2007-01-08 [paul] 2.6.1cvs117

	* po/ca.po
	* po/de.po
	* po/en_GB.po
	* po/fi.po
	* po/it.po
	* po/pt_BR.po
	* po/sk.po
	* po/sr.po
	* po/zh_CN.po
		updated by Miquel Oliete, Stephan Sachse, me,
		Tommi Pirinen, Andrea Spadaccini, Frederico
		Goncalves Guimaraes, Andrej Kacian, Aleksandar
		Urosevic, and Ralgh Young

diff --git a/ChangeLog b/ChangeLog
index bc11579f2729d6c20804b43a2d991751f862432d..ee95f2cea272fe70f3b06a7ecdc8430b777ac270 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-01-08 [paul]      2.6.1cvs117
+
+       * po/ca.po
+       * po/de.po
+       * po/en_GB.po
+       * po/fi.po
+       * po/it.po
+       * po/pt_BR.po
+       * po/sk.po
+       * po/sr.po
+       * po/zh_CN.po
+               updated by Miquel Oliete, Stephan Sachse, me,
+               Tommi Pirinen, Andrea Spadaccini, Frederico
+               Goncalves Guimaraes, Andrej Kacian, Aleksandar
+               Urosevic, and Ralgh Young
+

 2007-01-07 [mones]     2.6.1cvs116
 
        * manual/es/advanced.xml
 2007-01-07 [mones]     2.6.1cvs116
 
        * manual/es/advanced.xml

diff --git a/PATCHSETS b/PATCHSETS
index ef0f0d81d5ee23c062d11399ef420ad47e656f46..7bd5fd74712d2fefa98af598b7b483d916978f5f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2224,3 +2224,4 @@
 ( cvs diff -u -r 1.94.2.116 -r 1.94.2.117 src/messageview.c;  ) > 2.6.1cvs114.patchset
 ( cvs diff -u -r 1.43.2.50 -r 1.43.2.51 src/prefs_matcher.c;  ) > 2.6.1cvs115.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/es/advanced.xml;  cvs diff -u -r 1.60.2.40 -r 1.60.2.41 po/es.po;  ) > 2.6.1cvs116.patchset
 ( cvs diff -u -r 1.94.2.116 -r 1.94.2.117 src/messageview.c;  ) > 2.6.1cvs114.patchset
 ( cvs diff -u -r 1.43.2.50 -r 1.43.2.51 src/prefs_matcher.c;  ) > 2.6.1cvs115.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/es/advanced.xml;  cvs diff -u -r 1.60.2.40 -r 1.60.2.41 po/es.po;  ) > 2.6.1cvs116.patchset

+( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 po/ca.po;  cvs diff -u -r 1.58.2.28 -r 1.58.2.29 po/de.po;  cvs diff -u -r 1.12.2.12 -r 1.12.2.13 po/en_GB.po;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 po/fi.po;  cvs diff -u -r 1.34.2.21 -r 1.34.2.22 po/it.po;  cvs diff -u -r 1.50.2.22 -r 1.50.2.23 po/pt_BR.po;  cvs diff -u -r 1.2.2.23 -r 1.2.2.24 po/sk.po;  cvs diff -u -r 1.17.2.24 -r 1.17.2.25 po/sr.po;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 po/zh_CN.po;  ) > 2.6.1cvs117.patchset

diff --git a/configure.ac b/configure.ac
index 263c6638f35ee942bd1ee55fd339b65682faee9b..9f5aa66e4a34e34e22f35c98343c3e1af7640f21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=116
+EXTRA_VERSION=117

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/po/ca.po b/po/ca.po
index f39c3765a03fa49a16c17bc015e3cf41e8f9ba25..68a68233a1b92acd5334477e5532ec692e3cc991 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,13 +1,13 @@
-# Catalan translation of Sylpheed Claws.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Catalan translation of Claws Mail.
+# Copyright (C) 2007 The Claws Mail Team

 # Miquel Oliete i Baliarda <ktalanet@yahoo.es>, 2006.
 #
 msgid ""
 msgstr ""
 # Miquel Oliete i Baliarda <ktalanet@yahoo.es>, 2006.
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: sylpheed-claws\n"
-"Report-Msgid-Bugs-To: paul@sylpheed.org\n"
-"POT-Creation-Date: 2006-07-24 05:45+0100\n"
-"PO-Revision-Date: 2006-07-29 12:36+0100\n"
+"Project-Id-Version: Claws Mail\n"
+"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
+"POT-Creation-Date: 2007-01-01 10:27+0000\n"
+"PO-Revision-Date: 200i7-01-07 11:20+0100\n"

 "Last-Translator: Miquel Oliete i Baliarda <ktalanet@yahoo.es>\n"
 "Language-Team: Miquel Oliete i Baliarda <ktalanet@yahoo.es>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Miquel Oliete i Baliarda <ktalanet@yahoo.es>\n"
 "Language-Team: Miquel Oliete i Baliarda <ktalanet@yahoo.es>\n"
 "MIME-Version: 1.0\n"


@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 

-#: src/account.c:377
+#: src/account.c:378

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."


@@ -23,31 +23,33 @@ msgstr ""
 "Hi ha finestres de composició obertes.\n"
 "Tanqueu totes les finestres de composició abans d'editar els comptes."
 
 "Hi ha finestres de composició obertes.\n"
 "Tanqueu totes les finestres de composició abans d'editar els comptes."
 

-#: src/account.c:424
+#: src/account.c:425

 msgid "Can't create folder."
 msgstr "No s'ha pogut crear la carpeta."
 
 msgid "Can't create folder."
 msgstr "No s'ha pogut crear la carpeta."
 

-#: src/account.c:681
+#: src/account.c:682

 msgid "Edit accounts"
 msgstr "Editar comptes"
 
 msgid "Edit accounts"
 msgstr "Editar comptes"
 

-#: src/account.c:699
+#: src/account.c:700

 msgid ""
 msgid ""

-"New messages will be checked in this order. Check the boxes\n"
-"on the 'G' column to enable message retrieval by 'Get Mail'."
+"Using 'Get Mail' will retrieve messages from your Accounts in the order "
+"given, the checkbox in the 'G' column indicates which accounts will be "
+"included."

 msgstr ""
 msgstr ""

-"Els nous missatges seran comprovats en aquest ordre. Valida les bústies\n"
-"a la columna 'G' per activar la recollida de missatges amb 'Rebre tots'."
+"Usant 'Rebre' recuperareu els missatges desde els vostres comptes en l'ordre "
+"donat, la marca a la columna 'G' indicarà quins comptes hi seran "
+"inclosos."

 
 

-#: src/account.c:774
+#: src/account.c:773

 msgid " _Set as default account "
 msgstr " E_stablir com a compte primari "
 
 msgid " _Set as default account "
 msgstr " E_stablir com a compte primari "
 

-#: src/account.c:868
+#: src/account.c:867

 msgid "Accounts with remote folders cannot be copied."
 msgstr "Els comptes amb carpetes remotes no es poden copiar"
 
 msgid "Accounts with remote folders cannot be copied."
 msgstr "Els comptes amb carpetes remotes no es poden copiar"
 

-#: src/account.c:874
+#: src/account.c:873

 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"


@@ -65,20 +67,37 @@ msgstr "(Sense t
 msgid "Delete account"
 msgstr "Esborrar compte"
 
 msgid "Delete account"
 msgstr "Esborrar compte"
 

-#: src/account.c:1456 src/addressadd.c:196 src/addressbook.c:118
-#: src/compose.c:5519 src/compose.c:5810 src/editaddress.c:953
-#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:279
+#: src/account.c:1461
+msgid "Accounts List Default Column Name|D"
+msgstr "Comptes Llista Omissió Columna Nom|D"
+
+#: src/account.c:1467
+msgid "Default account"
+msgstr "Compte per omissió"
+
+#: src/account.c:1475
+msgid "Accounts List Get Column Name|G"
+msgstr "Comptes Llista Obtenir Columna Nom|G"
+
+#: src/account.c:1481
+msgid "'Get Mail' retrieves mail from the checked accounts"
+msgstr "'Obtenir' recupera el correu desde els comptes marcats"
+
+#: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132
+#: src/compose.c:5821 src/compose.c:6112 src/editaddress.c:1041
+#: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183

-#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:203
-#: src/plugins/pgpcore/select-keys.c:338 src/prefs_filtering.c:1342
+#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
+#: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364
+#: src/prefs_filtering.c:1481 src/prefs_template.c:185

 msgid "Name"
 msgstr "Nom"
 
 msgid "Name"
 msgstr "Nom"
 

-#: src/account.c:1463 src/prefs_account.c:1165 src/prefs_account.c:2686
+#: src/account.c:1495 src/prefs_account.c:1176 src/prefs_account.c:2712

 msgid "Protocol"
 msgstr "Protocol"
 
 msgid "Protocol"
 msgstr "Protocol"
 

-#: src/account.c:1470 src/ssl_manager.c:99
+#: src/account.c:1502 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Servidor"
 
 msgid "Server"
 msgstr "Servidor"
 


@@ -142,7 +161,7 @@ msgstr "--- Finalitzant: %s\n"
 msgid "Action's input/output"
 msgstr "Entrada/sortida de la acció"
 
 msgid "Action's input/output"
 msgstr "Entrada/sortida de la acció"
 

-#: src/action.c:1527
+#: src/action.c:1529

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -153,11 +172,11 @@ msgstr ""
 "(`%%h' serà substituït amb l'argument)\n"
 "  %s"
 
 "(`%%h' serà substituït amb l'argument)\n"
 "  %s"
 

-#: src/action.c:1532
+#: src/action.c:1534

 msgid "Action's hidden user argument"
 msgstr "Argument d'usuari ocult per a la acció"
 
 msgid "Action's hidden user argument"
 msgstr "Argument d'usuari ocult per a la acció"
 

-#: src/action.c:1536
+#: src/action.c:1538

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -168,7 +187,7 @@ msgstr ""
 "(`%%u' serà substituït amb l'argument)\n"
 "  %s"
 
 "(`%%u' serà substituït amb l'argument)\n"
 "  %s"
 

-#: src/action.c:1541
+#: src/action.c:1543

 msgid "Action's user argument"
 msgstr "Argument d'usuari per a la acció"
 
 msgid "Action's user argument"
 msgstr "Argument d'usuari per a la acció"
 


@@ -176,13 +195,13 @@ msgstr "Argument d'usuari per a la acci
 msgid "Add to address book"
 msgstr "Afegir a l'agenda"
 
 msgid "Add to address book"
 msgstr "Afegir a l'agenda"
 

-#: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:339
-#: src/toolbar.c:448
+#: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
+#: src/toolbar.c:459

 msgid "Address"
 msgstr "Adreça"
 
 msgid "Address"
 msgstr "Adreça"
 

-#: src/addressadd.c:218 src/addressbook.c:120 src/editaddress.c:761
-#: src/editaddress.c:825 src/editgroup.c:281
+#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:849
+#: src/editaddress.c:913 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Notes"
 
 msgid "Remarks"
 msgstr "Notes"
 


@@ -190,345 +209,349 @@ msgstr "Notes"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de l'agenda"
 
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de l'agenda"
 

-#: src/addressbook.c:119 src/editaddress.c:759 src/editaddress.c:807
-#: src/editgroup.c:280 src/expldifdlg.c:521 src/exporthtml.c:638
+#: src/addressbook.c:133 src/editaddress.c:847 src/editaddress.c:895
+#: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638

 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "Adreça de Correu"
 
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "Adreça de Correu"
 

-#: src/addressbook.c:402
+#: src/addressbook.c:419

 msgid "/_Book"
 msgstr "/Lli_bre"
 
 msgid "/_Book"
 msgstr "/Lli_bre"
 

-#: src/addressbook.c:403
+#: src/addressbook.c:420

 msgid "/_Book/New _Book"
 msgstr "/Lli_bre/Nou Lli_bre"
 
 msgid "/_Book/New _Book"
 msgstr "/Lli_bre/Nou Lli_bre"
 

-#: src/addressbook.c:404
+#: src/addressbook.c:421

 msgid "/_Book/New _Folder"
 msgstr "/Lli_bre/Nova _Carpeta"
 
 msgid "/_Book/New _Folder"
 msgstr "/Lli_bre/Nova _Carpeta"
 

-#: src/addressbook.c:405
+#: src/addressbook.c:422

 msgid "/_Book/New _vCard"
 msgstr "/Lli_bre/Nova _vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/Lli_bre/Nova _vCard"
 

-#: src/addressbook.c:407
+#: src/addressbook.c:424

 msgid "/_Book/New _JPilot"
 msgstr "/Lli_bre/Nou _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/Lli_bre/Nou _JPilot"
 

-#: src/addressbook.c:410
+#: src/addressbook.c:427

 msgid "/_Book/New LDAP _Server"
 msgstr "/Lli_bre/Nou _Servidor LDAP"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/Lli_bre/Nou _Servidor LDAP"
 

-#: src/addressbook.c:412 src/addressbook.c:415
+#: src/addressbook.c:429 src/addressbook.c:432

 msgid "/_Book/---"
 msgstr "/Lli_bre/---"
 
 msgid "/_Book/---"
 msgstr "/Lli_bre/---"
 

-#: src/addressbook.c:413
+#: src/addressbook.c:430

 msgid "/_Book/_Edit book"
 msgstr "/Lli_bre/_Editar Llibre"
 
 msgid "/_Book/_Edit book"
 msgstr "/Lli_bre/_Editar Llibre"
 

-#: src/addressbook.c:414
+#: src/addressbook.c:431

 msgid "/_Book/_Delete book"
 msgstr "/Lli_bre/_Esborrar llibre"
 
 msgid "/_Book/_Delete book"
 msgstr "/Lli_bre/_Esborrar llibre"
 

-#: src/addressbook.c:416
+#: src/addressbook.c:433

 msgid "/_Book/_Save"
 msgstr "/Lli_bre/_Guardar"
 
 msgid "/_Book/_Save"
 msgstr "/Lli_bre/_Guardar"
 

-#: src/addressbook.c:417
+#: src/addressbook.c:434

 msgid "/_Book/_Close"
 msgstr "/Lli_bre/Tan_car"
 
 msgid "/_Book/_Close"
 msgstr "/Lli_bre/Tan_car"
 

-#: src/addressbook.c:418
+#: src/addressbook.c:435

 msgid "/_Address"
 msgstr "/_Adreça"
 
 msgid "/_Address"
 msgstr "/_Adreça"
 

-#: src/addressbook.c:419
+#: src/addressbook.c:436

 msgid "/_Address/_Select all"
 msgstr "/_Adreça/_Seleccionar tot"
 
 msgid "/_Address/_Select all"
 msgstr "/_Adreça/_Seleccionar tot"
 

-#: src/addressbook.c:420 src/addressbook.c:424 src/addressbook.c:427
-#: src/addressbook.c:430
+#: src/addressbook.c:437 src/addressbook.c:441 src/addressbook.c:444
+#: src/addressbook.c:447

 msgid "/_Address/---"
 msgstr "/_Adreça/---"
 
 msgid "/_Address/---"
 msgstr "/_Adreça/---"
 

-#: src/addressbook.c:421
+#: src/addressbook.c:438

 msgid "/_Address/C_ut"
 msgstr "/_Adreça/_Tallar"
 
 msgid "/_Address/C_ut"
 msgstr "/_Adreça/_Tallar"
 

-#: src/addressbook.c:422
+#: src/addressbook.c:439

 msgid "/_Address/_Copy"
 msgstr "/_Adreça/_Copiar"
 
 msgid "/_Address/_Copy"
 msgstr "/_Adreça/_Copiar"
 

-#: src/addressbook.c:423
+#: src/addressbook.c:440

 msgid "/_Address/_Paste"
 msgstr "/_Adreça/_Enganxar"
 
 msgid "/_Address/_Paste"
 msgstr "/_Adreça/_Enganxar"
 

-#: src/addressbook.c:425
+#: src/addressbook.c:442

 msgid "/_Address/_Edit"
 msgstr "/_Adreça/_Editar"
 
 msgid "/_Address/_Edit"
 msgstr "/_Adreça/_Editar"
 

-#: src/addressbook.c:426
+#: src/addressbook.c:443

 msgid "/_Address/_Delete"
 msgstr "/_Adreça/_Esborrar"
 
 msgid "/_Address/_Delete"
 msgstr "/_Adreça/_Esborrar"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:445

 msgid "/_Address/New _Address"
 msgstr "/_Adreça/Nova _Adreça"
 
 msgid "/_Address/New _Address"
 msgstr "/_Adreça/Nova _Adreça"
 

-#: src/addressbook.c:429
+#: src/addressbook.c:446

 msgid "/_Address/New _Group"
 msgstr "/_Adreça/Nou _Grup"
 
 msgid "/_Address/New _Group"
 msgstr "/_Adreça/Nou _Grup"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:448

 msgid "/_Address/_Mail To"
 msgstr "/_Adreça/_Correu per"
 
 msgid "/_Address/_Mail To"
 msgstr "/_Adreça/_Correu per"
 

-#: src/addressbook.c:432 src/compose.c:756 src/mainwindow.c:759
-#: src/messageview.c:295
+#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:799
+#: src/messageview.c:302

 msgid "/_Tools"
 msgstr "/E_ines"
 
 msgid "/_Tools"
 msgstr "/E_ines"
 

-#: src/addressbook.c:433
+#: src/addressbook.c:450

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/E_ines/Importar fitxer _LDIF..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/E_ines/Importar fitxer _LDIF..."
 

-#: src/addressbook.c:434
+#: src/addressbook.c:451

 msgid "/_Tools/Import M_utt file..."
 msgstr "/E_ines/Importar fitxer M_utt..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/E_ines/Importar fitxer M_utt..."
 

-#: src/addressbook.c:435
+#: src/addressbook.c:452

 msgid "/_Tools/Import _Pine file..."
 msgstr "/E_ines/Importar fitxer _Pine..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/E_ines/Importar fitxer _Pine..."
 

-#: src/addressbook.c:436 src/mainwindow.c:768 src/mainwindow.c:791
-#: src/mainwindow.c:793 src/mainwindow.c:802 src/mainwindow.c:805
-#: src/mainwindow.c:809 src/messageview.c:299 src/messageview.c:320
+#: src/addressbook.c:453 src/mainwindow.c:808 src/mainwindow.c:831
+#: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
+#: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327

 msgid "/_Tools/---"
 msgstr "/E_ines/---"
 
 msgid "/_Tools/---"
 msgstr "/E_ines/---"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:454

 msgid "/_Tools/Export _HTML..."
 msgstr "/E_ines/Exportar _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/E_ines/Exportar _HTML..."
 

-#: src/addressbook.c:438
+#: src/addressbook.c:455

 msgid "/_Tools/Export LDI_F..."
 msgstr "/E_ines/Exportar LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/E_ines/Exportar LDI_F..."
 

-#: src/addressbook.c:439 src/compose.c:761 src/mainwindow.c:834
-#: src/messageview.c:323
+#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:874
+#: src/messageview.c:330

 msgid "/_Help"
 msgstr "/A_juda"
 
 msgid "/_Help"
 msgstr "/A_juda"
 

-#: src/addressbook.c:440 src/compose.c:762 src/mainwindow.c:840
-#: src/messageview.c:324
+#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:880
+#: src/messageview.c:331

 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 

-#: src/addressbook.c:445 src/addressbook.c:459 src/compose.c:535
-#: src/mainwindow.c:492 src/messageview.c:161
+#: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545
+#: src/mainwindow.c:518 src/messageview.c:164

 msgid "/_Edit"
 msgstr "/_Editar"
 
 msgid "/_Edit"
 msgstr "/_Editar"
 

-#: src/addressbook.c:446 src/addressbook.c:460
+#: src/addressbook.c:463 src/addressbook.c:479

 msgid "/_Delete"
 msgstr "/_Esborrar"
 
 msgid "/_Delete"
 msgstr "/_Esborrar"
 

-#: src/addressbook.c:447 src/addressbook.c:449 src/addressbook.c:458
-#: src/addressbook.c:461 src/addressbook.c:464 src/addressbook.c:468
-#: src/compose.c:514 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
-#: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:54
-#: src/news_gtk.c:57 src/news_gtk.c:59 src/plugins/trayicon/trayicon.c:94
-#: src/plugins/trayicon/trayicon.c:97 src/plugins/trayicon/trayicon.c:99
-#: src/summaryview.c:423 src/summaryview.c:427 src/summaryview.c:432
-#: src/summaryview.c:450 src/summaryview.c:471 src/summaryview.c:477
-msgid "/---"
-msgstr "/---"
+#: src/addressbook.c:465
+msgid "/New _Book"
+msgstr "/Nou Lli_bre"

 
 

-#: src/addressbook.c:448
+#: src/addressbook.c:466

 msgid "/New _Folder"
 msgstr "/Nova _Carpeta"
 
 msgid "/New _Folder"
 msgstr "/Nova _Carpeta"
 

-#: src/addressbook.c:450 src/addressbook.c:465
+#: src/addressbook.c:467 src/addressbook.c:482
+msgid "/New _Group"
+msgstr "/Nou _Grup"
+
+#: src/addressbook.c:469 src/addressbook.c:484

 msgid "/C_ut"
 msgstr "/T_allar"
 
 msgid "/C_ut"
 msgstr "/T_allar"
 

-#: src/addressbook.c:451 src/addressbook.c:466
+#: src/addressbook.c:470 src/addressbook.c:485

 msgid "/_Copy"
 msgstr "/_Copiar"
 
 msgid "/_Copy"
 msgstr "/_Copiar"
 

-#: src/addressbook.c:452 src/addressbook.c:467
+#: src/addressbook.c:471 src/addressbook.c:486

 msgid "/_Paste"
 msgstr "/_Enganxar"
 
 msgid "/_Paste"
 msgstr "/_Enganxar"
 

-#: src/addressbook.c:457
+#: src/addressbook.c:476

 msgid "/_Select all"
 msgstr "/_Seleccionar tot"
 
 msgid "/_Select all"
 msgstr "/_Seleccionar tot"
 

-#: src/addressbook.c:462
+#: src/addressbook.c:481

 msgid "/New _Address"
 msgstr "/Nova _Adreça"
 
 msgid "/New _Address"
 msgstr "/Nova _Adreça"
 

-#: src/addressbook.c:463
-msgid "/New _Group"
-msgstr "/Nou _Grup"
-
-#: src/addressbook.c:470
+#: src/addressbook.c:489

 msgid "/_Mail To"
 msgstr "/_Correu per"
 
 msgid "/_Mail To"
 msgstr "/_Correu per"
 

-#: src/addressbook.c:472
+#: src/addressbook.c:491

 msgid "/_Browse Entry"
 msgstr "/_Veure Entrada"
 
 msgid "/_Browse Entry"
 msgstr "/_Veure Entrada"
 

-#: src/addressbook.c:485 src/crash.c:450 src/crash.c:469 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:123 src/prefs_themes.c:683
+#: src/addressbook.c:504 src/crash.c:453 src/crash.c:472 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_themes.c:683

 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Desconegut"
 
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Desconegut"
 

-#: src/addressbook.c:492 src/addressbook.c:511 src/importldif.c:126
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:126

 msgid "Success"
 msgstr "Correcte"
 
 msgid "Success"
 msgstr "Correcte"
 

-#: src/addressbook.c:493 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127

 msgid "Bad arguments"
 msgstr "Arguments incorrectes"
 
 msgid "Bad arguments"
 msgstr "Arguments incorrectes"
 

-#: src/addressbook.c:494 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128

 msgid "File not specified"
 msgstr "No s'ha especificat l' arxiu"
 
 msgid "File not specified"
 msgstr "No s'ha especificat l' arxiu"
 

-#: src/addressbook.c:495 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129

 msgid "Error opening file"
 msgstr "Error obrint l'arxiu"
 
 msgid "Error opening file"
 msgstr "Error obrint l'arxiu"
 

-#: src/addressbook.c:496 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130

 msgid "Error reading file"
 msgstr "Error llegint l'arxiu"
 
 msgid "Error reading file"
 msgstr "Error llegint l'arxiu"
 

-#: src/addressbook.c:497 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131

 msgid "End of file encountered"
 msgstr "Trobat el final de l'arxiu"
 
 msgid "End of file encountered"
 msgstr "Trobat el final de l'arxiu"
 

-#: src/addressbook.c:498 src/importldif.c:132
+#: src/addressbook.c:517 src/importldif.c:132

 msgid "Error allocating memory"
 msgstr "Error reservant memòria"
 
 msgid "Error allocating memory"
 msgstr "Error reservant memòria"
 

-#: src/addressbook.c:499 src/importldif.c:133
+#: src/addressbook.c:518 src/importldif.c:133

 msgid "Bad file format"
 msgstr "Format d'arxiu erroni"
 
 msgid "Bad file format"
 msgstr "Format d'arxiu erroni"
 

-#: src/addressbook.c:500 src/importldif.c:134
+#: src/addressbook.c:519 src/importldif.c:134

 msgid "Error writing to file"
 msgstr "Error escrivint en l'arxiu"
 
 msgid "Error writing to file"
 msgstr "Error escrivint en l'arxiu"
 

-#: src/addressbook.c:501 src/importldif.c:135
+#: src/addressbook.c:520 src/importldif.c:135

 msgid "Error opening directory"
 msgstr "Error obrint el directori"
 
 msgid "Error opening directory"
 msgstr "Error obrint el directori"
 

-#: src/addressbook.c:502 src/importldif.c:136
+#: src/addressbook.c:521 src/importldif.c:136

 msgid "No path specified"
 msgstr "No s'ha especificat cap ruta"
 
 msgid "No path specified"
 msgstr "No s'ha especificat cap ruta"
 

-#: src/addressbook.c:512
+#: src/addressbook.c:531

 msgid "Error connecting to LDAP server"
 msgstr "Error connectant al servidor LDAP"
 
 msgid "Error connecting to LDAP server"
 msgstr "Error connectant al servidor LDAP"
 

-#: src/addressbook.c:513
+#: src/addressbook.c:532

 msgid "Error initializing LDAP"
 msgstr "Error inicializant LDAP"
 
 msgid "Error initializing LDAP"
 msgstr "Error inicializant LDAP"
 

-#: src/addressbook.c:514
+#: src/addressbook.c:533

 msgid "Error binding to LDAP server"
 msgstr "Error enllaçant amb el servidor LDAP"
 
 msgid "Error binding to LDAP server"
 msgstr "Error enllaçant amb el servidor LDAP"
 

-#: src/addressbook.c:515
+#: src/addressbook.c:534

 msgid "Error searching LDAP database"
 msgstr "Error buscant a la base de dades LDAP"
 
 msgid "Error searching LDAP database"
 msgstr "Error buscant a la base de dades LDAP"
 

-#: src/addressbook.c:516
+#: src/addressbook.c:535

 msgid "Timeout performing LDAP operation"
 msgstr "Fora de temps a la operació LDAP"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Fora de temps a la operació LDAP"
 

-#: src/addressbook.c:517
+#: src/addressbook.c:536

 msgid "Error in LDAP search criteria"
 msgstr "Error en el criteri de búsqueda LDAP"
 
 msgid "Error in LDAP search criteria"
 msgstr "Error en el criteri de búsqueda LDAP"
 

-#: src/addressbook.c:518
+#: src/addressbook.c:537

 msgid "No LDAP entries found for search criteria"
 msgstr "No s'ha trobat entrades LDAP per al criteri de búsqueda"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "No s'ha trobat entrades LDAP per al criteri de búsqueda"
 

-#: src/addressbook.c:519
+#: src/addressbook.c:538

 msgid "LDAP search terminated on request"
 msgstr "S'ha sol·licitat concloure la búsqueda LDAP"
 
 msgid "LDAP search terminated on request"
 msgstr "S'ha sol·licitat concloure la búsqueda LDAP"
 

-#: src/addressbook.c:520
+#: src/addressbook.c:539

 msgid "Error starting TLS connection"
 msgstr "Error iniciant la connexió TLS"
 
 msgid "Error starting TLS connection"
 msgstr "Error iniciant la connexió TLS"
 

-#: src/addressbook.c:835
+#: src/addressbook.c:897

 msgid "Sources"
 msgstr "Fonts"
 
 msgid "Sources"
 msgstr "Fonts"
 

-#: src/addressbook.c:839 src/prefs_other.c:100 src/toolbar.c:190
-#: src/toolbar.c:1730
+#: src/addressbook.c:901 src/prefs_other.c:101 src/toolbar.c:194
+#: src/toolbar.c:1787

 msgid "Address book"
 msgstr "Agenda d'adreces"
 
 msgid "Address book"
 msgstr "Agenda d'adreces"
 

-#: src/addressbook.c:962
+#: src/addressbook.c:1033

 msgid "Lookup name:"
 msgstr "Nom de búsqueda:"
 
 msgid "Lookup name:"
 msgstr "Nom de búsqueda:"
 

-#: src/addressbook.c:1026 src/compose.c:1959 src/compose.c:4187
-#: src/compose.c:5381 src/compose.c:6126 src/prefs_template.c:207
-#: src/summary_search.c:264
+#: src/addressbook.c:1106 src/compose.c:2129 src/compose.c:4443
+#: src/compose.c:5667 src/compose.c:6432 src/compose.c:9453
+#: src/summary_search.c:359

 msgid "To:"
 msgstr "Per a:"
 
 msgid "To:"
 msgstr "Per a:"
 

-#: src/addressbook.c:1030 src/compose.c:1943 src/compose.c:3966
-#: src/compose.c:4186 src/prefs_template.c:209
+#: src/addressbook.c:1110 src/compose.c:2113 src/compose.c:4182
+#: src/compose.c:4442 src/compose.c:9462

 msgid "Cc:"
 msgstr "Cc:"
 
 msgid "Cc:"
 msgstr "Cc:"
 

-#: src/addressbook.c:1034 src/compose.c:1946 src/compose.c:3997
-#: src/prefs_template.c:211
+#: src/addressbook.c:1114 src/compose.c:2116 src/compose.c:4213

 msgid "Bcc:"
 msgstr "Bcc:"
 
 msgid "Bcc:"
 msgstr "Bcc:"
 

-#: src/addressbook.c:1269 src/addressbook.c:1292
+#: src/addressbook.c:1363 src/addressbook.c:1409

 msgid "Delete address(es)"
 msgstr "Esborrar adreça(es)"
 
 msgid "Delete address(es)"
 msgstr "Esborrar adreça(es)"
 

-#: src/addressbook.c:1270
+#: src/addressbook.c:1364

 msgid "This address data is readonly and cannot be deleted."
 msgstr "Aquesta adreça és només de lectura i no es pot esborrar."
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Aquesta adreça és només de lectura i no es pot esborrar."
 

-#: src/addressbook.c:1293
+#: src/addressbook.c:1403
+msgid "Delete group"
+msgstr "Esborrar grup"
+
+#: src/addressbook.c:1404
+msgid ""
+"Really delete the group(s)?\n"
+"The addresses it contains will not be lost."
+msgstr ""
+"Voleu realment esborrar el(s) grup(s)?\n"
+"Les adreces que conté/contenen es perdran."
+
+#: src/addressbook.c:1410

 msgid "Really delete the address(es)?"
 msgstr "Esborrar realment la/les adreça/es?"
 
 msgid "Really delete the address(es)?"
 msgstr "Esborrar realment la/les adreça/es?"
 

-#: src/addressbook.c:1887
+#: src/addressbook.c:2014

 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "No es pot enganxar. El llibre d'adreces de destinació és només de lectura."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 "No es pot enganxar. El llibre d'adreces de destinació és només de lectura."
 

-#: src/addressbook.c:1898
+#: src/addressbook.c:2025

 msgid "Cannot paste into an address group."
 msgstr "No es pot enganxar dins d'un grup d'adreces."
 
 msgid "Cannot paste into an address group."
 msgstr "No es pot enganxar dins d'un grup d'adreces."
 

-#: src/addressbook.c:2554
+#: src/addressbook.c:2708

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Voleu esborrar els resultats de la búsqueda i adreces a `%s' ?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Voleu esborrar els resultats de la búsqueda i adreces a `%s' ?"
 

-#: src/addressbook.c:2557 src/addressbook.c:2583
+#: src/addressbook.c:2711 src/addressbook.c:2737 src/addressbook.c:2744

 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Esborrar"
 
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Esborrar"
 

-#: src/addressbook.c:2566
+#: src/addressbook.c:2720

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -537,19 +560,27 @@ msgstr ""
 "Voleu esborrar '%s' ? Si només esborreu la carpeta, les adreces es mouran a "
 "la carpeta mare."
 
 "Voleu esborrar '%s' ? Si només esborreu la carpeta, les adreces es mouran a "
 "la carpeta mare."
 

-#: src/addressbook.c:2569 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2723 src/imap_gtk.c:284 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Esborrar carpeta"
 
 msgid "Delete folder"
 msgstr "Esborrar carpeta"
 

-#: src/addressbook.c:2570
+#: src/addressbook.c:2724

 msgid "+Delete _folder only"
 msgstr "+Esborrar només _carpeta"
 
 msgid "+Delete _folder only"
 msgstr "+Esborrar només _carpeta"
 

-#: src/addressbook.c:2570
+#: src/addressbook.c:2724

 msgid "Delete folder and _addresses"
 msgstr "Esborrar carpeta i _adreces"
 
 msgid "Delete folder and _addresses"
 msgstr "Esborrar carpeta i _adreces"
 

-#: src/addressbook.c:2581
+#: src/addressbook.c:2735
+msgid ""
+"Do you want to delete '%s'?\n"
+"The addresses it contains will not be lost."
+msgstr ""
+"Voleu esborrar '%s'?\n"
+"Les adreces que conté no es perdran."
+
+#: src/addressbook.c:2742

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -558,19 +589,19 @@ msgstr ""
 "Voleu esborrar '%s'?\n"
 "Les adreces que conté es perdran."
 
 "Voleu esborrar '%s'?\n"
 "Les adreces que conté es perdran."
 

-#: src/addressbook.c:3391
+#: src/addressbook.c:3595

 msgid "New user, could not save index file."
 msgstr "Nou usuari, no s'ha pogut guardar l'arxiu d'índex."
 
 msgid "New user, could not save index file."
 msgstr "Nou usuari, no s'ha pogut guardar l'arxiu d'índex."
 

-#: src/addressbook.c:3395
+#: src/addressbook.c:3599

 msgid "New user, could not save address book files."
 msgstr "Nou usuari, no s'han pogut guardar els arxius d'adreces"
 
 msgid "New user, could not save address book files."
 msgstr "Nou usuari, no s'han pogut guardar els arxius d'adreces"
 

-#: src/addressbook.c:3405
+#: src/addressbook.c:3609

 msgid "Old address book converted successfully."
 msgstr "Agenda antiga d'adreces convertida amb èxit"
 
 msgid "Old address book converted successfully."
 msgstr "Agenda antiga d'adreces convertida amb èxit"
 

-#: src/addressbook.c:3410
+#: src/addressbook.c:3614

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -578,7 +609,7 @@ msgstr ""
 "L'antiga agenda d'adreces convertida,\n"
 "no s'ha pogut guardar el nou arxiu índex."
 
 "L'antiga agenda d'adreces convertida,\n"
 "no s'ha pogut guardar el nou arxiu índex."
 

-#: src/addressbook.c:3423
+#: src/addressbook.c:3627

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -586,7 +617,7 @@ msgstr ""
 "No s'ha pogut convertir l'agenda antiga,\n"
 "pero s'han creat nous arxius d'adreces buits."
 
 "No s'ha pogut convertir l'agenda antiga,\n"
 "pero s'han creat nous arxius d'adreces buits."
 

-#: src/addressbook.c:3429
+#: src/addressbook.c:3633

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -594,7 +625,7 @@ msgstr ""
 "No s'ha pogut convertir l'agenda d'adrecess,\n"
 "No s'ha pogut guardar el nou arxiu índex."
 
 "No s'ha pogut convertir l'agenda d'adrecess,\n"
 "No s'ha pogut guardar el nou arxiu índex."
 

-#: src/addressbook.c:3434
+#: src/addressbook.c:3638

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -602,69 +633,76 @@ msgstr ""
 "No s'ha pogut convertir l'agenda antiga\n"
 "i no s'han pogut crear els arxius per la nova."
 
 "No s'ha pogut convertir l'agenda antiga\n"
 "i no s'han pogut crear els arxius per la nova."
 

-#: src/addressbook.c:3441 src/addressbook.c:3447
+#: src/addressbook.c:3645 src/addressbook.c:3651

 msgid "Addressbook conversion error"
 msgstr "Error en la conversió de l'agenda"
 
 msgid "Addressbook conversion error"
 msgstr "Error en la conversió de l'agenda"
 

-#: src/addressbook.c:3485
+#: src/addressbook.c:3689

 msgid "Addressbook Error"
 msgstr "Error en l'agenda"
 
 msgid "Addressbook Error"
 msgstr "Error en l'agenda"
 

-#: src/addressbook.c:3486
+#: src/addressbook.c:3690

 msgid "Could not read address index"
 msgstr "No s'ha pogut llegir l'índex d'adreces"
 
 msgid "Could not read address index"
 msgstr "No s'ha pogut llegir l'índex d'adreces"
 

-#: src/addressbook.c:3813
+#: src/addressbook.c:4017

 msgid "Busy searching..."
 msgstr "Buscant..."
 
 msgid "Busy searching..."
 msgstr "Buscant..."
 

-#: src/addressbook.c:3884
+#: src/addressbook.c:4088

 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar '%s'"
 
 #, c-format
 msgid "Search '%s'"
 msgstr " Buscar '%s'"
 

-#: src/addressbook.c:4109
+#: src/addressbook.c:4313

 msgid "Interface"
 msgstr "Interficie"
 
 msgid "Interface"
 msgstr "Interficie"
 

-#: src/addressbook.c:4125 src/exphtmldlg.c:378 src/expldifdlg.c:394
+#: src/addressbook.c:4329 src/exphtmldlg.c:375 src/expldifdlg.c:394

 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Agenda d'adreces"
 
 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Agenda d'adreces"
 

-#: src/addressbook.c:4141
+#: src/addressbook.c:4345

 msgid "Person"
 msgstr "Persona"
 
 msgid "Person"
 msgstr "Persona"
 

-#: src/addressbook.c:4157
+#: src/addressbook.c:4361

 msgid "EMail Address"
 msgstr "Adreça de correu"
 
 msgid "EMail Address"
 msgstr "Adreça de correu"
 

-#: src/addressbook.c:4173
+#: src/addressbook.c:4377

 msgid "Group"
 msgstr "Grup"
 
 msgid "Group"
 msgstr "Grup"
 

-#: src/addressbook.c:4189 src/exporthtml.c:922 src/folderview.c:441
-#: src/prefs_account.c:2399 src/prefs_folder_column.c:79
+#: src/addressbook.c:4393 src/exporthtml.c:922 src/folderview.c:470
+#: src/prefs_account.c:2417 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Carpeta"
 
 msgid "Folder"
 msgstr "Carpeta"
 

-#: src/addressbook.c:4205
+#: src/addressbook.c:4409

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4221 src/addressbook.c:4237
+#: src/addressbook.c:4425 src/addressbook.c:4441

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4253
+#: src/addressbook.c:4457

 msgid "LDAP servers"
 msgstr "Servidors LDAP"
 
 msgid "LDAP servers"
 msgstr "Servidors LDAP"
 

-#: src/addressbook.c:4269
+#: src/addressbook.c:4473

 msgid "LDAP Query"
 msgstr "Petició LDAP"
 
 msgid "LDAP Query"
 msgstr "Petició LDAP"
 

+#: src/addressbook.c:4789 src/matcher.c:303 src/matcher.c:756
+#: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
+#: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
+#: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
+msgid "Any"
+msgstr "Qualsevol"
+

 #: src/addrgather.c:158
 msgid "Please specify name for address book."
 msgstr "Especifiqueu el nom de l'agenda, si us plau."
 #: src/addrgather.c:158
 msgid "Please specify name for address book."
 msgstr "Especifiqueu el nom de l'agenda, si us plau."


@@ -699,7 +737,7 @@ msgstr ""
 msgid "Folder :"
 msgstr "Carpeta :"
 
 msgid "Folder :"
 msgstr "Carpeta :"
 

-#: src/addrgather.c:365 src/exphtmldlg.c:546 src/expldifdlg.c:626
+#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Agenda d'adreces :"
 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Agenda d'adreces :"


@@ -724,9 +762,9 @@ msgstr "Nom de cap
 msgid "Address Count"
 msgstr "Comptador d'adreces"
 
 msgid "Address Count"
 msgstr "Comptador d'adreces"
 

-#: src/addrgather.c:537 src/alertpanel.c:153 src/compose.c:4518
-#: src/compose.c:8971 src/messageview.c:561 src/messageview.c:574
-#: src/plugins/pgpcore/sgpgme.c:563
+#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4794
+#: src/compose.c:9374 src/messageview.c:578 src/messageview.c:591
+#: src/plugins/pgpcore/sgpgme.c:574

 msgid "Warning"
 msgstr "Avís"
 
 msgid "Warning"
 msgstr "Avís"
 


@@ -734,7 +772,7 @@ msgstr "Av
 msgid "Header Fields"
 msgstr "Camps de capçalera"
 
 msgid "Header Fields"
 msgstr "Camps de capçalera"
 

-#: src/addrgather.c:539 src/exphtmldlg.c:666 src/expldifdlg.c:738
+#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Finalitzar"
 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Finalitzar"


@@ -747,36 +785,36 @@ msgstr "Recopilar Adreces de Correu - dels Missatges Seleccionats"
 msgid "Harvest Email Addresses - from Folder"
 msgstr "Recopilar Adreces de Correu - de la Carpeta"
 
 msgid "Harvest Email Addresses - from Folder"
 msgstr "Recopilar Adreces de Correu - de la Carpeta"
 

-#: src/addrindex.c:115
+#: src/addrindex.c:116

 msgid "Common addresses"
 msgstr "Adreces comums"
 
 msgid "Common addresses"
 msgstr "Adreces comums"
 

-#: src/addrindex.c:116
+#: src/addrindex.c:117

 msgid "Personal addresses"
 msgstr "Adreces personals"
 
 msgid "Personal addresses"
 msgstr "Adreces personals"
 

-#: src/addrindex.c:122
+#: src/addrindex.c:123

 msgid "Common address"
 msgstr "Adreça comú"
 
 msgid "Common address"
 msgstr "Adreça comú"
 

-#: src/addrindex.c:123
+#: src/addrindex.c:124

 msgid "Personal address"
 msgstr "Adreça personal"
 
 msgid "Personal address"
 msgstr "Adreça personal"
 

-#: src/alertpanel.c:140 src/compose.c:7199
+#: src/alertpanel.c:141 src/compose.c:7582

 msgid "Notice"
 msgstr "Notificació"
 
 msgid "Notice"
 msgstr "Notificació"
 

-#: src/alertpanel.c:166 src/alertpanel.c:188 src/compose.c:4464 src/inc.c:594
-#: src/plugins/pgpcore/sgpgme.c:135 src/plugins/pgpcore/sgpgme.c:226
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4734 src/inc.c:616
+#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239

 msgid "Error"
 msgstr "Error"
 
 msgid "Error"
 msgstr "Error"
 

-#: src/alertpanel.c:189
+#: src/alertpanel.c:191

 msgid "_View log"
 msgstr "_Veure traça"
 
 msgid "_View log"
 msgstr "_Veure traça"
 

-#: src/alertpanel.c:336
+#: src/alertpanel.c:338

 msgid "Show this message next time"
 msgstr "Mostrar aquest missatge la propera vegada"
 
 msgid "Show this message next time"
 msgstr "Mostrar aquest missatge la propera vegada"
 


@@ -805,38 +843,107 @@ msgstr "Valor de l'atribut"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "No s'ha pogut connectar amb el servidor NNTP: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "No s'ha pogut connectar amb el servidor NNTP: %s:%d\n"
 

-#: src/common/nntp.c:181 src/common/nntp.c:244
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:840
+msgid "SSL handshake failed\n"
+msgstr "Negociació SSL fallida\n"
+
+#: src/common/nntp.c:182 src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr "error del protocol: %s\n"
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "error del protocol: %s\n"
 

-#: src/common/nntp.c:204 src/common/nntp.c:250
+#: src/common/nntp.c:205 src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr "error del protocol\n"
 
 msgid "protocol error\n"
 msgstr "error del protocol\n"
 

-#: src/common/nntp.c:300
+#: src/common/nntp.c:301

 msgid "Error occurred while posting\n"
 msgstr "S'ha produït un error enviant el missatge\n"
 
 msgid "Error occurred while posting\n"
 msgstr "S'ha produït un error enviant el missatge\n"
 

-#: src/common/nntp.c:380
+#: src/common/nntp.c:381

 msgid "Error occurred while sending command\n"
 msgstr "S'ha produït un error enviant l'ordre\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "S'ha produït un error enviant l'ordre\n"
 

-#: src/common/plugin.c:251
+#: src/common/plugin.c:53
+msgid "Nothing"
+msgstr "Res"
+
+#: src/common/plugin.c:54
+msgid "a viewer"
+msgstr "un visor"
+
+#: src/common/plugin.c:55
+msgid "folders"
+msgstr "carpetes"
+
+#: src/common/plugin.c:56
+msgid "filtering"
+msgstr "filtrant"
+
+#: src/common/plugin.c:57
+msgid "a privacy interface"
+msgstr "una interfície de privacitat"
+
+#: src/common/plugin.c:58
+msgid "a notifier"
+msgstr "un notificador"
+
+#: src/common/plugin.c:59
+msgid "an utility"
+msgstr "una utilitat"
+
+#: src/common/plugin.c:60
+msgid "things"
+msgstr "coses"
+
+#: src/common/plugin.c:258
+#, c-format
+msgid ""
+"This plugin provides %s (%s), which is already provided by the %s plugin."
+msgstr ""
+"Aquest mòdul proporciona %s (%s), que ja és proporcionat per el mòdul %s."
+
+#: src/common/plugin.c:293

 msgid "Plugin already loaded"
 msgstr "Mòdul ja carregat"
 
 msgid "Plugin already loaded"
 msgstr "Mòdul ja carregat"
 

-#: src/common/plugin.c:261
+#: src/common/plugin.c:303

 msgid "Failed to allocate memory for Plugin"
 msgstr "Error en petició de memòria per al plug-in"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Error en petició de memòria per al plug-in"
 

-#: src/common/plugin.c:287
+#: src/common/plugin.c:330

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Aquest mòdul no té una llicència compatible amb la GPL."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Aquest mòdul no té una llicència compatible amb la GPL."
 

-#: src/common/plugin.c:294
-msgid "This module is for Sylpheed-Claws GTK1."
-msgstr "Aquest mòdul es per a la versió GTK1 del Sylpheed Claws."
+#: src/common/plugin.c:337
+msgid "This module is for Claws Mail GTK1."
+msgstr "Aquest mòdul es per Claws Mail GTK1."
+
+#: src/common/plugin.c:547
+#, c-format
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr ""
+"La vostra versió de Claws Mail és més nova que la versió amb la que el mòdul '%s' "
+"fou linkat."
+
+#: src/common/plugin.c:550
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr ""
+"La vostra versió de Claws Mail és més nova que la versió amb la que el mòdul "
+"fou linkat."
+
+#: src/common/plugin.c:559
+#, c-format
+msgid "Your version of Claws Mail is too old for the '%s' plugin."
+msgstr "La vostra versió de Claws Mail és massa antiga per al mòdul '%s'."
+
+#: src/common/plugin.c:561
+msgid "Your version of Claws Mail is too old for the plugin."
+msgstr "La vostra versió de Claws Mail és massa antiga per al mòdul."

 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"


@@ -860,10 +967,10 @@ msgid "Message is too big (Maximum size is %s)\n"
 msgstr "El missatge és massa gran (Tamany màxim %s)\n"
 
 #: src/common/smtp.c:635 src/pop.c:835
 msgstr "El missatge és massa gran (Tamany màxim %s)\n"
 
 #: src/common/smtp.c:635 src/pop.c:835

-msgid "can't start TLS session\n"
+msgid "couldn't start TLS session\n"

 msgstr "no es pot iniciar la sessió TLS\n"
 
 msgstr "no es pot iniciar la sessió TLS\n"
 

-#: src/common/socket.c:1332
+#: src/common/socket.c:1405

 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escrit a fd%d: %s\n"
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "escrit a fd%d: %s\n"


@@ -877,16 +984,16 @@ msgstr "Error creant el context SSL\n"
 msgid "SSL connect failed (%s)\n"
 msgstr "Connexió SSL fallida (%s)\n"
 
 msgid "SSL connect failed (%s)\n"
 msgstr "Connexió SSL fallida (%s)\n"
 

-#: src/common/ssl_certificate.c:189 src/common/ssl_certificate.c:200
-#: src/common/ssl_certificate.c:206 src/common/ssl_certificate.c:213
-#: src/common/ssl_certificate.c:224 src/common/ssl_certificate.c:230
+#: src/common/ssl_certificate.c:208 src/common/ssl_certificate.c:219
+#: src/common/ssl_certificate.c:225 src/common/ssl_certificate.c:232
+#: src/common/ssl_certificate.c:243 src/common/ssl_certificate.c:249

 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<no en el certificat>"
 
 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<no en el certificat>"
 

-#: src/common/ssl_certificate.c:239
+#: src/common/ssl_certificate.c:258

 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"


@@ -899,486 +1006,714 @@ msgstr ""
 "  Empremta digital: %s\n"
 "  Estat de la signatura: %s"
 
 "  Empremta digital: %s\n"
 "  Estat de la signatura: %s"
 

-#: src/common/ssl_certificate.c:348
-msgid "Can't load X509 default paths"
+#: src/common/ssl_certificate.c:385
+msgid "Couldn't load X509 default paths"

 msgstr "No es poden carregar les rutes X509 per omissió"
 
 #: src/common/string_match.c:79
 msgid "(Subject cleared by RegExp)"
 msgstr "(Assumpte buit per Exp.reg.)"
 
 msgstr "No es poden carregar les rutes X509 per omissió"
 
 #: src/common/string_match.c:79
 msgid "(Subject cleared by RegExp)"
 msgstr "(Assumpte buit per Exp.reg.)"
 

-#: src/common/utils.c:342
+#: src/common/utils.c:348

 #, c-format
 msgid "%dB"
 msgstr "%d B"
 
 #, c-format
 msgid "%dB"
 msgstr "%d B"
 

-#: src/common/utils.c:344
+#: src/common/utils.c:349

 #, c-format
 #, c-format

-msgid "%.1fKB"
-msgstr "%.1fKB"
+msgid "%d.%02dKB"
+msgstr "%d.%02dKB"

 
 

-#: src/common/utils.c:346
-#, c-format
-msgid "%.2fMB"
-msgstr "%.2fMB"
+#: src/common/utils.c:350
+msgid "%d.%02dMB"
+msgstr "%d.%02dMB"

 
 

-#: src/common/utils.c:348
+#: src/common/utils.c:351

 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 

-#: src/compose.c:512
+#: src/common/utils.c:4799
+msgid "Complete day name for use by strftime|Sunday"
+msgstr "Diumenge"
+
+#: src/common/utils.c:4800
+msgid "Complete day name for use by strftime|Monday"
+msgstr "Dilluns"
+
+#: src/common/utils.c:4801
+msgid "Complete day name for use by strftime|Tuesday"
+msgstr "Dimarts"
+
+#: src/common/utils.c:4802
+msgid "Complete day name for use by strftime|Wednesday"
+msgstr "Dimecres"
+
+#: src/common/utils.c:4803
+msgid "Complete day name for use by strftime|Thursday"
+msgstr "Dijous"
+
+#: src/common/utils.c:4804
+msgid "Complete day name for use by strftime|Friday"
+msgstr "Divendres"
+
+#: src/common/utils.c:4805
+msgid "Complete day name for use by strftime|Saturday"
+msgstr "Dissabte"
+
+#: src/common/utils.c:4807
+msgid "Complete month name for use by strftime|January"
+msgstr "Gener"
+
+#: src/common/utils.c:4808
+msgid "Complete month name for use by strftime|February"
+msgstr "Febrer"
+
+#: src/common/utils.c:4809
+msgid "Complete month name for use by strftime|March"
+msgstr "Març"
+
+#: src/common/utils.c:4810
+msgid "Complete month name for use by strftime|April"
+msgstr "Abril"
+
+#: src/common/utils.c:4811
+msgid "Complete month name for use by strftime|May"
+msgstr "Maig"
+
+#: src/common/utils.c:4812
+msgid "Complete month name for use by strftime|June"
+msgstr "Juny"
+
+#: src/common/utils.c:4813
+msgid "Complete month name for use by strftime|July"
+msgstr "Juliol"
+
+#: src/common/utils.c:4814
+msgid "Complete month name for use by strftime|August"
+msgstr "Agost"
+
+#: src/common/utils.c:4815
+msgid "Complete month name for use by strftime|September"
+msgstr "Setembre"
+
+#: src/common/utils.c:4816
+msgid "Complete month name for use by strftime|October"
+msgstr "Octubre"
+
+#: src/common/utils.c:4817
+msgid "Complete month name for use by strftime|November"
+msgstr "Novembre"
+
+#: src/common/utils.c:4818
+msgid "Complete month name for use by strftime|December"
+msgstr "Desembre"
+
+#: src/common/utils.c:4820
+msgid "Abbr. day name for use by strftime|Sun"
+msgstr "Dm"
+
+#: src/common/utils.c:4821
+msgid "Abbr. day name for use by strftime|Mon"
+msgstr "Dl"
+
+#: src/common/utils.c:4822
+msgid "Abbr. day name for use by strftime|Tue"
+msgstr "Dm"
+
+#: src/common/utils.c:4823
+msgid "Abbr. day name for use by strftime|Wed"
+msgstr "Dx"
+
+#: src/common/utils.c:4824
+msgid "Abbr. day name for use by strftime|Thu"
+msgstr "Dj"
+
+#: src/common/utils.c:4825
+msgid "Abbr. day name for use by strftime|Fri"
+msgstr "Dv"
+
+#: src/common/utils.c:4826
+msgid "Abbr. day name for use by strftime|Sat"
+msgstr "Ds"
+
+#: src/common/utils.c:4828
+msgid "Abbr. month name for use by strftime|Jan"
+msgstr "Gen"
+
+#: src/common/utils.c:4829
+msgid "Abbr. month name for use by strftime|Feb"
+msgstr "Feb"
+
+#: src/common/utils.c:4830
+msgid "Abbr. month name for use by strftime|Mar"
+msgstr "Mar"
+
+#: src/common/utils.c:4831
+msgid "Abbr. month name for use by strftime|Apr"
+msgstr "Abr"
+
+#: src/common/utils.c:4832
+msgid "Abbr. month name for use by strftime|May"
+msgstr "Mai"
+
+#: src/common/utils.c:4833
+msgid "Abbr. month name for use by strftime|Jun"
+msgstr "Jun"
+
+#: src/common/utils.c:4834
+msgid "Abbr. month name for use by strftime|Jul"
+msgstr "Jul"
+
+#: src/common/utils.c:4835
+msgid "Abbr. month name for use by strftime|Aug"
+msgstr "Ago"
+
+#: src/common/utils.c:4836
+msgid "Abbr. month name for use by strftime|Sep"
+msgstr "Set"
+
+#: src/common/utils.c:4837
+msgid "Abbr. month name for use by strftime|Oct"
+msgstr "Oct"
+
+#: src/common/utils.c:4838
+msgid "Abbr. month name for use by strftime|Nov"
+msgstr "Nov"
+
+#: src/common/utils.c:4839
+msgid "Abbr. month name for use by strftime|Dec"
+msgstr "Des"
+
+#: src/common/utils.c:4841
+msgid "For use by strftime (morning)|AM"
+msgstr "AM"
+
+#: src/common/utils.c:4842
+msgid "For use by strftime (afternoon)|PM"
+msgstr "PM"
+
+#: src/common/utils.c:4843
+msgid "For use by strftime (morning, lowercase)|am"
+msgstr "am"
+
+#: src/common/utils.c:4844
+msgid "For use by strftime (afternoon, lowercase)|pm"
+msgstr "pm"
+
+#: src/common/utils.c:4846
+msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
+msgstr "%a %d %b %Y %H:%M:%S"
+
+#: src/common/utils.c:4847
+msgid "For use by strftime (default date format)|%m/%d/%y"
+msgstr "%d/%m/%y"
+
+#: src/common/utils.c:4848
+msgid "For use by strftime (default time format)|%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#: src/common/utils.c:4850
+msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#: src/compose.c:522

 msgid "/_Add..."
 msgstr "/_Afegir..."
 
 msgid "/_Add..."
 msgstr "/_Afegir..."
 

-#: src/compose.c:513
+#: src/compose.c:523

 msgid "/_Remove"
 msgstr "/_Treure"
 
 msgid "/_Remove"
 msgstr "/_Treure"
 

-#: src/compose.c:515 src/folderview.c:288
+#: src/compose.c:525 src/folderview.c:294

 msgid "/_Properties..."
 msgstr "/_Propietats..."
 
 msgid "/_Properties..."
 msgstr "/_Propietats..."
 

-#: src/compose.c:520 src/mainwindow.c:705 src/messageview.c:278
+#: src/compose.c:530 src/mainwindow.c:740 src/messageview.c:285

 msgid "/_Message"
 msgstr "/_Missatge"
 
 msgid "/_Message"
 msgstr "/_Missatge"
 

-#: src/compose.c:521
+#: src/compose.c:531

 msgid "/_Message/_Send"
 msgstr "/_Missatge/_Enviar"
 
 msgid "/_Message/_Send"
 msgstr "/_Missatge/_Enviar"
 

-#: src/compose.c:523
+#: src/compose.c:533

 msgid "/_Message/Send _later"
 msgstr "/_Missatge/Enviar _després"
 
 msgid "/_Message/Send _later"
 msgstr "/_Missatge/Enviar _després"
 

-#: src/compose.c:525 src/compose.c:529 src/compose.c:532 src/mainwindow.c:715
-#: src/mainwindow.c:725 src/mainwindow.c:738 src/mainwindow.c:744
-#: src/mainwindow.c:756 src/messageview.c:281 src/messageview.c:289
+#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:750
+#: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
+#: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296

 msgid "/_Message/---"
 msgstr "/_Missatge/---"
 
 msgid "/_Message/---"
 msgstr "/_Missatge/---"
 

-#: src/compose.c:526
+#: src/compose.c:536

 msgid "/_Message/_Attach file"
 msgstr "/_Missatge/_Adjuntar arxiu"
 
 msgid "/_Message/_Attach file"
 msgstr "/_Missatge/_Adjuntar arxiu"
 

-#: src/compose.c:527
+#: src/compose.c:537

 msgid "/_Message/_Insert file"
 msgstr "/_Missatge/_Insertar arxiu"
 
 msgid "/_Message/_Insert file"
 msgstr "/_Missatge/_Insertar arxiu"
 

-#: src/compose.c:528
+#: src/compose.c:538

 msgid "/_Message/Insert si_gnature"
 msgstr "/_Missatge/Insertar _signatura"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/_Missatge/Insertar _signatura"
 

-#: src/compose.c:530
+#: src/compose.c:540

 msgid "/_Message/_Save"
 msgstr "/_Missatge/_Guardar"
 
 msgid "/_Message/_Save"
 msgstr "/_Missatge/_Guardar"
 

-#: src/compose.c:533
+#: src/compose.c:543

 msgid "/_Message/_Close"
 msgstr "/_Missatge/_Tancar"
 
 msgid "/_Message/_Close"
 msgstr "/_Missatge/_Tancar"
 

-#: src/compose.c:536
+#: src/compose.c:546

 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfer"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfer"
 

-#: src/compose.c:537
+#: src/compose.c:547

 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refer"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refer"
 

-#: src/compose.c:538 src/compose.c:626 src/compose.c:629 src/compose.c:635
-#: src/mainwindow.c:496 src/messageview.c:164
+#: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645
+#: src/mainwindow.c:522 src/messageview.c:167

 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 

-#: src/compose.c:539
+#: src/compose.c:549

 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Tallar"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Tallar"
 

-#: src/compose.c:540 src/mainwindow.c:493 src/messageview.c:162
+#: src/compose.c:550 src/mainwindow.c:519 src/messageview.c:165

 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 

-#: src/compose.c:541
+#: src/compose.c:551

 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Enganxar"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Enganxar"
 

-#: src/compose.c:542
+#: src/compose.c:552

 msgid "/_Edit/Special paste"
 msgstr "/_Editar/Enganxat especial"
 
 msgid "/_Edit/Special paste"
 msgstr "/_Editar/Enganxat especial"
 

-#: src/compose.c:543
+#: src/compose.c:553

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Editar/Enganxat especial/com a _marcat"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Editar/Enganxat especial/com a _marcat"
 

-#: src/compose.c:545
+#: src/compose.c:555

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Editar/Enganxat especial/_envolcallar"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Editar/Enganxat especial/_envolcallar"
 

-#: src/compose.c:547
+#: src/compose.c:557

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Editar/Enganxat especial/_desenvolcallar"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Editar/Enganxat especial/_desenvolcallar"
 

-#: src/compose.c:549 src/mainwindow.c:494 src/messageview.c:163
+#: src/compose.c:559 src/mainwindow.c:520 src/messageview.c:166

 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar tot"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar tot"
 

-#: src/compose.c:550
+#: src/compose.c:560

 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avança_des"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avança_des"
 

-#: src/compose.c:551
+#: src/compose.c:561

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avança_des/Anar al caràcter anterior"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avança_des/Anar al caràcter anterior"
 

-#: src/compose.c:556
+#: src/compose.c:566

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avança_des/Anar al caràcter següent"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avança_des/Anar al caràcter següent"
 

-#: src/compose.c:561
+#: src/compose.c:571

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avança_des/Anar a la paraula anterior"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avança_des/Anar a la paraula anterior"
 

-#: src/compose.c:566
+#: src/compose.c:576

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avança_des/Anar a la paraula següent"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avança_des/Anar a la paraula següent"
 

-#: src/compose.c:571
+#: src/compose.c:581

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avança_des/Anar a l'inici de la línia"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avança_des/Anar a l'inici de la línia"
 

-#: src/compose.c:576
+#: src/compose.c:586

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avança_des/Anar al final de la línia"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avança_des/Anar al final de la línia"
 

-#: src/compose.c:581
+#: src/compose.c:591

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avança_des/Anar a la línia anterior"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avança_des/Anar a la línia anterior"
 

-#: src/compose.c:586
+#: src/compose.c:596

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avança_des/Anar a la línia següent"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avança_des/Anar a la línia següent"
 

-#: src/compose.c:591
+#: src/compose.c:601

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avança_des/Esborrar el caràcter anterior"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avança_des/Esborrar el caràcter anterior"
 

-#: src/compose.c:596
+#: src/compose.c:606

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avança_des/Esborrar el caràcter següent"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avança_des/Esborrar el caràcter següent"
 

-#: src/compose.c:601
+#: src/compose.c:611

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avança_des/Esborrar la paraula anterior"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avança_des/Esborrar la paraula anterior"
 

-#: src/compose.c:606
+#: src/compose.c:616

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avança_des/Esborrar la paraula següent"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avança_des/Esborrar la paraula següent"
 

-#: src/compose.c:611
+#: src/compose.c:621

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avança_des/Esborrar línia"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avança_des/Esborrar línia"
 

-#: src/compose.c:616
+#: src/compose.c:626

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/Avança_des/Esborrar línia completa"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/Avança_des/Esborrar línia completa"
 

-#: src/compose.c:621
+#: src/compose.c:631

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avança_des/Esborrar fins al final de la línia"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avança_des/Esborrar fins al final de la línia"
 

-#: src/compose.c:627
+#: src/compose.c:637

 msgid "/_Edit/_Find"
 msgstr "/_Editar/_Trobar"
 
 msgid "/_Edit/_Find"
 msgstr "/_Editar/_Trobar"
 

-#: src/compose.c:630
+#: src/compose.c:640

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Retallar paragraf actual"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Retallar paragraf actual"
 

-#: src/compose.c:632
+#: src/compose.c:642

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Tallar totes les linies llargues"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Tallar totes les linies llargues"
 

-#: src/compose.c:634
+#: src/compose.c:644

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-retall"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-retall"
 

-#: src/compose.c:636
+#: src/compose.c:646

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar amb editor e_xtern"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar amb editor e_xtern"
 

-#: src/compose.c:639
+#: src/compose.c:649

 msgid "/_Spelling"
 msgstr "/_Ortografia"
 
 msgid "/_Spelling"
 msgstr "/_Ortografia"
 

-#: src/compose.c:640
+#: src/compose.c:650

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Ortografia/_Comprovar tot o la selecció"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Ortografia/_Comprovar tot o la selecció"
 

-#: src/compose.c:642
+#: src/compose.c:652

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Ortografia/_Ressaltar totes les faltes ortogràfiques"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Ortografia/_Ressaltar totes les faltes ortogràfiques"
 

-#: src/compose.c:644
+#: src/compose.c:654

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Ortografia/Comprovar faltes cap _enrera"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Ortografia/Comprovar faltes cap _enrera"
 

-#: src/compose.c:646
+#: src/compose.c:656

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Ortografia/Avançar fins a la següent _falta"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Ortografia/Avançar fins a la següent _falta"
 

-#: src/compose.c:648
+#: src/compose.c:658

 msgid "/_Spelling/---"
 msgstr "/_Ortografia/---"
 
 msgid "/_Spelling/---"
 msgstr "/_Ortografia/---"
 

-#: src/compose.c:649
+#: src/compose.c:659

 msgid "/_Spelling/Options"
 msgstr "/_Ortografia/Opcions"
 
 msgid "/_Spelling/Options"
 msgstr "/_Ortografia/Opcions"
 

-#: src/compose.c:652
+#: src/compose.c:662

 msgid "/_Options"
 msgstr "/_Opcions"
 
 msgid "/_Options"
 msgstr "/_Opcions"
 

-#: src/compose.c:653
-msgid "/_Options/Privacy System"
-msgstr "/_Opcions/Privacitat"
+#: src/compose.c:663
+msgid "/_Options/Reply _mode"
+msgstr "/_Opcions/_Contestar"

 
 

-#: src/compose.c:654
-msgid "/_Options/Privacy System/None"
-msgstr "/_Opcions/Privacitat/Cap"
+#: src/compose.c:664
+msgid "/_Options/Reply _mode/_Normal"
+msgstr "/_Opcions/_Contestar/_Normal"
+
+#: src/compose.c:665
+msgid "/_Options/Reply _mode/_All"
+msgstr "/_Opcions/_Contestar/_A tots"
+
+#: src/compose.c:666
+msgid "/_Options/Reply _mode/_Sender"
+msgstr "/_Opcions/_Contestar/Al _remitent"
+
+#: src/compose.c:667
+msgid "/_Options/Reply _mode/_Mailing-list"
+msgstr "/_Opcions/_Constestar/_Llista de correu"
+
+#: src/compose.c:668 src/compose.c:673 src/compose.c:680 src/compose.c:682
+#: src/compose.c:684
+msgid "/_Options/---"
+msgstr "/_Opcions/---"

 
 

-#: src/compose.c:655
+#: src/compose.c:669
+msgid "/_Options/Privacy _System"
+msgstr "/_Opcions/_Sistema de privacitat"
+
+#: src/compose.c:670
+msgid "/_Options/Privacy _System/None"
+msgstr "/_Opcions/_Sistema de privacitat/Cap"
+
+#: src/compose.c:671

 msgid "/_Options/Si_gn"
 msgstr "/_Opcions/Si_gnar"
 
 msgid "/_Options/Si_gn"
 msgstr "/_Opcions/Si_gnar"
 

-#: src/compose.c:656
+#: src/compose.c:672

 msgid "/_Options/_Encrypt"
 msgstr "/_Opcions/_Encriptar"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Opcions/_Encriptar"
 

-#: src/compose.c:657 src/compose.c:664 src/compose.c:666 src/compose.c:668
-msgid "/_Options/---"
-msgstr "/_Opcions/---"
-
-#: src/compose.c:658
+#: src/compose.c:674

 msgid "/_Options/_Priority"
 msgstr "/_Opcions/_Prioritat"
 
 msgid "/_Options/_Priority"
 msgstr "/_Opcions/_Prioritat"
 

-#: src/compose.c:659
+#: src/compose.c:675

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opcions/Prioritat/Màxima"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opcions/Prioritat/Màxima"
 

-#: src/compose.c:660
+#: src/compose.c:676

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opcions/Prioritat/_Alta"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opcions/Prioritat/_Alta"
 

-#: src/compose.c:661
+#: src/compose.c:677

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opcions/Prioritat/_Normal"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opcions/Prioritat/_Normal"
 

-#: src/compose.c:662
+#: src/compose.c:678

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opcions/Prioritat/_Baixa"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opcions/Prioritat/_Baixa"
 

-#: src/compose.c:663
+#: src/compose.c:679

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opcions/Prioritat/_Mínima"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opcions/Prioritat/_Mínima"
 

-#: src/compose.c:665
+#: src/compose.c:681

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opcions/Sollicitar justificant de _recepció"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opcions/Sollicitar justificant de _recepció"
 

-#: src/compose.c:667
+#: src/compose.c:683

 msgid "/_Options/Remo_ve references"
 msgstr "/_Opcions/Elimi_nar referències"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/_Opcions/Elimi_nar referències"
 

-#: src/compose.c:674
+#: src/compose.c:690

 msgid "/_Options/Character _encoding"
 msgstr "/_Opcions/Codificació d_e caràcters"
 
 msgid "/_Options/Character _encoding"
 msgstr "/_Opcions/Codificació d_e caràcters"
 

-#: src/compose.c:675
+#: src/compose.c:691

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opcions/Codificació d_e caràcters/_Automàtic"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opcions/Codificació d_e caràcters/_Automàtic"
 

-#: src/compose.c:677 src/compose.c:683 src/compose.c:691 src/compose.c:695
-#: src/compose.c:701 src/compose.c:705 src/compose.c:711 src/compose.c:717
-#: src/compose.c:721 src/compose.c:731 src/compose.c:735 src/compose.c:745
-#: src/compose.c:749
+#: src/compose.c:693 src/compose.c:699 src/compose.c:707 src/compose.c:711
+#: src/compose.c:717 src/compose.c:721 src/compose.c:727 src/compose.c:733
+#: src/compose.c:737 src/compose.c:747 src/compose.c:751 src/compose.c:761
+#: src/compose.c:765

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opcions/Codificació d_e caràcters/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opcions/Codificació d_e caràcters/---"
 

-#: src/compose.c:679
+#: src/compose.c:695

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opcions/Codificació d_e caràcters/ASCII de 7 bits (US-ASC_II)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opcions/Codificació d_e caràcters/ASCII de 7 bits (US-ASC_II)"
 

-#: src/compose.c:681
+#: src/compose.c:697

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opcions/Codificació d_e caràcters/Unicode (_UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opcions/Codificació d_e caràcters/Unicode (_UTF-8)"
 

-#: src/compose.c:685
+#: src/compose.c:701

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opcions/Codificació d_e caràcters/Europeu Occidental (ISO-8859-_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opcions/Codificació d_e caràcters/Europeu Occidental (ISO-8859-_1)"
 

-#: src/compose.c:687
+#: src/compose.c:703

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opcions/Codificació d_e caràcters/Europeu Occidental (ISO-8859-_15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opcions/Codificació d_e caràcters/Europeu Occidental (ISO-8859-_15)"
 

-#: src/compose.c:689
+#: src/compose.c:705

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Opcions/Codificació d_e caràcters/Europeu Occidental (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Opcions/Codificació d_e caràcters/Europeu Occidental (Windows-1252)"
 

-#: src/compose.c:693
+#: src/compose.c:709

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opcions/Codificació d_e caràcters/Centreeuropeu (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opcions/Codificació d_e caràcters/Centreeuropeu (ISO-8859-_2)"
 

-#: src/compose.c:697
+#: src/compose.c:713

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opcions/Codificació d_e caràcters/Bàltic (ISO-8859-13)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opcions/Codificació d_e caràcters/Bàltic (ISO-8859-13)"
 

-#: src/compose.c:699
+#: src/compose.c:715

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opcions/Codificació d_e caràcters/Bàltic (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opcions/Codificació d_e caràcters/Bàltic (ISO-8859-_4)"
 

-#: src/compose.c:703
+#: src/compose.c:719

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opcions/Codificació d_e caràcters/Grec (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opcions/Codificació d_e caràcters/Grec (ISO-8859-_7)"
 

-#: src/compose.c:707
+#: src/compose.c:723

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opcions/Codificació d_e caràcters/Hebreu (ISO-8859-_8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opcions/Codificació d_e caràcters/Hebreu (ISO-8859-_8)"
 

-#: src/compose.c:709
+#: src/compose.c:725

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opcions/Codificació d_e caràcters/Hebreu (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opcions/Codificació d_e caràcters/Hebreu (Windows-1255)"
 

-#: src/compose.c:713
+#: src/compose.c:729

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opcions/Codificació d_e caràcters/Aràbic (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opcions/Codificació d_e caràcters/Aràbic (ISO-8859-_6)"
 

-#: src/compose.c:715
+#: src/compose.c:731

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opcions/Codificació d_e caràcters/Aràbic (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opcions/Codificació d_e caràcters/Aràbic (Windows-1256)"
 

-#: src/compose.c:719
+#: src/compose.c:735

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opcions/Codificació d_e caràcters/Turc (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opcions/Codificació d_e caràcters/Turc (ISO-8859-_9)"
 

-#: src/compose.c:723
+#: src/compose.c:739

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opcions/Codificació d_e caràcters/Ciríl·lic (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opcions/Codificació d_e caràcters/Ciríl·lic (ISO-8859-_5)"
 

-#: src/compose.c:725
+#: src/compose.c:741

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opcions/Codificació d_e caràcters/Ciríl·lic (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opcions/Codificació d_e caràcters/Ciríl·lic (KOI8-_R)"
 

-#: src/compose.c:727
+#: src/compose.c:743

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opcions/Codificació d_e caràcters/Ciríl·lic (KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opcions/Codificació d_e caràcters/Ciríl·lic (KOI8-U)"
 

-#: src/compose.c:729
+#: src/compose.c:745

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opcions/Codificació d_e caràcters/Ciríl·lic (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opcions/Codificació d_e caràcters/Ciríl·lic (Windows-1251)"
 

-#: src/compose.c:733
+#: src/compose.c:749

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opcions/Codificació d_e caràcters/Japonès (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opcions/Codificació d_e caràcters/Japonès (ISO-2022-_JP)"
 

-#: src/compose.c:737
+#: src/compose.c:753

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opcions/Codificació d_e caràcters/Chinès simplificat (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opcions/Codificació d_e caràcters/Chinès simplificat (_GB2312)"
 

-#: src/compose.c:739
+#: src/compose.c:755

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opcions/Codificació d_e caràcters/Chinè simplificat (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opcions/Codificació d_e caràcters/Chinè simplificat (_GB2312)"
 

-#: src/compose.c:741
+#: src/compose.c:757

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opcions/Codificació d_e caràcters/Chinès tradicional (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opcions/Codificació d_e caràcters/Chinès tradicional (_Big5)"
 

-#: src/compose.c:743
+#: src/compose.c:759

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opcions/Codificació d_e caràcters/Chinès tradicional (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opcions/Codificació d_e caràcters/Chinès tradicional (EUC-_TW)"
 

-#: src/compose.c:747
+#: src/compose.c:763

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opcions/Codificació d_e caràcters/Coreà (EUC-_KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opcions/Codificació d_e caràcters/Coreà (EUC-_KR)"
 

-#: src/compose.c:751
+#: src/compose.c:767

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opcions/Codificació d_e caràcters/Tailandès (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opcions/Codificació d_e caràcters/Tailandès (TIS-620)"
 

-#: src/compose.c:753
+#: src/compose.c:769

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opcions/Codificació d_e caràcters/Tailandès (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opcions/Codificació d_e caràcters/Tailandès (Windows-874)"
 

-#: src/compose.c:757
+#: src/compose.c:773

 msgid "/_Tools/Show _ruler"
 msgstr "/E_ines/Mostrar gestor de _regles"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/E_ines/Mostrar gestor de _regles"
 

-#: src/compose.c:758 src/messageview.c:296
+#: src/compose.c:774 src/messageview.c:303

 msgid "/_Tools/_Address book"
 msgstr "/E_ines/_Agenda d'adreces"
 
 msgid "/_Tools/_Address book"
 msgstr "/E_ines/_Agenda d'adreces"
 

-#: src/compose.c:759
+#: src/compose.c:775

 msgid "/_Tools/_Template"
 msgstr "/E_ines/_Plantilles"
 
 msgid "/_Tools/_Template"
 msgstr "/E_ines/_Plantilles"
 

-#: src/compose.c:760 src/mainwindow.c:792 src/messageview.c:321
+#: src/compose.c:776 src/mainwindow.c:832 src/messageview.c:328

 msgid "/_Tools/Actio_ns"
 msgstr "/E_ines/Accio_ns"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/E_ines/Accio_ns"
 

-#: src/compose.c:1554
+#: src/compose.c:1039 src/prefs_compose_writing.c:384
+msgid "New message subject format error."
+msgstr "Error de format a l'assumpte' del nou missatge."
+
+#: src/compose.c:1068 src/prefs_compose_writing.c:388
+msgid "New message body format error."
+msgstr "Error de format al cos del nou missatge."
+
+#: src/compose.c:1438 src/prefs_quote.c:281
+msgid "Message reply format error."
+msgstr "Error de format al respondre el missatge."
+
+#: src/compose.c:1555 src/prefs_quote.c:286
+msgid "Message forward format error."
+msgstr "Error de format al re-enviar el missatge."
+
+#: src/compose.c:1675

 msgid "Fw: multiple emails"
 msgstr "Fw: multiples emails"
 
 msgid "Fw: multiple emails"
 msgstr "Fw: multiples emails"
 

-#: src/compose.c:1949
+#: src/compose.c:2050
+msgid "Message redirect format error."
+msgstr "Error de format al redireccionar el missatge."
+
+#: src/compose.c:2119

 msgid "Reply-To:"
 msgstr "Respondre a:"
 
 msgid "Reply-To:"
 msgstr "Respondre a:"
 

-#: src/compose.c:1952 src/compose.c:5378 src/compose.c:6128
+#: src/compose.c:2122 src/compose.c:5664 src/compose.c:6434 src/compose.c:9472

 msgid "Newsgroups:"
 msgstr "Grups de notícies:"
 
 msgid "Newsgroups:"
 msgstr "Grups de notícies:"
 

-#: src/compose.c:1955
+#: src/compose.c:2125

 msgid "Followup-To:"
 msgstr "Enviar a:"
 
 msgid "Followup-To:"
 msgstr "Enviar a:"
 

-#: src/compose.c:2352
+#: src/compose.c:2304
+msgid "The file '%s' has been attached."
+msgstr "L'arxiu '%s' ha estat adjuntat."
+
+#: src/compose.c:2308
+msgid "Couldn't attach a file (charset conversion failed)."
+msgstr "No s'ha pogut adjuntar l'arxiu (conversió de joc de caràcters fallida)."
+
+#: src/compose.c:2539

 msgid "Quote mark format error."
 msgstr "Marca de cita per error."
 
 msgid "Quote mark format error."
 msgstr "Marca de cita per error."
 

-#: src/compose.c:2368
-msgid "Message reply/forward format error."
-msgstr "Respondre/reenviar per error."
-
-#: src/compose.c:2925
+#: src/compose.c:3133

 #, c-format
 msgid "File %s is empty."
 msgstr "L'arxiu %s es buit."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "L'arxiu %s es buit."
 

-#: src/compose.c:2929
+#: src/compose.c:3137

 #, c-format
 msgid "Can't read %s."
 msgstr "No es pot llegir %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "No es pot llegir %s."
 

-#: src/compose.c:2956
+#: src/compose.c:3164

 #, c-format
 msgid "Message: %s"
 msgstr "Missatge: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Missatge: %s"
 

-#: src/compose.c:3768
+#: src/compose.c:3983

 msgid " [Edited]"
 msgstr " [Editat]"
 
 msgid " [Edited]"
 msgstr " [Editat]"
 

-#: src/compose.c:3774
+#: src/compose.c:3989

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composar missatge%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composar missatge%s"
 

-#: src/compose.c:3777
+#: src/compose.c:3992

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sense assumpte] - Composar missatge%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sense assumpte] - Composar missatge%s"
 

-#: src/compose.c:3802 src/messageview.c:596
+#: src/compose.c:4017 src/messageview.c:613

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1386,34 +1721,34 @@ msgstr ""
 "No heu especificar cap compte per a enviar.\n"
 "Seleccioneu algun compte abans d'enviar."
 
 "No heu especificar cap compte per a enviar.\n"
 "Seleccioneu algun compte abans d'enviar."
 

-#: src/compose.c:3979 src/compose.c:4010 src/compose.c:4041 src/toolbar.c:391
-#: src/toolbar.c:441
+#: src/compose.c:4195 src/compose.c:4226 src/compose.c:4258 src/toolbar.c:401
+#: src/toolbar.c:452

 msgid "Send"
 msgstr "Enviar"
 
 msgid "Send"
 msgstr "Enviar"
 

-#: src/compose.c:3980
+#: src/compose.c:4196

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "L'unic destinatari és l'adreça CC per defecte. Enviar de totes maneres?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 "L'unic destinatari és l'adreça CC per defecte. Enviar de totes maneres?"
 

-#: src/compose.c:3981 src/compose.c:4012 src/compose.c:4043 src/compose.c:4464
+#: src/compose.c:4197 src/compose.c:4228 src/compose.c:4260 src/compose.c:4734

 msgid "+_Send"
 msgstr "+_Enviar"
 
 msgid "+_Send"
 msgstr "+_Enviar"
 

-#: src/compose.c:4011
+#: src/compose.c:4227

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "L'unic destinatari és l'adreça BCC per defecte. Enviar de totes maneres?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 "L'unic destinatari és l'adreça BCC per defecte. Enviar de totes maneres?"
 

-#: src/compose.c:4028
+#: src/compose.c:4244

 msgid "Recipient is not specified."
 msgstr "No heu especificat el destinatari."
 
 msgid "Recipient is not specified."
 msgstr "No heu especificat el destinatari."
 

-#: src/compose.c:4042
+#: src/compose.c:4259

 msgid "Subject is empty. Send it anyway?"
 msgstr "L'assumpte es buit. Enviar de totes maneres?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "L'assumpte es buit. Enviar de totes maneres?"
 

-#: src/compose.c:4081 src/compose.c:7549
+#: src/compose.c:4305 src/compose.c:7935

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1423,7 +1758,18 @@ msgstr ""
 "\n"
 "Conversió de joc de caràcters fallida."
 
 "\n"
 "Conversió de joc de caràcters fallida."
 

-#: src/compose.c:4085 src/compose.c:7546
+#: src/compose.c:4308 src/compose.c:7938
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"Couldn't get recipient encryption key."
+msgstr ""
+"No s'ha pogut encuar el missatge per enviar:\n"
+"\n"
+"No s'ha pogut obtenir la clau d'encriptament per al recipient."
+
+#: src/compose.c:4312 src/compose.c:7932
+#, c-format

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1433,7 +1779,7 @@ msgstr ""
 "\n"
 "Signatura fallida: %s"
 
 "\n"
 "Signatura fallida: %s"
 

-#: src/compose.c:4088
+#: src/compose.c:4315

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1444,11 +1790,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4090
+#: src/compose.c:4317

 msgid "Could not queue message for sending."
 msgstr "No s'ha pogut encuar el missatge per enviar."
 
 msgid "Could not queue message for sending."
 msgstr "No s'ha pogut encuar el missatge per enviar."
 

-#: src/compose.c:4104 src/compose.c:4144
+#: src/compose.c:4332 src/compose.c:4391

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1456,7 +1802,8 @@ msgstr ""
 "El missatge està en cua però no s'ha pogut enviar.\n"
 "Useu \"Enviar missatge(s) en cua\" en la finestra principal per enviar-lo"
 
 "El missatge està en cua però no s'ha pogut enviar.\n"
 "Useu \"Enviar missatge(s) en cua\" en la finestra principal per enviar-lo"
 

-#: src/compose.c:4138
+#: src/compose.c:4385
+#, c-format

 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1464,7 +1811,7 @@ msgstr ""
 "%s\n"
 "Useu \"Enviar missatge(s) en cua\" en la finestra principal per reenviar-lo"
 
 "%s\n"
 "Useu \"Enviar missatge(s) en cua\" en la finestra principal per reenviar-lo"
 

-#: src/compose.c:4461
+#: src/compose.c:4731

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1475,7 +1822,7 @@ msgstr ""
 "al joc de caràcters %s especificat.\n"
 "Enviar-lo com a %s?"
 
 "al joc de caràcters %s especificat.\n"
 "Enviar-lo com a %s?"
 

-#: src/compose.c:4514
+#: src/compose.c:4790

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1488,60 +1835,60 @@ msgstr ""
 "\n"
 "Vols enviar-lo de totes maneres?"
 
 "\n"
 "Vols enviar-lo de totes maneres?"
 

-#: src/compose.c:4699
+#: src/compose.c:4978

 msgid "No account for sending mails available!"
 msgstr "No hi ha cap compte disponible per enviar correus!"
 
 msgid "No account for sending mails available!"
 msgstr "No hi ha cap compte disponible per enviar correus!"
 

-#: src/compose.c:4709
+#: src/compose.c:4988

 msgid "No account for posting news available!"
 msgstr "No hi ha cap compte disponible per enviar noticies!"
 
 msgid "No account for posting news available!"
 msgstr "No hi ha cap compte disponible per enviar noticies!"
 

-#: src/compose.c:5395
+#: src/compose.c:5681

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Useu <tab> per autocompletar desde el llibre d'adresses"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Useu <tab> per autocompletar desde el llibre d'adresses"
 

-#: src/compose.c:5507
+#: src/compose.c:5809

 msgid "Mime type"
 msgstr "Tipus MIME"
 
 msgid "Mime type"
 msgstr "Tipus MIME"
 

-#: src/compose.c:5513 src/compose.c:5809 src/mimeview.c:202
-#: src/plugins/pgpcore/select-keys.c:336 src/prefs_summary_column.c:86
+#: src/compose.c:5815 src/compose.c:6111 src/mimeview.c:212
+#: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86

 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Tamany"
 
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Tamany"
 

-#: src/compose.c:5574
+#: src/compose.c:5876

 msgid "Save Message to "
 msgstr "Guardar missatge a "
 
 msgid "Save Message to "
 msgstr "Guardar missatge a "
 

-#: src/compose.c:5596 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:5898 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242

-#: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:147
-#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
+#: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Veure"
 
 msgid "_Browse"
 msgstr "_Veure"
 

-#: src/compose.c:5808 src/compose.c:6959
+#: src/compose.c:6110 src/compose.c:7342

 msgid "MIME type"
 msgstr "Tipus MIME"
 
 msgid "MIME type"
 msgstr "Tipus MIME"
 

-#: src/compose.c:5880
+#: src/compose.c:6182

 msgid "Hea_der"
 msgstr "Ca_pçalera"
 
 msgid "Hea_der"
 msgstr "Ca_pçalera"
 

-#: src/compose.c:5884
+#: src/compose.c:6186

 msgid "_Attachments"
 msgstr "_Adjunts"
 
 msgid "_Attachments"
 msgstr "_Adjunts"
 

-#: src/compose.c:5888
+#: src/compose.c:6190

 msgid "Othe_rs"
 msgstr "Alt_res"
 
 msgid "Othe_rs"
 msgstr "Alt_res"
 

-#: src/compose.c:5903 src/prefs_template.c:213 src/summary_search.c:271
+#: src/compose.c:6205 src/summary_search.c:366

 msgid "Subject:"
 msgstr "Assumpte:"
 
 msgid "Subject:"
 msgstr "Assumpte:"
 

-#: src/compose.c:6091
+#: src/compose.c:6396

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1550,20 +1897,20 @@ msgstr ""
 "No s'ha pogut iniciar el corrector ortogràfic.\n"
 "%s"
 
 "No s'ha pogut iniciar el corrector ortogràfic.\n"
 "%s"
 

-#: src/compose.c:6202
+#: src/compose.c:6508

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Desde: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Desde: <i>%s</i>"
 

-#: src/compose.c:6233
+#: src/compose.c:6539

 msgid "Account to use for this email"
 msgstr "Compte a usar per aquest correu electrònic"
 
 msgid "Account to use for this email"
 msgstr "Compte a usar per aquest correu electrònic"
 

-#: src/compose.c:6235
+#: src/compose.c:6541

 msgid "Sender address to be used"
 msgstr "Adreça del remitent a usar"
 
 msgid "Sender address to be used"
 msgstr "Adreça del remitent a usar"
 

-#: src/compose.c:6359
+#: src/compose.c:6702

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "


@@ -1572,47 +1919,51 @@ msgstr ""
 "El sistema de privacitat '%s' no s'ha pogut carregar. No podreu signar o "
 "encriptar aquest missatge."
 
 "El sistema de privacitat '%s' no s'ha pogut carregar. No podreu signar o "
 "encriptar aquest missatge."
 

-#: src/compose.c:6598
-msgid "Message To format error."
-msgstr "Error de format a 'Per a'."
+#: src/compose.c:6864 src/prefs_template.c:549
+msgid "Template body format error."
+msgstr "Error de format en el cos de la plantilla."

 
 

-#: src/compose.c:6611
-msgid "Message Cc format error."
-msgstr "Error de format a 'Copia a'."
+#: src/compose.c:6972 src/prefs_template.c:587
+msgid "Template To format error."
+msgstr "Error de format en el Per a de la plantilla."

 
 

-#: src/compose.c:6624
-msgid "Message Bcc format error."
-msgstr "Error de format a 'Copia oculta a'."
+#: src/compose.c:6985 src/prefs_template.c:592
+msgid "Template Cc format error."
+msgstr "Error de format en el Cc de la plantilla."

 
 

-#: src/compose.c:6638
-msgid "Message subject format error."
-msgstr "Error de format a 'Assumpte'."
+#: src/compose.c:6998 src/prefs_template.c:597
+msgid "Template Bcc format error."
+msgstr "Error de format en el Bcc de la plantilla."

 
 

-#: src/compose.c:6853
+#: src/compose.c:7012 src/prefs_template.c:602
+msgid "Template subject format error."
+msgstr "Error de format en l'assumpte de la plantilla."
+
+#: src/compose.c:7236

 msgid "Invalid MIME type."
 msgstr "Tipus MIME invàlid."
 
 msgid "Invalid MIME type."
 msgstr "Tipus MIME invàlid."
 

-#: src/compose.c:6868
+#: src/compose.c:7251

 msgid "File doesn't exist or is empty."
 msgstr "L'arxiu no existeix o és buit."
 
 msgid "File doesn't exist or is empty."
 msgstr "L'arxiu no existeix o és buit."
 

-#: src/compose.c:6941
+#: src/compose.c:7324

 msgid "Properties"
 msgstr "Propietats"
 
 msgid "Properties"
 msgstr "Propietats"
 

-#: src/compose.c:6992
+#: src/compose.c:7375

 msgid "Encoding"
 msgstr "Codificació"
 
 msgid "Encoding"
 msgstr "Codificació"
 

-#: src/compose.c:7012
+#: src/compose.c:7395

 msgid "Path"
 msgstr "Ruta"
 
 msgid "Path"
 msgstr "Ruta"
 

-#: src/compose.c:7013 src/prefs_toolbar.c:1060
+#: src/compose.c:7396 src/prefs_toolbar.c:1060

 msgid "File name"
 msgstr "Nom d'arxiu"
 
 msgid "File name"
 msgstr "Nom d'arxiu"
 

-#: src/compose.c:7196
+#: src/compose.c:7579

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1623,19 +1974,19 @@ msgstr ""
 "Voleu acabar el procés?\n"
 "Id. de procés: %d"
 
 "Voleu acabar el procés?\n"
 "Id. de procés: %d"
 

-#: src/compose.c:7238
+#: src/compose.c:7621

 msgid "Compose: input from monitoring process\n"
 msgstr "Composar: entrada del procés de monitoritzat\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Composar: entrada del procés de monitoritzat\n"
 

-#: src/compose.c:7519 src/messageview.c:701
-msgid "Sylpheed-Claws needs network access in order to send this email."
-msgstr "Sylpheed-Claws necessita accés a la xarxa per enviar aquest correu."
+#: src/compose.c:7902 src/messageview.c:718
+msgid "Claws Mail needs network access in order to send this email."
+msgstr "Claws Mails necessita accés a la xarxa per enviar aquest correu."

 
 

-#: src/compose.c:7541
+#: src/compose.c:7927

 msgid "Could not queue message."
 msgstr "No s'ha pogut encuar el missatge."
 
 msgid "Could not queue message."
 msgstr "No s'ha pogut encuar el missatge."
 

-#: src/compose.c:7543
+#: src/compose.c:7929

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1646,20 +1997,20 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:7659
+#: src/compose.c:8049

 msgid "Could not save draft."
 msgstr "No s'ha pogut gravar el borrador."
 
 msgid "Could not save draft."
 msgstr "No s'ha pogut gravar el borrador."
 

-#: src/compose.c:7734 src/compose.c:7757
+#: src/compose.c:8124 src/compose.c:8147

 msgid "Select file"
 msgstr "Seleccionar arxiu"
 
 msgid "Select file"
 msgstr "Seleccionar arxiu"
 

-#: src/compose.c:7770
+#: src/compose.c:8160

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No s'ha pogut llegir l'arxiu '%s'."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No s'ha pogut llegir l'arxiu '%s'."
 

-#: src/compose.c:7772
+#: src/compose.c:8162

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1668,60 +2019,64 @@ msgstr ""
 "L'arxiu '%s' contenia caràcters invàlids per a\n"
 "la codificació actual, la inserció pot ser incorrecta."
 
 "L'arxiu '%s' contenia caràcters invàlids per a\n"
 "la codificació actual, la inserció pot ser incorrecta."
 

-#: src/compose.c:7820
+#: src/compose.c:8210

 msgid "Discard message"
 msgstr "Descartar missatge"
 
 msgid "Discard message"
 msgstr "Descartar missatge"
 

-#: src/compose.c:7821
+#: src/compose.c:8211

 msgid "This message has been modified. Discard it?"
 msgstr "Aquest missatge ha estat modificat. Voleu descartar-lo?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Aquest missatge ha estat modificat. Voleu descartar-lo?"
 

-#: src/compose.c:7822
+#: src/compose.c:8212

 msgid "_Discard"
 msgstr "_Descartar"
 
 msgid "_Discard"
 msgstr "_Descartar"
 

-#: src/compose.c:7822
+#: src/compose.c:8212

 msgid "_Save to Drafts"
 msgstr "_Guardar a Borradors"
 
 msgid "_Save to Drafts"
 msgstr "_Guardar a Borradors"
 

-#: src/compose.c:7866
+#: src/compose.c:8256

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Voleu aplicar la plantilla '%s'?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Voleu aplicar la plantilla '%s'?"
 

-#: src/compose.c:7868
+#: src/compose.c:8258

 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 

-#: src/compose.c:7869
+#: src/compose.c:8259

 msgid "_Replace"
 msgstr "_Reemplaçar"
 
 msgid "_Replace"
 msgstr "_Reemplaçar"
 

-#: src/compose.c:7869
+#: src/compose.c:8259

 msgid "_Insert"
 msgstr "_Insertar"
 
 msgid "_Insert"
 msgstr "_Insertar"
 

-#: src/compose.c:8556
+#: src/compose.c:8947

 msgid "Insert or attach?"
 msgstr "Insertar o adjuntar?"
 
 msgid "Insert or attach?"
 msgstr "Insertar o adjuntar?"
 

-#: src/compose.c:8557
+#: src/compose.c:8948

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""

-"Voleu insertar el contingut de/dels arxius(s) dins el cos del missatge, o"
-"adjuntar-lo al correu?"
+"Voleu insertar el contingut de/dels arxius(s) dins el cos del missatge, "
+"oadjuntar-lo al correu?"

 
 

-#: src/compose.c:8559
+#: src/compose.c:8950

 msgid "+_Insert"
 msgstr "+_Insertar"
 
 msgid "+_Insert"
 msgstr "+_Insertar"
 

-#: src/compose.c:8559
+#: src/compose.c:8950

 msgid "_Attach"
 msgstr "_Adjuntar"
 
 msgid "_Attach"
 msgstr "_Adjuntar"
 

-#: src/compose.c:8965
+#: src/compose.c:9149
+msgid "Quote format error."
+msgstr "Error de format a la cita."
+
+#: src/compose.c:9368

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -1731,13 +2086,12 @@ msgstr ""
 "mica. Voleu continuar?"
 
 #: src/crash.c:142
 "mica. Voleu continuar?"
 
 #: src/crash.c:142

-#, c-format
-msgid "Sylpheed-Claws process (%ld) received signal %ld"
-msgstr "El procés Sylpheed-Claws (%ld) ha rebut el senyal %ld"
+msgid "Claws Mail process (%ld) received signal %ld"
+msgstr "El procés Claws Mail (%ld) ha rebut el senyal %ld"

 
 #: src/crash.c:188
 
 #: src/crash.c:188

-msgid "Sylpheed-Claws has crashed"
-msgstr "Sylpheed-Claws ha acabat incorrectament"
+msgid "Claws Mail has crashed"
+msgstr "Claws Mail ha acabat incorrectament"

 
 #: src/crash.c:204
 #, c-format
 
 #: src/crash.c:204
 #, c-format


@@ -1768,61 +2122,69 @@ msgstr "Crear informe d'error"
 msgid "Save crash information"
 msgstr "Guardar informació de finalització incorrecta"
 
 msgid "Save crash information"
 msgstr "Guardar informació de finalització incorrecta"
 

-#: src/editaddress.c:153
+#: src/editaddress.c:183

 msgid "Add New Person"
 msgstr "Afegir nova persona"
 
 msgid "Add New Person"
 msgstr "Afegir nova persona"
 

-#: src/editaddress.c:154
+#: src/editaddress.c:184

 msgid "Edit Person Details"
 msgstr "Editar detalls personals"
 
 msgid "Edit Person Details"
 msgstr "Editar detalls personals"
 

-#: src/editaddress.c:316
+#: src/editaddress.c:355

 msgid "An Email address must be supplied."
 msgstr "S'ha d'especificar una Adreça de Correu."
 
 msgid "An Email address must be supplied."
 msgstr "S'ha d'especificar una Adreça de Correu."
 

-#: src/editaddress.c:490
+#: src/editaddress.c:529

 msgid "A Name and Value must be supplied."
 msgstr "S'ha d'especificar un Nom i un Valor"
 
 msgid "A Name and Value must be supplied."
 msgstr "S'ha d'especificar un Nom i un Valor"
 

-#: src/editaddress.c:560
+#: src/editaddress.c:618
+msgid "Discard"
+msgstr "Descartar"
+
+#: src/editaddress.c:619
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/editaddress.c:649 src/editaddress.c:698

 msgid "Edit Person Data"
 msgstr "Editar dades personals"
 
 msgid "Edit Person Data"
 msgstr "Editar dades personals"
 

-#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:799
+#: src/editaddress.c:759 src/expldifdlg.c:508 src/exporthtml.c:799

 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Nom mostrat"
 
 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Nom mostrat"
 

-#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:827
+#: src/editaddress.c:765 src/editaddress.c:769 src/ldif.c:827

 msgid "Last Name"
 msgstr "Cognoms"
 
 msgid "Last Name"
 msgstr "Cognoms"
 

-#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:823
+#: src/editaddress.c:766 src/editaddress.c:768 src/ldif.c:823

 msgid "First Name"
 msgstr "Nom"
 
 msgid "First Name"
 msgstr "Nom"
 

-#: src/editaddress.c:683
+#: src/editaddress.c:771

 msgid "Nickname"
 msgstr "Motiu (nick)"
 
 msgid "Nickname"
 msgstr "Motiu (nick)"
 

-#: src/editaddress.c:760 src/editaddress.c:816
+#: src/editaddress.c:848 src/editaddress.c:904

 msgid "Alias"
 msgstr "Alies"
 
 msgid "Alias"
 msgstr "Alies"
 

-#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:222
-#: src/prefs_matcher.c:490
+#: src/editaddress.c:1042 src/editaddress.c:1099 src/prefs_customheader.c:222
+#: src/prefs_matcher.c:530

 msgid "Value"
 msgstr "Valor"
 
 msgid "Value"
 msgstr "Valor"
 

-#: src/editaddress.c:1070
+#: src/editaddress.c:1161

 msgid "_User Data"
 msgstr "Dades d'Us_uari"
 
 msgid "_User Data"
 msgstr "Dades d'Us_uari"
 

-#: src/editaddress.c:1071
+#: src/editaddress.c:1162

 msgid "_Email Addresses"
 msgstr "Adr_eces de Correu"
 
 msgid "_Email Addresses"
 msgstr "Adr_eces de Correu"
 

-#: src/editaddress.c:1072
+#: src/editaddress.c:1163

 msgid "O_ther Attributes"
 msgstr "Al_tres Atributs"
 
 msgid "O_ther Attributes"
 msgstr "Al_tres Atributs"
 


@@ -1847,7 +2209,7 @@ msgid " Check File "
 msgstr " Comprovar arxiu "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr " Comprovar arxiu "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1895
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1917

 msgid "File"
 msgstr "Arxiu"
 
 msgid "File"
 msgstr "Arxiu"
 


@@ -1855,51 +2217,51 @@ msgstr "Arxiu"
 msgid "Add New Addressbook"
 msgstr "Afegir nova agenda"
 
 msgid "Add New Addressbook"
 msgstr "Afegir nova agenda"
 

-#: src/editgroup.c:103
+#: src/editgroup.c:100

 msgid "A Group Name must be supplied."
 msgstr "Heu de proporcionar un nom de grup"
 
 msgid "A Group Name must be supplied."
 msgstr "Heu de proporcionar un nom de grup"
 

-#: src/editgroup.c:286
+#: src/editgroup.c:293

 msgid "Edit Group Data"
 msgstr "Editar dades del grupo"
 
 msgid "Edit Group Data"
 msgstr "Editar dades del grupo"
 

-#: src/editgroup.c:314 src/exporthtml.c:635
+#: src/editgroup.c:323 src/exporthtml.c:635

 msgid "Group Name"
 msgstr "Nom de grup"
 
 msgid "Group Name"
 msgstr "Nom de grup"
 

-#: src/editgroup.c:333
+#: src/editgroup.c:342

 msgid "Addresses in Group"
 msgstr "Adreces en el grup"
 
 msgid "Addresses in Group"
 msgstr "Adreces en el grup"
 

-#: src/editgroup.c:364
+#: src/editgroup.c:373

 msgid "Available Addresses"
 msgstr "Adreces disponibles"
 
 msgid "Available Addresses"
 msgstr "Adreces disponibles"
 

-#: src/editgroup.c:425
+#: src/editgroup.c:445

 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr "Moure les Adreces de Correu des de/cap a el grup amb els cursors"
 
 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr "Moure les Adreces de Correu des de/cap a el grup amb els cursors"
 

-#: src/editgroup.c:473
+#: src/editgroup.c:493

 msgid "Edit Group Details"
 msgstr "Editar detalls del grup"
 
 msgid "Edit Group Details"
 msgstr "Editar detalls del grup"
 

-#: src/editgroup.c:476
+#: src/editgroup.c:496

 msgid "Add New Group"
 msgstr "Afegir nou grup"
 
 msgid "Add New Group"
 msgstr "Afegir nou grup"
 

-#: src/editgroup.c:526
+#: src/editgroup.c:546

 msgid "Edit folder"
 msgstr "Editar carpeta"
 
 msgid "Edit folder"
 msgstr "Editar carpeta"
 

-#: src/editgroup.c:526
+#: src/editgroup.c:546

 msgid "Input the new name of folder:"
 msgstr "Nom de la nova carpeta:"
 
 msgid "Input the new name of folder:"
 msgstr "Nom de la nova carpeta:"
 

-#: src/editgroup.c:529 src/foldersel.c:556 src/imap_gtk.c:134 src/mh_gtk.c:127
+#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:137 src/mh_gtk.c:130

 msgid "New folder"
 msgstr "Nova carpeta"
 
 msgid "New folder"
 msgstr "Nova carpeta"
 

-#: src/editgroup.c:530 src/foldersel.c:557 src/mh_gtk.c:128
+#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr "Nom de la nova carpeta:"
 
 msgid "Input the name of new folder:"
 msgstr "Nom de la nova carpeta:"
 


@@ -1931,7 +2293,7 @@ msgstr "Editar LDAP - Seleccionar base de b
 msgid "Hostname"
 msgstr "Nom de màquina"
 
 msgid "Hostname"
 msgstr "Nom de màquina"
 

-#: src/editldap_basedn.c:173 src/editldap.c:458 src/ssl_manager.c:107
+#: src/editldap_basedn.c:173 src/editldap.c:458 src/ssl_manager.c:110

 msgid "Port"
 msgstr "Port"
 
 msgid "Port"
 msgstr "Port"
 


@@ -1982,12 +2344,12 @@ 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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "

-"computer as Sylpheed-Claws."
+"computer as Claws Mail."

 msgstr ""
 "Aquest és el nom del servidor. Per exemple, \"ldap.elmeudomini.com\" pot "
 "ésser apropiat per a la organització \"elmeudomini.com\". També podeu usar "
 "una adreça IP. Podeu especificar \"localhost\" si el servidor LDAP està "
 msgstr ""
 "Aquest és el nom del servidor. Per exemple, \"ldap.elmeudomini.com\" pot "
 "ésser apropiat per a la organització \"elmeudomini.com\". També podeu usar "
 "una adreça IP. Podeu especificar \"localhost\" si el servidor LDAP està "

-"executant-se en la mateixa màquina que Sylpheed-Claws."
+"executant-se en la mateixa màquina que Claws Mail."

 
 #: src/editldap.c:470
 msgid "TLS"
 
 #: src/editldap.c:470
 msgid "TLS"


@@ -2033,13 +2395,13 @@ msgstr "Polseu aquest bot
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Especifica el nom del directori del servidor en el que es buscarà. Alguns "
 "exemples:\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Especifica el nom del directori del servidor en el que es buscarà. Alguns "
 "exemples:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=gent,dc=nomdomini,dc=com\n"
 "  o=Nom Organització,c=País\n"
 
 "  ou=gent,dc=nomdomini,dc=com\n"
 "  o=Nom Organització,c=País\n"
 


@@ -2141,12 +2503,12 @@ msgstr "Associar DN"
 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 "
 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 "

-"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "

 "performing a search."
 msgstr ""
 "El compte d'usuari LDAP a usar per connectar amb el servidor. Això només "
 "s'usa habitualment en servidors protegits. El nom típicament es formateja "
 "performing a search."
 msgstr ""
 "El compte d'usuari LDAP a usar per connectar amb el servidor. Això només "
 "s'usa habitualment en servidors protegits. El nom típicament es formateja "

-"com \"cn=usuari,dc=sylpheed,dc=com\". Normalment es deixa buit al realitzar "
+"com \"cn=usuari,dc=claws-mail,dc=org\". Normalment es deixa buit al realitzar "

 "la cerca."
 
 #: src/editldap.c:741
 "la cerca."
 
 #: src/editldap.c:741


@@ -2184,7 +2546,7 @@ msgstr "B
 msgid "Search"
 msgstr "Cercar"
 
 msgid "Search"
 msgstr "Cercar"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:411
+#: src/editldap.c:810 src/gtk/quicksearch.c:490

 msgid "Extended"
 msgstr "Extès"
 
 msgid "Extended"
 msgstr "Extès"
 


@@ -2208,19 +2570,19 @@ msgstr "Editar entrada vCard"
 msgid "Add New vCard Entry"
 msgstr "Afegir nova entrada vCard"
 
 msgid "Add New vCard Entry"
 msgstr "Afegir nova entrada vCard"
 

-#: src/exphtmldlg.c:113
+#: src/exphtmldlg.c:110

 msgid "Please specify output directory and file to create."
 msgstr "Especifiqueu el directori de sortida i l'arxiu a crear."
 
 msgid "Please specify output directory and file to create."
 msgstr "Especifiqueu el directori de sortida i l'arxiu a crear."
 

-#: src/exphtmldlg.c:116
+#: src/exphtmldlg.c:113

 msgid "Select stylesheet and formatting."
 msgstr "Seleccioneu el full d'estils i el format."
 
 msgid "Select stylesheet and formatting."
 msgstr "Seleccioneu el full d'estils i el format."
 

-#: src/exphtmldlg.c:119 src/expldifdlg.c:117
+#: src/exphtmldlg.c:116 src/expldifdlg.c:117

 msgid "File exported successfully."
 msgstr "Arxiu exportat amb èxit."
 
 msgid "File exported successfully."
 msgstr "Arxiu exportat amb èxit."
 

-#: src/exphtmldlg.c:184
+#: src/exphtmldlg.c:181

 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"


@@ -2229,11 +2591,11 @@ msgstr ""
 "El directori de sortida HTML '%s'\n"
 "no existeix. Crear-ne un nou?"
 
 "El directori de sortida HTML '%s'\n"
 "no existeix. Crear-ne un nou?"
 

-#: src/exphtmldlg.c:187 src/expldifdlg.c:193
+#: src/exphtmldlg.c:184 src/expldifdlg.c:193

 msgid "Create Directory"
 msgstr "Crear directori"
 
 msgid "Create Directory"
 msgstr "Crear directori"
 

-#: src/exphtmldlg.c:196
+#: src/exphtmldlg.c:193

 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"


@@ -2242,102 +2604,102 @@ msgstr ""
 "No s'ha pogut crear el directori de sortida per a l'arxiu HTML:\n"
 "%s"
 
 "No s'ha pogut crear el directori de sortida per a l'arxiu HTML:\n"
 "%s"
 

-#: src/exphtmldlg.c:198 src/expldifdlg.c:204
+#: src/exphtmldlg.c:195 src/expldifdlg.c:204

 msgid "Failed to Create Directory"
 msgstr "No s'ha pogut crear el directori"
 
 msgid "Failed to Create Directory"
 msgstr "No s'ha pogut crear el directori"
 

-#: src/exphtmldlg.c:240
+#: src/exphtmldlg.c:237

 msgid "Error creating HTML file"
 msgstr "Error creant l'arxiu HTML"
 
 msgid "Error creating HTML file"
 msgstr "Error creant l'arxiu HTML"
 

-#: src/exphtmldlg.c:326
+#: src/exphtmldlg.c:323

 msgid "Select HTML output file"
 msgstr "Seleccionar arxiu HTML de sortida"
 
 msgid "Select HTML output file"
 msgstr "Seleccionar arxiu HTML de sortida"
 

-#: src/exphtmldlg.c:390
+#: src/exphtmldlg.c:387

 msgid "HTML Output File"
 msgstr "Arxiu HTML de sortida"
 
 msgid "HTML Output File"
 msgstr "Arxiu HTML de sortida"
 

-#: src/exphtmldlg.c:399 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "M_ostrar"
 
 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "M_ostrar"
 

-#: src/exphtmldlg.c:452
+#: src/exphtmldlg.c:449

 msgid "Stylesheet"
 msgstr "Full d'estils"
 
 msgid "Stylesheet"
 msgstr "Full d'estils"
 

-#: src/exphtmldlg.c:460 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
-#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:964 src/prefs_account.c:661
-#: src/summaryview.c:4735
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1678
+#: src/gtk/gtkaspell.c:2411 src/mainwindow.c:1003 src/prefs_account.c:667
+#: src/summaryview.c:4991

 msgid "None"
 msgstr "Cap"
 
 msgid "None"
 msgstr "Cap"
 

-#: src/exphtmldlg.c:461 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:458 src/prefs_summaries.c:350 src/prefs_summaries.c:691

 msgid "Default"
 msgstr "Per omissió"
 
 msgid "Default"
 msgstr "Per omissió"
 

-#: src/exphtmldlg.c:462 src/plugins/pgpcore/sgpgme.c:131
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:144

 msgid "Full"
 msgstr "Complet"
 
 msgid "Full"
 msgstr "Complet"
 

-#: src/exphtmldlg.c:463
+#: src/exphtmldlg.c:460

 msgid "Custom"
 msgstr "Adequat"
 
 msgid "Custom"
 msgstr "Adequat"
 

-#: src/exphtmldlg.c:464
+#: src/exphtmldlg.c:461

 msgid "Custom-2"
 msgstr "Adequat-2"
 
 msgid "Custom-2"
 msgstr "Adequat-2"
 

-#: src/exphtmldlg.c:465
+#: src/exphtmldlg.c:462

 msgid "Custom-3"
 msgstr "Adequat-3"
 
 msgid "Custom-3"
 msgstr "Adequat-3"
 

-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:463

 msgid "Custom-4"
 msgstr "Adequat-4"
 
 msgid "Custom-4"
 msgstr "Adequat-4"
 

-#: src/exphtmldlg.c:473
+#: src/exphtmldlg.c:470

 msgid "Full Name Format"
 msgstr "Format de nom complet"
 
 msgid "Full Name Format"
 msgstr "Format de nom complet"
 

-#: src/exphtmldlg.c:481
+#: src/exphtmldlg.c:478

 msgid "First Name, Last Name"
 msgstr "Nom, Cognoms"
 
 msgid "First Name, Last Name"
 msgstr "Nom, Cognoms"
 

-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:479

 msgid "Last Name, First Name"
 msgstr "Cognoms, Nom"
 
 msgid "Last Name, First Name"
 msgstr "Cognoms, Nom"
 

-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:486

 msgid "Color Banding"
 msgstr "Bandes de color"
 
 msgid "Color Banding"
 msgstr "Bandes de color"
 

-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:492

 msgid "Format Email Links"
 msgstr "Formatejar Enllaços de Correu Electrònic"
 
 msgid "Format Email Links"
 msgstr "Formatejar Enllaços de Correu Electrònic"
 

-#: src/exphtmldlg.c:501
+#: src/exphtmldlg.c:498

 msgid "Format User Attributes"
 msgstr "Formatejar atributs de l'usuari"
 
 msgid "Format User Attributes"
 msgstr "Formatejar atributs de l'usuari"
 

-#: src/exphtmldlg.c:556 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919

 msgid "File Name :"
 msgstr "Nom d'arxiu :"
 
 msgid "File Name :"
 msgstr "Nom d'arxiu :"
 

-#: src/exphtmldlg.c:566
+#: src/exphtmldlg.c:563

 msgid "Open with Web Browser"
 msgstr "Obrir amb el navegador web"
 
 msgid "Open with Web Browser"
 msgstr "Obrir amb el navegador web"
 

-#: src/exphtmldlg.c:598
+#: src/exphtmldlg.c:595

 msgid "Export Address Book to HTML File"
 msgstr "Exportar agenda a un arxiu HTML"
 
 msgid "Export Address Book to HTML File"
 msgstr "Exportar agenda a un arxiu HTML"
 

-#: src/exphtmldlg.c:664 src/expldifdlg.c:736 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027

 msgid "File Info"
 msgstr "Informació d'arxiu"
 
 msgid "File Info"
 msgstr "Informació d'arxiu"
 

-#: src/exphtmldlg.c:665
+#: src/exphtmldlg.c:662

 msgid "Format"
 msgstr "Format"
 
 msgid "Format"
 msgstr "Format"
 


@@ -2399,13 +2761,13 @@ msgstr "Sufixe"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "El sufixe s'usa per crear un \"Nom Distingit\" (o DN) per una entrada LDAP. "
 "Alguns exemples:\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "El sufixe s'usa per crear un \"Nom Distingit\" (o DN) per una entrada LDAP. "
 "Alguns exemples:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=gent,dc=nomdomini,dc=com\n"
 "  o=Nom d'Organització,c=País\n"
 
 "  ou=gent,dc=nomdomini,dc=com\n"
 "  o=Nom d'Organització,c=País\n"
 


@@ -2421,29 +2783,29 @@ msgstr "ID 
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "L'ID únic de l'agenda és usat per crear un DN amb format de l'estil de:\n"
 msgstr ""
 "L'ID únic de l'agenda és usat per crear un DN amb format de l'estil de:\n"

-"  uid=102376,ou=gent,dc=sylpheed,dc=org"
+"  uid=102376,ou=gent,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "El nom mostrat de l'agenda s'usa per crear un DN amb format de l'estil de:\n"
 msgstr ""
 "El nom mostrat de l'agenda s'usa per crear un DN amb format de l'estil de:\n"

-"  cn=Joan Tal,ou=gent,dc=sylpheed,dc=org"
+"  cn=Joan Tal,ou=gent,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "La primera Adreça de Correu pertanyent a una persona s'usa per crear un DN "
 "de l'estil de:\n"
 msgstr ""
 "La primera Adreça de Correu pertanyent a una persona s'usa per crear un DN "
 "de l'estil de:\n"

-"  mail=joan.tal@domini.com,ou=gent,dc=sylpheed,dc=org"
+"  mail=joan.tal@domini.com,ou=gent,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:543
 msgid ""
 
 #: src/expldifdlg.c:543
 msgid ""


@@ -2491,11 +2853,11 @@ msgstr ""
 msgid "Export Address Book to LDIF File"
 msgstr "Exportar agenda a un arxiu LDIF"
 
 msgid "Export Address Book to LDIF File"
 msgstr "Exportar agenda a un arxiu LDIF"
 

-#: src/expldifdlg.c:737
+#: src/expldifdlg.c:736

 msgid "Distguished Name"
 msgstr "Nom distingit"
 
 msgid "Distguished Name"
 msgstr "Nom distingit"
 

-#: src/export.c:120 src/summaryview.c:6069
+#: src/export.c:120 src/summaryview.c:6368

 msgid "Export to mbox file"
 msgstr "Exportar a arxiu mbox"
 
 msgid "Export to mbox file"
 msgstr "Exportar a arxiu mbox"
 


@@ -2520,7 +2882,7 @@ msgid "Source folder can't be left empty."
 msgstr "La carpeta origen no es pot deixar buit."
 
 #: src/export.c:229
 msgstr "La carpeta origen no es pot deixar buit."
 
 #: src/export.c:229

-msgid "Can't find the source folder."
+msgid "Couldn't find the source folder."

 msgstr "No s'ha pogut trobar la carpeta origen."
 
 #: src/export.c:252
 msgstr "No s'ha pogut trobar la carpeta origen."
 
 #: src/export.c:252


@@ -2536,8 +2898,8 @@ msgid "Attributes"
 msgstr "Atributs"
 
 #: src/exporthtml.c:1010
 msgstr "Atributs"
 
 #: src/exporthtml.c:1010

-msgid "Sylpheed-Claws Address Book"
-msgstr "Agenda d'adreces de Sylpheed-Claws"
+msgid "Claws Mail Address Book"
+msgstr "Agenda d'adreces de Claws Mail"

 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."
 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."


@@ -2555,52 +2917,52 @@ msgstr "El nom 
 msgid "Not specified."
 msgstr "Sense especificar."
 
 msgid "Not specified."
 msgstr "Sense especificar."
 

-#: src/folder.c:1275 src/foldersel.c:371 src/prefs_folder_item.c:208
+#: src/folder.c:1283 src/foldersel.c:371 src/prefs_folder_item.c:239

 msgid "Inbox"
 msgstr "Entrada"
 
 msgid "Inbox"
 msgstr "Entrada"
 

-#: src/folder.c:1279 src/foldersel.c:375
+#: src/folder.c:1287 src/foldersel.c:375

 msgid "Sent"
 msgstr "Enviat"
 
 msgid "Sent"
 msgstr "Enviat"
 

-#: src/folder.c:1283 src/foldersel.c:379 src/prefs_folder_item.c:211
+#: src/folder.c:1291 src/foldersel.c:379 src/prefs_folder_item.c:242

 msgid "Queue"
 msgstr "Cua"
 
 msgid "Queue"
 msgstr "Cua"
 

-#: src/folder.c:1287 src/foldersel.c:383 src/prefs_folder_item.c:212
-#: src/toolbar.c:366 src/toolbar.c:399 src/toolbar.c:490
+#: src/folder.c:1295 src/foldersel.c:383 src/prefs_folder_item.c:243
+#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501

 msgid "Trash"
 msgstr "Paperera"
 
 msgid "Trash"
 msgstr "Paperera"
 

-#: src/folder.c:1291 src/foldersel.c:387 src/prefs_folder_item.c:210
+#: src/folder.c:1299 src/foldersel.c:387 src/prefs_folder_item.c:241

 msgid "Drafts"
 msgstr "Esborranys"
 
 msgid "Drafts"
 msgstr "Esborranys"
 

-#: src/folder.c:1562
+#: src/folder.c:1578

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processant (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processant (%s)...\n"
 

-#: src/folder.c:1935 src/inc.c:634
-msgid "Filtering messages...\n"
-msgstr "Filtrant missatge...\n"
-
-#: src/folder.c:2477
+#: src/folder.c:2514

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Seleccionant tots els missatges a %s ...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Seleccionant tots els missatges a %s ...\n"
 

-#: src/folder.c:2766
+#: src/folder.c:2803
+msgid "Copying %s to %s...\n"
+msgstr "Copiant %s a %s...\n"
+
+#: src/folder.c:2803

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movent %s a %s...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movent %s a %s...\n"
 

-#: src/folder.c:3035
+#: src/folder.c:3090

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualitzant memòria cauper %s ..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Actualitzant memòria cauper %s ..."
 

-#: src/folder.c:3739
+#: src/folder.c:3801

 msgid "Processing messages..."
 msgstr "Processant missatges..."
 
 msgid "Processing messages..."
 msgstr "Processant missatges..."
 


@@ -2608,180 +2970,166 @@ msgstr "Processant missatges..."
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 

-#: src/foldersel.c:558 src/imap_gtk.c:138 src/mh_gtk.c:129
+#: src/foldersel.c:558 src/imap_gtk.c:141 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 

-#: src/foldersel.c:566 src/imap_gtk.c:146 src/imap_gtk.c:152 src/mh_gtk.c:135
-#: src/mh_gtk.c:238
+#: src/foldersel.c:566 src/imap_gtk.c:149 src/imap_gtk.c:155 src/mh_gtk.c:138
+#: src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "No s'ha pogut incloure '%c' en el nom de la carpeta."
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "No s'ha pogut incloure '%c' en el nom de la carpeta."
 

-#: src/foldersel.c:576 src/imap_gtk.c:162 src/imap_gtk.c:216 src/mh_gtk.c:145
-#: src/mh_gtk.c:245
+#: src/foldersel.c:576 src/imap_gtk.c:165 src/imap_gtk.c:219 src/mh_gtk.c:148
+#: src/mh_gtk.c:248

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta '%s' ja existeix."
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La carpeta '%s' ja existeix."
 

-#: src/foldersel.c:583 src/imap_gtk.c:168 src/mh_gtk.c:151
+#: src/foldersel.c:583 src/imap_gtk.c:171 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No s'ha pogut crear la carpeta '%s'."
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "No s'ha pogut crear la carpeta '%s'."
 

-#: src/folderview.c:286
+#: src/folderview.c:291

 msgid "/Mark all re_ad"
 msgstr "/Marcar tot com _llegit"
 
 msgid "/Mark all re_ad"
 msgstr "/Marcar tot com _llegit"
 

-#: src/folderview.c:287
+#: src/folderview.c:293

 msgid "/_Search folder..."
 msgstr "/_Buscar en carpeta..."
 
 msgid "/_Search folder..."
 msgstr "/_Buscar en carpeta..."
 

-#: src/folderview.c:289
+#: src/folderview.c:295

 msgid "/Process_ing..."
 msgstr "/Pr_ocessant..."
 
 msgid "/Process_ing..."
 msgstr "/Pr_ocessant..."
 

-#: src/folderview.c:293
-msgid "/------trashsep"
-msgstr "/-----trashsep"
-
-#: src/folderview.c:294
+#: src/folderview.c:300

 msgid "/Empty _trash..."
 msgstr "/Buidar _paperera..."
 
 msgid "/Empty _trash..."
 msgstr "/Buidar _paperera..."
 

-#: src/folderview.c:298
-msgid "/------queuesep"
-msgstr "/-----queuesep"
-
-#: src/folderview.c:299
+#: src/folderview.c:305

 msgid "/Send _queue..."
 msgstr "Enviar a _cua..."
 
 msgid "/Send _queue..."
 msgstr "Enviar a _cua..."
 

-#: src/folderview.c:442 src/prefs_actions.c:450
-#: src/prefs_filtering_action.c:585 src/prefs_folder_column.c:80
-#: src/prefs_matcher.c:730
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:80

 msgid "New"
 msgstr "Nous"
 
 msgid "New"
 msgstr "Nous"
 

-#: src/folderview.c:443 src/prefs_folder_column.c:81
+#: src/folderview.c:425 src/folderview.c:472 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr "No llegits"
 
 msgid "Unread"
 msgstr "No llegits"
 

+#: src/folderview.c:426 src/prefs_folder_column.c:82
+msgid "Total"
+msgstr "Total"
+

 #. TRANSLATORS: This in Number sign in American style
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:445 src/summaryview.c:491
+#: src/folderview.c:474 src/summaryview.c:491

 msgid "#"
 msgstr "N"
 
 msgid "#"
 msgstr "N"
 

-#: src/folderview.c:678
+#: src/folderview.c:719

 msgid "Setting folder info..."
 msgstr "Establint informació de carpeta..."
 
 msgid "Setting folder info..."
 msgstr "Establint informació de carpeta..."
 

-#: src/folderview.c:732 src/summaryview.c:3278
+#: src/folderview.c:773 src/summaryview.c:3453

 msgid "Mark all as read"
 msgstr "Marcar tot  com a llegit"
 
 msgid "Mark all as read"
 msgstr "Marcar tot  com a llegit"
 

-#: src/folderview.c:733 src/summaryview.c:3279
+#: src/folderview.c:774 src/summaryview.c:3454

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Voleu realment marcar tots els mails d'aquesta carpeta com a llegits?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Voleu realment marcar tots els mails d'aquesta carpeta com a llegits?"
 

-#: src/folderview.c:1018
-msgid ""
-"You have one or more IMAP accounts defined. However this version of Sylpheed-"
-"Claws has been built without IMAP support; your IMAP account(s) are "
-"disabled.\n"
-"\n"
-"You probably need to install libetpan and recompile Sylpheed-Claws."
-msgstr ""
-"Teniu un o més comptes IMAP definit(s). Tot i això, aquesta versió de "
-"Sylpheed-Claws ha estat compilada sense suport IMAP; els compte(s) seran "
-"deshabili-tades.\n"
-"\n"
-"Probablement necessiteu instal·lar libetpan i recompilar Sylpheed-Claws."
-
-#: src/folderview.c:1035 src/imap.c:3110 src/mainwindow.c:3696 src/setup.c:90
+#: src/folderview.c:1060 src/imap.c:3190 src/mainwindow.c:3923 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisant carpeta %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisant carpeta %s%c%s ..."
 

-#: src/folderview.c:1039 src/imap.c:3115 src/mainwindow.c:3701 src/setup.c:95
+#: src/folderview.c:1064 src/imap.c:3195 src/mainwindow.c:3928 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisant carpeta %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisant carpeta %s ..."
 

-#: src/folderview.c:1066
+#: src/folderview.c:1091

 msgid "Rebuild folder tree"
 msgstr "Reconstruïr l'arbre de carpetes"
 
 msgid "Rebuild folder tree"
 msgstr "Reconstruïr l'arbre de carpetes"
 

-#: src/folderview.c:1067
+#: src/folderview.c:1092

 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Refer l'arbre de directoris esborrarà les memòries cau locals. Voleu "
 "continuar?"
 
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Refer l'arbre de directoris esborrarà les memòries cau locals. Voleu "
 "continuar?"
 

-#: src/folderview.c:1077
+#: src/folderview.c:1102

 msgid "Rebuilding folder tree..."
 msgstr "Reconstruint l'arbre de carpetes..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruint l'arbre de carpetes..."
 

-#: src/folderview.c:1079
+#: src/folderview.c:1104

 msgid "Scanning folder tree..."
 msgstr "Escanejant l'arbre de carpetes..."
 
 msgid "Scanning folder tree..."
 msgstr "Escanejant l'arbre de carpetes..."
 

-#: src/folderview.c:1197
+#: src/folderview.c:1175
+msgid "Couldn't scan folder %s\n"
+msgstr "No s'ha pogut explorar la carpeta %s\n"
+
+#: src/folderview.c:1228

 msgid "Checking for new messages in all folders..."
 msgstr "Comprovar missatges nous en totes les carpetes..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Comprovar missatges nous en totes les carpetes..."
 

-#: src/folderview.c:2031
+#: src/folderview.c:2090
+#, c-format

 msgid "Closing Folder %s..."
 msgstr "Tancant carpeta %s..."
 
 msgid "Closing Folder %s..."
 msgstr "Tancant carpeta %s..."
 

-#: src/folderview.c:2070
+#: src/folderview.c:2129

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Obrint carpeta %s ..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Obrint carpeta %s ..."
 

-#: src/folderview.c:2083
+#: src/folderview.c:2142

 msgid "Folder could not be opened."
 msgstr "No s'ha pogut obrir la carpeta."
 
 msgid "Folder could not be opened."
 msgstr "No s'ha pogut obrir la carpeta."
 

-#: src/folderview.c:2242 src/mainwindow.c:1962
+#: src/folderview.c:2303 src/mainwindow.c:2079

 msgid "Empty trash"
 msgstr "Buidar paperera"
 
 msgid "Empty trash"
 msgstr "Buidar paperera"
 

-#: src/folderview.c:2243
+#: src/folderview.c:2304

 msgid "Delete all messages in trash?"
 msgstr "Esborrar tots els missatges de la paperera?"
 
 msgid "Delete all messages in trash?"
 msgstr "Esborrar tots els missatges de la paperera?"
 

-#: src/folderview.c:2244 src/mainwindow.c:1964
+#: src/folderview.c:2305 src/mainwindow.c:2081

 msgid "+_Empty trash"
 msgstr "+Buidar pap_erera"
 
 msgid "+_Empty trash"
 msgstr "+Buidar pap_erera"
 

-#: src/folderview.c:2288 src/inc.c:1447 src/toolbar.c:2091
+#: src/folderview.c:2349 src/inc.c:1465 src/toolbar.c:2196

 msgid "Offline warning"
 msgstr "Avís de desconnexió"
 
 msgid "Offline warning"
 msgstr "Avís de desconnexió"
 

-#: src/folderview.c:2289 src/toolbar.c:2092
+#: src/folderview.c:2350 src/toolbar.c:2197

 msgid "You're working offline. Override?"
 msgstr "Esteu treballant sense connexió. Ignorar?"
 
 msgid "You're working offline. Override?"
 msgstr "Esteu treballant sense connexió. Ignorar?"
 

-#: src/folderview.c:2300 src/toolbar.c:2111
+#: src/folderview.c:2361 src/toolbar.c:2216

 msgid "Send queued messages"
 msgstr "Enviar missatge(s) encuats"
 
 msgid "Send queued messages"
 msgstr "Enviar missatge(s) encuats"
 

-#: src/folderview.c:2301 src/toolbar.c:2112
+#: src/folderview.c:2362 src/toolbar.c:2217

 msgid "Send all queued messages?"
 msgstr "Enviar tots els  missatges encuats?"
 
 msgid "Send all queued messages?"
 msgstr "Enviar tots els  missatges encuats?"
 

-#: src/folderview.c:2302 src/messageview.c:562 src/messageview.c:579
-#: src/prefs_account.c:1030 src/toolbar.c:2113
+#: src/folderview.c:2363 src/messageview.c:579 src/messageview.c:596
+#: src/prefs_account.c:1039 src/toolbar.c:2218

 msgid "_Send"
 msgstr "_Enviar"
 
 msgid "_Send"
 msgstr "_Enviar"
 

-#: src/folderview.c:2310 src/toolbar.c:2131
+#: src/folderview.c:2371 src/toolbar.c:2236

 msgid "Some errors occurred while sending queued messages."
 msgstr "S'han produït alguns errors enviant els missatges encuats."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "S'han produït alguns errors enviant els missatges encuats."
 

-#: src/folderview.c:2313 src/main.c:1263 src/toolbar.c:2134
+#: src/folderview.c:2374 src/main.c:1549 src/toolbar.c:2239
+#, c-format

 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"


@@ -2789,65 +3137,85 @@ msgstr ""
 "S'han produït alguns errors enviant els missatges encuats:\n"
 "%s"
 
 "S'han produït alguns errors enviant els missatges encuats:\n"
 "%s"
 

-#: src/folderview.c:2380
+#: src/folderview.c:2441
+msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgstr "Voleu realment copiar la carpeta '%s' a '%s' ?"
+
+#: src/folderview.c:2442

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Voleu realment fer que la carpeta '%s' sigui sub-carpeta de '%s' ?"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Voleu realment fer que la carpeta '%s' sigui sub-carpeta de '%s' ?"
 

-#: src/folderview.c:2383
+#: src/folderview.c:2444
+msgid "Copy folder"
+msgstr "Copiar carpeta"
+
+#: src/folderview.c:2444

 msgid "Move folder"
 msgstr "Moure carpeta"
 
 msgid "Move folder"
 msgstr "Moure carpeta"
 

-#: src/folderview.c:2394
+#: src/folderview.c:2455
+msgid "Copying %s to %s..."
+msgstr "Copiant %s a %s..."
+
+#: src/folderview.c:2455

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movent %s a %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movent %s a %s..."
 

-#: src/folderview.c:2423
+#: src/folderview.c:2486

 msgid "Source and destination are the same."
 msgstr "La destinació i l'origen són el mateix."
 
 msgid "Source and destination are the same."
 msgstr "La destinació i l'origen són el mateix."
 

-#: src/folderview.c:2426
+#: src/folderview.c:2489
+msgid "Can't copy a folder to one of its children."
+msgstr "No es pot copiar la carpeta a una de les seves subcarpetes."
+
+#: src/folderview.c:2490

 msgid "Can't move a folder to one of its children."
 msgstr "No es pot moure la carpeta a una de les seves subcarpetes."
 
 msgid "Can't move a folder to one of its children."
 msgstr "No es pot moure la carpeta a una de les seves subcarpetes."
 

-#: src/folderview.c:2429
+#: src/folderview.c:2493

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "No es poden moure carpetes entre busties diferents."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "No es poden moure carpetes entre busties diferents."
 

-#: src/folderview.c:2432
+#: src/folderview.c:2496
+msgid "Copy failed!"
+msgstr "Copiar ha fallat!"
+
+#: src/folderview.c:2496

 msgid "Move failed!"
 msgstr "Moure ha fallat!"
 
 msgid "Move failed!"
 msgstr "Moure ha fallat!"
 

-#: src/folderview.c:2468
+#: src/folderview.c:2532

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Processant configuració per la carpeta %s"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Processant configuració per la carpeta %s"
 

-#: src/gedit-print.c:146 src/messageview.c:1409 src/summaryview.c:3945
-#: src/toolbar.c:178
+#: src/gedit-print.c:147 src/messageview.c:1519 src/summaryview.c:4124
+#: src/toolbar.c:182

 msgid "Print"
 msgstr "Imprimir"
 
 msgid "Print"
 msgstr "Imprimir"
 

-#: src/gedit-print.c:244
+#: src/gedit-print.c:245

 msgid "Preparing pages..."
 msgstr "Preparant pàgines..."
 
 msgid "Preparing pages..."
 msgstr "Preparant pàgines..."
 

-#: src/gedit-print.c:271
+#: src/gedit-print.c:272

 #, c-format
 msgid "Rendering page %d of %d..."
 msgstr "Processant pàgina %d de %d..."
 
 #, c-format
 msgid "Rendering page %d of %d..."
 msgstr "Processant pàgina %d de %d..."
 

-#: src/gedit-print.c:273
+#: src/gedit-print.c:274

 #, c-format
 msgid "Printing page %d of %d..."
 msgstr "Imprimint pàgina %d de %d..."
 
 #, c-format
 msgid "Printing page %d of %d..."
 msgstr "Imprimint pàgina %d de %d..."
 

-#: src/gedit-print.c:295
+#: src/gedit-print.c:296

 msgid "Print preview"
 msgstr "Pre-visualització d'impressió"
 
 msgid "Print preview"
 msgstr "Pre-visualització d'impressió"
 

-#: src/gedit-print.c:451
+#: src/gedit-print.c:456

 msgid "Page %N of %Q"
 msgstr "Pàgina %N de %Q"
 
 msgid "Page %N of %Q"
 msgstr "Pàgina %N de %Q"
 


@@ -2895,7 +3263,7 @@ msgstr "desconegut"
 msgid "Can't retrieve newsgroup list."
 msgstr "No es pot obtenir la llista de grups."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "No es pot obtenir la llista de grups."
 

-#: src/grouplistdialog.c:447 src/summaryview.c:1168
+#: src/grouplistdialog.c:447 src/summaryview.c:1265

 msgid "Done."
 msgstr "Fet."
 
 msgid "Done."
 msgstr "Fet."
 


@@ -2904,19 +3272,48 @@ msgstr "Fet."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grups de notícies rebuts (%s llegits)"
 
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grups de notícies rebuts (%s llegits)"
 

-#: src/gtk/about.c:78 src/textview.c:226
+#: src/gtk/about.c:79 src/textview.c:216

 msgid "/_Open with Web browser"
 msgstr "/_Obrir amb el navegador web"
 
 msgid "/_Open with Web browser"
 msgstr "/_Obrir amb el navegador web"
 

-#: src/gtk/about.c:79 src/textview.c:227
+#: src/gtk/about.c:80 src/textview.c:217

 msgid "/Copy this _link"
 msgstr "/Copiar aquest enllaç"
 
 msgid "/Copy this _link"
 msgstr "/Copiar aquest enllaç"
 

-#: src/gtk/about.c:119
-msgid "About Sylpheed-Claws"
-msgstr "Sobre Sylpheed-Claws"
+#: src/gtk/about.c:138
+msgid ""
+"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
+"\n"
+"For further information visit the Claws Mail website:\n"
+msgstr ""
+"Claws Mail és un lleuger, ràpid i altament configurable client de "
+"correu.\n"
+"\n"
+"Per més informació visiteu la pàgina web de Claws Mail:\n"
+
+#: src/gtk/about.c:144
+msgid ""
+"\n"
+"\n"
+"Claws Mail is free software released under the GPL license. If you wish to "
+"donate to the Claws Mail project you can do so at:\n"
+msgstr ""
+"\n"
+"\n"
+"Claws Mail és software lliure alliberat sota la llicència GPL. Si vol "
+"fer donacions al projecte Claws Mail pot fer-ho a:\n"
+
+#: src/gtk/about.c:159
+msgid ""
+"\n"
+"\n"
+"System Information\n"
+msgstr ""
+"\n"
+"\n"
+"Informació del Sistema\n"

 
 

-#: src/gtk/about.c:161
+#: src/gtk/about.c:165

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2927,7 +3324,7 @@ msgstr ""
 "Locals: %s (cod. de caràcters: %s)\n"
 "Sistema Operatiu: %s %s (%s)"
 
 "Locals: %s (cod. de caràcters: %s)\n"
 "Sistema Operatiu: %s %s (%s)"
 

-#: src/gtk/about.c:170
+#: src/gtk/about.c:174

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2938,7 +3335,7 @@ msgstr ""
 "Locals: %s (cod. de caràcters: %s)\n"
 "Sistema Operatiu: %s"
 
 "Locals: %s (cod. de caràcters: %s)\n"
 "Sistema Operatiu: %s"
 

-#: src/gtk/about.c:179
+#: src/gtk/about.c:183

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2949,112 +3346,80 @@ msgstr ""
 "Locals: %s (cod. de caràcters: %s)\n"
 "Sistema Operatiu: desconegut"
 
 "Locals: %s (cod. de caràcters: %s)\n"
 "Sistema Operatiu: desconegut"
 

-#: src/gtk/about.c:194
-#, c-format
-msgid ""
-"Compiled-in features:\n"
-"%s"
-msgstr ""
-"Compilat amb caràcterístiques:\n"
-"%s"
+#: src/gtk/about.c:240 src/prefs_themes.c:706 src/wizard.c:467
+msgid "The Claws Mail Team"
+msgstr "L'equip de Claws Mail"

 
 

-#: src/gtk/about.c:237
-msgid ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Sylpheed-Claws team"
-msgstr ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"i l'equip de Sylpheed-Claws"
+#: src/gtk/about.c:259
+msgid "Previous team members"
+msgstr "Membres anteriors de l'equip"

 
 

-#: src/gtk/about.c:280
-msgid ""
-"Sylpheed-Claws is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Sylpheed-Claws website:\n"
-msgstr ""
-"Sylpheed-Claws és un lleuger, ràpid i altament configurable client de "
-"correu.\n"
-"\n"
-"Per més informació visiteu la pàgina web de Sylpheed-Claws:\n"
+#: src/gtk/about.c:278
+msgid "The translation team"
+msgstr "L'equip de traducció"

 
 

-#: src/gtk/about.c:286
-msgid ""
-"\n"
-"\n"
-"Sylpheed-Claws is free software released under the GPL license. If you wish "
-"to donate to the Sylpheed-Claws project you can do so at:\n"
-msgstr ""
-"\n"
-"\n"
-"Sylpheed-Claws és software lliure alliberat sota la llicència GPL. Si vol "
-"fer donacions al projecte Sylpheed-Claws pot fer-ho a:\n"
+#: src/gtk/about.c:297
+msgid "Documentation team"
+msgstr "L'equip de documentació"

 
 

-#: src/gtk/about.c:293
-msgid "\n"
-msgstr "\n"
+#: src/gtk/about.c:316
+msgid "Logo"
+msgstr "Logo"

 
 

-#: src/gtk/about.c:304
-msgid "_Info"
-msgstr "_Info"
+#: src/gtk/about.c:335
+msgid "Icons"
+msgstr "Icones"

 
 

-#: src/gtk/about.c:332
-msgid "The Sylpheed-Claws Team\n"
-msgstr "L'equip de Sylpheed-Claws\n"
+#: src/gtk/about.c:354
+msgid "Contributors"
+msgstr "Collaboradors"

 
 

-#: src/gtk/about.c:349
-msgid ""
-"\n"
-"Previous team members\n"
-msgstr ""
-"\n"
-"Membres anteriors de l'equip\n"
-"\n"
+#: src/gtk/about.c:402
+msgid "Compiled-in Features\n"
+msgstr "Compilat amb caràcterístiques\n"

 
 

-#: src/gtk/about.c:366
+#: src/gtk/about.c:418

 msgid ""
 msgid ""

-"\n"
-"The translation team\n"
-msgstr ""
-"\n"
-"L'equip de traducció\n"
+"IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
+msgstr "Afegeix support per adreces IPv6, el nou protocol d'adreçament d'internet\n"

 
 

-#: src/gtk/about.c:383
-msgid ""
-"\n"
-"Documentation team\n"
-msgstr ""
-"\n"
-"L'equip de documentació\n"
+#: src/gtk/about.c:429
+msgid "iconv|allows converting to and from different character sets\n"
+msgstr "Permet conversiones entre diferents conjunts de caràcters\n"

 
 

-#: src/gtk/about.c:400
-msgid ""
-"\n"
-"Logo\n"
-msgstr ""
-"\n"
-"Logo\n"
+#: src/gtk/about.c:439
+msgid "compface|adds support for the X-Face header\n"
+msgstr "Afegeix suport per a les capçalera X-Face\n"
+
+#: src/gtk/about.c:449
+msgid "OpenSSL|adds support for encrypted connections to servers\n"
+msgstr "Afegeix suport per a connexions encriptades a servidors\n"
+
+#: src/gtk/about.c:459
+msgid "LDAP|adds support for LDAP shared addressbooks\n"
+msgstr "Afegeix suport per a agendes d'adreces compartides amb LDAP\n"

 
 

-#: src/gtk/about.c:417
-msgid ""
-"\n"
-"Icons\n"
-msgstr ""
-"\n"
-"Icones\n"
+#: src/gtk/about.c:469
+msgid "JPilot|adds support for PalmOS addressbooks\n"
+msgstr "Afegeix suport per agences d'adreces de PamlOS\n"

 
 

-#: src/gtk/about.c:434
-msgid ""
-"\n"
-"Contributors\n"
-msgstr ""
-"\n"
-"Collaboradors\n"
+#: src/gtk/about.c:479
+msgid "GNU/aspell|adds support for spell checking\n"
+msgstr "Afegeix suport per comprovació ortogràfica\n"

 
 

-#: src/gtk/about.c:453
-msgid "_Authors"
-msgstr "_Autors"
+#: src/gtk/about.c:489
+msgid "libetpan|adds support for IMAP servers\n"
+msgstr "Afegeix suport per servidors IMAP\n"
+
+#: src/gtk/about.c:499
+msgid "libgnomeprint|adds support for a complete print dialog\n"
+msgstr "Afegeix suport per a diàlegs d'impressió complerts\n"
+
+#: src/gtk/about.c:509
+msgid "libSM|adds support for session handling\n"
+msgstr "Afegeix suport per a l'ús de sessions\n"

 
 

-#: src/gtk/about.c:473
+#: src/gtk/about.c:541

 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 "
 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 "


@@ -3068,7 +3433,7 @@ msgstr ""
 "versióposterior.\n"
 "\n"
 
 "versióposterior.\n"
 "\n"
 

-#: src/gtk/about.c:479
+#: src/gtk/about.c:547

 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 "
 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 "


@@ -3082,7 +3447,7 @@ msgstr ""
 "per a més detalls.\n"
 "\n"
 
 "per a més detalls.\n"
 "\n"
 

-#: src/gtk/about.c:485
+#: src/gtk/about.c:553

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "


@@ -3094,7 +3459,7 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 "\n"
 
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 "\n"
 

-#: src/gtk/about.c:499
+#: src/gtk/about.c:571

 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("


@@ -3102,53 +3467,83 @@ msgstr ""
 "Aquest producte inclou software desenvolupat per el projecte OpenSSL per "
 "usar dins les eines d'OpenSSL ("
 
 "Aquest producte inclou software desenvolupat per el projecte OpenSSL per "
 "usar dins les eines d'OpenSSL ("
 

-#: src/gtk/about.c:503
+#: src/gtk/about.c:575

 msgid ").\n"
 msgstr ").\n"
 
 msgid ").\n"
 msgstr ").\n"
 

-#: src/gtk/about.c:515
+#: src/gtk/about.c:668
+msgid "About Claws Mail"
+msgstr "Sobre Claws Mail"
+
+#: src/gtk/about.c:719
+msgid ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"
+msgstr ""
+"Copyright (C) 1999-2007\n" 
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"i l'equip de Claws Mail"
+
+#: src/gtk/about.c:733
+msgid "_Info"
+msgstr "_Info"
+
+#: src/gtk/about.c:739
+msgid "_Authors"
+msgstr "_Autors"
+
+#: src/gtk/about.c:745
+msgid "_Features"
+msgstr "_Característiques"
+
+#: src/gtk/about.c:751

 msgid "_License"
 msgstr "_Llicència"
 
 msgid "_License"
 msgstr "_Llicència"
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:299
+#: src/gtk/about.c:759
+msgid "_Release Notes"
+msgstr "_Notes de Versió"
+
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:313

 msgid "Orange"
 msgstr "Taronja"
 
 msgid "Orange"
 msgstr "Taronja"
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:303
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:317

 msgid "Red"
 msgstr "Vermell"
 
 msgid "Red"
 msgstr "Vermell"
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:307
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:321

 msgid "Pink"
 msgstr "Rosa"
 
 msgid "Pink"
 msgstr "Rosa"
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:311
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:325

 msgid "Sky blue"
 msgstr "Blau cel"
 
 msgid "Sky blue"
 msgstr "Blau cel"
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:315
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:329

 msgid "Blue"
 msgstr "Blau"
 
 msgid "Blue"
 msgstr "Blau"
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:319
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:333

 msgid "Green"
 msgstr "Verd"
 
 msgid "Green"
 msgstr "Verd"
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:323
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:337

 msgid "Brown"
 msgstr "Marró"
 
 msgid "Brown"
 msgstr "Marró"
 

-#: src/gtk/foldersort.c:142
+#: src/gtk/foldersort.c:156

 msgid "Set folder order"
 msgstr "Establir l'ordre de la carpeta"
 
 msgid "Set folder order"
 msgstr "Establir l'ordre de la carpeta"
 

-#: src/gtk/foldersort.c:172
+#: src/gtk/foldersort.c:190

 msgid "Move folders up or down to change the sort order in the folder list."
 msgstr ""
 "Moure les carpetes amunt o avall per canviar l'ordre de la llista de "
 "carpetes."
 
 msgid "Move folders up or down to change the sort order in the folder list."
 msgstr ""
 "Moure les carpetes amunt o avall per canviar l'ordre de la llista de "
 "carpetes."
 

-#: src/gtk/foldersort.c:196
+#: src/gtk/foldersort.c:214

 msgid "Folders"
 msgstr "Carpetes"
 
 msgid "Folders"
 msgstr "Carpetes"
 


@@ -3260,36 +3655,36 @@ msgstr "Descripci
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Font a usar per capçaleres i peus de pàgina (p. ex. \"Monospace 10\")"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Font a usar per capçaleres i peus de pàgina (p. ex. \"Monospace 10\")"
 

-#: src/gtk/gtkaspell.c:606
+#: src/gtk/gtkaspell.c:632

 msgid "No dictionary selected."
 msgstr "No heu seleccionat cap diccionari"
 
 msgid "No dictionary selected."
 msgstr "No heu seleccionat cap diccionari"
 

-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
+#: src/gtk/gtkaspell.c:868 src/gtk/gtkaspell.c:1869 src/gtk/gtkaspell.c:2164

 msgid "Normal Mode"
 msgstr "Mode normal"
 
 msgid "Normal Mode"
 msgstr "Mode normal"
 

-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
+#: src/gtk/gtkaspell.c:870 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2176

 msgid "Bad Spellers Mode"
 msgstr "Mode mals escriptors"
 
 msgid "Bad Spellers Mode"
 msgstr "Mode mals escriptors"
 

-#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:909

 msgid "Unknown suggestion mode."
 msgstr "Mode de suggerència desconegut."
 
 msgid "Unknown suggestion mode."
 msgstr "Mode de suggerència desconegut."
 

-#: src/gtk/gtkaspell.c:1154
+#: src/gtk/gtkaspell.c:1200

 msgid "No misspelled word found."
 msgstr "No s'han trobat faltes ortogràfiques."
 
 msgid "No misspelled word found."
 msgstr "No s'han trobat faltes ortogràfiques."
 

-#: src/gtk/gtkaspell.c:1502
+#: src/gtk/gtkaspell.c:1548

 msgid "Replace unknown word"
 msgstr "Substituïr paraula desconeguda"
 
 msgid "Replace unknown word"
 msgstr "Substituïr paraula desconeguda"
 

-#: src/gtk/gtkaspell.c:1517
+#: src/gtk/gtkaspell.c:1563

 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Reemplaçar \"%s\" amb: </span>"
 
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Reemplaçar \"%s\" amb: </span>"
 

-#: src/gtk/gtkaspell.c:1562
+#: src/gtk/gtkaspell.c:1608

 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"


@@ -3297,59 +3692,63 @@ msgstr ""
 "Si polseu la tecla Control juntament amb el Enter\n"
 "s'aprendrà l'error.\n"
 
 "Si polseu la tecla Control juntament amb el Enter\n"
 "s'aprendrà l'error.\n"
 

-#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
+#: src/gtk/gtkaspell.c:1863 src/gtk/gtkaspell.c:2152

 msgid "Fast Mode"
 msgstr "Mode ràpid"
 
 msgid "Fast Mode"
 msgstr "Mode ràpid"
 

-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1970

 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "\"%s\" desconeguda a %s"
 
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "\"%s\" desconeguda a %s"
 

-#: src/gtk/gtkaspell.c:1930
+#: src/gtk/gtkaspell.c:1984

 msgid "Accept in this session"
 msgstr "Acceptar per aquesta sessió"
 
 msgid "Accept in this session"
 msgstr "Acceptar per aquesta sessió"
 

-#: src/gtk/gtkaspell.c:1940
+#: src/gtk/gtkaspell.c:1994

 msgid "Add to personal dictionary"
 msgstr "Afegir al diccionari personal"
 
 msgid "Add to personal dictionary"
 msgstr "Afegir al diccionari personal"
 

-#: src/gtk/gtkaspell.c:1950
+#: src/gtk/gtkaspell.c:2004

 msgid "Replace with..."
 msgstr "Substituir per..."
 
 msgid "Replace with..."
 msgstr "Substituir per..."
 

-#: src/gtk/gtkaspell.c:1963
+#: src/gtk/gtkaspell.c:2017

 #, c-format
 msgid "Check with %s"
 msgstr " Comprovar amb %s"
 
 #, c-format
 msgid "Check with %s"
 msgstr " Comprovar amb %s"
 

-#: src/gtk/gtkaspell.c:1985
+#: src/gtk/gtkaspell.c:2039

 msgid "(no suggestions)"
 msgstr "(no hi ha suggerències)"
 
 msgid "(no suggestions)"
 msgstr "(no hi ha suggerències)"
 

-#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
+#: src/gtk/gtkaspell.c:2050 src/gtk/gtkaspell.c:2229

 msgid "More..."
 msgstr "Més..."
 
 msgid "More..."
 msgstr "Més..."
 

-#: src/gtk/gtkaspell.c:2060
+#: src/gtk/gtkaspell.c:2114

 #, c-format
 msgid "Dictionary: %s"
 msgstr "Diccionari: %s"
 
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Diccionari: %s"
 

-#: src/gtk/gtkaspell.c:2073
+#: src/gtk/gtkaspell.c:2127

 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Usar alternatiu (%s)"
 
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Usar alternatiu (%s)"
 

-#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2138
+msgid "Use both dictionaries"
+msgstr "Useu els dos diccionaris"
+
+#: src/gtk/gtkaspell.c:2192 src/prefs_spelling.c:218

 msgid "Check while typing"
 msgstr "Comprovar mentre s'escriu"
 
 msgid "Check while typing"
 msgstr "Comprovar mentre s'escriu"
 

-#: src/gtk/gtkaspell.c:2137
+#: src/gtk/gtkaspell.c:2208

 msgid "Change dictionary"
 msgstr "Canviar diccionari"
 
 msgid "Change dictionary"
 msgstr "Canviar diccionari"
 

-#: src/gtk/gtkaspell.c:2270
+#: src/gtk/gtkaspell.c:2340

 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"


@@ -3358,75 +3757,95 @@ msgstr ""
 "El corrector no ha pogut canviar de diccionari.\n"
 "%s"
 
 "El corrector no ha pogut canviar de diccionari.\n"
 "%s"
 

-#: src/gtk/icon_legend.c:63
+#: src/gtk/gtkaspell.c:2386
+msgid ""
+"The spell checker could not change the alternate dictionary.\n"
+"%s"
+msgstr ""
+"El corrector ortogràfic no ha pogut canviar al diccionari alternatiu.\n"
+"%s"
+
+#: src/gtk/icon_legend.c:67

 msgid "New message"
 msgstr "Missatge nou"
 
 msgid "New message"
 msgstr "Missatge nou"
 

-#: src/gtk/icon_legend.c:64
+#: src/gtk/icon_legend.c:68

 msgid "Unread message"
 msgstr "Missatge sense llegir"
 
 msgid "Unread message"
 msgstr "Missatge sense llegir"
 

-#: src/gtk/icon_legend.c:65
+#: src/gtk/icon_legend.c:69

 msgid "Message has been replied to"
 msgstr "El missatge ha estat contestat"
 
 msgid "Message has been replied to"
 msgstr "El missatge ha estat contestat"
 

-#: src/gtk/icon_legend.c:66
+#: src/gtk/icon_legend.c:70

 msgid "Message has been forwarded"
 msgstr "El missatge ha estat re-enviat"
 
 msgid "Message has been forwarded"
 msgstr "El missatge ha estat re-enviat"
 

-#: src/gtk/icon_legend.c:67
+#: src/gtk/icon_legend.c:71
+msgid "Message is in an ignored thread"
+msgstr "El missatge és en un fil ignorat"
+
+#: src/gtk/icon_legend.c:72
+msgid "Message is spam"
+msgstr "El missatge és correu brossa"
+
+#: src/gtk/icon_legend.c:74

 msgid "Message has attachment(s)"
 msgstr "El missatge té adjunt(s)"
 
 msgid "Message has attachment(s)"
 msgstr "El missatge té adjunt(s)"
 

-#: src/gtk/icon_legend.c:68
+#: src/gtk/icon_legend.c:75

 msgid "Digitally signed message"
 msgstr "Missatge signat digitalment"
 
 msgid "Digitally signed message"
 msgstr "Missatge signat digitalment"
 

-#: src/gtk/icon_legend.c:69
+#: src/gtk/icon_legend.c:76

 msgid "Encrypted message"
 msgstr "Missatge encriptat"
 
 msgid "Encrypted message"
 msgstr "Missatge encriptat"
 

-#: src/gtk/icon_legend.c:70
+#: src/gtk/icon_legend.c:77

 msgid "Message is signed and has attachment(s)"
 msgstr "El missatge és signat i té adjunt(s)"
 
 msgid "Message is signed and has attachment(s)"
 msgstr "El missatge és signat i té adjunt(s)"
 

-#: src/gtk/icon_legend.c:71
+#: src/gtk/icon_legend.c:78

 msgid "Message is encrypted and has attachment(s)"
 msgstr "El missatge és encriptat i té adjunt(s)"
 
 msgid "Message is encrypted and has attachment(s)"
 msgstr "El missatge és encriptat i té adjunt(s)"
 

-#: src/gtk/icon_legend.c:72
+#: src/gtk/icon_legend.c:80

 msgid "Marked message"
 msgstr "Missatge marcat"
 
 msgid "Marked message"
 msgstr "Missatge marcat"
 

-#: src/gtk/icon_legend.c:73
-msgid "Locked message"
-msgstr "Missatge bloquejat"
+#: src/gtk/icon_legend.c:81
+msgid "Message is marked for deletion"
+msgstr "El missatge s'ha marcat per a eliminar"

 
 

-#: src/gtk/icon_legend.c:74
-msgid "Message is in an ignored thread"
-msgstr "El missatge és en un fil ignorat"
+#: src/gtk/icon_legend.c:82
+msgid "Message is marked for moving"
+msgstr "El missatge s'ha marcat per a moure"

 
 

-#: src/gtk/icon_legend.c:75
-msgid "Message is spam"
-msgstr "El missatge és correu brossa"
+#: src/gtk/icon_legend.c:83
+msgid "Message is marked for copying"
+msgstr "El missatge s'ha marcat per a copiar"

 
 

-#: src/gtk/icon_legend.c:76
+#: src/gtk/icon_legend.c:85
+msgid "Locked message"
+msgstr "Missatge bloquejat"
+
+#: src/gtk/icon_legend.c:87

 msgid "Folder (normal, opened)"
 msgstr "Carpeta (normal, oberta)"
 
 msgid "Folder (normal, opened)"
 msgstr "Carpeta (normal, oberta)"
 

-#: src/gtk/icon_legend.c:77
+#: src/gtk/icon_legend.c:88

 msgid "Folder with read messages hidden"
 msgstr "Carpeta amb missatges llegits ocults"
 
 msgid "Folder with read messages hidden"
 msgstr "Carpeta amb missatges llegits ocults"
 

-#: src/gtk/icon_legend.c:78
-msgid "Folder contains marked emails"
-msgstr "La carpeta conté correus marcats"
+#: src/gtk/icon_legend.c:89
+msgid "Folder contains marked messages"
+msgstr "La carpeta conté missatges marcats"

 
 

-#: src/gtk/icon_legend.c:110
+#: src/gtk/icon_legend.c:122

 msgid "Icon Legend"
 msgstr "Text de la Icona"
 
 msgid "Icon Legend"
 msgstr "Text de la Icona"
 

-#: src/gtk/icon_legend.c:128
+#: src/gtk/icon_legend.c:140

 msgid ""
 "<span weight=\"bold\">The following icons are used to show the status of "
 "messages and folders:</span>"
 msgid ""
 "<span weight=\"bold\">The following icons are used to show the status of "
 "messages and folders:</span>"


@@ -3434,20 +3853,24 @@ msgstr ""
 "<span weight=\"bold\">Les icones següents s'usen per mostrar l'estat de "
 "missatges i carpetes:</span>"
 
 "<span weight=\"bold\">Les icones següents s'usen per mostrar l'estat de "
 "missatges i carpetes:</span>"
 

-#: src/gtk/inputdialog.c:168
+#: src/gtk/inputdialog.c:189

 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Contrasenya per %s a %s:"
 
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Contrasenya per %s a %s:"
 

-#: src/gtk/inputdialog.c:170
+#: src/gtk/inputdialog.c:191

 msgid "Input password"
 msgstr "Introduiu contrasenya"
 
 msgid "Input password"
 msgstr "Introduiu contrasenya"
 

+#: src/gtk/inputdialog.c:278
+msgid "Remember this"
+msgstr "Recorda això"
+

 #: src/gtk/logwindow.c:87
 msgid "Protocol log"
 msgstr "Traça del protocol"
 
 #: src/gtk/logwindow.c:87
 msgid "Protocol log"
 msgstr "Traça del protocol"
 

-#: src/gtk/logwindow.c:344
+#: src/gtk/logwindow.c:384

 msgid "Clear _Log"
 msgstr "Netejar _Log"
 
 msgid "Clear _Log"
 msgstr "Netejar _Log"
 


@@ -3470,227 +3893,243 @@ msgid "Plugin is not functional."
 msgstr "El mòdul no està operatiu"
 
 #: src/gtk/pluginwindow.c:185
 msgstr "El mòdul no està operatiu"
 
 #: src/gtk/pluginwindow.c:185

-msgid "Select Plugin to load"
-msgstr "Seleccionar mòdul a carregar"
+msgid "Select the Plugins to load"
+msgstr "Seleccionar els mòduls a carregar"

 
 

-#: src/gtk/pluginwindow.c:199
-#, c-format
+#: src/gtk/pluginwindow.c:200

 msgid ""
 msgid ""

-"The following error occured while loading the plugin [%s] :\n"
+"The following error occured while loading %s :\n"
+"\n"

 "%s\n"
 msgstr ""
 "%s\n"
 msgstr ""

-"Hi ha hagut el següent error mentre es descarregava el mòdul [%s] :\n"
+"Hi ha hagut el següent error mentre es carregava %s :\n"

 "%s\n"
 
 "%s\n"
 

-#: src/gtk/pluginwindow.c:283 src/gtk/pluginwindow.c:433
-#: src/plugins/clamav/clamav_plugin_gtk.c:213
+#: src/gtk/pluginwindow.c:286 src/plugins/clamav/clamav_plugin_gtk.c:211

 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/dillo_viewer/dillo_prefs.c:75

-#: src/plugins/pgpcore/prefs_gpg.c:453
+#: src/plugins/pgpcore/prefs_gpg.c:514

 #: src/plugins/spamassassin/spamassassin_gtk.c:548
 msgid "Plugins"
 msgstr "Mòduls"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:548
 msgid "Plugins"
 msgstr "Mòduls"
 

-#: src/gtk/pluginwindow.c:314 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:211

 msgid "Description"
 msgstr "Descripció"
 
 msgid "Description"
 msgstr "Descripció"
 

-#: src/gtk/pluginwindow.c:337 src/prefs_themes.c:866
+#: src/gtk/pluginwindow.c:336
+msgid "More plugins are available from the Claws Mail website."
+msgstr "Hi ha més mòduls disponibles a la pàgina web de Claws Mail."
+
+#: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866

 msgid "Get more..."
 msgstr "Més temes..."
 
 msgid "Get more..."
 msgstr "Més temes..."
 

-#: src/gtk/pluginwindow.c:346
+#: src/gtk/pluginwindow.c:356

 msgid "Load Plugin..."
 msgstr "Carregar Mòdul..."
 
 msgid "Load Plugin..."
 msgstr "Carregar Mòdul..."
 

-#: src/gtk/pluginwindow.c:347
+#: src/gtk/pluginwindow.c:357

 msgid "Unload Plugin"
 msgstr "Descarregar mòdul"
 
 msgid "Unload Plugin"
 msgstr "Descarregar mòdul"
 

+#: src/gtk/pluginwindow.c:384
+msgid "Click here to load one or more plugins"
+msgstr "Pulsa aquí per carregar un o més mòduls"
+
+#: src/gtk/pluginwindow.c:388
+msgid "Unload the selected plugin"
+msgstr "Descarregar el mòdul seleccionat"
+
+#: src/gtk/pluginwindow.c:455
+msgid "Loaded plugins"
+msgstr "Mòduls carregats"
+

 #: src/gtk/prefswindow.c:527
 msgid "Page Index"
 msgstr "Pàgina índex"
 
 #: src/gtk/prefswindow.c:527
 msgid "Page Index"
 msgstr "Pàgina índex"
 

-#: src/gtk/progressdialog.c:141 src/prefs_account.c:760
-#: src/prefs_filtering_action.c:378
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:769
+#: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
+#: src/prefs_filtering.c:1490

 msgid "Account"
 msgstr "Compte"
 
 msgid "Account"
 msgstr "Compte"
 

-#: src/gtk/progressdialog.c:149 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80
+#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
+#: src/prefs_summary_column.c:80 src/summaryview.c:2376

 msgid "Status"
 msgstr "Estat"
 
 msgid "Status"
 msgstr "Estat"
 

-#: src/gtk/quicksearch.c:252
+#: src/gtk/quicksearch.c:331

 msgid "all messages"
 msgstr "tots els missatges"
 
 msgid "all messages"
 msgstr "tots els missatges"
 

-#: src/gtk/quicksearch.c:253
+#: src/gtk/quicksearch.c:332

 msgid "messages whose age is greater than #"
 msgstr "missatges amb edat major que "
 
 msgid "messages whose age is greater than #"
 msgstr "missatges amb edat major que "
 

-#: src/gtk/quicksearch.c:254
+#: src/gtk/quicksearch.c:333

 msgid "messages whose age is less than #"
 msgstr "missatges amb edat menor que "
 
 msgid "messages whose age is less than #"
 msgstr "missatges amb edat menor que "
 

-#: src/gtk/quicksearch.c:255
+#: src/gtk/quicksearch.c:334

 msgid "messages which contain S in the message body"
 msgstr "missatges que contenen S en el cos del missatge"
 
 msgid "messages which contain S in the message body"
 msgstr "missatges que contenen S en el cos del missatge"
 

-#: src/gtk/quicksearch.c:256
+#: src/gtk/quicksearch.c:335

 msgid "messages which contain S in the whole message"
 msgstr "missatges que contenen S en el missatge complert"
 
 msgid "messages which contain S in the whole message"
 msgstr "missatges que contenen S en el missatge complert"
 

-#: src/gtk/quicksearch.c:257
+#: src/gtk/quicksearch.c:336

 msgid "messages carbon-copied to S"
 msgstr "missatges amb copia-carbó a S"
 
 msgid "messages carbon-copied to S"
 msgstr "missatges amb copia-carbó a S"
 

-#: src/gtk/quicksearch.c:258
+#: src/gtk/quicksearch.c:337

 msgid "message is either to: or cc: to S"
 msgstr "missatge amb Per a: o Cc: a S"
 
 msgid "message is either to: or cc: to S"
 msgstr "missatge amb Per a: o Cc: a S"
 

-#: src/gtk/quicksearch.c:259
+#: src/gtk/quicksearch.c:338

 msgid "deleted messages"
 msgstr "missatges esborrats"
 
 msgid "deleted messages"
 msgstr "missatges esborrats"
 

-#: src/gtk/quicksearch.c:260
+#: src/gtk/quicksearch.c:339

 msgid "messages which contain S in the Sender field"
 msgstr "missatges que contenen S en el camp remitent"
 
 msgid "messages which contain S in the Sender field"
 msgstr "missatges que contenen S en el camp remitent"
 

-#: src/gtk/quicksearch.c:261
+#: src/gtk/quicksearch.c:340

 msgid "true if execute \"S\" succeeds"
 msgstr "cert si executar \"S\" té èxit"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "cert si executar \"S\" té èxit"
 

-#: src/gtk/quicksearch.c:262
+#: src/gtk/quicksearch.c:341

 msgid "messages originating from user S"
 msgstr "missatges provinents de l'usuari S"
 
 msgid "messages originating from user S"
 msgstr "missatges provinents de l'usuari S"
 

-#: src/gtk/quicksearch.c:263
+#: src/gtk/quicksearch.c:342

 msgid "forwarded messages"
 msgstr "missatges reenviats"
 
 msgid "forwarded messages"
 msgstr "missatges reenviats"
 

-#: src/gtk/quicksearch.c:264
+#: src/gtk/quicksearch.c:343

 msgid "messages which contain header S"
 msgstr "missatges que contenen la capçalera S"
 
 msgid "messages which contain header S"
 msgstr "missatges que contenen la capçalera S"
 

-#: src/gtk/quicksearch.c:265
+#: src/gtk/quicksearch.c:344

 msgid "messages which contain S in Message-ID header"
 msgstr "missatges que contenen S a la capçalera Message-ID"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "missatges que contenen S a la capçalera Message-ID"
 

-#: src/gtk/quicksearch.c:266
+#: src/gtk/quicksearch.c:345

 msgid "messages which contain S in inreplyto header"
 msgstr "missatges que contenen S a la capçalera In-Reply-To"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "missatges que contenen S a la capçalera In-Reply-To"
 

-#: src/gtk/quicksearch.c:267
+#: src/gtk/quicksearch.c:346

 msgid "messages which are marked with color #"
 msgstr "missatges que han estat marcats amb color #"
 
 msgid "messages which are marked with color #"
 msgstr "missatges que han estat marcats amb color #"
 

-#: src/gtk/quicksearch.c:268
+#: src/gtk/quicksearch.c:347

 msgid "locked messages"
 msgstr "missatges bloquejats"
 
 msgid "locked messages"
 msgstr "missatges bloquejats"
 

-#: src/gtk/quicksearch.c:269
+#: src/gtk/quicksearch.c:348

 msgid "messages which are in newsgroup S"
 msgstr "missatges que estan en el grup de noticies S"
 
 msgid "messages which are in newsgroup S"
 msgstr "missatges que estan en el grup de noticies S"
 

-#: src/gtk/quicksearch.c:270
+#: src/gtk/quicksearch.c:349

 msgid "new messages"
 msgstr "missatges nous"
 
 msgid "new messages"
 msgstr "missatges nous"
 

-#: src/gtk/quicksearch.c:271
+#: src/gtk/quicksearch.c:350

 msgid "old messages"
 msgstr "missatges antics"
 
 msgid "old messages"
 msgstr "missatges antics"
 

-#: src/gtk/quicksearch.c:272
+#: src/gtk/quicksearch.c:351

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "missatges incomplerts (no descarregats completament)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "missatges incomplerts (no descarregats completament)"
 

-#: src/gtk/quicksearch.c:273
+#: src/gtk/quicksearch.c:352

 msgid "messages which have been replied to"
 msgstr "missatges que han estat contestats"
 
 msgid "messages which have been replied to"
 msgstr "missatges que han estat contestats"
 

-#: src/gtk/quicksearch.c:274
+#: src/gtk/quicksearch.c:353

 msgid "read messages"
 msgstr "missatges llegits"
 
 msgid "read messages"
 msgstr "missatges llegits"
 

-#: src/gtk/quicksearch.c:275
+#: src/gtk/quicksearch.c:354

 msgid "messages which contain S in subject"
 msgstr "missatges que contenen S a l'assumpte"
 
 msgid "messages which contain S in subject"
 msgstr "missatges que contenen S a l'assumpte"
 

-#: src/gtk/quicksearch.c:276
+#: src/gtk/quicksearch.c:355

 msgid "messages whose score is equal to #"
 msgstr "missatges amb puntuació igual a #"
 
 msgid "messages whose score is equal to #"
 msgstr "missatges amb puntuació igual a #"
 

-#: src/gtk/quicksearch.c:277
+#: src/gtk/quicksearch.c:356

 msgid "messages whose score is greater than #"
 msgstr "missatges amb puntuació major que #"
 
 msgid "messages whose score is greater than #"
 msgstr "missatges amb puntuació major que #"
 

-#: src/gtk/quicksearch.c:278
+#: src/gtk/quicksearch.c:357

 msgid "messages whose score is lower than #"
 msgstr "missatges amb puntuació menor que #"
 
 msgid "messages whose score is lower than #"
 msgstr "missatges amb puntuació menor que #"
 

-#: src/gtk/quicksearch.c:279
+#: src/gtk/quicksearch.c:358

 msgid "messages whose size is equal to #"
 msgstr "missatges amb tamany igual a #"
 
 msgid "messages whose size is equal to #"
 msgstr "missatges amb tamany igual a #"
 

-#: src/gtk/quicksearch.c:280
+#: src/gtk/quicksearch.c:359

 msgid "messages whose size is greater than #"
 msgstr "missatges amb tamany major que #"
 
 msgid "messages whose size is greater than #"
 msgstr "missatges amb tamany major que #"
 

-#: src/gtk/quicksearch.c:281
+#: src/gtk/quicksearch.c:360

 msgid "messages whose size is smaller than #"
 msgstr "missatges amb tamany menor que #"
 
 msgid "messages whose size is smaller than #"
 msgstr "missatges amb tamany menor que #"
 

-#: src/gtk/quicksearch.c:282
+#: src/gtk/quicksearch.c:361

 msgid "messages which have been sent to S"
 msgstr "missatges que han estat enviats a S"
 
 msgid "messages which have been sent to S"
 msgstr "missatges que han estat enviats a S"
 

-#: src/gtk/quicksearch.c:283
+#: src/gtk/quicksearch.c:362

 msgid "marked messages"
 msgstr "missatges marcats"
 
 msgid "marked messages"
 msgstr "missatges marcats"
 

-#: src/gtk/quicksearch.c:284
+#: src/gtk/quicksearch.c:363

 msgid "unread messages"
 msgstr "missatges sense llegir"
 
 msgid "unread messages"
 msgstr "missatges sense llegir"
 

-#: src/gtk/quicksearch.c:285
+#: src/gtk/quicksearch.c:364

 msgid "messages which contain S in References header"
 msgstr "missatges que contenen S a la capçalera References"
 
 msgid "messages which contain S in References header"
 msgstr "missatges que contenen S a la capçalera References"
 

-#: src/gtk/quicksearch.c:286
+#: src/gtk/quicksearch.c:365

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "missatges que retornen 0 al pasar-los a l'ordre - %F és un missatge d'arxiu"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "missatges que retornen 0 al pasar-los a l'ordre - %F és un missatge d'arxiu"
 

-#: src/gtk/quicksearch.c:287
+#: src/gtk/quicksearch.c:366

 msgid "messages which contain S in X-Label header"
 msgstr "missatges que contenen S a la capçalera X-Label"
 
 msgid "messages which contain S in X-Label header"
 msgstr "missatges que contenen S a la capçalera X-Label"
 

-#: src/gtk/quicksearch.c:289
+#: src/gtk/quicksearch.c:368

 msgid "logical AND operator"
 msgstr "operador I lògic"
 
 msgid "logical AND operator"
 msgstr "operador I lògic"
 

-#: src/gtk/quicksearch.c:290
+#: src/gtk/quicksearch.c:369

 msgid "logical OR operator"
 msgstr "operador O lògic"
 
 msgid "logical OR operator"
 msgstr "operador O lògic"
 

-#: src/gtk/quicksearch.c:291
+#: src/gtk/quicksearch.c:370

 msgid "logical NOT operator"
 msgstr "operador NO lògic"
 
 msgid "logical NOT operator"
 msgstr "operador NO lògic"
 

-#: src/gtk/quicksearch.c:292
+#: src/gtk/quicksearch.c:371

 msgid "case sensitive search"
 msgstr "sensible a majs./mins."
 
 msgid "case sensitive search"
 msgstr "sensible a majs./mins."
 

-#: src/gtk/quicksearch.c:294
+#: src/gtk/quicksearch.c:373

 msgid "all filtering expressions are allowed"
 msgstr "s'admet qualsevol expressió de filtratge"
 
 msgid "all filtering expressions are allowed"
 msgstr "s'admet qualsevol expressió de filtratge"
 

-#: src/gtk/quicksearch.c:302 src/summary_search.c:302
+#: src/gtk/quicksearch.c:381 src/summary_search.c:397

 msgid "Extended Search"
 msgstr "Recerca ampliada"
 
 msgid "Extended Search"
 msgstr "Recerca ampliada"
 

-#: src/gtk/quicksearch.c:303
+#: src/gtk/quicksearch.c:382

 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"
 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"


@@ -3702,45 +4141,51 @@ msgstr ""
 "\n"
 "Es poden usar els següents símbols:"
 
 "\n"
 "Es poden usar els següents símbols:"
 

-#: src/gtk/quicksearch.c:399 src/prefs_filtering_action.c:1080
-#: src/prefs_matcher.c:150 src/prefs_matcher.c:1684
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:47 src/summaryview.c:486
+#: src/gtk/quicksearch.c:478 src/prefs_compose_writing.c:239
+#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
+#: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
+#: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486

 msgid "Subject"
 msgstr "Assumpte"
 
 msgid "Subject"
 msgstr "Assumpte"
 

-#: src/gtk/quicksearch.c:403 src/prefs_filtering_action.c:1081
-#: src/prefs_matcher.c:151 src/prefs_matcher.c:1685
+#: src/gtk/quicksearch.c:482 src/prefs_filtering_action.c:1081
+#: src/prefs_matcher.c:159 src/prefs_matcher.c:1867

 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "Des de"
 
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "Des de"
 

-#: src/gtk/quicksearch.c:407 src/prefs_filtering_action.c:1082
-#: src/prefs_matcher.c:151 src/prefs_matcher.c:1686
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:48 src/summaryview.c:488
+#: src/gtk/quicksearch.c:486 src/prefs_filtering_action.c:1082
+#: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
+#: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
+#: src/summaryview.c:488

 msgid "To"
 msgstr "Per a"
 
 msgid "To"
 msgstr "Per a"
 

-#: src/gtk/quicksearch.c:418
+#: src/gtk/quicksearch.c:497

 msgid "Recursive"
 msgstr "Recursiu"
 
 msgid "Recursive"
 msgstr "Recursiu"
 

-#: src/gtk/quicksearch.c:428
+#: src/gtk/quicksearch.c:507

 msgid "Sticky"
 msgstr "Ràpid"
 
 msgid "Sticky"
 msgstr "Ràpid"
 

-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:517
+msgid "Type-ahead"
+msgstr "Mentrestant tecleja"
+
+#: src/gtk/quicksearch.c:548

 msgid " Clear "
 msgstr " Netejar "
 
 msgid " Clear "
 msgstr " Netejar "
 

-#: src/gtk/quicksearch.c:480 src/summary_search.c:255
+#: src/gtk/quicksearch.c:569 src/summary_search.c:350

 msgid "Edit search criteria"
 msgstr "Editar criteri de búsqueda"
 
 msgid "Edit search criteria"
 msgstr "Editar criteri de búsqueda"
 

-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:575

 msgid " Extended Symbols... "
 msgstr "Símbols Extesos... "
 
 msgid " Extended Symbols... "
 msgstr "Símbols Extesos... "
 

-#: src/gtk/quicksearch.c:917 src/summaryview.c:993
+#: src/gtk/quicksearch.c:1025 src/summaryview.c:1073

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscant a  %s... \n"
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Buscant a  %s... \n"


@@ -3759,7 +4204,7 @@ msgid "Signer"
 msgstr "Signant"
 
 #: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163
 msgstr "Signant"
 
 #: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163

-#: src/prefs_filtering.c:294 src/prefs_themes.c:883
+#: src/prefs_themes.c:883

 msgid "Name: "
 msgstr "Nom: "
 
 msgid "Name: "
 msgstr "Nom: "
 


@@ -3858,31 +4303,31 @@ msgstr "_Veure certificats"
 msgid "Changed SSL Certificate"
 msgstr "Certificat SSL canviat"
 
 msgid "Changed SSL Certificate"
 msgstr "Certificat SSL canviat"
 

-#: src/headerview.c:196 src/summaryview.c:2633 src/summaryview.c:2644
+#: src/headerview.c:195 src/summaryview.c:2784 src/summaryview.c:2795

 msgid "(No From)"
 msgstr "(Sense remitent)"
 
 msgid "(No From)"
 msgstr "(Sense remitent)"
 

-#: src/headerview.c:211 src/summaryview.c:2669 src/summaryview.c:2672
+#: src/headerview.c:210 src/summaryview.c:2819 src/summaryview.c:2822

 msgid "(No Subject)"
 msgstr "(Sense assumpte)"
 
 msgid "(No Subject)"
 msgstr "(Sense assumpte)"
 

-#: src/image_viewer.c:288
+#: src/image_viewer.c:283

 msgid "Filename:"
 msgstr "Nomb d'arxiu:"
 
 msgid "Filename:"
 msgstr "Nomb d'arxiu:"
 

-#: src/image_viewer.c:295
+#: src/image_viewer.c:290

 msgid "Filesize:"
 msgstr "Tamany d'arxiu:"
 
 msgid "Filesize:"
 msgstr "Tamany d'arxiu:"
 

-#: src/image_viewer.c:316
+#: src/image_viewer.c:311

 msgid "Load Image"
 msgstr "Carregar imatge"
 
 msgid "Load Image"
 msgstr "Carregar imatge"
 

-#: src/image_viewer.c:322
+#: src/image_viewer.c:317

 msgid "Content-Type:"
 msgstr "Content-Type:"
 
 msgid "Content-Type:"
 msgstr "Content-Type:"
 

-#: src/imap.c:616
+#: src/imap.c:632

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3894,185 +4339,227 @@ msgstr ""
 "Els logins CRAM-MD5 només funcionen si libetpan ha estat compilat amb suport "
 "SASL i el mòdul CRAM-MD5 SASL està instal·lat."
 
 "Els logins CRAM-MD5 només funcionen si libetpan ha estat compilat amb suport "
 "SASL i el mòdul CRAM-MD5 SASL està instal·lat."
 

-#: src/imap.c:625
+#: src/imap.c:639

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Ha fallat la connexió amb %s: login refusat.%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Ha fallat la connexió amb %s: login refusat.%s"
 

-#: src/imap.c:629
+#: src/imap.c:643

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Ha fallat la connexió a %s: login %s refusat.\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Ha fallat la connexió a %s: login %s refusat.\n"
 

-#: src/imap.c:646
+#: src/imap.c:660

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Connexió amb %s fallida"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Connexió amb %s fallida"
 

-#: src/imap.c:651 src/imap.c:654
+#: src/imap.c:665 src/imap.c:668

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexió IMAP4 amb %s s'ha desconnectat. Reconnectant...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexió IMAP4 amb %s s'ha desconnectat. Reconnectant...\n"
 

-#: src/imap.c:692 src/imap.c:2153 src/imap.c:2653 src/imap.c:2737
-#: src/imap.c:3075 src/imap.c:3831
-msgid "Sylpheed-Claws needs network access in order to access the IMAP server."
-msgstr "Sylpheed-Claws necessita accés a xarxa per accedir al servidor IMAP."
+#: src/imap.c:717 src/imap.c:2239 src/imap.c:2737 src/imap.c:2822
+#: src/imap.c:3156 src/imap.c:3914
+msgid "Claws Mail needs network access in order to access the IMAP server."
+msgstr "Claws Mail necessita accés a xarxa per accedir al servidor IMAP."

 
 

-#: src/imap.c:764 src/inc.c:759 src/news.c:295 src/send_message.c:299
+#: src/imap.c:789 src/inc.c:770 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Connexió no segura"
 
 msgid "Insecure connection"
 msgstr "Connexió no segura"
 

-#: src/imap.c:765 src/inc.c:760 src/news.c:296 src/send_message.c:300
+#: src/imap.c:790 src/inc.c:771 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "

-"available in this build of Sylpheed-Claws. \n"
+"available in this build of Claws Mail. \n"

 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""

+"Aquesta connexió s'ha configurat per ser segura usant SSL, però SSL no està "
+"disponible en aquesta compilació de Claws Mail.\n"
+"\n"

 "Voleu seguir connectant-vos a aquest servidor? La comunicació pot no ser "
 "segura."
 
 "Voleu seguir connectant-vos a aquest servidor? La comunicació pot no ser "
 "segura."
 

-#: src/imap.c:771 src/inc.c:766 src/news.c:302 src/send_message.c:306
+#: src/imap.c:796 src/inc.c:777 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "Con_tinuar connectant"
 
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar connectant"
 

-#: src/imap.c:781
+#: src/imap.c:806

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Connectant al servidor IMAP4: %s ..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Connectant al servidor IMAP4: %s ..."
 

-#: src/imap.c:813
+#: src/imap.c:844

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "No s'ha pogut connectar al servidor IMAP4: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "No s'ha pogut connectar al servidor IMAP4: %s:%d"
 

-#: src/imap.c:816
+#: src/imap.c:847

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No s'ha pogut connectar al servidor IMAP4: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No s'ha pogut connectar al servidor IMAP4: %s:%d\n"
 

-#: src/imap.c:845
+#: src/imap.c:876 src/imap.c:2545

 msgid "Can't start TLS session.\n"
 msgstr "No s'ha pogut iniciar la sessió TLS.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "No s'ha pogut iniciar la sessió TLS.\n"
 

-#: src/imap.c:882
+#: src/imap.c:913

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Connectant al servidor IMAP4 %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Connectant al servidor IMAP4 %s...\n"
 

-#: src/imap.c:894
+#: src/imap.c:924 src/imap.c:927
+#, c-format

 msgid "Couldn't login to IMAP server %s."
 msgstr "No s'ha pogut realitzar el login al IMAP %s."
 
 msgid "Couldn't login to IMAP server %s."
 msgstr "No s'ha pogut realitzar el login al IMAP %s."
 

-#: src/imap.c:1067
+#: src/imap.c:1100

 msgid "Adding messages..."
 msgstr "Afegint missatges..."
 
 msgid "Adding messages..."
 msgstr "Afegint missatges..."
 

-#: src/imap.c:1215 src/mh.c:500
+#: src/imap.c:1252 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Copiant missatges..."
 
 msgid "Copying messages..."
 msgstr "Copiant missatges..."
 

-#: src/imap.c:1342
+#: src/imap.c:1428

 msgid "can't set deleted flags\n"
 msgstr "no s'han pogut establir els flags esborrats\n"
 
 msgid "can't set deleted flags\n"
 msgstr "no s'han pogut establir els flags esborrats\n"
 

-#: src/imap.c:1348 src/imap.c:3583
+#: src/imap.c:1434 src/imap.c:3665

 msgid "can't expunge\n"
 msgstr "no s'ha pogut ampliar\n"
 
 msgid "can't expunge\n"
 msgstr "no s'ha pogut ampliar\n"
 

-#: src/imap.c:1792
+#: src/imap.c:1878

 msgid "can't create mailbox: LIST failed\n"
 msgstr "no s'ha pogut crear la bústia: LIST ha fallat\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no s'ha pogut crear la bústia: LIST ha fallat\n"
 

-#: src/imap.c:1808
+#: src/imap.c:1894

 msgid "can't create mailbox\n"
 msgstr "no s'ha pogut crear la bústia\n"
 
 msgid "can't create mailbox\n"
 msgstr "no s'ha pogut crear la bústia\n"
 

-#: src/imap.c:1889
+#: src/imap.c:1975

 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "El nou nom de la carpeta no ha de contenir el separador de l'espai de noms"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "El nou nom de la carpeta no ha de contenir el separador de l'espai de noms"
 

-#: src/imap.c:1920
+#: src/imap.c:2006

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no s'ha pogut reanomenar la bústia: %s a %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no s'ha pogut reanomenar la bústia: %s a %s\n"
 

-#: src/imap.c:1984
+#: src/imap.c:2070

 msgid "can't delete mailbox\n"
 msgstr "no s'ha pogut esborrar la bústia\n"
 
 msgid "can't delete mailbox\n"
 msgstr "no s'ha pogut esborrar la bústia\n"
 

-#: src/imap.c:2265
+#: src/imap.c:2316

 msgid "LIST failed\n"
 msgstr "LIST fallida\n"
 
 msgid "LIST failed\n"
 msgstr "LIST fallida\n"
 

-#: src/imap.c:2373
+#: src/imap.c:2433

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "No s'ha pogut seleccionar la carpeta: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "No s'ha pogut seleccionar la carpeta: %s\n"
 

-#: src/imap.c:2658
+#: src/imap.c:2542
+msgid "Server requires TLS to log in.\n"
+msgstr "El servidor requereix TLS per accedir-hi.\n"
+
+#: src/imap.c:2551
+msgid "Can't refresh capabilities.\n"
+msgstr "No es poden refrescar les capacitats.\n"
+
+#: src/imap.c:2556
+#, c-format
+msgid ""
+"Connection to %s failed: server requires TLS, but Claws Mail has been "
+"compiled without OpenSSL support.\n"
+msgstr "La connexió a %s ha fallat: el servidor reqauerexi TLS, però Claws Mail ha "
+"estat compilat sense suport OpenSSL.\n"
+
+#: src/imap.c:2564
+msgid "Server logins are disabled.\n"
+msgstr "Els accessos al servidors estan deshabilitats.\n"
+
+#: src/imap.c:2742

 msgid "Fetching message..."
 msgstr "Rebent missatge..."
 
 msgid "Fetching message..."
 msgstr "Rebent missatge..."
 

-#: src/imap.c:2824
+#: src/imap.c:2909

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no pot convertir UTF-7 a %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no pot convertir UTF-7 a %s\n"
 

-#: src/imap.c:2854
+#: src/imap.c:2939

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no pot convertir %s a UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no pot convertir %s a UTF-7\n"
 

-#: src/imap.c:2898
+#: src/imap.c:2983

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv no pot convertir UTF-8 a UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv no pot convertir UTF-8 a UTF-7\n"
 

-#: src/imap.c:3568
+#: src/imap.c:3650

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no s'han pogut establir els flags esborrats: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "no s'han pogut establir els flags esborrats: %d\n"
 

+#: src/imap.c:4378
+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 "
+"disabled.\n"
+"\n"
+"You probably need to install libetpan and recompile Claws Mail."
+msgstr ""
+"Teniu un o més comptes IMAP definit(s). Tot i això, aquesta versió de "
+"Claws Mail ha estat compilada sense suport IMAP; els compte(s) seran "
+"deshabili-tades.\n"
+"\n"
+"Probablement necessiteu instal·lar libetpan i recompilar Claws Mail."
+

 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/Crear _nova carpeta..."
 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/Crear _nova carpeta..."
 

-#: src/imap_gtk.c:56 src/mh_gtk.c:51
+#: src/imap_gtk.c:57 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr "/_Reanomenar carpeta..."
 
 msgid "/_Rename folder..."
 msgstr "/_Reanomenar carpeta..."
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:58 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr "/M_oure carpeta..."
 
 msgid "/M_ove folder..."
 msgstr "/M_oure carpeta..."
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:59 src/mh_gtk.c:54
+msgid "/Cop_y folder..."
+msgstr "/Cop_iar carpeta..."
+
+#: src/imap_gtk.c:61 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr "/Es_borrar carpeta..."
 
 msgid "/_Delete folder..."
 msgstr "/Es_borrar carpeta..."
 

-#: src/imap_gtk.c:60 src/news_gtk.c:55
+#: src/imap_gtk.c:63 src/news_gtk.c:55

 msgid "/Synchronise"
 msgstr "/Sincronitzar"
 
 msgid "/Synchronise"
 msgstr "/Sincronitzar"
 

-#: src/imap_gtk.c:61 src/news_gtk.c:56
+#: src/imap_gtk.c:64 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr "/Descarregar missatges"
 
 msgid "/Down_load messages"
 msgstr "/Descarregar missatges"
 

-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:58
+#: src/imap_gtk.c:66 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr "/_Comprovar si hi ha missatges nous"
 
 msgid "/_Check for new messages"
 msgstr "/_Comprovar si hi ha missatges nous"
 

-#: src/imap_gtk.c:64 src/mh_gtk.c:56
+#: src/imap_gtk.c:67 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr "/_Comprovar per noves carpetes"
 
 msgid "/C_heck for new folders"
 msgstr "/_Comprovar per noves carpetes"
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:57
+#: src/imap_gtk.c:68 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruïr l'arbre de carpetes"
 
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruïr l'arbre de carpetes"
 

-#: src/imap_gtk.c:135
+#: src/imap_gtk.c:138

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"


@@ -4082,21 +4569,21 @@ msgstr ""
 "(si voleu crear una carpeta per emmagatzemar subcarpetes\n"
 "i no mails, afegiu `/' al final del nom)"
 
 "(si voleu crear una carpeta per emmagatzemar subcarpetes\n"
 "i no mails, afegiu `/' al final del nom)"
 

-#: src/imap_gtk.c:193 src/mh_gtk.c:228
+#: src/imap_gtk.c:196 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introdueixi el nou nom per a '%s':"
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Introdueixi el nou nom per a '%s':"
 

-#: src/imap_gtk.c:195 src/mh_gtk.c:230
+#: src/imap_gtk.c:198 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr "Reanomenar carpeta"
 
 msgid "Rename folder"
 msgstr "Reanomenar carpeta"
 

-#: src/imap_gtk.c:204 src/imap_gtk.c:209
+#: src/imap_gtk.c:207 src/imap_gtk.c:212

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no s'ha pogut incloure al nom de la carpeta."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no s'ha pogut incloure al nom de la carpeta."
 

-#: src/imap_gtk.c:226 src/mh_gtk.c:255
+#: src/imap_gtk.c:229 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -4104,7 +4591,7 @@ msgstr ""
 "No s'ha pogut reanomenar la carpeta.\n"
 "El nou nom no està permès."
 
 "No s'ha pogut reanomenar la carpeta.\n"
 "El nou nom no està permès."
 

-#: src/imap_gtk.c:280 src/mh_gtk.c:176
+#: src/imap_gtk.c:281 src/mh_gtk.c:179

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -4117,12 +4604,12 @@ msgstr ""
 "\n"
 "Voleu eliminar-los definitivament?"
 
 "\n"
 "Voleu eliminar-los definitivament?"
 

-#: src/imap_gtk.c:302 src/mh_gtk.c:198 src/news_gtk.c:238
+#: src/imap_gtk.c:303 src/mh_gtk.c:201 src/news_gtk.c:238

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No es pot eliminar la carpeta '%s'."
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No es pot eliminar la carpeta '%s'."
 

-#: src/imap_gtk.c:362 src/news_gtk.c:299
+#: src/imap_gtk.c:363 src/news_gtk.c:299

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "S'ha produït algun error al descarregar els missatges a `%s'."
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "S'ha produït algun error al descarregar els missatges a `%s'."


@@ -4312,139 +4799,139 @@ msgstr "Seleccionar arxiu Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importar arxiu Pine a l'agenda"
 
 msgid "Import Pine file into Address Book"
 msgstr "Importar arxiu Pine a l'agenda"
 

-#: src/inc.c:172 src/inc.c:277 src/inc.c:303
-msgid "Sylpheed-Claws needs network access in order to get mails."
-msgstr "Sylpheed-Claws necessita xarxa per descarregar els correus."
+#: src/inc.c:173 src/inc.c:278 src/inc.c:304
+msgid "Claws Mail needs network access in order to get mails."
+msgstr "Claws Mail necessita xarxa per descarregar els correus."

 
 

-#: src/inc.c:373
+#: src/inc.c:384

 msgid "Retrieving new messages"
 msgstr "Obtenint nous missatges"
 
 msgid "Retrieving new messages"
 msgstr "Obtenint nous missatges"
 

-#: src/inc.c:420
+#: src/inc.c:443

 msgid "Standby"
 msgstr "En espera"
 
 msgid "Standby"
 msgstr "En espera"
 

-#: src/inc.c:550 src/inc.c:600
+#: src/inc.c:572 src/inc.c:622

 msgid "Cancelled"
 msgstr "Cancellat"
 
 msgid "Cancelled"
 msgstr "Cancellat"
 

-#: src/inc.c:561
+#: src/inc.c:583

 msgid "Retrieving"
 msgstr "Recuperant"
 
 msgid "Retrieving"
 msgstr "Recuperant"
 

-#: src/inc.c:570
+#: src/inc.c:592

 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Fet (%d missatge (%s) rebut)"
 msgstr[1] "Fet (%d missatge(s) (%s) rebut(s))"
 
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Fet (%d missatge (%s) rebut)"
 msgstr[1] "Fet (%d missatge(s) (%s) rebut(s))"
 

-#: src/inc.c:576
+#: src/inc.c:598

 msgid "Done (no new messages)"
 msgstr "Fet (no hi ha missatges nous)"
 
 msgid "Done (no new messages)"
 msgstr "Fet (no hi ha missatges nous)"
 

-#: src/inc.c:581
+#: src/inc.c:603

 msgid "Connection failed"
 msgstr "Connexió fallida"
 
 msgid "Connection failed"
 msgstr "Connexió fallida"
 

-#: src/inc.c:584
+#: src/inc.c:606

 msgid "Auth failed"
 msgstr "Authorizació fallida"
 
 msgid "Auth failed"
 msgstr "Authorizació fallida"
 

-#: src/inc.c:587 src/prefs_summary_column.c:89
+#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2372

 msgid "Locked"
 msgstr "Bloquejat"
 
 msgid "Locked"
 msgstr "Bloquejat"
 

-#: src/inc.c:597 src/plugins/spamassassin/spamassassin_gtk.c:345
+#: src/inc.c:619 src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "Temps límit"
 
 msgid "Timeout"
 msgstr "Temps límit"
 

-#: src/inc.c:701
+#: src/inc.c:712

 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Finalitzat (%d missatge nou)"
 msgstr[1] "Finalitzat (%d missatge(s) nou(s))"
 
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Finalitzat (%d missatge nou)"
 msgstr[1] "Finalitzat (%d missatge(s) nou(s))"
 

-#: src/inc.c:705
+#: src/inc.c:716

 msgid "Finished (no new messages)"
 msgstr "Finalitzat (no hi ha missatges nous)"
 
 msgid "Finished (no new messages)"
 msgstr "Finalitzat (no hi ha missatges nous)"
 

-#: src/inc.c:743
+#: src/inc.c:754

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperant nous missatges"
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperant nous missatges"
 

-#: src/inc.c:775
+#: src/inc.c:786

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectant al servidor POP3: %s..."
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectant al servidor POP3: %s..."
 

-#: src/inc.c:787
-#, c-format
-msgid "Can't connect to POP3 server: %s:%d\n"
-msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d\n"
-
-#: src/inc.c:794
+#: src/inc.c:803

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d"
 

-#: src/inc.c:875 src/send_message.c:472
+#: src/inc.c:807
+#, c-format
+msgid "Can't connect to POP3 server: %s:%d\n"
+msgstr "No s'ha pogut connectar amb el servidor POP3: %s:%d\n"
+
+#: src/inc.c:887 src/send_message.c:472

 msgid "Authenticating..."
 msgstr "Autentificant..."
 
 msgid "Authenticating..."
 msgstr "Autentificant..."
 

-#: src/inc.c:877
+#: src/inc.c:889

 #, c-format
 msgid "Retrieving messages from %s (%s) ..."
 msgstr "Obtenint missatges de %s (%s) ..."
 
 #, c-format
 msgid "Retrieving messages from %s (%s) ..."
 msgstr "Obtenint missatges de %s (%s) ..."
 

-#: src/inc.c:883
+#: src/inc.c:895

 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtenint el número de nous missatges (STAT)..."
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obtenint el número de nous missatges (STAT)..."
 

-#: src/inc.c:887
+#: src/inc.c:899

 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtenint el número de nous missatges (LAST)..."
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obtenint el número de nous missatges (LAST)..."
 

-#: src/inc.c:891
+#: src/inc.c:903

 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtenint el número de nous missatges (UIDL)..."
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obtenint el número de nous missatges (UIDL)..."
 

-#: src/inc.c:895
+#: src/inc.c:907

 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtenint el tamany dels nous missatges (LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtenint el tamany dels nous missatges (LIST)..."
 

-#: src/inc.c:902 src/send_message.c:490
+#: src/inc.c:914 src/send_message.c:490

 msgid "Quitting"
 msgstr "Sortint"
 
 msgid "Quitting"
 msgstr "Sortint"
 

-#: src/inc.c:927
+#: src/inc.c:939

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperant missatge (%d / %d) (%s / %s)"
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperant missatge (%d / %d) (%s / %s)"
 

-#: src/inc.c:946
+#: src/inc.c:958

 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recuperant (%d missatge (%s) rebut)"
 msgstr[1] "Recuperant (%d missatge(s) (%s) rebut(s))"
 
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Recuperant (%d missatge (%s) rebut)"
 msgstr[1] "Recuperant (%d missatge(s) (%s) rebut(s))"
 

-#: src/inc.c:1102
+#: src/inc.c:1114

 msgid "Connection failed."
 msgstr "Connexió fallida."
 
 msgid "Connection failed."
 msgstr "Connexió fallida."
 

-#: src/inc.c:1105
+#: src/inc.c:1118

 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Connexió amb %s:%d fallida."
 
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Connexió amb %s:%d fallida."
 

-#: src/inc.c:1110
+#: src/inc.c:1123

 msgid "Error occurred while processing mail."
 msgstr "S'ha produït un error mentre es processava el correu."
 
 msgid "Error occurred while processing mail."
 msgstr "S'ha produït un error mentre es processava el correu."
 

-#: src/inc.c:1115
+#: src/inc.c:1129

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"


@@ -4453,37 +4940,37 @@ msgstr ""
 "S'ha produït un error mentre es processava el correu:\n"
 "%s"
 
 "S'ha produït un error mentre es processava el correu:\n"
 "%s"
 

-#: src/inc.c:1121
+#: src/inc.c:1135

 msgid "No disk space left."
 msgstr "No hi ha espai liure en disc."
 
 msgid "No disk space left."
 msgstr "No hi ha espai liure en disc."
 

-#: src/inc.c:1126
+#: src/inc.c:1140

 msgid "Can't write file."
 msgstr "No es pot escriure l'arxiu."
 
 msgid "Can't write file."
 msgstr "No es pot escriure l'arxiu."
 

-#: src/inc.c:1131
+#: src/inc.c:1145

 msgid "Socket error."
 msgstr "Error de socket."
 
 msgid "Socket error."
 msgstr "Error de socket."
 

-#: src/inc.c:1134
+#: src/inc.c:1148

 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de socket connectant amb %s:%d."
 
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Error de socket connectant amb %s:%d."
 

-#: src/inc.c:1139 src/send_message.c:400 src/send_message.c:615
+#: src/inc.c:1153 src/send_message.c:400 src/send_message.c:637

 msgid "Connection closed by the remote host."
 msgstr "Connexió tancada per la màquina remota."
 
 msgid "Connection closed by the remote host."
 msgstr "Connexió tancada per la màquina remota."
 

-#: src/inc.c:1142
+#: src/inc.c:1156

 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Connexió amb %s:%d tancada per la màquina remota."
 
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Connexió amb %s:%d tancada per la màquina remota."
 

-#: src/inc.c:1147
+#: src/inc.c:1161

 msgid "Mailbox is locked."
 msgstr "La bústia està bloquejada."
 
 msgid "Mailbox is locked."
 msgstr "La bústia està bloquejada."
 

-#: src/inc.c:1151
+#: src/inc.c:1165

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 #, c-format
 msgid ""
 "Mailbox is locked:\n"


@@ -4492,11 +4979,11 @@ msgstr ""
 "La bústia està bloquejada:\n"
 "%s"
 
 "La bústia està bloquejada:\n"
 "%s"
 

-#: src/inc.c:1157 src/send_message.c:600
+#: src/inc.c:1171 src/send_message.c:622

 msgid "Authentication failed."
 msgstr "Autentificació fallida."
 
 msgid "Authentication failed."
 msgstr "Autentificació fallida."
 

-#: src/inc.c:1162 src/send_message.c:603
+#: src/inc.c:1177 src/send_message.c:625

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -4505,25 +4992,25 @@ msgstr ""
 "L'autentificació ha fallat:\n"
 "%s"
 
 "L'autentificació ha fallat:\n"
 "%s"
 

-#: src/inc.c:1167 src/send_message.c:619
+#: src/inc.c:1182 src/send_message.c:641

 msgid "Session timed out."
 msgstr "Excedit el temps límit de la sessió."
 
 msgid "Session timed out."
 msgstr "Excedit el temps límit de la sessió."
 

-#: src/inc.c:1170
+#: src/inc.c:1185

 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La connexió amb %s:%d ha excedit el límit de temps."
 
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "La connexió amb %s:%d ha excedit el límit de temps."
 

-#: src/inc.c:1205
+#: src/inc.c:1223

 msgid "Incorporation cancelled\n"
 msgstr "Incorporació cancel·lada\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Incorporació cancel·lada\n"
 

-#: src/inc.c:1442
+#: src/inc.c:1460

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sEsteu treballant sense connexió. Ignorar durant %d minuts?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sEsteu treballant sense connexió. Ignorar durant %d minuts?"
 

-#: src/inc.c:1449
+#: src/inc.c:1467

 msgid "On_ly once"
 msgstr "Només _una vegada"
 
 msgid "On_ly once"
 msgstr "Només _una vegada"
 


@@ -4531,7 +5018,7 @@ msgstr "Nom
 msgid "Nick Name"
 msgstr "Motiu (nick)"
 
 msgid "Nick Name"
 msgstr "Motiu (nick)"
 

-#: src/main.c:175
+#: src/main.c:180

 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 #, c-format
 msgid ""
 "File '%s' already exists.\n"


@@ -4540,60 +5027,49 @@ msgstr ""
 "L'arxiu '%s' ja existeix.\n"
 "No s'ha pogut crear la carpeta."
 
 "L'arxiu '%s' ja existeix.\n"
 "No s'ha pogut crear la carpeta."
 

-#: src/main.c:264
-#, c-format
+#: src/main.c:270

 msgid ""
 msgid ""

-"Configuration for Sylpheed-Claws %s found.\n"
+"Configuration for %s (or previous) found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"Trobada configuració %s per Sylpheed-Claws.\n"
+"Trobada configuració per %s (o previa).\n"

 "Voleu migrar aquesta configuració?"
 
 "Voleu migrar aquesta configuració?"
 

-#: src/main.c:267
-msgid "1.0.5 or previous"
-msgstr "1.0.5 o prèvia"
-
-#: src/main.c:267
-msgid "1.9.15 or previous"
-msgstr "1.9.15 o prèvia"
-
-#: src/main.c:270
+#: src/main.c:274

 msgid "Migration of configuration"
 msgstr "migració de configuració"
 
 msgid "Migration of configuration"
 msgstr "migració de configuració"
 

-#: src/main.c:276
+#: src/main.c:280

 msgid "Copying configuration..."
 msgstr "Copiant configuració..."
 
 msgid "Copying configuration..."
 msgstr "Copiant configuració..."
 

-#: src/main.c:281
+#: src/main.c:285

 msgid "Migration failed!"
 msgstr "Migració fallida!"
 
 msgid "Migration failed!"
 msgstr "Migració fallida!"
 

-#: src/main.c:348
+#: src/main.c:572

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no està soportat per glib.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no està soportat per glib.\n"
 

-#: src/main.c:354
+#: src/main.c:578

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with a more recent GTK+ library than is "
+"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 "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "

-"recompile Sylpheed-Claws."
+"recompile Claws Mail."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws ha estat compilat amb una llibreria GTK+ més recent de la "
-"disponible actualment. Això causarà un error. Necessiteu actualitzar GTK+ o"
-"recompilar Sylpheed-Claws."
+"Claws Mail ha estat compilat amb una llibreria GTK+ més recent de la "
+"disponible actualment. Això causarà un error. Necessiteu actualitzar GTK+ "
+"orecompilar Claws Mail."

 
 

-#: src/main.c:363
+#: src/main.c:587

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with an older GTK+ library than is "
-"currently available. This will cause crashes. You need to recompile Sylpheed-"
-"Claws."
+"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 ""
 msgstr ""

-"Sylpheed-Claws ha estat compilat amb una llibreria GTK+ més antiga de la "
-"disponible actualment. Això causarà un error. Necessiteu recompilar Sylpheed-"
-"Claws."
+"Claws Mail ha estat compilat amb una llibreria GTK+ més antiga de la "
+"disponible actualment. Això causarà un error. Necessiteu recompilar Claws Mail."

 
 

-#: src/main.c:561
+#: src/main.c:810

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."


@@ -4601,32 +5077,42 @@ msgstr ""
 "Alguns mòduls no s'han pogut carregar.Comprova la configuració dels mòduls "
 "per més informació."
 
 "Alguns mòduls no s'han pogut carregar.Comprova la configuració dels mòduls "
 "per més informació."
 

-#: src/main.c:571
+#: src/main.c:822
+msgid ""
+"Claws Mail has detected a configured mailbox, but is it incomplete. It is "
+"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
+"mailbox's folder to try to fix it."
+msgstr ""
+"Claws Mail ha detectat una bústia configurada, però es incompleta. Pot ser "
+"degut a un compte IMAP que estigui fallant. Useu \"Reconstruïr l'arbre de carpetes\" "
+"a la carpeta de la bústia per intentar arreglar-ho."
+
+#: src/main.c:828

 msgid ""
 msgid ""

-"Sylpheed-Claws has detected a configured mailbox, but could not load it. It "
-"is probably provided by an out-of-date external plugin. Please reinstall the "
+"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 ""
 "plugin and try again."
 msgstr ""

-"Sylpheed-Claws ha detectat una bústia configurada, però no la ha pogut "
+"Claws Mail ha detectat una bústia configurada, però no la ha pogut "

 "carregar. És probable que estigui soportat per un mòdul extern "
 "desactualitzat. Si us plau reinstal·leu el mòdul i intenteu-ho una altra "
 "vegada."
 
 "carregar. És probable que estigui soportat per un mòdul extern "
 "desactualitzat. Si us plau reinstal·leu el mòdul i intenteu-ho una altra "
 "vegada."
 

-#: src/main.c:803
+#: src/main.c:1074

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Ús: %s [OPCIÓ]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Ús: %s [OPCIÓ]...\n"
 

-#: src/main.c:805
+#: src/main.c:1076

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adreça]  obre la finestra d'edició"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adreça]  obre la finestra d'edició"
 

-#: src/main.c:806
+#: src/main.c:1077

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      subscriu-re's a la URI proporcionada si es posible"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      subscriu-re's a la URI proporcionada si es posible"
 

-#: src/main.c:807
+#: src/main.c:1078

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -4636,23 +5122,23 @@ msgstr ""
 "                         obre la finestra de composició amb els arxius\n"
 "                         especificats com a adjunts"
 
 "                         obre la finestra de composició amb els arxius\n"
 "                         especificats com a adjunts"
 

-#: src/main.c:810
+#: src/main.c:1081

 msgid "  --receive              receive new messages"
 msgstr "  --receive              rep els missatges nous"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              rep els missatges nous"
 

-#: src/main.c:811
+#: src/main.c:1082

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          rep nous missatges per tots els comptes"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          rep nous missatges per tots els comptes"
 

-#: src/main.c:812
+#: src/main.c:1083

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar tots els missatges encuats"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar tots els missatges encuats"
 

-#: src/main.c:813
+#: src/main.c:1084

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  mostra el número total de missatges"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  mostra el número total de missatges"
 

-#: src/main.c:814
+#: src/main.c:1085

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -4660,904 +5146,949 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         mostra l'estat de cada carpeta"
 
 "  --status-full [carpeta]...\n"
 "                         mostra l'estat de cada carpeta"
 

-#: src/main.c:816
+#: src/main.c:1087

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"

-"                         folder is a folder id like '#mh/Mailbox/inbox'"
+"                         folder is a folder id like 'folder/sub_folder'"

 msgstr ""
 msgstr ""

-"  --select carp[/mnsj]   salteu a la carpeta/missatge especificats\n"
-"                         carpeta és un identificador estil «#mh/Mailbox/"
+"  --select carp[/msj]    salteu a la carpeta/missatge especificats\n"
+"                         carpeta és un identificador estil 'carpeta/sub_carpeta'"

 "inbox»"
 
 "inbox»"
 

-#: src/main.c:818
+#: src/main.c:1089

 msgid "  --online               switch to online mode"
 msgstr "  --online               canviar a mode de treball amb connexió"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               canviar a mode de treball amb connexió"
 

-#: src/main.c:819
+#: src/main.c:1090

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline               canviar a mode de treball sense connexió"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline               canviar a mode de treball sense connexió"
 

-#: src/main.c:820
-msgid "  --exit                 exit Sylpheed-Claws"
-msgstr "  --sortir               sortir de Sylpheed-Claws"
+#: src/main.c:1091
+msgid "  --exit                 exit Claws Mail"
+msgstr "  --sortir               sortir de Claws Mail"

 
 

-#: src/main.c:821
+#: src/main.c:1092

 msgid "  --debug                debug mode"
 msgstr "  --debug                mode de depuració"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                mode de depuració"
 

-#: src/main.c:822
+#: src/main.c:1093

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta aquesta ajuda i finalitza"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta aquesta ajuda i finalitza"
 

-#: src/main.c:823
+#: src/main.c:1094

 msgid "  --version              output version information and exit"
 msgstr "  --version              dona la informació de la versió i finalitza"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              dona la informació de la versió i finalitza"
 

-#: src/main.c:824
+#: src/main.c:1095

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           mostra el directori de la configuració"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           mostra el directori de la configuració"
 

-#: src/main.c:889
+#: src/main.c:1160

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processant (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processant (%s)..."
 

-#: src/main.c:892
+#: src/main.c:1163

 msgid "top level folder"
 msgstr "carpeta superior"
 
 msgid "top level folder"
 msgstr "carpeta superior"
 

-#: src/main.c:953
+#: src/main.c:1227

 msgid "Really quit?"
 msgstr "Sortir realment?"
 
 msgid "Really quit?"
 msgstr "Sortir realment?"
 

-#: src/main.c:954
+#: src/main.c:1228

 msgid "Composing message exists."
 msgstr "Existeixen missatges en composició."
 
 msgid "Composing message exists."
 msgstr "Existeixen missatges en composició."
 

-#: src/main.c:955
+#: src/main.c:1229

 msgid "_Save to Draft"
 msgstr "_Guardar a Borradors"
 
 msgid "_Save to Draft"
 msgstr "_Guardar a Borradors"
 

-#: src/main.c:955
+#: src/main.c:1229

 msgid "_Discard them"
 msgstr "_Descartar-los"
 
 msgid "_Discard them"
 msgstr "_Descartar-los"
 

-#: src/main.c:955
+#: src/main.c:1229

 msgid "Do_n't quit"
 msgstr "_No sortir"
 
 msgid "Do_n't quit"
 msgstr "_No sortir"
 

-#: src/main.c:969
+#: src/main.c:1244

 msgid "Queued messages"
 msgstr "Missatges en cua"
 
 msgid "Queued messages"
 msgstr "Missatges en cua"
 

-#: src/main.c:970
+#: src/main.c:1245

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hi ha missatges sense enviar a la cua. Sortir ara?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hi ha missatges sense enviar a la cua. Sortir ara?"
 

-#: src/mainwindow.c:470 src/messageview.c:155
+#: src/mainwindow.c:496 src/messageview.c:158

 msgid "/_File"
 msgstr "/_Arxiu"
 
 msgid "/_File"
 msgstr "/_Arxiu"
 

-#: src/mainwindow.c:471
+#: src/mainwindow.c:497

 msgid "/_File/_Add mailbox"
 msgstr "/_Arxiu/_Afegir bústia"
 
 msgid "/_File/_Add mailbox"
 msgstr "/_Arxiu/_Afegir bústia"
 

-#: src/mainwindow.c:472
+#: src/mainwindow.c:498

 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Arxiu/_Afegir bústia/MH..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Arxiu/_Afegir bústia/MH..."
 

-#: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:480
-#: src/mainwindow.c:482 src/mainwindow.c:485 src/mainwindow.c:488
-#: src/messageview.c:158
+#: src/mainwindow.c:499 src/mainwindow.c:501 src/mainwindow.c:506
+#: src/mainwindow.c:508 src/mainwindow.c:511 src/mainwindow.c:514
+#: src/messageview.c:161

 msgid "/_File/---"
 msgstr "/_Fitxer/---"
 
 msgid "/_File/---"
 msgstr "/_Fitxer/---"
 

-#: src/mainwindow.c:474
+#: src/mainwindow.c:500

 msgid "/_File/Change folder order..."
 msgstr "/_Arxiu/Canviar l'ordre de les carpetes..."
 
 msgid "/_File/Change folder order..."
 msgstr "/_Arxiu/Canviar l'ordre de les carpetes..."
 

-#: src/mainwindow.c:476
+#: src/mainwindow.c:502

 msgid "/_File/_Import mbox file..."
 msgstr "/_Arxiu/_Importar arxiu mbox..."
 
 msgid "/_File/_Import mbox file..."
 msgstr "/_Arxiu/_Importar arxiu mbox..."
 

-#: src/mainwindow.c:477
+#: src/mainwindow.c:503

 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arxiu/_Exportar a arxiu mbox..."
 
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Arxiu/_Exportar a arxiu mbox..."
 

-#: src/mainwindow.c:478
+#: src/mainwindow.c:504

 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr "/_Arxiu/E_xportar seleccionats a arxiu mbox..."
 
 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr "/_Arxiu/E_xportar seleccionats a arxiu mbox..."
 

-#: src/mainwindow.c:481
+#: src/mainwindow.c:507

 msgid "/_File/Empty all _Trash folders"
 msgstr "/_Arxiu/_Buidar totes les papereres"
 
 msgid "/_File/Empty all _Trash folders"
 msgstr "/_Arxiu/_Buidar totes les papereres"
 

-#: src/mainwindow.c:483 src/messageview.c:156
+#: src/mainwindow.c:509 src/messageview.c:159

 msgid "/_File/_Save as..."
 msgstr "/_Arxiu/_Guardar com..."
 
 msgid "/_File/_Save as..."
 msgstr "/_Arxiu/_Guardar com..."
 

-#: src/mainwindow.c:484 src/messageview.c:157
+#: src/mainwindow.c:510 src/messageview.c:160

 msgid "/_File/_Print..."
 msgstr "/_Arxiu/Im_primir"
 
 msgid "/_File/_Print..."
 msgstr "/_Arxiu/Im_primir"
 

-#: src/mainwindow.c:486
+#: src/mainwindow.c:512

 msgid "/_File/_Work offline"
 msgstr "/_Arxiu/_Treballar sense connexió"
 
 msgid "/_File/_Work offline"
 msgstr "/_Arxiu/_Treballar sense connexió"
 

-#: src/mainwindow.c:487
+#: src/mainwindow.c:513

 msgid "/_File/Synchronise folders"
 msgstr "/_Arxiu/Sincronitzar carpetes"
 
 msgid "/_File/Synchronise folders"
 msgstr "/_Arxiu/Sincronitzar carpetes"
 

-#: src/mainwindow.c:490
+#: src/mainwindow.c:516

 msgid "/_File/E_xit"
 msgstr "/_Arxiu/_Sortir"
 
 msgid "/_File/E_xit"
 msgstr "/_Arxiu/_Sortir"
 

-#: src/mainwindow.c:495
+#: src/mainwindow.c:521

 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _fil"
 
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _fil"
 

-#: src/mainwindow.c:497 src/messageview.c:165
+#: src/mainwindow.c:523 src/messageview.c:168

 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edició/_Buscar en el missatge actual..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edició/_Buscar en el missatge actual..."
 

-#: src/mainwindow.c:499
+#: src/mainwindow.c:525

 msgid "/_Edit/_Search folder..."
 msgstr "/_Edició/Buscar a la _carpeta..."
 
 msgid "/_Edit/_Search folder..."
 msgstr "/_Edició/Buscar a la _carpeta..."
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:526

 msgid "/_Edit/_Quick search"
 msgstr "/_Edició/_Busqueda ràpida"
 
 msgid "/_Edit/_Quick search"
 msgstr "/_Edició/_Busqueda ràpida"
 

-#: src/mainwindow.c:501 src/messageview.c:168 src/summaryview.c:472
+#: src/mainwindow.c:527 src/messageview.c:171 src/summaryview.c:472

 msgid "/_View"
 msgstr "/_Veure"
 
 msgid "/_View"
 msgstr "/_Veure"
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:528

 msgid "/_View/Show or hi_de"
 msgstr "/_Veure/_Mostrar o ocultar"
 
 msgid "/_View/Show or hi_de"
 msgstr "/_Veure/_Mostrar o ocultar"
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:529

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Veure/_Mostrar o ocultar/_Arbre de carpetes"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Veure/_Mostrar o ocultar/_Arbre de carpetes"
 

-#: src/mainwindow.c:505
+#: src/mainwindow.c:531

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Veure/_Mostrar o ocultar/_Vista de missatge"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Veure/_Mostrar o ocultar/_Vista de missatge"
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:533

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Veure/_Mostrar o ocultar/_Eines"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Veure/_Mostrar o ocultar/_Eines"
 

-#: src/mainwindow.c:509
+#: src/mainwindow.c:535

 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/_Text sota icones"
 
 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/_Text sota icones"
 

-#: src/mainwindow.c:511
+#: src/mainwindow.c:537

 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/Text al co_stat de les icones"
 
 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/Text al co_stat de les icones"
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:539

 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/Només _icones"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/Només _icones"
 

-#: src/mainwindow.c:515
+#: src/mainwindow.c:541

 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/Només _text"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/Només _text"
 

-#: src/mainwindow.c:517
+#: src/mainwindow.c:543

 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/_Ocultar"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr "/_Veure/_Mostrar o ocultar/__Eines/_Ocultar"
 

-#: src/mainwindow.c:519
+#: src/mainwindow.c:545

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Veure/_Mostrar o ocultar/_Barra d'estat"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Veure/_Mostrar o ocultar/_Barra d'estat"
 

-#: src/mainwindow.c:521
+#: src/mainwindow.c:547

 msgid "/_View/Set displayed _columns"
 msgstr "/_Veure/Definint _columnes mostrades"
 
 msgid "/_View/Set displayed _columns"
 msgstr "/_Veure/Definint _columnes mostrades"
 

-#: src/mainwindow.c:522
+#: src/mainwindow.c:548

 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr "/_Veure/Definint _columnes mostrades/ a la ll_ista de carpetes..."
 
 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr "/_Veure/Definint _columnes mostrades/ a la ll_ista de carpetes..."
 

-#: src/mainwindow.c:523
+#: src/mainwindow.c:549

 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/_Veure/Definint _columnes mostrades/a la llista de _missatges..."
 
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/_Veure/Definint _columnes mostrades/a la llista de _missatges..."
 

-#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:556
-#: src/mainwindow.c:581 src/mainwindow.c:698 src/mainwindow.c:702
-#: src/messageview.c:274
+#: src/mainwindow.c:551 src/mainwindow.c:554 src/mainwindow.c:582
+#: src/mainwindow.c:612 src/mainwindow.c:729 src/mainwindow.c:737
+#: src/messageview.c:277

 msgid "/_View/---"
 msgstr "/_Veure/---"
 
 msgid "/_View/---"
 msgstr "/_Veure/---"
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:552

 msgid "/_View/Separate f_older tree"
 msgstr "/_Veure/_Separar l'arbre de carpetes"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/_Veure/_Separar l'arbre de carpetes"
 

-#: src/mainwindow.c:527
+#: src/mainwindow.c:553

 msgid "/_View/Separate _message view"
 msgstr "/_Veure/Vista de missatges separada"
 
 msgid "/_View/Separate _message view"
 msgstr "/_Veure/Vista de missatges separada"
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:555

 msgid "/_View/_Sort"
 msgstr "/_Veure/_Ordenar"
 
 msgid "/_View/_Sort"
 msgstr "/_Veure/_Ordenar"
 

-#: src/mainwindow.c:530
+#: src/mainwindow.c:556

 msgid "/_View/_Sort/by _number"
 msgstr "/_Veure/_Ordenar/per _número"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/_Veure/_Ordenar/per _número"
 

-#: src/mainwindow.c:531
+#: src/mainwindow.c:557

 msgid "/_View/_Sort/by S_ize"
 msgstr "/_Veure/_Ordenar/per T_amany"
 
 msgid "/_View/_Sort/by S_ize"
 msgstr "/_Veure/_Ordenar/per T_amany"
 

-#: src/mainwindow.c:532
+#: src/mainwindow.c:558

 msgid "/_View/_Sort/by _Date"
 msgstr "/_Veure/_Ordenar/per _Data"
 
 msgid "/_View/_Sort/by _Date"
 msgstr "/_Veure/_Ordenar/per _Data"
 

-#: src/mainwindow.c:533
+#: src/mainwindow.c:559

 msgid "/_View/_Sort/by _From"
 msgstr "/_Veure/_Ordenar/per _Remitent"
 
 msgid "/_View/_Sort/by _From"
 msgstr "/_Veure/_Ordenar/per _Remitent"
 

-#: src/mainwindow.c:534
+#: src/mainwindow.c:560

 msgid "/_View/_Sort/by _To"
 msgstr "/_Veure/_Ordenar/per _Destinatari"
 
 msgid "/_View/_Sort/by _To"
 msgstr "/_Veure/_Ordenar/per _Destinatari"
 

-#: src/mainwindow.c:535
+#: src/mainwindow.c:561

 msgid "/_View/_Sort/by S_ubject"
 msgstr "/_Veure/_Ordenar/per Ass_umpte"
 
 msgid "/_View/_Sort/by S_ubject"
 msgstr "/_Veure/_Ordenar/per Ass_umpte"
 

-#: src/mainwindow.c:536
+#: src/mainwindow.c:562

 msgid "/_View/_Sort/by _color label"
 msgstr "/_Veure/_Ordenar/per color d' _etiqueta"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Veure/_Ordenar/per color d' _etiqueta"
 

-#: src/mainwindow.c:538
+#: src/mainwindow.c:564

 msgid "/_View/_Sort/by _mark"
 msgstr "/_Veure/_Ordenar/per _marca"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Veure/_Ordenar/per _marca"
 

-#: src/mainwindow.c:539
+#: src/mainwindow.c:565

 msgid "/_View/_Sort/by _status"
 msgstr "/_Veure/_Ordenar/per e_stat"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/_Veure/_Ordenar/per e_stat"
 

-#: src/mainwindow.c:540
+#: src/mainwindow.c:566

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Veure/_Ordenar/per _adjunt"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Veure/_Ordenar/per _adjunt"
 

-#: src/mainwindow.c:542
+#: src/mainwindow.c:568

 msgid "/_View/_Sort/by score"
 msgstr "/_Veure/_Ordenar/per tamany"
 
 msgid "/_View/_Sort/by score"
 msgstr "/_Veure/_Ordenar/per tamany"
 

-#: src/mainwindow.c:543
+#: src/mainwindow.c:569

 msgid "/_View/_Sort/by locked"
 msgstr "/_Veure/_Ordenar/per bloquejat"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/_Veure/_Ordenar/per bloquejat"
 

-#: src/mainwindow.c:544
+#: src/mainwindow.c:570

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Veure/_Ordenar/N_o ordenar"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Veure/_Ordenar/N_o ordenar"
 

-#: src/mainwindow.c:545 src/mainwindow.c:548
+#: src/mainwindow.c:571 src/mainwindow.c:574

 msgid "/_View/_Sort/---"
 msgstr "/_Veure/_Ordenar/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/_Veure/_Ordenar/---"
 

-#: src/mainwindow.c:546
+#: src/mainwindow.c:572

 msgid "/_View/_Sort/Ascending"
 msgstr "/_Veure/_Ordenar/Ascendent"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Veure/_Ordenar/Ascendent"
 

-#: src/mainwindow.c:547
+#: src/mainwindow.c:573

 msgid "/_View/_Sort/Descending"
 msgstr "/_Veure/_Ordenar/Descendent"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/_Veure/_Ordenar/Descendent"
 

-#: src/mainwindow.c:549
+#: src/mainwindow.c:575

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Veure/_Ordenar/Atraure _per assumpte"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Veure/_Ordenar/Atraure _per assumpte"
 

-#: src/mainwindow.c:551
+#: src/mainwindow.c:577

 msgid "/_View/Th_read view"
 msgstr "/_Veure/_Vista jeràrquica"
 
 msgid "/_View/Th_read view"
 msgstr "/_Veure/_Vista jeràrquica"
 

-#: src/mainwindow.c:552
+#: src/mainwindow.c:578

 msgid "/_View/E_xpand all threads"
 msgstr "/_Veure/E_xpandir tots els fils"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/_Veure/E_xpandir tots els fils"
 

-#: src/mainwindow.c:553
+#: src/mainwindow.c:579

 msgid "/_View/Co_llapse all threads"
 msgstr "/_Veure/Co_llapsar tots els fils"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Veure/Co_llapsar tots els fils"
 

-#: src/mainwindow.c:554
+#: src/mainwindow.c:580

 msgid "/_View/_Hide read messages"
 msgstr "/_Veure/Ama_gar els missatges llegits"
 
 msgid "/_View/_Hide read messages"
 msgstr "/_Veure/Ama_gar els missatges llegits"
 

-#: src/mainwindow.c:557
+#: src/mainwindow.c:583

 msgid "/_View/_Go to"
 msgstr "/_Veure/_Anar a"
 
 msgid "/_View/_Go to"
 msgstr "/_Veure/_Anar a"
 

-#: src/mainwindow.c:558
+#: src/mainwindow.c:584

 msgid "/_View/_Go to/_Previous message"
 msgstr "/_Veure/_Anar a/Missatge a_nterior"
 
 msgid "/_View/_Go to/_Previous message"
 msgstr "/_Veure/_Anar a/Missatge a_nterior"
 

-#: src/mainwindow.c:559
+#: src/mainwindow.c:585

 msgid "/_View/_Go to/_Next message"
 msgstr "/_Veure/_Anar a/Missatge s_egüent"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Veure/_Anar a/Missatge s_egüent"
 

-#: src/mainwindow.c:560 src/mainwindow.c:565 src/mainwindow.c:568
-#: src/mainwindow.c:573 src/mainwindow.c:578
+#: src/mainwindow.c:586 src/mainwindow.c:591 src/mainwindow.c:594
+#: src/mainwindow.c:599 src/mainwindow.c:604 src/mainwindow.c:609

 msgid "/_View/_Go to/---"
 msgstr "/_Veure/_Anar a/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/_Veure/_Anar a/---"
 

-#: src/mainwindow.c:561
+#: src/mainwindow.c:587

 msgid "/_View/_Go to/P_revious unread message"
 msgstr "/_Veure/_Anar a/_Anterior sense llegir"
 
 msgid "/_View/_Go to/P_revious unread message"
 msgstr "/_Veure/_Anar a/_Anterior sense llegir"
 

-#: src/mainwindow.c:563
+#: src/mainwindow.c:589

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Veure/_Anar a/_Següent sense llegir"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Veure/_Anar a/_Següent sense llegir"
 

-#: src/mainwindow.c:566
+#: src/mainwindow.c:592

 msgid "/_View/_Go to/Previous ne_w message"
 msgstr "/_Veure/_Anar a/Anterior no_u"
 
 msgid "/_View/_Go to/Previous ne_w message"
 msgstr "/_Veure/_Anar a/Anterior no_u"
 

-#: src/mainwindow.c:567
+#: src/mainwindow.c:593

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Veure/_Anar a/Missatge no_u següent"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Veure/_Anar a/Missatge no_u següent"
 

-#: src/mainwindow.c:569
+#: src/mainwindow.c:595

 msgid "/_View/_Go to/Previous _marked message"
 msgstr "/_Veure/_Anar a/Missatge _marcat anterior"
 
 msgid "/_View/_Go to/Previous _marked message"
 msgstr "/_Veure/_Anar a/Missatge _marcat anterior"
 

-#: src/mainwindow.c:571
+#: src/mainwindow.c:597

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Veure/_Anar a/Següent missatge marcat"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Veure/_Anar a/Següent missatge marcat"
 

-#: src/mainwindow.c:574
+#: src/mainwindow.c:600

 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/_Veure/_Anar a/Missatge etiquetat anterior"
 
 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/_Veure/_Anar a/Missatge etiquetat anterior"
 

-#: src/mainwindow.c:576
+#: src/mainwindow.c:602

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Veure/_Anar a/Següent missatge etiquetat"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Veure/_Anar a/Següent missatge etiquetat"
 

-#: src/mainwindow.c:579
+#: src/mainwindow.c:605
+msgid "/_View/_Go to/Last read message"
+msgstr "/_Veure/_Anar a/Últim missatge llegit"
+
+#: src/mainwindow.c:607
+msgid "/_View/_Go to/Parent message"
+msgstr "/_Veure/_Anar a/Missatge pare"
+
+#: src/mainwindow.c:610

 msgid "/_View/_Go to/Next unread _folder"
 msgstr "/_Veure/_Anar a/_Següent directori sense llegir"
 
 msgid "/_View/_Go to/Next unread _folder"
 msgstr "/_Veure/_Anar a/_Següent directori sense llegir"
 

-#: src/mainwindow.c:580
+#: src/mainwindow.c:611

 msgid "/_View/_Go to/_Other folder..."
 msgstr "/_Veure/_Anar a/_Anar a una altra carpeta..."
 
 msgid "/_View/_Go to/_Other folder..."
 msgstr "/_Veure/_Anar a/_Anar a una altra carpeta..."
 

-#: src/mainwindow.c:584 src/mainwindow.c:591 src/messageview.c:171
+#: src/mainwindow.c:615 src/mainwindow.c:622 src/messageview.c:174

 msgid "/_View/Character _encoding/---"
 msgstr "/_Veure/Codificació d_e caràcters/---"
 
 msgid "/_View/Character _encoding/---"
 msgstr "/_Veure/Codificació d_e caràcters/---"
 

-#: src/mainwindow.c:588 src/messageview.c:175
+#: src/mainwindow.c:619 src/messageview.c:178

 msgid "/_View/Character _encoding"
 msgstr "/_Veure/Codificació d_e caràcters"
 
 msgid "/_View/Character _encoding"
 msgstr "/_Veure/Codificació d_e caràcters"
 

-#: src/mainwindow.c:589 src/messageview.c:176
+#: src/mainwindow.c:620 src/messageview.c:179

 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Veure/Codificació d_e caràcters/_Autodetectar"
 
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Veure/Codificació d_e caràcters/_Autodetectar"
 

-#: src/mainwindow.c:592 src/messageview.c:179
+#: src/mainwindow.c:623 src/messageview.c:182

 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Veure/Codificació d_e caràcters/ASCII de 7 bits (US-ASC_II)"
 
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Veure/Codificació d_e caràcters/ASCII de 7 bits (US-ASC_II)"
 

-#: src/mainwindow.c:594 src/messageview.c:182
+#: src/mainwindow.c:625 src/messageview.c:185

 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Veure/Codificació d_e caràcters/Unicode (_UTF-8)"
 
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Veure/Codificació d_e caràcters/Unicode (_UTF-8)"
 

-#: src/mainwindow.c:598 src/messageview.c:185
+#: src/mainwindow.c:629 src/messageview.c:188

 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Veure/Codificació d_e caràcters/Europeu Occidental (ISO-8859-_1)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Veure/Codificació d_e caràcters/Europeu Occidental (ISO-8859-_1)"
 

-#: src/mainwindow.c:600 src/messageview.c:187
+#: src/mainwindow.c:631 src/messageview.c:190

 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Veure/Codificació d_e caràcters/Europeu Occidental (ISO-8859-_15)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Veure/Codificació d_e caràcters/Europeu Occidental (ISO-8859-_15)"
 

-#: src/mainwindow.c:602 src/messageview.c:189
+#: src/mainwindow.c:633 src/messageview.c:192

 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Veure/Codificació d_e caràcters/Europeu Occidental (Windows-1252)"
 
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Veure/Codificació d_e caràcters/Europeu Occidental (Windows-1252)"
 

-#: src/mainwindow.c:606 src/messageview.c:192
+#: src/mainwindow.c:637 src/messageview.c:195

 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Veure/Codificació d_e caràcters/Centreeuropeu (ISO-8859-_2)"
 
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Veure/Codificació d_e caràcters/Centreeuropeu (ISO-8859-_2)"
 

-#: src/mainwindow.c:610 src/messageview.c:195
+#: src/mainwindow.c:641 src/messageview.c:198

 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Veure/Codificació d_e caràcters/Bàltic (ISO-8859-13)"
 
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Veure/Codificació d_e caràcters/Bàltic (ISO-8859-13)"
 

-#: src/mainwindow.c:612 src/messageview.c:197
+#: src/mainwindow.c:643 src/messageview.c:200

 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Veure/Codificació d_e caràcters/Bàltic (ISO-8859-_4)"
 
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Veure/Codificació d_e caràcters/Bàltic (ISO-8859-_4)"
 

-#: src/mainwindow.c:616 src/messageview.c:200
+#: src/mainwindow.c:647 src/messageview.c:203

 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Veure/Codificació d_e caràcters/Grec (ISO-8859-_7)"
 
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Veure/Codificació d_e caràcters/Grec (ISO-8859-_7)"
 

-#: src/mainwindow.c:620 src/messageview.c:203
+#: src/mainwindow.c:651 src/messageview.c:206

 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Veure/Codificació d_e caràcters/Hebreu (ISO-8859-_8)"
 
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Veure/Codificació d_e caràcters/Hebreu (ISO-8859-_8)"
 

-#: src/mainwindow.c:622 src/messageview.c:205
+#: src/mainwindow.c:653 src/messageview.c:208

 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Veure/Codificació d_e caràcter/Hebreu (Windows-1255)"
 
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Veure/Codificació d_e caràcter/Hebreu (Windows-1255)"
 

-#: src/mainwindow.c:626 src/messageview.c:208
+#: src/mainwindow.c:657 src/messageview.c:211

 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Veure/Codificació d_e caràcters/Aràbic (ISO-8859-_6)"
 
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Veure/Codificació d_e caràcters/Aràbic (ISO-8859-_6)"
 

-#: src/mainwindow.c:628 src/messageview.c:210
+#: src/mainwindow.c:659 src/messageview.c:213

 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Veure/Codificació d_e caràcter/Aràbic (Windows-1256)"
 
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Veure/Codificació d_e caràcter/Aràbic (Windows-1256)"
 

-#: src/mainwindow.c:632 src/messageview.c:213
+#: src/mainwindow.c:663 src/messageview.c:216

 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Veure/Codificació d_e caràcters/Turc (ISO-8859-_9)"
 
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Veure/Codificació d_e caràcters/Turc (ISO-8859-_9)"
 

-#: src/mainwindow.c:636 src/messageview.c:216
+#: src/mainwindow.c:667 src/messageview.c:219

 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Veure/Codificació d_e caràcters/Ciríl·lic (ISO-8859-_5)"
 
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Veure/Codificació d_e caràcters/Ciríl·lic (ISO-8859-_5)"
 

-#: src/mainwindow.c:638 src/messageview.c:218
+#: src/mainwindow.c:669 src/messageview.c:221

 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Veure/Codificació d_e caràcters/Ciríl·lic (KOI8-_R)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Veure/Codificació d_e caràcters/Ciríl·lic (KOI8-_R)"
 

-#: src/mainwindow.c:640 src/messageview.c:220
+#: src/mainwindow.c:671 src/messageview.c:223

 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Veure/Codificació d_e caràcters/Ciríl·lic (KOI8-U)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Veure/Codificació d_e caràcters/Ciríl·lic (KOI8-U)"
 

-#: src/mainwindow.c:642 src/messageview.c:222
+#: src/mainwindow.c:673 src/messageview.c:225

 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Veure/Codificació d_e caràcter/Ciríl·lic (Windows-1251)"
 
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Veure/Codificació d_e caràcter/Ciríl·lic (Windows-1251)"
 

-#: src/mainwindow.c:646 src/messageview.c:225
+#: src/mainwindow.c:677 src/messageview.c:228

 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Veure/Codificació d_e caràcters/Japonès (ISO-2022-_JP)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Veure/Codificació d_e caràcters/Japonès (ISO-2022-_JP)"
 

-#: src/mainwindow.c:648 src/messageview.c:227
+#: src/mainwindow.c:679 src/messageview.c:230

 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Veure/Codificació d_e caràcters/Japonès (ISO-2022-JP-2)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Veure/Codificació d_e caràcters/Japonès (ISO-2022-JP-2)"
 

-#: src/mainwindow.c:650 src/messageview.c:229
+#: src/mainwindow.c:681 src/messageview.c:232

 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Veure/Codificació d_e caràcters/Japonès (_EUC-JP)"
 
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Veure/Codificació d_e caràcters/Japonès (_EUC-JP)"
 

-#: src/mainwindow.c:652 src/messageview.c:231
+#: src/mainwindow.c:683 src/messageview.c:234

 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Veure/Codificació d_e caràcters/Japonès (_Shift__JIS)"
 
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Veure/Codificació d_e caràcters/Japonès (_Shift__JIS)"
 

-#: src/mainwindow.c:656 src/messageview.c:234
+#: src/mainwindow.c:687 src/messageview.c:237

 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès simplificat (_GB2312)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès simplificat (_GB2312)"
 

-#: src/mainwindow.c:658 src/messageview.c:236
+#: src/mainwindow.c:689 src/messageview.c:239

 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès simplificat (_GB2312)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès simplificat (_GB2312)"
 

-#: src/mainwindow.c:660 src/messageview.c:238
+#: src/mainwindow.c:691 src/messageview.c:241

 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès tradicional (_Big5)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès tradicional (_Big5)"
 

-#: src/mainwindow.c:662 src/messageview.c:240
+#: src/mainwindow.c:693 src/messageview.c:243

 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès tradicional (EUC-_TW)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès tradicional (EUC-_TW)"
 

-#: src/mainwindow.c:664 src/messageview.c:242
+#: src/mainwindow.c:695 src/messageview.c:245

 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès (ISO-2022-_CN)"
 
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Veure/Codificació d_e caràcters/Chinès (ISO-2022-_CN)"
 

-#: src/mainwindow.c:668 src/messageview.c:245
+#: src/mainwindow.c:699 src/messageview.c:248

 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Veure/Codificació d_e caràcters/Coreà (EUC-_KR)"
 
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Veure/Codificació d_e caràcters/Coreà (EUC-_KR)"
 

-#: src/mainwindow.c:670 src/messageview.c:247
+#: src/mainwindow.c:701 src/messageview.c:250

 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Veure/Codificació d_e caràcters/Coreà (ISO-2022-KR)"
 
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Veure/Codificació d_e caràcters/Coreà (ISO-2022-KR)"
 

-#: src/mainwindow.c:674 src/messageview.c:250
+#: src/mainwindow.c:705 src/messageview.c:253

 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Veure/Codificació d_e caràcters/Tailandès (TIS-620)"
 
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Veure/Codificació d_e caràcters/Tailandès (TIS-620)"
 

-#: src/mainwindow.c:676 src/messageview.c:252
+#: src/mainwindow.c:707 src/messageview.c:255

 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Veure/Codificació d_e caràcters/Tailandès (Windows-874)"
 
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Veure/Codificació d_e caràcters/Tailandès (Windows-874)"
 

-#: src/mainwindow.c:683 src/mainwindow.c:689 src/messageview.c:259
-#: src/messageview.c:265
+#: src/mainwindow.c:714 src/mainwindow.c:720 src/messageview.c:262
+#: src/messageview.c:268

 msgid "/_View/Decode/---"
 msgstr "/_Veure/Decodificar/---"
 
 msgid "/_View/Decode/---"
 msgstr "/_Veure/Decodificar/---"
 

-#: src/mainwindow.c:686 src/messageview.c:262
+#: src/mainwindow.c:717 src/messageview.c:265

 msgid "/_View/Decode"
 msgstr "/_Veure/Decodificar"
 
 msgid "/_View/Decode"
 msgstr "/_Veure/Decodificar"
 

-#: src/mainwindow.c:687 src/messageview.c:263
+#: src/mainwindow.c:718 src/messageview.c:266

 msgid "/_View/Decode/_Auto detect"
 msgstr "/_Veure/Decodificar/_Autodetectar"
 
 msgid "/_View/Decode/_Auto detect"
 msgstr "/_Veure/Decodificar/_Autodetectar"
 

-#: src/mainwindow.c:690 src/messageview.c:266
+#: src/mainwindow.c:721 src/messageview.c:269

 msgid "/_View/Decode/_8bit"
 msgstr "/_Veure/Decodificar/_8bit"
 
 msgid "/_View/Decode/_8bit"
 msgstr "/_Veure/Decodificar/_8bit"
 

-#: src/mainwindow.c:691 src/messageview.c:267
+#: src/mainwindow.c:722 src/messageview.c:270

 msgid "/_View/Decode/_Quoted printable"
 msgstr "/_Veure/Decodificar/_Marca d'impressió"
 
 msgid "/_View/Decode/_Quoted printable"
 msgstr "/_Veure/Decodificar/_Marca d'impressió"
 

-#: src/mainwindow.c:692 src/messageview.c:268
+#: src/mainwindow.c:723 src/messageview.c:271

 msgid "/_View/Decode/_Base64"
 msgstr "/_Veure/Decodificar/_Base64"
 
 msgid "/_View/Decode/_Base64"
 msgstr "/_Veure/Decodificar/_Base64"
 

-#: src/mainwindow.c:693 src/messageview.c:269
+#: src/mainwindow.c:724 src/messageview.c:272

 msgid "/_View/Decode/_Uuencode"
 msgstr "/_Veure/Decodificar/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/_Veure/Decodificar/_Uuencode"
 

-#: src/mainwindow.c:699 src/summaryview.c:473
+#: src/mainwindow.c:730 src/summaryview.c:473

 msgid "/_View/Open in new _window"
 msgstr "/_Veure/Obrir en finestra _nova"
 
 msgid "/_View/Open in new _window"
 msgstr "/_Veure/Obrir en finestra _nova"
 

-#: src/mainwindow.c:700 src/messageview.c:275
+#: src/mainwindow.c:731 src/messageview.c:278

 msgid "/_View/Mess_age source"
 msgstr "/_Veure/Fon_t del missatge"
 
 msgid "/_View/Mess_age source"
 msgstr "/_Veure/Fon_t del missatge"
 

-#: src/mainwindow.c:701
-msgid "/_View/Show all headers"
-msgstr "/_Veure/Mostrar totes les ca_pçaleres"
+#: src/mainwindow.c:732
+msgid "/_View/All headers"
+msgstr "/_Veure/Totes les capçaleres"
+
+#: src/mainwindow.c:733 src/messageview.c:280
+msgid "/_View/Quotes"
+msgstr "/_Veure/Cites"
+
+#: src/mainwindow.c:734 src/messageview.c:281
+msgid "/_View/Quotes/_Fold all"
+msgstr "/_Veure/Cites/_Plegar totes"
+
+#: src/mainwindow.c:735 src/messageview.c:282
+msgid "/_View/Quotes/Fold from level _2"
+msgstr "/_Veure/Cites/Plegar desde el nivell _2"

 
 

-#: src/mainwindow.c:703
+#: src/mainwindow.c:736 src/messageview.c:283
+msgid "/_View/Quotes/Fold from level _3"
+msgstr "/_Veure/Cites/Plegar desde el nivell _3"
+
+#: src/mainwindow.c:738

 msgid "/_View/_Update summary"
 msgstr "/_Veure/Act_ualitzar resum"
 
 msgid "/_View/_Update summary"
 msgstr "/_Veure/Act_ualitzar resum"
 

-#: src/mainwindow.c:706
+#: src/mainwindow.c:741

 msgid "/_Message/Recei_ve"
 msgstr "/_Missatge/Re_bre"
 
 msgid "/_Message/Recei_ve"
 msgstr "/_Missatge/Re_bre"
 

-#: src/mainwindow.c:707
+#: src/mainwindow.c:742

 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Missatge/Re_bre/Del compte _actual"
 
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/_Missatge/Re_bre/Del compte _actual"
 

-#: src/mainwindow.c:709
+#: src/mainwindow.c:744

 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Missatge/Re_bre/De _tots els comptes"
 
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/_Missatge/Re_bre/De _tots els comptes"
 

-#: src/mainwindow.c:711
+#: src/mainwindow.c:746

 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Missatge/Re_bre/_Cancel·lar la recepció"
 
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/_Missatge/Re_bre/_Cancel·lar la recepció"
 

-#: src/mainwindow.c:713
+#: src/mainwindow.c:748

 msgid "/_Message/Recei_ve/---"
 msgstr "/_Missatge/Re_bre/---"
 
 msgid "/_Message/Recei_ve/---"
 msgstr "/_Missatge/Re_bre/---"
 

-#: src/mainwindow.c:714
+#: src/mainwindow.c:749

 msgid "/_Message/_Send queued messages"
 msgstr "/_Missatge/_Enviar missatges en cua"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/_Missatge/_Enviar missatges en cua"
 

-#: src/mainwindow.c:716
+#: src/mainwindow.c:751

 msgid "/_Message/Compose a_n email message"
 msgstr "/_Missatge/Composar _nou missatge"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/_Missatge/Composar _nou missatge"
 

-#: src/mainwindow.c:717
+#: src/mainwindow.c:752

 msgid "/_Message/Compose a news message"
 msgstr "/_Missatge/Composar una notícia"
 
 msgid "/_Message/Compose a news message"
 msgstr "/_Missatge/Composar una notícia"
 

-#: src/mainwindow.c:718 src/messageview.c:282
+#: src/mainwindow.c:753 src/messageview.c:289

 msgid "/_Message/_Reply"
 msgstr "/_Missatge/_Respondre"
 
 msgid "/_Message/_Reply"
 msgstr "/_Missatge/_Respondre"
 

-#: src/mainwindow.c:719
+#: src/mainwindow.c:754

 msgid "/_Message/Repl_y to"
 msgstr "/_Missatge/Respon_dre a"
 
 msgid "/_Message/Repl_y to"
 msgstr "/_Missatge/Respon_dre a"
 

-#: src/mainwindow.c:720 src/messageview.c:283
+#: src/mainwindow.c:755 src/messageview.c:290

 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Missatge/Respon_dre a/A _tots"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Missatge/Respon_dre a/A _tots"
 

-#: src/mainwindow.c:721 src/messageview.c:285
+#: src/mainwindow.c:756 src/messageview.c:292

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Missatge/Respon_dre a/Al _remitent"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Missatge/Respon_dre a/Al _remitent"
 

-#: src/mainwindow.c:722 src/messageview.c:287
+#: src/mainwindow.c:757 src/messageview.c:294

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Missatge/Respon_dre a/A la _llista de correu"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Missatge/Respon_dre a/A la _llista de correu"
 

-#: src/mainwindow.c:724
+#: src/mainwindow.c:759

 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Missatge/_Reenviar i respondre a"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Missatge/_Reenviar i respondre a"
 

-#: src/mainwindow.c:726 src/messageview.c:290
+#: src/mainwindow.c:761 src/messageview.c:297

 msgid "/_Message/_Forward"
 msgstr "/_Missatge/Ree_nviar"
 
 msgid "/_Message/_Forward"
 msgstr "/_Missatge/Ree_nviar"
 

-#: src/mainwindow.c:727 src/messageview.c:291
+#: src/mainwindow.c:762 src/messageview.c:298

 msgid "/_Message/For_ward as attachment"
 msgstr "/_Missatge/Reenviar com a a_djunt"
 
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Missatge/Reenviar com a a_djunt"
 

-#: src/mainwindow.c:728
+#: src/mainwindow.c:763

 msgid "/_Message/Redirect"
 msgstr "/_Missatge/Redirigir"
 
 msgid "/_Message/Redirect"
 msgstr "/_Missatge/Redirigir"
 

-#: src/mainwindow.c:730
+#: src/mainwindow.c:765

 msgid "/_Message/Mailing-_List"
 msgstr "/_Missatge/_Llista de correu"
 
 msgid "/_Message/Mailing-_List"
 msgstr "/_Missatge/_Llista de correu"
 

-#: src/mainwindow.c:731
+#: src/mainwindow.c:766

 msgid "/_Message/Mailing-_List/Post"
 msgstr "/_Missatge/_Llista de correu/Correu"
 
 msgid "/_Message/Mailing-_List/Post"
 msgstr "/_Missatge/_Llista de correu/Correu"
 

-#: src/mainwindow.c:732
+#: src/mainwindow.c:767

 msgid "/_Message/Mailing-_List/Help"
 msgstr "/_Missatge/_Llista de correu/Ajuda"
 
 msgid "/_Message/Mailing-_List/Help"
 msgstr "/_Missatge/_Llista de correu/Ajuda"
 

-#: src/mainwindow.c:733
+#: src/mainwindow.c:768

 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr "/_Missatge/_Llista de correu/Subscriure's"
 
 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr "/_Missatge/_Llista de correu/Subscriure's"
 

-#: src/mainwindow.c:734
+#: src/mainwindow.c:769

 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr "/_Missatge/_Llista de correu/Desubscriure's"
 
 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr "/_Missatge/_Llista de correu/Desubscriure's"
 

-#: src/mainwindow.c:735
+#: src/mainwindow.c:770

 msgid "/_Message/Mailing-_List/View archive"
 msgstr "/_Missatge/_Llista de correu/Veure arxiu"
 
 msgid "/_Message/Mailing-_List/View archive"
 msgstr "/_Missatge/_Llista de correu/Veure arxiu"
 

-#: src/mainwindow.c:736
+#: src/mainwindow.c:771

 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr "/_Missatge/_Llista de correu/Posseidor del contacte"
 
 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr "/_Missatge/_Llista de correu/Posseidor del contacte"
 

-#: src/mainwindow.c:739
+#: src/mainwindow.c:774

 msgid "/_Message/M_ove..."
 msgstr "/_Missatge/M_oure..."
 
 msgid "/_Message/M_ove..."
 msgstr "/_Missatge/M_oure..."
 

-#: src/mainwindow.c:740
+#: src/mainwindow.c:775

 msgid "/_Message/_Copy..."
 msgstr "/_Missatge/_Copiar..."
 
 msgid "/_Message/_Copy..."
 msgstr "/_Missatge/_Copiar..."
 

-#: src/mainwindow.c:741
+#: src/mainwindow.c:776

 msgid "/_Message/Move to _trash"
 msgstr "/_Missatge/M_oure a les escombraries"
 
 msgid "/_Message/Move to _trash"
 msgstr "/_Missatge/M_oure a les escombraries"
 

-#: src/mainwindow.c:742
+#: src/mainwindow.c:777

 msgid "/_Message/_Delete..."
 msgstr "/_Missatge/Es_borrar..."
 
 msgid "/_Message/_Delete..."
 msgstr "/_Missatge/Es_borrar..."
 

-#: src/mainwindow.c:743
+#: src/mainwindow.c:778

 msgid "/_Message/Cancel a news message"
 msgstr "/_Missatge/Cancel·lar una notícia"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/_Missatge/Cancel·lar una notícia"
 

-#: src/mainwindow.c:745
+#: src/mainwindow.c:780

 msgid "/_Message/_Mark"
 msgstr "/_Missatge/_Marcar"
 
 msgid "/_Message/_Mark"
 msgstr "/_Missatge/_Marcar"
 

-#: src/mainwindow.c:746
+#: src/mainwindow.c:781

 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Missatge/_Marcar/_Marcar"
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Missatge/_Marcar/_Marcar"
 

-#: src/mainwindow.c:747
+#: src/mainwindow.c:782

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Missatge/_Marcar/_Desmarcar"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Missatge/_Marcar/_Desmarcar"
 

-#: src/mainwindow.c:748 src/mainwindow.c:752
+#: src/mainwindow.c:783 src/mainwindow.c:789 src/mainwindow.c:792

 msgid "/_Message/_Mark/---"
 msgstr "/_Missatge/_Marcar/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/_Missatge/_Marcar/---"
 

-#: src/mainwindow.c:749
+#: src/mainwindow.c:784

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Missatge/_Marcar/Marcar com a no llegit"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Missatge/_Marcar/Marcar com a no llegit"
 

-#: src/mainwindow.c:750
+#: src/mainwindow.c:785

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Missatge/_Marcar/Marcar como a llegit"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Missatge/_Marcar/Marcar como a llegit"
 

-#: src/mainwindow.c:751
+#: src/mainwindow.c:786

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Missatge/_Marcar/Marcar tot com a llegit"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Missatge/_Marcar/Marcar tot com a llegit"
 

-#: src/mainwindow.c:753
+#: src/mainwindow.c:787
+msgid "/_Message/_Mark/Ignore thread"
+msgstr "/_Missatge/_Marcar/Ignorar fil"
+
+#: src/mainwindow.c:788
+msgid "/_Message/_Mark/Unignore thread"
+msgstr "/_Marcar/_Marcar/No ignorar fil"
+
+#: src/mainwindow.c:790

 msgid "/_Message/_Mark/Mark as _spam"
 msgstr "/_Missatge/_Marcar/Marcar com a correu brossa"
 
 msgid "/_Message/_Mark/Mark as _spam"
 msgstr "/_Missatge/_Marcar/Marcar com a correu brossa"
 

-#: src/mainwindow.c:754
+#: src/mainwindow.c:791

 msgid "/_Message/_Mark/Mark as _ham"
 msgstr "/_Missatge/_Marcar/Marcar com a bò"
 
 msgid "/_Message/_Mark/Mark as _ham"
 msgstr "/_Missatge/_Marcar/Marcar com a bò"
 

-#: src/mainwindow.c:755
+#: src/mainwindow.c:793
+msgid "/_Message/_Mark/Lock"
+msgstr "/_Missatge/_Marcar/Bloquejar"
+
+#: src/mainwindow.c:794
+msgid "/_Message/_Mark/Unlock"
+msgstr "/_Missatge/_Marcar/Desbloquejar"
+
+#: src/mainwindow.c:795

 msgid "/_Message/Color la_bel"
 msgstr "/_Missatge/E_tiqueta de color"
 
 msgid "/_Message/Color la_bel"
 msgstr "/_Missatge/E_tiqueta de color"
 

-#: src/mainwindow.c:757
+#: src/mainwindow.c:797

 msgid "/_Message/Re-_edit"
 msgstr "/_Missatge/Re_editar"
 
 msgid "/_Message/Re-_edit"
 msgstr "/_Missatge/Re_editar"
 

-#: src/mainwindow.c:760
+#: src/mainwindow.c:800

 msgid "/_Tools/_Address book..."
 msgstr "/E_ines/_Agenda d'adreces..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/E_ines/_Agenda d'adreces..."
 

-#: src/mainwindow.c:761 src/messageview.c:297
+#: src/mainwindow.c:801 src/messageview.c:304

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/E_ines/Afegir _remitent a l'agenda"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/E_ines/Afegir _remitent a l'agenda"
 

-#: src/mainwindow.c:763
+#: src/mainwindow.c:803

 msgid "/_Tools/_Harvest addresses"
 msgstr "/E_ines/_Recopilar adreces"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/E_ines/_Recopilar adreces"
 

-#: src/mainwindow.c:764
+#: src/mainwindow.c:804

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/E_ines/_Recopilar adreces/De la _carpeta..."
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/E_ines/_Recopilar adreces/De la _carpeta..."
 

-#: src/mainwindow.c:766
+#: src/mainwindow.c:806

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/E_ines/_Recopilar adreces/Dels _missatges..."
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/E_ines/_Recopilar adreces/Dels _missatges..."
 

-#: src/mainwindow.c:769
+#: src/mainwindow.c:809

 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/E_ines/_Filtrar tots els missatges a la carpeta"
 
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/E_ines/_Filtrar tots els missatges a la carpeta"
 

-#: src/mainwindow.c:771
+#: src/mainwindow.c:811

 msgid "/_Tools/Filter _selected messages"
 msgstr "/E_ines/_Filtrar els missatges seleccionats"
 
 msgid "/_Tools/Filter _selected messages"
 msgstr "/E_ines/_Filtrar els missatges seleccionats"
 

-#: src/mainwindow.c:773 src/messageview.c:300
+#: src/mainwindow.c:813 src/messageview.c:307

 msgid "/_Tools/_Create filter rule"
 msgstr "/E_ines/_Crear regla de filtrat"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/E_ines/_Crear regla de filtrat"
 

-#: src/mainwindow.c:774 src/messageview.c:302
+#: src/mainwindow.c:814 src/messageview.c:309

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/E_ines/_Crear regla de filtrat/_Automàticament"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/E_ines/_Crear regla de filtrat/_Automàticament"
 

-#: src/mainwindow.c:776 src/messageview.c:304
+#: src/mainwindow.c:816 src/messageview.c:311

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/E_ines/_Crear regla de filtrat/Basada en _Desde"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/E_ines/_Crear regla de filtrat/Basada en _Desde"
 

-#: src/mainwindow.c:778 src/messageview.c:306
+#: src/mainwindow.c:818 src/messageview.c:313

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/E_ines/_Crear regla de filtrat/Basada en _Per a"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/E_ines/_Crear regla de filtrat/Basada en _Per a"
 

-#: src/mainwindow.c:780 src/messageview.c:308
+#: src/mainwindow.c:820 src/messageview.c:315

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/E_ines/_Crear regla de filtrat/Basada en el _Assumpte"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/E_ines/_Crear regla de filtrat/Basada en el _Assumpte"
 

-#: src/mainwindow.c:782
+#: src/mainwindow.c:822

 msgid "/_Tools/C_reate processing rule"
 msgstr "/E_ines/Crear regla de processament"
 
 msgid "/_Tools/C_reate processing rule"
 msgstr "/E_ines/Crear regla de processament"
 

-#: src/mainwindow.c:783
+#: src/mainwindow.c:823

 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr "/E_ines/Crear regla de processament/_Automàticament"
 
 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr "/E_ines/Crear regla de processament/_Automàticament"
 

-#: src/mainwindow.c:785
+#: src/mainwindow.c:825

 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr "/E_ines/Crear regla de processament/Basada en _Desde"
 
 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr "/E_ines/Crear regla de processament/Basada en _Desde"
 

-#: src/mainwindow.c:787
+#: src/mainwindow.c:827

 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr "/E_ines/Crear regla de processament/Basada en _Per a"
 
 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr "/E_ines/Crear regla de processament/Basada en _Per a"
 

-#: src/mainwindow.c:789
+#: src/mainwindow.c:829

 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/E_ines/Crear regla de processament/Basada en el _Asumpte"
 
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/E_ines/Crear regla de processament/Basada en el _Asumpte"
 

-#: src/mainwindow.c:794
+#: src/mainwindow.c:834

 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/E_ines/_Comprovar missatges nous en totes les carpetes"
 
 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/E_ines/_Comprovar missatges nous en totes les carpetes"
 

-#: src/mainwindow.c:796
+#: src/mainwindow.c:836

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/E_ines/Es_borrar els missatges repetits"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/E_ines/Es_borrar els missatges repetits"
 

-#: src/mainwindow.c:798
+#: src/mainwindow.c:838

 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr "/E_ines/Es_borrar els missatges repetits/A la carpeta seleccionada"
 
 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr "/E_ines/Es_borrar els missatges repetits/A la carpeta seleccionada"
 

-#: src/mainwindow.c:800
+#: src/mainwindow.c:840

 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr "/E_ines/Es_borrar els missatges repetits/En totes les carpetes"
 
 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr "/E_ines/Es_borrar els missatges repetits/En totes les carpetes"
 

-#: src/mainwindow.c:803
+#: src/mainwindow.c:843

 msgid "/_Tools/E_xecute"
 msgstr "/E_ines/E_xecutar"
 
 msgid "/_Tools/E_xecute"
 msgstr "/E_ines/E_xecutar"
 

-#: src/mainwindow.c:806
+#: src/mainwindow.c:846

 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/E_ines/Certi_ficats SSL..."
 
 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/E_ines/Certi_ficats SSL..."
 

-#: src/mainwindow.c:810
+#: src/mainwindow.c:850

 msgid "/_Tools/_Log window"
 msgstr "/E_ines/_Finestra de traça"
 
 msgid "/_Tools/_Log window"
 msgstr "/E_ines/_Finestra de traça"
 

-#: src/mainwindow.c:812
+#: src/mainwindow.c:852

 msgid "/_Configuration"
 msgstr "/_Configuració"
 
 msgid "/_Configuration"
 msgstr "/_Configuració"
 

-#: src/mainwindow.c:813
+#: src/mainwindow.c:853

 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuració/_Canviar compte actual"
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuració/_Canviar compte actual"
 

-#: src/mainwindow.c:815
+#: src/mainwindow.c:855

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuració/_Preferències del compte actual..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuració/_Preferències del compte actual..."
 

-#: src/mainwindow.c:817
+#: src/mainwindow.c:857

 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuració/Crear _nou compte..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuració/Crear _nou compte..."
 

-#: src/mainwindow.c:819
+#: src/mainwindow.c:859

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuració/_Editar comptes..."
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuració/_Editar comptes..."
 

-#: src/mainwindow.c:821
+#: src/mainwindow.c:861

 msgid "/_Configuration/---"
 msgstr "/_Configuració/---"
 
 msgid "/_Configuration/---"
 msgstr "/_Configuració/---"
 

-#: src/mainwindow.c:822
+#: src/mainwindow.c:862

 msgid "/_Configuration/P_references..."
 msgstr "/_Configuració/_Preferències..."
 
 msgid "/_Configuration/P_references..."
 msgstr "/_Configuració/_Preferències..."
 

-#: src/mainwindow.c:824
+#: src/mainwindow.c:864

 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr "/_Configuració/Pre-processament..."
 
 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr "/_Configuració/Pre-processament..."
 

-#: src/mainwindow.c:826
+#: src/mainwindow.c:866

 msgid "/_Configuration/Post-pro_cessing..."
 msgstr "/_Configuració/Post-processament..."
 
 msgid "/_Configuration/Post-pro_cessing..."
 msgstr "/_Configuració/Post-processament..."
 

-#: src/mainwindow.c:828
+#: src/mainwindow.c:868

 msgid "/_Configuration/_Filtering..."
 msgstr "/_Configuració/_Filtrat..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/_Configuració/_Filtrat..."
 

-#: src/mainwindow.c:830
+#: src/mainwindow.c:870

 msgid "/_Configuration/_Templates..."
 msgstr "/_Configuració/_Plantilles..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/_Configuració/_Plantilles..."
 

-#: src/mainwindow.c:831
+#: src/mainwindow.c:871

 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuració/_Accions..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuració/_Accions..."
 

-#: src/mainwindow.c:832
+#: src/mainwindow.c:872

 msgid "/_Configuration/Plu_gins..."
 msgstr "/_Configuració/Mòduls..."
 
 msgid "/_Configuration/Plu_gins..."
 msgstr "/_Configuració/Mòduls..."
 

-#: src/mainwindow.c:835
+#: src/mainwindow.c:875

 msgid "/_Help/_Manual"
 msgstr "/A_juda/_Manual"
 
 msgid "/_Help/_Manual"
 msgstr "/A_juda/_Manual"
 

-#: src/mainwindow.c:836
+#: src/mainwindow.c:876

 msgid "/_Help/_Online User-contributed FAQ"
 msgstr "/A_juda/PUF d'usuari collaborador _online"
 
 msgid "/_Help/_Online User-contributed FAQ"
 msgstr "/A_juda/PUF d'usuari collaborador _online"
 

-#: src/mainwindow.c:838
+#: src/mainwindow.c:878

 msgid "/_Help/Icon _Legend"
 msgstr "A_juda/Llegenda d'icones"
 
 msgid "/_Help/Icon _Legend"
 msgstr "A_juda/Llegenda d'icones"
 

-#: src/mainwindow.c:839
+#: src/mainwindow.c:879

 msgid "/_Help/---"
 msgstr "/A_juda/---"
 
 msgid "/_Help/---"
 msgstr "/A_juda/---"
 

-#: src/mainwindow.c:1132
+#: src/mainwindow.c:1227
+msgid "Some error(s) happened. Click here to view log."
+msgstr "S'ha(n) produït algun(s) error(s). Pulseu aquí per veure la traça registrada."
+
+#: src/mainwindow.c:1241

 msgid "You are online. Click the icon to go offline"
 msgstr "Esteu connectat. Polseu en la icona per desconectar-se"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "Esteu connectat. Polseu en la icona per desconectar-se"
 

-#: src/mainwindow.c:1136
+#: src/mainwindow.c:1244

 msgid "You are offline. Click the icon to go online"
 msgstr "Esteu desconnectat. Polseu en la icona per conectarse"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "Esteu desconnectat. Polseu en la icona per conectarse"
 

-#: src/mainwindow.c:1153
+#: src/mainwindow.c:1260

 msgid "Select account"
 msgstr "Seleccionar compte"
 
 msgid "Select account"
 msgstr "Seleccionar compte"
 

-#: src/mainwindow.c:1545 src/mainwindow.c:1586 src/mainwindow.c:1622
-#: src/mainwindow.c:1658 src/mainwindow.c:1700 src/prefs_folder_item.c:668
+#: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738
+#: src/mainwindow.c:1774 src/mainwindow.c:1817
+#: src/plugins/trayicon/trayicon.c:143 src/prefs_folder_item.c:762

 msgid "Untitled"
 msgstr "Sense títol"
 
 msgid "Untitled"
 msgstr "Sense títol"
 

-#: src/mainwindow.c:1701
+#: src/mainwindow.c:1818

 msgid "none"
 msgstr "cap"
 
 msgid "none"
 msgstr "cap"
 

-#: src/mainwindow.c:1963
+#: src/mainwindow.c:2080

 msgid "Delete all messages in trash folders?"
 msgstr "Esborrar tots els missatges de la paperera?"
 
 msgid "Delete all messages in trash folders?"
 msgstr "Esborrar tots els missatges de la paperera?"
 

-#: src/mainwindow.c:1982
+#: src/mainwindow.c:2099

 msgid "Add mailbox"
 msgstr "Afegir bústia"
 
 msgid "Add mailbox"
 msgstr "Afegir bústia"
 

-#: src/mainwindow.c:1983
+#: src/mainwindow.c:2100

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -5566,16 +6097,16 @@ msgstr ""
 "Introduiu la localització de la bústia.\n"
 "Si la bústia especificada ja existeix serà escaneajada automàticament."
 
 "Introduiu la localització de la bústia.\n"
 "Si la bústia especificada ja existeix serà escaneajada automàticament."
 

-#: src/mainwindow.c:1989
+#: src/mainwindow.c:2106

 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La bústia '%s' ja existeix."
 
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La bústia '%s' ja existeix."
 

-#: src/mainwindow.c:1994 src/setup.c:51
+#: src/mainwindow.c:2111 src/setup.c:51

 msgid "Mailbox"
 msgstr "Correu"
 
 msgid "Mailbox"
 msgstr "Correu"
 

-#: src/mainwindow.c:1999 src/setup.c:54
+#: src/mainwindow.c:2116 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 "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -5585,90 +6116,95 @@ msgstr ""
 "Pot ser que ja existeixin els arxius o no tingueu prous permisos per a "
 "escriure en el directori."
 
 "Pot ser que ja existeixin els arxius o no tingueu prous permisos per a "
 "escriure en el directori."
 

-#: src/mainwindow.c:2281
+#: src/mainwindow.c:2432

 msgid "No posting allowed"
 msgstr "Cap correu permès"
 
 msgid "No posting allowed"
 msgstr "Cap correu permès"
 

-#: src/mainwindow.c:2543
-msgid "Sylpheed-Claws - Folder View"
-msgstr "Sylpheed-Claws - Vista de Carpeta"
+#: src/mainwindow.c:2699
+msgid "Claws Mail - Folder View"
+msgstr "Claws Mail - Vista de Carpeta"

 
 

-#: src/mainwindow.c:2579 src/messageview.c:442 src/messageview.c:825
-msgid "Sylpheed-Claws - Message View"
-msgstr "Sylpheed-Claws - Vista de missatge"
+#: src/mainwindow.c:2735 src/messageview.c:449 src/messageview.c:855
+msgid "Claws Mail - Message View"
+msgstr "Claws Mail - Vista de missatge"

 
 

-#: src/mainwindow.c:2929
+#: src/mainwindow.c:3085

 msgid "Mbox import has failed."
 msgstr "L'importació de l'arxiu mbox ha fallat."
 
 msgid "Mbox import has failed."
 msgstr "L'importació de l'arxiu mbox ha fallat."
 

-#: src/mainwindow.c:2938 src/mainwindow.c:2947
+#: src/mainwindow.c:3094 src/mainwindow.c:3103

 msgid "Export to mbox has failed."
 msgstr "L'exportació a arxiu mbox ha fallat."
 
 msgid "Export to mbox has failed."
 msgstr "L'exportació a arxiu mbox ha fallat."
 

-#: src/mainwindow.c:2970 src/plugins/trayicon/trayicon.c:369
+#: src/mainwindow.c:3126 src/plugins/trayicon/trayicon.c:474

 msgid "Exit"
 msgstr "Sortir"
 
 msgid "Exit"
 msgstr "Sortir"
 

-#: src/mainwindow.c:2970
-msgid "Exit Sylpheed-Claws?"
-msgstr "Voleu sortir de Sylpheed?"
+#: src/mainwindow.c:3126
+msgid "Exit Claws Mail?"
+msgstr "Voleu sortir de Claws Mail?"

 
 

-#: src/mainwindow.c:3116
+#: src/mainwindow.c:3271

 msgid "Folder synchronisation"
 msgstr "Sincronització de carpetes"
 
 msgid "Folder synchronisation"
 msgstr "Sincronització de carpetes"
 

-#: src/mainwindow.c:3117
+#: src/mainwindow.c:3272

 msgid "Do you want to synchronise your folders now?"
 msgstr "Voleu sincronitzar les vostres carpetes ara?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Voleu sincronitzar les vostres carpetes ara?"
 

-#: src/mainwindow.c:3118
+#: src/mainwindow.c:3273

 msgid "+_Synchronise"
 msgstr "+_Sincronitzar"
 
 msgid "+_Synchronise"
 msgstr "+_Sincronitzar"
 

-#: src/mainwindow.c:3392
+#: src/mainwindow.c:3604

 msgid "Deleting duplicated messages..."
 msgstr "Esborrant missatges duplicats..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Esborrant missatges duplicats..."
 

-#: src/mainwindow.c:3426
+#: src/mainwindow.c:3641

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Esborrant %d missatge duplicat a les %d carpetes.\n"
 msgstr[1] "Esborrant %d missatges duplicats a les %d carpetes.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Esborrant %d missatge duplicat a les %d carpetes.\n"
 msgstr[1] "Esborrant %d missatges duplicats a les %d carpetes.\n"
 

-#: src/mainwindow.c:3573 src/summaryview.c:4527
+#: src/mainwindow.c:3800 src/summaryview.c:4783

 msgid "Processing rules to apply before folder rules"
 msgstr "Regles de processament a aplicar abans de les de les carpetes"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Regles de processament a aplicar abans de les de les carpetes"
 

-#: src/mainwindow.c:3582
+#: src/mainwindow.c:3809

 msgid "Processing rules to apply after folder rules"
 msgstr "Regles de processament a aplicar després de les de les carpetes"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Regles de processament a aplicar després de les de les carpetes"
 

-#: src/mainwindow.c:3591 src/summaryview.c:4538
+#: src/mainwindow.c:3818 src/summaryview.c:4794

 msgid "Filtering configuration"
 msgstr "Configuració de filtrat"
 
 msgid "Filtering configuration"
 msgstr "Configuració de filtrat"
 

-#: src/mainwindow.c:3845
+#: src/mainwindow.c:4072

 #, c-format
 msgid "not initialized\n"
 msgstr "no inicialitzat\n"
 
 #, c-format
 msgid "not initialized\n"
 msgstr "no inicialitzat\n"
 

-#: src/mainwindow.c:3857 src/mainwindow.c:3868
+#: src/mainwindow.c:4084 src/mainwindow.c:4095

 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "Seleccionant carpeta '%s'\n"
 
 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "Seleccionant carpeta '%s'\n"
 

-#: src/mainwindow.c:3872
+#: src/mainwindow.c:4099

 #, c-format
 msgid "selecting message %d\n"
 msgstr "Seleccionant missatge %d\n"
 
 #, c-format
 msgid "selecting message %d\n"
 msgstr "Seleccionant missatge %d\n"
 

-#: src/matcher.c:1347 src/matcher.c:1348 src/matcher.c:1349 src/matcher.c:1350
-#: src/matcher.c:1351 src/matcher.c:1352 src/matcher.c:1353 src/matcher.c:1354
+#: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
+#: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
+msgid "Filtering Matcher Menu|All"
+msgstr "Tots"
+
+#: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
+#: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470

 msgid "(none)"
 msgstr "(cap)"
 
 msgid "(none)"
 msgstr "(cap)"
 

-#: src/mbox.c:84
+#: src/mbox.c:98

 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 #, c-format
 msgid ""
 "Could not open mbox file:\n"


@@ -5677,25 +6213,25 @@ msgstr ""
 "No s'ha pogut obrir l'arxiu:\n"
 "%s\n"
 
 "No s'ha pogut obrir l'arxiu:\n"
 "%s\n"
 

-#: src/mbox.c:120
+#: src/mbox.c:134

 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Important desde mbox... (%d correus improtats)"
 
 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Important desde mbox... (%d correus improtats)"
 

-#: src/mbox.c:467
+#: src/mbox.c:481

 msgid "Overwrite mbox file"
 msgstr "Sobreescriure l'arxiu mbox"
 
 msgid "Overwrite mbox file"
 msgstr "Sobreescriure l'arxiu mbox"
 

-#: src/mbox.c:468
+#: src/mbox.c:482

 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Aquest arxiu ja existeix. Voleu sobreescriure'l?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Aquest arxiu ja existeix. Voleu sobreescriure'l?"
 

-#: src/mbox.c:469 src/messageview.c:1106 src/mimeview.c:1390
-#: src/textview.c:2364
+#: src/mbox.c:483 src/messageview.c:1143 src/mimeview.c:1443
+#: src/textview.c:2654

 msgid "Overwrite"
 msgstr "Sobreescriure"
 
 msgid "Overwrite"
 msgstr "Sobreescriure"
 

-#: src/mbox.c:478
+#: src/mbox.c:492

 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 #, c-format
 msgid ""
 "Could not create mbox file:\n"


@@ -5704,83 +6240,83 @@ msgstr ""
 "No s'ha pogut crear l'arxiu:\n"
 "%s\n"
 
 "No s'ha pogut crear l'arxiu:\n"
 "%s\n"
 

-#: src/mbox.c:482
+#: src/mbox.c:500

 msgid "Exporting to mbox..."
 msgstr "Exportant a arxiu mbox..."
 
 msgid "Exporting to mbox..."
 msgstr "Exportant a arxiu mbox..."
 

-#: src/message_search.c:131
+#: src/message_search.c:169

 msgid "Find in current message"
 msgstr "Cercar en el missatge actual"
 
 msgid "Find in current message"
 msgstr "Cercar en el missatge actual"
 

-#: src/message_search.c:149
+#: src/message_search.c:187

 msgid "Find text:"
 msgstr "Cercar text:"
 
 msgid "Find text:"
 msgstr "Cercar text:"
 

-#: src/message_search.c:164 src/prefs_matcher.c:578 src/summary_search.c:297
+#: src/message_search.c:210 src/prefs_matcher.c:649 src/summary_search.c:392

 msgid "Case sensitive"
 msgstr "Majs./mins."
 
 msgid "Case sensitive"
 msgstr "Majs./mins."
 

-#: src/message_search.c:240 src/summary_search.c:505
+#: src/message_search.c:323 src/summary_search.c:637

 msgid "Search failed"
 msgstr "Cerca errònia"
 
 msgid "Search failed"
 msgstr "Cerca errònia"
 

-#: src/message_search.c:241 src/summary_search.c:506
+#: src/message_search.c:324 src/summary_search.c:638

 msgid "Search string not found."
 msgstr "Cadena no trobada."
 
 msgid "Search string not found."
 msgstr "Cadena no trobada."
 

-#: src/message_search.c:250
+#: src/message_search.c:333

 msgid "Beginning of message reached; continue from end?"
 msgstr "S'ha arribat a l'inici del missatge. Voleu seguir desde el final?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "S'ha arribat a l'inici del missatge. Voleu seguir desde el final?"
 

-#: src/message_search.c:253
+#: src/message_search.c:336

 msgid "End of message reached; continue from beginning?"
 msgstr "S'ha arribat al final del missatge. Voleu seguir desde l'inici?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "S'ha arribat al final del missatge. Voleu seguir desde l'inici?"
 

-#: src/message_search.c:256 src/summary_search.c:517
+#: src/message_search.c:339 src/summary_search.c:649

 msgid "Search finished"
 msgstr "Cerca finalitzada"
 
 msgid "Search finished"
 msgstr "Cerca finalitzada"
 

-#: src/messageview.c:159
+#: src/messageview.c:162

 msgid "/_File/_Close"
 msgstr "/_Fitxer/_Tancar"
 
 msgid "/_File/_Close"
 msgstr "/_Fitxer/_Tancar"
 

-#: src/messageview.c:276
+#: src/messageview.c:279

 msgid "/_View/Show all _headers"
 msgstr "/_Veure/Mostrar totes les ca_pçaleres"
 
 msgid "/_View/Show all _headers"
 msgstr "/_Veure/Mostrar totes les ca_pçaleres"
 

-#: src/messageview.c:279
+#: src/messageview.c:286

 msgid "/_Message/Compose _new message"
 msgstr "/_Missatge/Composar un missatge _nou"
 
 msgid "/_Message/Compose _new message"
 msgstr "/_Missatge/Composar un missatge _nou"
 

-#: src/messageview.c:293
+#: src/messageview.c:300

 msgid "/_Message/Redirec_t"
 msgstr "/_Missatge/Redirigi_r"
 
 msgid "/_Message/Redirec_t"
 msgstr "/_Missatge/Redirigi_r"
 

-#: src/messageview.c:310
+#: src/messageview.c:317

 msgid "/_Tools/Create processing rule"
 msgstr "/E_ines/Crear regla de processament"
 
 msgid "/_Tools/Create processing rule"
 msgstr "/E_ines/Crear regla de processament"
 

-#: src/messageview.c:312
+#: src/messageview.c:319

 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/E_ines/Crear regla de processament/_Automàticament"
 
 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/E_ines/Crear regla de processament/_Automàticament"
 

-#: src/messageview.c:314
+#: src/messageview.c:321

 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/E_ines/Crear regla de processament/Basada en _Desde"
 
 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/E_ines/Crear regla de processament/Basada en _Desde"
 

-#: src/messageview.c:316
+#: src/messageview.c:323

 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/E_ines/Crear regla de processament/Basada en _Per a"
 
 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/E_ines/Crear regla de processament/Basada en _Per a"
 

-#: src/messageview.c:318
+#: src/messageview.c:325

 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/E_ines/Crear regla de processament/Basada en el _Asumpte"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/E_ines/Crear regla de processament/Basada en el _Asumpte"
 

-#: src/messageview.c:547
+#: src/messageview.c:564

 msgid "<No Return-Path found>"
 msgstr "<No s'ha trobat Return-Path>"
 
 msgid "<No Return-Path found>"
 msgstr "<No s'ha trobat Return-Path>"
 

-#: src/messageview.c:555
+#: src/messageview.c:572

 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"


@@ -5795,11 +6331,11 @@ msgstr ""
 "Adreça de retorn: %s\n"
 "Es recomana no enviar el justificant de recepció."
 
 "Adreça de retorn: %s\n"
 "Es recomana no enviar el justificant de recepció."
 

-#: src/messageview.c:562 src/messageview.c:579
+#: src/messageview.c:579 src/messageview.c:596

 msgid "_Don't Send"
 msgstr "_No enviar"
 
 msgid "_Don't Send"
 msgstr "_No enviar"
 

-#: src/messageview.c:575
+#: src/messageview.c:592

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -5811,34 +6347,38 @@ msgstr ""
 "oficialment dirigit a vostè \n"
 "és un avís per no enviar el justificant de recepció."
 
 "oficialment dirigit a vostè \n"
 "és un avís per no enviar el justificant de recepció."
 

-#: src/messageview.c:787 src/procmime.c:823
+#: src/messageview.c:809 src/procmime.c:873
+#, c-format

 msgid "Couldn't decrypt: %s"
 msgstr "No es pot desencriptar: %s"
 
 msgid "Couldn't decrypt: %s"
 msgstr "No es pot desencriptar: %s"
 

-#: src/messageview.c:1101 src/mimeview.c:1528 src/summaryview.c:3871
-#: src/summaryview.c:3874 src/textview.c:2352
+#: src/messageview.c:1138 src/mimeview.c:1582 src/summaryview.c:4065
+#: src/summaryview.c:4068 src/textview.c:2642

 msgid "Save as"
 msgstr "Guardar com"
 
 msgid "Save as"
 msgstr "Guardar com"
 

-#: src/messageview.c:1107
+#: src/messageview.c:1144

 msgid "Overwrite existing file?"
 msgstr "Sobreescriure l'arxiu existent?"
 
 msgid "Overwrite existing file?"
 msgstr "Sobreescriure l'arxiu existent?"
 

-#: src/messageview.c:1115 src/summaryview.c:3891 src/summaryview.c:3894
-#: src/summaryview.c:3909
-#, c-format
-msgid "Can't save the file '%s'."
-msgstr "No es pot guardar l'arxiu '%s'."
+#: src/messageview.c:1152 src/summaryview.c:4085 src/summaryview.c:4088
+#: src/summaryview.c:4103
+msgid "Couldn't save the file '%s'."
+msgstr "No s'ha pogut guardar l'arxiu '%s'."
+
+#: src/messageview.c:1233
+msgid "You asked for a return receipt in this message."
+msgstr "Heu demanat justificant de recepció en aquest missatge."

 
 

-#: src/messageview.c:1198
+#: src/messageview.c:1237

 msgid "This message asks for a return receipt."
 msgstr "Aquest missatge sollicita justificant de recepció."
 
 msgid "This message asks for a return receipt."
 msgstr "Aquest missatge sollicita justificant de recepció."
 

-#: src/messageview.c:1199
+#: src/messageview.c:1238

 msgid "Send receipt"
 msgstr "Enviar justificant de recepció"
 
 msgid "Send receipt"
 msgstr "Enviar justificant de recepció"
 

-#: src/messageview.c:1239
+#: src/messageview.c:1281

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -5846,7 +6386,7 @@ msgstr ""
 "Aquest missatge s'ha descarregat parcialment,\n"
 "i ha estat eliminat del servidor."
 
 "Aquest missatge s'ha descarregat parcialment,\n"
 "i ha estat eliminat del servidor."
 

-#: src/messageview.c:1245
+#: src/messageview.c:1287

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -5855,15 +6395,15 @@ msgstr ""
 "Aquest missatge s'ha descarregat parcialment;\n"
 "es de %s."
 
 "Aquest missatge s'ha descarregat parcialment;\n"
 "es de %s."
 

-#: src/messageview.c:1249 src/messageview.c:1271
+#: src/messageview.c:1291 src/messageview.c:1313

 msgid "Mark for download"
 msgstr "Marcar per a descarregar"
 
 msgid "Mark for download"
 msgstr "Marcar per a descarregar"
 

-#: src/messageview.c:1250 src/messageview.c:1262
+#: src/messageview.c:1292 src/messageview.c:1304

 msgid "Mark for deletion"
 msgstr "Marcar per a eliminar"
 
 msgid "Mark for deletion"
 msgstr "Marcar per a eliminar"
 

-#: src/messageview.c:1255
+#: src/messageview.c:1297

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -5873,12 +6413,12 @@ msgstr ""
 "es de %s i serà descarregat."
 
 # RML To be consistent with previous one.
 "es de %s i serà descarregat."
 
 # RML To be consistent with previous one.

-#: src/messageview.c:1260 src/messageview.c:1273
+#: src/messageview.c:1302 src/messageview.c:1315

 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Desmarca"
 
 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Desmarca"
 

-#: src/messageview.c:1266
+#: src/messageview.c:1308

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -5887,11 +6427,11 @@ msgstr ""
 "Aquest missatge s'ha descarregat parcialment;\n"
 "es de %s i serà eliminat."
 
 "Aquest missatge s'ha descarregat parcialment;\n"
 "es de %s i serà eliminat."
 

-#: src/messageview.c:1342
+#: src/messageview.c:1384

 msgid "Return Receipt Notification"
 msgstr "Notificació de justificant de recepció"
 
 msgid "Return Receipt Notification"
 msgstr "Notificació de justificant de recepció"
 

-#: src/messageview.c:1343
+#: src/messageview.c:1385

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -5901,15 +6441,19 @@ msgstr ""
 "Per favor, escolliu el compte que desitjeu usar per enviar la notificació de "
 "justificant de recepció:"
 
 "Per favor, escolliu el compte que desitjeu usar per enviar la notificació de "
 "justificant de recepció:"
 

-#: src/messageview.c:1347
+#: src/messageview.c:1389

 msgid "_Send Notification"
 msgstr "_Enviar Notificació"
 
 msgid "_Send Notification"
 msgstr "_Enviar Notificació"
 

-#: src/messageview.c:1347
+#: src/messageview.c:1389

 msgid "+_Cancel"
 msgstr "+_Cancel·lar"
 
 msgid "+_Cancel"
 msgstr "+_Cancel·lar"
 

-#: src/messageview.c:1410 src/summaryview.c:3946
+#: src/messageview.c:1456
+msgid "Cannot print: the message doesn't contain text."
+msgstr "No es pot imprimit: el missatge no conté text."
+
+#: src/messageview.c:1520 src/summaryview.c:4125

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -5918,7 +6462,7 @@ msgstr ""
 "Tecleji l'ordre per a imprimir:\n"
 "('%s' serà substituït per el nom de l'arxiu)"
 
 "Tecleji l'ordre per a imprimir:\n"
 "('%s' serà substituït per el nom de l'arxiu)"
 

-#: src/messageview.c:1416 src/summaryview.c:3952
+#: src/messageview.c:1526 src/summaryview.c:4131

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -5927,16 +6471,12 @@ msgstr ""
 "La comanda d'impressió no es vàida:\n"
 "'%s'"
 
 "La comanda d'impressió no es vàida:\n"
 "'%s'"
 

-#: src/messageview.c:1427 src/summaryview.c:3923
-msgid "Cannot print: the message doesn't contain text."
-msgstr "No es pot imprimit: el missatge no conté text."
-
-#: src/messageview.c:1638 src/messageview.c:1644 src/summaryview.c:3342
-#: src/summaryview.c:5237
+#: src/messageview.c:1796 src/messageview.c:1802 src/summaryview.c:3521
+#: src/summaryview.c:5540

 msgid "An error happened while learning.\n"
 msgstr "S'ha produït un error mentre s'aprenia.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "S'ha produït un error mentre s'aprenia.\n"
 

-#: src/mh.c:427
+#: src/mh.c:423

 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "no s'ha pogut copiar el missatge %s a %s\n"
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "no s'ha pogut copiar el missatge %s a %s\n"


@@ -5945,11 +6485,15 @@ msgstr "no s'ha pogut copiar el missatge %s a %s\n"
 msgid "Moving messages..."
 msgstr "Moent missatges..."
 
 msgid "Moving messages..."
 msgstr "Moent missatges..."
 

-#: src/mh_gtk.c:59
+#: src/mh.c:638
+msgid "Deleting messages..."
+msgstr "Esborrant missatges..."
+
+#: src/mh_gtk.c:62

 msgid "/Remove _mailbox..."
 msgstr "/Eliminar _bústia..."
 
 msgid "/Remove _mailbox..."
 msgstr "/Eliminar _bústia..."
 

-#: src/mh_gtk.c:323
+#: src/mh_gtk.c:324

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"


@@ -5958,92 +6502,92 @@ msgstr ""
 "Eliminar realment la bústia '%s'?\n"
 "(Els missatges NO seran esborrats del disc)"
 
 "Eliminar realment la bústia '%s'?\n"
 "(Els missatges NO seran esborrats del disc)"
 

-#: src/mh_gtk.c:325
+#: src/mh_gtk.c:326

 msgid "Remove mailbox"
 msgstr "Eliminar bústia"
 
 msgid "Remove mailbox"
 msgstr "Eliminar bústia"
 

-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:327

 msgid "_Remove"
 msgstr "_Esborrar"
 
 msgid "_Remove"
 msgstr "_Esborrar"
 

-#: src/mimeview.c:158
+#: src/mimeview.c:168

 msgid "/_Open"
 msgstr "/_Obrir"
 
 msgid "/_Open"
 msgstr "/_Obrir"
 

-#: src/mimeview.c:159
+#: src/mimeview.c:169

 msgid "/Open _with..."
 msgstr "/Obrir _amb..."
 
 msgid "/Open _with..."
 msgstr "/Obrir _amb..."
 

-#: src/mimeview.c:160
+#: src/mimeview.c:170

 msgid "/_Display as text"
 msgstr "/_Veure com a text"
 
 msgid "/_Display as text"
 msgstr "/_Veure com a text"
 

-#: src/mimeview.c:161 src/summaryview.c:478
+#: src/mimeview.c:171 src/summaryview.c:478

 msgid "/_Save as..."
 msgstr "/_Guardar com..."
 
 msgid "/_Save as..."
 msgstr "/_Guardar com..."
 

-#: src/mimeview.c:162
+#: src/mimeview.c:172

 msgid "/Save _all..."
 msgstr "/Gu_ardar todo..."
 
 msgid "/Save _all..."
 msgstr "/Gu_ardar todo..."
 

-#: src/mimeview.c:201
+#: src/mimeview.c:211

 msgid "MIME Type"
 msgstr "Tipus MIME"
 
 msgid "MIME Type"
 msgstr "Tipus MIME"
 

-#: src/mimeview.c:702
+#: src/mimeview.c:742

 msgid "Check signature"
 msgstr "Comprovar signatura"
 
 msgid "Check signature"
 msgstr "Comprovar signatura"
 

-#: src/mimeview.c:707 src/mimeview.c:712 src/mimeview.c:717
+#: src/mimeview.c:747 src/mimeview.c:752 src/mimeview.c:757

 msgid "View full information"
 msgstr "Veure informació completa"
 
 msgid "View full information"
 msgstr "Veure informació completa"
 

-#: src/mimeview.c:722 src/mimeview.c:726
+#: src/mimeview.c:762 src/mimeview.c:766

 msgid "Check again"
 msgstr "Verificar de nou"
 
 msgid "Check again"
 msgstr "Verificar de nou"
 

-#: src/mimeview.c:735
+#: src/mimeview.c:775

 msgid "Click the icon or hit 'C' to check it."
 msgstr "Cliqueu la icona o premeu 'C' per comprovar-ho."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Cliqueu la icona o premeu 'C' per comprovar-ho."
 

-#: src/mimeview.c:740
+#: src/mimeview.c:780

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Ha expirat el temps comprovant la signatura. Pulseu l'icona o la tecla «C» "
 "per a reintentar."
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Ha expirat el temps comprovant la signatura. Pulseu l'icona o la tecla «C» "
 "per a reintentar."
 

-#: src/mimeview.c:950
+#: src/mimeview.c:990

 msgid "Checking signature..."
 msgstr "Comprovant signatura..."
 
 msgid "Checking signature..."
 msgstr "Comprovant signatura..."
 

-#: src/mimeview.c:992
+#: src/mimeview.c:1032

 msgid "Go back to email"
 msgstr "Tornar al correu"
 
 msgid "Go back to email"
 msgstr "Tornar al correu"
 

-#: src/mimeview.c:1317 src/mimeview.c:1398 src/mimeview.c:1574
-#: src/mimeview.c:1607
-msgid "Can't save the part of multipart message."
-msgstr "No es pot guardar la part del missatge multiparts."
+#: src/mimeview.c:1370 src/mimeview.c:1451 src/mimeview.c:1628
+#: src/mimeview.c:1661
+msgid "Couldn't save the part of multipart message."
+msgstr "No es pot guardar la part del missatge multipart."

 
 

-#: src/mimeview.c:1387 src/textview.c:2362
+#: src/mimeview.c:1440 src/textview.c:2652

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobreescriure l'arxiu existent '%s'?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobreescriure l'arxiu existent '%s'?"
 

-#: src/mimeview.c:1425
+#: src/mimeview.c:1478

 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destinació"
 
 msgid "Select destination folder"
 msgstr "Seleccionar carpeta destinació"
 

-#: src/mimeview.c:1432
+#: src/mimeview.c:1485

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' no és un directori."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' no és un directori."
 

-#: src/mimeview.c:1636
+#: src/mimeview.c:1707 src/mimeview.c:1715 src/textview.c:2583

 msgid "Open with"
 msgstr "Obrir amb"
 
 msgid "Open with"
 msgstr "Obrir amb"
 

-#: src/mimeview.c:1637
+#: src/mimeview.c:1708 src/mimeview.c:1716 src/textview.c:2584

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6058,9 +6602,9 @@ msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creant la connexió NNTP amb %s:%d ...\n"
 
 #: src/news.c:328
 msgstr "creant la connexió NNTP amb %s:%d ...\n"
 
 #: src/news.c:328

-msgid "Sylpheed-Claws needs network access in order to access the News server."
+msgid "Claws Mail needs network access in order to access the News server."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws necessita accés a xarxa per accedir al servidor de notícies."
+"Claws Mail necessita accés a xarxa per accedir al servidor de notícies."

 
 #: src/news.c:345
 #, c-format
 
 #: src/news.c:345
 #, c-format


@@ -6072,22 +6616,19 @@ msgid "can't retrieve newsgroup list\n"
 msgstr "no es pot obtenir la llista de grups\n"
 
 #: src/news.c:588
 msgstr "no es pot obtenir la llista de grups\n"
 
 #: src/news.c:588

-msgid "can't post article.\n"
+msgid "couldn't post article.\n"

 msgstr "no es pot enviar l'article.\n"
 
 #: src/news.c:614
 msgstr "no es pot enviar l'article.\n"
 
 #: src/news.c:614

-#, c-format
-msgid "can't retrieve article %d\n"
+msgid "couldn't retrieve article %d\n"

 msgstr "no es pot obtenir l'article %d\n"
 
 #: src/news.c:663
 msgstr "no es pot obtenir l'article %d\n"
 
 #: src/news.c:663

-#, c-format
-msgid "can't select group: %s\n"
+msgid "couldn't select group: %s\n"

 msgstr "no es pot seleccionar el grup: %s\n"
 
 #: src/news.c:888
 msgstr "no es pot seleccionar el grup: %s\n"
 
 #: src/news.c:888

-#, c-format
-msgid "can't set group: %s\n"
+msgid "couldn't set group: %s\n"

 msgstr "no es pot establir el grup: %s\n"
 
 #: src/news.c:897
 msgstr "no es pot establir el grup: %s\n"
 
 #: src/news.c:897


@@ -6100,33 +6641,33 @@ msgstr "rang d'articles inv
 msgid "error occurred while getting %s.\n"
 msgstr "s'ha produït un error obtenint %s.\n"
 
 msgid "error occurred while getting %s.\n"
 msgstr "s'ha produït un error obtenint %s.\n"
 

-#: src/news.c:935
+#: src/news.c:955

 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "obtenint xover %d a %s...\n"
 
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "obtenint xover %d a %s...\n"
 

-#: src/news.c:942 src/news.c:1035
-msgid "can't get xover\n"
+#: src/news.c:962 src/news.c:1056
+msgid "couldn't get xover\n"

 msgstr "no s'ha pogut obtenir xover\n"
 
 msgstr "no s'ha pogut obtenir xover\n"
 

-#: src/news.c:952 src/news.c:1047
+#: src/news.c:972 src/news.c:1068

 msgid "error occurred while getting xover.\n"
 msgstr "s'ha produït un error obtenint xover.\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "s'ha produït un error obtenint xover.\n"
 

-#: src/news.c:959 src/news.c:1061
+#: src/news.c:979 src/news.c:1082

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "línia xover invàlida: %s\n"
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "línia xover invàlida: %s\n"
 

-#: src/news.c:976 src/news.c:997 src/news.c:1080 src/news.c:1112
-msgid "can't get xhdr\n"
+#: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133
+msgid "couldn't get xhdr\n"

 msgstr "no s'ha pogut obtenir xhdr\n"
 
 msgstr "no s'ha pogut obtenir xhdr\n"
 

-#: src/news.c:986 src/news.c:1007 src/news.c:1093 src/news.c:1125
+#: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146

 msgid "error occurred while getting xhdr.\n"
 msgstr "s'ha produït un error obtenint xhdr.\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "s'ha produït un error obtenint xhdr.\n"
 

-#: src/news.c:1031
+#: src/news.c:1052

 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtenint xover %d - %d a %s...\n"
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obtenint xover %d - %d a %s...\n"


@@ -6152,16 +6693,20 @@ msgstr "Desubscriure's grup de not
 msgid "_Unsubscribe"
 msgstr "/Des_ubscriure's"
 
 msgid "_Unsubscribe"
 msgstr "/Des_ubscriure's"
 

-#: src/plugins/clamav/clamav_plugin.c:118
+#: src/plugins/clamav/clamav_plugin.c:43
+#: src/plugins/clamav/clamav_plugin_gtk.c:212
+msgid "Clam AntiVirus"
+msgstr "Antivirus Clam"
+
+#: src/plugins/clamav/clamav_plugin.c:120

 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: inspeccionant missatge..."
 
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: inspeccionant missatge..."
 

-#: src/plugins/clamav/clamav_plugin.c:251
-#: src/plugins/clamav/clamav_plugin_gtk.c:214
-msgid "Clam AntiVirus"
-msgstr "Antivirus Clam"
+#: src/plugins/clamav/clamav_plugin.c:205
+msgid "Failed to register mail filtering hook"
+msgstr "Ha fallat el registre d'enllaç del filtrat de correu"

 
 

-#: src/plugins/clamav/clamav_plugin.c:256
+#: src/plugins/clamav/clamav_plugin.c:253

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -6180,6 +6725,10 @@ msgstr ""
 "Les opcions es poden trobar a /Configuració/Preferencies/Mòduls/Antivirus "
 "Clam"
 
 "Les opcions es poden trobar a /Configuració/Preferencies/Mòduls/Antivirus "
 "Clam"
 

+#: src/plugins/clamav/clamav_plugin.c:280
+msgid "Virus detection"
+msgstr "Detecció de virus"
+

 #: src/plugins/clamav/clamav_plugin_gtk.c:96
 msgid "Enable virus scanning"
 msgstr "Habilitar detecció de virus"
 #: src/plugins/clamav/clamav_plugin_gtk.c:96
 msgid "Enable virus scanning"
 msgstr "Habilitar detecció de virus"


@@ -6215,25 +6764,29 @@ msgstr ""
 "Carpeta per guardar el correu infectat. Deixeu-la buida per usar la Paperera "
 "primària"
 
 "Carpeta per guardar el correu infectat. Deixeu-la buida per usar la Paperera "
 "primària"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:151
+#: src/plugins/clamav/clamav_plugin_gtk.c:150

 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 "Cliqueu aquest botó per seleccionar la carpeta per guardar el correu "
 "infectats"
 
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 "Cliqueu aquest botó per seleccionar la carpeta per guardar el correu "
 "infectats"
 

-#: src/plugins/demo/demo.c:74
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99

 msgid "Demo"
 msgstr "Demostració"
 
 msgid "Demo"
 msgstr "Demostració"
 

-#: src/plugins/demo/demo.c:79
+#: src/plugins/demo/demo.c:52
+msgid "Failed to register log text hook"
+msgstr "No s'ha pogut registrar l'enllaç de traça de text"
+
+#: src/plugins/demo/demo.c:75

 msgid ""
 msgid ""

-"This Plugin is only a demo of how to write plugins for Sylpheed-Claws. It "
+"This Plugin is only a demo of how to write plugins for Claws Mail. It "

 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"

-"It is not really useful"
+"It is not really useful."

 msgstr ""
 msgstr ""

-"Aquest mòdul és només una mostra de com escriure mòduls per a Sylpheed-"
-"Claws. Installa un enllaç per a una nova traça i l'escriu a la sortida "
+"Aquest mòdul és només una mostra de com escriure mòduls per a Claws Mail. "
+"Instal·leu un enllaç per a una nova traça i l'escriu a la sortida "

 "estàndard.\n"
 "\n"
 "No és realment útil"
 "estàndard.\n"
 "\n"
 "No és realment útil"


@@ -6262,11 +6815,11 @@ msgstr "Mode finestra completa (ocultar controls)"
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Equivalent a la opció '--fullwindow' de Dillo"
 
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Equivalent a la opció '--fullwindow' de Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:193
+#: src/plugins/dillo_viewer/dillo_viewer.c:39

 msgid "Dillo HTML Viewer"
 msgstr "Visor HTML Dillo"
 
 msgid "Dillo HTML Viewer"
 msgstr "Visor HTML Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:198
+#: src/plugins/dillo_viewer/dillo_viewer.c:195

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -6277,15 +6830,47 @@ msgstr ""
 "Les opcions podeu trobar-les a /Configuració/Preferencies/Mòduls/Navegador "
 "Dillo"
 
 "Les opcions podeu trobar-les a /Configuració/Preferencies/Mòduls/Navegador "
 "Dillo"
 

-#: src/plugins/pgpcore/passphrase.c:99 src/plugins/pgpcore/prefs_gpg.c:94
+#: src/plugins/dillo_viewer/dillo_viewer.c:219
+msgid "text/html"
+msgstr "text/html"
+
+#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:97

 msgid "Passphrase"
 msgstr "Frase de pas"
 
 msgid "Passphrase"
 msgstr "Frase de pas"
 

-#: src/plugins/pgpcore/passphrase.c:260
+#: src/plugins/pgpcore/passphrase.c:259

 msgid "[no user id]"
 msgstr "[sense id d'usuari]"
 
 #: src/plugins/pgpcore/passphrase.c:274
 msgid "[no user id]"
 msgstr "[sense id d'usuari]"
 
 #: src/plugins/pgpcore/passphrase.c:274

+msgid ""
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
+"new key:</span>\n"
+"\n"
+"%.*s\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%sSi us plau, escriviu la frase de pas "
+"per a la nova clau: </span>\n"
+"\n"
+"%.*s\n"
+
+#: src/plugins/pgpcore/passphrase.c:277
+msgid "Passphrases did not match.\n"
+msgstr "La frase de pas no coincideix.\n"
+
+#: src/plugins/pgpcore/passphrase.c:280
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
+"new key:</span>\n"
+"\n"
+"%.*s\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%sSi us plau, re-escriviu la frase de pas "
+"per a la nova clau: </span>\n"
+"\n"
+"%.*s\n"
+
+#: src/plugins/pgpcore/passphrase.c:284

 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"


@@ -6298,262 +6883,277 @@ msgstr ""
 "\n"
 "%.*s\n"
 
 "\n"
 "%.*s\n"
 

-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:287

 msgid "Bad passphrase.\n"
 msgstr "Paraula de pas errònia\n"
 
 msgid "Bad passphrase.\n"
 msgstr "Paraula de pas errònia\n"
 

-#: src/plugins/pgpcore/prefs_gpg.c:92
+#: src/plugins/pgpcore/prefs_gpg.c:95

 msgid "Automatically check signatures"
 msgstr "Verificar signatures automàticament"
 
 msgid "Automatically check signatures"
 msgstr "Verificar signatures automàticament"
 

-#: src/plugins/pgpcore/prefs_gpg.c:102
+#: src/plugins/pgpcore/prefs_gpg.c:105

 msgid "Store passphrase in memory"
 msgstr "Emmagatzemeu la frase de pas en memòria"
 
 msgid "Store passphrase in memory"
 msgstr "Emmagatzemeu la frase de pas en memòria"
 

-#: src/plugins/pgpcore/prefs_gpg.c:108
+#: src/plugins/pgpcore/prefs_gpg.c:111

 msgid "Expire after"
 msgstr "Caduca després de"
 
 msgid "Expire after"
 msgstr "Caduca després de"
 

-#: src/plugins/pgpcore/prefs_gpg.c:123
+#: src/plugins/pgpcore/prefs_gpg.c:126

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Establint-lo a '0' guarda la frase de pas durant tota la sessió"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Establint-lo a '0' guarda la frase de pas durant tota la sessió"
 

-#: src/plugins/pgpcore/prefs_gpg.c:128 src/prefs_receive.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:165

 msgid "minute(s)"
 msgstr "minut(s)"
 
 msgid "minute(s)"
 msgstr "minut(s)"
 

-#: src/plugins/pgpcore/prefs_gpg.c:138
+#: src/plugins/pgpcore/prefs_gpg.c:141

 msgid "Grab input while entering a passphrase"
 msgstr "Capturar l'entrada al introduïr la frase de pas"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar l'entrada al introduïr la frase de pas"
 

-#: src/plugins/pgpcore/prefs_gpg.c:145
+#: src/plugins/pgpcore/prefs_gpg.c:148

 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar un avís a l'inici si GnuPG no funciona"
 
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar un avís a l'inici si GnuPG no funciona"
 

-#: src/plugins/pgpcore/prefs_gpg.c:235
+#: src/plugins/pgpcore/prefs_gpg.c:273

 msgid "Sign key"
 msgstr "Clau per signar"
 
 msgid "Sign key"
 msgstr "Clau per signar"
 

-#: src/plugins/pgpcore/prefs_gpg.c:248
+#: src/plugins/pgpcore/prefs_gpg.c:286

 msgid "Use default GnuPG key"
 msgstr "Useu la clau GnuPG per omissió"
 
 msgid "Use default GnuPG key"
 msgstr "Useu la clau GnuPG per omissió"
 

-#: src/plugins/pgpcore/prefs_gpg.c:259
+#: src/plugins/pgpcore/prefs_gpg.c:297

 msgid "Select key by your email address"
 msgstr "Seleccioneu la clau en base a l'adreça de correu"
 
 msgid "Select key by your email address"
 msgstr "Seleccioneu la clau en base a l'adreça de correu"
 

-#: src/plugins/pgpcore/prefs_gpg.c:270
+#: src/plugins/pgpcore/prefs_gpg.c:308

 msgid "Specify key manually"
 msgstr "Especifiqueu la clau manualment"
 
 msgid "Specify key manually"
 msgstr "Especifiqueu la clau manualment"
 

-#: src/plugins/pgpcore/prefs_gpg.c:280
+#: src/plugins/pgpcore/prefs_gpg.c:318

 msgid "User or key ID:"
 msgstr "Usuari o ID de clau:"
 
 msgid "User or key ID:"
 msgstr "Usuari o ID de clau:"
 

-#: src/plugins/pgpcore/prefs_gpg.c:454
+#: src/plugins/pgpcore/prefs_gpg.c:359
+msgid "No secret key found."
+msgstr "No s'ha trobat cap clau secreta."
+
+#: src/plugins/pgpcore/prefs_gpg.c:362
+msgid "Generate a new key pair"
+msgstr "Generar un nou parell de claus"
+
+#: src/plugins/pgpcore/prefs_gpg.c:515

 msgid "GPG"
 msgstr "GPG"
 
 #: src/plugins/pgpcore/select-keys.c:107
 #, c-format
 msgid "GPG"
 msgstr "GPG"
 
 #: src/plugins/pgpcore/select-keys.c:107
 #, c-format

-msgid "Please select key for '%s'"
-msgstr "Seleccioneu clau per '%s'"
+msgid "No exact match for '%s'; please select the key."
+msgstr "No casa exactament per '%s'; si us plau seleccioneu la clau."

 
 #: src/plugins/pgpcore/select-keys.c:110
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Recollint info per '%s' ... %c"
 
 
 #: src/plugins/pgpcore/select-keys.c:110
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "Recollint info per '%s' ... %c"
 

-#: src/plugins/pgpcore/select-keys.c:310
+#: src/plugins/pgpcore/select-keys.c:348

 msgid "Select Keys"
 msgstr "Seleccioneu tecles"
 
 msgid "Select Keys"
 msgstr "Seleccioneu tecles"
 

-#: src/plugins/pgpcore/select-keys.c:337
+#: src/plugins/pgpcore/select-keys.c:375

 msgid "Key ID"
 msgstr "ID tecla"
 
 msgid "Key ID"
 msgstr "ID tecla"
 

-#: src/plugins/pgpcore/select-keys.c:340
+#: src/plugins/pgpcore/select-keys.c:378

 msgid "Val"
 msgstr "Val"
 
 msgid "Val"
 msgstr "Val"
 

-#: src/plugins/pgpcore/select-keys.c:361
+#: src/plugins/pgpcore/select-keys.c:399

 msgid "Select"
 msgstr "Seleccionar"
 
 msgid "Select"
 msgstr "Seleccionar"
 

-#: src/plugins/pgpcore/select-keys.c:362 src/prefs_other.c:271
+#: src/plugins/pgpcore/select-keys.c:400 src/prefs_other.c:278

 msgid "Other"
 msgstr "Altres"
 
 msgid "Other"
 msgstr "Altres"
 

-#: src/plugins/pgpcore/select-keys.c:363
+#: src/plugins/pgpcore/select-keys.c:401

 msgid "Don't encrypt"
 msgstr "No encriptar"
 
 msgid "Don't encrypt"
 msgstr "No encriptar"
 

-#: src/plugins/pgpcore/select-keys.c:508
+#: src/plugins/pgpcore/select-keys.c:543

 msgid "Add key"
 msgstr "Afegir clau"
 
 msgid "Add key"
 msgstr "Afegir clau"
 

-#: src/plugins/pgpcore/select-keys.c:509
+#: src/plugins/pgpcore/select-keys.c:544

 msgid "Enter another user or key ID:"
 msgstr "Entreu un altre usuari o clau ID:"
 
 msgid "Enter another user or key ID:"
 msgstr "Entreu un altre usuari o clau ID:"
 

-#: src/plugins/pgpcore/select-keys.c:525
-msgid "Trust key"
-msgstr "Clau de confiança"
-
-#: src/plugins/pgpcore/select-keys.c:526
+#: src/plugins/pgpcore/select-keys.c:561

 msgid ""
 msgid ""

-"The selected key is not fully trusted.\n"
+"The key of '%s' is not fully trusted.\n"

 "If you choose to encrypt the message with this key you don't\n"
 "know for sure that it will go to the person you mean it to.\n"
 "Do you trust it enough to use it anyway?"
 msgstr ""
 "If you choose to encrypt the message with this key you don't\n"
 "know for sure that it will go to the person you mean it to.\n"
 "Do you trust it enough to use it anyway?"
 msgstr ""

-"La clau seleccionada no es confiable totalment.\n"
+"La clau de '%s' no es confiable totalment.\n"

 "Si escolliu d'encriptar el missatge amb aquesta clau no podreu\n"
 "assegurar-vos de que aniría la persona que creieu que va.\n"
 "Hi confieu lo suficient com per usar-la de totes maneres?"
 
 "Si escolliu d'encriptar el missatge amb aquesta clau no podreu\n"
 "assegurar-vos de que aniría la persona que creieu que va.\n"
 "Hi confieu lo suficient com per usar-la de totes maneres?"
 

-#: src/plugins/pgpcore/sgpgme.c:125
+#: src/plugins/pgpcore/select-keys.c:566
+msgid "Trust key"
+msgstr "Clau de confiança"
+
+#: src/plugins/pgpcore/sgpgme.c:76 src/privacy.c:211 src/privacy.c:215
+#: src/privacy.c:232 src/privacy.c:236
+msgid "No signature found"
+msgstr "No s'ha trobat signatura"
+
+#: src/plugins/pgpcore/sgpgme.c:138

 msgid "Undefined"
 msgstr "Indefinida"
 
 msgid "Undefined"
 msgstr "Indefinida"
 

-#: src/plugins/pgpcore/sgpgme.c:127 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:193

 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Mai"
 
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Mai"
 

-#: src/plugins/pgpcore/sgpgme.c:129
+#: src/plugins/pgpcore/sgpgme.c:142

 msgid "Marginal"
 msgstr "Marginal"
 
 msgid "Marginal"
 msgstr "Marginal"
 

-#: src/plugins/pgpcore/sgpgme.c:133
+#: src/plugins/pgpcore/sgpgme.c:146

 msgid "Ultimate"
 msgstr "Final"
 
 msgid "Ultimate"
 msgstr "Final"
 

-#: src/plugins/pgpcore/sgpgme.c:167
+#: src/plugins/pgpcore/sgpgme.c:180
+#, c-format

 msgid "The signature can't be checked - %s"
 msgstr "La signatura no pot ser comprovada - %s"
 
 msgid "The signature can't be checked - %s"
 msgstr "La signatura no pot ser comprovada - %s"
 

-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/pgpcore/sgpgme.c:175
-#: src/plugins/pgpcore/sgpgme.c:222
+#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:188
+#: src/plugins/pgpcore/sgpgme.c:235

 msgid "The signature has not been checked."
 msgstr "La signatura no ha estat comprovada"
 
 msgid "The signature has not been checked."
 msgstr "La signatura no ha estat comprovada"
 

-#: src/plugins/pgpcore/sgpgme.c:181 src/plugins/pgpcore/sgpgme.c:183
+#: src/plugins/pgpcore/sgpgme.c:194 src/plugins/pgpcore/sgpgme.c:196

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "Nucli PGP: no es pot obtenir la clau - gpg-agent no s'està executant."
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "Nucli PGP: no es pot obtenir la clau - gpg-agent no s'està executant."
 

-#: src/plugins/pgpcore/sgpgme.c:196
+#: src/plugins/pgpcore/sgpgme.c:209

 #, c-format
 msgid "Good signature from %s."
 msgstr "Signatura vàlida de %s."
 
 #, c-format
 msgid "Good signature from %s."
 msgstr "Signatura vàlida de %s."
 

-#: src/plugins/pgpcore/sgpgme.c:202
+#: src/plugins/pgpcore/sgpgme.c:215

 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Signatura vàlida(sense confiança)  de %s."
 
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Signatura vàlida(sense confiança)  de %s."
 

-#: src/plugins/pgpcore/sgpgme.c:207
+#: src/plugins/pgpcore/sgpgme.c:220

 #, c-format
 msgid "Expired signature from %s."
 msgstr "Signatura caducada de %s"
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Signatura caducada de %s"
 

-#: src/plugins/pgpcore/sgpgme.c:210
+#: src/plugins/pgpcore/sgpgme.c:223

 #, c-format
 msgid "Expired key from %s."
 msgstr "Signatura caducada de %s."
 
 #, c-format
 msgid "Expired key from %s."
 msgstr "Signatura caducada de %s."
 

-#: src/plugins/pgpcore/sgpgme.c:213
+#: src/plugins/pgpcore/sgpgme.c:226

 #, c-format
 msgid "Bad signature from %s."
 msgstr "Signatura errònia de %s."
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Signatura errònia de %s."
 

-#: src/plugins/pgpcore/sgpgme.c:217
+#: src/plugins/pgpcore/sgpgme.c:230

 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Clau 0x%s no disponible per verificar aquesta signatura."
 
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Clau 0x%s no disponible per verificar aquesta signatura."
 

-#: src/plugins/pgpcore/sgpgme.c:259
+#: src/plugins/pgpcore/sgpgme.c:272

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Signatura realitzada usant %s ID de clau %s\n"
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Signatura realitzada usant %s ID de clau %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:266
+#: src/plugins/pgpcore/sgpgme.c:279

 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Signatura vàlida de \"%s\" (Confiança: %s)\n"
 
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Signatura vàlida de \"%s\" (Confiança: %s)\n"
 

-#: src/plugins/pgpcore/sgpgme.c:271
+#: src/plugins/pgpcore/sgpgme.c:284

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Signatura caducada de \"%s\"\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Signatura caducada de \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:276
+#: src/plugins/pgpcore/sgpgme.c:289

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Signatura INVÀLIDA de \"%s\"\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Signatura INVÀLIDA de \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:287
+#: src/plugins/pgpcore/sgpgme.c:300

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               alies \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               alies \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:293
+#: src/plugins/pgpcore/sgpgme.c:306

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Empremta digital de clau primària: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Empremta digital de clau primària: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:298
+#: src/plugins/pgpcore/sgpgme.c:311

 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVÍS: l'adreça del signant «%s» no coincideix amb l'entrada DNS\n"
 
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVÍS: l'adreça del signant «%s» no coincideix amb l'entrada DNS\n"
 

-#: src/plugins/pgpcore/sgpgme.c:304
+#: src/plugins/pgpcore/sgpgme.c:317

 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "L'adreça verificada del signant és «%s»\n"
 
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "L'adreça verificada del signant és «%s»\n"
 

-#: src/plugins/pgpcore/sgpgme.c:348
+#: src/plugins/pgpcore/sgpgme.c:359
+#, c-format

 msgid "Couldn't get data from message, %s"
 msgstr "No s'ha pogut obtenir dades del missatge %s"
 
 msgid "Couldn't get data from message, %s"
 msgstr "No s'ha pogut obtenir dades del missatge %s"
 

-#: src/plugins/pgpcore/sgpgme.c:364
+#: src/plugins/pgpcore/sgpgme.c:375
+#, c-format

 msgid "Couldn't initialize data, %s"
 msgstr "No s'ha pogut inicialitzar les dades, %s"
 
 msgid "Couldn't initialize data, %s"
 msgstr "No s'ha pogut inicialitzar les dades, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:480
-#, c-format
-msgid "Private key not found (%s)"
-msgstr "Clau privada no trobada (%s)"
+#: src/plugins/pgpcore/sgpgme.c:491
+msgid "Secret key not found (%s)"
+msgstr "Clau secreta no trobada (%s)"

 
 

-#: src/plugins/pgpcore/sgpgme.c:488
-msgid "Private key specification is ambiguous"
-msgstr "La especificació de la clau privata es ambigua"
+#: src/plugins/pgpcore/sgpgme.c:499
+msgid "Secret key specification is ambiguous"
+msgstr "La especificació de la clau secreta es ambigua"

 
 

-#: src/plugins/pgpcore/sgpgme.c:498
-#, c-format
-msgid "Error setting private key: %s"
-msgstr "Error definint clau privada: %s"
+#: src/plugins/pgpcore/sgpgme.c:509
+msgid "Error setting secret key: %s"
+msgstr "Error definint la clau secreta: %s"

 
 

-#: src/plugins/pgpcore/sgpgme.c:534
+#: src/plugins/pgpcore/sgpgme.c:545

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."

-msgstr "Protocol gpgme '%s' no es usable: Motor '%s' no s'ha instal·lat correctament."
+msgstr ""
+"Protocol gpgme '%s' no es usable: Motor '%s' no s'ha instal·lat correctament."

 
 

-#: src/plugins/pgpcore/sgpgme.c:540
+#: src/plugins/pgpcore/sgpgme.c:551

 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
 msgstr ""
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
 msgstr ""

-"Protocol gpgme '%s' no es usable: Motor '%s' versió '%s' s'ha instal·lat, però "
-"la versió %s és necessària.\n"
+"Protocol gpgme '%s' no es usable: Motor '%s' versió '%s' s'ha instal·lat, "
+"però la versió %s és necessària.\n"

 
 

-#: src/plugins/pgpcore/sgpgme.c:548
+#: src/plugins/pgpcore/sgpgme.c:559

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Protocol gpgme '%s' no es usable (problema desconegut)"
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Protocol gpgme '%s' no es usable (problema desconegut)"
 

-#: src/plugins/pgpcore/sgpgme.c:564
+#: src/plugins/pgpcore/sgpgme.c:575

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -6561,7 +7161,74 @@ msgstr ""
 "GnuPG no està adecuadament installat o necessita actualitzar-se.\n"
 "Soport de OpenPGP deshabilitat."
 
 "GnuPG no està adecuadament installat o necessita actualitzar-se.\n"
 "Soport de OpenPGP deshabilitat."
 

-#: src/plugins/pgpcore/plugin.c:59
+#: src/plugins/pgpcore/sgpgme.c:609
+msgid ""
+"You have to save the account's information with \"OK\" before being able to "
+"generate a key pair.\n"
+msgstr ""
+"Heu de guardar la informació del compte amb \"Acceptar\" abans de poder "
+"generar el parell de claus.\n"
+
+#: src/plugins/pgpcore/sgpgme.c:614
+msgid "No PGP key found"
+msgstr "No s'ha trobat una clau PGP"
+
+#: src/plugins/pgpcore/sgpgme.c:615
+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 ""
+"Claws Mail no ha trobat cap clau secreta PGP, la qual cosa vol dir que no podeu "
+" signar missatges o rebre missatges encriptats.\n"
+"Voleu crear un nou parell de claus ara?"
+
+#: src/plugins/pgpcore/sgpgme.c:685 src/plugins/pgpcore/sgpgme.c:701
+msgid "Couldn't generate a new key pair: %s"
+msgstr "No s'ha pogut generar un nou parell de claus: %s"
+
+#: src/plugins/pgpcore/sgpgme.c:692
+msgid ""
+"Generating your new key pair... Please move the mouse around to help "
+"generate entropy..."
+msgstr ""
+"Generant el vostre nou parell de claus...Si us plau mogueu el ratolí per "
+"ajudar a generar entropia..."
+
+#: src/plugins/pgpcore/sgpgme.c:707
+msgid "Couldn't generate a new key pair: unknown error"
+msgstr "No s'ha pogut generar un nou parell de claus: error desconegut"
+
+#: src/plugins/pgpcore/sgpgme.c:711
+#, c-format
+msgid ""
+"Your new key pair has been generated. Its fingerprint is:\n"
+"%s\n"
+"\n"
+"Do you want to export it to a keyserver?"
+msgstr ""
+"El vostre nou parell de claus ha estat generat. La polsada és:\n"
+"%s\n"
+"\n"
+"Voleu exportar-la a un servidor de claus?" 
+
+#: src/plugins/pgpcore/sgpgme.c:715
+msgid "Key generated"
+msgstr "Clau generada"
+
+#: src/plugins/pgpcore/sgpgme.c:754
+msgid "Key exported."
+msgstr "Clau exportada."
+
+#: src/plugins/pgpcore/sgpgme.c:756
+msgid "Couldn't export key."
+msgstr "No s'ha pogut exportar la clau."
+
+#: src/plugins/pgpcore/sgpgme.c:760
+msgid "Key export isn't implemented in Windows."
+msgstr "La clau exportada no està implementada a Windows."
+
+#: src/plugins/pgpcore/plugin.c:35

 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 


@@ -6587,70 +7254,170 @@ msgstr ""
 "\n"
 "GPGME és copyright 2001 per Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME és copyright 2001 per Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpinline/pgpinline.c:236 src/plugins/pgpinline/pgpinline.c:384
+#: src/plugins/pgpcore/plugin.c:93
+msgid "Core operations"
+msgstr "Operacions principals"
+
+#: src/plugins/pgpcore/pgp_viewer.c:118
+msgid "Key import"
+msgstr "Importar clau"
+
+#: src/plugins/pgpcore/pgp_viewer.c:119
+msgid ""
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"
+msgstr ""
+"Aquesta clau no és al vostre anell de claus. Voleu que Claws Mail intenti importar-la "
+"desde un servidor de claus?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
+msgid ""
+"\n"
+"  Key ID "
+msgstr ""
+"\n"
+"  ID tecla"
+
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:186
+msgid "   This key is not in your keyring.\n"
+msgstr "   Aquesta clau no és al vostre anell de claus.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:130
+msgid "   It should be possible to import it "
+msgstr "   Hauria de ser possible importar-la"
+
+#: src/plugins/pgpcore/pgp_viewer.c:132
+msgid ""
+"when working online,\n"
+"   or "
+msgstr ""
+"mentre treballeu amb connexió,\n"
+"   o "
+
+#: src/plugins/pgpcore/pgp_viewer.c:133
+msgid ""
+"with the following command: \n"
+"\n"
+"     "
+msgstr ""
+"amb la següent comanda: \n"
+"\n"
+"     "
+
+#: src/plugins/pgpcore/pgp_viewer.c:140
+msgid ""
+"\n"
+"  Importing key ID "
+msgstr ""
+"\n"
+"  Important l'ID de la clau "
+
+#: src/plugins/pgpcore/pgp_viewer.c:179
+msgid "   This key has been imported to your keyring.\n"
+msgstr "   Aquesta clau ha estat importada al vostre anell de claus.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:181
+msgid "   This key couldn't be imported to your keyring.\n"
+msgstr "   Aquesta clau no ha pogut ser importada al vostre anell de claus.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid ""
+"   You can try to import it manually with the command:\n"
+"\n"
+"     "
+msgstr ""
+"   Podeu intentar importar-lo manualment amb la comanda:\n"
+"\n"
+"     "
+
+#: src/plugins/pgpcore/pgp_viewer.c:187
+msgid "   Key import isn't implemented in Windows.\n"
+msgstr "   Importar claus no és implementat a Windows.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:196
+msgid "   This key is in your keyring.\n"
+msgstr "   Aquesta clau és al vostre anell de claus.\n"
+
+#: src/plugins/pgpinline/pgpinline.c:241 src/plugins/pgpinline/pgpinline.c:393

 msgid "Couldn't get text data."
 msgstr "No s'ha pogut obtenir les dades del text."
 
 msgid "Couldn't get text data."
 msgstr "No s'ha pogut obtenir les dades del text."
 

-#: src/plugins/pgpinline/pgpinline.c:254
+#: src/plugins/pgpinline/pgpinline.c:259

 msgid "Couldn't convert text data to any sane charset."
 msgstr "No s'ha pogut convertir dades de text a un joc de caràcters correcte"
 
 msgid "Couldn't convert text data to any sane charset."
 msgstr "No s'ha pogut convertir dades de text a un joc de caràcters correcte"
 

-#: src/plugins/pgpinline/pgpinline.c:377
+#: src/plugins/pgpinline/pgpinline.c:267 src/plugins/pgpinline/pgpinline.c:523
+#: src/plugins/pgpinline/pgpinline.c:644 src/plugins/pgpinline/pgpinline.c:691
+#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
+#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
+#: src/plugins/pgpmime/pgpmime.c:593
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "No s'ha pogut inicialitzar el contexte GPG, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:386

 msgid "Couldn't parse mime part."
 msgstr "No s'ha pogut parsejar la part mime del missatge."
 
 msgid "Couldn't parse mime part."
 msgstr "No s'ha pogut parsejar la part mime del missatge."
 

-#: src/plugins/pgpinline/pgpinline.c:407 src/plugins/pgpmime/pgpmime.c:332
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:343
+#, c-format

 msgid "Couldn't open decrypted file %s"
 msgstr "No s'ha pogut obrir l'arxiu desencriptat %s"
 
 msgid "Couldn't open decrypted file %s"
 msgstr "No s'ha pogut obrir l'arxiu desencriptat %s"
 

-#: src/plugins/pgpinline/pgpinline.c:437
+#: src/plugins/pgpinline/pgpinline.c:446

 msgid "Couldn't scan decrypted file."
 msgstr "No s'ha pogut escanejar l'arxiu desencriptat."
 
 msgid "Couldn't scan decrypted file."
 msgstr "No s'ha pogut escanejar l'arxiu desencriptat."
 

-#: src/plugins/pgpinline/pgpinline.c:445
+#: src/plugins/pgpinline/pgpinline.c:454

 msgid "Couldn't scan decrypted file parts."
 msgstr "No s'ha escanejar les parts de l'arxiu desencriptat."
 
 msgid "Couldn't scan decrypted file parts."
 msgstr "No s'ha escanejar les parts de l'arxiu desencriptat."
 

-#: src/plugins/pgpinline/pgpinline.c:499
+#: src/plugins/pgpinline/pgpinline.c:508

 msgid "Couldn't create temporary file."
 msgstr "No s'ha pogut crear l'arxiu temporal."
 
 msgid "Couldn't create temporary file."
 msgstr "No s'ha pogut crear l'arxiu temporal."
 

-#: src/plugins/pgpinline/pgpinline.c:533 src/plugins/pgpmime/pgpmime.c:479
+#: src/plugins/pgpinline/pgpinline.c:546 src/plugins/pgpmime/pgpmime.c:494

 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Signatura de dades fallida, %s"
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Signatura de dades fallida, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:551 src/plugins/pgpmime/pgpmime.c:504
+#: src/plugins/pgpinline/pgpinline.c:564 src/plugins/pgpmime/pgpmime.c:519

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Signatura de dades fallida per signant no vàlid: %s"
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Signatura de dades fallida per signant no vàlid: %s"
 

-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:513
+#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:528

 msgid "Data signing failed, no results."
 msgstr "Signatura de dades fallida, sense resultats."
 
 msgid "Data signing failed, no results."
 msgstr "Signatura de dades fallida, sense resultats."
 

-#: src/plugins/pgpinline/pgpinline.c:572 src/plugins/pgpmime/pgpmime.c:525
+#: src/plugins/pgpinline/pgpinline.c:583 src/plugins/pgpmime/pgpmime.c:539

 msgid "Data signing failed, no contents."
 msgstr "Signatura de dades fallidam, sense continguts."
 
 msgid "Data signing failed, no contents."
 msgstr "Signatura de dades fallidam, sense continguts."
 

-#: src/plugins/pgpinline/pgpinline.c:635 src/plugins/pgpmime/pgpmime.c:583
+#: src/plugins/pgpinline/pgpinline.c:653 src/plugins/pgpmime/pgpmime.c:602

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "No s'ha pogut afegir la clau GPG %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "No s'ha pogut afegir la clau GPG %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpmime/pgpmime.c:611
+#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:630
+#, c-format

 msgid "Couldn't create temporary file, %s"
 msgstr "No s'ha pogut crear l'arxiu temporal, %s"
 
 msgid "Couldn't create temporary file, %s"
 msgstr "No s'ha pogut crear l'arxiu temporal, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:681 src/plugins/pgpmime/pgpmime.c:637
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:655
+#, c-format

 msgid "Encryption failed, %s"
 msgstr "Encriptació fallida, %s"
 
 msgid "Encryption failed, %s"
 msgstr "Encriptació fallida, %s"
 

-#: src/plugins/pgpinline/plugin.c:57
+#: src/plugins/pgpinline/pgpinline.c:767
+msgid "PGP/Inline"
+msgstr "PGP/Inline"
+
+#: src/plugins/pgpinline/plugin.c:33

 msgid "PGP/inline"
 msgstr "PGP/inline"
 
 msgid "PGP/inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:62
+#: src/plugins/pgpinline/plugin.c:58

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -6676,11 +7443,11 @@ msgstr ""
 "\n"
 "GPGME és copyright 2001 per Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME és copyright 2001 per Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/plugin.c:56
+#: src/plugins/pgpmime/plugin.c:33

 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:61
+#: src/plugins/pgpmime/plugin.c:58

 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"


@@ -6705,59 +7472,75 @@ msgstr ""
 "\n"
 "GPGME és copyright 2001 per Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME és copyright 2001 per Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/pgpmime.c:191
+#: src/plugins/pgpmime/pgpmime.c:201

 msgid "Signature boundary not found."
 msgstr "Límit de la signatura no trobat."
 
 msgid "Signature boundary not found."
 msgstr "Límit de la signatura no trobat."
 

-#: src/plugins/pgpmime/pgpmime.c:309
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "No s'ha pogut inicialitzar el contexte GPG, %s"
-
-#: src/plugins/pgpmime/pgpmime.c:351
+#: src/plugins/pgpmime/pgpmime.c:362

 msgid "Couldn't parse decrypted file."
 msgstr "No s'ha pogut parsejar l'arxiu desencriptat."
 
 msgid "Couldn't parse decrypted file."
 msgstr "No s'ha pogut parsejar l'arxiu desencriptat."
 

-#: src/plugins/pgpmime/pgpmime.c:357
+#: src/plugins/pgpmime/pgpmime.c:368

 msgid "Couldn't parse decrypted file parts."
 msgstr "No s'ha pogut parsejar les parts de l'arxiu desencriptat."
 
 msgid "Couldn't parse decrypted file parts."
 msgstr "No s'ha pogut parsejar les parts de l'arxiu desencriptat."
 

-#: src/plugins/pgpmime/pgpmime.c:403 src/plugins/pgpmime/pgpmime.c:442
+#: src/plugins/pgpmime/pgpmime.c:414 src/plugins/pgpmime/pgpmime.c:453
+#, c-format

 msgid "Couldn't create temporary file: %s"
 msgstr "No s'ha pogut crear l'arxiu temporal: %s"
 
 msgid "Couldn't create temporary file: %s"
 msgstr "No s'ha pogut crear l'arxiu temporal: %s"
 

-#: src/plugins/spamassassin/spamassassin.c:152
-msgid "Spamassassin plugin couldn't connect to spamd.\n"
-msgstr "El mòdul Spamassassin no pot connectar amb spamd.\n"
+#: src/plugins/pgpmime/pgpmime.c:723
+msgid "PGP/Mime"
+msgstr "PGP/Mime"
+
+#: src/plugins/spamassassin/spamassassin.c:75
+#: src/plugins/spamassassin/spamassassin_gtk.c:549
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: src/plugins/spamassassin/spamassassin.c:161
+msgid "SpamAssassin plugin couldn't connect to spamd.\n"
+msgstr "Spamassassin no pot connectar amb spamd.\n"

 
 

-#: src/plugins/spamassassin/spamassassin.c:192
-msgid "Spamassassin plugin is disabled by its preferences.\n"
-msgstr "El mòdul Spamassassin està deshabilitat per les vostres preferències\n"
+#: src/plugins/spamassassin/spamassassin.c:177
+msgid "SpamAssassin plugin filtering failed.\n"
+msgstr "Ha fallat el filtratge del mòdul SpamAssassin.\n"

 
 

-#: src/plugins/spamassassin/spamassassin.c:197
+#: src/plugins/spamassassin/spamassassin.c:203
+msgid "SpamAssassin plugin is disabled by its preferences.\n"
+msgstr "El mòdul Spamassassin està deshabilitat per les seves preferències.\n"
+
+#: src/plugins/spamassassin/spamassassin.c:208

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrant missatge..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrant missatge..."
 

-#: src/plugins/spamassassin/spamassassin.c:303
+#: src/plugins/spamassassin/spamassassin.c:277

 msgid ""
 msgid ""

-"Sylpheed-Claws needs network access in order to feed this mail(s) to the "
-"remote learner."
+"The SpamAssassin plugin couldn't filter a message. The probable cause of the "
+"error is an unreachable spamd daemon. Please make sure spamd is running and "
+"accessible."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws necessita accés a xarxa per enviar aquest correu al programa "
-"d'aprenentatge remot."
+"El mòdul SpamAssassin no pot filtrar el missatge. La causa més probable de "
+"l'error es que no s'hagi pogut arribar al dimoni spamd. Si us plau, assegureu-vos de que "
+"spamd séstà executant i és accessible."

 
 

-#: src/plugins/spamassassin/spamassassin.c:464
-msgid "Spamassassin plugin is loaded but disabled by its preferences.\n"
+#: src/plugins/spamassassin/spamassassin.c:336
+msgid ""
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."

 msgstr ""
 msgstr ""

-"El mòdul Spamassassin està carregat però deshabilitat per les vostres "
-"preferències.\n"
+"Claws Mail necessita accés a xarxa per enviar aquest correu al programa "
+"d'aprenentatge remot."

 
 

-#: src/plugins/spamassassin/spamassassin.c:492
-#: src/plugins/spamassassin/spamassassin_gtk.c:549
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
+#: src/plugins/spamassassin/spamassassin.c:479
+msgid "Failed to get username"
+msgstr "Ha fallat la recepció del nom d'usuari"
+
+#: src/plugins/spamassassin/spamassassin.c:491
+msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
+msgstr "El mòdul Spamassassin està carregat però deshabilitat per les seves preferències.\n"

 
 

-#: src/plugins/spamassassin/spamassassin.c:497
+#: src/plugins/spamassassin/spamassassin.c:524

 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "


@@ -6781,6 +7564,14 @@ msgstr ""
 "\n"
 "Les opcions les podeu trobar a /Configuració/Preferències/Mòduls/SpamAssassin"
 
 "\n"
 "Les opcions les podeu trobar a /Configuració/Preferències/Mòduls/SpamAssassin"
 

+#: src/plugins/spamassassin/spamassassin.c:555
+msgid "Spam detection"
+msgstr "Detecció de correu brossa"
+
+#: src/plugins/spamassassin/spamassassin.c:556
+msgid "Spam learning"
+msgstr "Aprenentatge de correu brossa"
+

 #: src/plugins/spamassassin/spamassassin_gtk.c:85
 msgid "Localhost"
 msgstr "Màquina local"
 #: src/plugins/spamassassin/spamassassin_gtk.c:85
 msgid "Localhost"
 msgstr "Màquina local"


@@ -6849,7 +7640,8 @@ msgstr ""
 "Temps màxim permès per a la comprovació. Si la comprovació dura més aquesta "
 "serà cancel·lada."
 
 "Temps màxim permès per a la comprovació. Si la comprovació dura més aquesta "
 "serà cancel·lada."
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:187
+#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
+#: src/prefs_summaries.c:900

 msgid "seconds"
 msgstr "segons"
 
 msgid "seconds"
 msgstr "segons"
 


@@ -6873,44 +7665,60 @@ msgid "Click this button to select a folder for storing spam"
 msgstr ""
 "Pulseu aquest botò per seleccionar la carpeta on guardareu el correu brossa"
 
 msgstr ""
 "Pulseu aquest botò per seleccionar la carpeta on guardareu el correu brossa"
 

-#: src/plugins/trayicon/trayicon.c:93
+#: src/plugins/trayicon/trayicon.c:59 src/plugins/trayicon/trayicon.c:497
+msgid "Trayicon"
+msgstr "Icona de safata"
+
+#: src/plugins/trayicon/trayicon.c:106

 msgid "/_Get Mail"
 msgstr "/_Rebre Mail"
 
 msgid "/_Get Mail"
 msgstr "/_Rebre Mail"
 

-#: src/plugins/trayicon/trayicon.c:95
+#: src/plugins/trayicon/trayicon.c:108

 msgid "/_Email"
 msgstr "/_Correu"
 
 msgid "/_Email"
 msgstr "/_Correu"
 

-#: src/plugins/trayicon/trayicon.c:96
+#: src/plugins/trayicon/trayicon.c:109
+msgid "/_Email from account"
+msgstr "/_Correu del compte"
+
+#: src/plugins/trayicon/trayicon.c:111

 msgid "/Open A_ddressbook"
 msgstr "/_Agenda d'adreces"
 
 msgid "/Open A_ddressbook"
 msgstr "/_Agenda d'adreces"
 

-#: src/plugins/trayicon/trayicon.c:98
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Work Offline"
 msgstr "/_Treballar sense connexió"
 
 msgid "/_Work Offline"
 msgstr "/_Treballar sense connexió"
 

-#: src/plugins/trayicon/trayicon.c:100
-msgid "/E_xit Sylpheed-Claws"
-msgstr "/_Sortir de Sylpheed-Claws"
+#: src/plugins/trayicon/trayicon.c:115
+msgid "/E_xit Claws Mail"
+msgstr "/_Sortir de Claws Mail"

 
 

-#: src/plugins/trayicon/trayicon.c:148
+#: src/plugins/trayicon/trayicon.c:204

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nous %d, No llegits: %d, Totals: %d"
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nous %d, No llegits: %d, Totals: %d"
 

-#: src/plugins/trayicon/trayicon.c:204
+#: src/plugins/trayicon/trayicon.c:278

 msgid "/Work Offline"
 msgstr "/Treballar sense connexió"
 
 msgid "/Work Offline"
 msgstr "/Treballar sense connexió"
 

-#: src/plugins/trayicon/trayicon.c:207
+#: src/plugins/trayicon/trayicon.c:281

 msgid "/Get Mail"
 msgstr "/Rebre Mail"
 
 msgid "/Get Mail"
 msgstr "/Rebre Mail"
 

-#: src/plugins/trayicon/trayicon.c:310
-msgid "Trayicon"
-msgstr "Icona de safata"
+#: src/plugins/trayicon/trayicon.c:361
+msgid "Failed to register folder item update hook"
+msgstr "Ha fallat el registre de l'enllaç d'actualització d'elements de carpeta"
+
+#: src/plugins/trayicon/trayicon.c:367
+msgid "Failed to register folder update hook"
+msgstr "Ha fallat el registre de l'enllaç d'actualització de les carpetes"
+
+#: src/plugins/trayicon/trayicon.c:373 src/plugins/trayicon/trayicon.c:379
+msgid "Failed to register offline switch hook"
+msgstr "Ha fallat el registre de l'enllaç del canvi a mode sense connexió"

 
 

-#: src/plugins/trayicon/trayicon.c:315
+#: src/plugins/trayicon/trayicon.c:415

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -6924,15 +7732,15 @@ msgstr ""
 "La bústia apareix buida si no teniu correu sense llegir, sinó mostrarà una "
 "carta. Un consel flotant mostra el n de correus nous, sense llegir i total."
 
 "La bústia apareix buida si no teniu correu sense llegir, sinó mostrarà una "
 "carta. Un consel flotant mostra el n de correus nous, sense llegir i total."
 

-#: src/plugins/trayicon/trayicon.c:369
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit this program?"
 msgstr "Sortir del programa?"
 
 msgid "Exit this program?"
 msgstr "Sortir del programa?"
 

-#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:115
+#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:123

 msgid "Orientation"
 msgstr "Orientació"
 
 msgid "Orientation"
 msgstr "Orientació"
 

-#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:116
+#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:124

 msgid "The orientation of the tray."
 msgstr "La orientació de la safata."
 
 msgid "The orientation of the tray."
 msgstr "La orientació de la safata."
 


@@ -6983,179 +7791,187 @@ msgstr "hi ha hagut un error a la sessi
 msgid "TOP command unsupported\n"
 msgstr "ordre TOP no soportada\n"
 
 msgid "TOP command unsupported\n"
 msgstr "ordre TOP no soportada\n"
 

-#: src/prefs_account.c:231 src/prefs_account.c:1440 src/prefs_account.c:2127
-#: src/wizard.c:991
+#: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145
+#: src/wizard.c:1122

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:234 src/prefs_account.c:1566 src/prefs_account.c:2144
+#: src/prefs_account.c:236 src/prefs_account.c:1587 src/prefs_account.c:2162

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:235
+#: src/prefs_account.c:237

 msgid "News (NNTP)"
 msgstr "Notícies (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "Notícies (NNTP)"
 

-#: src/prefs_account.c:236 src/wizard.c:1001
+#: src/prefs_account.c:238 src/wizard.c:1132

 msgid "Local mbox file"
 msgstr "Arxiu mbox local"
 
 msgid "Local mbox file"
 msgstr "Arxiu mbox local"
 

-#: src/prefs_account.c:237
+#: src/prefs_account.c:239

 msgid "None (SMTP only)"
 msgstr "Cap (només SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Cap (només SMTP)"
 

-#: src/prefs_account.c:716
+#: src/prefs_account.c:725

 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "Compte%d"
 

-#: src/prefs_account.c:989
+#: src/prefs_account.c:998

 msgid "Preferences for new account"
 msgstr "Preferències per a un nou compte"
 
 msgid "Preferences for new account"
 msgstr "Preferències per a un nou compte"
 

-#: src/prefs_account.c:991
+#: src/prefs_account.c:1000

 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferències del compte"
 
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferències del compte"
 

-#: src/prefs_account.c:1026
+#: src/prefs_account.c:1035

 msgid "_Basic"
 msgstr "_Bàsic"
 
 msgid "_Basic"
 msgstr "_Bàsic"
 

-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1037

 msgid "_Receive"
 msgstr "_Rebre"
 
 msgid "_Receive"
 msgstr "_Rebre"
 

-#: src/prefs_account.c:1032
+#: src/prefs_account.c:1041

 msgid "Co_mpose"
 msgstr "Co_mposar"
 
 msgid "Co_mpose"
 msgstr "Co_mposar"
 

-#: src/prefs_account.c:1034
+#: src/prefs_account.c:1043

 msgid "_Privacy"
 msgstr "_Privacitat"
 
 msgid "_Privacy"
 msgstr "_Privacitat"
 

-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1046

 msgid "SS_L"
 msgstr "SS_L"
 
 msgid "SS_L"
 msgstr "SS_L"
 

-#: src/prefs_account.c:1040
+#: src/prefs_account.c:1049

 msgid "A_dvanced"
 msgstr "Avança_des"
 
 msgid "A_dvanced"
 msgstr "Avança_des"
 

-#: src/prefs_account.c:1096
+#: src/prefs_account.c:1107

 msgid "Name of account"
 msgstr "Nom del compte"
 
 msgid "Name of account"
 msgstr "Nom del compte"
 

-#: src/prefs_account.c:1105
+#: src/prefs_account.c:1116

 msgid "Set as default"
 msgstr "Marcar com a primària"
 
 msgid "Set as default"
 msgstr "Marcar com a primària"
 

-#: src/prefs_account.c:1109
+#: src/prefs_account.c:1120

 msgid "Personal information"
 msgstr "Informació personal"
 
 msgid "Personal information"
 msgstr "Informació personal"
 

-#: src/prefs_account.c:1118
+#: src/prefs_account.c:1129

 msgid "Full name"
 msgstr "Nom complet"
 
 msgid "Full name"
 msgstr "Nom complet"
 

-#: src/prefs_account.c:1124
+#: src/prefs_account.c:1135

 msgid "Mail address"
 msgstr "Adreça de correu"
 
 msgid "Mail address"
 msgstr "Adreça de correu"
 

-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1141

 msgid "Organization"
 msgstr "Organizació"
 
 msgid "Organization"
 msgstr "Organizació"
 

-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1165

 msgid "Server information"
 msgstr "Informació del servidor"
 
 msgid "Server information"
 msgstr "Informació del servidor"
 

-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1205 src/wizard.c:1216
+msgid ""
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"
+"has been built without IMAP support.</span>"
+msgstr ""
+"<span weight=\"bold\">Avís: aquesta versió de Claws Mail\n"
+"ha estat compilat sense suport IMAP.</span>"
+
+#: src/prefs_account.c:1234

 msgid "This server requires authentication"
 msgstr "Aquest servidor requereix autentificació"
 
 msgid "This server requires authentication"
 msgstr "Aquest servidor requereix autentificació"
 

-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1241

 msgid "Authenticate on connect"
 msgstr "Autentificació al connectar"
 
 msgid "Authenticate on connect"
 msgstr "Autentificació al connectar"
 

-#: src/prefs_account.c:1265
+#: src/prefs_account.c:1286

 msgid "News server"
 msgstr "Servidor de news"
 
 msgid "News server"
 msgstr "Servidor de news"
 

-#: src/prefs_account.c:1271
+#: src/prefs_account.c:1292

 msgid "Server for receiving"
 msgstr "Servidor de recepció"
 
 msgid "Server for receiving"
 msgstr "Servidor de recepció"
 

-#: src/prefs_account.c:1277
+#: src/prefs_account.c:1298

 msgid "Local mailbox"
 msgstr "Bústia local"
 
 msgid "Local mailbox"
 msgstr "Bústia local"
 

-#: src/prefs_account.c:1284
+#: src/prefs_account.c:1305

 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 

-#: src/prefs_account.c:1292
+#: src/prefs_account.c:1313

 msgid "Use mail command rather than SMTP server"
 msgstr "Useu commanda per correu enlloc de servidor SMTP"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Useu commanda per correu enlloc de servidor SMTP"
 

-#: src/prefs_account.c:1301
+#: src/prefs_account.c:1322

 msgid "command to send mails"
 msgstr "ordre per enviar els correus"
 
 msgid "command to send mails"
 msgstr "ordre per enviar els correus"
 

-#: src/prefs_account.c:1308 src/prefs_account.c:1757
+#: src/prefs_account.c:1329 src/prefs_account.c:1779

 msgid "User ID"
 msgstr "ID d'usuari"
 
 msgid "User ID"
 msgstr "ID d'usuari"
 

-#: src/prefs_account.c:1314 src/prefs_account.c:1766
+#: src/prefs_account.c:1335 src/prefs_account.c:1788

 msgid "Password"
 msgstr "Contrasenya"
 
 msgid "Password"
 msgstr "Contrasenya"
 

-#: src/prefs_account.c:1407
+#: src/prefs_account.c:1428

 msgid "Local"
 msgstr "Local"
 
 msgid "Local"
 msgstr "Local"
 

-#: src/prefs_account.c:1418 src/prefs_account.c:1513
+#: src/prefs_account.c:1439 src/prefs_account.c:1534

 msgid "Default inbox"
 msgstr "Bústia primària"
 
 msgid "Default inbox"
 msgstr "Bústia primària"
 

-#: src/prefs_account.c:1425 src/prefs_account.c:1433 src/prefs_account.c:1520
-#: src/prefs_account.c:1528
+#: src/prefs_account.c:1446 src/prefs_account.c:1454 src/prefs_account.c:1541
+#: src/prefs_account.c:1549

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Els missatges sense filtrar es guardaran en aquesta carpeta"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Els missatges sense filtrar es guardaran en aquesta carpeta"
 

-#: src/prefs_account.c:1430 src/prefs_account.c:1525 src/prefs_account.c:1927
+#: src/prefs_account.c:1451 src/prefs_account.c:1546 src/prefs_account.c:1949

 msgid "Bro_wse"
 msgstr "M_ostrar"
 
 msgid "Bro_wse"
 msgstr "M_ostrar"
 

-#: src/prefs_account.c:1448
+#: src/prefs_account.c:1469

 msgid "Use secure authentication (APOP)"
 msgstr "Usar autentificació segura (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autentificació segura (APOP)"
 

-#: src/prefs_account.c:1451
+#: src/prefs_account.c:1472

 msgid "Remove messages on server when received"
 msgstr "Eliminar missatges del servidor quan s'hagin rebut"
 
 msgid "Remove messages on server when received"
 msgstr "Eliminar missatges del servidor quan s'hagin rebut"
 

-#: src/prefs_account.c:1462
+#: src/prefs_account.c:1483

 msgid "Remove after"
 msgstr "Eliminar després de"
 
 msgid "Remove after"
 msgstr "Eliminar després de"
 

-#: src/prefs_account.c:1471
+#: src/prefs_account.c:1492

 msgid "0 days: remove immediately"
 msgstr "0 dies: esborrar immediatament"
 
 msgid "0 days: remove immediately"
 msgstr "0 dies: esborrar immediatament"
 

-#: src/prefs_account.c:1475
+#: src/prefs_account.c:1496

 msgid "days"
 msgstr "dies"
 
 msgid "days"
 msgstr "dies"
 

-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1503

 msgid "Download all messages on server"
 msgstr "Descarregar tots els missatges del servidor"
 
 msgid "Download all messages on server"
 msgstr "Descarregar tots els missatges del servidor"
 

-#: src/prefs_account.c:1488
+#: src/prefs_account.c:1509

 msgid "Receive size limit"
 msgstr "Límit de tamany al rebre"
 
 msgid "Receive size limit"
 msgstr "Límit de tamany al rebre"
 

-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1512

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -7163,72 +7979,68 @@ msgstr ""
 "Els missatges que sobrepassin aquest límit seran parcialment recuperats. "
 "Quan els seleccioneu podreu descarregar-los completament o esborrar-los"
 
 "Els missatges que sobrepassin aquest límit seran parcialment recuperats. "
 "Quan els seleccioneu podreu descarregar-los completament o esborrar-los"
 

-#: src/prefs_account.c:1501
+#: src/prefs_account.c:1522

 msgid "KB"
 msgstr "Kb"
 
 msgid "KB"
 msgstr "Kb"
 

-#: src/prefs_account.c:1535 src/prefs_account.c:2161
+#: src/prefs_account.c:1556 src/prefs_account.c:2179

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1568

 msgid "Maximum number of articles to download"
 msgstr "Nmero màxim d'articles a descarregar"
 
 msgid "Maximum number of articles to download"
 msgstr "Nmero màxim d'articles a descarregar"
 

-#: src/prefs_account.c:1559
+#: src/prefs_account.c:1580

 msgid "unlimited if 0 is specified"
 msgstr "sense límit si s'especifica 0"
 
 msgid "unlimited if 0 is specified"
 msgstr "sense límit si s'especifica 0"
 

-#: src/prefs_account.c:1577 src/prefs_account.c:1727
+#: src/prefs_account.c:1598 src/prefs_account.c:1749

 msgid "Authentication method"
 msgstr "Mètode d'autentificació"
 
 msgid "Authentication method"
 msgstr "Mètode d'autentificació"
 

-#: src/prefs_account.c:1587 src/prefs_account.c:1737 src/prefs_send.c:273
+#: src/prefs_account.c:1608 src/prefs_account.c:1759 src/prefs_send.c:273

 msgid "Automatic"
 msgstr "Automàtic"
 
 msgid "Automatic"
 msgstr "Automàtic"
 

-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1620

 msgid "IMAP server directory"
 msgstr "Directori del servidor IMAP"
 
 msgid "IMAP server directory"
 msgstr "Directori del servidor IMAP"
 

-#: src/prefs_account.c:1602
+#: src/prefs_account.c:1624

 msgid "(usually empty)"
 msgstr "(normalment buït)"
 
 msgid "(usually empty)"
 msgstr "(normalment buït)"
 

-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1634

 msgid "Filter messages on receiving"
 msgstr "Filtrar missatges al rebre"
 
 msgid "Filter messages on receiving"
 msgstr "Filtrar missatges al rebre"
 

-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1638

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Rebre' comprova si hi ha nous missatges en aquest compte"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Rebre' comprova si hi ha nous missatges en aquest compte"
 

-#: src/prefs_account.c:1678 src/prefs_customheader.c:205
-#: src/prefs_matcher.c:154
+#: src/prefs_account.c:1700 src/prefs_customheader.c:205
+#: src/prefs_matcher.c:162

 msgid "Header"
 msgstr "Capçalera"
 
 msgid "Header"
 msgstr "Capçalera"
 

-#: src/prefs_account.c:1685
+#: src/prefs_account.c:1707

 msgid "Generate Message-ID"
 msgstr "Generar Message-ID"
 
 msgid "Generate Message-ID"
 msgstr "Generar Message-ID"
 

-#: src/prefs_account.c:1692
+#: src/prefs_account.c:1714

 msgid "Add user-defined header"
 msgstr "Afegir capçaleres d'usuari"
 
 msgid "Add user-defined header"
 msgstr "Afegir capçaleres d'usuari"
 

-#: src/prefs_account.c:1694 src/prefs_account.c:1936 src/prefs_message.c:142
-msgid " Edit... "
-msgstr " Editar... "
-
-#: src/prefs_account.c:1704
+#: src/prefs_account.c:1726

 msgid "Authentication"
 msgstr "Autentificació"
 
 msgid "Authentication"
 msgstr "Autentificació"
 

-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1734

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificació SMTP (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificació SMTP (SMTP AUTH)"
 

-#: src/prefs_account.c:1788
+#: src/prefs_account.c:1810

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."


@@ -7236,261 +8048,273 @@ msgstr ""
 "Si deixeu aquests camps buits, s'usarà el mateix ID d'usuari i contrasenya "
 "usats per a la recepció."
 
 "Si deixeu aquests camps buits, s'usarà el mateix ID d'usuari i contrasenya "
 "usats per a la recepció."
 

-#: src/prefs_account.c:1799
+#: src/prefs_account.c:1821

 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificació amb POP3 abans d'enviar"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificació amb POP3 abans d'enviar"
 

-#: src/prefs_account.c:1814
+#: src/prefs_account.c:1836

 msgid "POP authentication timeout: "
 msgstr "Temps límit per autentificació POP: "
 
 msgid "POP authentication timeout: "
 msgstr "Temps límit per autentificació POP: "
 

-#: src/prefs_account.c:1823
+#: src/prefs_account.c:1845

 msgid "minutes"
 msgstr "minuts"
 
 msgid "minutes"
 msgstr "minuts"
 

-#: src/prefs_account.c:1868 src/prefs_account.c:1919
+#: src/prefs_account.c:1890 src/prefs_account.c:1941

 msgid "Signature"
 msgstr "Signatura"
 
 msgid "Signature"
 msgstr "Signatura"
 

-#: src/prefs_account.c:1876
+#: src/prefs_account.c:1898

 msgid "Insert signature automatically"
 msgstr "Insertar signatura automàticament"
 
 msgid "Insert signature automatically"
 msgstr "Insertar signatura automàticament"
 

-#: src/prefs_account.c:1881
+#: src/prefs_account.c:1903

 msgid "Signature separator"
 msgstr "Separador de signatura"
 
 msgid "Signature separator"
 msgstr "Separador de signatura"
 

-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1928

 msgid "Command output"
 msgstr "Sortida de l'ordre"
 
 msgid "Command output"
 msgstr "Sortida de l'ordre"
 

-#: src/prefs_account.c:1943
+#: src/prefs_account.c:1961

 msgid "Automatically set the following addresses"
 msgstr "Establir les següents adreces automàticament"
 
 msgid "Automatically set the following addresses"
 msgstr "Establir les següents adreces automàticament"
 

-#: src/prefs_account.c:1952 src/prefs_filtering_action.c:1083
-#: src/prefs_matcher.c:151 src/prefs_matcher.c:1687 src/quote_fmt.c:49
+#: src/prefs_account.c:1970 src/prefs_filtering_action.c:1083
+#: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
+#: src/quote_fmt.c:49

 msgid "Cc"
 msgstr "Cc"
 
 msgid "Cc"
 msgstr "Cc"
 

-#: src/prefs_account.c:1965
+#: src/prefs_account.c:1983 src/prefs_template.c:189

 msgid "Bcc"
 msgstr "Bcc"
 
 msgid "Bcc"
 msgstr "Bcc"
 

-#: src/prefs_account.c:1978
+#: src/prefs_account.c:1996

 msgid "Reply-To"
 msgstr "Respondre a"
 
 msgid "Reply-To"
 msgstr "Respondre a"
 

-#: src/prefs_account.c:2030
+#: src/prefs_account.c:2048

 msgid "Default privacy system"
 msgstr "Sistema de privacitat per omissió"
 
 msgid "Default privacy system"
 msgstr "Sistema de privacitat per omissió"
 

-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2057

 msgid "Always sign messages"
 msgstr "Sempre missatges signats"
 
 msgid "Always sign messages"
 msgstr "Sempre missatges signats"
 

-#: src/prefs_account.c:2041
+#: src/prefs_account.c:2059

 msgid "Always encrypt messages"
 msgstr "Sempre missatges encriptats"
 
 msgid "Always encrypt messages"
 msgstr "Sempre missatges encriptats"
 

-#: src/prefs_account.c:2043
+#: src/prefs_account.c:2061

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Encriptar missatges sempre que se'n contesti un escriptat"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Encriptar missatges sempre que se'n contesti un escriptat"
 

-#: src/prefs_account.c:2046
+#: src/prefs_account.c:2064

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Encriptar els missatges enviats amb la vostra pròpia clau a més de la del "
 "destinatari"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Encriptar els missatges enviats amb la vostra pròpia clau a més de la del "
 "destinatari"
 

-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2066

 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en clar els missatges enviats encriptats"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Guardar en clar els missatges enviats encriptats"
 

-#: src/prefs_account.c:2135 src/prefs_account.c:2152 src/prefs_account.c:2168
+#: src/prefs_account.c:2153 src/prefs_account.c:2170 src/prefs_account.c:2186

 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 

-#: src/prefs_account.c:2138
+#: src/prefs_account.c:2156

 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL per a la connexió POP3"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL per a la connexió POP3"
 

-#: src/prefs_account.c:2141 src/prefs_account.c:2158 src/prefs_account.c:2193
+#: src/prefs_account.c:2159 src/prefs_account.c:2176 src/prefs_account.c:2211

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar l'ordre STARTTLS per obrir la sessió SSL"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar l'ordre STARTTLS per obrir la sessió SSL"
 

-#: src/prefs_account.c:2155
+#: src/prefs_account.c:2173

 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL per a la connexió IMAP4"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL per a la connexió IMAP4"
 

-#: src/prefs_account.c:2177
+#: src/prefs_account.c:2195

 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL per a la connexió NNTP"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL per a la connexió NNTP"
 

-#: src/prefs_account.c:2179
+#: src/prefs_account.c:2197

 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 

-#: src/prefs_account.c:2187
+#: src/prefs_account.c:2205

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (però usar STARTTLS si és necessari)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (però usar STARTTLS si és necessari)"
 

-#: src/prefs_account.c:2190
+#: src/prefs_account.c:2208

 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL per a la connexió SMTP"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL per a la connexió SMTP"
 

-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2219

 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloquejant"
 
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloquejant"
 

-#: src/prefs_account.c:2213
+#: src/prefs_account.c:2231

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desactiveu això si teniu problemes de connexió amb SSL"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desactiveu això si teniu problemes de connexió amb SSL"
 

-#: src/prefs_account.c:2339
+#: src/prefs_account.c:2357

 msgid "SMTP port"
 msgstr "Port SMTP"
 
 msgid "SMTP port"
 msgstr "Port SMTP"
 

-#: src/prefs_account.c:2345
+#: src/prefs_account.c:2363

 msgid "POP3 port"
 msgstr "Port POP3"
 
 msgid "POP3 port"
 msgstr "Port POP3"
 

-#: src/prefs_account.c:2351
+#: src/prefs_account.c:2369

 msgid "IMAP4 port"
 msgstr "Port IMAP4"
 
 msgid "IMAP4 port"
 msgstr "Port IMAP4"
 

-#: src/prefs_account.c:2357
+#: src/prefs_account.c:2375

 msgid "NNTP port"
 msgstr "Port NNTP"
 
 msgid "NNTP port"
 msgstr "Port NNTP"
 

-#: src/prefs_account.c:2362
+#: src/prefs_account.c:2380

 msgid "Domain name"
 msgstr "Nom del domini"
 
 msgid "Domain name"
 msgstr "Nom del domini"
 

-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2390

 msgid "Use command to communicate with server"
 msgstr "Usar comanda per a comunicar-se amb el servidor"
 
 msgid "Use command to communicate with server"
 msgstr "Usar comanda per a comunicar-se amb el servidor"
 

-#: src/prefs_account.c:2380
+#: src/prefs_account.c:2398

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar els misstages creuats com a llegits i de color:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar els misstages creuats com a llegits i de color:"
 

-#: src/prefs_account.c:2427
+#: src/prefs_account.c:2445

 msgid "Browse"
 msgstr "Mostrar"
 
 msgid "Browse"
 msgstr "Mostrar"
 

-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2458

 msgid "Put sent messages in"
 msgstr "Posar missatges enviats a"
 
 msgid "Put sent messages in"
 msgstr "Posar missatges enviats a"
 

-#: src/prefs_account.c:2442
+#: src/prefs_account.c:2460

 msgid "Put queued messages in"
 msgstr "Posar missatges encuats a"
 
 msgid "Put queued messages in"
 msgstr "Posar missatges encuats a"
 

-#: src/prefs_account.c:2444
+#: src/prefs_account.c:2462

 msgid "Put draft messages in"
 msgstr "Posar borradors de missatges a"
 
 msgid "Put draft messages in"
 msgstr "Posar borradors de missatges a"
 

-#: src/prefs_account.c:2446
+#: src/prefs_account.c:2464

 msgid "Put deleted messages in"
 msgstr "Posar missatges esborrats a"
 
 msgid "Put deleted messages in"
 msgstr "Posar missatges esborrats a"
 

-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2507

 msgid "Account name is not entered."
 msgstr "No s'ha especificat el nom del compte."
 
 msgid "Account name is not entered."
 msgstr "No s'ha especificat el nom del compte."
 

-#: src/prefs_account.c:2493
+#: src/prefs_account.c:2511

 msgid "Mail address is not entered."
 msgstr "No s'ha especificat l'adreça de correu."
 
 msgid "Mail address is not entered."
 msgstr "No s'ha especificat l'adreça de correu."
 

-#: src/prefs_account.c:2500
+#: src/prefs_account.c:2518

 msgid "SMTP server is not entered."
 msgstr "No s'ha especificat el servidor SMTP."
 
 msgid "SMTP server is not entered."
 msgstr "No s'ha especificat el servidor SMTP."
 

-#: src/prefs_account.c:2505
+#: src/prefs_account.c:2523

 msgid "User ID is not entered."
 msgstr "No s'ha especificat l'usuari."
 
 msgid "User ID is not entered."
 msgstr "No s'ha especificat l'usuari."
 

-#: src/prefs_account.c:2510
+#: src/prefs_account.c:2528

 msgid "POP3 server is not entered."
 msgstr "No s'ha especificat el servidor POP3."
 
 msgid "POP3 server is not entered."
 msgstr "No s'ha especificat el servidor POP3."
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2535
+msgid "The default inbox folder doesn't exist."
+msgstr "La bústia per omissió no existeix."
+
+#: src/prefs_account.c:2541

 msgid "IMAP4 server is not entered."
 msgstr "No s'ha especificat el servidor IMAP4."
 
 msgid "IMAP4 server is not entered."
 msgstr "No s'ha especificat el servidor IMAP4."
 

-#: src/prefs_account.c:2520
+#: src/prefs_account.c:2546

 msgid "NNTP server is not entered."
 msgstr "No s'ha especificat el servidor NNTP."
 
 msgid "NNTP server is not entered."
 msgstr "No s'ha especificat el servidor NNTP."
 

-#: src/prefs_account.c:2526
+#: src/prefs_account.c:2552

 msgid "local mailbox filename is not entered."
 msgstr "no s'ha especificat el nom de l'arxiu de la bústia local."
 
 msgid "local mailbox filename is not entered."
 msgstr "no s'ha especificat el nom de l'arxiu de la bústia local."
 

-#: src/prefs_account.c:2532
+#: src/prefs_account.c:2558

 msgid "mail command is not entered."
 msgstr "no s'ha especificat la comanda de correu."
 
 msgid "mail command is not entered."
 msgstr "no s'ha especificat la comanda de correu."
 

-#: src/prefs_account.c:2597
+#: src/prefs_account.c:2623

 msgid "Select signature file"
 msgstr "Seleccionar arxiu de signatura"
 
 msgid "Select signature file"
 msgstr "Seleccionar arxiu de signatura"
 

-#: src/prefs_account.c:2690
+#: src/prefs_account.c:2716

 msgid "Protocol:"
 msgstr "Protocol:"
 
 msgid "Protocol:"
 msgstr "Protocol:"
 

-#: src/prefs_account.c:2830
-#, c-format
-msgid "Unsupported (%s)"
-msgstr "No soportat (%s)"
+#: src/prefs_account.c:2869
+msgid "%s (plugin not loaded)"
+msgstr "%s (mòdul no carregat)"

 
 

-#: src/prefs_actions.c:202
+#: src/prefs_actions.c:201

 msgid "Actions configuration"
 msgstr "Configuració d'accions"
 
 msgid "Actions configuration"
 msgstr "Configuració d'accions"
 

-#: src/prefs_actions.c:229
-msgid "Menu name:"
-msgstr "Nom de men:"
+#: src/prefs_actions.c:228
+msgid "Menu name"
+msgstr "Nom de menú"

 
 

-#: src/prefs_actions.c:238
-msgid "Command line:"
-msgstr "Ordre:"
+#: src/prefs_actions.c:241
+msgid "Command line"
+msgstr "Ordre"

 
 

-#: src/prefs_actions.c:267 src/prefs_filtering_action.c:493
-#: src/prefs_filtering.c:371 src/prefs_matcher.c:602 src/prefs_template.c:260
+#: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
+#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:270

 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Reemplaçar"
 
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Reemplaçar"
 

-#: src/prefs_actions.c:283 src/prefs_filtering_action.c:464
-msgid "Info ..."
-msgstr "Informació ..."
+#: src/prefs_actions.c:291 src/prefs_filtering_action.c:464
+#: src/prefs_matcher.c:569
+msgid "Info..."
+msgstr "Informació..."
+
+#: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
+#: src/prefs_filtering.c:762 src/prefs_filtering.c:764
+#: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
+#: src/prefs_template.c:367
+msgid "(New)"
+msgstr "(Nova)"

 
 

-#: src/prefs_actions.c:515
+#: src/prefs_actions.c:523

 msgid "Menu name is not set."
 msgstr "No s'ha establert el nom del men."
 
 msgid "Menu name is not set."
 msgstr "No s'ha establert el nom del men."
 

-#: src/prefs_actions.c:520
+#: src/prefs_actions.c:528

 msgid "A leading '/' is not allowed in the menu name."
 msgstr "No es permet '/' a l'inici del nom del menú."
 
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "No es permet '/' a l'inici del nom del menú."
 

-#: src/prefs_actions.c:525
+#: src/prefs_actions.c:533

 msgid "Colon ':' is not allowed in the menu name."
 msgstr "No es permet ':' (dos punts) en el nom del menú."
 
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "No es permet ':' (dos punts) en el nom del menú."
 

-#: src/prefs_actions.c:544
+#: src/prefs_actions.c:552

 msgid "Menu name is too long."
 msgstr "El nom del menú és masssa llarg."
 
 msgid "Menu name is too long."
 msgstr "El nom del menú és masssa llarg."
 

-#: src/prefs_actions.c:553
+#: src/prefs_actions.c:561

 msgid "Command line not set."
 msgstr "No s'ha especificat l'ordre a executar."
 
 msgid "Command line not set."
 msgstr "No s'ha especificat l'ordre a executar."
 

-#: src/prefs_actions.c:558
+#: src/prefs_actions.c:566

 msgid "Menu name and command are too long."
 msgstr "El nom del menú i la comanda són massa llargs."
 
 msgid "Menu name and command are too long."
 msgstr "El nom del menú i la comanda són massa llargs."
 

-#: src/prefs_actions.c:563
+#: src/prefs_actions.c:571

 #, c-format
 msgid ""
 "The command\n"
 #, c-format
 msgid ""
 "The command\n"


@@ -7501,116 +8325,116 @@ msgstr ""
 "%s\n"
 "té errors sintàctics."
 
 "%s\n"
 "té errors sintàctics."
 

-#: src/prefs_actions.c:623
+#: src/prefs_actions.c:631

 msgid "Delete action"
 msgstr "Esborrar acció"
 
 msgid "Delete action"
 msgstr "Esborrar acció"
 

-#: src/prefs_actions.c:624
+#: src/prefs_actions.c:632

 msgid "Do you really want to delete this action?"
 msgstr "Voleu realment esborrar aquesta acció?"
 
 msgid "Do you really want to delete this action?"
 msgstr "Voleu realment esborrar aquesta acció?"
 

-#: src/prefs_actions.c:741 src/prefs_actions.c:761 src/prefs_filtering.c:1127
-#: src/prefs_filtering.c:1149 src/prefs_matcher.c:1640
-#: src/prefs_template.c:411 src/prefs_template.c:428
+#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
+#: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
+#: src/prefs_template.c:426 src/prefs_template.c:443

 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 

-#: src/prefs_actions.c:742 src/prefs_actions.c:762 src/prefs_filtering.c:1128
-#: src/prefs_filtering.c:1150 src/prefs_template.c:412
-#: src/prefs_template.c:429
+#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
+#: src/prefs_filtering.c:1276 src/prefs_template.c:427
+#: src/prefs_template.c:444

 msgid "The entry was not saved. Close anyway?"
 msgstr "L'entrada no fou guardada. Tancar igualment?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "L'entrada no fou guardada. Tancar igualment?"
 

-#: src/prefs_actions.c:743 src/prefs_actions.c:763 src/prefs_filtering.c:1129
-#: src/prefs_filtering.c:1151 src/prefs_matcher.c:1642
-#: src/prefs_template.c:413 src/prefs_template.c:430
+#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
+#: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
+#: src/prefs_template.c:428 src/prefs_template.c:445

 msgid "+_Continue editing"
 msgstr "+_Continuar editant"
 
 msgid "+_Continue editing"
 msgstr "+_Continuar editant"
 

-#: src/prefs_actions.c:798
+#: src/prefs_actions.c:806

 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nom de menú:</span>"
 
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Nom de menú:</span>"
 

-#: src/prefs_actions.c:799
+#: src/prefs_actions.c:807

 msgid "Use / in menu name to make submenus."
 msgstr "Useu / en el nom de menú per crear submens."
 
 msgid "Use / in menu name to make submenus."
 msgstr "Useu / en el nom de menú per crear submens."
 

-#: src/prefs_actions.c:801
+#: src/prefs_actions.c:809

 msgid "<span weight=\"bold\" underline=\"single\">Command line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Línia de comandes:</span>"
 
 msgid "<span weight=\"bold\" underline=\"single\">Command line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">Línia de comandes:</span>"
 

-#: src/prefs_actions.c:802
+#: src/prefs_actions.c:810

 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Començar amb:</span>"
 
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">Començar amb:</span>"
 

-#: src/prefs_actions.c:803
+#: src/prefs_actions.c:811

 msgid "to send message body or selection to command's standard input"
 msgstr "per enviar el missatge o la selecció a l'entrada standard de l'ordre"
 
 msgid "to send message body or selection to command's standard input"
 msgstr "per enviar el missatge o la selecció a l'entrada standard de l'ordre"
 

-#: src/prefs_actions.c:804
+#: src/prefs_actions.c:812

 msgid "to send user provided text to command's standard input"
 msgstr "per enviar el text d'usuari a l'entrada estàndard de l'ordre"
 
 msgid "to send user provided text to command's standard input"
 msgstr "per enviar el text d'usuari a l'entrada estàndard de l'ordre"
 

-#: src/prefs_actions.c:805
+#: src/prefs_actions.c:813

 msgid "to send user provided hidden text to command's standard input"
 msgstr "per enviar el text d'usuari ocult a l'entrada estàndard de l'ordre"
 
 msgid "to send user provided hidden text to command's standard input"
 msgstr "per enviar el text d'usuari ocult a l'entrada estàndard de l'ordre"
 

-#: src/prefs_actions.c:806
+#: src/prefs_actions.c:814

 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Finalitzar amb:</span>"
 
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">Finalitzar amb:</span>"
 

-#: src/prefs_actions.c:807
+#: src/prefs_actions.c:815

 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "per reemplaçar el missatge o selecció amb la sortida estàndard de l'ordre"
 
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "per reemplaçar el missatge o selecció amb la sortida estàndard de l'ordre"
 

-#: src/prefs_actions.c:808
+#: src/prefs_actions.c:816

 msgid "to insert command's standard output without replacing old text"
 msgstr "per insertar la sortida estàndard de l'ordre sense reemplaçar el text"
 
 msgid "to insert command's standard output without replacing old text"
 msgstr "per insertar la sortida estàndard de l'ordre sense reemplaçar el text"
 

-#: src/prefs_actions.c:809
+#: src/prefs_actions.c:817

 msgid "to run command asynchronously"
 msgstr "per executar l'ordre de manera asíncrona"
 
 msgid "to run command asynchronously"
 msgstr "per executar l'ordre de manera asíncrona"
 

-#: src/prefs_actions.c:810
+#: src/prefs_actions.c:818

 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Usar:</span>"
 
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">Usar:</span>"
 

-#: src/prefs_actions.c:811
+#: src/prefs_actions.c:819

 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "per a l'arxiu del missatge seleccionat en format RFC822/2822 "
 
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "per a l'arxiu del missatge seleccionat en format RFC822/2822 "
 

-#: src/prefs_actions.c:812
+#: src/prefs_actions.c:820

 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "per a la llista de noms dels missatges seleccionats en format RFC822/2822"
 
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "per a la llista de noms dels missatges seleccionats en format RFC822/2822"
 

-#: src/prefs_actions.c:813
+#: src/prefs_actions.c:821

 msgid "for the file of the selected decoded message MIME part"
 msgstr "per a l'arxiu de la part MIME seleccionada del missatge decodificat"
 
 msgid "for the file of the selected decoded message MIME part"
 msgstr "per a l'arxiu de la part MIME seleccionada del missatge decodificat"
 

-#: src/prefs_actions.c:814
+#: src/prefs_actions.c:822

 msgid "for a user provided argument"
 msgstr "per a un paràmetre introduït per l'usuari"
 
 msgid "for a user provided argument"
 msgstr "per a un paràmetre introduït per l'usuari"
 

-#: src/prefs_actions.c:815
+#: src/prefs_actions.c:823

 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "per a un paràmetre introduït per l'usuari i ocult (p.ex. contrasenya)"
 
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "per a un paràmetre introduït per l'usuari i ocult (p.ex. contrasenya)"
 

-#: src/prefs_actions.c:816
+#: src/prefs_actions.c:824

 msgid "for the text selection"
 msgstr "per la part seleccionada del text"
 
 msgid "for the text selection"
 msgstr "per la part seleccionada del text"
 

-#: src/prefs_actions.c:817
+#: src/prefs_actions.c:825

 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplicar accions de filtrat entre {} als missatges seleccionats"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplicar accions de filtrat entre {} als missatges seleccionats"
 

-#: src/prefs_actions.c:826 src/prefs_themes.c:982
+#: src/prefs_actions.c:834 src/prefs_themes.c:982

 msgid "Actions"
 msgstr "Accions"
 
 msgid "Actions"
 msgstr "Accions"
 

-#: src/prefs_actions.c:827
+#: src/prefs_actions.c:835

 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."
 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."


@@ -7618,15 +8442,19 @@ msgstr ""
 "Les accions són una manera de que l'usuari executi comandes externes que "
 "processin un arxiu de missatge complert o alguna de les seves parts."
 
 "Les accions són una manera de que l'usuari executi comandes externes que "
 "processin un arxiu de missatge complert o alguna de les seves parts."
 

-#: src/prefs_actions.c:913
+#: src/prefs_actions.c:921

 msgid "Current actions"
 msgstr "Accions actuals"
 
 msgid "Current actions"
 msgstr "Accions actuals"
 

-#: src/prefs_common.c:258
+#: src/prefs_common.c:210
+msgid "Hello,\\n"
+msgstr "Hola,\\n"
+
+#: src/prefs_common.c:272

 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "EL %d\\n%f escrigué:\\n\\n%q"
 
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "EL %d\\n%f escrigué:\\n\\n%q"
 

-#: src/prefs_common.c:264
+#: src/prefs_common.c:278

 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"
 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"


@@ -7634,85 +8462,97 @@ msgstr ""
 "\\n\\nInici del missatge reenviat:\\n\\n?d{Data: %d\\n}?f{Desde: %f\\n}?t{A: "
 "%t\\n}?c{Cc: %c\\n}?n{Grups de notícies: %n\\n}?s{Assumpte: %s\\n}\\n\\n%M"
 
 "\\n\\nInici del missatge reenviat:\\n\\n?d{Data: %d\\n}?f{Desde: %f\\n}?t{A: "
 "%t\\n}?c{Cc: %c\\n}?n{Grups de notícies: %n\\n}?s{Assumpte: %s\\n}\\n\\n%M"
 

-#: src/prefs_common.c:349
+#: src/prefs_common.c:363

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 

-#: src/prefs_compose_writing.c:106
+#: src/prefs_compose_writing.c:124

 msgid "Automatic account selection"
 msgstr "Selecció automàtica de compte"
 
 msgid "Automatic account selection"
 msgstr "Selecció automàtica de compte"
 

-#: src/prefs_compose_writing.c:114
+#: src/prefs_compose_writing.c:132

 msgid "when replying"
 msgstr "al respondre"
 
 msgid "when replying"
 msgstr "al respondre"
 

-#: src/prefs_compose_writing.c:116
+#: src/prefs_compose_writing.c:134

 msgid "when forwarding"
 msgstr "al reenviar"
 
 msgid "when forwarding"
 msgstr "al reenviar"
 

-#: src/prefs_compose_writing.c:118
+#: src/prefs_compose_writing.c:136

 msgid "when re-editing"
 msgstr "al reeditar"
 
 msgid "when re-editing"
 msgstr "al reeditar"
 

-#: src/prefs_compose_writing.c:120
+#: src/prefs_compose_writing.c:138

 msgid "Forwarding"
 msgstr "Reenviant"
 
 msgid "Forwarding"
 msgstr "Reenviant"
 

-#: src/prefs_compose_writing.c:128 src/prefs_filtering_action.c:160
+#: src/prefs_compose_writing.c:146 src/prefs_filtering_action.c:160

 msgid "Forward as attachment"
 msgstr "Reenviar com a adjunt"
 
 msgid "Forward as attachment"
 msgstr "Reenviar com a adjunt"
 

-#: src/prefs_compose_writing.c:131
+#: src/prefs_compose_writing.c:149

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Mantenir la capçalera 'Desde' original al redirigir"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Mantenir la capçalera 'Desde' original al redirigir"
 

-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:151

 msgid "Editing"
 msgstr "Editant"
 
 msgid "Editing"
 msgstr "Editant"
 

-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:159

 msgid "Automatically launch the external editor"
 msgstr "Arrencar l'editor extern automàticament"
 
 msgid "Automatically launch the external editor"
 msgstr "Arrencar l'editor extern automàticament"
 

-#: src/prefs_compose_writing.c:148
+#: src/prefs_compose_writing.c:166

 msgid "Autosave message text to Drafts folder every"
 msgstr "Autoguardar el text del missatge al directori Borradors cada "
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Autoguardar el text del missatge al directori Borradors cada "
 

-#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:176 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "caràcters"
 
 msgid "characters"
 msgstr "caràcters"
 

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:184

 msgid "Undo level"
 msgstr "Nivells de desfer"
 
 msgid "Undo level"
 msgstr "Nivells de desfer"
 

-#: src/prefs_compose_writing.c:179
+#: src/prefs_compose_writing.c:197

 msgid "Reply button invokes mailing list reply"
 msgstr "El botó Respondre invoca respondre a la llista de correu"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "El botó Respondre invoca respondre a la llista de correu"
 

-#: src/prefs_compose_writing.c:182
+#: src/prefs_compose_writing.c:200

 msgid "When dropping files into the Compose window"
 msgstr "Quan deixeu caure arxiu dins la finestra de composició"
 
 msgid "When dropping files into the Compose window"
 msgstr "Quan deixeu caure arxiu dins la finestra de composició"
 

-#: src/prefs_compose_writing.c:190
-msgid "Ask whether to insert or attach"
-msgstr "Pregunteu si voleu insertar o adjuntar"
+#: src/prefs_compose_writing.c:208
+msgid "Ask"
+msgstr "Preguntar"
+
+#: src/prefs_compose_writing.c:209 src/toolbar.c:456
+msgid "Insert"
+msgstr "Insertar"
+
+#: src/prefs_compose_writing.c:210 src/toolbar.c:457
+msgid "Attach"
+msgstr "Adjuntar"
+
+#: src/prefs_compose_writing.c:226
+msgid "Use format when composing new messages"
+msgstr "Useu format quan composeu missatges nous"

 
 

-#: src/prefs_compose_writing.c:191
-msgid "Always insert"
-msgstr "Insertar sempre"
+#: src/prefs_compose_writing.c:228
+msgid "New message format"
+msgstr "Format de missatge nou"

 
 

-#: src/prefs_compose_writing.c:192
-msgid "Always attach"
-msgstr "Adjuntar sempre"
+#: src/prefs_compose_writing.c:282 src/prefs_quote.c:206
+msgid " Description of symbols... "
+msgstr " Descripció de símbols... "

 
 

-#: src/prefs_compose_writing.c:297 src/prefs_folder_item.c:935
-#: src/prefs_quote.c:285 src/prefs_spelling.c:404 src/prefs_wrapping.c:144
-#: src/toolbar.c:392 src/toolbar.c:1514
+#: src/prefs_compose_writing.c:402 src/prefs_folder_item.c:1170
+#: src/prefs_quote.c:311 src/prefs_spelling.c:448 src/prefs_wrapping.c:144
+#: src/toolbar.c:1560

 msgid "Compose"
 msgstr "Composar"
 
 msgid "Compose"
 msgstr "Composar"
 

-#: src/prefs_compose_writing.c:298
+#: src/prefs_compose_writing.c:403

 msgid "Writing"
 msgstr "Escrivint"
 
 msgid "Writing"
 msgstr "Escrivint"
 


@@ -7724,8 +8564,8 @@ msgstr "Configuraci
 msgid "From file..."
 msgstr "Desde l'arxiu... "
 
 msgid "From file..."
 msgstr "Desde l'arxiu... "
 

-#: src/prefs_customheader.c:505 src/prefs_display_header.c:566
-#: src/prefs_matcher.c:1224
+#: src/prefs_customheader.c:505 src/prefs_display_header.c:565
+#: src/prefs_matcher.c:1312 src/prefs_matcher.c:1322

 msgid "Header name is not set."
 msgstr "No s'ha establert el nom de capçalera"
 
 msgid "Header name is not set."
 msgstr "No s'ha establert el nom de capçalera"
 


@@ -7789,7 +8629,7 @@ msgstr "Cap
 msgid "Displayed header configuration"
 msgstr "Configuració de capçaleres mostrades"
 
 msgid "Displayed header configuration"
 msgstr "Configuració de capçaleres mostrades"
 

-#: src/prefs_display_header.c:251 src/prefs_matcher.c:469
+#: src/prefs_display_header.c:251 src/prefs_matcher.c:491

 msgid "Header name"
 msgstr "Capçalera"
 
 msgid "Header name"
 msgstr "Capçalera"
 


@@ -7805,53 +8645,46 @@ msgstr "Cap
 msgid "Show all unspecified headers"
 msgstr "Mostrar totes les capçaleres"
 
 msgid "Show all unspecified headers"
 msgstr "Mostrar totes les capçaleres"
 

-#: src/prefs_display_header.c:576
+#: src/prefs_display_header.c:575

 msgid "This header is already in the list."
 msgstr "Aquesta capçalera ja existeix en la llista."
 
 msgid "This header is already in the list."
 msgstr "Aquesta capçalera ja existeix en la llista."
 

-#: src/prefs_ext_prog.c:110
+#: src/prefs_ext_prog.c:100

 #, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr "%s es substituirà amb el nom d'arxiu / URI)"
 
 #, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr "%s es substituirà amb el nom d'arxiu / URI)"
 

-#: src/prefs_ext_prog.c:127
+#: src/prefs_ext_prog.c:117

 msgid "Web browser"
 msgstr "Navegador web"
 
 msgid "Web browser"
 msgstr "Navegador web"
 

-#: src/prefs_ext_prog.c:156
+#: src/prefs_ext_prog.c:146

 msgid "Text editor"
 msgstr "Editor de text"
 
 msgid "Text editor"
 msgstr "Editor de text"
 

-#: src/prefs_ext_prog.c:183
-msgid "Image viewer"
-msgstr "Visor d'imatges"
-
-#: src/prefs_ext_prog.c:201
+#: src/prefs_ext_prog.c:173

 msgid "Command for 'Display as text'"
 msgstr "Comanda per 'Mostrar com a text'"
 
 msgid "Command for 'Display as text'"
 msgstr "Comanda per 'Mostrar com a text'"
 

-#: src/prefs_ext_prog.c:213
+#: src/prefs_ext_prog.c:185

 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 ""
 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 ""

-"Aquesta opció activa les parts MIME per ser mostrades a la vista del missatge via un"
-"script quan useu la opció de menú contextual 'Mostrar com a text'"
+"Aquesta opció activa les parts MIME per ser mostrades a la vista del "
+"missatge via unscript quan useu la opció de menú contextual 'Mostrar com a "
+"text'"

 
 

-#: src/prefs_ext_prog.c:224
-msgid "Audio player"
-msgstr "Reproductor de so"
-
-#: src/prefs_ext_prog.c:242
+#: src/prefs_ext_prog.c:196

 msgid "Print command"
 msgstr "Ordre per imprimir"
 
 msgid "Print command"
 msgstr "Ordre per imprimir"
 

-#: src/prefs_ext_prog.c:304 src/prefs_image_viewer.c:128
-#: src/prefs_message.c:312
+#: src/prefs_ext_prog.c:252 src/prefs_image_viewer.c:128
+#: src/prefs_message.c:308

 msgid "Message View"
 msgstr "Vista de missatge"
 
 msgid "Message View"
 msgstr "Vista de missatge"
 

-#: src/prefs_ext_prog.c:305
+#: src/prefs_ext_prog.c:253

 msgid "External Programs"
 msgstr "Programes externs"
 
 msgid "External Programs"
 msgstr "Programes externs"
 


@@ -7867,6 +8700,7 @@ msgstr "Copiar"
 # RML on filtering is a verb ("Marcar") while in summary colunm it's really
 # RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
 # RML on filtering is a verb ("Marcar") while in summary colunm it's really
 # RML a noun ("Marca"). Xlated as "Marca" (also verbal tense).
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79

+#: src/summaryview.c:2366

 msgid "Mark"
 msgstr "Marca"
 
 msgid "Mark"
 msgstr "Marca"
 


@@ -7886,7 +8720,7 @@ msgstr "Marcar com a llegit"
 msgid "Mark as unread"
 msgstr "Marcar com a no llegit"
 
 msgid "Mark as unread"
 msgstr "Marcar com a no llegit"
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:397 src/toolbar.c:488
+#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499

 msgid "Forward"
 msgstr "Reenviar"
 
 msgid "Forward"
 msgstr "Reenviar"
 


@@ -7895,7 +8729,7 @@ msgid "Redirect"
 msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
 msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429

-#: src/toolbar.c:174 src/toolbar.c:1654
+#: src/toolbar.c:178 src/toolbar.c:1711

 msgid "Execute"
 msgstr "Executar"
 
 msgid "Execute"
 msgstr "Executar"
 


@@ -7915,7 +8749,7 @@ msgstr "Establir punts"
 msgid "Hide"
 msgstr "Ocultar"
 
 msgid "Hide"
 msgstr "Ocultar"
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:177
+#: src/prefs_filtering_action.c:167 src/toolbar.c:181

 msgid "Ignore thread"
 msgstr "Ignorar fil"
 
 msgid "Ignore thread"
 msgstr "Ignorar fil"
 


@@ -7927,7 +8761,7 @@ msgstr "Parar filtre"
 msgid "Filtering action configuration"
 msgstr "Configuració d'accions de filtratge"
 
 msgid "Filtering action configuration"
 msgstr "Configuració d'accions de filtratge"
 

-#: src/prefs_filtering_action.c:342
+#: src/prefs_filtering_action.c:342 src/prefs_filtering.c:413

 msgid "Action"
 msgstr "Acció"
 
 msgid "Action"
 msgstr "Acció"
 


@@ -7972,44 +8806,44 @@ msgstr "Puntuaci
 msgid "No action was defined."
 msgstr "No s'ha definit cap acció."
 
 msgid "No action was defined."
 msgstr "No s'ha definit cap acció."
 

-#: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1683
-#: src/quote_fmt.c:58
+#: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1865
+#: src/quote_fmt.c:62

 msgid "literal %"
 msgstr "literal %"
 
 msgid "literal %"
 msgstr "literal %"
 

-#: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1688
+#: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1870

 #: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:489
 msgid "Date"
 msgstr "Data"
 
 #: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:489
 msgid "Date"
 msgstr "Data"
 

-#: src/prefs_filtering_action.c:1085 src/prefs_matcher.c:1689
+#: src/prefs_filtering_action.c:1085 src/prefs_matcher.c:1871

 #: src/quote_fmt.c:52
 msgid "Message-ID"
 msgstr "ID-Missatge"
 
 #: src/quote_fmt.c:52
 msgid "Message-ID"
 msgstr "ID-Missatge"
 

-#: src/prefs_filtering_action.c:1086 src/prefs_matcher.c:152
-#: src/prefs_matcher.c:1690 src/quote_fmt.c:50
+#: src/prefs_filtering_action.c:1086 src/prefs_matcher.c:160
+#: src/prefs_matcher.c:1872 src/quote_fmt.c:50

 msgid "Newsgroups"
 msgstr "Grups de notícies"
 
 msgid "Newsgroups"
 msgstr "Grups de notícies"
 

-#: src/prefs_filtering_action.c:1087 src/prefs_matcher.c:152
-#: src/prefs_matcher.c:1691 src/quote_fmt.c:51
+#: src/prefs_filtering_action.c:1087 src/prefs_matcher.c:160
+#: src/prefs_matcher.c:1873 src/quote_fmt.c:51

 msgid "References"
 msgstr "Referències"
 
 msgid "References"
 msgstr "Referències"
 

-#: src/prefs_filtering_action.c:1088 src/prefs_matcher.c:1692
+#: src/prefs_filtering_action.c:1088 src/prefs_matcher.c:1874

 msgid "filename (should not be modified)"
 msgstr "Nom d'arxiu (no ha d'ésser modificat)"
 
 msgid "filename (should not be modified)"
 msgstr "Nom d'arxiu (no ha d'ésser modificat)"
 

-#: src/prefs_filtering_action.c:1089 src/prefs_matcher.c:1693
+#: src/prefs_filtering_action.c:1089 src/prefs_matcher.c:1875

 msgid "new line"
 msgstr "línia nova"
 
 msgid "new line"
 msgstr "línia nova"
 

-#: src/prefs_filtering_action.c:1090 src/prefs_matcher.c:1694
+#: src/prefs_filtering_action.c:1090 src/prefs_matcher.c:1876

 msgid "escape character for quotes"
 msgstr "caràcter d'escapament per entrecomillat"
 
 msgid "escape character for quotes"
 msgstr "caràcter d'escapament per entrecomillat"
 

-#: src/prefs_filtering_action.c:1091 src/prefs_matcher.c:1695
+#: src/prefs_filtering_action.c:1091 src/prefs_matcher.c:1877

 msgid "quote character"
 msgstr "caràcter d'entrecomillat"
 
 msgid "quote character"
 msgstr "caràcter d'entrecomillat"
 


@@ -8029,67 +8863,59 @@ msgstr ""
 "\n"
 "Els següents símbols poden ser usats:"
 
 "\n"
 "Els següents símbols poden ser usats:"
 

-#: src/prefs_filtering_action.c:1404
+#: src/prefs_filtering_action.c:1408

 msgid "Current action list"
 msgstr "Llista actual d'accions "
 
 msgid "Current action list"
 msgstr "Llista actual d'accions "
 

-#: src/prefs_filtering.c:164 src/prefs_filtering.c:270
+#: src/prefs_filtering.c:188 src/prefs_filtering.c:339

 msgid "Filtering/Processing configuration"
 msgstr "Configuració de filtrat/procesament"
 
 msgid "Filtering/Processing configuration"
 msgstr "Configuració de filtrat/procesament"
 

-#: src/prefs_filtering.c:307
-msgid "Condition: "
-msgstr "Condició: "
+#: src/prefs_filtering.c:250 src/prefs_filtering.c:781
+#: src/prefs_filtering.c:872
+msgid "Filtering Account Menu|All"
+msgstr "Filtrant qualsevol"
+
+#: src/prefs_filtering.c:391
+msgid "Condition"
+msgstr "Condició"

 
 

-#: src/prefs_filtering.c:320 src/prefs_filtering.c:342
+#: src/prefs_filtering.c:404 src/prefs_filtering.c:426

 msgid " Define... "
 msgstr "Definiu... "
 
 msgid " Define... "
 msgstr "Definiu... "
 

-#: src/prefs_filtering.c:329
-msgid "Action: "
-msgstr "Acció: "
-
-#: src/prefs_filtering.c:677 src/prefs_filtering.c:678
-#: src/prefs_filtering.c:740 src/prefs_template.c:361
-msgid "(New)"
-msgstr "(Nova)"
-
-#: src/prefs_filtering.c:819 src/prefs_filtering.c:902
+#: src/prefs_filtering.c:928 src/prefs_filtering.c:1014

 msgid "Condition string is not valid."
 msgstr "La cadena de condició no és vàlida."
 
 msgid "Condition string is not valid."
 msgstr "La cadena de condició no és vàlida."
 

-#: src/prefs_filtering.c:855 src/prefs_filtering.c:910
+#: src/prefs_filtering.c:964 src/prefs_filtering.c:1022

 msgid "Action string is not valid."
 msgstr "La cadena de l'acció no és vàlida."
 
 msgid "Action string is not valid."
 msgstr "La cadena de l'acció no és vàlida."
 

-#: src/prefs_filtering.c:889
+#: src/prefs_filtering.c:1001

 msgid "Condition string is empty."
 msgstr "La cadena de condició es buida."
 
 msgid "Condition string is empty."
 msgstr "La cadena de condició es buida."
 

-#: src/prefs_filtering.c:895
+#: src/prefs_filtering.c:1007

 msgid "Action string is empty."
 msgstr "La cadena de l'acció es buida."
 
 msgid "Action string is empty."
 msgstr "La cadena de l'acció es buida."
 

-#: src/prefs_filtering.c:967
+#: src/prefs_filtering.c:1091

 msgid "Delete rule"
 msgstr "Esborrar regla"
 
 msgid "Delete rule"
 msgstr "Esborrar regla"
 

-#: src/prefs_filtering.c:968
+#: src/prefs_filtering.c:1092

 msgid "Do you really want to delete this rule?"
 msgstr "Voleu esborrar realment aquesta regla?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "Voleu esborrar realment aquesta regla?"
 

-#: src/prefs_filtering.c:1331
+#: src/prefs_filtering.c:1469

 msgid "Enable"
 msgstr "Activa"
 
 msgid "Enable"
 msgstr "Activa"
 

-#: src/prefs_filtering.c:1351
+#: src/prefs_filtering.c:1501

 msgid "Rule"
 msgstr "Regla"
 
 msgid "Rule"
 msgstr "Regla"
 

-#: src/prefs_folder_column.c:82
-msgid "Total"
-msgstr "Total"
-

 #: src/prefs_folder_column.c:205
 msgid "Folder list columns configuration"
 msgstr "Configuració de la llista de columnes de la carpeta"
 #: src/prefs_folder_column.c:205
 msgid "Folder list columns configuration"
 msgstr "Configuració de la llista de columnes de la carpeta"


@@ -8106,7 +8932,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Columnes ocultes"
 
 msgid "Hidden columns"
 msgstr "Columnes ocultes"
 

-#: src/prefs_folder_column.c:280 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:797
+#: src/prefs_summaries.c:943 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Columnes mostrades"
 
 msgid "Displayed columns"
 msgstr "Columnes mostrades"
 


@@ -8115,7 +8942,17 @@ msgstr "Columnes mostrades"
 msgid " Use default "
 msgstr " Usar configuració inicial "
 
 msgid " Use default "
 msgstr " Usar configuració inicial "
 

-#: src/prefs_folder_item.c:183 src/prefs_folder_item.c:566
+#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:646
+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 ""
+"<i>Aquestes preferències no seran guardadesed perque aquesta carpeta es de màxim nivell. "
+"De totes maneres podeu usar-les per definir tot l'arbre de la bústia usant \"Aplicar "
+"a subcarpetes\".</i>"
+
+#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:658

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -8123,76 +8960,84 @@ msgstr ""
 "Aplicar a\n"
 "subcarpetes"
 
 "Aplicar a\n"
 "subcarpetes"
 

-#: src/prefs_folder_item.c:207
+#: src/prefs_folder_item.c:238

 msgid "Normal"
 msgstr "Normal"
 
 msgid "Normal"
 msgstr "Normal"
 

-#: src/prefs_folder_item.c:209
+#: src/prefs_folder_item.c:240

 msgid "Outbox"
 msgstr "Carpeta de sortida"
 
 msgid "Outbox"
 msgstr "Carpeta de sortida"
 

-#: src/prefs_folder_item.c:226
-msgid "Folder type:"
-msgstr "Tipus carpeta:"
+#: src/prefs_folder_item.c:257
+msgid "Folder type"
+msgstr "Tipus de carpeta"

 
 

-#: src/prefs_folder_item.c:238
-msgid "Simplify Subject RegExp: "
-msgstr "Exp.reg. per simplificar assumpte: "
+#: src/prefs_folder_item.c:269
+msgid "Simplify Subject RegExp"
+msgstr "Exp.reg. per simplificar assumpte"

 
 

-#: src/prefs_folder_item.c:258
-msgid "Folder chmod: "
-msgstr "Mode de carpeta: "
+#: src/prefs_folder_item.c:295
+msgid "Test RegExp"
+msgstr "Exp.reg. de testeig"

 
 

-#: src/prefs_folder_item.c:284
-msgid "Folder color: "
-msgstr "Color de carpeta: "
+#: src/prefs_folder_item.c:327
+msgid "Folder chmod"
+msgstr "Permisos de carpeta"

 
 

-#: src/prefs_folder_item.c:298 src/prefs_folder_item.c:906
+#: src/prefs_folder_item.c:353
+msgid "Folder color"
+msgstr "Color de carpeta"
+
+#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1045

 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Escolliu color per a la carpeta"
 
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Escolliu color per a la carpeta"
 

-#: src/prefs_folder_item.c:315
+#: src/prefs_folder_item.c:384

 msgid "Process at startup"
 msgstr "Processament al inici"
 
 msgid "Process at startup"
 msgstr "Processament al inici"
 

-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:398

 msgid "Scan for new mail"
 msgstr "Examinar si hi ha correu nou"
 
 msgid "Scan for new mail"
 msgstr "Examinar si hi ha correu nou"
 

-#: src/prefs_folder_item.c:342
+#: src/prefs_folder_item.c:411

 msgid "Synchronise for offline use"
 msgstr "Sincronitzar per usar sense connexió"
 
 msgid "Synchronise for offline use"
 msgstr "Sincronitzar per usar sense connexió"
 

-#: src/prefs_folder_item.c:575
+#: src/prefs_folder_item.c:667

 msgid "Request Return Receipt"
 msgstr "Sollicitar justificant de recepció"
 
 msgid "Request Return Receipt"
 msgstr "Sollicitar justificant de recepció"
 

-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:682

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Guardar els missatges sortints en aquesta carpeta enlloc de a Enviat"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Guardar els missatges sortints en aquesta carpeta enlloc de a Enviat"
 

-#: src/prefs_folder_item.c:603
+#: src/prefs_folder_item.c:695

 msgid "Default To: "
 msgstr "Per omissióPer a: "
 
 msgid "Default To: "
 msgstr "Per omissióPer a: "
 

-#: src/prefs_folder_item.c:623
+#: src/prefs_folder_item.c:716

 msgid "Default To for replies: "
 msgstr "Valor per omissióde 'Per a' per respostes: "
 
 msgid "Default To for replies: "
 msgstr "Valor per omissióde 'Per a' per respostes: "
 

-#: src/prefs_folder_item.c:643
+#: src/prefs_folder_item.c:737

 msgid "Default account: "
 msgstr "Compte primari: "
 
 msgid "Default account: "
 msgstr "Compte primari: "
 

-#: src/prefs_folder_item.c:694
+#: src/prefs_folder_item.c:788

 msgid "Default dictionary: "
 msgstr "Diccionari per omissió "
 
 msgid "Default dictionary: "
 msgstr "Diccionari per omissió "
 

-#: src/prefs_folder_item.c:918
+#: src/prefs_folder_item.c:821
+msgid "Default alternate dictionary: "
+msgstr "Diccionari alternatiu per defecte: "
+
+#: src/prefs_folder_item.c:1153

 msgid "General"
 msgstr "General"
 
 msgid "General"
 msgstr "General"
 

-#: src/prefs_folder_item.c:961
+#: src/prefs_folder_item.c:1198

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propietats de la carpeta %s"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propietats de la carpeta %s"


@@ -8213,7 +9058,7 @@ msgstr "Usar font diferent per imprimir"
 msgid "Message Printing"
 msgstr "Missatge d'impressió"
 
 msgid "Message Printing"
 msgstr "Missatge d'impressió"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1078

 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Veure"
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Veure"


@@ -8222,7 +9067,7 @@ msgstr "Veure"
 msgid "Fonts"
 msgstr "Tipografies"
 
 msgid "Fonts"
 msgstr "Tipografies"
 

-#: src/prefs_gtk.c:871
+#: src/prefs_gtk.c:908

 msgid "Preferences"
 msgstr "Preferències"
 
 msgid "Preferences"
 msgstr "Preferències"
 


@@ -8246,159 +9091,197 @@ msgstr "Veure imatges inline"
 msgid "Image Viewer"
 msgstr "Visor d'imatges"
 
 msgid "Image Viewer"
 msgstr "Visor d'imatges"
 

-#: src/prefs_matcher.c:150
+#: src/prefs_matcher.c:158

 msgid "All messages"
 msgstr "Tots els missatges"
 
 msgid "All messages"
 msgstr "Tots els missatges"
 

-#: src/prefs_matcher.c:151
+#: src/prefs_matcher.c:159

 msgid "To or Cc"
 msgstr "Per o Cc"
 
 msgid "To or Cc"
 msgstr "Per o Cc"
 

-#: src/prefs_matcher.c:152
+#: src/prefs_matcher.c:160

 msgid "In reply to"
 msgstr "En resposta a"
 
 msgid "In reply to"
 msgstr "En resposta a"
 

-#: src/prefs_matcher.c:153
+#: src/prefs_matcher.c:161

 msgid "Age greater than"
 msgstr "Més antic que"
 
 msgid "Age greater than"
 msgstr "Més antic que"
 

-#: src/prefs_matcher.c:153
+#: src/prefs_matcher.c:161

 msgid "Age lower than"
 msgstr "Més nou que"
 
 msgid "Age lower than"
 msgstr "Més nou que"
 

-#: src/prefs_matcher.c:154
+#: src/prefs_matcher.c:162

 msgid "Headers part"
 msgstr "Secció capçaleres"
 
 msgid "Headers part"
 msgstr "Secció capçaleres"
 

-#: src/prefs_matcher.c:155
+#: src/prefs_matcher.c:163

 msgid "Body part"
 msgstr "Secció cos"
 
 msgid "Body part"
 msgstr "Secció cos"
 

-#: src/prefs_matcher.c:155
+#: src/prefs_matcher.c:163

 msgid "Whole message"
 msgstr "Missatge complet"
 
 msgid "Whole message"
 msgstr "Missatge complet"
 

-#: src/prefs_matcher.c:156
+#: src/prefs_matcher.c:164

 msgid "Unread flag"
 msgstr "Marca `No llegit`"
 
 msgid "Unread flag"
 msgstr "Marca `No llegit`"
 

-#: src/prefs_matcher.c:156
+#: src/prefs_matcher.c:164

 msgid "New flag"
 msgstr "Marca `Nou`"
 
 msgid "New flag"
 msgstr "Marca `Nou`"
 

-#: src/prefs_matcher.c:157
+#: src/prefs_matcher.c:165

 msgid "Marked flag"
 msgstr "Marca `Marcat`"
 
 msgid "Marked flag"
 msgstr "Marca `Marcat`"
 

-#: src/prefs_matcher.c:157
+#: src/prefs_matcher.c:165

 msgid "Deleted flag"
 msgstr "Marca `Esborrat`"
 
 msgid "Deleted flag"
 msgstr "Marca `Esborrat`"
 

-#: src/prefs_matcher.c:158
+#: src/prefs_matcher.c:166

 msgid "Replied flag"
 msgstr "Marca `Respost`"
 
 msgid "Replied flag"
 msgstr "Marca `Respost`"
 

-#: src/prefs_matcher.c:158
+#: src/prefs_matcher.c:166

 msgid "Forwarded flag"
 msgstr "Marca `Reenviat`"
 
 msgid "Forwarded flag"
 msgstr "Marca `Reenviat`"
 

-#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:167

 msgid "Locked flag"
 msgstr "Marca `Bloquejat`"
 
 msgid "Locked flag"
 msgstr "Marca `Bloquejat`"
 

-#: src/prefs_matcher.c:160
+#: src/prefs_matcher.c:168

 msgid "Color label"
 msgstr "Etiqueta de color"
 
 msgid "Color label"
 msgstr "Etiqueta de color"
 

-#: src/prefs_matcher.c:161
+#: src/prefs_matcher.c:169

 msgid "Ignored thread"
 msgstr "Fil ignorat"
 
 msgid "Ignored thread"
 msgstr "Fil ignorat"
 

-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:170

 msgid "Score greater than"
 msgstr "Puntuació major que"
 
 msgid "Score greater than"
 msgstr "Puntuació major que"
 

-#: src/prefs_matcher.c:162
+#: src/prefs_matcher.c:170

 msgid "Score lower than"
 msgstr "Puntuació menor que"
 
 msgid "Score lower than"
 msgstr "Puntuació menor que"
 

-#: src/prefs_matcher.c:163
+#: src/prefs_matcher.c:171

 msgid "Score equal to"
 msgstr "Puntuació igual a"
 
 msgid "Score equal to"
 msgstr "Puntuació igual a"
 

-#: src/prefs_matcher.c:164
+#: src/prefs_matcher.c:172

 msgid "Test"
 msgstr "Provar"
 
 msgid "Test"
 msgstr "Provar"
 

-#: src/prefs_matcher.c:165
+#: src/prefs_matcher.c:173

 msgid "Size greater than"
 msgstr "Tamany major que"
 
 msgid "Size greater than"
 msgstr "Tamany major que"
 

-#: src/prefs_matcher.c:166
+#: src/prefs_matcher.c:174

 msgid "Size smaller than"
 msgstr "Tamany menor que"
 
 msgid "Size smaller than"
 msgstr "Tamany menor que"
 

-#: src/prefs_matcher.c:167
+#: src/prefs_matcher.c:175

 msgid "Size exactly"
 msgstr "Tamany exacte"
 
 msgid "Size exactly"
 msgstr "Tamany exacte"
 

-#: src/prefs_matcher.c:168
+#: src/prefs_matcher.c:176

 msgid "Partially downloaded"
 msgstr "Parcialment descarregat"
 
 msgid "Partially downloaded"
 msgstr "Parcialment descarregat"
 

-#: src/prefs_matcher.c:185
+#: src/prefs_matcher.c:177
+msgid "Found in addressbook"
+msgstr "Trobat a l'agenda"
+
+#: src/prefs_matcher.c:194

 msgid "or"
 msgstr "o"
 
 msgid "or"
 msgstr "o"
 

-#: src/prefs_matcher.c:185
+#: src/prefs_matcher.c:194

 msgid "and"
 msgstr "i"
 
 msgid "and"
 msgstr "i"
 

-#: src/prefs_matcher.c:202
+#: src/prefs_matcher.c:211

 msgid "contains"
 msgstr "conté"
 
 msgid "contains"
 msgstr "conté"
 

-#: src/prefs_matcher.c:202
+#: src/prefs_matcher.c:211

 msgid "does not contain"
 msgstr "no conté"
 
 msgid "does not contain"
 msgstr "no conté"
 

-#: src/prefs_matcher.c:219
+#: src/prefs_matcher.c:235

 msgid "yes"
 msgstr "si"
 
 msgid "yes"
 msgstr "si"
 

-#: src/prefs_matcher.c:219
+#: src/prefs_matcher.c:235

 msgid "no"
 msgstr "no"
 
 msgid "no"
 msgstr "no"
 

-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:432

 msgid "Condition configuration"
 msgstr "Configuració de condició"
 
 msgid "Condition configuration"
 msgstr "Configuració de condició"
 

-#: src/prefs_matcher.c:437
+#: src/prefs_matcher.c:459

 msgid "Match type"
 msgstr "Tipo de coincidencia"
 
 msgid "Match type"
 msgstr "Tipo de coincidencia"
 

-#: src/prefs_matcher.c:505
-msgid " Info... "
-msgstr "Informació... "
+#: src/prefs_matcher.c:512
+msgid "Address header"
+msgstr "Capçalera d'adreça"
+
+#: src/prefs_matcher.c:544
+msgid "Book/folder"
+msgstr "Llibre/carpeta"
+
+#: src/prefs_matcher.c:578
+msgid " Select... "
+msgstr "Seleccionar... "

 
 

-#: src/prefs_matcher.c:528
+#: src/prefs_matcher.c:599

 msgid "Predicate"
 msgstr "Predicat"
 
 msgid "Predicate"
 msgstr "Predicat"
 

-#: src/prefs_matcher.c:579
+#: src/prefs_matcher.c:650

 msgid "Use regexp"
 msgstr "Usar exp.reg."
 
 msgid "Use regexp"
 msgstr "Usar exp.reg."
 

-#: src/prefs_matcher.c:617
+#: src/prefs_matcher.c:688

 msgid "Boolean Op"
 msgstr "Op. booleà"
 
 msgid "Boolean Op"
 msgstr "Op. booleà"
 

-#: src/prefs_matcher.c:1204
+#: src/prefs_matcher.c:1294

 msgid "Value is not set."
 msgstr "Valor no establert."
 
 msgid "Value is not set."
 msgstr "Valor no establert."
 

-#: src/prefs_matcher.c:1641
+#: src/prefs_matcher.c:1330
+msgid "all addresses in all headers"
+msgstr "Totes les adreces a totes les capçaleres"
+
+#: src/prefs_matcher.c:1333
+msgid "any address in any header"
+msgstr "Qualsevol adreça a qualsevol capçalera"
+
+#: src/prefs_matcher.c:1335
+#, c-format
+msgid "the address(es) in header '%s'"
+msgstr "la/les adreça/ces a la capçalera/es '%s'"
+
+#: src/prefs_matcher.c:1336
+#, 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."
+msgstr ""
+"La ruta del llibre/carpeta no ha estat definida.\n"
+"\n"
+"Si voleu que l'adreça '%s' coincideixi amb tot el llibre d'adreces, haureu de "
+"seleccionar 'Any' desde la llista desplegable de llibre/carpeta."
+
+#: src/prefs_matcher.c:1823

 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"


@@ -8406,11 +9289,11 @@ msgstr ""
 "L'entrada no fou guardada.\n"
 "Tancar igualment?"
 
 "L'entrada no fou guardada.\n"
 "Tancar igualment?"
 

-#: src/prefs_matcher.c:1703
+#: src/prefs_matcher.c:1885

 msgid "Match Type: 'Test'"
 msgstr "Tipus de coincidència: 'Provar'"
 
 msgid "Match Type: 'Test'"
 msgstr "Tipus de coincidència: 'Provar'"
 

-#: src/prefs_matcher.c:1704
+#: src/prefs_matcher.c:1886

 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"
 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"


@@ -8422,7 +9305,7 @@ msgstr ""
 "\n"
 "Podeu usar els següents símbols:"
 
 "\n"
 "Podeu usar els següents símbols:"
 

-#: src/prefs_matcher.c:1786
+#: src/prefs_matcher.c:1980

 msgid "Current condition rules"
 msgstr "Regles de condició actuals"
 
 msgid "Current condition rules"
 msgstr "Regles de condició actuals"
 


@@ -8443,50 +9326,50 @@ msgid "Display Face in message view"
 msgstr "Mostrar Face en la vista del missatge"
 
 #: src/prefs_message.c:137
 msgstr "Mostrar Face en la vista del missatge"
 
 #: src/prefs_message.c:137

-msgid "Display short headers on message view"
-msgstr "Capçaleres breus en la vista del missatge"
+msgid "Display headers in message view"
+msgstr "Mostra les capçaleres a la vista del missatge"

 
 

-#: src/prefs_message.c:153
+#: src/prefs_message.c:149

 msgid "HTML messages"
 msgstr "Missatges HTML"
 
 msgid "HTML messages"
 msgstr "Missatges HTML"
 

-#: src/prefs_message.c:161
+#: src/prefs_message.c:157

 msgid "Render HTML messages as text"
 msgstr "Renderitzar missatges HTML com si fos text"
 
 msgid "Render HTML messages as text"
 msgstr "Renderitzar missatges HTML com si fos text"
 

-#: src/prefs_message.c:164
+#: src/prefs_message.c:160

 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Mostrar els missatges HTML amb un mòdul si és possible"
 
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "Mostrar els missatges HTML amb un mòdul si és possible"
 

-#: src/prefs_message.c:174
+#: src/prefs_message.c:170

 msgid "Line space"
 msgstr "Interlineat"
 
 msgid "Line space"
 msgstr "Interlineat"
 

-#: src/prefs_message.c:188 src/prefs_message.c:226
+#: src/prefs_message.c:184 src/prefs_message.c:222

 msgid "pixel(s)"
 msgstr "punt(s)"
 
 msgid "pixel(s)"
 msgstr "punt(s)"
 

-#: src/prefs_message.c:193
+#: src/prefs_message.c:189

 msgid "Scroll"
 msgstr "Desplaçament"
 
 msgid "Scroll"
 msgstr "Desplaçament"
 

-#: src/prefs_message.c:200
+#: src/prefs_message.c:196

 msgid "Half page"
 msgstr "Mitja pàgina"
 
 msgid "Half page"
 msgstr "Mitja pàgina"
 

-#: src/prefs_message.c:206
+#: src/prefs_message.c:202

 msgid "Smooth scroll"
 msgstr "Desplaçament suau"
 
 msgid "Smooth scroll"
 msgstr "Desplaçament suau"
 

-#: src/prefs_message.c:212
+#: src/prefs_message.c:208

 msgid "Step"
 msgstr "Pas"
 
 msgid "Step"
 msgstr "Pas"
 

-#: src/prefs_message.c:233
+#: src/prefs_message.c:229

 msgid "Show attachment descriptions (rather than names)"
 msgstr "Mostrar descripcions dels adjunts (enlloc de noms)"
 
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Mostrar descripcions dels adjunts (enlloc de noms)"
 

-#: src/prefs_message.c:313
+#: src/prefs_message.c:309

 msgid "Text Options"
 msgstr "Opcions de Text"
 
 msgid "Text Options"
 msgstr "Opcions de Text"
 


@@ -8577,7 +9460,7 @@ msgstr "Escollir color per a les firmes"
 msgid "Signatures"
 msgstr "Signatures"
 
 msgid "Signatures"
 msgstr "Signatures"
 

-#: src/prefs_msg_colors.c:376
+#: src/prefs_msg_colors.c:376 src/prefs_summaries.c:761

 msgid "Folder list"
 msgstr "Llista de carpetes"
 
 msgid "Folder list"
 msgstr "Llista de carpetes"
 


@@ -8609,9 +9492,8 @@ msgstr "Etiquetes de color"
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480

-#, c-format
-msgid "Pick color for 'color %d'"
-msgstr "Escolliu color per 'color %d'"
+msgid "Tooltip|Pick color for 'color %d'"
+msgstr "Seleccioneu color per 'color %d'"

 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated


@@ -8623,9 +9505,8 @@ msgstr "Escollir etiqueta per a 'color %d'"
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612

-#, c-format
-msgid "Pick color for 'color %d' "
-msgstr "Escolliu color per 'color %d' "
+msgid "Dialog title|Pick color for 'color %d'"
+msgstr "Escolliu color per 'color %d'"

 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "
 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "


@@ -8667,163 +9548,159 @@ msgstr "Escollir color per a les signatures"
 msgid "Colors"
 msgstr "Colors"
 
 msgid "Colors"
 msgstr "Colors"
 

-#: src/prefs_other.c:109
+#: src/prefs_other.c:110

 msgid "Add address to destination when double-clicked"
 msgstr "Afegir adreça a la destinació amb doble click"
 
 msgid "Add address to destination when double-clicked"
 msgstr "Afegir adreça a la destinació amb doble click"
 

-#: src/prefs_other.c:112
+#: src/prefs_other.c:113

 msgid "Log Size"
 msgstr "Tamany de traça"
 
 msgid "Log Size"
 msgstr "Tamany de traça"
 

-#: src/prefs_other.c:119
+#: src/prefs_other.c:120

 msgid "Clip the log size"
 msgstr "Retallar tamany de traça"
 
 msgid "Clip the log size"
 msgstr "Retallar tamany de traça"
 

-#: src/prefs_other.c:124
+#: src/prefs_other.c:125

 msgid "Log window length"
 msgstr "Longitud finestra de traça"
 
 msgid "Log window length"
 msgstr "Longitud finestra de traça"
 

-#: src/prefs_other.c:141
+#: src/prefs_other.c:142

 msgid "0 to stop logging in the log window"
 msgstr "0 per deixar de registrar a la finestra de traça"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 per deixar de registrar a la finestra de traça"
 

-#: src/prefs_other.c:147
+#: src/prefs_other.c:145
+msgid "lines"
+msgstr "línies"
+
+#: src/prefs_other.c:154

 msgid "On exit"
 msgstr "Al sortir"
 
 msgid "On exit"
 msgstr "Al sortir"
 

-#: src/prefs_other.c:155
+#: src/prefs_other.c:162

 msgid "Confirm on exit"
 msgstr "Confirmar al sortir"
 
 msgid "Confirm on exit"
 msgstr "Confirmar al sortir"
 

-#: src/prefs_other.c:162
+#: src/prefs_other.c:169

 msgid "Empty trash on exit"
 msgstr "Buidar paperera al sortir"
 
 msgid "Empty trash on exit"
 msgstr "Buidar paperera al sortir"
 

-#: src/prefs_other.c:164
+#: src/prefs_other.c:171

 msgid "Ask before emptying"
 msgstr "Preguntar abans de buidar"
 
 msgid "Ask before emptying"
 msgstr "Preguntar abans de buidar"
 

-#: src/prefs_other.c:168
+#: src/prefs_other.c:175

 msgid "Warn if there are queued messages"
 msgstr "Avisar si existeixen missatges en cua"
 
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existeixen missatges en cua"
 

-#: src/prefs_other.c:174
-msgid "Socket I/O timeout:"
-msgstr "Temps límit E/S socket:"
+#: src/prefs_other.c:181
+msgid "Socket I/O timeout"
+msgstr "Temps límit E/S socket"

 
 

-#: src/prefs_other.c:192
+#: src/prefs_other.c:199

 msgid "Never send Return Receipts"
 msgstr "Mai enviar justificants de recepció"
 
 msgid "Never send Return Receipts"
 msgstr "Mai enviar justificants de recepció"
 

-#: src/prefs_quote.c:90
+#: src/prefs_quote.c:92

 msgid "Reply will quote by default"
 msgstr "Respondre amb cometes per omissió"
 
 msgid "Reply will quote by default"
 msgstr "Respondre amb cometes per omissió"
 

-#: src/prefs_quote.c:92
+#: src/prefs_quote.c:94

 msgid "Reply format"
 msgstr "Format de rèplica"
 
 msgid "Reply format"
 msgstr "Format de rèplica"
 

-#: src/prefs_quote.c:107 src/prefs_quote.c:149
+#: src/prefs_quote.c:109 src/prefs_quote.c:161

 msgid "Quotation mark"
 msgstr "Símbol"
 
 msgid "Quotation mark"
 msgstr "Símbol"
 

-#: src/prefs_quote.c:134
+#: src/prefs_quote.c:146

 msgid "Forward format"
 msgstr "Format de reenviament"
 
 msgid "Forward format"
 msgstr "Format de reenviament"
 

-#: src/prefs_quote.c:184
-msgid " Description of symbols... "
-msgstr " Descripció de símbols... "
-
-#: src/prefs_quote.c:193
+#: src/prefs_quote.c:215

 msgid "Quotation characters"
 msgstr "Caracters de cometes"
 
 msgid "Quotation characters"
 msgstr "Caracters de cometes"
 

-#: src/prefs_quote.c:208
+#: src/prefs_quote.c:230

 msgid "Treat these characters as quotation marks: "
 msgstr "Tractar aquests caràcters com a símbols de marcat: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Tractar aquests caràcters com a símbols de marcat: "
 

-#: src/prefs_quote.c:286
+#: src/prefs_quote.c:312

 msgid "Quoting"
 msgstr "Marcant"
 
 msgid "Quoting"
 msgstr "Marcant"
 

-#: src/prefs_receive.c:122
+#: src/prefs_receive.c:121

 msgid "External incorporation program"
 msgstr "Incorporació external de programa"
 
 msgid "External incorporation program"
 msgstr "Incorporació external de programa"
 

-#: src/prefs_receive.c:129
+#: src/prefs_receive.c:128

 msgid "Use external program for receiving mail"
 msgstr "Usar un programa extern per rebre correu"
 
 msgid "Use external program for receiving mail"
 msgstr "Usar un programa extern per rebre correu"
 

-#: src/prefs_receive.c:136
+#: src/prefs_receive.c:135

 msgid "Command"
 msgstr "Comanda"
 
 msgid "Command"
 msgstr "Comanda"
 

-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:144

 msgid "Automatic checking"
 msgstr "Verificació automàtica"
 
 msgid "Automatic checking"
 msgstr "Verificació automàtica"
 

-#: src/prefs_receive.c:156
-msgid "Automatically check for new mail"
-msgstr "Verificar l'existència de nou correu automàticament"
+#: src/prefs_receive.c:155
+msgid "Automatically check for new mail every"
+msgstr "Verificar l'existència de nou correu automàticament cada"

 
 

-#: src/prefs_receive.c:158
-msgid "every"
-msgstr "cada"
-
-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:173

 msgid "Check for new mail on startup"
 msgstr "Comprovar l'existència de nou correu a l'inici"
 
 msgid "Check for new mail on startup"
 msgstr "Comprovar l'existència de nou correu a l'inici"
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:176

 msgid "Dialogs"
 msgstr "Diàlegs"
 
 msgid "Dialogs"
 msgstr "Diàlegs"
 

-#: src/prefs_receive.c:188
+#: src/prefs_receive.c:182

 msgid "Show receive dialog"
 msgstr "Mostrar diàleg de recepció"
 
 msgid "Show receive dialog"
 msgstr "Mostrar diàleg de recepció"
 

-#: src/prefs_receive.c:196 src/prefs_send.c:169 src/prefs_summaries.c:958
+#: src/prefs_receive.c:190 src/prefs_send.c:169 src/prefs_summaries.c:855

 msgid "Always"
 msgstr "Sempre"
 
 msgid "Always"
 msgstr "Sempre"
 

-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:191

 msgid "Only on manual receiving"
 msgstr "Només al rebre manualment"
 
 msgid "Only on manual receiving"
 msgstr "Només al rebre manualment"
 

-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:205

 msgid "Close receive dialog when finished"
 msgstr "Tancar el diàleg de recepció al finalitzar"
 
 msgid "Close receive dialog when finished"
 msgstr "Tancar el diàleg de recepció al finalitzar"
 

-#: src/prefs_receive.c:214
+#: src/prefs_receive.c:208

 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diàleg d'error en l'error de recepció"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diàleg d'error en l'error de recepció"
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:210

 msgid "After receiving new mail"
 msgstr "Després de rebre correu nou"
 
 msgid "After receiving new mail"
 msgstr "Després de rebre correu nou"
 

-#: src/prefs_receive.c:222
+#: src/prefs_receive.c:216

 msgid "Go to inbox"
 msgstr "Anar a la safata d'entrada"
 
 msgid "Go to inbox"
 msgstr "Anar a la safata d'entrada"
 

-#: src/prefs_receive.c:224
+#: src/prefs_receive.c:218

 msgid "Update all local folders"
 msgstr "Actualitzar totes les carpetes locals"
 
 msgid "Update all local folders"
 msgstr "Actualitzar totes les carpetes locals"
 

-#: src/prefs_receive.c:226
+#: src/prefs_receive.c:220

 msgid "Run command"
 msgstr "Executa comanda"
 
 msgid "Run command"
 msgstr "Executa comanda"
 

-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:229

 msgid "after automatic check"
 msgstr "després de la comprovació automàtica"
 
 msgid "after automatic check"
 msgstr "després de la comprovació automàtica"
 

-#: src/prefs_receive.c:237
+#: src/prefs_receive.c:231

 msgid "after manual check"
 msgstr "després de la comprovació manual"
 
 msgid "after manual check"
 msgstr "després de la comprovació manual"
 

-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:239

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -8832,11 +9709,11 @@ msgstr ""
 "Orden a ejecutar:\n"
 "(usar %d com a n de missatges nous)"
 
 "Orden a ejecutar:\n"
 "(usar %d com a n de missatges nous)"
 

-#: src/prefs_receive.c:371 src/prefs_send.c:337
+#: src/prefs_receive.c:365 src/prefs_send.c:337

 msgid "Mail Handling"
 msgstr "Recollida de correu"
 
 msgid "Mail Handling"
 msgstr "Recollida de correu"
 

-#: src/prefs_receive.c:372
+#: src/prefs_receive.c:366

 msgid "Receiving"
 msgstr "Rebent"
 
 msgid "Receiving"
 msgstr "Rebent"
 


@@ -8997,39 +9874,39 @@ msgstr ""
 msgid "Sending"
 msgstr "Enviant"
 
 msgid "Sending"
 msgstr "Enviant"
 

-#: src/prefs_spelling.c:105
+#: src/prefs_spelling.c:91

 msgid "Select dictionaries location"
 msgstr "Seleccionar la ubicació dels diccionaris"
 
 msgid "Select dictionaries location"
 msgstr "Seleccionar la ubicació dels diccionaris"
 

-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:126

 msgid "Pick color for misspelled word"
 msgstr "Escolli color de les paraules incorrectes"
 
 msgid "Pick color for misspelled word"
 msgstr "Escolli color de les paraules incorrectes"
 

-#: src/prefs_spelling.c:186
+#: src/prefs_spelling.c:183

 msgid "Enable spell checker"
 msgstr "Habilitar el corrector ortogràfic"
 
 msgid "Enable spell checker"
 msgstr "Habilitar el corrector ortogràfic"
 

-#: src/prefs_spelling.c:191
+#: src/prefs_spelling.c:188

 msgid "Enable alternate dictionary"
 msgstr "Habilitar diccionari alternatiu"
 
 msgid "Enable alternate dictionary"
 msgstr "Habilitar diccionari alternatiu"
 

-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194

 msgid "Faster switching with last used dictionary"
 msgstr "Canvi més ràpid amb l'últim diccionari usat"
 
 msgid "Faster switching with last used dictionary"
 msgstr "Canvi més ràpid amb l'últim diccionari usat"
 

-#: src/prefs_spelling.c:199
-msgid "Dictionary path"
-msgstr "Ruta de diccionaris"
+#: src/prefs_spelling.c:196
+msgid "Path to dictionaries"
+msgstr "Ruta als diccionaris"

 
 

-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:211

 msgid "Automatic spelling"
 msgstr "Verificació automàtica"
 
 msgid "Automatic spelling"
 msgstr "Verificació automàtica"
 

-#: src/prefs_spelling.c:226
+#: src/prefs_spelling.c:223

 msgid "Re-check message when changing dictionary"
 msgstr "Re-comprovar el missatge quan canvieu de diccionari"
 
 msgid "Re-check message when changing dictionary"
 msgstr "Re-comprovar el missatge quan canvieu de diccionari"
 

-#: src/prefs_spelling.c:230
+#: src/prefs_spelling.c:227

 msgid "Dictionary"
 msgstr "Diccionari"
 
 msgid "Dictionary"
 msgstr "Diccionari"
 


@@ -9037,126 +9914,134 @@ msgstr "Diccionari"
 msgid "Default dictionary"
 msgstr "Diccionari per omissió"
 
 msgid "Default dictionary"
 msgstr "Diccionari per omissió"
 

-#: src/prefs_spelling.c:263
+#: src/prefs_spelling.c:258
+msgid "Default alternate dictionary"
+msgstr "Diccionari alternatiu per omissió"
+
+#: src/prefs_spelling.c:277
+msgid "Check with both dictionaries"
+msgstr "Comprova amb ambdos diccionaris"
+
+#: src/prefs_spelling.c:283

 msgid "Default suggestion mode"
 msgstr "Mode de suggeriment per omissió"
 
 msgid "Default suggestion mode"
 msgstr "Mode de suggeriment per omissió"
 

-#: src/prefs_spelling.c:286
-msgid "Misspelled word color:"
-msgstr "Color de les faltes ortogràfiques:"
+#: src/prefs_spelling.c:305
+msgid "Misspelled word color"
+msgstr "Color de les faltes ortogràfiques"

 
 

-#: src/prefs_spelling.c:300
+#: src/prefs_spelling.c:319

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr ""
 "Escolliu color de les paraules incorrectes. Useu el color negre per "
 "subrattlar"
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr ""
 "Escolliu color de les paraules incorrectes. Useu el color negre per "
 "subrattlar"
 

-#: src/prefs_spelling.c:405
+#: src/prefs_spelling.c:449

 msgid "Spell Checking"
 msgstr "Corregint ortogràficament"
 
 msgid "Spell Checking"
 msgstr "Corregint ortogràficament"
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr "el dia de la setmana abreviat"
 
 msgid "the full abbreviated weekday name"
 msgstr "el dia de la setmana abreviat"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr "el dia de la setmana complert"
 
 msgid "the full weekday name"
 msgstr "el dia de la setmana complert"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr "el nom del mes abreviat"
 
 msgid "the abbreviated month name"
 msgstr "el nom del mes abreviat"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr "el nom del mes complert"
 
 msgid "the full month name"
 msgstr "el nom del mes complert"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr "la data i hora preferida per a la localizació actual"
 
 msgid "the preferred date and time for the current locale"
 msgstr "la data i hora preferida per a la localizació actual"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr "el número de segle (any/100)"
 
 msgid "the century number (year/100)"
 msgstr "el número de segle (any/100)"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes com a número decimal"
 
 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes com a número decimal"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora com a número usant el rellotge de 24 hores"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora com a número usant el rellotge de 24 hores"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora com a número usant el rellotge de 12 hores"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora com a número usant el rellotge de 12 hores"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr "el dia de l'any com a número decimal"
 
 msgid "the day of the year as a decimal number"
 msgstr "el dia de l'any com a número decimal"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr "el mes com a número decimal"
 
 msgid "the month as a decimal number"
 msgstr "el mes com a número decimal"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr "el minut com a número decimal"
 
 msgid "the minute as a decimal number"
 msgstr "el minut com a número decimal"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr "AM o PM"
 
 msgid "either AM or PM"
 msgstr "AM o PM"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr "el segon com a número decimal"
 
 msgid "the second as a decimal number"
 msgstr "el segon com a número decimal"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr "el dia de la setmana com a número decimal"
 
 msgid "the day of the week as a decimal number"
 msgstr "el dia de la setmana com a número decimal"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr "la data preferida per a la localizació actual"
 
 msgid "the preferred date for the current locale"
 msgstr "la data preferida per a la localizació actual"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr "els dos últims dígits de l'any"
 
 msgid "the last two digits of a year"
 msgstr "els dos últims dígits de l'any"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr "l'any com a número decimal"
 
 msgid "the year as a decimal number"
 msgstr "l'any com a número decimal"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr "zona horària o nom o abreviatura"
 
 msgid "the time zone or name or abbreviation"
 msgstr "zona horària o nom o abreviatura"
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
+#: src/prefs_summaries.c:911

 msgid "Date format"
 msgstr "Format de data"
 
 msgid "Date format"
 msgstr "Format de data"
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr "Especificador"
 
 msgid "Specifier"
 msgstr "Especificador"
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr "Exemple"
 
 msgid "Example"
 msgstr "Exemple"
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Select key bindings"
 msgstr "Seleccionar dreceres de teclat"
 
 msgid "Select key bindings"
 msgstr "Seleccionar dreceres de teclat"
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr "Seleccionar combinació:"
 
 msgid "Select preset:"
 msgstr "Seleccionar combinació:"
 

-#: src/prefs_summaries.c:352 src/prefs_summaries.c:699
+#: src/prefs_summaries.c:353 src/prefs_summaries.c:700

 msgid "Old Sylpheed"
 msgstr "Antic Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Antic Sylpheed"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:361

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."


@@ -9164,127 +10049,127 @@ msgstr ""
 "Podeu modificar també cada drecera de menú presionant\n"
 "alguna(es) tecla(es) al situar el punter sobre l'element."
 
 "Podeu modificar també cada drecera de menú presionant\n"
 "alguna(es) tecla(es) al situar el punter sobre l'element."
 

-#: src/prefs_summaries.c:767
-msgid "Translate header names"
-msgstr "Traduïu Capçaleres"
-
-#: src/prefs_summaries.c:769
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"Les capçaleres standart mostrades (com 'From:', 'Subject:') seran traduïdes "
-"al vostre idioma."
-
-#: src/prefs_summaries.c:773
+#: src/prefs_summaries.c:768

 msgid "Display unread number next to folder name"
 msgstr "Veure el número de no llegits amb el nom de la carpeta"
 
 msgid "Display unread number next to folder name"
 msgstr "Veure el número de no llegits amb el nom de la carpeta"
 

-#: src/prefs_summaries.c:780
+#: src/prefs_summaries.c:775

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar noms de grup amb més de"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar noms de grup amb més de"
 

-#: src/prefs_summaries.c:794
+#: src/prefs_summaries.c:789

 msgid "letters"
 msgstr "lletres"
 
 #: src/prefs_summaries.c:807
 msgid "letters"
 msgstr "lletres"
 
 #: src/prefs_summaries.c:807

-msgid "Display sender using address book"
-msgstr "Mostrar remitent usant l'agenda"
-
-#: src/prefs_summaries.c:810
-msgid "Thread using subject in addition to standard headers"
-msgstr "Jerarquitzar usant l'assumpte a més a més de les capçaleres estàndar"
+msgid "Message list"
+msgstr "Llista de missatges"

 
 

-#: src/prefs_summaries.c:833
-msgid "Date format help"
-msgstr "Ajuda del format de data"
-
-#: src/prefs_summaries.c:837
-msgid "Set displayed columns"
-msgstr "Definir columnes visibles"
-
-#: src/prefs_summaries.c:845
-msgid " Folder list... "
-msgstr "Llista de carpetes..."
-
-#: src/prefs_summaries.c:853
-msgid " Message list... "
-msgstr "Llista de missatges..."
-
-#: src/prefs_summaries.c:874
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Executar immediatament moviments o esborrats de missatges"
-
-#: src/prefs_summaries.c:876
-msgid "Messages will be marked until execution if this is turned off"
-msgstr "Els missatges seran marcats fins a l'execució si està desactivada"
-
-#: src/prefs_summaries.c:882
-msgid "Confirm before marking all mails in a folder as read"
-msgstr "Confirmeu abans de marcar tots els correus de la carpeta com a llegits"
-
-#: src/prefs_summaries.c:886
-msgid "Always open message when selected"
-msgstr "Obrir sempre els missatges quan es seleccionin"
-
-#: src/prefs_summaries.c:890
-msgid "Only mark message as read when opened in a new window"
-msgstr "Marcar missatge com a llegit només al obrir-lo en una finestra nova"
-
-#: src/prefs_summaries.c:903
+#: src/prefs_summaries.c:817

 msgid "When entering a folder"
 msgstr "Quan s'entri a la carpeta"
 
 msgid "When entering a folder"
 msgstr "Quan s'entri a la carpeta"
 

-#: src/prefs_summaries.c:919
+#: src/prefs_summaries.c:825

 msgid "Do nothing"
 msgstr "Fer res"
 
 msgid "Do nothing"
 msgstr "Fer res"
 

-#: src/prefs_summaries.c:920
+#: src/prefs_summaries.c:826

 msgid "Select first unread (or new or marked) message"
 msgstr "Seleccionar primer missatge sense llegir (o nou o marcat)"
 
 msgid "Select first unread (or new or marked) message"
 msgstr "Seleccionar primer missatge sense llegir (o nou o marcat)"
 

-#: src/prefs_summaries.c:922
+#: src/prefs_summaries.c:828

 msgid "Select first unread (or marked or new) message"
 msgstr "Seleccionar primer missatge sense llegir (o marcat o nou)"
 
 msgid "Select first unread (or marked or new) message"
 msgstr "Seleccionar primer missatge sense llegir (o marcat o nou)"
 

-#: src/prefs_summaries.c:924
+#: src/prefs_summaries.c:830

 msgid "Select first new (or unread or marked) message"
 msgstr "Seleccionar primer missatges nou (o sense llegir o marcat)"
 
 msgid "Select first new (or unread or marked) message"
 msgstr "Seleccionar primer missatges nou (o sense llegir o marcat)"
 

-#: src/prefs_summaries.c:926
+#: src/prefs_summaries.c:832

 msgid "Select first new (or marked or unread) message"
 msgstr "Seleccionar primer missatges nou (o marcat o sense llegir)"
 
 msgid "Select first new (or marked or unread) message"
 msgstr "Seleccionar primer missatges nou (o marcat o sense llegir)"
 

-#: src/prefs_summaries.c:928
+#: src/prefs_summaries.c:834

 msgid "Select first marked (or new or unread) message"
 msgstr "Seleccionar primer missatge marcat (o nou o sense llegir)"
 
 msgid "Select first marked (or new or unread) message"
 msgstr "Seleccionar primer missatge marcat (o nou o sense llegir)"
 

-#: src/prefs_summaries.c:930
+#: src/prefs_summaries.c:836

 msgid "Select first marked (or unread or new) message"
 msgstr "Seleccionar primer missatges marcat (o sense llegir o nou)"
 
 msgid "Select first marked (or unread or new) message"
 msgstr "Seleccionar primer missatges marcat (o sense llegir o nou)"
 

-#: src/prefs_summaries.c:942
+#: src/prefs_summaries.c:847

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Mostrar opció \"missatges no llegit (o nou)\""
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Mostrar opció \"missatges no llegit (o nou)\""
 

-#: src/prefs_summaries.c:959
+#: src/prefs_summaries.c:856

 msgid "Assume 'Yes'"
 msgstr "Assumir 'Si'"
 
 msgid "Assume 'Yes'"
 msgstr "Assumir 'Si'"
 

-#: src/prefs_summaries.c:961
+#: src/prefs_summaries.c:858

 msgid "Assume 'No'"
 msgstr "Assumir 'No'"
 
 msgid "Assume 'No'"
 msgstr "Assumir 'No'"
 

-#: src/prefs_summaries.c:970
+#: src/prefs_summaries.c:866
+msgid "Always open message when selected"
+msgstr "Obrir sempre els missatges quan es seleccionin"
+
+#: src/prefs_summaries.c:869
+msgid "Thread using subject in addition to standard headers"
+msgstr "Jerarquitzar usant l'assumpte a més a més de les capçaleres estàndar"
+
+#: src/prefs_summaries.c:875
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Executar immediatament moviments o esborrats de missatges"
+
+#: src/prefs_summaries.c:877
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr ""
+"Posposa el moviment, copiat i esborrat de missatges fins que escolliu 'Eines/"
+"Executar'"
+
+#: src/prefs_summaries.c:882
+msgid "Only mark message as read when opened in a new window"
+msgstr "Marcar missatge com a llegit només al obrir-lo en una finestra nova"
+
+#: src/prefs_summaries.c:889
+msgid "Mark messages as read after"
+msgstr "Marcar els misstages com a llegits després de"
+
+#: src/prefs_summaries.c:905
+msgid "Display sender using address book"
+msgstr "Mostrar remitent usant l'agenda"
+
+#: src/prefs_summaries.c:937
+msgid "Date format help"
+msgstr "Ajuda del format de data"
+
+#: src/prefs_summaries.c:955
+msgid "Confirm before marking all mails in a folder as read"
+msgstr "Confirmeu abans de marcar tots els correus de la carpeta com a llegits"
+
+#: src/prefs_summaries.c:958
+msgid "Translate header names"
+msgstr "Traduïu Capçaleres"
+
+#: src/prefs_summaries.c:960
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"Les capçaleres standart mostrades (com 'From:', 'Subject:') seran traduïdes "
+"al vostre idioma."
+
+#: src/prefs_summaries.c:967

 msgid " Set key bindings... "
 msgstr " Establir dreceres de teclat..."
 
 msgid " Set key bindings... "
 msgstr " Establir dreceres de teclat..."
 

-#: src/prefs_summaries.c:1077
+#: src/prefs_summaries.c:1079

 msgid "Summaries"
 msgstr "Sumaris"
 
 msgid "Summaries"
 msgstr "Sumaris"
 

-#: src/prefs_summary_column.c:81
+#: src/prefs_summary_column.c:81 src/summaryview.c:2360

 msgid "Attachment"
 msgstr "Adjunt"
 
 msgid "Attachment"
 msgstr "Adjunt"
 


@@ -9305,39 +10190,35 @@ msgstr ""
 "modificar\n"
 "l'ordre usant els botons Amunt / Avall, o arrossegant els elements."
 
 "modificar\n"
 "l'ordre usant els botons Amunt / Avall, o arrossegant els elements."
 

-#: src/prefs_template.c:192
-msgid "Template name"
-msgstr "Nom de plantilla"
+#: src/prefs_template.c:186
+msgid "This name is used as the Menu item"
+msgstr "Aquest nom és usat com a element de Menú"

 
 

-#: src/prefs_template.c:276
+#: src/prefs_template.c:286

 msgid " Symbols... "
 msgstr " Símbols... "
 
 msgid " Symbols... "
 msgstr " Símbols... "
 

-#: src/prefs_template.c:305
+#: src/prefs_template.c:315

 msgid "Template configuration"
 msgstr "Configuració de plantilla"
 
 msgid "Template configuration"
 msgstr "Configuració de plantilla"
 

-#: src/prefs_template.c:521
-msgid "Template format error."
-msgstr "Error de format en la plantilla."
-
-#: src/prefs_template.c:531
+#: src/prefs_template.c:557

 msgid "Template name is not set."
 msgstr "No s'ha establert el nom de la plantilla"
 
 msgid "Template name is not set."
 msgstr "No s'ha establert el nom de la plantilla"
 

-#: src/prefs_template.c:620
+#: src/prefs_template.c:667

 msgid "Delete template"
 msgstr "Esborrar plantilla"
 
 msgid "Delete template"
 msgstr "Esborrar plantilla"
 

-#: src/prefs_template.c:621
+#: src/prefs_template.c:668

 msgid "Do you really want to delete this template?"
 msgstr "Voleu realment esborrar aquesta plantilla?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Voleu realment esborrar aquesta plantilla?"
 

-#: src/prefs_template.c:758
+#: src/prefs_template.c:805

 msgid "Current templates"
 msgstr "Plantilles actuals"
 
 msgid "Current templates"
 msgstr "Plantilles actuals"
 

-#: src/prefs_template.c:783
+#: src/prefs_template.c:830

 msgid "Template"
 msgstr "Plantilla"
 
 msgid "Template"
 msgstr "Plantilla"
 


@@ -9439,10 +10320,6 @@ msgstr ""
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "Disponibles %d temes (%d d'usuari, %d globals, 1 intern)"
 
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "Disponibles %d temes (%d d'usuari, %d globals, 1 intern)"
 

-#: src/prefs_themes.c:706
-msgid "The Sylpheed-Claws Team"
-msgstr "L'equip de Sylpheed-Claws"
-

 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"


@@ -9453,8 +10330,8 @@ msgid "No info file available for this theme"
 msgstr "No hi ha arxiu d'informació per a aquest tema"
 
 #: src/prefs_themes.c:732
 msgstr "No hi ha arxiu d'informació per a aquest tema"
 
 #: src/prefs_themes.c:732

-msgid "Error: can't get theme status"
-msgstr "Error: no se pot obtenir l'estat del tema"
+msgid "Error: couldn't get theme status"
+msgstr "Error: no es pot obtenir l'estat del tema"

 
 #: src/prefs_themes.c:756
 #, c-format
 
 #: src/prefs_themes.c:756
 #, c-format


@@ -9489,11 +10366,11 @@ msgstr "Estat:"
 msgid "Preview"
 msgstr "Pre-visualització"
 
 msgid "Preview"
 msgstr "Pre-visualització"
 

-#: src/prefs_themes.c:992
+#: src/prefs_themes.c:991

 msgid "Use this"
 msgstr "Useu aquest"
 
 msgid "Use this"
 msgstr "Useu aquest"
 

-#: src/prefs_themes.c:997
+#: src/prefs_themes.c:996

 msgid "Remove"
 msgstr "Eliminar"
 
 msgid "Remove"
 msgstr "Eliminar"
 


@@ -9518,8 +10395,8 @@ msgid "Message view toolbar configuration"
 msgstr "Configuració de la barra de vista de missatges"
 
 #: src/prefs_toolbar.c:643
 msgstr "Configuració de la barra de vista de missatges"
 
 #: src/prefs_toolbar.c:643

-msgid "Sylpheed-Claws Action"
-msgstr "Acció de Sylpheed-Claws"
+msgid "Claws Mail Action"
+msgstr "Acció de Claws Mail"

 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"
 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"


@@ -9589,10 +10466,6 @@ msgstr "Envolcallant"
 msgid "Unknown error"
 msgstr "Error desconegut"
 
 msgid "Unknown error"
 msgstr "Error desconegut"
 

-#: src/privacy.c:211 src/privacy.c:215 src/privacy.c:232 src/privacy.c:236
-msgid "No signature found"
-msgstr "No s'ha trobat signatura"
-

 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "No hi ha informació disponible"
 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "No hi ha informació disponible"


@@ -9601,63 +10474,66 @@ msgstr "No hi ha informaci
 msgid "No recipient keys defined."
 msgstr "No s'ha definit cap clau."
 
 msgid "No recipient keys defined."
 msgstr "No s'ha definit cap clau."
 

-#: src/procmime.c:296 src/procmime.c:298
+#: src/procmime.c:340 src/procmime.c:342

 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificant BASE64]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Error decodificant BASE64]\n"
 

-#: src/procmsg.c:900
-msgid "Already trying to send\n"
-msgstr "Ja s'ha intentat enviar\n"
-
-#: src/procmsg.c:903
+#: src/procmsg.c:918 src/procmsg.c:921

 msgid "Already trying to send."
 msgstr "Ja s'ha intentat enviar "
 
 msgid "Already trying to send."
 msgstr "Ja s'ha intentat enviar "
 

-#: src/procmsg.c:1434
+#: src/procmsg.c:1515
+#, c-format

 msgid "Couldn't open file %s."
 msgstr "No s'ha pogut obrir l'arxiu %s."
 
 msgid "Couldn't open file %s."
 msgstr "No s'ha pogut obrir l'arxiu %s."
 

-#: src/procmsg.c:1528
+#: src/procmsg.c:1613
+#, c-format

 msgid "Couldn't encrypt the email: %s"
 msgstr "No s'ha pogut encriptar el correu: %s"
 
 msgid "Couldn't encrypt the email: %s"
 msgstr "No s'ha pogut encriptar el correu: %s"
 

-#: src/procmsg.c:1561
+#: src/procmsg.c:1646

 msgid "Queued message header is broken."
 msgstr "La capçalera del missatge encuat és defectuosa."
 
 msgid "Queued message header is broken."
 msgstr "La capçalera del missatge encuat és defectuosa."
 

-#: src/procmsg.c:1582
+#: src/procmsg.c:1667

 msgid "An error happened during SMTP session."
 msgstr "S'ha produït un error durant la sessió SMTP."
 
 msgid "An error happened during SMTP session."
 msgstr "S'ha produït un error durant la sessió SMTP."
 

-#: src/procmsg.c:1596
+#: src/procmsg.c:1681

 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""

-"No s'ha especificat cap compte per enviar, i s'ha produït un error durant "
-"la sessió SMTP"
+"No s'ha especificat cap compte per enviar, i s'ha produït un error durant la "
+"sessió SMTP"

 
 

-#: src/procmsg.c:1604
+#: src/procmsg.c:1689

 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "

-"generated by Sylpheed-Claws."
+"generated by Claws Mail."

 msgstr ""
 msgstr ""

-"No s'ha pogut obtenir les condicions d'enviament. Potser el correu no ha estat"
-"generat per Sylpheed-Claws."
+"No s'ha pogut obtenir les condicions d'enviament. Potser el correu no ha estat "
+"generat per Claws Mail."

 
 

-#: src/procmsg.c:1622
-msgid "Could not create temporary file for news sending."
+#: src/procmsg.c:1707
+msgid "Couldn't create temporary file for news sending."

 msgstr "No s'ha pogut crear l'arxiu temporal per enviar noticies."
 
 msgstr "No s'ha pogut crear l'arxiu temporal per enviar noticies."
 

-#: src/procmsg.c:1635
+#: src/procmsg.c:1720

 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "S'ha produït un error al escriure l'arxiu temporal per enviar noticies."
 
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "S'ha produït un error al escriure l'arxiu temporal per enviar noticies."
 

-#: src/procmsg.c:1649
+#: src/procmsg.c:1734
+#, c-format

 msgid "Error occurred while posting the message to %s."
 msgstr "S'ha produït un error enviant el missatge a %s."
 
 msgid "Error occurred while posting the message to %s."
 msgstr "S'ha produït un error enviant el missatge a %s."
 

+#: src/procmsg.c:2214
+msgid "Filtering messages...\n"
+msgstr "Filtrant missatge...\n"
+

 #: src/quote_fmt.c:40
 msgid "customized date format (see 'man strftime')"
 msgstr "format de data configurat (veure 'man strftime')"
 #: src/quote_fmt.c:40
 msgid "customized date format (see 'man strftime')"
 msgstr "format de data configurat (veure 'man strftime')"


@@ -9698,55 +10574,71 @@ msgstr "cos de missatge marcat sense signatura"
 msgid "cursor position"
 msgstr "posició del cursor"
 
 msgid "cursor position"
 msgstr "posició del cursor"
 

+#: src/quote_fmt.c:58
+msgid "Account property: your name"
+msgstr "Propietat del compte: el vostre nom"
+

 #: src/quote_fmt.c:59
 #: src/quote_fmt.c:59

+msgid "Account property: your email address"
+msgstr "Propietat del compte: la vostra adreça de correu"
+
+#: src/quote_fmt.c:60
+msgid "Account property: account name"
+msgstr "Propietat del compte: nom de compte"
+
+#: src/quote_fmt.c:61
+msgid "Account property: organization"
+msgstr "Propietat del compte : organització"
+
+#: src/quote_fmt.c:63

 msgid "literal backslash"
 msgstr "caràcter contrabarra"
 
 msgid "literal backslash"
 msgstr "caràcter contrabarra"
 

-#: src/quote_fmt.c:60
+#: src/quote_fmt.c:64

 msgid "literal question mark"
 msgstr "caràcter d'interrogació"
 
 msgid "literal question mark"
 msgstr "caràcter d'interrogació"
 

-#: src/quote_fmt.c:61
+#: src/quote_fmt.c:65

 msgid "literal exclamation mark"
 msgstr "marca del literal d'exclamació"
 
 msgid "literal exclamation mark"
 msgstr "marca del literal d'exclamació"
 

-#: src/quote_fmt.c:62
+#: src/quote_fmt.c:66

 msgid "literal pipe"
 msgstr "caràcter 'pipe'"
 
 msgid "literal pipe"
 msgstr "caràcter 'pipe'"
 

-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:67

 msgid "literal opening curly brace"
 msgstr "caràcter 'claudator' obert"
 
 msgid "literal opening curly brace"
 msgstr "caràcter 'claudator' obert"
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:68

 msgid "literal closing curly brace"
 msgstr "caràcter 'claudator' tancada"
 
 msgid "literal closing curly brace"
 msgstr "caràcter 'claudator' tancada"
 

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:69

 msgid "tab"
 msgstr "tab"
 
 msgid "tab"
 msgstr "tab"
 

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:70

 msgid "linefeed"
 msgstr "Salt de línia"
 
 msgid "linefeed"
 msgstr "Salt de línia"
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:72

 msgid ""
 "insert expr if x is set\n"
 msgid ""
 "insert expr if x is set\n"

-"(where x is one of the dfNFLIstcnri characters)"
+"(where x is one of the dfNFLIstcnri characters or af, ao)"

 msgstr ""
 "insertar expr si x està habilitat\n"
 msgstr ""
 "insertar expr si x està habilitat\n"

-"(on x es uno dels caràcters dfNFLIstrcnri)"
+"(on x es uno dels caràcters dfNFLIstrcnri o af, ao)"

 
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:73

 msgid ""
 "insert expr if x is not set\n"
 msgid ""
 "insert expr if x is not set\n"

-"(where x is one of the dfNFLIstcnri characters)"
+"(where x is one of the dfNFLIstcnri characters or af, ao)"

 msgstr ""
 "insertar expr si x no està habilitat\n"
 msgstr ""
 "insertar expr si x no està habilitat\n"

-"(on x es un dels caràcters dfNFLIstcnri)"
+"(on x es un dels caràcters dfNFLIstcnri o af, ao)"

 
 

-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:74

 msgid ""
 "insert file:\n"
 "sub_expr is evaluated as a filename to insert"
 msgid ""
 "insert file:\n"
 "sub_expr is evaluated as a filename to insert"


@@ -9754,7 +10646,7 @@ msgstr ""
 "inserteu arxiu:\n"
 "sub_expr és evaluada com a un nom d'arxiu a insertar"
 
 "inserteu arxiu:\n"
 "sub_expr és evaluada com a un nom d'arxiu a insertar"
 

-#: src/quote_fmt.c:71
+#: src/quote_fmt.c:75

 msgid ""
 "insert program output:\n"
 "sub_expr is evaluated as a command-line to get\n"
 msgid ""
 "insert program output:\n"
 "sub_expr is evaluated as a command-line to get\n"


@@ -9764,7 +10656,7 @@ msgstr ""
 "sub_expr es evaluada com a una comanda d'on obtenir\n"
 "la resposta"
 
 "sub_expr es evaluada com a una comanda d'on obtenir\n"
 "la resposta"
 

-#: src/quote_fmt.c:72
+#: src/quote_fmt.c:76

 msgid ""
 "insert user input:\n"
 "sub_expr is a variable to be replaced by\n"
 msgid ""
 "insert user input:\n"
 "sub_expr is a variable to be replaced by\n"


@@ -9774,20 +10666,35 @@ msgstr ""
 "sub_expr es una variable per ser reemplaçada per\n"
 "un text entrat per l'usuari"
 
 "sub_expr es una variable per ser reemplaçada per\n"
 "un text entrat per l'usuari"
 

-#: src/quote_fmt.c:84
+#: src/quote_fmt.c:78
+msgid "terms definition:"
+msgstr "Definició de termes:"
+
+#: src/quote_fmt.c:79
+msgid "text that can contain any of the symbols above"
+msgstr "texte que pot contenir qualsevol dels simbols indicat anteriorment"
+
+#: src/quote_fmt.c:80
+msgid ""
+"text that can contain any of the symbols above\n"
+"but ?x{}, !x{}, |f{}, |p{} and |i{}"
+msgstr "texte que pot contenir qualsevol dels simbols indicat anteriorment\n"
+"excepte ?x{}, !x{}, |f{}, |p{} i |i{}"
+
+#: src/quote_fmt.c:88

 msgid "Description of symbols"
 msgstr "Descripció de símbols"
 
 msgid "Description of symbols"
 msgstr "Descripció de símbols"
 

-#: src/quote_fmt.c:85
+#: src/quote_fmt.c:89

 msgid "The following symbols can be used:"
 msgstr "Es poden usar els següents símbols:"
 
 msgid "The following symbols can be used:"
 msgstr "Es poden usar els següents símbols:"
 

-#: src/quote_fmt_parse.y:458
+#: src/quote_fmt_parse.y:464

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Entra text per reemplaçar '%s'"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Entra text per reemplaçar '%s'"
 

-#: src/quote_fmt_parse.y:459
+#: src/quote_fmt_parse.y:465

 msgid "Enter variable"
 msgstr "Inserta una variable"
 
 msgid "Enter variable"
 msgstr "Inserta una variable"
 


@@ -9797,8 +10704,7 @@ msgid "Sending message using command: %s\n"
 msgstr "Enviant missatge usant l'ordre: %s\n"
 
 #: src/send_message.c:151
 msgstr "Enviant missatge usant l'ordre: %s\n"
 
 #: src/send_message.c:151

-#, c-format
-msgid "Can't execute command: %s"
+msgid "Couldn't execute command: %s"

 msgstr "No s'ha pogut executar l'ordre: %s"
 
 #: src/send_message.c:186
 msgstr "No s'ha pogut executar l'ordre: %s"
 
 #: src/send_message.c:186


@@ -9864,15 +10770,15 @@ msgstr "Sortint..."
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviant missatge (%d / %d bytes)"
 
 msgid "Sending message (%d / %d bytes)"
 msgstr "Enviant missatge (%d / %d bytes)"
 

-#: src/send_message.c:545
+#: src/send_message.c:555

 msgid "Sending message"
 msgstr "Enviant missatge"
 
 msgid "Sending message"
 msgstr "Enviant missatge"
 

-#: src/send_message.c:591 src/send_message.c:611
+#: src/send_message.c:613 src/send_message.c:633

 msgid "Error occurred while sending the message."
 msgstr "Hi ha hagut un error enviant el missatge."
 
 msgid "Error occurred while sending the message."
 msgstr "Hi ha hagut un error enviant el missatge."
 

-#: src/send_message.c:594
+#: src/send_message.c:616

 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"


@@ -9906,51 +10812,51 @@ msgstr "Font del missatge"
 msgid "%s - Source"
 msgstr "%s - Font"
 
 msgid "%s - Source"
 msgstr "%s - Font"
 

-#: src/ssl_manager.c:154
+#: src/ssl_manager.c:157

 msgid "Saved SSL Certificates"
 msgstr "Certificats SSL guardats"
 
 msgid "Saved SSL Certificates"
 msgstr "Certificats SSL guardats"
 

-#: src/ssl_manager.c:374
+#: src/ssl_manager.c:428

 msgid "Delete certificate"
 msgstr "Eliminar certificat"
 
 msgid "Delete certificate"
 msgstr "Eliminar certificat"
 

-#: src/ssl_manager.c:375
+#: src/ssl_manager.c:429

 msgid "Do you really want to delete this certificate?"
 msgstr "Voleu eliminar realment aquest certificat?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Voleu eliminar realment aquest certificat?"
 

-#: src/summary_search.c:175
+#: src/summary_search.c:230

 msgid "Search messages"
 msgstr "Buscar en els missatges"
 
 msgid "Search messages"
 msgstr "Buscar en els missatges"
 

-#: src/summary_search.c:197
+#: src/summary_search.c:252

 msgid "Match any of the following"
 msgstr "Coincidir amb algun dels següents"
 
 msgid "Match any of the following"
 msgstr "Coincidir amb algun dels següents"
 

-#: src/summary_search.c:198
+#: src/summary_search.c:253

 msgid "Match all of the following"
 msgstr "Coincidir amb tots els següents"
 
 msgid "Match all of the following"
 msgstr "Coincidir amb tots els següents"
 

-#: src/summary_search.c:257
+#: src/summary_search.c:352

 msgid "From:"
 msgstr "Des de:"
 
 msgid "From:"
 msgstr "Des de:"
 

-#: src/summary_search.c:278
+#: src/summary_search.c:373

 msgid "Body:"
 msgstr "Cos:"
 
 msgid "Body:"
 msgstr "Cos:"
 

-#: src/summary_search.c:285
+#: src/summary_search.c:380

 msgid "Condition:"
 msgstr "Condició:"
 
 msgid "Condition:"
 msgstr "Condició:"
 

-#: src/summary_search.c:315
+#: src/summary_search.c:410

 msgid "Find _all"
 msgstr "Trob_ar a tots"
 
 msgid "Find _all"
 msgstr "Trob_ar a tots"
 

-#: src/summary_search.c:513
+#: src/summary_search.c:645

 msgid "Beginning of list reached; continue from end?"
 msgstr "S'ha arribat al principi de la llista, seguir desde el final?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "S'ha arribat al principi de la llista, seguir desde el final?"
 

-#: src/summary_search.c:515
+#: src/summary_search.c:647

 msgid "End of list reached; continue from beginning?"
 msgstr "S'ha acabat la llista, continuar desde el principi?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "S'ha acabat la llista, continuar desde el principi?"
 


@@ -9974,11 +10880,11 @@ msgstr "/Respon_dre a/Al _remitent"
 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_dre a/A la _llista de correu"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_dre a/A la _llista de correu"
 

-#: src/summaryview.c:424 src/toolbar.c:234
+#: src/summaryview.c:424 src/toolbar.c:239

 msgid "/_Forward"
 msgstr "/Reen_viar"
 
 msgid "/_Forward"
 msgstr "/Reen_viar"
 

-#: src/summaryview.c:425 src/toolbar.c:235
+#: src/summaryview.c:425 src/toolbar.c:240

 msgid "/For_ward as attachment"
 msgstr "/Reen_viar com a adjunt"
 
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar com a adjunt"
 


@@ -10103,206 +11009,234 @@ msgid "/Create processing rule/by _Subject"
 msgstr "/Crear regla de processament/Amb l'_assumpte"
 
 #: src/summaryview.c:475
 msgstr "/Crear regla de processament/Amb l'_assumpte"
 
 #: src/summaryview.c:475

-msgid "/_View/_Source"
-msgstr "/_Veure/_Font"
+msgid "/_View/Message _source"
+msgstr "/_Veure/O_rigen del missatge"

 
 #: src/summaryview.c:476
 
 #: src/summaryview.c:476

-msgid "/_View/All _header"
-msgstr "/_Veure/Totes les capçaleres"
+msgid "/_View/All _headers"
+msgstr "/_Veure/_Totes les capçaleres"

 
 #: src/summaryview.c:479
 msgid "/_Print..."
 msgstr "/Im_primir..."
 
 
 #: src/summaryview.c:479
 msgid "/_Print..."
 msgstr "/Im_primir..."
 

-#: src/summaryview.c:555
+#: src/summaryview.c:585

 msgid "Toggle quick search bar"
 msgstr "Barra de búsqueda ràpida"
 
 msgid "Toggle quick search bar"
 msgstr "Barra de búsqueda ràpida"
 

-#: src/summaryview.c:893
+#: src/summaryview.c:963

 msgid "Process mark"
 msgstr "Processar marques"
 
 msgid "Process mark"
 msgstr "Processar marques"
 

-#: src/summaryview.c:894
+#: src/summaryview.c:964

 msgid "Some marks are left. Process them?"
 msgstr "Queden algunes marques. Processar-les?"
 
 msgid "Some marks are left. Process them?"
 msgstr "Queden algunes marques. Processar-les?"
 

-#: src/summaryview.c:949
+#: src/summaryview.c:1021

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisant carpeta (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisant carpeta (%s)..."
 

-#: src/summaryview.c:1411 src/summaryview.c:1463
+#: src/summaryview.c:1509 src/summaryview.c:1561

 msgid "No more unread messages"
 msgstr "No hi ha més missatges sense llegir"
 
 msgid "No more unread messages"
 msgstr "No hi ha més missatges sense llegir"
 

-#: src/summaryview.c:1412
+#: src/summaryview.c:1510

 msgid "No unread message found. Search from the end?"
 msgstr "Cap missatge sense llegir trobat. Buscar desde el final?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Cap missatge sense llegir trobat. Buscar desde el final?"
 

-#: src/summaryview.c:1424 src/summaryview.c:1476 src/summaryview.c:1523
-#: src/summaryview.c:1575 src/summaryview.c:1654
+#: src/summaryview.c:1522 src/summaryview.c:1574 src/summaryview.c:1621
+#: src/summaryview.c:1673 src/summaryview.c:1752

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Error intern: valor inesperat per prefs_common.next_unread_msg_dialog\n"
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Error intern: valor inesperat per prefs_common.next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1432
+#: src/summaryview.c:1530

 msgid "No unread messages."
 msgstr "No hi ha missatges sense llegir."
 
 msgid "No unread messages."
 msgstr "No hi ha missatges sense llegir."
 

-#: src/summaryview.c:1464
+#: src/summaryview.c:1562

 msgid "No unread message found. Go to next folder?"
 msgstr "No hi ha missatges sense llegir. Anar a la carpeta següent?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "No hi ha missatges sense llegir. Anar a la carpeta següent?"
 

-#: src/summaryview.c:1510 src/summaryview.c:1562
+#: src/summaryview.c:1608 src/summaryview.c:1660

 msgid "No more new messages"
 msgstr "No hi ha més missatges nous"
 
 msgid "No more new messages"
 msgstr "No hi ha més missatges nous"
 

-#: src/summaryview.c:1511
+#: src/summaryview.c:1609

 msgid "No new message found. Search from the end?"
 msgstr "No hi ha més missatges nous. Buscar desde el final?"
 
 msgid "No new message found. Search from the end?"
 msgstr "No hi ha més missatges nous. Buscar desde el final?"
 

-#: src/summaryview.c:1531
+#: src/summaryview.c:1629

 msgid "No new messages."
 msgstr "No hi ha missatges nous."
 
 msgid "No new messages."
 msgstr "No hi ha missatges nous."
 

-#: src/summaryview.c:1563
+#: src/summaryview.c:1661

 msgid "No new message found. Go to next folder?"
 msgstr "No hi ha més missatges nous. Anar a la cartea següent?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "No hi ha més missatges nous. Anar a la cartea següent?"
 

-#: src/summaryview.c:1600 src/summaryview.c:1641
+#: src/summaryview.c:1698 src/summaryview.c:1739

 msgid "No more marked messages"
 msgstr "No hi ha més missatges marcats"
 
 msgid "No more marked messages"
 msgstr "No hi ha més missatges marcats"
 

-#: src/summaryview.c:1601
+#: src/summaryview.c:1699

 msgid "No marked message found. Search from the end?"
 msgstr "Cap missatge marcat trobat. Buscar desde el final?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Cap missatge marcat trobat. Buscar desde el final?"
 

-#: src/summaryview.c:1610
+#: src/summaryview.c:1708

 msgid "No marked messages."
 msgstr "No hi ha missatges marcats."
 
 msgid "No marked messages."
 msgstr "No hi ha missatges marcats."
 

-#: src/summaryview.c:1642
+#: src/summaryview.c:1740

 msgid "No marked message found. Go to next folder?"
 msgstr "No s'han trobat missatges marcats. Anar a la carpeta següent?"
 
 msgid "No marked message found. Go to next folder?"
 msgstr "No s'han trobat missatges marcats. Anar a la carpeta següent?"
 

-#: src/summaryview.c:1679 src/summaryview.c:1704
+#: src/summaryview.c:1777 src/summaryview.c:1802

 msgid "No more labeled messages"
 msgstr "No hi ha més missatges etiquetats"
 
 msgid "No more labeled messages"
 msgstr "No hi ha més missatges etiquetats"
 

-#: src/summaryview.c:1680
+#: src/summaryview.c:1778

 msgid "No labeled message found. Search from the end?"
 msgstr "Cap missatge etiquetat trobat. Buscar desde el final?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Cap missatge etiquetat trobat. Buscar desde el final?"
 

-#: src/summaryview.c:1689 src/summaryview.c:1714
+#: src/summaryview.c:1787 src/summaryview.c:1812

 msgid "No labeled messages."
 msgstr "No hi ha missatges etiquetats."
 
 msgid "No labeled messages."
 msgstr "No hi ha missatges etiquetats."
 

-#: src/summaryview.c:1705
+#: src/summaryview.c:1803

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Cap missatge etiquetat trobat. Buscar desde el principi?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Cap missatge etiquetat trobat. Buscar desde el principi?"
 

-#: src/summaryview.c:1942
+#: src/summaryview.c:2094

 msgid "Attracting messages by subject..."
 msgstr "Agrupant missatges per l'assumpte..."
 
 msgid "Attracting messages by subject..."
 msgstr "Agrupant missatges per l'assumpte..."
 

-#: src/summaryview.c:2103
+#: src/summaryview.c:2252

 #, c-format
 msgid "%d deleted"
 msgstr "%d borrat(s)"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrat(s)"
 

-#: src/summaryview.c:2107
+#: src/summaryview.c:2256

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d moguts"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d moguts"
 

-#: src/summaryview.c:2108 src/summaryview.c:2115
+#: src/summaryview.c:2257 src/summaryview.c:2264

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:2113
+#: src/summaryview.c:2262

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiat"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiat"
 

-#: src/summaryview.c:2128
+#: src/summaryview.c:2277

 msgid " item selected"
 msgstr " element seleccionat"
 
 msgid " item selected"
 msgstr " element seleccionat"
 

-#: src/summaryview.c:2130
+#: src/summaryview.c:2279

 msgid " items selected"
 msgstr " elements seleccionats"
 
 msgid " items selected"
 msgstr " elements seleccionats"
 

-#: src/summaryview.c:2146
+#: src/summaryview.c:2295

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nou(s), %d no llegit(s), %d total(s) (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nou(s), %d no llegit(s), %d total(s) (%s)"
 

-#: src/summaryview.c:2349
+#: src/summaryview.c:2504

 msgid "Sorting summary..."
 msgstr "Ordenant el resum..."
 
 msgid "Sorting summary..."
 msgstr "Ordenant el resum..."
 

-#: src/summaryview.c:2438
+#: src/summaryview.c:2585

 msgid "Setting summary from message data..."
 msgstr "Establint el resum dels missatges..."
 
 msgid "Setting summary from message data..."
 msgstr "Establint el resum dels missatges..."
 

-#: src/summaryview.c:2612
+#: src/summaryview.c:2763

 msgid "(No Date)"
 msgstr "(Sense data)"
 
 msgid "(No Date)"
 msgstr "(Sense data)"
 

-#: src/summaryview.c:2650
+#: src/summaryview.c:2801

 msgid "(No Recipient)"
 msgstr "Cap recipient"
 
 msgid "(No Recipient)"
 msgstr "Cap recipient"
 

-#: src/summaryview.c:3436
+#: src/summaryview.c:3622

 msgid "You're not the author of the article.\n"
 msgstr "Vostè no es l'autor de l'article.\n"
 
 msgid "You're not the author of the article.\n"
 msgstr "Vostè no es l'autor de l'article.\n"
 

-#: src/summaryview.c:3520
+#: src/summaryview.c:3707

 msgid "Delete message(s)"
 msgstr "Esborrar missatge(s)"
 
 msgid "Delete message(s)"
 msgstr "Esborrar missatge(s)"
 

-#: src/summaryview.c:3521
+#: src/summaryview.c:3708

 msgid "Do you really want to delete selected message(s)?"
 msgstr "Voleu realment esborrar el(s) missatge(s) seleccionats?"
 
 msgid "Do you really want to delete selected message(s)?"
 msgstr "Voleu realment esborrar el(s) missatge(s) seleccionats?"
 

-#: src/summaryview.c:3669
+#: src/summaryview.c:3861

 msgid "Destination is same as current folder."
 msgstr "La destinació és la mateixa que la carpeta actual."
 
 msgid "Destination is same as current folder."
 msgstr "La destinació és la mateixa que la carpeta actual."
 

-#: src/summaryview.c:3758
+#: src/summaryview.c:3952

 msgid "Destination to copy is same as current folder."
 msgstr "La destinaciés de còpia és la carpeta actual."
 
 msgid "Destination to copy is same as current folder."
 msgstr "La destinaciés de còpia és la carpeta actual."
 

-#: src/summaryview.c:3878
+#: src/summaryview.c:4072

 msgid "Append or Overwrite"
 msgstr "Afegir o Sobreescriure"
 
 msgid "Append or Overwrite"
 msgstr "Afegir o Sobreescriure"
 

-#: src/summaryview.c:3879
+#: src/summaryview.c:4073

 msgid "Append or overwrite existing file?"
 msgstr "Afegir o sobreescriure l'arxiu existent?"
 
 msgid "Append or overwrite existing file?"
 msgstr "Afegir o sobreescriure l'arxiu existent?"
 

-#: src/summaryview.c:3880
+#: src/summaryview.c:4074

 msgid "_Append"
 msgstr "_Afegir"
 
 msgid "_Append"
 msgstr "_Afegir"
 

-#: src/summaryview.c:3880
+#: src/summaryview.c:4074

 msgid "_Overwrite"
 msgstr "_Sobreescriure"
 
 msgid "_Overwrite"
 msgstr "_Sobreescriure"
 

-#: src/summaryview.c:4257
+#: src/summaryview.c:4431

 msgid "Building threads..."
 msgstr "Construïnt jerarquia..."
 
 msgid "Building threads..."
 msgstr "Construïnt jerarquia..."
 

-#: src/summaryview.c:4462
+#: src/summaryview.c:4650
+msgid "Skip these rules"
+msgstr "Saltar-se aquestes regles"
+
+#: src/summaryview.c:4653
+msgid "Apply these rules regardless of the account they belong to"
+msgstr "Aplicar aquestes regles independentment del compte al que pertanyin"
+
+#: src/summaryview.c:4656
+msgid "Apply these rules if they apply to the current account"
+msgstr "Aplicar aquestes regles si s'apliquen al compte actual"
+
+#: src/summaryview.c:4685
+msgid "Filtering"
+msgstr "Filtrant"
+
+#: src/summaryview.c:4686
+msgid ""
+"There are some filtering rules that belong to an account.\n"
+"Please choose what to do with these rules:"
+msgstr ""
+"Hi ha algunes regles de filtrat que èrtanyen a un compte.\n"
+"Si us plau, escolliu que s'ha de fer amb aquestes regles:"
+
+#: src/summaryview.c:4688
+msgid "+_Filter"
+msgstr "+_Filtre"
+
+#: src/summaryview.c:4715

 msgid "Filtering..."
 msgstr "Filtrant..."
 
 msgid "Filtering..."
 msgstr "Filtrant..."
 

-#: src/summaryview.c:4532
+#: src/summaryview.c:4788

 msgid "Processing configuration"
 msgstr "Configuració de procesament"
 
 msgid "Processing configuration"
 msgstr "Configuració de procesament"
 

-#: src/summaryview.c:5958
+#: src/summaryview.c:6233

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -10311,27 +11245,37 @@ msgstr ""
 "Error en l'expressió regular (regexp):\n"
 "%s"
 
 "Error en l'expressió regular (regexp):\n"
 "%s"
 

-#: src/textview.c:232
+#: src/textview.c:222

 msgid "/Compose _new message"
 msgstr "/Composar un missatge _nou"
 
 msgid "/Compose _new message"
 msgstr "/Composar un missatge _nou"
 

-#: src/textview.c:233
+#: src/textview.c:223

 msgid "/Add to _address book"
 msgstr "Afegir a l'agenda"
 
 msgid "/Add to _address book"
 msgstr "Afegir a l'agenda"
 

-#: src/textview.c:234
+#: src/textview.c:224

 msgid "/Copy this add_ress"
 msgstr "Copiar aquesta ad_reça"
 
 msgid "/Copy this add_ress"
 msgstr "Copiar aquesta ad_reça"
 

-#: src/textview.c:239
+#: src/textview.c:229

 msgid "/_Open image"
 msgstr "/_Obrir imatge"
 
 msgid "/_Open image"
 msgstr "/_Obrir imatge"
 

-#: src/textview.c:240
+#: src/textview.c:230

 msgid "/_Save image..."
 msgstr "/_Guardar imatge..."
 
 msgid "/_Save image..."
 msgstr "/_Guardar imatge..."
 

-#: src/textview.c:790
+#: src/textview.c:639
+#, c-format
+msgid "[%s  %s (%d bytes)]"
+msgstr "[%s  %s (%d bytes)]"
+
+#: src/textview.c:642
+#, c-format
+msgid "[%s (%d bytes)]"
+msgstr "[%s (%d bytes)]"
+
+#: src/textview.c:812

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -10345,79 +11289,79 @@ msgstr ""
 "\n"
 "  Useu "
 
 "\n"
 "  Useu "
 

-#: src/textview.c:795
+#: src/textview.c:817

 msgid "'View Log'"
 msgstr "'Veure Traça'"
 
 msgid "'View Log'"
 msgstr "'Veure Traça'"
 

-#: src/textview.c:796
+#: src/textview.c:818

 msgid " in the Tools menu for more information."
 msgstr " al menú Eines per més informació"
 
 msgid " in the Tools menu for more information."
 msgstr " al menú Eines per més informació"
 

-#: src/textview.c:817
+#: src/textview.c:839

 msgid "  The following can be performed on this part by\n"
 msgstr "  El següent serà fet en aquesta part per \n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  El següent serà fet en aquesta part per \n"
 

-#: src/textview.c:818
+#: src/textview.c:840

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  clica amb el botó dret la icona o la llista d'elements:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  clica amb el botó dret la icona o la llista d'elements:\n"
 

-#: src/textview.c:820
+#: src/textview.c:842

 msgid "     - To save, select "
 msgstr "     - Per guardar, seleccioneu "
 
 msgid "     - To save, select "
 msgstr "     - Per guardar, seleccioneu "
 

-#: src/textview.c:821
+#: src/textview.c:843

 msgid "'Save as...'"
 msgstr "'Guardar com...'"
 
 msgid "'Save as...'"
 msgstr "'Guardar com...'"
 

-#: src/textview.c:822
+#: src/textview.c:844

 msgid " (Shortcut key: 'y')\n"
 msgstr "(Drecera: 'y')\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr "(Drecera: 'y')\n"
 

-#: src/textview.c:823
+#: src/textview.c:845

 msgid "     - To display as text, select "
 msgstr "     - Per mostrar com a text seleccioneu "
 
 msgid "     - To display as text, select "
 msgstr "     - Per mostrar com a text seleccioneu "
 

-#: src/textview.c:824
+#: src/textview.c:846

 msgid "'Display as text'"
 msgstr "'Mostrar com a text'"
 
 msgid "'Display as text'"
 msgstr "'Mostrar com a text'"
 

-#: src/textview.c:825
+#: src/textview.c:847

 msgid " (Shortcut key: 't')\n"
 msgstr " (Drecera: 't')\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (Drecera: 't')\n"
 

-#: src/textview.c:826
+#: src/textview.c:848

 msgid "     - To open with an external program, select "
 msgstr "     - Per obrir amb un programa extern seleccioneu "
 
 msgid "     - To open with an external program, select "
 msgstr "     - Per obrir amb un programa extern seleccioneu "
 

-#: src/textview.c:827
+#: src/textview.c:849

 msgid "'Open'"
 msgstr "'Obrir'"
 
 msgid "'Open'"
 msgstr "'Obrir'"
 

-#: src/textview.c:828
+#: src/textview.c:850

 msgid " (Shortcut key: 'l')\n"
 msgstr "(Drecera: 'l')\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr "(Drecera: 'l')\n"
 

-#: src/textview.c:829
+#: src/textview.c:851

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativament doble-click, click amb el botó "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativament doble-click, click amb el botó "
 

-#: src/textview.c:830
+#: src/textview.c:852

 msgid "mouse button)\n"
 msgstr "central del ratolí)\n"
 
 msgid "mouse button)\n"
 msgstr "central del ratolí)\n"
 

-#: src/textview.c:831
+#: src/textview.c:853

 msgid "     - Or use "
 msgstr "     - O useu "
 
 msgid "     - Or use "
 msgstr "     - O useu "
 

-#: src/textview.c:832
+#: src/textview.c:854

 msgid "'Open with...'"
 msgstr "'Obrir amb...'"
 
 msgid "'Open with...'"
 msgstr "'Obrir amb...'"
 

-#: src/textview.c:833
+#: src/textview.c:855

 msgid " (Shortcut key: 'o')\n"
 msgstr "(Drecera: 'o')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr "(Drecera: 'o')\n"
 

-#: src/textview.c:922
+#: src/textview.c:944

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -10428,7 +11372,8 @@ msgstr ""
 "    %s\n"
 "Codi de retorn %d\n"
 
 "    %s\n"
 "Codi de retorn %d\n"
 

-#: src/textview.c:2213
+#: src/textview.c:2492
+#, c-format

 msgid ""
 "The real URL is different from the displayed URL.\n"
 "\n"
 msgid ""
 "The real URL is different from the displayed URL.\n"
 "\n"


@@ -10446,239 +11391,252 @@ msgstr ""
 "\n"
 "Obrir-la de totes maneres?"
 
 "\n"
 "Obrir-la de totes maneres?"
 

-#: src/textview.c:2222
+#: src/textview.c:2501

 msgid "Phishing attempt warning"
 msgstr "Avís d'intent de phishing"
 
 msgid "Phishing attempt warning"
 msgstr "Avís d'intent de phishing"
 

-#: src/textview.c:2223
+#: src/textview.c:2502

 msgid "_Open URL"
 msgstr "_Obrir URL"
 
 msgid "_Open URL"
 msgstr "_Obrir URL"
 

-#: src/toolbar.c:162 src/toolbar.c:1489
+#: src/toolbar.c:166 src/toolbar.c:1535

 msgid "Receive Mail on all Accounts"
 msgstr "Rebre correu de tots els comptes"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Rebre correu de tots els comptes"
 

-#: src/toolbar.c:163 src/toolbar.c:1503
+#: src/toolbar.c:167 src/toolbar.c:1549

 msgid "Receive Mail on current Account"
 msgstr "Rebre correu del compte actual"
 
 msgid "Receive Mail on current Account"
 msgstr "Rebre correu del compte actual"
 

-#: src/toolbar.c:164 src/toolbar.c:1509
+#: src/toolbar.c:168 src/toolbar.c:1555

 msgid "Send Queued Messages"
 msgstr "Enviar missatge(s) encuat(s)"
 
 msgid "Send Queued Messages"
 msgstr "Enviar missatge(s) encuat(s)"
 

-#: src/toolbar.c:165 src/toolbar.c:1522
+#: src/toolbar.c:169 src/toolbar.c:1568

 msgid "Compose Email"
 msgstr "Composar correu"
 
 msgid "Compose Email"
 msgstr "Composar correu"
 

-#: src/toolbar.c:166 src/toolbar.c:1526
+#: src/toolbar.c:170 src/toolbar.c:1572

 msgid "Compose News"
 msgstr "Composar notícia"
 
 msgid "Compose News"
 msgstr "Composar notícia"
 

-#: src/toolbar.c:167 src/toolbar.c:1557 src/toolbar.c:1567
+#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624

 msgid "Reply to Message"
 msgstr "Respondre al missatge"
 
 msgid "Reply to Message"
 msgstr "Respondre al missatge"
 

-#: src/toolbar.c:168 src/toolbar.c:1574 src/toolbar.c:1584
+#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641

 msgid "Reply to Sender"
 msgstr "Respondre al remitent"
 
 msgid "Reply to Sender"
 msgstr "Respondre al remitent"
 

-#: src/toolbar.c:169 src/toolbar.c:1591 src/toolbar.c:1601
+#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658

 msgid "Reply to All"
 msgstr "Respondre a tots"
 
 msgid "Reply to All"
 msgstr "Respondre a tots"
 

-#: src/toolbar.c:170 src/toolbar.c:1608 src/toolbar.c:1618
+#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675

 msgid "Reply to Mailing-list"
 msgstr "Respondre a la lista de correu"
 
 msgid "Reply to Mailing-list"
 msgstr "Respondre a la lista de correu"
 

-#: src/toolbar.c:171 src/toolbar.c:1625 src/toolbar.c:1635
+#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692

 msgid "Forward Message"
 msgstr "Reenviar missatge"
 
 msgid "Forward Message"
 msgstr "Reenviar missatge"
 

-#: src/toolbar.c:172 src/toolbar.c:1642
+#: src/toolbar.c:176 src/toolbar.c:1699

 msgid "Trash Message"
 msgstr "Missatge de la paperera"
 
 msgid "Trash Message"
 msgstr "Missatge de la paperera"
 

-#: src/toolbar.c:173 src/toolbar.c:1648
+#: src/toolbar.c:177 src/toolbar.c:1705

 msgid "Delete Message"
 msgstr "Esborrar missatge"
 
 msgid "Delete Message"
 msgstr "Esborrar missatge"
 

-#: src/toolbar.c:175 src/toolbar.c:1660
+#: src/toolbar.c:179 src/toolbar.c:1717

 msgid "Go to Previous Unread Message"
 msgstr "Anar a l'anterior Sense Llegir"
 
 msgid "Go to Previous Unread Message"
 msgstr "Anar a l'anterior Sense Llegir"
 

-#: src/toolbar.c:176 src/toolbar.c:1667
+#: src/toolbar.c:180 src/toolbar.c:1724

 msgid "Go to Next Unread Message"
 msgstr "Anar al Missatge Següent"
 
 msgid "Go to Next Unread Message"
 msgstr "Anar al Missatge Següent"
 

-#: src/toolbar.c:179
+#: src/toolbar.c:183

 msgid "Learn Spam or Ham"
 msgstr "Aprendre correu brossa o bò"
 
 msgid "Learn Spam or Ham"
 msgstr "Aprendre correu brossa o bò"
 

-#: src/toolbar.c:181 src/toolbar.c:1676
+#: src/toolbar.c:185 src/toolbar.c:1733

 msgid "Send Message"
 msgstr "Enviar missatge"
 
 msgid "Send Message"
 msgstr "Enviar missatge"
 

-#: src/toolbar.c:182 src/toolbar.c:1682
+#: src/toolbar.c:186 src/toolbar.c:1739

 msgid "Put into queue folder and send later"
 msgstr "Posar a la cua i enviar després"
 
 msgid "Put into queue folder and send later"
 msgstr "Posar a la cua i enviar després"
 

-#: src/toolbar.c:183 src/toolbar.c:1688
+#: src/toolbar.c:187 src/toolbar.c:1745

 msgid "Save to draft folder"
 msgstr "Guardar com a esborrany"
 
 msgid "Save to draft folder"
 msgstr "Guardar com a esborrany"
 

-#: src/toolbar.c:184 src/toolbar.c:1694
+#: src/toolbar.c:188 src/toolbar.c:1751

 msgid "Insert file"
 msgstr "Insertar arxiu"
 
 msgid "Insert file"
 msgstr "Insertar arxiu"
 

-#: src/toolbar.c:185 src/toolbar.c:1700
+#: src/toolbar.c:189 src/toolbar.c:1757

 msgid "Attach file"
 msgstr "Adjuntar arxiu"
 
 msgid "Attach file"
 msgstr "Adjuntar arxiu"
 

-#: src/toolbar.c:186 src/toolbar.c:1706
+#: src/toolbar.c:190 src/toolbar.c:1763

 msgid "Insert signature"
 msgstr "Insertar signatura"
 
 msgid "Insert signature"
 msgstr "Insertar signatura"
 

-#: src/toolbar.c:187 src/toolbar.c:1712
+#: src/toolbar.c:191 src/toolbar.c:1769

 msgid "Edit with external editor"
 msgstr "Editar amb un editor extern"
 
 msgid "Edit with external editor"
 msgstr "Editar amb un editor extern"
 

-#: src/toolbar.c:188 src/toolbar.c:1718
+#: src/toolbar.c:192 src/toolbar.c:1775

 msgid "Wrap long lines of current paragraph"
 msgstr "Tallar línies llargues del paràgraf actual"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Tallar línies llargues del paràgraf actual"
 

-#: src/toolbar.c:189 src/toolbar.c:1724
+#: src/toolbar.c:193 src/toolbar.c:1781

 msgid "Wrap all long lines"
 msgstr "Tallar totes les línies llargues"
 
 msgid "Wrap all long lines"
 msgstr "Tallar totes les línies llargues"
 

-#: src/toolbar.c:192 src/toolbar.c:1737
+#: src/toolbar.c:196 src/toolbar.c:1794

 msgid "Check spelling"
 msgstr "Verificar ortografia"
 
 msgid "Check spelling"
 msgstr "Verificar ortografia"
 

-#: src/toolbar.c:194
-msgid "Sylpheed-Claws Actions Feature"
-msgstr "Característica Accions de Sylpheed-Claws"
+#: src/toolbar.c:198
+msgid "Claws Mail Actions Feature"
+msgstr "Característica Accions de Claws Mail"
+
+#: src/toolbar.c:199 src/toolbar.c:1817
+msgid "Cancel receiving"
+msgstr "Cancel·lar la recepció"

 
 

-#: src/toolbar.c:214
+#: src/toolbar.c:219

 msgid "/Reply with _quote"
 msgstr "/Respondre amb _citació"
 
 msgid "/Reply with _quote"
 msgstr "/Respondre amb _citació"
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/_Reply without quote"
 msgstr "/_Respondre sense citació"
 
 msgid "/_Reply without quote"
 msgstr "/_Respondre sense citació"
 

-#: src/toolbar.c:219
+#: src/toolbar.c:224

 msgid "/Reply to all with _quote"
 msgstr "/Respondre a _tots amb citació"
 
 msgid "/Reply to all with _quote"
 msgstr "/Respondre a _tots amb citació"
 

-#: src/toolbar.c:220
+#: src/toolbar.c:225

 msgid "/_Reply to all without quote"
 msgstr "/Respondre a t_ots sense citació"
 
 msgid "/_Reply to all without quote"
 msgstr "/Respondre a t_ots sense citació"
 

-#: src/toolbar.c:224
+#: src/toolbar.c:229

 msgid "/Reply to list with _quote"
 msgstr "/Respondre a la _llista amb citació"
 
 msgid "/Reply to list with _quote"
 msgstr "/Respondre a la _llista amb citació"
 

-#: src/toolbar.c:225
+#: src/toolbar.c:230

 msgid "/_Reply to list without quote"
 msgstr "/Respondre a la l_lista sense citació"
 
 msgid "/_Reply to list without quote"
 msgstr "/Respondre a la l_lista sense citació"
 

-#: src/toolbar.c:229
+#: src/toolbar.c:234

 msgid "/Reply to sender with _quote"
 msgstr "/Respondre al remitent amb _citació"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Respondre al remitent amb _citació"
 

-#: src/toolbar.c:230
+#: src/toolbar.c:235

 msgid "/_Reply to sender without quote"
 msgstr "/_Respondre al remitent sense citació"
 
 msgid "/_Reply to sender without quote"
 msgstr "/_Respondre al remitent sense citació"
 

-#: src/toolbar.c:236
+#: src/toolbar.c:241

 msgid "/Redirec_t"
 msgstr "/Redirigi_r"
 
 msgid "/Redirec_t"
 msgstr "/Redirigi_r"
 

-#: src/toolbar.c:389
+#: src/toolbar.c:245
+msgid "/Learn as _Spam"
+msgstr "/Aprendre com a correu bro_ssa"
+
+#: src/toolbar.c:246
+msgid "/Learn as _Ham"
+msgstr "/Aprendre com a correu _Bò"
+
+#: src/toolbar.c:399

 msgid "Get Mail"
 msgstr "Rebre Mail"
 
 msgid "Get Mail"
 msgstr "Rebre Mail"
 

-#: src/toolbar.c:394 src/toolbar.c:485
+#: src/toolbar.c:403
+msgid "Toolbar|Compose"
+msgstr "Barra|Composar"
+
+#: src/toolbar.c:405 src/toolbar.c:496

 msgid "Reply"
 msgstr "Respondre"
 
 msgid "Reply"
 msgstr "Respondre"
 

-#: src/toolbar.c:395 src/toolbar.c:486
+#: src/toolbar.c:406 src/toolbar.c:497

 msgid "All"
 msgstr "Tot"
 
 msgid "All"
 msgstr "Tot"
 

-#: src/toolbar.c:396 src/toolbar.c:487
+#: src/toolbar.c:407 src/toolbar.c:498

 msgid "Sender"
 msgstr "Remitent"
 
 msgid "Sender"
 msgstr "Remitent"
 

-#: src/toolbar.c:401 src/toolbar.c:492
+#: src/toolbar.c:412 src/toolbar.c:503

 msgid "Spam"
 msgstr "spam"
 
 msgid "Spam"
 msgstr "spam"
 

-#: src/toolbar.c:404 src/toolbar.c:494
+#: src/toolbar.c:415 src/toolbar.c:505

 msgid "Next"
 msgstr "Següent"
 
 msgid "Next"
 msgstr "Següent"
 

-#: src/toolbar.c:442
+#: src/toolbar.c:453

 msgid "Send later"
 msgstr "Enviar després"
 
 msgid "Send later"
 msgstr "Enviar després"
 

-#: src/toolbar.c:443
+#: src/toolbar.c:454

 msgid "Draft"
 msgstr "Esborrany"
 
 msgid "Draft"
 msgstr "Esborrany"
 

-#: src/toolbar.c:445
-msgid "Insert"
-msgstr "Insertar"
-
-#: src/toolbar.c:446
-msgid "Attach"
-msgstr "Adjuntar"
-
-#: src/toolbar.c:1496
+#: src/toolbar.c:1542

 msgid "Receive Mail on selected Account"
 msgstr "Rebre Correu des Comptes seleccionats"
 
 msgid "Receive Mail on selected Account"
 msgstr "Rebre Correu des Comptes seleccionats"
 

-#: src/toolbar.c:1533
+#: src/toolbar.c:1579

 msgid "Compose with selected Account"
 msgstr "Composar amb el compte seleccionat"
 
 msgid "Compose with selected Account"
 msgstr "Composar amb el compte seleccionat"
 

-#: src/toolbar.c:1539
+#: src/toolbar.c:1585

 msgid "Ham"
 msgstr "Bò"
 
 msgid "Ham"
 msgstr "Bò"
 

-#: src/toolbar.c:1547
+#: src/toolbar.c:1593

 msgid "Learn Spam"
 msgstr "Aprendre com a correu Spam"
 
 msgid "Learn Spam"
 msgstr "Aprendre com a correu Spam"
 

-#: src/toolbar.c:1551
+#: src/toolbar.c:1597

 msgid "Learn Ham"
 msgstr "Aprendre com a correu Bò"
 
 msgid "Learn Ham"
 msgstr "Aprendre com a correu Bò"
 

-#: src/wizard.c:459
-msgid "Welcome to Sylpheed-Claws "
-msgstr "Benvinguts a Sylpheed-Claws "
+#: src/toolbar.c:1607
+msgid "Learn as..."
+msgstr "Aprendre com a..."

 
 

-#: src/wizard.c:469
-msgid "Sylpheed-Claws Team"
-msgstr "L'equip de Sylpheed-Claws"
+#: src/wizard.c:461
+msgid "Welcome Mail Subject|Welcome to Claws Mail"
+msgstr "Títol de correu de benvinguda|Benvingut a Claws Mail"

 
 

-#: src/wizard.c:475
-#, c-format
+#: src/wizard.c:484

 msgid ""
 "\n"
 msgid ""
 "\n"

-"Welcome to Sylpheed-Claws\n"
-"-------------------------\n"
+"Welcome to Claws Mail\n"
+"---------------------\n"

 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"
 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"

+"Claws Mail has lots of extra features accessible via plugins,\n"
+"like anti-spam filtering and learning (via the Bogofilter or\n"
+"SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
+"aggregator, a calendar, and much more. You can load them from\n"
+"the menu entry '/Configuration/Plugins'.\n"
+"\n"

 "You can change your Account Preferences by using the menu\n"
 "entry '/Configuration/Preferences for current account'\n"
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"
 "You can change your Account Preferences by using the menu\n"
 "entry '/Configuration/Preferences for current account'\n"
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"

-"You can find further information in the Sylpheed-Claws manual,\n"
+"You can find further information in the Claws Mail manual,\n"

 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"
 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"


@@ -10692,7 +11650,7 @@ msgid ""
 "\n"
 "LICENSE\n"
 "-------\n"
 "\n"
 "LICENSE\n"
 "-------\n"

-"Sylpheed-Claws is free software, released under the terms\n"
+"Claws Mail is free software, released under the terms\n"

 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"


@@ -10700,12 +11658,12 @@ msgid ""
 "\n"
 "DONATIONS\n"
 "---------\n"
 "\n"
 "DONATIONS\n"
 "---------\n"

-"If you wish to donate to the Sylpheed-Claws project you can do\n"
+"If you wish to donate to the Claws Mail project you can do\n"

 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"
 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"

-"Benvinguts a Sylpheed-Claws\n"
+"Benvinguts a Claws Mail\n"

 "---------------------------\n"
 "\n"
 "Ara que ja s'ha configurat el seu compte de correu i pot baixar el seu\n"
 "---------------------------\n"
 "\n"
 "Ara que ja s'ha configurat el seu compte de correu i pot baixar el seu\n"


@@ -10717,7 +11675,7 @@ msgstr ""
 "preferencies generals usant\n"
 "'/Configuració/Preferències'.\n"
 "\n"
 "preferencies generals usant\n"
 "'/Configuració/Preferències'.\n"
 "\n"

-"Podeu obtenir més informació en el manual de Sylpheed-Claws,\n"
+"Podeu obtenir més informació en el manual de Claws Mail,\n"

 "el qual és accessible mitjançant l'entrada de menú '/Ajuda/Manual'\n"
 "o de manera on-line a l'adreça donada aquí sota.\n"
 "\n"
 "el qual és accessible mitjançant l'entrada de menú '/Ajuda/Manual'\n"
 "o de manera on-line a l'adreça donada aquí sota.\n"
 "\n"


@@ -10731,7 +11689,7 @@ msgstr ""
 "\n"
 "LLICÈNCIA\n"
 "-------\n"
 "\n"
 "LLICÈNCIA\n"
 "-------\n"

-"Sylpheed-Claws is software lliure, alliberat sota les condicions\n"
+"Claws Mail is software lliure, alliberat sota les condicions\n"

 "de la Llicència Pblica General de GNU, versió 2 o posterior, \n"
 "publicada per la Fundació de Software Lliure (Free Software Foundation), 51 "
 "Franklin Street,\n"
 "de la Llicència Pblica General de GNU, versió 2 o posterior, \n"
 "publicada per la Fundació de Software Lliure (Free Software Foundation), 51 "
 "Franklin Street,\n"


@@ -10740,61 +11698,76 @@ msgstr ""
 "\n"
 "DONACIONS\n"
 "---------\n"
 "\n"
 "DONACIONS\n"
 "---------\n"

-"Si vol fer donacions al projecte Sylpheed-Claws ho pot fer\n"
+"Si vol fer donacions al projecte Claws Mail ho pot fer\n"

 "a <%s>.\n"
 "\n"
 
 "a <%s>.\n"
 "\n"
 

-#: src/wizard.c:545
+#: src/wizard.c:564

 msgid "Please enter the mailbox name."
 msgstr "Ompliu el nom de la bústia."
 
 msgid "Please enter the mailbox name."
 msgstr "Ompliu el nom de la bústia."
 

-#: src/wizard.c:573
+#: src/wizard.c:592

 msgid "Please enter your name and email address."
 msgstr "Seleccioneu el vostre nom i adreça de correu"
 
 msgid "Please enter your name and email address."
 msgstr "Seleccioneu el vostre nom i adreça de correu"
 

-#: src/wizard.c:584
+#: src/wizard.c:603

 msgid "Please enter your receiving server and username."
 msgstr ""
 "Si us plau, introdugueu el vostre servidor de recepció i el vostre nom "
 "d'usuari."
 
 msgid "Please enter your receiving server and username."
 msgstr ""
 "Si us plau, introdugueu el vostre servidor de recepció i el vostre nom "
 "d'usuari."
 

-#: src/wizard.c:594
+#: src/wizard.c:613

 msgid "Please enter your username."
 msgstr "Si us plau introdugueu el vostre nom d'usuari."
 
 msgid "Please enter your username."
 msgstr "Si us plau introdugueu el vostre nom d'usuari."
 

-#: src/wizard.c:604
+#: src/wizard.c:623

 msgid "Please enter your SMTP server."
 msgstr "Ompliu el vostre servidor SMTP"
 
 msgid "Please enter your SMTP server."
 msgstr "Ompliu el vostre servidor SMTP"
 

-#: src/wizard.c:615
+#: src/wizard.c:634

 msgid "Please enter your SMTP username."
 msgstr "Si us plau introdugueu el vostre nom d'usuari de SMTP."
 
 msgid "Please enter your SMTP username."
 msgstr "Si us plau introdugueu el vostre nom d'usuari de SMTP."
 

-#: src/wizard.c:823
+#: src/wizard.c:881

 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">El vostre nom:</span>"
 
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">El vostre nom:</span>"
 

-#: src/wizard.c:828
+#: src/wizard.c:886

 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">La vostra adreça de correu:</span>"
 
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">La vostra adreça de correu:</span>"
 

-#: src/wizard.c:832
+#: src/wizard.c:890

 msgid "Your organization:"
 msgstr "Organització: "
 
 msgid "Your organization:"
 msgstr "Organització: "
 

-#: src/wizard.c:852
+#: src/wizard.c:913
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr ""
+"Podeu especificar una ruta absoluta, per exemple: \"/home/joan/Documents/"
+"Correu\""
+
+#: src/wizard.c:917

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nom de la bústia:</span>"
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nom de la bústia:</span>"
 

-#: src/wizard.c:882
+#: src/wizard.c:954
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr ""
+"Podeu especificar el port afegint-lo al final: \"correu.exemple.com:25\""
+
+#: src/wizard.c:958

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adreça del servidor SMTP:</span>"
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adreça del servidor SMTP:</span>"
 

-#: src/wizard.c:885
+#: src/wizard.c:961

 msgid "Use authentication"
 msgstr "Useu autentificació"
 
 msgid "Use authentication"
 msgstr "Useu autentificació"
 

-#: src/wizard.c:899
+#: src/wizard.c:975

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -10802,7 +11775,7 @@ msgstr ""
 "Nom d'usuari SMTP:\n"
 "<span size=\"small\">(buit per usar el mateix que a la recepció)</span>"
 
 "Nom d'usuari SMTP:\n"
 "<span size=\"small\">(buit per usar el mateix que a la recepció)</span>"
 

-#: src/wizard.c:912
+#: src/wizard.c:988

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -10810,103 +11783,219 @@ msgstr ""
 "Contrassenya SMTP:\n"
 "<span size=\"small\">(buit per usar el mateix que a la recepció)</span>"
 
 "Contrassenya SMTP:\n"
 "<span size=\"small\">(buit per usar el mateix que a la recepció)</span>"
 

-#: src/wizard.c:939 src/wizard.c:951 src/wizard.c:1035
+#: src/wizard.c:1000
+msgid "Use SSL to connect to SMTP server"
+msgstr "Useu SSL per connectar-vos al servidor SMTP"
+
+#: src/wizard.c:1007 src/wizard.c:1230
+msgid "Use SSL via STARTTLS"
+msgstr "Useu SSL via STARTTLS"
+
+#: src/wizard.c:1037 src/wizard.c:1056 src/wizard.c:1165

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Adreça del servidor:</span>"
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Adreça del servidor:</span>"
 

-#: src/wizard.c:956
+#: src/wizard.c:1076

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Bústia local:</span>"
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Bústia local:</span>"
 

-#: src/wizard.c:996
+#: src/wizard.c:1127

 msgid "IMAP"
 msgstr "IMAP"
 
 msgid "IMAP"
 msgstr "IMAP"
 

-#: src/wizard.c:1027
+#: src/wizard.c:1152

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Tipus de servidor:</span>"
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Tipus de servidor:</span>"
 

-#: src/wizard.c:1046
+#: src/wizard.c:1161
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr ""
+"Podeu especificar el port afegint-lo al final: \"correu.exemple.com:110\""
+
+#: src/wizard.c:1176

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Nom d'usuari:</span>"
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Nom d'usuari:</span>"
 

-#: src/wizard.c:1062
+#: src/wizard.c:1192

 msgid "Password:"
 msgstr "Contrasenya:"
 
 msgid "Password:"
 msgstr "Contrasenya:"
 

-#: src/wizard.c:1074
+#: src/wizard.c:1204

 msgid "IMAP server directory:"
 msgstr "Directori del servidor IMAP:"
 
 msgid "IMAP server directory:"
 msgstr "Directori del servidor IMAP:"
 

-#: src/wizard.c:1098
-msgid "Use SSL to connect to SMTP server"
-msgstr "Useu SSL per connectar-vos al servidor SMTP"
-
-#: src/wizard.c:1105
+#: src/wizard.c:1223

 msgid "Use SSL to connect to receiving server"
 msgstr "Useu SSL per connectar-vos al servidor de rebuda"
 
 msgid "Use SSL to connect to receiving server"
 msgstr "Useu SSL per connectar-vos al servidor de rebuda"
 

-#: src/wizard.c:1221
-msgid "Sylpheed-Claws Setup Wizard"
-msgstr "L'equip de Sylpheed-Claws"
+#: src/wizard.c:1347
+msgid "Claws Mail Setup Wizard"
+msgstr "Assistent de configuració de Claws Mail"

 
 

-#: src/wizard.c:1253
-msgid "Welcome to Sylpheed-Claws"
-msgstr "Benvingut a Sylpheed-Claws"
+#: src/wizard.c:1379
+msgid "Welcome to Claws Mail"
+msgstr "Benvinguts a Claws Mail"

 
 

-#: src/wizard.c:1261
+#: src/wizard.c:1387

 msgid ""
 msgid ""

-"Welcome to the Sylpheed-Claws setup wizard.\n"
+"Welcome to the Claws Mail setup wizard.\n"

 "\n"
 "We will begin by defining some basic information about you and your most "
 "\n"
 "We will begin by defining some basic information about you and your most "

-"common mail options so that you can start to use Sylpheed-Claws in less than "
+"common mail options so that you can start to use Claws Mail in less than "

 "five minutes."
 msgstr ""
 "five minutes."
 msgstr ""

-"Benvingut a l'assistent de configuració de Sylpheed-Claws.\n"
+"Benvingut a l'assistent de configuració de Claws Mail.\n"

 "\n"
 "Anem a definir alguna informació bàsica sobre vostè i els paràmetres més "
 "\n"
 "Anem a definir alguna informació bàsica sobre vostè i els paràmetres més "

-"comuns del seu correu  perque vostè pugui usar Sylpheed-Claws en menys de "
+"comuns del seu correu  perque vostè pugui usar Claws Mail en menys de "

 "cinc minuts."
 
 "cinc minuts."
 

-#: src/wizard.c:1274
+#: src/wizard.c:1400

 msgid "About You"
 msgstr "Sobre Tu"
 
 msgid "About You"
 msgstr "Sobre Tu"
 

-#: src/wizard.c:1276 src/wizard.c:1285 src/wizard.c:1294 src/wizard.c:1304
-#: src/wizard.c:1314
+#: src/wizard.c:1402 src/wizard.c:1411 src/wizard.c:1420 src/wizard.c:1430

 msgid "Bold fields must be completed"
 msgstr "Camps en negreta s'han d'omplir"
 
 msgid "Bold fields must be completed"
 msgstr "Camps en negreta s'han d'omplir"
 

-#: src/wizard.c:1283
+#: src/wizard.c:1409

 msgid "Receiving mail"
 msgstr "Rebent correu"
 
 msgid "Receiving mail"
 msgstr "Rebent correu"
 

-#: src/wizard.c:1292
+#: src/wizard.c:1418

 msgid "Sending mail"
 msgstr "Enviant correu"
 
 msgid "Sending mail"
 msgstr "Enviant correu"
 

-#: src/wizard.c:1302
+#: src/wizard.c:1428

 msgid "Saving mail on disk"
 msgstr "Gravant el correu al disc"
 
 msgid "Saving mail on disk"
 msgstr "Gravant el correu al disc"
 

-#: src/wizard.c:1312
-msgid "Security"
-msgstr "Seguretat"
-
-#: src/wizard.c:1322
+#: src/wizard.c:1438

 msgid "Configuration finished"
 msgstr "Configuració finalitzada"
 
 msgid "Configuration finished"
 msgstr "Configuració finalitzada"
 

-#: src/wizard.c:1330
+#: src/wizard.c:1446

 msgid ""
 msgid ""

-"Sylpheed-Claws is now ready.\n"
+"Claws Mail is now ready.\n"

 "\n"
 "Click Save to start."
 msgstr ""
 "\n"
 "Click Save to start."
 msgstr ""

-"Sylpheed-Claws ja està preparat.\n"
+"Claws Mail ja està preparat.\n"

 "\n"
 "Cliqueu Gravar per començar."
 
 "\n"
 "Cliqueu Gravar per començar."
 

+#~ msgid ""
+#~ "New messages will be checked in this order. Check the boxes\n"
+#~ "on the 'G' column to enable message retrieval by 'Get Mail'."
+#~ msgstr ""
+#~ "Els nous missatges seran comprovats en aquest ordre. Valida les bústies\n"
+#~ "a la columna 'G' per activar la recollida de missatges amb 'Rebre tots'."
+
+#~ msgid "/---"
+#~ msgstr "/---"
+
+#~ msgid "%.1fKB"
+#~ msgstr "%.1fKB"
+
+#~ msgid "Message Bcc format error."
+#~ msgstr "Error de format a 'Copia oculta a'."
+
+#~ msgid "/------trashsep"
+#~ msgstr "/-----trashsep"
+
+#~ msgid "/------queuesep"
+#~ msgstr "/-----queuesep"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "The Sylpheed-Claws Team\n"
+#~ msgstr "L'equip de Sylpheed-Claws\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Icons\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Icones\n"
+
+#~ msgid "1.0.5 or previous"
+#~ msgstr "1.0.5 o prèvia"
+
+#~ msgid "1.9.15 or previous"
+#~ msgstr "1.9.15 o prèvia"
+
+#~ msgid "/_View/Show all headers"
+#~ msgstr "/_Veure/Mostrar totes les ca_pçaleres"
+
+#~ msgid "Please select key for '%s'"
+#~ msgstr "Seleccioneu clau per '%s'"
+
+#~ msgid " Edit... "
+#~ msgstr " Editar... "
+
+#~ msgid "Unsupported (%s)"
+#~ msgstr "No soportat (%s)"
+
+#~ msgid "Ask whether to insert or attach"
+#~ msgstr "Pregunteu si voleu insertar o adjuntar"
+
+#~ msgid "Always insert"
+#~ msgstr "Insertar sempre"
+
+#~ msgid "Always attach"
+#~ msgstr "Adjuntar sempre"
+
+#~ msgid "Audio player"
+#~ msgstr "Reproductor de so"
+
+#~ msgid "Condition: "
+#~ msgstr "Condició: "
+
+#~ msgid "Action: "
+#~ msgstr "Acció: "
+
+#~ msgid " Info... "
+#~ msgstr "Informació... "
+
+#~ msgid "Pick color for 'color %d' "
+#~ msgstr "Escolliu color per 'color %d' "
+
+#~ msgid "every"
+#~ msgstr "cada"
+
+#~ msgid "Dictionary path"
+#~ msgstr "Ruta de diccionaris"
+
+#~ msgid "Set displayed columns"
+#~ msgstr "Definir columnes visibles"
+
+#~ msgid " Folder list... "
+#~ msgstr "Llista de carpetes..."
+
+#~ msgid "Messages will be marked until execution if this is turned off"
+#~ msgstr "Els missatges seran marcats fins a l'execució si està desactivada"
+
+#~ msgid "Template name"
+#~ msgstr "Nom de plantilla"
+
+#~ msgid "Already trying to send\n"
+#~ msgstr "Ja s'ha intentat enviar\n"
+
+#~ msgid "/_View/_Source"
+#~ msgstr "/_Veure/_Font"
+
+#~ msgid "Sylpheed-Claws Team"
+#~ msgstr "L'equip de Sylpheed-Claws"
+
+#~ msgid "Welcome to Sylpheed-Claws"
+#~ msgstr "Benvingut a Sylpheed-Claws"
+
+#~ msgid "Security"
+#~ msgstr "Seguretat"
+

 #~ msgid "Sylpheed - Message View"
 #~ msgstr "Sylpheed - Vista de missatge"
 
 #~ msgid "Sylpheed - Message View"
 #~ msgstr "Sylpheed - Vista de missatge"
 

diff --git a/po/de.po b/po/de.po
index 8582b066132c399b7b37e9bf6a9d75f10aaf648e..d2f1bb5e71372e48bbac0c1f51768209c4ad4ac8 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # German translation of Sylpheed.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # German translation of Sylpheed.
 # Copyright (C) 2000 Free Software Foundation, Inc.

-# Stephan Sachse <white@dev-zero.com>, 2005
+# Stephan Sachse <white@dev-zero.com>, 2005-2007

 # Thomas Gilgin <thg1@karate-muellheim.de>, 2004, 2005
 # Hubert Gilgin, 2004
 # Jens Oberender <j.obi@troja.net>, 2003, 2004
 # Thomas Gilgin <thg1@karate-muellheim.de>, 2004, 2005
 # Hubert Gilgin, 2004
 # Jens Oberender <j.obi@troja.net>, 2003, 2004


@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claws\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claws\n"

-"Report-Msgid-Bugs-To: paul@sylpheed.org\n"
-"POT-Creation-Date: 2006-11-02 17:05+0100\n"
-"PO-Revision-Date: 2006-11-04 12:43+0100\n"
+"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
+"POT-Creation-Date: 2007-01-05 17:06+0100\n"
+"PO-Revision-Date: 2007-01-06 02:45+0100\n"

 "Last-Translator: Stephan Sachse <white@dev-zero.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Stephan Sachse <white@dev-zero.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"


@@ -71,17 +71,25 @@ msgstr "(Unbenannt)"
 msgid "Delete account"
 msgstr "Konto löschen"
 
 msgid "Delete account"
 msgstr "Konto löschen"
 

-#: src/account.c:1458
+#: src/account.c:1461
+msgid "Accounts List Default Column Name|D"
+msgstr "D"
+
+#: src/account.c:1467

 msgid "Default account"
 msgstr "Standardkonto"
 
 msgid "Default account"
 msgstr "Standardkonto"
 

-#: src/account.c:1472
+#: src/account.c:1475
+msgid "Accounts List Get Column Name|G"
+msgstr "G"
+
+#: src/account.c:1481

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hole alle' ruft Nachrichten der ausgewählten Konten ab"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Hole alle' ruft Nachrichten der ausgewählten Konten ab"
 

-#: src/account.c:1479 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5684 src/compose.c:5975 src/editaddress.c:953
-#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:287
+#: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132
+#: src/compose.c:5824 src/compose.c:6115 src/editaddress.c:1041
+#: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364


@@ -89,11 +97,11 @@ msgstr "'Hole alle' ruft Nachrichten der ausgewählten Konten ab"
 msgid "Name"
 msgstr "Name"
 
 msgid "Name"
 msgstr "Name"
 

-#: src/account.c:1486 src/prefs_account.c:1169 src/prefs_account.c:2697
+#: src/account.c:1495 src/prefs_account.c:1176 src/prefs_account.c:2712

 msgid "Protocol"
 msgstr "Protokoll"
 
 msgid "Protocol"
 msgstr "Protokoll"
 

-#: src/account.c:1493 src/ssl_manager.c:102
+#: src/account.c:1502 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Server"
 
 msgid "Server"
 msgstr "Server"
 


@@ -157,7 +165,7 @@ msgstr "--- Beendet: %s\n"
 msgid "Action's input/output"
 msgstr "Ein-/Ausgabe der Aktion"
 
 msgid "Action's input/output"
 msgstr "Ein-/Ausgabe der Aktion"
 

-#: src/action.c:1527
+#: src/action.c:1529

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -168,11 +176,11 @@ msgstr ""
 "('%%h' wird durch das Argument ersetzt)\n"
 "  %s"
 
 "('%%h' wird durch das Argument ersetzt)\n"
 "  %s"
 

-#: src/action.c:1532
+#: src/action.c:1534

 msgid "Action's hidden user argument"
 msgstr "Versteckte Benutzerargumente der Aktion"
 
 msgid "Action's hidden user argument"
 msgstr "Versteckte Benutzerargumente der Aktion"
 

-#: src/action.c:1536
+#: src/action.c:1538

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -183,7 +191,7 @@ msgstr ""
 "('%%u' wird durch das Argument ersetzt)\n"
 "  %s"
 
 "('%%u' wird durch das Argument ersetzt)\n"
 "  %s"
 

-#: src/action.c:1541
+#: src/action.c:1543

 msgid "Action's user argument"
 msgstr "Benutzerargument der Aktion"
 
 msgid "Action's user argument"
 msgstr "Benutzerargument der Aktion"
 


@@ -192,12 +200,12 @@ msgid "Add to address book"
 msgstr "Zum Adressbuch hinzufügen"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
 msgstr "Zum Adressbuch hinzufügen"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377

-#: src/toolbar.c:449
+#: src/toolbar.c:459

 msgid "Address"
 msgstr "Adresse"
 
 msgid "Address"
 msgstr "Adresse"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:761
-#: src/editaddress.c:825 src/editgroup.c:289
+#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:849
+#: src/editaddress.c:913 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Kommentar"
 
 msgid "Remarks"
 msgstr "Kommentar"
 


@@ -205,328 +213,318 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Adressbuchordner auswählen"
 
 msgid "Select Address Book Folder"
 msgstr "Adressbuchordner auswählen"
 

-#: src/addressbook.c:133 src/editaddress.c:759 src/editaddress.c:807
+#: src/addressbook.c:133 src/editaddress.c:847 src/editaddress.c:895

 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 

-#: src/addressbook.c:416
+#: src/addressbook.c:419

 msgid "/_Book"
 msgstr "/Adressb_uch"
 
 msgid "/_Book"
 msgstr "/Adressb_uch"
 

-#: src/addressbook.c:417
+#: src/addressbook.c:420

 msgid "/_Book/New _Book"
 msgstr "/Adressb_uch/Neues _Adressbuch"
 
 msgid "/_Book/New _Book"
 msgstr "/Adressb_uch/Neues _Adressbuch"
 

-#: src/addressbook.c:418
+#: src/addressbook.c:421

 msgid "/_Book/New _Folder"
 msgstr "/Adressb_uch/Neuer _Ordner"
 
 msgid "/_Book/New _Folder"
 msgstr "/Adressb_uch/Neuer _Ordner"
 

-#: src/addressbook.c:419
+#: src/addressbook.c:422

 msgid "/_Book/New _vCard"
 msgstr "/Adressb_uch/Neue _vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/Adressb_uch/Neue _vCard"
 

-#: src/addressbook.c:421
+#: src/addressbook.c:424

 msgid "/_Book/New _JPilot"
 msgstr "/Adressb_uch/Neuer _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/Adressb_uch/Neuer _JPilot"
 

-#: src/addressbook.c:424
+#: src/addressbook.c:427

 msgid "/_Book/New LDAP _Server"
 msgstr "/Adressb_uch/Neuer LDAP-S_erver"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/Adressb_uch/Neuer LDAP-S_erver"
 

-#: src/addressbook.c:426 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:432

 msgid "/_Book/---"
 msgstr "/Adressb_uch/---"
 
 msgid "/_Book/---"
 msgstr "/Adressb_uch/---"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:430

 msgid "/_Book/_Edit book"
 msgstr "/Adressb_uch/Adressbuch _bearbeiten"
 
 msgid "/_Book/_Edit book"
 msgstr "/Adressb_uch/Adressbuch _bearbeiten"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:431

 msgid "/_Book/_Delete book"
 msgstr "/Adressb_uch/Adressbuch _löschen"
 
 msgid "/_Book/_Delete book"
 msgstr "/Adressb_uch/Adressbuch _löschen"
 

-#: src/addressbook.c:430
+#: src/addressbook.c:433

 msgid "/_Book/_Save"
 msgstr "/Adressb_uch/_Speichern"
 
 msgid "/_Book/_Save"
 msgstr "/Adressb_uch/_Speichern"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:434

 msgid "/_Book/_Close"
 msgstr "/Adressb_uch/S_chließen"
 
 msgid "/_Book/_Close"
 msgstr "/Adressb_uch/S_chließen"
 

-#: src/addressbook.c:432
+#: src/addressbook.c:435

 msgid "/_Address"
 msgstr "/_Adresse"
 
 msgid "/_Address"
 msgstr "/_Adresse"
 

-#: src/addressbook.c:433
+#: src/addressbook.c:436

 msgid "/_Address/_Select all"
 msgstr "/_Adresse/_Löschen/_Adresse/all_e auswählen"
 
 msgid "/_Address/_Select all"
 msgstr "/_Adresse/_Löschen/_Adresse/all_e auswählen"
 

-#: src/addressbook.c:434 src/addressbook.c:438 src/addressbook.c:441
-#: src/addressbook.c:444
+#: src/addressbook.c:437 src/addressbook.c:441 src/addressbook.c:444
+#: src/addressbook.c:447

 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 

-#: src/addressbook.c:435
+#: src/addressbook.c:438

 msgid "/_Address/C_ut"
 msgstr "/_Adresse/A_usschneiden"
 
 msgid "/_Address/C_ut"
 msgstr "/_Adresse/A_usschneiden"
 

-#: src/addressbook.c:436
+#: src/addressbook.c:439

 msgid "/_Address/_Copy"
 msgstr "/_Adresse/_Kopieren"
 
 msgid "/_Address/_Copy"
 msgstr "/_Adresse/_Kopieren"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:440

 msgid "/_Address/_Paste"
 msgstr "/_Adresse/E_infügen"
 
 msgid "/_Address/_Paste"
 msgstr "/_Adresse/E_infügen"
 

-#: src/addressbook.c:439
+#: src/addressbook.c:442

 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:443

 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:445

 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:446

 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:448

 msgid "/_Address/_Mail To"
 msgstr "/_Adresse/_Mail an"
 
 msgid "/_Address/_Mail To"
 msgstr "/_Adresse/_Mail an"
 

-#: src/addressbook.c:446 src/compose.c:767 src/mainwindow.c:799
+#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:799

 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/E_xtras"
 
 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/E_xtras"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:450

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/E_xtras/_LDIF-Datei importieren..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/E_xtras/_LDIF-Datei importieren..."
 

-#: src/addressbook.c:448
+#: src/addressbook.c:451

 msgid "/_Tools/Import M_utt file..."
 msgstr "/E_xtras/M_utt-Datei importieren..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/E_xtras/M_utt-Datei importieren..."
 

-#: src/addressbook.c:449
+#: src/addressbook.c:452

 msgid "/_Tools/Import _Pine file..."
 msgstr "/E_xtras/_Pine-Datei importieren..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/E_xtras/_Pine-Datei importieren..."
 

-#: src/addressbook.c:450 src/mainwindow.c:808 src/mainwindow.c:831
+#: src/addressbook.c:453 src/mainwindow.c:808 src/mainwindow.c:831

 #: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
 #: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
 msgid "/_Tools/---"
 msgstr "/E_xtras/---"
 
 #: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
 #: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
 msgid "/_Tools/---"
 msgstr "/E_xtras/---"
 

-#: src/addressbook.c:451
+#: src/addressbook.c:454

 msgid "/_Tools/Export _HTML..."
 msgstr "/E_xtras/Als HTML exportieren..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/E_xtras/Als HTML exportieren..."
 

-#: src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Tools/Export LDI_F..."
 msgstr "/E_xtras/Als LDI_F exportieren..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/E_xtras/Als LDI_F exportieren..."
 

-#: src/addressbook.c:453 src/compose.c:772 src/mainwindow.c:874
+#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:874

 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/_Hilfe"
 
 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/_Hilfe"
 

-#: src/addressbook.c:454 src/compose.c:773 src/mainwindow.c:880
+#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:880

 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 

-#: src/addressbook.c:459 src/addressbook.c:475 src/compose.c:540
+#: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545

 #: src/mainwindow.c:518 src/messageview.c:164
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
 #: src/mainwindow.c:518 src/messageview.c:164
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 

-#: src/addressbook.c:460 src/addressbook.c:476
+#: src/addressbook.c:463 src/addressbook.c:479

 msgid "/_Delete"
 msgstr "/_Löschen"
 
 msgid "/_Delete"
 msgstr "/_Löschen"
 

-#: src/addressbook.c:461 src/addressbook.c:465 src/addressbook.c:474
-#: src/addressbook.c:477 src/addressbook.c:480 src/addressbook.c:484
-#: src/compose.c:519 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
-#: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:54
-#: src/news_gtk.c:57 src/news_gtk.c:59 src/plugins/trayicon/trayicon.c:102
-#: src/plugins/trayicon/trayicon.c:105 src/plugins/trayicon/trayicon.c:107
-#: src/summaryview.c:423 src/summaryview.c:427 src/summaryview.c:432
-#: src/summaryview.c:450 src/summaryview.c:471 src/summaryview.c:477
-msgid "/---"
-msgstr "/---"
-
-#: src/addressbook.c:462
+#: src/addressbook.c:465

 msgid "/New _Book"
 msgstr "/Neues _Adressbuch"
 
 msgid "/New _Book"
 msgstr "/Neues _Adressbuch"
 

-#: src/addressbook.c:463
+#: src/addressbook.c:466

 msgid "/New _Folder"
 msgstr "/Neuer _Ordner"
 
 msgid "/New _Folder"
 msgstr "/Neuer _Ordner"
 

-#: src/addressbook.c:464 src/addressbook.c:479
+#: src/addressbook.c:467 src/addressbook.c:482

 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 

-#: src/addressbook.c:466 src/addressbook.c:481
+#: src/addressbook.c:469 src/addressbook.c:484

 msgid "/C_ut"
 msgstr "/_Ausschneiden"
 
 msgid "/C_ut"
 msgstr "/_Ausschneiden"
 

-#: src/addressbook.c:467 src/addressbook.c:482
+#: src/addressbook.c:470 src/addressbook.c:485

 msgid "/_Copy"
 msgstr "/_Kopieren"
 
 msgid "/_Copy"
 msgstr "/_Kopieren"
 

-#: src/addressbook.c:468 src/addressbook.c:483
+#: src/addressbook.c:471 src/addressbook.c:486

 msgid "/_Paste"
 msgstr "/_Einfügen"
 
 msgid "/_Paste"
 msgstr "/_Einfügen"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:476

 msgid "/_Select all"
 msgstr "All_e auswählen"
 
 msgid "/_Select all"
 msgstr "All_e auswählen"
 

-#: src/addressbook.c:478
+#: src/addressbook.c:481

 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 

-#: src/addressbook.c:486
+#: src/addressbook.c:489

 msgid "/_Mail To"
 msgstr "/_Mail an"
 
 msgid "/_Mail To"
 msgstr "/_Mail an"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:491

 msgid "/_Browse Entry"
 msgstr "/Eintrag ü_berfliegen"
 
 msgid "/_Browse Entry"
 msgstr "/Eintrag ü_berfliegen"
 

-#: src/addressbook.c:501 src/crash.c:450 src/crash.c:469 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:132 src/prefs_themes.c:683
+#: src/addressbook.c:504 src/crash.c:453 src/crash.c:472 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_themes.c:683

 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Unbekannt"
 

-#: src/addressbook.c:508 src/addressbook.c:527 src/importldif.c:126
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:126

 msgid "Success"
 msgstr "Erfolg"
 
 msgid "Success"
 msgstr "Erfolg"
 

-#: src/addressbook.c:509 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127

 msgid "Bad arguments"
 msgstr "Falsches Argument"
 
 msgid "Bad arguments"
 msgstr "Falsches Argument"
 

-#: src/addressbook.c:510 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128

 msgid "File not specified"
 msgstr "Datei nicht angegeben"
 
 msgid "File not specified"
 msgstr "Datei nicht angegeben"
 

-#: src/addressbook.c:511 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129

 msgid "Error opening file"
 msgstr "Fehler beim Öffnen der Datei"
 
 msgid "Error opening file"
 msgstr "Fehler beim Öffnen der Datei"
 

-#: src/addressbook.c:512 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130

 msgid "Error reading file"
 msgstr "Fehler beim Lesen der Datei"
 
 msgid "Error reading file"
 msgstr "Fehler beim Lesen der Datei"
 

-#: src/addressbook.c:513 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131

 msgid "End of file encountered"
 msgstr "Dateiende erreicht"
 
 msgid "End of file encountered"
 msgstr "Dateiende erreicht"
 

-#: src/addressbook.c:514 src/importldif.c:132
+#: src/addressbook.c:517 src/importldif.c:132

 msgid "Error allocating memory"
 msgstr "Fehler bei Speicherreservierung"
 
 msgid "Error allocating memory"
 msgstr "Fehler bei Speicherreservierung"
 

-#: src/addressbook.c:515 src/importldif.c:133
+#: src/addressbook.c:518 src/importldif.c:133

 msgid "Bad file format"
 msgstr "Ungültiges Dateiformat"
 
 msgid "Bad file format"
 msgstr "Ungültiges Dateiformat"
 

-#: src/addressbook.c:516 src/importldif.c:134
+#: src/addressbook.c:519 src/importldif.c:134

 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben der Datei"
 
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben der Datei"
 

-#: src/addressbook.c:517 src/importldif.c:135
+#: src/addressbook.c:520 src/importldif.c:135

 msgid "Error opening directory"
 msgstr "Fehler beim Öffnen des Verzeichnisses"
 
 msgid "Error opening directory"
 msgstr "Fehler beim Öffnen des Verzeichnisses"
 

-#: src/addressbook.c:518 src/importldif.c:136
+#: src/addressbook.c:521 src/importldif.c:136

 msgid "No path specified"
 msgstr "Kein Pfad angegeben"
 
 msgid "No path specified"
 msgstr "Kein Pfad angegeben"
 

-#: src/addressbook.c:528
+#: src/addressbook.c:531

 msgid "Error connecting to LDAP server"
 msgstr "Fehler beim Verbinden mit dem LDAP-Server"
 
 msgid "Error connecting to LDAP server"
 msgstr "Fehler beim Verbinden mit dem LDAP-Server"
 

-#: src/addressbook.c:529
+#: src/addressbook.c:532

 msgid "Error initializing LDAP"
 msgstr "Fehler beim LDAP-Start"
 
 msgid "Error initializing LDAP"
 msgstr "Fehler beim LDAP-Start"
 

-#: src/addressbook.c:530
+#: src/addressbook.c:533

 msgid "Error binding to LDAP server"
 msgstr "Fehler beim Binden an den LDAP-Server"
 
 msgid "Error binding to LDAP server"
 msgstr "Fehler beim Binden an den LDAP-Server"
 

-#: src/addressbook.c:531
+#: src/addressbook.c:534

 msgid "Error searching LDAP database"
 msgstr "Fehler beim Suchen in der LDAP-Datenbank"
 
 msgid "Error searching LDAP database"
 msgstr "Fehler beim Suchen in der LDAP-Datenbank"
 

-#: src/addressbook.c:532
+#: src/addressbook.c:535

 msgid "Timeout performing LDAP operation"
 msgstr "Timeout während des LDAP-Befehls"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Timeout während des LDAP-Befehls"
 

-#: src/addressbook.c:533
+#: src/addressbook.c:536

 msgid "Error in LDAP search criteria"
 msgstr "Fehler im LDAP-Suchkriterium"
 
 msgid "Error in LDAP search criteria"
 msgstr "Fehler im LDAP-Suchkriterium"
 

-#: src/addressbook.c:534
+#: src/addressbook.c:537

 msgid "No LDAP entries found for search criteria"
 msgstr "Keine LDAP-Einträge für das Suchkriterium gefunden"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "Keine LDAP-Einträge für das Suchkriterium gefunden"
 

-#: src/addressbook.c:535
+#: src/addressbook.c:538

 msgid "LDAP search terminated on request"
 msgstr "LDAP-Suche auf Verlangen abgebrochen"
 
 msgid "LDAP search terminated on request"
 msgstr "LDAP-Suche auf Verlangen abgebrochen"
 

-#: src/addressbook.c:536
+#: src/addressbook.c:539

 msgid "Error starting TLS connection"
 msgstr "Fehler beim Starten der TLS-Verbindung"
 
 msgid "Error starting TLS connection"
 msgstr "Fehler beim Starten der TLS-Verbindung"
 

-#: src/addressbook.c:853
+#: src/addressbook.c:897

 msgid "Sources"
 msgstr "Quellen"
 
 msgid "Sources"
 msgstr "Quellen"
 

-#: src/addressbook.c:857 src/prefs_other.c:101 src/toolbar.c:190
-#: src/toolbar.c:1727
+#: src/addressbook.c:901 src/prefs_other.c:101 src/toolbar.c:194
+#: src/toolbar.c:1787

 msgid "Address book"
 msgstr "Adressbuch"
 
 msgid "Address book"
 msgstr "Adressbuch"
 

-#: src/addressbook.c:980
+#: src/addressbook.c:1033

 msgid "Lookup name:"
 msgstr "Suchname:"
 
 msgid "Lookup name:"
 msgstr "Suchname:"
 

-#: src/addressbook.c:1040 src/compose.c:2031 src/compose.c:4308
-#: src/compose.c:5530 src/compose.c:6293 src/summary_search.c:291
+#: src/addressbook.c:1106 src/compose.c:2129 src/compose.c:4446
+#: src/compose.c:5670 src/compose.c:6435 src/compose.c:9456
+#: src/summary_search.c:359

 msgid "To:"
 msgstr "An:"
 
 msgid "To:"
 msgstr "An:"
 

-#: src/addressbook.c:1044 src/compose.c:2015 src/compose.c:4051
-#: src/compose.c:4307
+#: src/addressbook.c:1110 src/compose.c:2113 src/compose.c:4182
+#: src/compose.c:4445 src/compose.c:9465

 msgid "Cc:"
 msgstr "Cc:"
 
 msgid "Cc:"
 msgstr "Cc:"
 

-#: src/addressbook.c:1048 src/compose.c:2018 src/compose.c:4082
+#: src/addressbook.c:1114 src/compose.c:2116 src/compose.c:4213

 msgid "Bcc:"
 msgstr "Bcc:"
 
 msgid "Bcc:"
 msgstr "Bcc:"
 

-#: src/addressbook.c:1283 src/addressbook.c:1329
+#: src/addressbook.c:1363 src/addressbook.c:1409

 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 

-#: src/addressbook.c:1284
+#: src/addressbook.c:1364

 msgid "This address data is readonly and cannot be deleted."
 msgstr "Diese Adressdaten sind nur lesbar und können nicht gelöscht werden."
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Diese Adressdaten sind nur lesbar und können nicht gelöscht werden."
 

-#: src/addressbook.c:1323
+#: src/addressbook.c:1403

 msgid "Delete group"
 msgstr "Gruppe löschen"
 
 msgid "Delete group"
 msgstr "Gruppe löschen"
 

-#: src/addressbook.c:1324
+#: src/addressbook.c:1404

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -534,29 +532,29 @@ msgstr ""
 "Diese Gruppe(n) wirklich löschen?\n"
 "Die enthaltenen Adressen gehen nicht verloren"
 
 "Diese Gruppe(n) wirklich löschen?\n"
 "Die enthaltenen Adressen gehen nicht verloren"
 

-#: src/addressbook.c:1330
+#: src/addressbook.c:1410

 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 

-#: src/addressbook.c:1932
+#: src/addressbook.c:2014

 msgid "Cannot paste. Target address book is readonly."
 msgstr "Einfügen nicht möglich, da das Zieladressbuch nur lesbar ist."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Einfügen nicht möglich, da das Zieladressbuch nur lesbar ist."
 

-#: src/addressbook.c:1943
+#: src/addressbook.c:2025

 msgid "Cannot paste into an address group."
 msgstr "Einfügen in eine Adressgruppe nicht möglich."
 
 msgid "Cannot paste into an address group."
 msgstr "Einfügen in eine Adressgruppe nicht möglich."
 

-#: src/addressbook.c:2619
+#: src/addressbook.c:2708

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Sollen die Suchergebnisse und Adressen in '%s' gelöscht werden?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Sollen die Suchergebnisse und Adressen in '%s' gelöscht werden?"
 

-#: src/addressbook.c:2622 src/addressbook.c:2648 src/addressbook.c:2655
+#: src/addressbook.c:2711 src/addressbook.c:2737 src/addressbook.c:2744

 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Löschen"
 
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Löschen"
 

-#: src/addressbook.c:2631
+#: src/addressbook.c:2720

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -565,19 +563,19 @@ msgstr ""
 "Soll '%s' gelöscht werden? Wenn nur der Ordner gelöscht wird, werden die "
 "Adressen in den darüberliegenden Ordner verschoben."
 
 "Soll '%s' gelöscht werden? Wenn nur der Ordner gelöscht wird, werden die "
 "Adressen in den darüberliegenden Ordner verschoben."
 

-#: src/addressbook.c:2634 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2723 src/imap_gtk.c:284 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Ordner löschen"
 
 msgid "Delete folder"
 msgstr "Ordner löschen"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "+Delete _folder only"
 msgstr "+nur Ordner löschen"
 
 msgid "+Delete _folder only"
 msgstr "+nur Ordner löschen"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "Delete folder and _addresses"
 msgstr "Ordner und Adressen löschen"
 
 msgid "Delete folder and _addresses"
 msgstr "Ordner und Adressen löschen"
 

-#: src/addressbook.c:2646
+#: src/addressbook.c:2735

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -586,7 +584,7 @@ msgstr ""
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen nicht verloren."
 
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen nicht verloren."
 

-#: src/addressbook.c:2653
+#: src/addressbook.c:2742

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -595,19 +593,19 @@ msgstr ""
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen verloren."
 
 "Soll '%s' gelöscht werden?\n"
 "Die enthaltenen Adressen gehen verloren."
 

-#: src/addressbook.c:3465
+#: src/addressbook.c:3595

 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, Indexdatei konnte nicht gespeichert werden."
 
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, Indexdatei konnte nicht gespeichert werden."
 

-#: src/addressbook.c:3469
+#: src/addressbook.c:3599

 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, Adressbuchdatei konnte nicht gespeichert werden."
 
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, Adressbuchdatei konnte nicht gespeichert werden."
 

-#: src/addressbook.c:3479
+#: src/addressbook.c:3609

 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 

-#: src/addressbook.c:3484
+#: src/addressbook.c:3614

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -615,7 +613,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "Indexdatei des neuen Adressbuches konnte nicht gespeichert werden."
 
 "Altes Adressbuch konvertiert,\n"
 "Indexdatei des neuen Adressbuches konnte nicht gespeichert werden."
 

-#: src/addressbook.c:3497
+#: src/addressbook.c:3627

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -623,7 +621,7 @@ msgstr ""
 "Adressbuch konnte nicht konvertiert werden,\n"
 "aber eine leere, neue Adressbuchdatei wurde erstellt."
 
 "Adressbuch konnte nicht konvertiert werden,\n"
 "aber eine leere, neue Adressbuchdatei wurde erstellt."
 

-#: src/addressbook.c:3503
+#: src/addressbook.c:3633

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -631,7 +629,7 @@ msgstr ""
 "Adressbuch konnte nicht konvertiert werden,\n"
 "neue Adressindexdatei konnte nicht erstellt werden."
 
 "Adressbuch konnte nicht konvertiert werden,\n"
 "neue Adressindexdatei konnte nicht erstellt werden."
 

-#: src/addressbook.c:3508
+#: src/addressbook.c:3638

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -639,70 +637,70 @@ msgstr ""
 "Adressbuch konnte nicht konvertiert werden\n"
 "und eine neue Adressbuchdatei konnte nicht erstellt werden."
 
 "Adressbuch konnte nicht konvertiert werden\n"
 "und eine neue Adressbuchdatei konnte nicht erstellt werden."
 

-#: src/addressbook.c:3515 src/addressbook.c:3521
+#: src/addressbook.c:3645 src/addressbook.c:3651

 msgid "Addressbook conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
 msgid "Addressbook conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 

-#: src/addressbook.c:3559
+#: src/addressbook.c:3689

 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 
 msgid "Addressbook Error"
 msgstr "Adressbuch-Fehler"
 

-#: src/addressbook.c:3560
+#: src/addressbook.c:3690

 msgid "Could not read address index"
 msgstr "Adressindex konnte nicht gelesen werden."
 
 msgid "Could not read address index"
 msgstr "Adressindex konnte nicht gelesen werden."
 

-#: src/addressbook.c:3887
+#: src/addressbook.c:4017

 msgid "Busy searching..."
 msgstr "Beschäftigt mit Suchen..."
 
 msgid "Busy searching..."
 msgstr "Beschäftigt mit Suchen..."
 

-#: src/addressbook.c:3958
+#: src/addressbook.c:4088

 #, c-format
 msgid "Search '%s'"
 msgstr "Suche '%s'"
 
 #, c-format
 msgid "Search '%s'"
 msgstr "Suche '%s'"
 

-#: src/addressbook.c:4183
+#: src/addressbook.c:4313

 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 

-#: src/addressbook.c:4199 src/exphtmldlg.c:378 src/expldifdlg.c:394
+#: src/addressbook.c:4329 src/exphtmldlg.c:375 src/expldifdlg.c:394

 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Adressbuch"
 
 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Adressbuch"
 

-#: src/addressbook.c:4215
+#: src/addressbook.c:4345

 msgid "Person"
 msgstr "Person"
 
 msgid "Person"
 msgstr "Person"
 

-#: src/addressbook.c:4231
+#: src/addressbook.c:4361

 msgid "EMail Address"
 msgstr "E-Mail-Adresse"
 
 msgid "EMail Address"
 msgstr "E-Mail-Adresse"
 

-#: src/addressbook.c:4247
+#: src/addressbook.c:4377

 msgid "Group"
 msgstr "Gruppe"
 
 msgid "Group"
 msgstr "Gruppe"
 

-#: src/addressbook.c:4263 src/exporthtml.c:922 src/folderview.c:468
-#: src/prefs_account.c:2410 src/prefs_folder_column.c:79
+#: src/addressbook.c:4393 src/exporthtml.c:922 src/folderview.c:470
+#: src/prefs_account.c:2417 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Ordner"
 
 msgid "Folder"
 msgstr "Ordner"
 

-#: src/addressbook.c:4279
+#: src/addressbook.c:4409

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4295 src/addressbook.c:4311
+#: src/addressbook.c:4425 src/addressbook.c:4441

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4327
+#: src/addressbook.c:4457

 msgid "LDAP servers"
 msgstr "LDAP-Server"
 
 msgid "LDAP servers"
 msgstr "LDAP-Server"
 

-#: src/addressbook.c:4343
+#: src/addressbook.c:4473

 msgid "LDAP Query"
 msgstr "LDAP-Anfrage"
 
 msgid "LDAP Query"
 msgstr "LDAP-Anfrage"
 

-#: src/addressbook.c:4659 src/matcher.c:303 src/matcher.c:756
+#: src/addressbook.c:4789 src/matcher.c:303 src/matcher.c:756

 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106


@@ -743,7 +741,7 @@ msgstr ""
 msgid "Folder :"
 msgstr "Ordner :"
 
 msgid "Folder :"
 msgstr "Ordner :"
 

-#: src/addrgather.c:365 src/exphtmldlg.c:546 src/expldifdlg.c:626
+#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Adressbuch :"
 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Adressbuch :"


@@ -768,9 +766,9 @@ msgstr "Kopfzeilenname"
 msgid "Address Count"
 msgstr "Adresszahl"
 
 msgid "Address Count"
 msgstr "Adresszahl"
 

-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4657
-#: src/compose.c:9183 src/messageview.c:578 src/messageview.c:591
-#: src/plugins/pgpcore/sgpgme.c:570
+#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4797
+#: src/compose.c:9377 src/messageview.c:580 src/messageview.c:593
+#: src/plugins/pgpcore/sgpgme.c:574

 msgid "Warning"
 msgstr "Warnung"
 
 msgid "Warning"
 msgstr "Warnung"
 


@@ -778,7 +776,7 @@ msgstr "Warnung"
 msgid "Header Fields"
 msgstr "Kopfzeilenfelder"
 
 msgid "Header Fields"
 msgstr "Kopfzeilenfelder"
 

-#: src/addrgather.c:539 src/exphtmldlg.c:666 src/expldifdlg.c:738
+#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Ende"
 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Ende"


@@ -807,12 +805,12 @@ msgstr "Allgemeine Adresse"
 msgid "Personal address"
 msgstr "Persönliche Adresse"
 
 msgid "Personal address"
 msgstr "Persönliche Adresse"
 

-#: src/alertpanel.c:141 src/compose.c:7403
+#: src/alertpanel.c:141 src/compose.c:7585

 msgid "Notice"
 msgstr "Notiz"
 
 msgid "Notice"
 msgstr "Notiz"
 

-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4597 src/inc.c:616
-#: src/plugins/pgpcore/sgpgme.c:144 src/plugins/pgpcore/sgpgme.c:235
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4737 src/inc.c:616
+#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239

 msgid "Error"
 msgstr "Fehler"
 
 msgid "Error"
 msgstr "Fehler"
 


@@ -849,57 +847,60 @@ msgstr "Attributname"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Keine Verbindung mit NNTP-Server: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Keine Verbindung mit NNTP-Server: %s:%d\n"
 

-#: src/common/nntp.c:181 src/common/nntp.c:244
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:840
+msgid "SSL handshake failed\n"
+msgstr "SSL-Verbindung fehlgeschlagen\n"
+
+#: src/common/nntp.c:182 src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr "Protokollfehler: %s\n"
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "Protokollfehler: %s\n"
 

-#: src/common/nntp.c:204 src/common/nntp.c:250
+#: src/common/nntp.c:205 src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr "Protokollfehler\n"
 
 msgid "protocol error\n"
 msgstr "Protokollfehler\n"
 

-#: src/common/nntp.c:300
+#: src/common/nntp.c:301

 msgid "Error occurred while posting\n"
 msgstr "Fehler beim Senden\n"
 
 msgid "Error occurred while posting\n"
 msgstr "Fehler beim Senden\n"
 

-#: src/common/nntp.c:380
+#: src/common/nntp.c:381

 msgid "Error occurred while sending command\n"
 msgstr "Fehler beim Senden des Kommandos\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "Fehler beim Senden des Kommandos\n"
 

-#: src/common/plugin.c:52
+#: src/common/plugin.c:53

 msgid "Nothing"
 msgstr "Nichts"
 
 msgid "Nothing"
 msgstr "Nichts"
 

-#: src/common/plugin.c:53
+#: src/common/plugin.c:54

 msgid "a viewer"
 msgstr "ein Betrachter"
 
 msgid "a viewer"
 msgstr "ein Betrachter"
 

-#: src/common/plugin.c:54
+#: src/common/plugin.c:55

 msgid "folders"
 msgstr "Ordner"
 
 msgid "folders"
 msgstr "Ordner"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "filtering"
 msgstr "Filter"
 
 msgid "filtering"
 msgstr "Filter"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a privacy interface"
 msgstr "ein Datenschutzinterface"
 
 msgid "a privacy interface"
 msgstr "ein Datenschutzinterface"
 

-#: src/common/plugin.c:57
-#, fuzzy
+#: src/common/plugin.c:58

 msgid "a notifier"
 msgstr "ein Benachrichtiger"
 
 msgid "a notifier"
 msgstr "ein Benachrichtiger"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "an utility"
 msgstr "ein Werkzeug"
 
 msgid "an utility"
 msgstr "ein Werkzeug"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "things"
 msgstr "Dinge"
 
 msgid "things"
 msgstr "Dinge"
 

-#: src/common/plugin.c:257
+#: src/common/plugin.c:258

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."


@@ -907,21 +908,47 @@ msgstr ""
 "Dieses Plugin stellt %s (%s) zur Verfügung, welches bereits vom Plugin %s "
 "zur Verfügung gestellt wird"
 
 "Dieses Plugin stellt %s (%s) zur Verfügung, welches bereits vom Plugin %s "
 "zur Verfügung gestellt wird"
 

-#: src/common/plugin.c:292
+#: src/common/plugin.c:293

 msgid "Plugin already loaded"
 msgstr "Plugin bereits geladen"
 
 msgid "Plugin already loaded"
 msgstr "Plugin bereits geladen"
 

-#: src/common/plugin.c:302
+#: src/common/plugin.c:303

 msgid "Failed to allocate memory for Plugin"
 msgstr "Speicherreservierung für das Plugin fehlgeschlagen"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Speicherreservierung für das Plugin fehlgeschlagen"
 

-#: src/common/plugin.c:329
+#: src/common/plugin.c:330

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Diese Modul ist nicht unter einer GPL kompatiblen Lizenz lizenziert."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Diese Modul ist nicht unter einer GPL kompatiblen Lizenz lizenziert."
 

-#: src/common/plugin.c:336
-msgid "This module is for Sylpheed-Claws GTK1."
-msgstr "Dies ist ein Plugin für die GTK1-Version von Sylpheed-Claws."
+#: src/common/plugin.c:337
+msgid "This module is for Claws Mail GTK1."
+msgstr "Dies ist ein Plugin für Claws Mail GTK1."
+
+#: src/common/plugin.c:550
+#, c-format
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr ""
+"Die Claws Mail Version ist neuer als die Version mit der das '%s' Plugin "
+"kompiliert wurde."
+
+#: src/common/plugin.c:553
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr ""
+"Die Claws Mail Version ist neuer als die Version mit der das Plugin "
+"kompiliert wurde."
+
+#: src/common/plugin.c:562
+#, c-format
+msgid "Your version of Claws Mail is too old for the '%s' plugin."
+msgstr "Die Claws Mail Version ist zu alt für das '%s' Plugin."
+
+#: src/common/plugin.c:564
+msgid "Your version of Claws Mail is too old for the plugin."
+msgstr "Die Claws Mail Version ist zu alt für das Plugin."

 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"


@@ -962,16 +989,16 @@ msgstr "Fehler beim Erzeugen des SSL-Kontexts\n"
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL-Verbindung fehlgeschlagen (%s)\n"
 
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL-Verbindung fehlgeschlagen (%s)\n"
 

-#: src/common/ssl_certificate.c:189 src/common/ssl_certificate.c:200
-#: src/common/ssl_certificate.c:206 src/common/ssl_certificate.c:213
-#: src/common/ssl_certificate.c:224 src/common/ssl_certificate.c:230
+#: src/common/ssl_certificate.c:208 src/common/ssl_certificate.c:219
+#: src/common/ssl_certificate.c:225 src/common/ssl_certificate.c:232
+#: src/common/ssl_certificate.c:243 src/common/ssl_certificate.c:249

 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<nicht im Zertifikat>"
 
 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<nicht im Zertifikat>"
 

-#: src/common/ssl_certificate.c:239
+#: src/common/ssl_certificate.c:258

 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"


@@ -984,7 +1011,7 @@ msgstr ""
 "  Fingerabdruck: %s\n"
 "  Signaturstatus: %s"
 
 "  Fingerabdruck: %s\n"
 "  Signaturstatus: %s"
 

-#: src/common/ssl_certificate.c:348
+#: src/common/ssl_certificate.c:385

 msgid "Couldn't load X509 default paths"
 msgstr "X509 Standardpfad konnte nicht geladen werden"
 
 msgid "Couldn't load X509 default paths"
 msgstr "X509 Standardpfad konnte nicht geladen werden"
 


@@ -1012,479 +1039,690 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
 msgid "%.2fGB"
 msgstr "%.2fGB"
 

-#: src/compose.c:517
+#: src/common/utils.c:4799
+msgid "Complete day name for use by strftime|Sunday"
+msgstr "Sonntag"
+
+#: src/common/utils.c:4800
+msgid "Complete day name for use by strftime|Monday"
+msgstr "Montag"
+
+#: src/common/utils.c:4801
+msgid "Complete day name for use by strftime|Tuesday"
+msgstr "Dienstag"
+
+#: src/common/utils.c:4802
+msgid "Complete day name for use by strftime|Wednesday"
+msgstr "Mittwoch"
+
+#: src/common/utils.c:4803
+msgid "Complete day name for use by strftime|Thursday"
+msgstr "Donnerstag"
+
+#: src/common/utils.c:4804
+msgid "Complete day name for use by strftime|Friday"
+msgstr "Freitag"
+
+#: src/common/utils.c:4805
+msgid "Complete day name for use by strftime|Saturday"
+msgstr "Samstag"
+
+#: src/common/utils.c:4807
+msgid "Complete month name for use by strftime|January"
+msgstr "Januar"
+
+#: src/common/utils.c:4808
+msgid "Complete month name for use by strftime|February"
+msgstr "Februar"
+
+#: src/common/utils.c:4809
+msgid "Complete month name for use by strftime|March"
+msgstr "März"
+
+#: src/common/utils.c:4810
+msgid "Complete month name for use by strftime|April"
+msgstr "April"
+
+#: src/common/utils.c:4811
+msgid "Complete month name for use by strftime|May"
+msgstr "Mai"
+
+#: src/common/utils.c:4812
+msgid "Complete month name for use by strftime|June"
+msgstr "Juni"
+
+#: src/common/utils.c:4813
+msgid "Complete month name for use by strftime|July"
+msgstr "Juli"
+
+#: src/common/utils.c:4814
+msgid "Complete month name for use by strftime|August"
+msgstr "August"
+
+#: src/common/utils.c:4815
+msgid "Complete month name for use by strftime|September"
+msgstr "September"
+
+#: src/common/utils.c:4816
+msgid "Complete month name for use by strftime|October"
+msgstr "Oktober"
+
+#: src/common/utils.c:4817
+msgid "Complete month name for use by strftime|November"
+msgstr "November"
+
+#: src/common/utils.c:4818
+msgid "Complete month name for use by strftime|December"
+msgstr "Dezember"
+
+#: src/common/utils.c:4820
+msgid "Abbr. day name for use by strftime|Sun"
+msgstr "So"
+
+#: src/common/utils.c:4821
+msgid "Abbr. day name for use by strftime|Mon"
+msgstr "Mo"
+
+#: src/common/utils.c:4822
+msgid "Abbr. day name for use by strftime|Tue"
+msgstr "Di"
+
+#: src/common/utils.c:4823
+msgid "Abbr. day name for use by strftime|Wed"
+msgstr "Mi"
+
+#: src/common/utils.c:4824
+msgid "Abbr. day name for use by strftime|Thu"
+msgstr "Do"
+
+#: src/common/utils.c:4825
+msgid "Abbr. day name for use by strftime|Fri"
+msgstr "Fr"
+
+#: src/common/utils.c:4826
+msgid "Abbr. day name for use by strftime|Sat"
+msgstr "Sa"
+
+#: src/common/utils.c:4828
+msgid "Abbr. month name for use by strftime|Jan"
+msgstr "Jan"
+
+#: src/common/utils.c:4829
+msgid "Abbr. month name for use by strftime|Feb"
+msgstr "Feb"
+
+#: src/common/utils.c:4830
+msgid "Abbr. month name for use by strftime|Mar"
+msgstr "Mär"
+
+#: src/common/utils.c:4831
+msgid "Abbr. month name for use by strftime|Apr"
+msgstr "Apr"
+
+#: src/common/utils.c:4832
+msgid "Abbr. month name for use by strftime|May"
+msgstr "Mai"
+
+#: src/common/utils.c:4833
+msgid "Abbr. month name for use by strftime|Jun"
+msgstr "Jun"
+
+#: src/common/utils.c:4834
+msgid "Abbr. month name for use by strftime|Jul"
+msgstr "Jul"
+
+#: src/common/utils.c:4835
+msgid "Abbr. month name for use by strftime|Aug"
+msgstr "Aug"
+
+#: src/common/utils.c:4836
+msgid "Abbr. month name for use by strftime|Sep"
+msgstr "Sep"
+
+#: src/common/utils.c:4837
+msgid "Abbr. month name for use by strftime|Oct"
+msgstr "Okt"
+
+#: src/common/utils.c:4838
+msgid "Abbr. month name for use by strftime|Nov"
+msgstr "Nov"
+
+#: src/common/utils.c:4839
+msgid "Abbr. month name for use by strftime|Dec"
+msgstr "Dez"
+
+#: src/common/utils.c:4841
+msgid "For use by strftime (morning)|AM"
+msgstr "AM"
+
+#: src/common/utils.c:4842
+msgid "For use by strftime (afternoon)|PM"
+msgstr "PM"
+
+#: src/common/utils.c:4843
+msgid "For use by strftime (morning, lowercase)|am"
+msgstr "am"
+
+#: src/common/utils.c:4844
+msgid "For use by strftime (afternoon, lowercase)|pm"
+msgstr "pm"
+
+#: src/common/utils.c:4846
+msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
+msgstr "%a %e %b %H:%M:%S %Y"
+
+#: src/common/utils.c:4847
+msgid "For use by strftime (default date format)|%m/%d/%y"
+msgstr "%d.%m.%y"
+
+#: src/common/utils.c:4848
+msgid "For use by strftime (default time format)|%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#: src/common/utils.c:4850
+msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#: src/compose.c:522

 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 

-#: src/compose.c:518
+#: src/compose.c:523

 msgid "/_Remove"
 msgstr "/_Entfernen"
 
 msgid "/_Remove"
 msgstr "/_Entfernen"
 

-#: src/compose.c:520 src/folderview.c:292
+#: src/compose.c:525 src/folderview.c:294

 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 

-#: src/compose.c:525 src/mainwindow.c:740 src/messageview.c:285
+#: src/compose.c:530 src/mainwindow.c:740 src/messageview.c:285

 msgid "/_Message"
 msgstr "/_Nachricht"
 
 msgid "/_Message"
 msgstr "/_Nachricht"
 

-#: src/compose.c:526
+#: src/compose.c:531

 msgid "/_Message/_Send"
 msgstr "/_Nachricht/Sen_den"
 
 msgid "/_Message/_Send"
 msgstr "/_Nachricht/Sen_den"
 

-#: src/compose.c:528
+#: src/compose.c:533

 msgid "/_Message/Send _later"
 msgstr "/_Nachricht/S_päter senden"
 
 msgid "/_Message/Send _later"
 msgstr "/_Nachricht/S_päter senden"
 

-#: src/compose.c:530 src/compose.c:534 src/compose.c:537 src/mainwindow.c:750
+#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:750

 #: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
 #: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
 #: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
 #: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 

-#: src/compose.c:531
+#: src/compose.c:536

 msgid "/_Message/_Attach file"
 msgstr "/_Nachricht/Datei an_hängen"
 
 msgid "/_Message/_Attach file"
 msgstr "/_Nachricht/Datei an_hängen"
 

-#: src/compose.c:532
+#: src/compose.c:537

 msgid "/_Message/_Insert file"
 msgstr "/_Nachricht/Datei _einfügen"
 
 msgid "/_Message/_Insert file"
 msgstr "/_Nachricht/Datei _einfügen"
 

-#: src/compose.c:533
+#: src/compose.c:538

 msgid "/_Message/Insert si_gnature"
 msgstr "/_Nachricht/_Unterschrift einfügen"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/_Nachricht/_Unterschrift einfügen"
 

-#: src/compose.c:535
+#: src/compose.c:540

 msgid "/_Message/_Save"
 msgstr "/_Nachricht/_Speichern"
 
 msgid "/_Message/_Save"
 msgstr "/_Nachricht/_Speichern"
 

-#: src/compose.c:538
+#: src/compose.c:543

 msgid "/_Message/_Close"
 msgstr "/_Nachricht/S_chliessen"
 
 msgid "/_Message/_Close"
 msgstr "/_Nachricht/S_chliessen"
 

-#: src/compose.c:541
+#: src/compose.c:546

 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Rückgängig"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Rückgängig"
 

-#: src/compose.c:542
+#: src/compose.c:547

 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 

-#: src/compose.c:543 src/compose.c:631 src/compose.c:634 src/compose.c:640
+#: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645

 #: src/mainwindow.c:522 src/messageview.c:167
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
 #: src/mainwindow.c:522 src/messageview.c:167
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 

-#: src/compose.c:544
+#: src/compose.c:549

 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 

-#: src/compose.c:545 src/mainwindow.c:519 src/messageview.c:165
+#: src/compose.c:550 src/mainwindow.c:519 src/messageview.c:165

 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 

-#: src/compose.c:546
+#: src/compose.c:551

 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 

-#: src/compose.c:547
+#: src/compose.c:552

 msgid "/_Edit/Special paste"
 msgstr "/_Bearbeiten/_Spezielles Einfügen"
 
 msgid "/_Edit/Special paste"
 msgstr "/_Bearbeiten/_Spezielles Einfügen"
 

-#: src/compose.c:548
+#: src/compose.c:553

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/als _Zitat"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/als _Zitat"
 

-#: src/compose.c:550
+#: src/compose.c:555

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/_umgebrochen"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/_umgebrochen"
 

-#: src/compose.c:552
+#: src/compose.c:557

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/_nicht umgebrochen"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Bearbeiten/_Spezielles Einfügen/_nicht umgebrochen"
 

-#: src/compose.c:554 src/mainwindow.c:520 src/messageview.c:166
+#: src/compose.c:559 src/mainwindow.c:520 src/messageview.c:166

 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/A_lles markieren"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/A_lles markieren"
 

-#: src/compose.c:555
+#: src/compose.c:560

 msgid "/_Edit/A_dvanced"
 msgstr "/_Bearbeiten/Erwei_tert"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Bearbeiten/Erwei_tert"
 

-#: src/compose.c:556
+#: src/compose.c:561

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen rückwärts"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen rückwärts"
 

-#: src/compose.c:561
+#: src/compose.c:566

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen vorwärts"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen vorwärts"
 

-#: src/compose.c:566
+#: src/compose.c:571

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort rückwärts"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort rückwärts"
 

-#: src/compose.c:571
+#: src/compose.c:576

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort vorwärts"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort vorwärts"
 

-#: src/compose.c:576
+#: src/compose.c:581

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Bearbeiten/Erwei_tert/Zum Zeilenanfang"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Bearbeiten/Erwei_tert/Zum Zeilenanfang"
 

-#: src/compose.c:581
+#: src/compose.c:586

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Bearbeiten/Erwei_tert/Zum Zeilenende"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Bearbeiten/Erwei_tert/Zum Zeilenende"
 

-#: src/compose.c:586
+#: src/compose.c:591

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Bearbeiten/Erwei_tert/Zur vorherigen Zeile"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Bearbeiten/Erwei_tert/Zur vorherigen Zeile"
 

-#: src/compose.c:591
+#: src/compose.c:596

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Bearbeiten/Erwei_tert/Zur nächsten Zeile"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Bearbeiten/Erwei_tert/Zur nächsten Zeile"
 

-#: src/compose.c:596
+#: src/compose.c:601

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen rückwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen rückwärts löschen"
 

-#: src/compose.c:601
+#: src/compose.c:606

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen vorwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Zeichen vorwärts löschen"
 

-#: src/compose.c:606
+#: src/compose.c:611

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort rückwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort rückwärts löschen"
 

-#: src/compose.c:611
+#: src/compose.c:616

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort vorwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Bearbeiten/Erwei_tert/Ein Wort vorwärts löschen"
 

-#: src/compose.c:616
+#: src/compose.c:621

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Bearbeiten/Erwei_tert/Zeile löschen"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Bearbeiten/Erwei_tert/Zeile löschen"
 

-#: src/compose.c:621
+#: src/compose.c:626

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Bearbeiten/Erwei_tert/Ganze Zeile löschen"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Bearbeiten/Erwei_tert/Ganze Zeile löschen"
 

-#: src/compose.c:626
+#: src/compose.c:631

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Bearbeiten/Erwei_tert/Bis zum Ende der Zeile löschen"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Bearbeiten/Erwei_tert/Bis zum Ende der Zeile löschen"
 

-#: src/compose.c:632
+#: src/compose.c:637

 msgid "/_Edit/_Find"
 msgstr "/_Bearbeiten/Su_chen"
 
 msgid "/_Edit/_Find"
 msgstr "/_Bearbeiten/Su_chen"
 

-#: src/compose.c:635
+#: src/compose.c:640

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz _umbrechen"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/Aktuellen Absatz _umbrechen"
 

-#: src/compose.c:637
+#: src/compose.c:642

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen _Zeilen umbrechen"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/Alle langen _Zeilen umbrechen"
 

-#: src/compose.c:639
+#: src/compose.c:644

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Automatisch um_brechen"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Automatisch um_brechen"
 

-#: src/compose.c:641
+#: src/compose.c:646

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Bearbeiten/Mit e_xternem Editor bearbeiten"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Bearbeiten/Mit e_xternem Editor bearbeiten"
 

-#: src/compose.c:644
+#: src/compose.c:649

 msgid "/_Spelling"
 msgstr "/_Rechtschreibung"
 
 msgid "/_Spelling"
 msgstr "/_Rechtschreibung"
 

-#: src/compose.c:645
+#: src/compose.c:650

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Rechtschreibung/Alles _prüfen oder nur Selektiertes"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Rechtschreibung/Alles _prüfen oder nur Selektiertes"
 

-#: src/compose.c:647
+#: src/compose.c:652

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Rechtschreibung/Alle _falschen Wörter markieren"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Rechtschreibung/Alle _falschen Wörter markieren"
 

-#: src/compose.c:649
+#: src/compose.c:654

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter rückwärts prüfen"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter rückwärts prüfen"
 

-#: src/compose.c:651
+#: src/compose.c:656

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter vorwärts prüfen"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter vorwärts prüfen"
 

-#: src/compose.c:653
+#: src/compose.c:658

 msgid "/_Spelling/---"
 msgstr "/_Rechtschreibung/---"
 
 msgid "/_Spelling/---"
 msgstr "/_Rechtschreibung/---"
 

-#: src/compose.c:654
+#: src/compose.c:659

 msgid "/_Spelling/Options"
 msgstr "/_Rechtschreibung/Optionen"
 
 msgid "/_Spelling/Options"
 msgstr "/_Rechtschreibung/Optionen"
 

-#: src/compose.c:657
+#: src/compose.c:662

 msgid "/_Options"
 msgstr "/_Optionen"
 
 msgid "/_Options"
 msgstr "/_Optionen"
 

-#: src/compose.c:658
+#: src/compose.c:663

 msgid "/_Options/Reply _mode"
 msgstr "/_Optionen/Antwort_methode"
 
 msgid "/_Options/Reply _mode"
 msgstr "/_Optionen/Antwort_methode"
 

-#: src/compose.c:659
+#: src/compose.c:664

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Optionen/Antwort_methode/_Normal"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Optionen/Antwort_methode/_Normal"
 

-#: src/compose.c:660
+#: src/compose.c:665

 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Optionen/Antwort_methode/A_lle"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Optionen/Antwort_methode/A_lle"
 

-#: src/compose.c:661
+#: src/compose.c:666

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Optionen/Antwort_methode/Ab_sender"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Optionen/Antwort_methode/Ab_sender"
 

-#: src/compose.c:662
+#: src/compose.c:667

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Optionen/Antwort_methode/_Mailingliste"
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Optionen/Antwort_methode/_Mailingliste"
 

-#: src/compose.c:663 src/compose.c:668 src/compose.c:675 src/compose.c:677
-#: src/compose.c:679
+#: src/compose.c:668 src/compose.c:673 src/compose.c:680 src/compose.c:682
+#: src/compose.c:684

 msgid "/_Options/---"
 msgstr "/_Optionen/---"
 
 msgid "/_Options/---"
 msgstr "/_Optionen/---"
 

-#: src/compose.c:664
+#: src/compose.c:669

 msgid "/_Options/Privacy _System"
 msgstr "/_Optionen/Datenschutz_system"
 
 msgid "/_Options/Privacy _System"
 msgstr "/_Optionen/Datenschutz_system"
 

-#: src/compose.c:665
+#: src/compose.c:670

 msgid "/_Options/Privacy _System/None"
 msgstr "/_Optionen/Datenschutz/Keines"
 
 msgid "/_Options/Privacy _System/None"
 msgstr "/_Optionen/Datenschutz/Keines"
 

-#: src/compose.c:666
+#: src/compose.c:671

 msgid "/_Options/Si_gn"
 msgstr "/_Optionen/Digital _unterschreiben"
 
 msgid "/_Options/Si_gn"
 msgstr "/_Optionen/Digital _unterschreiben"
 

-#: src/compose.c:667
+#: src/compose.c:672

 msgid "/_Options/_Encrypt"
 msgstr "/_Optionen/_Verschlüsseln"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Optionen/_Verschlüsseln"
 

-#: src/compose.c:669
+#: src/compose.c:674

 msgid "/_Options/_Priority"
 msgstr "/_Optionen/_Priorität"
 
 msgid "/_Options/_Priority"
 msgstr "/_Optionen/_Priorität"
 

-#: src/compose.c:670
+#: src/compose.c:675

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Optionen/Priorität/_Höchste"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Optionen/Priorität/_Höchste"
 

-#: src/compose.c:671
+#: src/compose.c:676

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Optionen/Priorität/H_och"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Optionen/Priorität/H_och"
 

-#: src/compose.c:672
+#: src/compose.c:677

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Optionen/Priorität/_Normal"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Optionen/Priorität/_Normal"
 

-#: src/compose.c:673
+#: src/compose.c:678

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Optionen/Priorität/Nie_drig"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Optionen/Priorität/Nie_drig"
 

-#: src/compose.c:674
+#: src/compose.c:679

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Optionen/Priorität/Nied_rigste"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Optionen/Priorität/Nied_rigste"
 

-#: src/compose.c:676
+#: src/compose.c:681

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Optionen/_Empfangsbestätigung fordern"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Optionen/_Empfangsbestätigung fordern"
 

-#: src/compose.c:678
+#: src/compose.c:683

 msgid "/_Options/Remo_ve references"
 msgstr "/_Optionen/_Referenzen entfernen"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/_Optionen/_Referenzen entfernen"
 

-#: src/compose.c:685
+#: src/compose.c:690

 msgid "/_Options/Character _encoding"
 msgstr "/_Ansicht/Zeichen_kodierung"
 
 msgid "/_Options/Character _encoding"
 msgstr "/_Ansicht/Zeichen_kodierung"
 

-#: src/compose.c:686
+#: src/compose.c:691

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Ansicht/Zeichen_kodierung/_Automatisch erkennen"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Ansicht/Zeichen_kodierung/_Automatisch erkennen"
 

-#: src/compose.c:688 src/compose.c:694 src/compose.c:702 src/compose.c:706
-#: src/compose.c:712 src/compose.c:716 src/compose.c:722 src/compose.c:728
-#: src/compose.c:732 src/compose.c:742 src/compose.c:746 src/compose.c:756
-#: src/compose.c:760
+#: src/compose.c:693 src/compose.c:699 src/compose.c:707 src/compose.c:711
+#: src/compose.c:717 src/compose.c:721 src/compose.c:727 src/compose.c:733
+#: src/compose.c:737 src/compose.c:747 src/compose.c:751 src/compose.c:761
+#: src/compose.c:765

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Ansicht/Zeichen_kodierung/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Ansicht/Zeichen_kodierung/---"
 

-#: src/compose.c:690
+#: src/compose.c:695

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/Zeichen_kodierung/7bit ascii (US-ASC_II)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/Zeichen_kodierung/7bit ascii (US-ASC_II)"
 

-#: src/compose.c:692
+#: src/compose.c:697

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/Zeichen_kodierung/Unicode (_UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Ansicht/Zeichen_kodierung/Unicode (_UTF-8)"
 

-#: src/compose.c:696
+#: src/compose.c:701

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (ISO-8859-1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (ISO-8859-1)"
 

-#: src/compose.c:698
+#: src/compose.c:703

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (ISO-8859-_15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (ISO-8859-_15)"
 

-#: src/compose.c:700
+#: src/compose.c:705

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Ansicht/Zeichen_kodierung/Westeuropäisch (Windows-1252)"
 

-#: src/compose.c:704
+#: src/compose.c:709

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/Zeichen_kodierung/Mitteleuropäisch (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/Zeichen_kodierung/Mitteleuropäisch (ISO-8859-_2)"
 

-#: src/compose.c:708
+#: src/compose.c:713

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/Zeichen_kodierung/_Baltisch (ISO-8859-13)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/Zeichen_kodierung/_Baltisch (ISO-8859-13)"
 

-#: src/compose.c:710
+#: src/compose.c:715

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/Zeichen_kodierung/Baltisch (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/Zeichen_kodierung/Baltisch (ISO-8859-_4)"
 

-#: src/compose.c:714
+#: src/compose.c:719

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/Zeichen_kodierung/Griechisch (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/Zeichen_kodierung/Griechisch (ISO-8859-_7)"
 

-#: src/compose.c:718
+#: src/compose.c:723

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/Zeichen_kodierung/Hebräisch (ISO-8859-_8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Ansicht/Zeichen_kodierung/Hebräisch (ISO-8859-_8)"
 

-#: src/compose.c:720
+#: src/compose.c:725

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/Zeichen_kodierung/Hebräisch (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Ansicht/Zeichen_kodierung/Hebräisch (Windows-1255)"
 

-#: src/compose.c:724
+#: src/compose.c:729

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Optionen/Zeichen_kodierung/Arabic (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Optionen/Zeichen_kodierung/Arabic (ISO-8859-_6)"
 

-#: src/compose.c:726
+#: src/compose.c:731

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Optionen/Zeichen_kodierung/Arabic (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Optionen/Zeichen_kodierung/Arabic (Windows-1256)"
 

-#: src/compose.c:730
+#: src/compose.c:735

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/Zeichen_kodierung/Türkisch (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/Zeichen_kodierung/Türkisch (ISO-8859-_9)"
 

-#: src/compose.c:734
+#: src/compose.c:739

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (ISO-8859-_5)"
 

-#: src/compose.c:736
+#: src/compose.c:741

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (KOI8-_R)"
 

-#: src/compose.c:738
+#: src/compose.c:743

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (KOI8-U)"
 

-#: src/compose.c:740
+#: src/compose.c:745

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/Zeichen_kodierung/Kyrillisch (Windows-1251)"
 

-#: src/compose.c:744
+#: src/compose.c:749

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/Zeichen_kodierung/Japanisch (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/Zeichen_kodierung/Japanisch (ISO-2022-_JP)"
 

-#: src/compose.c:748
+#: src/compose.c:753

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch vereinfacht (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch vereinfacht (_GB2312)"
 

-#: src/compose.c:750
+#: src/compose.c:755

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch vereinfacht (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch vereinfacht (_GB2312)"
 

-#: src/compose.c:752
+#: src/compose.c:757

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch traditionell (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch traditionell (_Big5)"
 

-#: src/compose.c:754
+#: src/compose.c:759

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch traditionell (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/Zeichen_kodierung/Chinesisch traditionell (EUC-_TW)"
 

-#: src/compose.c:758
+#: src/compose.c:763

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/Zeichen_kodierung/Koreanisch (EUC-_KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Ansicht/Zeichen_kodierung/Koreanisch (EUC-_KR)"
 

-#: src/compose.c:762
+#: src/compose.c:767

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/Zeichen_kodierung/Thailändisch (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Ansicht/Zeichen_kodierung/Thailändisch (TIS-620)"
 

-#: src/compose.c:764
+#: src/compose.c:769

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/Zeichen_kodierung/Thailändisch (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Ansicht/Zeichen_kodierung/Thailändisch (Windows-874)"
 

-#: src/compose.c:768
+#: src/compose.c:773

 msgid "/_Tools/Show _ruler"
 msgstr "/E_xtras/_Lineal anzeigen"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/E_xtras/_Lineal anzeigen"
 

-#: src/compose.c:769 src/messageview.c:303
+#: src/compose.c:774 src/messageview.c:303

 msgid "/_Tools/_Address book"
 msgstr "/E_xtras/_Adressbuch"
 
 msgid "/_Tools/_Address book"
 msgstr "/E_xtras/_Adressbuch"
 

-#: src/compose.c:770
+#: src/compose.c:775

 msgid "/_Tools/_Template"
 msgstr "/E_xtras/_Vorlagen"
 
 msgid "/_Tools/_Template"
 msgstr "/E_xtras/_Vorlagen"
 

-#: src/compose.c:771 src/mainwindow.c:832 src/messageview.c:328
+#: src/compose.c:776 src/mainwindow.c:832 src/messageview.c:328

 msgid "/_Tools/Actio_ns"
 msgstr "/E_xtras/A_ktionen"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/E_xtras/A_ktionen"
 

-#: src/compose.c:1598
+#: src/compose.c:1039 src/prefs_compose_writing.c:384
+msgid "New message subject format error."
+msgstr "neue Nachricht Betreff Formatierungsfehler."
+
+#: src/compose.c:1068 src/prefs_compose_writing.c:388
+msgid "New message body format error."
+msgstr "neue Nachricht Formatierungsfehler."
+
+#: src/compose.c:1438 src/prefs_quote.c:281
+msgid "Message reply format error."
+msgstr "Antwort Formatierungsfehler."
+
+#: src/compose.c:1555 src/prefs_quote.c:286
+msgid "Message forward format error."
+msgstr "Weiterleitung Formatierungsfehler."
+
+#: src/compose.c:1675

 msgid "Fw: multiple emails"
 msgstr "Fw: mehrere E-Mails"
 
 msgid "Fw: multiple emails"
 msgstr "Fw: mehrere E-Mails"
 

-#: src/compose.c:2021
+#: src/compose.c:2050
+msgid "Message redirect format error."
+msgstr "Umleitung Formatierungsfehler."
+
+#: src/compose.c:2119

 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 msgid "Reply-To:"
 msgstr "Antwort an:"
 

-#: src/compose.c:2024 src/compose.c:5527 src/compose.c:6295
+#: src/compose.c:2122 src/compose.c:5667 src/compose.c:6437 src/compose.c:9475

 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 

-#: src/compose.c:2027
+#: src/compose.c:2125

 msgid "Followup-To:"
 msgstr "Followup an:"
 
 msgid "Followup-To:"
 msgstr "Followup an:"
 

-#: src/compose.c:2424
+#: src/compose.c:2304
+#, c-format
+msgid "The file '%s' has been attached."
+msgstr "Die Datei '%s' wurde angehängt."
+
+#: src/compose.c:2308
+msgid "Couldn't attach a file (charset conversion failed)."
+msgstr ""
+"Datei konnte nicht angehängt werden (Zeichensatzkonvertierung "
+"fehlgeschlagen)."
+
+#: src/compose.c:2539

 msgid "Quote mark format error."
 msgstr "Zitatzeichen-Formatfehler."
 
 msgid "Quote mark format error."
 msgstr "Zitatzeichen-Formatfehler."
 

-#: src/compose.c:2447
-msgid "Message reply/forward format error."
-msgstr "Antwort-/Weiterleitungs-Formatfehler."
-
-#: src/compose.c:3004
+#: src/compose.c:3133

 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 

-#: src/compose.c:3008
+#: src/compose.c:3137

 #, c-format
 msgid "Can't read %s."
 msgstr "%s konnte nicht gelesen werden."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "%s konnte nicht gelesen werden."
 

-#: src/compose.c:3035
+#: src/compose.c:3164

 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 

-#: src/compose.c:3853
+#: src/compose.c:3983

 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 
 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 

-#: src/compose.c:3859
+#: src/compose.c:3989

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Nachricht verfassen%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Nachricht verfassen%s"
 

-#: src/compose.c:3862
+#: src/compose.c:3992

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[kein Betreff] - Nachricht verfassen%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[kein Betreff] - Nachricht verfassen%s"
 

-#: src/compose.c:3887 src/messageview.c:613
+#: src/compose.c:4017 src/messageview.c:615

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1492,32 +1730,32 @@ msgstr ""
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Konto vor dem Senden."
 
 "Kein Konto zum Versenden von E-Mails angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Konto vor dem Senden."
 

-#: src/compose.c:4064 src/compose.c:4095 src/compose.c:4126 src/toolbar.c:391
-#: src/toolbar.c:442
+#: src/compose.c:4195 src/compose.c:4226 src/compose.c:4258 src/toolbar.c:401
+#: src/toolbar.c:452

 msgid "Send"
 msgstr "Senden"
 
 msgid "Send"
 msgstr "Senden"
 

-#: src/compose.c:4065
+#: src/compose.c:4196

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard Cc Adresse. Trotzdem senden?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Der einzige Empfänger ist die Standard Cc Adresse. Trotzdem senden?"
 

-#: src/compose.c:4066 src/compose.c:4097 src/compose.c:4128 src/compose.c:4597
+#: src/compose.c:4197 src/compose.c:4228 src/compose.c:4260 src/compose.c:4737

 msgid "+_Send"
 msgstr "+_Senden"
 
 msgid "+_Send"
 msgstr "+_Senden"
 

-#: src/compose.c:4096
+#: src/compose.c:4227

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Der einzigste Empfänger ist die Standard Bcc Adresse. Trotzdem senden?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Der einzigste Empfänger ist die Standard Bcc Adresse. Trotzdem senden?"
 

-#: src/compose.c:4113
+#: src/compose.c:4244

 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben"
 
 msgid "Recipient is not specified."
 msgstr "Kein Empfänger angegeben"
 

-#: src/compose.c:4127
+#: src/compose.c:4259

 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem senden?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem senden?"
 

-#: src/compose.c:4170 src/compose.c:7756
+#: src/compose.c:4306 src/compose.c:7938

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1527,7 +1765,7 @@ msgstr ""
 "\n"
 "Zeichensatz-Konvertierung fehlgeschlagen."
 
 "\n"
 "Zeichensatz-Konvertierung fehlgeschlagen."
 

-#: src/compose.c:4173 src/compose.c:7759
+#: src/compose.c:4309 src/compose.c:7941

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1537,7 +1775,7 @@ msgstr ""
 "\n"
 "Schlüssel des Empfängers konnte nicht geholt werden."
 
 "\n"
 "Schlüssel des Empfängers konnte nicht geholt werden."
 

-#: src/compose.c:4177 src/compose.c:7753
+#: src/compose.c:4313 src/compose.c:7935

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1548,7 +1786,7 @@ msgstr ""
 "\n"
 "Signieren fehlgeschlagen: %s"
 
 "\n"
 "Signieren fehlgeschlagen: %s"
 

-#: src/compose.c:4180
+#: src/compose.c:4316

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1559,11 +1797,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4182
+#: src/compose.c:4318

 msgid "Could not queue message for sending."
 msgstr "Nachricht konnte nicht für das Senden zwischengespeichert werden"
 
 msgid "Could not queue message for sending."
 msgstr "Nachricht konnte nicht für das Senden zwischengespeichert werden"
 

-#: src/compose.c:4197 src/compose.c:4256
+#: src/compose.c:4333 src/compose.c:4394

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1572,7 +1810,7 @@ msgstr ""
 "gesendet werden. Benutzen Sie 'Wartende Nachrichten senden'\n"
 "aus dem Hauptmenu zum Wiederholen."
 
 "gesendet werden. Benutzen Sie 'Wartende Nachrichten senden'\n"
 "aus dem Hauptmenu zum Wiederholen."
 

-#: src/compose.c:4250
+#: src/compose.c:4388

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -1582,7 +1820,7 @@ msgstr ""
 "Benutzen Sie \"Wartende Nachrichten senden\" aus dem Hauptmenu zum "
 "Wiederholen."
 
 "Benutzen Sie \"Wartende Nachrichten senden\" aus dem Hauptmenu zum "
 "Wiederholen."
 

-#: src/compose.c:4594
+#: src/compose.c:4734

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1593,7 +1831,7 @@ msgstr ""
 "spezifizierten Zeichensatz %s konvertiert werden.\n"
 "Als %s senden?"
 
 "spezifizierten Zeichensatz %s konvertiert werden.\n"
 "Als %s senden?"
 

-#: src/compose.c:4653
+#: src/compose.c:4793

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1606,60 +1844,60 @@ msgstr ""
 "\n"
 "Trotzdem senden?"
 
 "\n"
 "Trotzdem senden?"
 

-#: src/compose.c:4841
+#: src/compose.c:4981

 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 
 msgid "No account for sending mails available!"
 msgstr "Kein Konto zum Versenden von E-Mails vorhanden!"
 

-#: src/compose.c:4851
+#: src/compose.c:4991

 msgid "No account for posting news available!"
 msgstr "Kein Konto zum Versenden von News vorhanden!"
 
 msgid "No account for posting news available!"
 msgstr "Kein Konto zum Versenden von News vorhanden!"
 

-#: src/compose.c:5544
+#: src/compose.c:5684

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "benutze <tab> um automatisch aus dem Adressbuch zu vervollständigen"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "benutze <tab> um automatisch aus dem Adressbuch zu vervollständigen"
 

-#: src/compose.c:5672
+#: src/compose.c:5812

 msgid "Mime type"
 msgstr "MIME-Typ"
 
 msgid "Mime type"
 msgstr "MIME-Typ"
 

-#: src/compose.c:5678 src/compose.c:5974 src/mimeview.c:212
+#: src/compose.c:5818 src/compose.c:6114 src/mimeview.c:212

 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Größe"
 
 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Größe"
 

-#: src/compose.c:5739
+#: src/compose.c:5879

 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 

-#: src/compose.c:5761 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:5901 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Durchsuchen"
 
 msgid "_Browse"
 msgstr "_Durchsuchen"
 

-#: src/compose.c:5973 src/compose.c:7163
+#: src/compose.c:6113 src/compose.c:7345

 msgid "MIME type"
 msgstr "MIME-Typ"
 
 msgid "MIME type"
 msgstr "MIME-Typ"
 

-#: src/compose.c:6045
+#: src/compose.c:6185

 msgid "Hea_der"
 msgstr "_Kopfzeilen"
 
 msgid "Hea_der"
 msgstr "_Kopfzeilen"
 

-#: src/compose.c:6049
+#: src/compose.c:6189

 msgid "_Attachments"
 msgstr "_Anhänge"
 
 msgid "_Attachments"
 msgstr "_Anhänge"
 

-#: src/compose.c:6053
+#: src/compose.c:6193

 msgid "Othe_rs"
 msgstr "Weite_res"
 
 msgid "Othe_rs"
 msgstr "Weite_res"
 

-#: src/compose.c:6068 src/summary_search.c:298
+#: src/compose.c:6208 src/summary_search.c:366

 msgid "Subject:"
 msgstr "Betreff:"
 
 msgid "Subject:"
 msgstr "Betreff:"
 

-#: src/compose.c:6257
+#: src/compose.c:6399

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1668,20 +1906,20 @@ msgstr ""
 "Die Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 
 "Die Rechtschreibprüfung konnte nicht gestartet werden.\n"
 "%s"
 

-#: src/compose.c:6369
+#: src/compose.c:6511

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Von: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Von: <i>%s</i>"
 

-#: src/compose.c:6400
+#: src/compose.c:6542

 msgid "Account to use for this email"
 msgstr "benutztes Konto für diese E-Mail"
 
 msgid "Account to use for this email"
 msgstr "benutztes Konto für diese E-Mail"
 

-#: src/compose.c:6402
+#: src/compose.c:6544

 msgid "Sender address to be used"
 msgstr "zu benutzende Absenderadresse"
 
 msgid "Sender address to be used"
 msgstr "zu benutzende Absenderadresse"
 

-#: src/compose.c:6556
+#: src/compose.c:6705

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "


@@ -1690,48 +1928,51 @@ msgstr ""
 "Das Datenschutzsystem '%s' kann nicht geladen werden. Es wird nicht möglich "
 "sein, diese Nachricht zu signieren oder zu verschlüsseln."
 
 "Das Datenschutzsystem '%s' kann nicht geladen werden. Es wird nicht möglich "
 "sein, diese Nachricht zu signieren oder zu verschlüsseln."
 

-#: src/compose.c:6795
-msgid "Message To format error."
-msgstr "Vorlangenfehler im An: Eintrag."
+#: src/compose.c:6867 src/prefs_template.c:549
+msgid "Template body format error."
+msgstr "Vorlage Formatierungsfehler."

 
 

-#: src/compose.c:6808
-msgid "Message Cc format error."
-msgstr "Vorlangenfehler im Cc: Eintrag."
+#: src/compose.c:6975 src/prefs_template.c:587
+msgid "Template To format error."
+msgstr "Vorlage An Formatierungsfehler."

 
 

-#: src/compose.c:6821
-msgid "Message Bcc format error."
-msgstr "Vorlangenfehler im Bcc: Eintrag."
+#: src/compose.c:6988 src/prefs_template.c:592
+msgid "Template Cc format error."
+msgstr "Vorlage Cc Formatierungsfehler."

 
 

-#: src/compose.c:6835
-msgid "Message subject format error."
-msgstr ""
-"Antwort-/Weiterleitungs-Formatfehler.Vorlangenfehler im Betreff: Eintrag."
+#: src/compose.c:7001 src/prefs_template.c:597
+msgid "Template Bcc format error."
+msgstr "Vorlage Bcc Formatierungsfehler."
+
+#: src/compose.c:7015 src/prefs_template.c:602
+msgid "Template subject format error."
+msgstr "Vorlage Betreff Formatierungsfehler."

 
 

-#: src/compose.c:7057
+#: src/compose.c:7239

 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ"
 
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME-Typ"
 

-#: src/compose.c:7072
+#: src/compose.c:7254

 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 

-#: src/compose.c:7145
+#: src/compose.c:7327

 msgid "Properties"
 msgstr "Eigenschaften"
 
 msgid "Properties"
 msgstr "Eigenschaften"
 

-#: src/compose.c:7196
+#: src/compose.c:7378

 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 

-#: src/compose.c:7216
+#: src/compose.c:7398

 msgid "Path"
 msgstr "Pfad"
 
 msgid "Path"
 msgstr "Pfad"
 

-#: src/compose.c:7217 src/prefs_toolbar.c:1060
+#: src/compose.c:7399 src/prefs_toolbar.c:1060

 msgid "File name"
 msgstr "Dateiname"
 
 msgid "File name"
 msgstr "Dateiname"
 

-#: src/compose.c:7400
+#: src/compose.c:7582

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1742,20 +1983,19 @@ msgstr ""
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 
 "Prozess beenden?\n"
 "Prozessgruppen-ID: %d"
 

-#: src/compose.c:7442
+#: src/compose.c:7624

 msgid "Compose: input from monitoring process\n"
 msgstr "Verfassen: Eingabe vom übergeordneten Prozess\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Verfassen: Eingabe vom übergeordneten Prozess\n"
 

-#: src/compose.c:7723 src/messageview.c:718
-msgid "Sylpheed-Claws needs network access in order to send this email."
-msgstr ""
-"Sylpheed-Claws benötigt einen Netzwerkzugang um diese E-Mail zu senden."
+#: src/compose.c:7905 src/messageview.c:720
+msgid "Claws Mail needs network access in order to send this email."
+msgstr "Claws Mail benötigt einen Netzwerkzugang um diese E-Mail zu senden."

 
 

-#: src/compose.c:7748
+#: src/compose.c:7930

 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht zwischengespeichert werden."
 
 msgid "Could not queue message."
 msgstr "Nachricht konnte nicht zwischengespeichert werden."
 

-#: src/compose.c:7750
+#: src/compose.c:7932

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1765,20 +2005,20 @@ msgstr ""
 "Nachricht konnte nicht zwischengespeichert werden\n"
 "%s."
 
 "Nachricht konnte nicht zwischengespeichert werden\n"
 "%s."
 

-#: src/compose.c:7870
+#: src/compose.c:8052

 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 
 msgid "Could not save draft."
 msgstr "Entwurf konnte nicht gespeichert werden."
 

-#: src/compose.c:7945 src/compose.c:7968
+#: src/compose.c:8127 src/compose.c:8150

 msgid "Select file"
 msgstr "Datei auswählen"
 
 msgid "Select file"
 msgstr "Datei auswählen"
 

-#: src/compose.c:7981
+#: src/compose.c:8163

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 

-#: src/compose.c:7983
+#: src/compose.c:8165

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1787,44 +2027,44 @@ msgstr ""
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 

-#: src/compose.c:8031
+#: src/compose.c:8213

 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 

-#: src/compose.c:8032
+#: src/compose.c:8214

 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 

-#: src/compose.c:8033
+#: src/compose.c:8215

 msgid "_Discard"
 msgstr "_Verwerfen"
 
 msgid "_Discard"
 msgstr "_Verwerfen"
 

-#: src/compose.c:8033
+#: src/compose.c:8215

 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 
 msgid "_Save to Drafts"
 msgstr "Entwurf _speichern"
 

-#: src/compose.c:8077
+#: src/compose.c:8259

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Soll die Vorlage '%s' angewendet werden?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Soll die Vorlage '%s' angewendet werden?"
 

-#: src/compose.c:8079
+#: src/compose.c:8261

 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 

-#: src/compose.c:8080
+#: src/compose.c:8262

 msgid "_Replace"
 msgstr "Ersetzen"
 
 msgid "_Replace"
 msgstr "Ersetzen"
 

-#: src/compose.c:8080
+#: src/compose.c:8262

 msgid "_Insert"
 msgstr "Einfügen"
 
 msgid "_Insert"
 msgstr "Einfügen"
 

-#: src/compose.c:8768
+#: src/compose.c:8950

 msgid "Insert or attach?"
 msgstr "Einfügen oder Anhängen?"
 
 msgid "Insert or attach?"
 msgstr "Einfügen oder Anhängen?"
 

-#: src/compose.c:8769
+#: src/compose.c:8951

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"


@@ -1832,15 +2072,19 @@ msgstr ""
 "Wollen Sie den Inhalt der Datei in den Nachrichtenkörper einfügen, oder an "
 "die Mail anhängen?"
 
 "Wollen Sie den Inhalt der Datei in den Nachrichtenkörper einfügen, oder an "
 "die Mail anhängen?"
 

-#: src/compose.c:8771
+#: src/compose.c:8953

 msgid "+_Insert"
 msgstr "+Einfügen"
 
 msgid "+_Insert"
 msgstr "+Einfügen"
 

-#: src/compose.c:8771
+#: src/compose.c:8953

 msgid "_Attach"
 msgstr "Anhang"
 
 msgid "_Attach"
 msgstr "Anhang"
 

-#: src/compose.c:9177
+#: src/compose.c:9152
+msgid "Quote format error."
+msgstr "Zitatzeichen-Formatfehler."
+
+#: src/compose.c:9371

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -1851,12 +2095,12 @@ msgstr ""
 
 #: src/crash.c:142
 #, c-format
 
 #: src/crash.c:142
 #, c-format

-msgid "Sylpheed-Claws process (%ld) received signal %ld"
-msgstr "Sylpheed-Claws-Prozess (%ld) empfing Signal %ld"
+msgid "Claws Mail process (%ld) received signal %ld"
+msgstr "Claws Mail Prozess (%ld) empfing Signal %ld"

 
 #: src/crash.c:188
 
 #: src/crash.c:188

-msgid "Sylpheed-Claws has crashed"
-msgstr "Sylpheed-Claws ist abgestürzt"
+msgid "Claws Mail has crashed"
+msgstr "Claws Mail ist abgestürzt"

 
 #: src/crash.c:204
 #, c-format
 
 #: src/crash.c:204
 #, c-format


@@ -1887,61 +2131,69 @@ msgstr "Bugreport erstellen"
 msgid "Save crash information"
 msgstr "Crash-Informationen speichern"
 
 msgid "Save crash information"
 msgstr "Crash-Informationen speichern"
 

-#: src/editaddress.c:153
+#: src/editaddress.c:183

 msgid "Add New Person"
 msgstr "Neue Person hinzufügen"
 
 msgid "Add New Person"
 msgstr "Neue Person hinzufügen"
 

-#: src/editaddress.c:154
+#: src/editaddress.c:184

 msgid "Edit Person Details"
 msgstr "Personendetails bearbeiten"
 
 msgid "Edit Person Details"
 msgstr "Personendetails bearbeiten"
 

-#: src/editaddress.c:316
+#: src/editaddress.c:355

 msgid "An Email address must be supplied."
 msgstr "Es muss eine E-Mail-Adresse angegeben werden."
 
 msgid "An Email address must be supplied."
 msgstr "Es muss eine E-Mail-Adresse angegeben werden."
 

-#: src/editaddress.c:490
+#: src/editaddress.c:529

 msgid "A Name and Value must be supplied."
 msgstr "Es müssen ein Name und ein Wert angegeben werden."
 
 msgid "A Name and Value must be supplied."
 msgstr "Es müssen ein Name und ein Wert angegeben werden."
 

-#: src/editaddress.c:560
+#: src/editaddress.c:618
+msgid "Discard"
+msgstr "Verwerfen"
+
+#: src/editaddress.c:619
+msgid "Apply"
+msgstr "Anwenden"
+
+#: src/editaddress.c:649 src/editaddress.c:698

 msgid "Edit Person Data"
 msgstr "Personendaten bearbeiten"
 
 msgid "Edit Person Data"
 msgstr "Personendaten bearbeiten"
 

-#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:799
+#: src/editaddress.c:759 src/expldifdlg.c:508 src/exporthtml.c:799

 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Anzeigename"
 
 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Anzeigename"
 

-#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:827
+#: src/editaddress.c:765 src/editaddress.c:769 src/ldif.c:827

 msgid "Last Name"
 msgstr "Nachname"
 
 msgid "Last Name"
 msgstr "Nachname"
 

-#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:823
+#: src/editaddress.c:766 src/editaddress.c:768 src/ldif.c:823

 msgid "First Name"
 msgstr "Vorname"
 
 msgid "First Name"
 msgstr "Vorname"
 

-#: src/editaddress.c:683
+#: src/editaddress.c:771

 msgid "Nickname"
 msgstr "Spitzname"
 
 msgid "Nickname"
 msgstr "Spitzname"
 

-#: src/editaddress.c:760 src/editaddress.c:816
+#: src/editaddress.c:848 src/editaddress.c:904

 msgid "Alias"
 msgstr "Alias"
 
 msgid "Alias"
 msgstr "Alias"
 

-#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:222
+#: src/editaddress.c:1042 src/editaddress.c:1099 src/prefs_customheader.c:222

 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Wert"
 
 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Wert"
 

-#: src/editaddress.c:1070
+#: src/editaddress.c:1161

 msgid "_User Data"
 msgstr "_persönliche Daten"
 
 msgid "_User Data"
 msgstr "_persönliche Daten"
 

-#: src/editaddress.c:1071
+#: src/editaddress.c:1162

 msgid "_Email Addresses"
 msgstr "_E-Mail-Adressen"
 
 msgid "_Email Addresses"
 msgstr "_E-Mail-Adressen"
 

-#: src/editaddress.c:1072
+#: src/editaddress.c:1163

 msgid "O_ther Attributes"
 msgstr "andere Eigenschaf_ten"
 
 msgid "O_ther Attributes"
 msgstr "andere Eigenschaf_ten"
 


@@ -1966,7 +2218,7 @@ msgid " Check File "
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr " Datei überprüfen "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1910
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1917

 msgid "File"
 msgstr "Datei"
 
 msgid "File"
 msgstr "Datei"
 


@@ -2015,11 +2267,11 @@ msgstr "Ordner bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen des Ordners ein:"
 
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen des Ordners ein:"
 

-#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:134 src/mh_gtk.c:127
+#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:137 src/mh_gtk.c:130

 msgid "New folder"
 msgstr "Neuer Ordner"
 
 msgid "New folder"
 msgstr "Neuer Ordner"
 

-#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:128
+#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen des neuen Ordners ein:"
 
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen des neuen Ordners ein:"
 


@@ -2101,12 +2353,12 @@ 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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "

-"computer as Sylpheed-Claws."
+"computer as Claws Mail."

 msgstr ""
 msgstr ""

-"Dies ist der Hostname des LDAP Servers. 'ldap.mydomain.com' könnte zum "
-"Beispiel für die Organisation 'mydomain.com' zuständig sein. Es kann auch "
+"Dies ist der Hostname des LDAP Servers. \"ldap.mydomain.com\" könnte zum "
+"Beispiel für die Organisation \"mydomain.com\" zuständig sein. Es kann auch "

 "ein IP-Adresse verwendet werden. Wenn der LDAP Server auf dem selben "
 "ein IP-Adresse verwendet werden. Wenn der LDAP Server auf dem selben "

-"Computer wie Sylpheed-Claws läuft, können sie auch 'localhost' angeben."
+"Computer wie Claws Mail läuft, können sie auch \"localhost\" angeben."

 
 #: src/editldap.c:470
 msgid "TLS"
 
 #: src/editldap.c:470
 msgid "TLS"


@@ -2152,13 +2404,13 @@ msgstr "Diesen Knopf drücken, um die Verbindung zum Server zu testen."
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Dies gibt das Verzeichnis an, das auf dem Server gesucht werden soll. "
 "Beispiele enthalten:\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Dies gibt das Verzeichnis an, das auf dem Server gesucht werden soll. "
 "Beispiele enthalten:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 


@@ -2260,13 +2512,13 @@ msgstr "Bind DN"
 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 "
 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 "

-"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "

 "performing a search."
 msgstr ""
 "Der LDAP Useraccountname zum Verbinden mit dem Server. Dies wird "
 "üblicherweise nur bei geschützten Servern verwendet. Dieser Name ist "
 "performing a search."
 msgstr ""
 "Der LDAP Useraccountname zum Verbinden mit dem Server. Dies wird "
 "üblicherweise nur bei geschützten Servern verwendet. Dieser Name ist "

-"typischerweise folgendermaßen formatiert: 'cn=user,dc=sylpheed,dc=com'. "
-"Gewöhnlich wird das Feld bei einer Suche leergelassen."
+"typischerweise folgendermaßen formatiert: \"cn=user,dc=claws-mail,dc=com\". "
+"Gewöhnlich wird das Feld bei einer Suche leer gelassen."

 
 #: src/editldap.c:741
 msgid "Bind Password"
 
 #: src/editldap.c:741
 msgid "Bind Password"


@@ -2303,7 +2555,7 @@ msgstr "Grundeinstellungen"
 msgid "Search"
 msgstr "Suchen"
 
 msgid "Search"
 msgstr "Suchen"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:488
+#: src/editldap.c:810 src/gtk/quicksearch.c:490

 msgid "Extended"
 msgstr "Erweitert"
 
 msgid "Extended"
 msgstr "Erweitert"
 


@@ -2327,19 +2579,19 @@ msgstr "vCard-Eintrag bearbeiten"
 msgid "Add New vCard Entry"
 msgstr "Neuen vCard-Eintrag hinzufügen"
 
 msgid "Add New vCard Entry"
 msgstr "Neuen vCard-Eintrag hinzufügen"
 

-#: src/exphtmldlg.c:113
+#: src/exphtmldlg.c:110

 msgid "Please specify output directory and file to create."
 msgstr "Bitte Ausgabeverzeichnis und -datei zum Erstellen angeben."
 
 msgid "Please specify output directory and file to create."
 msgstr "Bitte Ausgabeverzeichnis und -datei zum Erstellen angeben."
 

-#: src/exphtmldlg.c:116
+#: src/exphtmldlg.c:113

 msgid "Select stylesheet and formatting."
 msgstr "Stylesheet und Formatierung wählen."
 
 msgid "Select stylesheet and formatting."
 msgstr "Stylesheet und Formatierung wählen."
 

-#: src/exphtmldlg.c:119 src/expldifdlg.c:117
+#: src/exphtmldlg.c:116 src/expldifdlg.c:117

 msgid "File exported successfully."
 msgstr "Datei erfolgreich exportiert."
 
 msgid "File exported successfully."
 msgstr "Datei erfolgreich exportiert."
 

-#: src/exphtmldlg.c:184
+#: src/exphtmldlg.c:181

 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"


@@ -2348,11 +2600,11 @@ msgstr ""
 "HTML Ausgabeverzeichnis '%s' existiert nicht.\n"
 "Sind Sie bereit ein neues Verzeichnis zu erstellen?"
 
 "HTML Ausgabeverzeichnis '%s' existiert nicht.\n"
 "Sind Sie bereit ein neues Verzeichnis zu erstellen?"
 

-#: src/exphtmldlg.c:187 src/expldifdlg.c:193
+#: src/exphtmldlg.c:184 src/expldifdlg.c:193

 msgid "Create Directory"
 msgstr "Verzeichnis erstellen"
 
 msgid "Create Directory"
 msgstr "Verzeichnis erstellen"
 

-#: src/exphtmldlg.c:196
+#: src/exphtmldlg.c:193

 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"


@@ -2361,102 +2613,102 @@ msgstr ""
 "Ausgabeverzeichnis für HTML-Datei konnte nicht erstellt werden:\n"
 "%s"
 
 "Ausgabeverzeichnis für HTML-Datei konnte nicht erstellt werden:\n"
 "%s"
 

-#: src/exphtmldlg.c:198 src/expldifdlg.c:204
+#: src/exphtmldlg.c:195 src/expldifdlg.c:204

 msgid "Failed to Create Directory"
 msgstr "Erstellen des Verzeichnisses fehlgeschlagen"
 
 msgid "Failed to Create Directory"
 msgstr "Erstellen des Verzeichnisses fehlgeschlagen"
 

-#: src/exphtmldlg.c:240
+#: src/exphtmldlg.c:237

 msgid "Error creating HTML file"
 msgstr "Fehler beim Erstellen der HTML-Datei"
 
 msgid "Error creating HTML file"
 msgstr "Fehler beim Erstellen der HTML-Datei"
 

-#: src/exphtmldlg.c:326
+#: src/exphtmldlg.c:323

 msgid "Select HTML output file"
 msgstr "HTML-Ausgabedatei wählen"
 
 msgid "Select HTML output file"
 msgstr "HTML-Ausgabedatei wählen"
 

-#: src/exphtmldlg.c:390
+#: src/exphtmldlg.c:387

 msgid "HTML Output File"
 msgstr "HTML-Ausgabedatei"
 
 msgid "HTML Output File"
 msgstr "HTML-Ausgabedatei"
 

-#: src/exphtmldlg.c:399 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "Du_rchsuchen"
 
 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "Du_rchsuchen"
 

-#: src/exphtmldlg.c:452
+#: src/exphtmldlg.c:449

 msgid "Stylesheet"
 msgstr "Stylesheet"
 
 msgid "Stylesheet"
 msgstr "Stylesheet"
 

-#: src/exphtmldlg.c:460 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
-#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:1003 src/prefs_account.c:663
-#: src/summaryview.c:4983
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1678
+#: src/gtk/gtkaspell.c:2411 src/mainwindow.c:1003 src/prefs_account.c:667
+#: src/summaryview.c:4991

 msgid "None"
 msgstr "Keine"
 
 msgid "None"
 msgstr "Keine"
 

-#: src/exphtmldlg.c:461 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:458 src/prefs_summaries.c:350 src/prefs_summaries.c:691

 msgid "Default"
 msgstr "Standard"
 
 msgid "Default"
 msgstr "Standard"
 

-#: src/exphtmldlg.c:462 src/plugins/pgpcore/sgpgme.c:140
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:144

 msgid "Full"
 msgstr "Voll"
 
 msgid "Full"
 msgstr "Voll"
 

-#: src/exphtmldlg.c:463
+#: src/exphtmldlg.c:460

 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 

-#: src/exphtmldlg.c:464
+#: src/exphtmldlg.c:461

 msgid "Custom-2"
 msgstr "Benutzerdefiniert-2"
 
 msgid "Custom-2"
 msgstr "Benutzerdefiniert-2"
 

-#: src/exphtmldlg.c:465
+#: src/exphtmldlg.c:462

 msgid "Custom-3"
 msgstr "Benutzerdefiniert-3"
 
 msgid "Custom-3"
 msgstr "Benutzerdefiniert-3"
 

-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:463

 msgid "Custom-4"
 msgstr "Benutzerdefiniert-4"
 
 msgid "Custom-4"
 msgstr "Benutzerdefiniert-4"
 

-#: src/exphtmldlg.c:473
+#: src/exphtmldlg.c:470

 msgid "Full Name Format"
 msgstr "Vollständiges Namensformat"
 
 msgid "Full Name Format"
 msgstr "Vollständiges Namensformat"
 

-#: src/exphtmldlg.c:481
+#: src/exphtmldlg.c:478

 msgid "First Name, Last Name"
 msgstr "Vorname, Nachname"
 
 msgid "First Name, Last Name"
 msgstr "Vorname, Nachname"
 

-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:479

 msgid "Last Name, First Name"
 msgstr "Nachname, Vorname"
 
 msgid "Last Name, First Name"
 msgstr "Nachname, Vorname"
 

-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:486

 msgid "Color Banding"
 msgstr "Farbmarkierung"
 
 msgid "Color Banding"
 msgstr "Farbmarkierung"
 

-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:492

 msgid "Format Email Links"
 msgstr "E-Mail-Links formatieren"
 
 msgid "Format Email Links"
 msgstr "E-Mail-Links formatieren"
 

-#: src/exphtmldlg.c:501
+#: src/exphtmldlg.c:498

 msgid "Format User Attributes"
 msgstr "Benutzerattribute formatieren"
 
 msgid "Format User Attributes"
 msgstr "Benutzerattribute formatieren"
 

-#: src/exphtmldlg.c:556 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919

 msgid "File Name :"
 msgstr "Dateiname :"
 
 msgid "File Name :"
 msgstr "Dateiname :"
 

-#: src/exphtmldlg.c:566
+#: src/exphtmldlg.c:563

 msgid "Open with Web Browser"
 msgstr "Mit Webbrowser öffnen"
 
 msgid "Open with Web Browser"
 msgstr "Mit Webbrowser öffnen"
 

-#: src/exphtmldlg.c:598
+#: src/exphtmldlg.c:595

 msgid "Export Address Book to HTML File"
 msgstr "Adressbuch in HTML-Datei Exportieren"
 
 msgid "Export Address Book to HTML File"
 msgstr "Adressbuch in HTML-Datei Exportieren"
 

-#: src/exphtmldlg.c:664 src/expldifdlg.c:736 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027

 msgid "File Info"
 msgstr "Dateiinfo"
 
 msgid "File Info"
 msgstr "Dateiinfo"
 

-#: src/exphtmldlg.c:665
+#: src/exphtmldlg.c:662

 msgid "Format"
 msgstr "Format"
 
 msgid "Format"
 msgstr "Format"
 


@@ -2518,13 +2770,13 @@ msgstr "Suffix"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""

-"Das Suffix wird verwendet, um einen 'Distinguished Name' (oder DN) für einen "
-"LDAP Eintrag zu erzeugen. Beispiele enthalten:\n"
-"  dc=sylpheed,dc=org\n"
+"Das Suffix wird verwendet, um einen \"Distinguished Name\" (oder DN) für "
+"einen LDAP Eintrag zu erzeugen. Beispiele enthalten:\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 


@@ -2540,31 +2792,31 @@ msgstr "Eindeutige ID"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Die eindeutige ID des Adressbuchs wird verwendet, um einen DN zu erzeugen, "
 msgstr ""
 "Die eindeutige ID des Adressbuchs wird verwendet, um einen DN zu erzeugen, "

-"der ähnlich ist zu :\n"
-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"der ähnlich ist zu:\n"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Der Adressbuchname wird verwendet, um einen DN zu erzeugen der ähnlich "
 "formatiert ist wie:\n"
 msgstr ""
 "Der Adressbuchname wird verwendet, um einen DN zu erzeugen der ähnlich "
 "formatiert ist wie:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Die erste E-Mail-Adresse, die zu einer Person gehört, wird verwendet, um "
 "einen DN zu erzeugen, der ähnlich formatiert ist wie:\n"
 msgstr ""
 "Die erste E-Mail-Adresse, die zu einer Person gehört, wird verwendet, um "
 "einen DN zu erzeugen, der ähnlich formatiert ist wie:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:543
 msgid ""
 
 #: src/expldifdlg.c:543
 msgid ""


@@ -2614,11 +2866,11 @@ msgstr ""
 msgid "Export Address Book to LDIF File"
 msgstr "Adressbuch in LDIF Datei Exportieren"
 
 msgid "Export Address Book to LDIF File"
 msgstr "Adressbuch in LDIF Datei Exportieren"
 

-#: src/expldifdlg.c:737
+#: src/expldifdlg.c:736

 msgid "Distguished Name"
 msgstr "Distguished Name"
 
 msgid "Distguished Name"
 msgstr "Distguished Name"
 

-#: src/export.c:120 src/summaryview.c:6355
+#: src/export.c:120 src/summaryview.c:6368

 msgid "Export to mbox file"
 msgstr "Export in Mbox-Datei"
 
 msgid "Export to mbox file"
 msgstr "Export in Mbox-Datei"
 


@@ -2659,8 +2911,8 @@ msgid "Attributes"
 msgstr "Attribute"
 
 #: src/exporthtml.c:1010
 msgstr "Attribute"
 
 #: src/exporthtml.c:1010

-msgid "Sylpheed-Claws Address Book"
-msgstr "Sylpheed-Claws Adressbuch"
+msgid "Claws Mail Address Book"
+msgstr "Claws Mail Adressbuch"

 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."
 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."


@@ -2678,48 +2930,53 @@ msgstr "Name zu lang."
 msgid "Not specified."
 msgstr "Nicht angegeben."
 
 msgid "Not specified."
 msgstr "Nicht angegeben."
 

-#: src/folder.c:1277 src/foldersel.c:371 src/prefs_folder_item.c:236
+#: src/folder.c:1283 src/foldersel.c:371 src/prefs_folder_item.c:239

 msgid "Inbox"
 msgstr "Posteingang"
 
 msgid "Inbox"
 msgstr "Posteingang"
 

-#: src/folder.c:1281 src/foldersel.c:375
+#: src/folder.c:1287 src/foldersel.c:375

 msgid "Sent"
 msgstr "Gesendet"
 
 msgid "Sent"
 msgstr "Gesendet"
 

-#: src/folder.c:1285 src/foldersel.c:379 src/prefs_folder_item.c:239
+#: src/folder.c:1291 src/foldersel.c:379 src/prefs_folder_item.c:242

 msgid "Queue"
 msgstr "Postausgang"
 
 msgid "Queue"
 msgstr "Postausgang"
 

-#: src/folder.c:1289 src/foldersel.c:383 src/prefs_folder_item.c:240
-#: src/toolbar.c:366 src/toolbar.c:400 src/toolbar.c:491
+#: src/folder.c:1295 src/foldersel.c:383 src/prefs_folder_item.c:243
+#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501

 msgid "Trash"
 msgstr "Papierkorb"
 
 msgid "Trash"
 msgstr "Papierkorb"
 

-#: src/folder.c:1293 src/foldersel.c:387 src/prefs_folder_item.c:238
+#: src/folder.c:1299 src/foldersel.c:387 src/prefs_folder_item.c:241

 msgid "Drafts"
 msgstr "Entwürfe"
 
 msgid "Drafts"
 msgstr "Entwürfe"
 

-#: src/folder.c:1572
+#: src/folder.c:1578

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeitung läuft (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeitung läuft (%s)...\n"
 

-#: src/folder.c:2508
+#: src/folder.c:2514

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Alle Nachrichten in %s werden geholt...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Alle Nachrichten in %s werden geholt...\n"
 

-#: src/folder.c:2797
+#: src/folder.c:2803
+#, c-format
+msgid "Copying %s to %s...\n"
+msgstr "Kopiere %s nach %s...\n"
+
+#: src/folder.c:2803

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "%s wird nach %s verschoben...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "%s wird nach %s verschoben...\n"
 

-#: src/folder.c:3079
+#: src/folder.c:3090

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "aktualisiere Zwischenspeicher für %s..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "aktualisiere Zwischenspeicher für %s..."
 

-#: src/folder.c:3790
+#: src/folder.c:3801

 msgid "Processing messages..."
 msgstr "Bearbeitung läuft..."
 
 msgid "Processing messages..."
 msgstr "Bearbeitung läuft..."
 


@@ -2727,162 +2984,167 @@ msgstr "Bearbeitung läuft..."
 msgid "Select folder"
 msgstr "Ordner wählen"
 
 msgid "Select folder"
 msgstr "Ordner wählen"
 

-#: src/foldersel.c:558 src/imap_gtk.c:138 src/mh_gtk.c:129
+#: src/foldersel.c:558 src/imap_gtk.c:141 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr "NeuerOrdner"
 
 msgid "NewFolder"
 msgstr "NeuerOrdner"
 

-#: src/foldersel.c:566 src/imap_gtk.c:146 src/imap_gtk.c:152 src/mh_gtk.c:135
-#: src/mh_gtk.c:238
+#: src/foldersel.c:566 src/imap_gtk.c:149 src/imap_gtk.c:155 src/mh_gtk.c:138
+#: src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 

-#: src/foldersel.c:576 src/imap_gtk.c:162 src/imap_gtk.c:216 src/mh_gtk.c:145
-#: src/mh_gtk.c:245
+#: src/foldersel.c:576 src/imap_gtk.c:165 src/imap_gtk.c:219 src/mh_gtk.c:148
+#: src/mh_gtk.c:248

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Der Ordner '%s' existiert bereits."
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Der Ordner '%s' existiert bereits."
 

-#: src/foldersel.c:583 src/imap_gtk.c:168 src/mh_gtk.c:151
+#: src/foldersel.c:583 src/imap_gtk.c:171 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Ordner '%s' konnte nicht erstellt werden."
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Ordner '%s' konnte nicht erstellt werden."
 

-#: src/folderview.c:290
+#: src/folderview.c:291

 msgid "/Mark all re_ad"
 msgstr "/Alle als _gelesen markieren"
 
 msgid "/Mark all re_ad"
 msgstr "/Alle als _gelesen markieren"
 

-#: src/folderview.c:291
+#: src/folderview.c:293

 msgid "/_Search folder..."
 msgstr "/Ordner _durchsuchen..."
 
 msgid "/_Search folder..."
 msgstr "/Ordner _durchsuchen..."
 

-#: src/folderview.c:293
+#: src/folderview.c:295

 msgid "/Process_ing..."
 msgstr "/_Verarbeitungsregeln..."
 
 msgid "/Process_ing..."
 msgstr "/_Verarbeitungsregeln..."
 

-#: src/folderview.c:298
+#: src/folderview.c:300

 msgid "/Empty _trash..."
 msgstr "/_Papierkorb leeren"
 
 msgid "/Empty _trash..."
 msgstr "/_Papierkorb leeren"
 

-#: src/folderview.c:303
+#: src/folderview.c:305

 msgid "/Send _queue..."
 msgstr "/Sende wartende..."
 
 msgid "/Send _queue..."
 msgstr "/Sende wartende..."
 

-#: src/folderview.c:422 src/folderview.c:469 src/prefs_folder_column.c:80
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:80

 msgid "New"
 msgstr "Neu"
 
 msgid "New"
 msgstr "Neu"
 

-#: src/folderview.c:423 src/folderview.c:470 src/prefs_folder_column.c:81
+#: src/folderview.c:425 src/folderview.c:472 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr "Ungelesen"
 
 msgid "Unread"
 msgstr "Ungelesen"
 

-#: src/folderview.c:424 src/prefs_folder_column.c:82
+#: src/folderview.c:426 src/prefs_folder_column.c:82

 msgid "Total"
 msgstr "Gesamt"
 
 #. TRANSLATORS: This in Number sign in American style
 msgid "Total"
 msgstr "Gesamt"
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:472 src/summaryview.c:491
+#: src/folderview.c:474 src/summaryview.c:491

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 

-#: src/folderview.c:717
+#: src/folderview.c:719

 msgid "Setting folder info..."
 msgstr "Ordnerinformation werden gesetzt..."
 
 msgid "Setting folder info..."
 msgstr "Ordnerinformation werden gesetzt..."
 

-#: src/folderview.c:771 src/summaryview.c:3455
+#: src/folderview.c:773 src/summaryview.c:3453

 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 
 msgid "Mark all as read"
 msgstr "Alle als gelesen markieren"
 

-#: src/folderview.c:772 src/summaryview.c:3456
+#: src/folderview.c:774 src/summaryview.c:3454

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Sollen wirklich alle Mails in diesem Ordner als gelesen markiert werden?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Sollen wirklich alle Mails in diesem Ordner als gelesen markiert werden?"
 

-#: src/folderview.c:1058 src/imap.c:3199 src/mainwindow.c:3918 src/setup.c:90
+#: src/folderview.c:1060 src/imap.c:3190 src/mainwindow.c:3923 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Ordner %s%c%s wird durchsucht ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Ordner %s%c%s wird durchsucht ..."
 

-#: src/folderview.c:1062 src/imap.c:3204 src/mainwindow.c:3923 src/setup.c:95
+#: src/folderview.c:1064 src/imap.c:3195 src/mainwindow.c:3928 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Ordner %s wird durchsucht..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Ordner %s wird durchsucht..."
 

-#: src/folderview.c:1089
+#: src/folderview.c:1091

 msgid "Rebuild folder tree"
 msgstr "/_Ordnerbaum erneuern"
 
 msgid "Rebuild folder tree"
 msgstr "/_Ordnerbaum erneuern"
 

-#: src/folderview.c:1090
+#: src/folderview.c:1092

 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Neuerstellen des Ordnerbaumes löscht den lokalen Zwischenspeicher. Möchten "
 "Sie fortfahren?"
 
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Neuerstellen des Ordnerbaumes löscht den lokalen Zwischenspeicher. Möchten "
 "Sie fortfahren?"
 

-#: src/folderview.c:1100
+#: src/folderview.c:1102

 msgid "Rebuilding folder tree..."
 msgstr "Ordnerbaum wird erneuert..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Ordnerbaum wird erneuert..."
 

-#: src/folderview.c:1102
+#: src/folderview.c:1104

 msgid "Scanning folder tree..."
 msgstr "Ordnerbaum wird durchsucht..."
 
 msgid "Scanning folder tree..."
 msgstr "Ordnerbaum wird durchsucht..."
 

-#: src/folderview.c:1220
+#: src/folderview.c:1175
+#, c-format
+msgid "Couldn't scan folder %s\n"
+msgstr "Ordner %s konnte nicht durchsucht werden\n"
+
+#: src/folderview.c:1228

 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten geprüft..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ordner werden auf neue Nachrichten geprüft..."
 

-#: src/folderview.c:2081
+#: src/folderview.c:2090

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Schließe Ordner %s..."
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Schließe Ordner %s..."
 

-#: src/folderview.c:2120
+#: src/folderview.c:2129

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Ordner %s wird geöffnet..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Ordner %s wird geöffnet..."
 

-#: src/folderview.c:2133
+#: src/folderview.c:2142

 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 
 msgid "Folder could not be opened."
 msgstr "Ordner konnte nicht geöffnet werden."
 

-#: src/folderview.c:2294 src/mainwindow.c:2078
+#: src/folderview.c:2303 src/mainwindow.c:2079

 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 
 msgid "Empty trash"
 msgstr "Papierkorb leeren"
 

-#: src/folderview.c:2295
+#: src/folderview.c:2304

 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb löschen?"
 
 msgid "Delete all messages in trash?"
 msgstr "Alle Nachrichten im Papierkorb löschen?"
 

-#: src/folderview.c:2296 src/mainwindow.c:2080
+#: src/folderview.c:2305 src/mainwindow.c:2081

 msgid "+_Empty trash"
 msgstr "+_Papierkorb leeren"
 
 msgid "+_Empty trash"
 msgstr "+_Papierkorb leeren"
 

-#: src/folderview.c:2340 src/inc.c:1465 src/toolbar.c:2122
+#: src/folderview.c:2349 src/inc.c:1465 src/toolbar.c:2196

 msgid "Offline warning"
 msgstr "Offline-Warnung"
 
 msgid "Offline warning"
 msgstr "Offline-Warnung"
 

-#: src/folderview.c:2341 src/toolbar.c:2123
+#: src/folderview.c:2350 src/toolbar.c:2197

 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 
 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem fortfahren?"
 

-#: src/folderview.c:2352 src/toolbar.c:2142
+#: src/folderview.c:2361 src/toolbar.c:2216

 msgid "Send queued messages"
 msgstr "Wartende Nachrichten senden"
 
 msgid "Send queued messages"
 msgstr "Wartende Nachrichten senden"
 

-#: src/folderview.c:2353 src/toolbar.c:2143
+#: src/folderview.c:2362 src/toolbar.c:2217

 msgid "Send all queued messages?"
 msgstr "Alle wartende Nachrichten senden?"
 
 msgid "Send all queued messages?"
 msgstr "Alle wartende Nachrichten senden?"
 

-#: src/folderview.c:2354 src/messageview.c:579 src/messageview.c:596
-#: src/prefs_account.c:1032 src/toolbar.c:2144
+#: src/folderview.c:2363 src/messageview.c:581 src/messageview.c:598
+#: src/prefs_account.c:1039 src/toolbar.c:2218

 msgid "_Send"
 msgstr "_Senden"
 
 msgid "_Send"
 msgstr "_Senden"
 

-#: src/folderview.c:2362 src/toolbar.c:2162
+#: src/folderview.c:2371 src/toolbar.c:2236

 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden von Nachrichten des Postausgangs."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler beim Senden von Nachrichten des Postausgangs."
 

-#: src/folderview.c:2365 src/main.c:1478 src/toolbar.c:2165
+#: src/folderview.c:2374 src/main.c:1549 src/toolbar.c:2239

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -2891,45 +3153,68 @@ msgstr ""
 "Fehler beim Senden der Nachrichten im Postausgangs:\n"
 "%s"
 
 "Fehler beim Senden der Nachrichten im Postausgangs:\n"
 "%s"
 

-#: src/folderview.c:2432
+#: src/folderview.c:2441
+#, c-format
+msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgstr "Soll der Ordner '%s' in '%s' kopiert werden?"
+
+#: src/folderview.c:2442

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Soll Ordner '%s' wirklich in den Unterordner '%s' verschoben werden?"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Soll Ordner '%s' wirklich in den Unterordner '%s' verschoben werden?"
 

-#: src/folderview.c:2435
+#: src/folderview.c:2444
+msgid "Copy folder"
+msgstr "Kopiere Ordner"
+
+#: src/folderview.c:2444

 msgid "Move folder"
 msgstr "Ordner verschieben"
 
 msgid "Move folder"
 msgstr "Ordner verschieben"
 

-#: src/folderview.c:2446
+#: src/folderview.c:2455
+#, c-format
+msgid "Copying %s to %s..."
+msgstr "Kopiere %s nach %s..."
+
+#: src/folderview.c:2455

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "%s wird nach %s verschoben..."
 

-#: src/folderview.c:2475
+#: src/folderview.c:2486

 msgid "Source and destination are the same."
 msgstr "Ursprung und Ziel sind identisch."
 
 msgid "Source and destination are the same."
 msgstr "Ursprung und Ziel sind identisch."
 

-#: src/folderview.c:2478
+#: src/folderview.c:2489
+msgid "Can't copy a folder to one of its children."
+msgstr ""
+"Ein Ordner kann nicht in einen seiner untergeordneten Ordner kopiert werden."
+
+#: src/folderview.c:2490

 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
 "werden."
 
 msgid "Can't move a folder to one of its children."
 msgstr ""
 "Ein Ordner kann nicht in einen seiner untergeordneten Ordner verschoben "
 "werden."
 

-#: src/folderview.c:2481
+#: src/folderview.c:2493

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Ordner können nicht zwischen verschiedenen Mailboxen verschoben werden"
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Ordner können nicht zwischen verschiedenen Mailboxen verschoben werden"
 

-#: src/folderview.c:2484
+#: src/folderview.c:2496
+msgid "Copy failed!"
+msgstr "Kopieren fehlgeschlagen!"
+
+#: src/folderview.c:2496

 msgid "Move failed!"
 msgstr "Verschieben fehlgeschlagen!"
 
 msgid "Move failed!"
 msgstr "Verschieben fehlgeschlagen!"
 

-#: src/folderview.c:2520
+#: src/folderview.c:2532

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration für Ordner %s wird verarbeitet"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Konfiguration für Ordner %s wird verarbeitet"
 

-#: src/gedit-print.c:147 src/messageview.c:1502 src/summaryview.c:4124
-#: src/toolbar.c:178
+#: src/gedit-print.c:147 src/messageview.c:1522 src/summaryview.c:4124
+#: src/toolbar.c:182

 msgid "Print"
 msgstr "Drucken"
 
 msgid "Print"
 msgstr "Drucken"
 


@@ -3008,157 +3293,154 @@ msgstr "Fertig."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Newsgruppen empfangen (%s gelesen)"
 
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Newsgruppen empfangen (%s gelesen)"
 

-#: src/gtk/about.c:78 src/textview.c:216
+#: src/gtk/about.c:79 src/textview.c:216

 msgid "/_Open with Web browser"
 msgstr "/Mit Webbrowser öffnen"
 
 msgid "/_Open with Web browser"
 msgstr "/Mit Webbrowser öffnen"
 

-#: src/gtk/about.c:79 src/textview.c:217
+#: src/gtk/about.c:80 src/textview.c:217

 msgid "/Copy this _link"
 msgstr "/Link-Adresse kopieren"
 
 msgid "/Copy this _link"
 msgstr "/Link-Adresse kopieren"
 

-#: src/gtk/about.c:119
-msgid "About Sylpheed-Claws"
-msgstr "Über Sylpheed-Claws"
-
-#: src/gtk/about.c:161
-#, c-format
+#: src/gtk/about.c:138

 msgid ""
 msgid ""

-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
-"Locale: %s (charset: %s)\n"
-"Operating System: %s %s (%s)"
+"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
+"\n"
+"For further information visit the Claws Mail website:\n"

 msgstr ""
 msgstr ""

-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
-"Locale: %s (Zeichensatz: %s)\n"
-"Betriebssystem: %s %s (%s)"
+"Claws Mail ist ein schlankes, schnelles und hochkonfigurierbares E-"
+"Mailprogramm.\n"
+"\n"
+"Für weitere Informationen besuchen Sie die Claws Mail Webseite:\n"

 
 

-#: src/gtk/about.c:170
+#: src/gtk/about.c:144
+msgid ""
+"\n"
+"\n"
+"Claws Mail is free software released under the GPL license. If you wish to "
+"donate to the Claws Mail project you can do so at:\n"
+msgstr ""
+"\n"
+"\n"
+"Claws Mail ist freie Software, veröffentlicht unter der GPL Lizenz. Wenn Sie "
+"dem Claws Mail Projekt etwas spenden möchten, können Sie das tun unter:\n"
+
+#: src/gtk/about.c:159
+msgid ""
+"\n"
+"\n"
+"System Information\n"
+msgstr ""
+"\n"
+"\n"
+"Systeminformationen\n"
+
+#: src/gtk/about.c:165

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"

-"Operating System: %s"
+"Operating System: %s %s (%s)"

 msgstr ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (Zeichensatz: %s)\n"
 msgstr ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (Zeichensatz: %s)\n"

-"Betriebssystem: %s"
+"Betriebssystem: %s %s (%s)"

 
 

-#: src/gtk/about.c:179
+#: src/gtk/about.c:174

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"

-"Operating System: unknown"
+"Operating System: %s"

 msgstr ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (Zeichensatz: %s)\n"
 msgstr ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (Zeichensatz: %s)\n"

-"Betriebssystem: unbekannt"
+"Betriebssystem: %s"

 
 

-#: src/gtk/about.c:194
+#: src/gtk/about.c:183

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Compiled-in features:\n"
-"%s"
+"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"Locale: %s (charset: %s)\n"
+"Operating System: unknown"

 msgstr ""
 msgstr ""

-"Enthaltene Funktionen:\n"
-"%s"
+"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+"Locale: %s (Zeichensatz: %s)\n"
+"Betriebssystem: unbekannt"

 
 

-#: src/gtk/about.c:240
-msgid ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Sylpheed-Claws team"
-msgstr ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Sylpheed-Claws team"
+#: src/gtk/about.c:240 src/prefs_themes.c:706 src/wizard.c:467
+msgid "The Claws Mail Team"
+msgstr "Das Claws Mail Team"

 
 

-#: src/gtk/about.c:283
-msgid ""
-"Sylpheed-Claws is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Sylpheed-Claws website:\n"
-msgstr ""
-"Sylpheed-Claws ist ein schlankes, schnelles und hochkonfigurierbares E-"
-"Mailprogramm.\n"
-"\n"
-"Für weitere Informationen besuchen Sie die Sylpheed-Claws Webseite:\n"
+#: src/gtk/about.c:259
+msgid "Previous team members"
+msgstr "Frühere Teammitglieder"

 
 

-#: src/gtk/about.c:289
-msgid ""
-"\n"
-"\n"
-"Sylpheed-Claws is free software released under the GPL license. If you wish "
-"to donate to the Sylpheed-Claws project you can do so at:\n"
-msgstr ""
-"\n"
-"\n"
-"Sylpheed-Claws ist freie Software, veröffentlicht unter der GPL Lizenz. Wenn "
-"Sie dem Sylpheed-Claws Projekt etwas spenden möchten, können Sie das tun "
-"unter:\n"
+#: src/gtk/about.c:278
+msgid "The translation team"
+msgstr "Das Übersetzungsteam"

 
 

-#: src/gtk/about.c:296
-msgid "\n"
-msgstr "\n"
+#: src/gtk/about.c:297
+msgid "Documentation team"
+msgstr "Das Dokumentationsteam"

 
 

-#: src/gtk/about.c:307
-msgid "_Info"
-msgstr "_Informationen"
+#: src/gtk/about.c:316
+msgid "Logo"
+msgstr "Logo"

 
 #: src/gtk/about.c:335
 
 #: src/gtk/about.c:335

-msgid "The Sylpheed-Claws Team\n"
-msgstr "Das Sylpheed-Claws Team\n"
+msgid "Icons"
+msgstr "Icons"

 
 

-#: src/gtk/about.c:352
-msgid ""
-"\n"
-"Previous team members\n"
-msgstr ""
-"\n"
-"Frühere Teammitglieder\n"
+#: src/gtk/about.c:354
+msgid "Contributors"
+msgstr "Mitwirkende"

 
 

-#: src/gtk/about.c:369
-msgid ""
-"\n"
-"The translation team\n"
-msgstr ""
-"\n"
-"Das Übersetzungsteam\n"
+#: src/gtk/about.c:402
+msgid "Compiled-in Features\n"
+msgstr "Enthaltene Funktionen\n"

 
 

-#: src/gtk/about.c:386
+#: src/gtk/about.c:418

 msgid ""
 msgid ""

-"\n"
-"Documentation team\n"
-msgstr ""
-"\n"
-"Das Dokumentationsteam\n"
+"IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
+msgstr "Internet Protokoll Version 6\n"

 
 

-#: src/gtk/about.c:403
-msgid ""
-"\n"
-"Logo\n"
-msgstr ""
-"\n"
-"Logo\n"
+#: src/gtk/about.c:429
+msgid "iconv|allows converting to and from different character sets\n"
+msgstr "Konvertierung zwischen verschiedenen Zeichensätzen\n"

 
 

-#: src/gtk/about.c:420
-msgid ""
-"\n"
-"Icons\n"
-msgstr ""
-"\n"
-"Icons\n"
+#: src/gtk/about.c:439
+msgid "compface|adds support for the X-Face header\n"
+msgstr "Anzeigen von X-Face Kopfzeilen\n"

 
 

-#: src/gtk/about.c:437
-msgid ""
-"\n"
-"Contributors\n"
-msgstr ""
-"\n"
-"Mitwirkende\n"
+#: src/gtk/about.c:449
+msgid "OpenSSL|adds support for encrypted connections to servers\n"
+msgstr "verschlüsselte Verbindungen zum Server\n"

 
 

-#: src/gtk/about.c:456
-msgid "_Authors"
-msgstr "_Autoren"
+#: src/gtk/about.c:459
+msgid "LDAP|adds support for LDAP shared addressbooks\n"
+msgstr "gemeinsam genutzte LDAP Adressbücher\n"
+
+#: src/gtk/about.c:469
+msgid "JPilot|adds support for PalmOS addressbooks\n"
+msgstr "Nutzung von PamlOS Adressbüchern\n"
+
+#: src/gtk/about.c:479
+msgid "GNU/aspell|adds support for spell checking\n"
+msgstr "Rechtschreibprüfung\n"

 
 

-#: src/gtk/about.c:476
+#: src/gtk/about.c:489
+msgid "libetpan|adds support for IMAP servers\n"
+msgstr "Verbindung zu IMAP Servern\n"
+
+#: src/gtk/about.c:499
+msgid "libgnomeprint|adds support for a complete print dialog\n"
+msgstr "ein kompletter Druckdialog\n"
+
+#: src/gtk/about.c:509
+msgid "libSM|adds support for session handling\n"
+msgstr "Sitzungsverwaltung\n"
+
+#: src/gtk/about.c:541

 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 "
 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 "


@@ -3172,7 +3454,7 @@ msgstr ""
 "(wahlweise) jede neuere Version.\n"
 "\n"
 
 "(wahlweise) jede neuere Version.\n"
 "\n"
 

-#: src/gtk/about.c:482
+#: src/gtk/about.c:547

 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 "
 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 "


@@ -3186,7 +3468,7 @@ msgstr ""
 "General Public License für weitere Details.\n"
 "\n"
 
 "General Public License für weitere Details.\n"
 "\n"
 

-#: src/gtk/about.c:488
+#: src/gtk/about.c:553

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "


@@ -3198,7 +3480,7 @@ msgstr ""
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 "\n"
 
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 "\n"
 

-#: src/gtk/about.c:502
+#: src/gtk/about.c:571

 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("


@@ -3206,39 +3488,69 @@ msgstr ""
 "Dieses Produkt enthält vom OpenSSL-Projekt zur Benutzung im OpenSSL-Toolkit "
 "entwickelte Software. ("
 
 "Dieses Produkt enthält vom OpenSSL-Projekt zur Benutzung im OpenSSL-Toolkit "
 "entwickelte Software. ("
 

-#: src/gtk/about.c:506
+#: src/gtk/about.c:575

 msgid ").\n"
 msgstr ").\n"
 
 msgid ").\n"
 msgstr ").\n"
 

-#: src/gtk/about.c:518
+#: src/gtk/about.c:668
+msgid "About Claws Mail"
+msgstr "Über Claws Mail"
+
+#: src/gtk/about.c:719
+msgid ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"
+msgstr ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"und das Claws Mail Team"
+
+#: src/gtk/about.c:733
+msgid "_Info"
+msgstr "_Informationen"
+
+#: src/gtk/about.c:739
+msgid "_Authors"
+msgstr "_Autoren"
+
+#: src/gtk/about.c:745
+msgid "_Features"
+msgstr "_Funktionen"
+
+#: src/gtk/about.c:751

 msgid "_License"
 msgstr "_Lizenz"
 
 msgid "_License"
 msgstr "_Lizenz"
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:303
+#: src/gtk/about.c:759
+msgid "_Release Notes"
+msgstr "_Release Notes"
+
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:313

 msgid "Orange"
 msgstr "Orange"
 
 msgid "Orange"
 msgstr "Orange"
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:307
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:317

 msgid "Red"
 msgstr "Rot"
 
 msgid "Red"
 msgstr "Rot"
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:311
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:321

 msgid "Pink"
 msgstr "Pink"
 
 msgid "Pink"
 msgstr "Pink"
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:315
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:325

 msgid "Sky blue"
 msgstr "Himmelblau"
 
 msgid "Sky blue"
 msgstr "Himmelblau"
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:319
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:329

 msgid "Blue"
 msgstr "Blau"
 
 msgid "Blue"
 msgstr "Blau"
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:323
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:333

 msgid "Green"
 msgstr "Grün"
 
 msgid "Green"
 msgstr "Grün"
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:327
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:337

 msgid "Brown"
 msgstr "Braun"
 
 msgid "Brown"
 msgstr "Braun"
 


@@ -3369,36 +3681,36 @@ msgstr "Schriftartebeschreibung für Kopf und Fußzeile"
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Schriftart für Kopf und Fußzeile (zB \"Monospace 10\")"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Schriftart für Kopf und Fußzeile (zB \"Monospace 10\")"
 

-#: src/gtk/gtkaspell.c:606
+#: src/gtk/gtkaspell.c:632

 msgid "No dictionary selected."
 msgstr "Kein Wörterbuch ausgewählt"
 
 msgid "No dictionary selected."
 msgstr "Kein Wörterbuch ausgewählt"
 

-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
+#: src/gtk/gtkaspell.c:868 src/gtk/gtkaspell.c:1869 src/gtk/gtkaspell.c:2164

 msgid "Normal Mode"
 msgstr "Normaler Modus"
 
 msgid "Normal Mode"
 msgstr "Normaler Modus"
 

-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
+#: src/gtk/gtkaspell.c:870 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2176

 msgid "Bad Spellers Mode"
 msgstr "Schlechtschreiber-Modus"
 
 msgid "Bad Spellers Mode"
 msgstr "Schlechtschreiber-Modus"
 

-#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:909

 msgid "Unknown suggestion mode."
 msgstr "Unbekannter Vorschlagmodus"
 
 msgid "Unknown suggestion mode."
 msgstr "Unbekannter Vorschlagmodus"
 

-#: src/gtk/gtkaspell.c:1154
+#: src/gtk/gtkaspell.c:1200

 msgid "No misspelled word found."
 msgstr "Keine falschen Wörter gefunden."
 
 msgid "No misspelled word found."
 msgstr "Keine falschen Wörter gefunden."
 

-#: src/gtk/gtkaspell.c:1502
+#: src/gtk/gtkaspell.c:1548

 msgid "Replace unknown word"
 msgstr "Unbekanntes Wort ersetzen"
 
 msgid "Replace unknown word"
 msgstr "Unbekanntes Wort ersetzen"
 

-#: src/gtk/gtkaspell.c:1517
+#: src/gtk/gtkaspell.c:1563

 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">\"%s\" ersetzen durch: </span>"
 
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">\"%s\" ersetzen durch: </span>"
 

-#: src/gtk/gtkaspell.c:1562
+#: src/gtk/gtkaspell.c:1608

 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"


@@ -3406,59 +3718,63 @@ msgstr ""
 "Durch das Halten der Strg-Taste während des Drückens\n"
 "der Enter-Taste wird aus Fehlern gelernt.\n"
 
 "Durch das Halten der Strg-Taste während des Drückens\n"
 "der Enter-Taste wird aus Fehlern gelernt.\n"
 

-#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
+#: src/gtk/gtkaspell.c:1863 src/gtk/gtkaspell.c:2152

 msgid "Fast Mode"
 msgstr "Schneller Modus"
 
 msgid "Fast Mode"
 msgstr "Schneller Modus"
 

-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1970

 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "'%s' unbekannt in %s"
 
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "'%s' unbekannt in %s"
 

-#: src/gtk/gtkaspell.c:1930
+#: src/gtk/gtkaspell.c:1984

 msgid "Accept in this session"
 msgstr "Für diese Sitzung akzeptieren"
 
 msgid "Accept in this session"
 msgstr "Für diese Sitzung akzeptieren"
 

-#: src/gtk/gtkaspell.c:1940
+#: src/gtk/gtkaspell.c:1994

 msgid "Add to personal dictionary"
 msgstr "Dem persönlichen Wörterbuch hinzufügen"
 
 msgid "Add to personal dictionary"
 msgstr "Dem persönlichen Wörterbuch hinzufügen"
 

-#: src/gtk/gtkaspell.c:1950
+#: src/gtk/gtkaspell.c:2004

 msgid "Replace with..."
 msgstr "Ersetzen durch..."
 
 msgid "Replace with..."
 msgstr "Ersetzen durch..."
 

-#: src/gtk/gtkaspell.c:1963
+#: src/gtk/gtkaspell.c:2017

 #, c-format
 msgid "Check with %s"
 msgstr "Mit %s prüfen"
 
 #, c-format
 msgid "Check with %s"
 msgstr "Mit %s prüfen"
 

-#: src/gtk/gtkaspell.c:1985
+#: src/gtk/gtkaspell.c:2039

 msgid "(no suggestions)"
 msgstr "(keine Vorschläge)"
 
 msgid "(no suggestions)"
 msgstr "(keine Vorschläge)"
 

-#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
+#: src/gtk/gtkaspell.c:2050 src/gtk/gtkaspell.c:2229

 msgid "More..."
 msgstr "Mehr..."
 
 msgid "More..."
 msgstr "Mehr..."
 

-#: src/gtk/gtkaspell.c:2060
+#: src/gtk/gtkaspell.c:2114

 #, c-format
 msgid "Dictionary: %s"
 msgstr "Wörterbuch: %s"
 
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Wörterbuch: %s"
 

-#: src/gtk/gtkaspell.c:2073
+#: src/gtk/gtkaspell.c:2127

 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Alternative verwenden (%s)"
 
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Alternative verwenden (%s)"
 

-#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2138
+msgid "Use both dictionaries"
+msgstr "benutze beide Wörterbücher"
+
+#: src/gtk/gtkaspell.c:2192 src/prefs_spelling.c:218

 msgid "Check while typing"
 msgstr "Beim Schreiben überprüfen"
 
 msgid "Check while typing"
 msgstr "Beim Schreiben überprüfen"
 

-#: src/gtk/gtkaspell.c:2137
+#: src/gtk/gtkaspell.c:2208

 msgid "Change dictionary"
 msgstr "Wörterbuch wechseln"
 
 msgid "Change dictionary"
 msgstr "Wörterbuch wechseln"
 

-#: src/gtk/gtkaspell.c:2270
+#: src/gtk/gtkaspell.c:2340

 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"


@@ -3467,6 +3783,15 @@ msgstr ""
 "Das Rechtschreibprüfprogramm konnte das Wörterbuch nicht ändern.\n"
 "%s"
 
 "Das Rechtschreibprüfprogramm konnte das Wörterbuch nicht ändern.\n"
 "%s"
 

+#: src/gtk/gtkaspell.c:2386
+#, c-format
+msgid ""
+"The spell checker could not change the alternate dictionary.\n"
+"%s"
+msgstr ""
+"Das Rechtschreibprüfprogramm konnte das Wörterbuch nicht wechseln.\n"
+"%s"
+

 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "neue Nachricht"
 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "neue Nachricht"


@@ -3572,7 +3897,7 @@ msgstr "merken"
 msgid "Protocol log"
 msgstr "Mitschrift des Protokolls"
 
 msgid "Protocol log"
 msgstr "Mitschrift des Protokolls"
 

-#: src/gtk/logwindow.c:373
+#: src/gtk/logwindow.c:384

 msgid "Clear _Log"
 msgstr "Protokoll löschen"
 
 msgid "Clear _Log"
 msgstr "Protokoll löschen"
 


@@ -3616,13 +3941,13 @@ msgstr ""
 msgid "Plugins"
 msgstr "Plugins"
 
 msgid "Plugins"
 msgstr "Plugins"
 

-#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:211

 msgid "Description"
 msgstr "Beschreibung"
 
 #: src/gtk/pluginwindow.c:336
 msgid "Description"
 msgstr "Beschreibung"
 
 #: src/gtk/pluginwindow.c:336

-msgid "More plugins are available from the Sylpheed-Claws website."
-msgstr "Zusätzliche Plugins sind auf der Sylpheed-Claws Webseite verfügbar."
+msgid "More plugins are available from the Claws Mail website."
+msgstr "Zusätzliche Plugins sind auf der Claws Mail Webseite verfügbar."

 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."
 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."


@@ -3652,189 +3977,189 @@ msgstr "geladenen Plugins"
 msgid "Page Index"
 msgstr "Seitenindex"
 
 msgid "Page Index"
 msgstr "Seitenindex"
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:762
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:769

 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Konto"
 
 #: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Konto"
 
 #: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136

-#: src/prefs_summary_column.c:80 src/summaryview.c:2375
+#: src/prefs_summary_column.c:80 src/summaryview.c:2376

 msgid "Status"
 msgstr "Status"
 
 msgid "Status"
 msgstr "Status"
 

-#: src/gtk/quicksearch.c:329
+#: src/gtk/quicksearch.c:331

 msgid "all messages"
 msgstr "Alle Nachrichten"
 
 msgid "all messages"
 msgstr "Alle Nachrichten"
 

-#: src/gtk/quicksearch.c:330
+#: src/gtk/quicksearch.c:332

 msgid "messages whose age is greater than #"
 msgstr "Nachrichten, deren Alter größer ist als #"
 
 msgid "messages whose age is greater than #"
 msgstr "Nachrichten, deren Alter größer ist als #"
 

-#: src/gtk/quicksearch.c:331
+#: src/gtk/quicksearch.c:333

 msgid "messages whose age is less than #"
 msgstr "Nachrichten, deren Alter kleiner ist als #"
 
 msgid "messages whose age is less than #"
 msgstr "Nachrichten, deren Alter kleiner ist als #"
 

-#: src/gtk/quicksearch.c:332
+#: src/gtk/quicksearch.c:334

 msgid "messages which contain S in the message body"
 msgstr "Nachrichten, die S im Nachrichtenkörper enthalten"
 
 msgid "messages which contain S in the message body"
 msgstr "Nachrichten, die S im Nachrichtenkörper enthalten"
 

-#: src/gtk/quicksearch.c:333
+#: src/gtk/quicksearch.c:335

 msgid "messages which contain S in the whole message"
 msgstr "Nachrichten, die S in der ganzen Nachricht enthalten"
 
 msgid "messages which contain S in the whole message"
 msgstr "Nachrichten, die S in der ganzen Nachricht enthalten"
 

-#: src/gtk/quicksearch.c:334
+#: src/gtk/quicksearch.c:336

 msgid "messages carbon-copied to S"
 msgstr "Nachrichten mit Kopie an S"
 
 msgid "messages carbon-copied to S"
 msgstr "Nachrichten mit Kopie an S"
 

-#: src/gtk/quicksearch.c:335
+#: src/gtk/quicksearch.c:337

 msgid "message is either to: or cc: to S"
 msgstr "Nachricht ist entweder to: oder cc: an S"
 
 msgid "message is either to: or cc: to S"
 msgstr "Nachricht ist entweder to: oder cc: an S"
 

-#: src/gtk/quicksearch.c:336
+#: src/gtk/quicksearch.c:338

 msgid "deleted messages"
 msgstr "gelöschte Nachrichten"
 
 msgid "deleted messages"
 msgstr "gelöschte Nachrichten"
 

-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:339

 msgid "messages which contain S in the Sender field"
 msgstr "Nachrichten, die S im Absenderfeld enthalten"
 
 msgid "messages which contain S in the Sender field"
 msgstr "Nachrichten, die S im Absenderfeld enthalten"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:340

 msgid "true if execute \"S\" succeeds"
 msgstr "wahr, wenn der Aufruf von 'S' erfolgreich war"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "wahr, wenn der Aufruf von 'S' erfolgreich war"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:341

 msgid "messages originating from user S"
 msgstr "Nachrichten, ursprünglich von User S"
 
 msgid "messages originating from user S"
 msgstr "Nachrichten, ursprünglich von User S"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:342

 msgid "forwarded messages"
 msgstr "weitergeleitete Nachrichten"
 
 msgid "forwarded messages"
 msgstr "weitergeleitete Nachrichten"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:343

 msgid "messages which contain header S"
 msgstr "Nachrichten, die den Header S enthalten"
 
 msgid "messages which contain header S"
 msgstr "Nachrichten, die den Header S enthalten"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:344

 msgid "messages which contain S in Message-ID header"
 msgstr "Nachrichten, die S im Message-Id-Header enthalten"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "Nachrichten, die S im Message-Id-Header enthalten"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:345

 msgid "messages which contain S in inreplyto header"
 msgstr "Nachrichten, die S im 'Inreplyto'-Header enthalten"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "Nachrichten, die S im 'Inreplyto'-Header enthalten"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:346

 msgid "messages which are marked with color #"
 msgstr "Nachrichten, die mit der Farbe # markiert sind"
 
 msgid "messages which are marked with color #"
 msgstr "Nachrichten, die mit der Farbe # markiert sind"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:347

 msgid "locked messages"
 msgstr "gesperrte Nachrichten"
 
 msgid "locked messages"
 msgstr "gesperrte Nachrichten"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:348

 msgid "messages which are in newsgroup S"
 msgstr "Nachrichten in der Newsgroup S"
 
 msgid "messages which are in newsgroup S"
 msgstr "Nachrichten in der Newsgroup S"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:349

 msgid "new messages"
 msgstr "neue Nachrichten"
 
 msgid "new messages"
 msgstr "neue Nachrichten"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:350

 msgid "old messages"
 msgstr "alte Nachrichten"
 
 msgid "old messages"
 msgstr "alte Nachrichten"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:351

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "unvollständige Nachricht (nicht komplett heruntergeladen)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "unvollständige Nachricht (nicht komplett heruntergeladen)"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:352

 msgid "messages which have been replied to"
 msgstr "Nachrichten, die beantwortet wurden"
 
 msgid "messages which have been replied to"
 msgstr "Nachrichten, die beantwortet wurden"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:353

 msgid "read messages"
 msgstr "gelesene Nachrichten"
 
 msgid "read messages"
 msgstr "gelesene Nachrichten"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:354

 msgid "messages which contain S in subject"
 msgstr "Nachrichten, die S im Betreff enthalten"
 
 msgid "messages which contain S in subject"
 msgstr "Nachrichten, die S im Betreff enthalten"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:355

 msgid "messages whose score is equal to #"
 msgstr "Nachrichten, deren Score gleich # ist"
 
 msgid "messages whose score is equal to #"
 msgstr "Nachrichten, deren Score gleich # ist"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:356

 msgid "messages whose score is greater than #"
 msgstr "Nachrichten, deren Score größer als # ist"
 
 msgid "messages whose score is greater than #"
 msgstr "Nachrichten, deren Score größer als # ist"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:357

 msgid "messages whose score is lower than #"
 msgstr "Nachrichten, deren Score kleiner als # ist"
 
 msgid "messages whose score is lower than #"
 msgstr "Nachrichten, deren Score kleiner als # ist"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:358

 msgid "messages whose size is equal to #"
 msgstr "Nachrichten, deren Größe gleich # ist"
 
 msgid "messages whose size is equal to #"
 msgstr "Nachrichten, deren Größe gleich # ist"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:359

 msgid "messages whose size is greater than #"
 msgstr "Nachrichten, deren Größe größer als # ist"
 
 msgid "messages whose size is greater than #"
 msgstr "Nachrichten, deren Größe größer als # ist"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:360

 msgid "messages whose size is smaller than #"
 msgstr "Nachrichten, deren Größe kleiner als # ist"
 
 msgid "messages whose size is smaller than #"
 msgstr "Nachrichten, deren Größe kleiner als # ist"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:361

 msgid "messages which have been sent to S"
 msgstr "Nachrichten, die an S gesendet wurden"
 
 msgid "messages which have been sent to S"
 msgstr "Nachrichten, die an S gesendet wurden"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:362

 msgid "marked messages"
 msgstr "markierte Nachrichten"
 
 msgid "marked messages"
 msgstr "markierte Nachrichten"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:363

 msgid "unread messages"
 msgstr "ungelesene Nachrichten"
 
 msgid "unread messages"
 msgstr "ungelesene Nachrichten"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:364

 msgid "messages which contain S in References header"
 msgstr "Nachrichten, die S im Referenzheader enthalten"
 
 msgid "messages which contain S in References header"
 msgstr "Nachrichten, die S im Referenzheader enthalten"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:365

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "Nachrichten, die 0 zurückgeben, wenn sie an das Kommando übergeben werden - %"
 "F ist die Datei mit der Nachricht"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "Nachrichten, die 0 zurückgeben, wenn sie an das Kommando übergeben werden - %"
 "F ist die Datei mit der Nachricht"
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:366

 msgid "messages which contain S in X-Label header"
 msgstr "Nachrichten, die S im X-Label-Header enthalten"
 
 msgid "messages which contain S in X-Label header"
 msgstr "Nachrichten, die S im X-Label-Header enthalten"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:368

 msgid "logical AND operator"
 msgstr "Logischer UND Operator"
 
 msgid "logical AND operator"
 msgstr "Logischer UND Operator"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:369

 msgid "logical OR operator"
 msgstr "Logischer ODER Operator"
 
 msgid "logical OR operator"
 msgstr "Logischer ODER Operator"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:370

 msgid "logical NOT operator"
 msgstr "Logischer NICHT Operator"
 
 msgid "logical NOT operator"
 msgstr "Logischer NICHT Operator"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:371

 msgid "case sensitive search"
 msgstr "Groß-/Kleinschreibung beachten"
 
 msgid "case sensitive search"
 msgstr "Groß-/Kleinschreibung beachten"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:373

 msgid "all filtering expressions are allowed"
 msgstr "alle Filterausdrücke sind erlaubt"
 
 msgid "all filtering expressions are allowed"
 msgstr "alle Filterausdrücke sind erlaubt"
 

-#: src/gtk/quicksearch.c:379 src/summary_search.c:329
+#: src/gtk/quicksearch.c:381 src/summary_search.c:397

 msgid "Extended Search"
 msgstr "Erweiterte Suche"
 
 msgid "Extended Search"
 msgstr "Erweiterte Suche"
 

-#: src/gtk/quicksearch.c:380
+#: src/gtk/quicksearch.c:382

 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"
 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"


@@ -3846,51 +4171,51 @@ msgstr ""
 "\n"
 "Die folgenden Symbole können verwendet werden:"
 
 "\n"
 "Die folgenden Symbole können verwendet werden:"
 

-#: src/gtk/quicksearch.c:476 src/prefs_filtering_action.c:1080
-#: src/prefs_matcher.c:158 src/prefs_matcher.c:1866
-#: src/prefs_summary_column.c:82 src/prefs_template.c:190 src/quote_fmt.c:47
-#: src/summaryview.c:486
+#: src/gtk/quicksearch.c:478 src/prefs_compose_writing.c:239
+#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
+#: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
+#: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486

 msgid "Subject"
 msgstr "Betreff"
 
 msgid "Subject"
 msgstr "Betreff"
 

-#: src/gtk/quicksearch.c:480 src/prefs_filtering_action.c:1081
+#: src/gtk/quicksearch.c:482 src/prefs_filtering_action.c:1081

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "Von"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "Von"
 

-#: src/gtk/quicksearch.c:484 src/prefs_filtering_action.c:1082
+#: src/gtk/quicksearch.c:486 src/prefs_filtering_action.c:1082

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr "An"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr "An"
 

-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:497

 msgid "Recursive"
 msgstr "Rekursiv"
 
 msgid "Recursive"
 msgstr "Rekursiv"
 

-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:507

 msgid "Sticky"
 msgstr "dauerhaft"
 
 msgid "Sticky"
 msgstr "dauerhaft"
 

-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:517

 msgid "Type-ahead"
 msgstr "Simultan"
 
 msgid "Type-ahead"
 msgstr "Simultan"
 

-#: src/gtk/quicksearch.c:546
+#: src/gtk/quicksearch.c:548

 msgid " Clear "
 msgstr "Leeren"
 
 msgid " Clear "
 msgstr "Leeren"
 

-#: src/gtk/quicksearch.c:567 src/summary_search.c:282
+#: src/gtk/quicksearch.c:569 src/summary_search.c:350

 msgid "Edit search criteria"
 msgstr "Suchkriterien anpassen"
 
 msgid "Edit search criteria"
 msgstr "Suchkriterien anpassen"
 

-#: src/gtk/quicksearch.c:573
+#: src/gtk/quicksearch.c:575

 msgid " Extended Symbols... "
 msgstr " Erweiterte Symbole... "
 
 msgid " Extended Symbols... "
 msgstr " Erweiterte Symbole... "
 

-#: src/gtk/quicksearch.c:1020 src/summaryview.c:1073
+#: src/gtk/quicksearch.c:1025 src/summaryview.c:1073

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Suche in %s... \n"
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Suche in %s... \n"


@@ -4008,27 +4333,27 @@ msgstr "Zertifikate anzeigen"
 msgid "Changed SSL Certificate"
 msgstr "Geändertes SSL-Zertifikat"
 
 msgid "Changed SSL Certificate"
 msgstr "Geändertes SSL-Zertifikat"
 

-#: src/headerview.c:195 src/summaryview.c:2783 src/summaryview.c:2794
+#: src/headerview.c:195 src/summaryview.c:2784 src/summaryview.c:2795

 msgid "(No From)"
 msgstr "(Kein Von)"
 
 msgid "(No From)"
 msgstr "(Kein Von)"
 

-#: src/headerview.c:210 src/summaryview.c:2818 src/summaryview.c:2821
+#: src/headerview.c:210 src/summaryview.c:2819 src/summaryview.c:2822

 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 

-#: src/image_viewer.c:283
+#: src/image_viewer.c:284

 msgid "Filename:"
 msgstr "Dateiname:"
 
 msgid "Filename:"
 msgstr "Dateiname:"
 

-#: src/image_viewer.c:290
+#: src/image_viewer.c:291

 msgid "Filesize:"
 msgstr "Dateigröße:"
 
 msgid "Filesize:"
 msgstr "Dateigröße:"
 

-#: src/image_viewer.c:311
+#: src/image_viewer.c:312

 msgid "Load Image"
 msgstr "Bild laden"
 
 msgid "Load Image"
 msgstr "Bild laden"
 

-#: src/image_viewer.c:317
+#: src/image_viewer.c:318

 msgid "Content-Type:"
 msgstr "Content-Type:"
 
 msgid "Content-Type:"
 msgstr "Content-Type:"
 


@@ -4064,205 +4389,209 @@ msgstr "Verbindung zu %s fehlgeschlagen"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Neuverbindung...\n"
 

-#: src/imap.c:706 src/imap.c:2222 src/imap.c:2746 src/imap.c:2831
-#: src/imap.c:3165 src/imap.c:3920
-msgid "Sylpheed-Claws needs network access in order to access the IMAP server."
+#: src/imap.c:717 src/imap.c:2239 src/imap.c:2737 src/imap.c:2822
+#: src/imap.c:3156 src/imap.c:3914
+msgid "Claws Mail needs network access in order to access the IMAP server."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws benötigt Netzwerkzugang um auf diesen IMAP-Server zuzugreifen."
+"Claws Mail benötigt Netzwerkzugang um auf diesen IMAP-Server zuzugreifen."

 
 

-#: src/imap.c:780 src/inc.c:770 src/news.c:295 src/send_message.c:299
+#: src/imap.c:789 src/inc.c:770 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 

-#: src/imap.c:781 src/inc.c:771 src/news.c:296 src/send_message.c:300
+#: src/imap.c:790 src/inc.c:771 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "

-"available in this build of Sylpheed-Claws. \n"
+"available in this build of Claws Mail. \n"

 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Für diese Verbindung ist SSL-Schutz eingestellt, welcher jedoch in diesem "
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Für diese Verbindung ist SSL-Schutz eingestellt, welcher jedoch in diesem "

-"Build von Sylpheed-Claws nicht verfügbar ist. \n"
+"Build von Claws Mail nicht verfügbar ist. \n"

 "\n"
 "Soll eine Verbindung zu diesem Server hergestellt werden? Die Übertragung "
 "wäre nicht geschützt."
 
 "\n"
 "Soll eine Verbindung zu diesem Server hergestellt werden? Die Übertragung "
 "wäre nicht geschützt."
 

-#: src/imap.c:787 src/inc.c:777 src/news.c:302 src/send_message.c:306
+#: src/imap.c:796 src/inc.c:777 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "Mit dem Verbinden _fortfahren"
 
 msgid "Con_tinue connecting"
 msgstr "Mit dem Verbinden _fortfahren"
 

-#: src/imap.c:797
+#: src/imap.c:806

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Verbindung mit IMAP4-Server: %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Verbindung mit IMAP4-Server: %s..."
 

-#: src/imap.c:829
+#: src/imap.c:844

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d"
 

-#: src/imap.c:832
+#: src/imap.c:847

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 

-#: src/imap.c:861 src/imap.c:2554
+#: src/imap.c:876 src/imap.c:2545

 msgid "Can't start TLS session.\n"
 msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "TLS-Sitzung konnte nicht gestartet werden.\n"
 

-#: src/imap.c:898
+#: src/imap.c:913

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Verbindung mit IMAP4-Server %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Verbindung mit IMAP4-Server %s...\n"
 

-#: src/imap.c:909 src/imap.c:912
+#: src/imap.c:924 src/imap.c:927

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Anmeldung am IMAP-Server %s fehlgeschlagen."
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Anmeldung am IMAP-Server %s fehlgeschlagen."
 

-#: src/imap.c:1086
+#: src/imap.c:1100

 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 
 msgid "Adding messages..."
 msgstr "Nachrichten werden hinzugefügt..."
 

-#: src/imap.c:1236 src/mh.c:500
+#: src/imap.c:1252 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert..."
 

-#: src/imap.c:1411
+#: src/imap.c:1428

 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Flags konnten nicht gesetzt werden\n"
 
 msgid "can't set deleted flags\n"
 msgstr "Gelöscht-Flags konnten nicht gesetzt werden\n"
 

-#: src/imap.c:1417 src/imap.c:3672
+#: src/imap.c:1434 src/imap.c:3665

 msgid "can't expunge\n"
 msgstr "Löschen nicht möglich\n"
 
 msgid "can't expunge\n"
 msgstr "Löschen nicht möglich\n"
 

-#: src/imap.c:1861
+#: src/imap.c:1878

 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox konnte nicht erstellt werden: LIST fehlgeschlagen\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Mailbox konnte nicht erstellt werden: LIST fehlgeschlagen\n"
 

-#: src/imap.c:1877
+#: src/imap.c:1894

 msgid "can't create mailbox\n"
 msgstr "Mailbox konnte nicht erstellt werden\n"
 
 msgid "can't create mailbox\n"
 msgstr "Mailbox konnte nicht erstellt werden\n"
 

-#: src/imap.c:1958
+#: src/imap.c:1975

 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Neuer Ordnername darf nicht das Trennzeichen des Namensbereichs enthalten"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Neuer Ordnername darf nicht das Trennzeichen des Namensbereichs enthalten"
 

-#: src/imap.c:1989
+#: src/imap.c:2006

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s konnte nicht in %s umbenannt werden\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s konnte nicht in %s umbenannt werden\n"
 

-#: src/imap.c:2053
+#: src/imap.c:2070

 msgid "can't delete mailbox\n"
 msgstr "Mailbox konnte nicht gelöscht werden\n"
 
 msgid "can't delete mailbox\n"
 msgstr "Mailbox konnte nicht gelöscht werden\n"
 

-#: src/imap.c:2334
+#: src/imap.c:2316

 msgid "LIST failed\n"
 msgstr "LIST fehlgeschlagen\n"
 
 msgid "LIST failed\n"
 msgstr "LIST fehlgeschlagen\n"
 

-#: src/imap.c:2442
+#: src/imap.c:2433

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s konnte nicht ausgewählt werden\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Ordner %s konnte nicht ausgewählt werden\n"
 

-#: src/imap.c:2551
+#: src/imap.c:2542

 msgid "Server requires TLS to log in.\n"
 msgstr "Server benötigt TLS für die Anmeldung.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "Server benötigt TLS für die Anmeldung.\n"
 

-#: src/imap.c:2560
+#: src/imap.c:2551

 msgid "Can't refresh capabilities.\n"
 msgstr "Fähigkeiten konnten nicht neu geladen werden.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "Fähigkeiten konnten nicht neu geladen werden.\n"
 

-#: src/imap.c:2565
+#: src/imap.c:2556

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Connection to %s failed: server requires TLS, but Sylpheed-Claws has been "
+"Connection to %s failed: server requires TLS, but Claws Mail has been "

 "compiled without OpenSSL support.\n"
 msgstr ""
 "compiled without OpenSSL support.\n"
 msgstr ""

-"Verbindung zu %s fehlgeschlagen: Server benötigt TLS, aber Sylpheed-Claws "
-"wurde ohne OpenSSL kompiliert.\n"
+"Verbindung zu %s fehlgeschlagen: Server benötigt TLS, aber Claws Mail wurde "
+"ohne OpenSSL kompiliert.\n"

 
 

-#: src/imap.c:2573
+#: src/imap.c:2564

 msgid "Server logins are disabled.\n"
 msgstr "Serveranmeldung wurde deaktiviert.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "Serveranmeldung wurde deaktiviert.\n"
 

-#: src/imap.c:2751
+#: src/imap.c:2742

 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 
 msgid "Fetching message..."
 msgstr "Nachricht wird abgeholt..."
 

-#: src/imap.c:2918
+#: src/imap.c:2909

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv-Konvertierung schlug fehl: UTF-7 zu %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv-Konvertierung schlug fehl: UTF-7 zu %s\n"
 

-#: src/imap.c:2948
+#: src/imap.c:2939

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv-Konvertierung von %s zu UTF-7 fehlgeschlagen\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv-Konvertierung von %s zu UTF-7 fehlgeschlagen\n"
 

-#: src/imap.c:2992
+#: src/imap.c:2983

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv-Konvertierung von UTF-8 zu UTF-7 fehlgeschlagen\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv-Konvertierung von UTF-8 zu UTF-7 fehlgeschlagen\n"
 

-#: src/imap.c:3657
+#: src/imap.c:3650

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Flags konnten nicht gesetzt werden: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "Gelöscht-Flags konnten nicht gesetzt werden: %d\n"
 

-#: src/imap.c:4382
+#: src/imap.c:4376

 msgid ""
 msgid ""

-"You have one or more IMAP accounts defined. However this version of Sylpheed-"
-"Claws has been built without IMAP support; your IMAP account(s) are "
+"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 "

 "disabled.\n"
 "\n"
 "disabled.\n"
 "\n"

-"You probably need to install libetpan and recompile Sylpheed-Claws."
+"You probably need to install libetpan and recompile Claws Mail."

 msgstr ""
 "Es wurde mindestens ein IMAP Konto gefunden. Allerdings wurde diese Version "
 msgstr ""
 "Es wurde mindestens ein IMAP Konto gefunden. Allerdings wurde diese Version "

-"von Sylpheed-Claws ohne IMAP Unterstützung compiliert. Die IMAP Konten "
-"bleiben deshalb deaktiviert.\n"
+"von Claws Mail ohne IMAP Unterstützung compiliert. Die IMAP Konten bleiben "
+"deshalb deaktiviert.\n"

 "\n"
 "\n"

-"Vermutlich muss libetpan installiert und Sylpheed-Claws recompiliert werden."
+"Vermutlich muss libetpan installiert und Claws Mail neu kompiliert werden."

 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/_Neuen Ordner erstellen..."
 
 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/_Neuen Ordner erstellen..."
 

-#: src/imap_gtk.c:56 src/mh_gtk.c:51
+#: src/imap_gtk.c:57 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr "/Ordner _umbenennen..."
 
 msgid "/_Rename folder..."
 msgstr "/Ordner _umbenennen..."
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:58 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr "/Ordner ver_schieben..."
 
 msgid "/M_ove folder..."
 msgstr "/Ordner ver_schieben..."
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:59 src/mh_gtk.c:54
+msgid "/Cop_y folder..."
+msgstr "/Ordner _kopieren..."
+
+#: src/imap_gtk.c:61 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr "/Ordner _löschen..."
 
 msgid "/_Delete folder..."
 msgstr "/Ordner _löschen..."
 

-#: src/imap_gtk.c:60 src/news_gtk.c:55
+#: src/imap_gtk.c:63 src/news_gtk.c:55

 msgid "/Synchronise"
 msgstr "Synchronisieren"
 
 msgid "/Synchronise"
 msgstr "Synchronisieren"
 

-#: src/imap_gtk.c:61 src/news_gtk.c:56
+#: src/imap_gtk.c:64 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr "/Nachrichten herun_terladen"
 
 msgid "/Down_load messages"
 msgstr "/Nachrichten herun_terladen"
 

-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:58
+#: src/imap_gtk.c:66 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten _prüfen"
 
 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten _prüfen"
 

-#: src/imap_gtk.c:64 src/mh_gtk.c:56
+#: src/imap_gtk.c:67 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr "/Auf neue _Ordner prüfen"
 
 msgid "/C_heck for new folders"
 msgstr "/Auf neue _Ordner prüfen"
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:57
+#: src/imap_gtk.c:68 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr "/_Ordnerbaum erneuern"
 
 msgid "/R_ebuild folder tree"
 msgstr "/_Ordnerbaum erneuern"
 

-#: src/imap_gtk.c:135
+#: src/imap_gtk.c:138

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"


@@ -4273,21 +4602,21 @@ msgstr ""
 "Mails dafür aber Unterordner enthalten soll, \n"
 "fügen Sie ein '/' am Ende des Namens an)"
 
 "Mails dafür aber Unterordner enthalten soll, \n"
 "fügen Sie ein '/' am Ende des Namens an)"
 

-#: src/imap_gtk.c:193 src/mh_gtk.c:228
+#: src/imap_gtk.c:196 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Neuer Name für '%s':"
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Neuer Name für '%s':"
 

-#: src/imap_gtk.c:195 src/mh_gtk.c:230
+#: src/imap_gtk.c:198 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 
 msgid "Rename folder"
 msgstr "Ordner umbenennen"
 

-#: src/imap_gtk.c:204 src/imap_gtk.c:209
+#: src/imap_gtk.c:207 src/imap_gtk.c:212

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' darf nicht im Ordnernamen enthalten sein."
 

-#: src/imap_gtk.c:226 src/mh_gtk.c:255
+#: src/imap_gtk.c:229 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -4295,7 +4624,7 @@ msgstr ""
 "Der Ordner konnt nicht umbenannt werden.\n"
 "Der Name des neuen Ordners ist nicht erlaubt."
 
 "Der Ordner konnt nicht umbenannt werden.\n"
 "Der Name des neuen Ordners ist nicht erlaubt."
 

-#: src/imap_gtk.c:280 src/mh_gtk.c:176
+#: src/imap_gtk.c:281 src/mh_gtk.c:179

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -4308,12 +4637,12 @@ msgstr ""
 "\n"
 "Wollen Sie wirklich löschen?"
 
 "\n"
 "Wollen Sie wirklich löschen?"
 

-#: src/imap_gtk.c:302 src/mh_gtk.c:198 src/news_gtk.c:238
+#: src/imap_gtk.c:303 src/mh_gtk.c:201 src/news_gtk.c:238

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ordner '%s' konnte nicht entfernt werden."
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ordner '%s' konnte nicht entfernt werden."
 

-#: src/imap_gtk.c:362 src/news_gtk.c:299
+#: src/imap_gtk.c:363 src/news_gtk.c:299

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s'."
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s'."


@@ -4505,8 +4834,8 @@ msgid "Import Pine file into Address Book"
 msgstr "Pine-Datei in Adressbuch importieren"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304
 msgstr "Pine-Datei in Adressbuch importieren"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304

-msgid "Sylpheed-Claws needs network access in order to get mails."
-msgstr "Sylpheed-Claws benötigt einen Netzwerkzugang um E-Mail zu holen."
+msgid "Claws Mail needs network access in order to get mails."
+msgstr "Claws Mail benötigt einen Netzwerkzugang um E-Mail zu holen."

 
 #: src/inc.c:384
 msgid "Retrieving new messages"
 
 #: src/inc.c:384
 msgid "Retrieving new messages"


@@ -4543,7 +4872,7 @@ msgstr "Verbindung fehlgeschlagen"
 msgid "Auth failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
 msgid "Auth failed"
 msgstr "Authentifizierung fehlgeschlagen"
 

-#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2371
+#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2372

 msgid "Locked"
 msgstr "Gesperrt"
 
 msgid "Locked"
 msgstr "Gesperrt"
 


@@ -4735,57 +5064,48 @@ msgstr ""
 #: src/main.c:270
 #, c-format
 msgid ""
 #: src/main.c:270
 #, c-format
 msgid ""

-"Configuration for Sylpheed-Claws %s found.\n"
+"Configuration for %s (or previous) found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"Konfiguration für Sylpheed-Claws %s gefunden.\n"
-"Soll auf diese Konfiguration umgestellt werden?"
-
-#: src/main.c:273
-msgid "1.0.5 or previous"
-msgstr "1.0.5 oder älter"
+"Konfiguration für %s (oder älter) gefunden.\n"
+"Sollte diese Konfiguration angepasst werden?"

 
 

-#: src/main.c:273
-msgid "1.9.15 or previous"
-msgstr "1.9.15 oder älter"
-
-#: src/main.c:276
+#: src/main.c:274

 msgid "Migration of configuration"
 msgstr "Umstellung der Konfiguration"
 
 msgid "Migration of configuration"
 msgstr "Umstellung der Konfiguration"
 

-#: src/main.c:282
+#: src/main.c:280

 msgid "Copying configuration..."
 msgstr "Kopiere Konfiguration"
 
 msgid "Copying configuration..."
 msgstr "Kopiere Konfiguration"
 

-#: src/main.c:287
+#: src/main.c:285

 msgid "Migration failed!"
 msgstr "Umstellung fehlgeschlagen!"
 
 msgid "Migration failed!"
 msgstr "Umstellung fehlgeschlagen!"
 

-#: src/main.c:529
+#: src/main.c:572

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird von glib nicht unterstützt.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird von glib nicht unterstützt.\n"
 

-#: src/main.c:535
+#: src/main.c:578

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with a more recent GTK+ library than is "
+"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 "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "

-"recompile Sylpheed-Claws."
+"recompile Claws Mail."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws wurde mit einer neueren GTK+ Bibliothek kompiliert als im "
-"System verfügbar ist. Dies wird zu Abstürzen führen. Sie sollten GTK+ "
-"aktualisieren, oder Sylpheed-Claws neu kompilieren."
+"Claws Mail wurde mit einer neueren GTK+ Bibliothek kompiliert als im System "
+"verfügbar ist. Dies wird zu Abstürzen führen. Sie sollten GTK+ "
+"aktualisieren, oder Claws Mail neu kompilieren."

 
 

-#: src/main.c:544
+#: src/main.c:587

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with an older GTK+ library than is "
-"currently available. This will cause crashes. You need to recompile Sylpheed-"
-"Claws."
+"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 ""
 msgstr ""

-"Sylpheed-Claws wurde mit einer äteren GTK+ Bibliothek kompiliert als im "
-"System verfügbar ist. Dies wird zu Abstürzen führen. Sie sollten Sylpheed-"
-"Claws neu kompilieren."
+"Claws Mail wurde mit einer äteren GTK+ Bibliothek kompiliert als im System "
+"verfügbar ist. Dies wird zu Abstürzen führen. Sie sollten Claws Mail neu "
+"kompilieren."

 
 

-#: src/main.c:754
+#: src/main.c:810

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."


@@ -4793,32 +5113,41 @@ msgstr ""
 "Eine Plugins konnten nicht geladenwerden. Prüfen sie die Plugineinstellungen "
 "für mehr Informationen."
 
 "Eine Plugins konnten nicht geladenwerden. Prüfen sie die Plugineinstellungen "
 "für mehr Informationen."
 

-#: src/main.c:765
+#: src/main.c:822
+msgid ""
+"Claws Mail has detected a configured mailbox, but is it incomplete. It is "
+"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
+"mailbox's folder to try to fix it."
+msgstr ""
+"Claws Mail hat ein unvollständig konfiguriertes Postfach erkannt. Möglicher "
+"Weise liegt dies an einem fehlerhaften IMAP Konto. \"Ordnerbaum erneuern\" "
+"im Hauptverzeichnis des Postfaches könnte das Problem lösen."
+
+#: src/main.c:828

 msgid ""
 msgid ""

-"Sylpheed-Claws has detected a configured mailbox, but could not load it. It "
-"is probably provided by an out-of-date external plugin. Please reinstall the "
+"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 ""
 "plugin and try again."
 msgstr ""

-"Sylpheed-Claws hat eine konfigurierte Mailbox gefunden, kann diese aber "
-"nicht laden. Diese Mailbox wird vermutlich von einem alten Plugin zur "
-"Verfügung gestellt. Bitte installieren Sie das Plugin neu und versuchen es "
-"noch einmal."
+"Claws Mail hat eine konfigurierte Mailbox gefunden, kann diese aber nicht "
+"laden. Diese Mailbox wird vermutlich von einem alten Plugin zur Verfügung "
+"gestellt. Bitte installieren Sie das Plugin neu und versuchen es noch einmal."

 
 

-#: src/main.c:1008
+#: src/main.c:1074

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 

-#: src/main.c:1010
+#: src/main.c:1076

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 

-#: src/main.c:1011
+#: src/main.c:1077

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      abonniere die angegebene URI wenn es möglich ist"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr ""
 "  --subscribe [uri]      abonniere die angegebene URI wenn es möglich ist"
 

-#: src/main.c:1012
+#: src/main.c:1078

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -4829,23 +5158,23 @@ msgstr ""
 "Datei/-en\n"
 "                         als Anhang"
 
 "Datei/-en\n"
 "                         als Anhang"
 

-#: src/main.c:1015
+#: src/main.c:1081

 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 

-#: src/main.c:1016
+#: src/main.c:1082

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Konten"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Konten"
 

-#: src/main.c:1017
+#: src/main.c:1083

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle zwischengespeicherten Nachrichten"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle zwischengespeicherten Nachrichten"
 

-#: src/main.c:1018
+#: src/main.c:1084

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ordner]...   zeigt die Anzahl neuer Nachrichten"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ordner]...   zeigt die Anzahl neuer Nachrichten"
 

-#: src/main.c:1019
+#: src/main.c:1085

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -4853,77 +5182,77 @@ msgstr ""
 "  --status-full [Ordner]...\n"
 "                         zeigt den Status jedes Ordners"
 
 "  --status-full [Ordner]...\n"
 "                         zeigt den Status jedes Ordners"
 

-#: src/main.c:1021
+#: src/main.c:1087

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"

-"                         folder is a folder id like '#mh/Mailbox/inbox'"
+"                         folder is a folder id like 'folder/sub_folder'"

 msgstr ""
 "  --select Ordner[/Nachricht]  springt zu dem angegebenen Ordner/Nachricht\n"
 msgstr ""
 "  --select Ordner[/Nachricht]  springt zu dem angegebenen Ordner/Nachricht\n"

-"                         Ordner ist eine Ordner-ID wie zB: '#mh/Mailbox/"
-"inbox'"
+"                         Ordner ist eine Ordner-ID wie zB: 'Ordner/"
+"Unterordner'"

 
 

-#: src/main.c:1023
+#: src/main.c:1089

 msgid "  --online               switch to online mode"
 msgstr "  --online               schaltet in den Onlinemodus"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               schaltet in den Onlinemodus"
 

-#: src/main.c:1024
+#: src/main.c:1090

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              schaltet in den Offlinemodus"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              schaltet in den Offlinemodus"
 

-#: src/main.c:1025
-msgid "  --exit                 exit Sylpheed-Claws"
-msgstr "  --exit                 beende Sylpheed-Claws"
+#: src/main.c:1091
+msgid "  --exit                 exit Claws Mail"
+msgstr "  --exit                 beende Claws Mail"

 
 

-#: src/main.c:1026
+#: src/main.c:1092

 msgid "  --debug                debug mode"
 msgstr "  --debug                Debugmodus"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                Debugmodus"
 

-#: src/main.c:1027
+#: src/main.c:1093

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 zeigt diese Hilfe an"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 zeigt diese Hilfe an"
 

-#: src/main.c:1028
+#: src/main.c:1094

 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Versionsinformationen aus und beendet"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Versionsinformationen aus und beendet"
 

-#: src/main.c:1029
+#: src/main.c:1095

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           gibt das Konfigurationsverzeichnis aus"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           gibt das Konfigurationsverzeichnis aus"
 

-#: src/main.c:1094
+#: src/main.c:1160

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Bearbeitung läuft (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Bearbeitung läuft (%s)..."
 

-#: src/main.c:1097
+#: src/main.c:1163

 msgid "top level folder"
 msgstr "Oberster Ordner"
 
 msgid "top level folder"
 msgstr "Oberster Ordner"
 

-#: src/main.c:1161
+#: src/main.c:1227

 msgid "Really quit?"
 msgstr "Wirklich beenden?"
 
 msgid "Really quit?"
 msgstr "Wirklich beenden?"
 

-#: src/main.c:1162
+#: src/main.c:1228

 msgid "Composing message exists."
 msgstr "Verfasste Nachricht existiert."
 
 msgid "Composing message exists."
 msgstr "Verfasste Nachricht existiert."
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Save to Draft"
 msgstr "Entwurf _speichern"
 
 msgid "_Save to Draft"
 msgstr "Entwurf _speichern"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Discard them"
 msgstr "_Verwerfen"
 
 msgid "_Discard them"
 msgstr "_Verwerfen"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "Do_n't quit"
 msgstr "Nicht bee_nden"
 
 msgid "Do_n't quit"
 msgstr "Nicht bee_nden"
 

-#: src/main.c:1178
+#: src/main.c:1244

 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 
 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 

-#: src/main.c:1179
+#: src/main.c:1245

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Es sind ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Es sind ungesendete Nachrichten vorhanden. Jetzt beenden?"
 


@@ -5782,23 +6111,24 @@ msgid "Select account"
 msgstr "Konto wählen"
 
 #: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738
 msgstr "Konto wählen"
 
 #: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738

-#: src/mainwindow.c:1774 src/mainwindow.c:1816 src/prefs_folder_item.c:756
+#: src/mainwindow.c:1774 src/mainwindow.c:1817
+#: src/plugins/trayicon/trayicon.c:143 src/prefs_folder_item.c:762

 msgid "Untitled"
 msgstr "Unbenannt"
 
 msgid "Untitled"
 msgstr "Unbenannt"
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1818

 msgid "none"
 msgstr "nicht"
 
 msgid "none"
 msgstr "nicht"
 

-#: src/mainwindow.c:2079
+#: src/mainwindow.c:2080

 msgid "Delete all messages in trash folders?"
 msgstr "Alle Nachrichten der Papierkörbe löschen?"
 
 msgid "Delete all messages in trash folders?"
 msgstr "Alle Nachrichten der Papierkörbe löschen?"
 

-#: src/mainwindow.c:2098
+#: src/mainwindow.c:2099

 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 

-#: src/mainwindow.c:2099
+#: src/mainwindow.c:2100

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -5808,16 +6138,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wird,\n"
 "wird sie automatisch durchsucht."
 
 "Wenn die existierende Mailbox angegeben wird,\n"
 "wird sie automatisch durchsucht."
 

-#: src/mainwindow.c:2105
+#: src/mainwindow.c:2106

 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox '%s' existiert bereits."
 
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox '%s' existiert bereits."
 

-#: src/mainwindow.c:2110 src/setup.c:51
+#: src/mainwindow.c:2111 src/setup.c:51

 msgid "Mailbox"
 msgstr "Mailbox"
 
 msgid "Mailbox"
 msgstr "Mailbox"
 

-#: src/mainwindow.c:2115 src/setup.c:54
+#: src/mainwindow.c:2116 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 "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -5827,90 +6157,80 @@ msgstr ""
 "Möglicherweise existieren bereits einige Dateien, oder Sie haben keine "
 "Schreibrechte"
 
 "Möglicherweise existieren bereits einige Dateien, oder Sie haben keine "
 "Schreibrechte"
 

-#: src/mainwindow.c:2431
+#: src/mainwindow.c:2432

 msgid "No posting allowed"
 msgstr "keine Nachrichten erlaubt"
 
 msgid "No posting allowed"
 msgstr "keine Nachrichten erlaubt"
 

-#: src/mainwindow.c:2696
-msgid "Sylpheed-Claws - Folder View"
-msgstr "Sylpheed-Claws - Ordneransicht"
+#: src/mainwindow.c:2699
+msgid "Claws Mail - Folder View"
+msgstr "Claws Mail - Ordneransicht"

 
 

-#: src/mainwindow.c:2732 src/messageview.c:449 src/messageview.c:855
-msgid "Sylpheed-Claws - Message View"
-msgstr "Sylpheed-Claws - Nachrichtenanzeige"
+#: src/mainwindow.c:2735 src/messageview.c:449 src/messageview.c:858
+msgid "Claws Mail - Message View"
+msgstr "Claws Mail - Nachrichtenanzeige"

 
 

-#: src/mainwindow.c:3082
+#: src/mainwindow.c:3085

 msgid "Mbox import has failed."
 msgstr "Der Import der Mbox ist fehlgeschlagen."
 
 msgid "Mbox import has failed."
 msgstr "Der Import der Mbox ist fehlgeschlagen."
 

-#: src/mainwindow.c:3091 src/mainwindow.c:3100
+#: src/mainwindow.c:3094 src/mainwindow.c:3103

 msgid "Export to mbox has failed."
 msgstr "Der Export in die mbox ist fehlgeschlagen."
 
 msgid "Export to mbox has failed."
 msgstr "Der Export in die mbox ist fehlgeschlagen."
 

-#: src/mainwindow.c:3123 src/plugins/trayicon/trayicon.c:426
+#: src/mainwindow.c:3126 src/plugins/trayicon/trayicon.c:474

 msgid "Exit"
 msgstr "Beenden"
 
 msgid "Exit"
 msgstr "Beenden"
 

-#: src/mainwindow.c:3123
-msgid "Exit Sylpheed-Claws?"
-msgstr "Sylpheed-Claws beenden?"
+#: src/mainwindow.c:3126
+msgid "Exit Claws Mail?"
+msgstr "Claws Mail beenden?"

 
 

-#: src/mainwindow.c:3269
+#: src/mainwindow.c:3271

 msgid "Folder synchronisation"
 msgstr "Ordner-Synchronisation"
 
 msgid "Folder synchronisation"
 msgstr "Ordner-Synchronisation"
 

-#: src/mainwindow.c:3270
+#: src/mainwindow.c:3272

 msgid "Do you want to synchronise your folders now?"
 msgstr "Sollen die Ordner jetzt synchronisiert werden?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sollen die Ordner jetzt synchronisiert werden?"
 

-#: src/mainwindow.c:3271
+#: src/mainwindow.c:3273

 msgid "+_Synchronise"
 msgstr "+_Synchronisieren"
 
 msgid "+_Synchronise"
 msgstr "+_Synchronisieren"
 

-#: src/mainwindow.c:3602
+#: src/mainwindow.c:3604

 msgid "Deleting duplicated messages..."
 msgstr "Mehrfach vorhandene Nachrichten werden gelöscht..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Mehrfach vorhandene Nachrichten werden gelöscht..."
 

-#: src/mainwindow.c:3636
+#: src/mainwindow.c:3641

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d doppelte Nachricht in Ordner %d gelöscht.\n"
 msgstr[1] "%d doppelte Nachrichten in Ordner %d gelöscht.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "%d doppelte Nachricht in Ordner %d gelöscht.\n"
 msgstr[1] "%d doppelte Nachrichten in Ordner %d gelöscht.\n"
 

-#: src/mainwindow.c:3795 src/summaryview.c:4775
+#: src/mainwindow.c:3800 src/summaryview.c:4783

 msgid "Processing rules to apply before folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden vor den Ordnerregeln"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden vor den Ordnerregeln"
 

-#: src/mainwindow.c:3804
+#: src/mainwindow.c:3809

 msgid "Processing rules to apply after folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden nach den Ordnerregeln"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden nach den Ordnerregeln"
 

-#: src/mainwindow.c:3813 src/summaryview.c:4786
+#: src/mainwindow.c:3818 src/summaryview.c:4794

 msgid "Filtering configuration"
 msgstr "Filterungs-Konfiguration"
 
 msgid "Filtering configuration"
 msgstr "Filterungs-Konfiguration"
 

-#: src/mainwindow.c:4067
-#, c-format
-msgid "not initialized\n"
-msgstr "nicht initialisiert\n"
-
-#: src/mainwindow.c:4079 src/mainwindow.c:4090
-#, c-format
-msgid "selecting folder '%s'\n"
-msgstr "wähle Ordner '%s' aus\n"
-
-#: src/mainwindow.c:4094
-#, c-format
-msgid "selecting message %d\n"
-msgstr "wähle Nachricht %d\n"
+#: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
+#: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
+msgid "Filtering Matcher Menu|All"
+msgstr "Alle"

 
 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(nichts)"
 
 
 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(nichts)"
 

-#: src/mbox.c:85
+#: src/mbox.c:98

 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 #, c-format
 msgid ""
 "Could not open mbox file:\n"


@@ -5919,25 +6239,25 @@ msgstr ""
 "mbox Datei konnte nicht geöffet werden:\n"
 "%s\n"
 
 "mbox Datei konnte nicht geöffet werden:\n"
 "%s\n"
 

-#: src/mbox.c:121
+#: src/mbox.c:134

 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Importiere aus mbox... (%d mails importiert)"
 
 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Importiere aus mbox... (%d mails importiert)"
 

-#: src/mbox.c:468
+#: src/mbox.c:481

 msgid "Overwrite mbox file"
 msgstr "überschreibe mbox Datei"
 
 msgid "Overwrite mbox file"
 msgstr "überschreibe mbox Datei"
 

-#: src/mbox.c:469
+#: src/mbox.c:482

 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie überschrieben werden?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Die Datei existiert bereits. Soll sie überschrieben werden?"
 

-#: src/mbox.c:470 src/messageview.c:1143 src/mimeview.c:1422
-#: src/textview.c:2650
+#: src/mbox.c:483 src/messageview.c:1146 src/mimeview.c:1443
+#: src/textview.c:2654

 msgid "Overwrite"
 msgstr "Überschreiben"
 
 msgid "Overwrite"
 msgstr "Überschreiben"
 

-#: src/mbox.c:479
+#: src/mbox.c:492

 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 #, c-format
 msgid ""
 "Could not create mbox file:\n"


@@ -5946,39 +6266,39 @@ msgstr ""
 "mbox Datei konnte nicht agelegt werden:\n"
 "%s\n"
 
 "mbox Datei konnte nicht agelegt werden:\n"
 "%s\n"
 

-#: src/mbox.c:483
+#: src/mbox.c:500

 msgid "Exporting to mbox..."
 msgstr "Export in Mbox-Datei..."
 
 msgid "Exporting to mbox..."
 msgstr "Export in Mbox-Datei..."
 

-#: src/message_search.c:162
+#: src/message_search.c:169

 msgid "Find in current message"
 msgstr "In aktueller Nachricht suchen"
 
 msgid "Find in current message"
 msgstr "In aktueller Nachricht suchen"
 

-#: src/message_search.c:180
+#: src/message_search.c:187

 msgid "Find text:"
 msgstr "Suchen nach:"
 
 msgid "Find text:"
 msgstr "Suchen nach:"
 

-#: src/message_search.c:195 src/prefs_matcher.c:649 src/summary_search.c:324
+#: src/message_search.c:210 src/prefs_matcher.c:649 src/summary_search.c:392

 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
 
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
 

-#: src/message_search.c:301 src/summary_search.c:535
+#: src/message_search.c:323 src/summary_search.c:637

 msgid "Search failed"
 msgstr "Suche fehlgeschlagen"
 
 msgid "Search failed"
 msgstr "Suche fehlgeschlagen"
 

-#: src/message_search.c:302 src/summary_search.c:536
+#: src/message_search.c:324 src/summary_search.c:638

 msgid "Search string not found."
 msgstr "Gesuchte Zeichenkette nicht gefunden."
 
 msgid "Search string not found."
 msgstr "Gesuchte Zeichenkette nicht gefunden."
 

-#: src/message_search.c:311
+#: src/message_search.c:333

 msgid "Beginning of message reached; continue from end?"
 msgstr "Anfang der Nachricht erreicht. Weiter vom Ende?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "Anfang der Nachricht erreicht. Weiter vom Ende?"
 

-#: src/message_search.c:314
+#: src/message_search.c:336

 msgid "End of message reached; continue from beginning?"
 msgstr "Ende der Nachricht erreicht. Weiter vom Anfang?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Ende der Nachricht erreicht. Weiter vom Anfang?"
 

-#: src/message_search.c:317 src/summary_search.c:547
+#: src/message_search.c:339 src/summary_search.c:649

 msgid "Search finished"
 msgstr "Suche beendet"
 
 msgid "Search finished"
 msgstr "Suche beendet"
 


@@ -6018,11 +6338,11 @@ msgstr "/E_xtras/Verarbeitungsregel erstellen/nach Empf_änger"
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/E_xtras/Verarbeitungsregel erstellen/nach _Betreff"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/E_xtras/Verarbeitungsregel erstellen/nach _Betreff"
 

-#: src/messageview.c:564
+#: src/messageview.c:566

 msgid "<No Return-Path found>"
 msgstr "<Kein Antwortpfad gefunden>"
 
 msgid "<No Return-Path found>"
 msgstr "<Kein Antwortpfad gefunden>"
 

-#: src/messageview.c:572
+#: src/messageview.c:574

 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"


@@ -6037,11 +6357,11 @@ msgstr ""
 "Antwortpfad: %s\n"
 "Es wird geraten, die Empfangsbestätigung nicht zu senden."
 
 "Antwortpfad: %s\n"
 "Es wird geraten, die Empfangsbestätigung nicht zu senden."
 

-#: src/messageview.c:579 src/messageview.c:596
+#: src/messageview.c:581 src/messageview.c:598

 msgid "_Don't Send"
 msgstr "Nicht Sen_den"
 
 msgid "_Don't Send"
 msgstr "Nicht Sen_den"
 

-#: src/messageview.c:592
+#: src/messageview.c:594

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -6053,39 +6373,39 @@ msgstr ""
 "offiziell an Sie adressiert.\n"
 "Es wird empfohlen die Empfangsbestätigung nicht zu senden."
 
 "offiziell an Sie adressiert.\n"
 "Es wird empfohlen die Empfangsbestätigung nicht zu senden."
 

-#: src/messageview.c:809 src/procmime.c:873
+#: src/messageview.c:812 src/procmime.c:873

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsslung fehlgeschlagen: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Entschlüsslung fehlgeschlagen: %s"
 

-#: src/messageview.c:1138 src/mimeview.c:1560 src/summaryview.c:4065
-#: src/summaryview.c:4068 src/textview.c:2638
+#: src/messageview.c:1141 src/mimeview.c:1582 src/summaryview.c:4065
+#: src/summaryview.c:4068 src/textview.c:2642

 msgid "Save as"
 msgstr "Speichern als"
 
 msgid "Save as"
 msgstr "Speichern als"
 

-#: src/messageview.c:1144
+#: src/messageview.c:1147

 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 
 msgid "Overwrite existing file?"
 msgstr "Existierende Datei überschreiben?"
 

-#: src/messageview.c:1152 src/summaryview.c:4085 src/summaryview.c:4088
+#: src/messageview.c:1155 src/summaryview.c:4085 src/summaryview.c:4088

 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 
 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Datei '%s' konnte nicht gespeichert werden."
 

-#: src/messageview.c:1233
+#: src/messageview.c:1236

 msgid "You asked for a return receipt in this message."
 msgstr "Es wurde eine Empfangsbestätigung für diese Nachricht angefordert."
 
 msgid "You asked for a return receipt in this message."
 msgstr "Es wurde eine Empfangsbestätigung für diese Nachricht angefordert."
 

-#: src/messageview.c:1237
+#: src/messageview.c:1240

 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht wünscht eine Empfangsbestätigung."
 
 msgid "This message asks for a return receipt."
 msgstr "Diese Nachricht wünscht eine Empfangsbestätigung."
 

-#: src/messageview.c:1238
+#: src/messageview.c:1241

 msgid "Send receipt"
 msgstr "Bestätigung senden"
 
 msgid "Send receipt"
 msgstr "Bestätigung senden"
 

-#: src/messageview.c:1281
+#: src/messageview.c:1284

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -6093,7 +6413,7 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgeholt\n"
 "und wurde auf dem Server gelöscht."
 
 "Diese Nachricht wurde teilweise abgeholt\n"
 "und wurde auf dem Server gelöscht."
 

-#: src/messageview.c:1287
+#: src/messageview.c:1290

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6102,15 +6422,15 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s groß."
 
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s groß."
 

-#: src/messageview.c:1291 src/messageview.c:1313
+#: src/messageview.c:1294 src/messageview.c:1316

 msgid "Mark for download"
 msgstr "Zum Download markieren"
 
 msgid "Mark for download"
 msgstr "Zum Download markieren"
 

-#: src/messageview.c:1292 src/messageview.c:1304
+#: src/messageview.c:1295 src/messageview.c:1307

 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 
 msgid "Mark for deletion"
 msgstr "Zum Löschen markieren"
 

-#: src/messageview.c:1297
+#: src/messageview.c:1300

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6119,12 +6439,12 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s groß und wird heruntergeladen."
 
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s groß und wird heruntergeladen."
 

-#: src/messageview.c:1302 src/messageview.c:1315
+#: src/messageview.c:1305 src/messageview.c:1318

 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Demarkieren"
 
 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Demarkieren"
 

-#: src/messageview.c:1308
+#: src/messageview.c:1311

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6133,11 +6453,11 @@ msgstr ""
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s und wird gelöscht."
 
 "Diese Nachricht wurde teilweise abgeholt;\n"
 "sie ist %s und wird gelöscht."
 

-#: src/messageview.c:1384
+#: src/messageview.c:1387

 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 
 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 

-#: src/messageview.c:1385
+#: src/messageview.c:1388

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -6147,19 +6467,19 @@ msgstr ""
 "Bitte wählen Sie, welches Konto Sie für das versenden der "
 "Empfangsbestätigung verwenden möchten:"
 
 "Bitte wählen Sie, welches Konto Sie für das versenden der "
 "Empfangsbestätigung verwenden möchten:"
 

-#: src/messageview.c:1389
+#: src/messageview.c:1392

 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 
 msgid "_Send Notification"
 msgstr "Benachrichtigung _senden"
 

-#: src/messageview.c:1389
+#: src/messageview.c:1392

 msgid "+_Cancel"
 msgstr "+_Abbrechen"
 
 msgid "+_Cancel"
 msgstr "+_Abbrechen"
 

-#: src/messageview.c:1456
+#: src/messageview.c:1459

 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken nicht möglich: Die Nachricht enthält keinen Text."
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Drucken nicht möglich: Die Nachricht enthält keinen Text."
 

-#: src/messageview.c:1503 src/summaryview.c:4125
+#: src/messageview.c:1523 src/summaryview.c:4125

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6168,7 +6488,7 @@ msgstr ""
 "Geben Sie den Druckbefehl ein:\n"
 "('%s' wird durch den Dateinamen ersetzt)"
 
 "Geben Sie den Druckbefehl ein:\n"
 "('%s' wird durch den Dateinamen ersetzt)"
 

-#: src/messageview.c:1509 src/summaryview.c:4131
+#: src/messageview.c:1529 src/summaryview.c:4131

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6177,8 +6497,8 @@ msgstr ""
 "Druckbefehl ist ungültig:\n"
 "'%s'"
 
 "Druckbefehl ist ungültig:\n"
 "'%s'"
 

-#: src/messageview.c:1775 src/messageview.c:1781 src/summaryview.c:3521
-#: src/summaryview.c:5527
+#: src/messageview.c:1799 src/messageview.c:1805 src/summaryview.c:3521
+#: src/summaryview.c:5540

 msgid "An error happened while learning.\n"
 msgstr "beim Lernen ist ein Fehler aufgetreten.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "beim Lernen ist ein Fehler aufgetreten.\n"
 


@@ -6195,11 +6515,11 @@ msgstr "Nachrichten werden verschoben..."
 msgid "Deleting messages..."
 msgstr "Nachrichten werden gelöscht..."
 
 msgid "Deleting messages..."
 msgstr "Nachrichten werden gelöscht..."
 

-#: src/mh_gtk.c:59
+#: src/mh_gtk.c:62

 msgid "/Remove _mailbox..."
 msgstr "/_Mailbox entfernen..."
 
 msgid "/Remove _mailbox..."
 msgstr "/_Mailbox entfernen..."
 

-#: src/mh_gtk.c:323
+#: src/mh_gtk.c:324

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"


@@ -6208,11 +6528,11 @@ msgstr ""
 "Mailbox '%s' wirklich entfernen?\n"
 "(Die Nachrichten werden NICHT von der Festplatte gelöscht)"
 
 "Mailbox '%s' wirklich entfernen?\n"
 "(Die Nachrichten werden NICHT von der Festplatte gelöscht)"
 

-#: src/mh_gtk.c:325
+#: src/mh_gtk.c:326

 msgid "Remove mailbox"
 msgstr "Mailbox entfernen"
 
 msgid "Remove mailbox"
 msgstr "Mailbox entfernen"
 

-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:327

 msgid "_Remove"
 msgstr "_Entfernen"
 
 msgid "_Remove"
 msgstr "_Entfernen"
 


@@ -6240,62 +6560,62 @@ msgstr "/_Alles speichern..."
 msgid "MIME Type"
 msgstr "MIME-Typ"
 
 msgid "MIME Type"
 msgstr "MIME-Typ"
 

-#: src/mimeview.c:721
+#: src/mimeview.c:742

 msgid "Check signature"
 msgstr "Unterschrift prüfen"
 
 msgid "Check signature"
 msgstr "Unterschrift prüfen"
 

-#: src/mimeview.c:726 src/mimeview.c:731 src/mimeview.c:736
+#: src/mimeview.c:747 src/mimeview.c:752 src/mimeview.c:757

 msgid "View full information"
 msgstr "Vollständige Informationen anzeigen"
 
 msgid "View full information"
 msgstr "Vollständige Informationen anzeigen"
 

-#: src/mimeview.c:741 src/mimeview.c:745
+#: src/mimeview.c:762 src/mimeview.c:766

 msgid "Check again"
 msgstr "Erneut überprüfen"
 
 msgid "Check again"
 msgstr "Erneut überprüfen"
 

-#: src/mimeview.c:754
+#: src/mimeview.c:775

 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 "Klicken Sie auf das Symbol oder drücken Sie die Taste 'C' um sie zu "
 "überprüfen."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 "Klicken Sie auf das Symbol oder drücken Sie die Taste 'C' um sie zu "
 "überprüfen."
 

-#: src/mimeview.c:759
+#: src/mimeview.c:780

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Zeitüberschreitung beim prüfen der Signatur. Symbol klicken oder 'C' drücken "
 "um es nocheinmal zu versuchen"
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Zeitüberschreitung beim prüfen der Signatur. Symbol klicken oder 'C' drücken "
 "um es nocheinmal zu versuchen"
 

-#: src/mimeview.c:969
+#: src/mimeview.c:990

 msgid "Checking signature..."
 msgstr "Signatur wird überprüft..."
 
 msgid "Checking signature..."
 msgstr "Signatur wird überprüft..."
 

-#: src/mimeview.c:1011
+#: src/mimeview.c:1032

 msgid "Go back to email"
 msgstr "Zurück zur E-Mail"
 
 msgid "Go back to email"
 msgstr "Zurück zur E-Mail"
 

-#: src/mimeview.c:1349 src/mimeview.c:1430 src/mimeview.c:1606
-#: src/mimeview.c:1639
+#: src/mimeview.c:1370 src/mimeview.c:1451 src/mimeview.c:1628
+#: src/mimeview.c:1661

 msgid "Couldn't save the part of multipart message."
 msgstr "Ein Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden."
 
 msgid "Couldn't save the part of multipart message."
 msgstr "Ein Teil einer mehrteiligen Nachricht konnte nicht gespeichert werden."
 

-#: src/mimeview.c:1419 src/textview.c:2648
+#: src/mimeview.c:1440 src/textview.c:2652

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Soll existierende Datei '%s' überschrieben werden?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Soll existierende Datei '%s' überschrieben werden?"
 

-#: src/mimeview.c:1457
+#: src/mimeview.c:1478

 msgid "Select destination folder"
 msgstr "Zielordner wählen"
 
 msgid "Select destination folder"
 msgstr "Zielordner wählen"
 

-#: src/mimeview.c:1464
+#: src/mimeview.c:1485

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' ist kein Verzeichnis."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' ist kein Verzeichnis."
 

-#: src/mimeview.c:1685 src/mimeview.c:1693 src/textview.c:2579
+#: src/mimeview.c:1707 src/mimeview.c:1715 src/textview.c:2583

 msgid "Open with"
 msgstr "Öffnen mit"
 
 msgid "Open with"
 msgstr "Öffnen mit"
 

-#: src/mimeview.c:1686 src/mimeview.c:1694 src/textview.c:2580
+#: src/mimeview.c:1708 src/mimeview.c:1716 src/textview.c:2584

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6310,9 +6630,9 @@ msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "NNTP-Verbindung zu %s:%d wird erstellt...\n"
 
 #: src/news.c:328
 msgstr "NNTP-Verbindung zu %s:%d wird erstellt...\n"
 
 #: src/news.c:328

-msgid "Sylpheed-Claws needs network access in order to access the News server."
+msgid "Claws Mail needs network access in order to access the News server."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws benötigt Netzwerkzugang um auf diesen News-Server zuzugreifen."
+"Claws Mail benötigt Netzwerkzugang um auf diesen News-Server zuzugreifen."

 
 #: src/news.c:345
 #, c-format
 
 #: src/news.c:345
 #, c-format


@@ -6404,32 +6724,20 @@ msgstr "Newsgroup kündigen"
 msgid "_Unsubscribe"
 msgstr "/Newsgroup _kündigen"
 
 msgid "_Unsubscribe"
 msgstr "/Newsgroup _kündigen"
 

-#: src/plugins/clamav/clamav_plugin.c:118
+#: src/plugins/clamav/clamav_plugin.c:43
+#: src/plugins/clamav/clamav_plugin_gtk.c:212
+msgid "Clam AntiVirus"
+msgstr "Clam AntiVirus"
+
+#: src/plugins/clamav/clamav_plugin.c:120

 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: Nachricht wird gescannt..."
 
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: Nachricht wird gescannt..."
 

-#: src/plugins/clamav/clamav_plugin.c:198
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the ClamAV plugin "
-"was built with"
-msgstr ""
-"Die Version von Sylpheed-Claws ist neuer als die mit der das ClamAV Plugin "
-"kompiliert wurde"
-
-#: src/plugins/clamav/clamav_plugin.c:203
-msgid "Your version of Sylpheed-Claws is too old for the ClamAV plugin"
-msgstr "Die Version von Sylpheed-Claws ist zu alt für das ClamAV Plugin"
-
-#: src/plugins/clamav/clamav_plugin.c:209
+#: src/plugins/clamav/clamav_plugin.c:205

 msgid "Failed to register mail filtering hook"
 msgstr "mail-filtering-hook konnte nicht registriert werden"
 
 msgid "Failed to register mail filtering hook"
 msgstr "mail-filtering-hook konnte nicht registriert werden"
 

-#: src/plugins/clamav/clamav_plugin.c:252
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr "Clam AntiVirus"
-
-#: src/plugins/clamav/clamav_plugin.c:257
+#: src/plugins/clamav/clamav_plugin.c:253

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -6448,7 +6756,7 @@ msgstr ""
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/Clam "
 "AntiVirus"
 
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/Clam "
 "AntiVirus"
 

-#: src/plugins/clamav/clamav_plugin.c:284
+#: src/plugins/clamav/clamav_plugin.c:280

 msgid "Virus detection"
 msgstr "Viruserkennung"
 
 msgid "Virus detection"
 msgstr "Viruserkennung"
 


@@ -6494,36 +6802,24 @@ msgstr ""
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem infizierte e-Mails "
 "abgespeichert werden"
 
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem infizierte e-Mails "
 "abgespeichert werden"
 

-#: src/plugins/demo/demo.c:45
-msgid ""
-"Your sylpheed-claws version is newer than the version the plugin was built "
-"with"
-msgstr ""
-"Die Version von Sylpheed-Claws ist neuer also die Version mit der Plugin "
-"kompiliert wurde"
-
-#: src/plugins/demo/demo.c:50
-msgid "Your sylpheed-claws version is too old"
-msgstr "Die Sylpheed-Claws Version ist zu alt"
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+msgid "Demo"
+msgstr "Demo"

 
 

-#: src/plugins/demo/demo.c:56
+#: src/plugins/demo/demo.c:52

 msgid "Failed to register log text hook"
 msgstr "Registrierung des \"log text hook\" fehlgeschlagen"
 
 msgid "Failed to register log text hook"
 msgstr "Registrierung des \"log text hook\" fehlgeschlagen"
 

-#: src/plugins/demo/demo.c:74 src/plugins/demo/demo.c:103
-msgid "Demo"
-msgstr "Demo"
-
-#: src/plugins/demo/demo.c:79
+#: src/plugins/demo/demo.c:75

 msgid ""
 msgid ""

-"This Plugin is only a demo of how to write plugins for Sylpheed-Claws. It "
+"This Plugin is only a demo of how to write plugins for Claws Mail. It "

 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"

-"It is not really useful"
+"It is not really useful."

 msgstr ""
 msgstr ""

-"Dieses Plugin ist nur ein Bespiel, wie man Plugins für Sylpheed-Claws "
-"schreibt. Es installiert einen Hook für neue Logausgabe und schreibt dies "
-"nach STDOUT.\n"
+"Dieses Plugin ist nur ein Beispiel, wie man Plugins für Claws Mail schreibt. "
+"Es installiert einen Hook für neue Logausgabe und schreibt dies nach "
+"STDOUT.\n"

 "\n"
 "Es ist nicht wirklich nützlich"
 
 "\n"
 "Es ist nicht wirklich nützlich"
 


@@ -6551,23 +6847,11 @@ msgstr "Vollbildmodus (Bedienelemente ausblenden)"
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Entsprechend Dillo's '--fullwindow' Option"
 
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Entsprechend Dillo's '--fullwindow' Option"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:169
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Dillo plugin "
-"was built with"
-msgstr ""
-"Die Sylpheed-Claws Version ist neuer als die Version mit der das Dillo "
-"Plugin kompiliert wurde"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:174
-msgid "Your version of Sylpheed-Claws is too old for the Dillo plugin"
-msgstr "Die Sylpheed-Claws Version ist zu alt für das Dillo Plugin"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:194
+#: src/plugins/dillo_viewer/dillo_viewer.c:39

 msgid "Dillo HTML Viewer"
 msgstr "Dillo HTML Betrachter"
 
 msgid "Dillo HTML Viewer"
 msgstr "Dillo HTML Betrachter"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:199
+#: src/plugins/dillo_viewer/dillo_viewer.c:195

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -6578,7 +6862,7 @@ msgstr ""
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/Dillo "
 "Browser"
 
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/Dillo "
 "Browser"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:223
+#: src/plugins/dillo_viewer/dillo_viewer.c:219

 msgid "text/html"
 msgstr "text/html"
 
 msgid "text/html"
 msgstr "text/html"
 


@@ -6653,7 +6937,7 @@ msgstr "Verfällt nach"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Ein Wert von '0' speichert das Passwort für die ganze Sitzung"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Ein Wert von '0' speichert das Passwort für die ganze Sitzung"
 

-#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:165

 msgid "minute(s)"
 msgstr "Minute(n)"
 
 msgid "minute(s)"
 msgstr "Minute(n)"
 


@@ -6756,142 +7040,147 @@ msgstr ""
 msgid "Trust key"
 msgstr "Schlüsselvertrauen"
 
 msgid "Trust key"
 msgstr "Schlüsselvertrauen"
 

-#: src/plugins/pgpcore/sgpgme.c:134
+#: src/plugins/pgpcore/sgpgme.c:76 src/privacy.c:211 src/privacy.c:215
+#: src/privacy.c:232 src/privacy.c:236
+msgid "No signature found"
+msgstr "Keine digitale Unterschrift gefunden"
+
+#: src/plugins/pgpcore/sgpgme.c:138

 msgid "Undefined"
 msgstr "Undefiniert"
 
 msgid "Undefined"
 msgstr "Undefiniert"
 

-#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:193

 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Niemals"
 
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Niemals"
 

-#: src/plugins/pgpcore/sgpgme.c:138
+#: src/plugins/pgpcore/sgpgme.c:142

 msgid "Marginal"
 msgstr "Gering"
 
 msgid "Marginal"
 msgstr "Gering"
 

-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/sgpgme.c:146

 msgid "Ultimate"
 msgstr "Ultimativ"
 
 msgid "Ultimate"
 msgstr "Ultimativ"
 

-#: src/plugins/pgpcore/sgpgme.c:176
+#: src/plugins/pgpcore/sgpgme.c:180

 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Die Signatur kann nicht überprüft werden - %s"
 
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Die Signatur kann nicht überprüft werden - %s"
 

-#: src/plugins/pgpcore/sgpgme.c:180 src/plugins/pgpcore/sgpgme.c:184
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:188
+#: src/plugins/pgpcore/sgpgme.c:235

 msgid "The signature has not been checked."
 msgstr "Die Signatur wurde nicht überprüft"
 
 msgid "The signature has not been checked."
 msgstr "Die Signatur wurde nicht überprüft"
 

-#: src/plugins/pgpcore/sgpgme.c:190 src/plugins/pgpcore/sgpgme.c:192
+#: src/plugins/pgpcore/sgpgme.c:194 src/plugins/pgpcore/sgpgme.c:196

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "PGP Core: Der Schlüssel konnte nicht geholt werde, es läuft kein gpg-agent."
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "PGP Core: Der Schlüssel konnte nicht geholt werde, es läuft kein gpg-agent."
 

-#: src/plugins/pgpcore/sgpgme.c:205
+#: src/plugins/pgpcore/sgpgme.c:209

 #, c-format
 msgid "Good signature from %s."
 msgstr "Gültige Signatur von %s."
 
 #, c-format
 msgid "Good signature from %s."
 msgstr "Gültige Signatur von %s."
 

-#: src/plugins/pgpcore/sgpgme.c:211
+#: src/plugins/pgpcore/sgpgme.c:215

 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Gültige Signatur (nicht vertraut) von %s."
 
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Gültige Signatur (nicht vertraut) von %s."
 

-#: src/plugins/pgpcore/sgpgme.c:216
+#: src/plugins/pgpcore/sgpgme.c:220

 #, c-format
 msgid "Expired signature from %s."
 msgstr "Abgelaufene Signatur von %s."
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Abgelaufene Signatur von %s."
 

-#: src/plugins/pgpcore/sgpgme.c:219
+#: src/plugins/pgpcore/sgpgme.c:223

 #, c-format
 msgid "Expired key from %s."
 msgstr "Abgelaufener Schlüssel von %s."
 
 #, c-format
 msgid "Expired key from %s."
 msgstr "Abgelaufener Schlüssel von %s."
 

-#: src/plugins/pgpcore/sgpgme.c:222
+#: src/plugins/pgpcore/sgpgme.c:226

 #, c-format
 msgid "Bad signature from %s."
 msgstr "Ungültige Signatur von %s."
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Ungültige Signatur von %s."
 

-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:230

 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Schlüssel 0x%s ist nicht verfügbar zum Überprüfen der Signatur."
 
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Schlüssel 0x%s ist nicht verfügbar zum Überprüfen der Signatur."
 

-#: src/plugins/pgpcore/sgpgme.c:268
+#: src/plugins/pgpcore/sgpgme.c:272

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Signatur erstellt unter Verwendung eines %s key ID %s\n"
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Signatur erstellt unter Verwendung eines %s key ID %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:279

 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Gültige Signatur von \"%s\" (Vertrauen: %s)\n"
 
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Gültige Signatur von \"%s\" (Vertrauen: %s)\n"
 

-#: src/plugins/pgpcore/sgpgme.c:280
+#: src/plugins/pgpcore/sgpgme.c:284

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Abgelaufene Signatur von '%s'\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Abgelaufene Signatur von '%s'\n"
 

-#: src/plugins/pgpcore/sgpgme.c:285
+#: src/plugins/pgpcore/sgpgme.c:289

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "UNGÜLTIGE Signatur von '%s'\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "UNGÜLTIGE Signatur von '%s'\n"
 

-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:300

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                aka '%s'\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                aka '%s'\n"
 

-#: src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:306

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Primärer Schlüssel-Fingerabdruck: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Primärer Schlüssel-Fingerabdruck: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:311

 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "WARNUNG: Die Adresse des Unterzeichners \"%s\" stimmt nicht mit dem DNS-"
 "Eintrag überein\n"
 
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "WARNUNG: Die Adresse des Unterzeichners \"%s\" stimmt nicht mit dem DNS-"
 "Eintrag überein\n"
 

-#: src/plugins/pgpcore/sgpgme.c:313
+#: src/plugins/pgpcore/sgpgme.c:317

 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "überprüfte Adresse des Unterzeichners ist \"%s\"\n"
 
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "überprüfte Adresse des Unterzeichners ist \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:355
+#: src/plugins/pgpcore/sgpgme.c:359

 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Daten konnten nicht aus der Nachricht geholt werden, %s"
 
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Daten konnten nicht aus der Nachricht geholt werden, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:375

 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Daten konnten nicht initialisiert werden, %s"
 
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Daten konnten nicht initialisiert werden, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:487
+#: src/plugins/pgpcore/sgpgme.c:491

 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Privater Schlüssel nicht gefunden (%s)"
 
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Privater Schlüssel nicht gefunden (%s)"
 

-#: src/plugins/pgpcore/sgpgme.c:495
+#: src/plugins/pgpcore/sgpgme.c:499

 msgid "Secret key specification is ambiguous"
 msgstr "Angaben zum Privaten Schlüssel sind mehrdeutig"
 
 msgid "Secret key specification is ambiguous"
 msgstr "Angaben zum Privaten Schlüssel sind mehrdeutig"
 

-#: src/plugins/pgpcore/sgpgme.c:505
+#: src/plugins/pgpcore/sgpgme.c:509

 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fehler beim setzten des Privaten Schlüssels: %s"
 
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Fehler beim setzten des Privaten Schlüssels: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:541
+#: src/plugins/pgpcore/sgpgme.c:545

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' ist nicht richtig "
 "installiert."
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' ist nicht richtig "
 "installiert."
 

-#: src/plugins/pgpcore/sgpgme.c:547
+#: src/plugins/pgpcore/sgpgme.c:551

 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "


@@ -6900,12 +7189,12 @@ msgstr ""
 "Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' Version %s ist "
 "installiert, aber Version %s wird benötigt.\n"
 
 "Gpgme Protokoll '%s' ist nicht nutzbar. Treiber '%s' Version %s ist "
 "installiert, aber Version %s wird benötigt.\n"
 

-#: src/plugins/pgpcore/sgpgme.c:555
+#: src/plugins/pgpcore/sgpgme.c:559

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme Protokoll '%s' ist nicht nutzbar (unbekannter Fehler)"
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme Protokoll '%s' ist nicht nutzbar (unbekannter Fehler)"
 

-#: src/plugins/pgpcore/sgpgme.c:571
+#: src/plugins/pgpcore/sgpgme.c:575

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -6913,7 +7202,7 @@ msgstr ""
 "GnuPG ist nicht richtig installiert oder muss aktualisiert werden.\n"
 "OpenPGP-Unterstützung ausgeschaltet"
 
 "GnuPG ist nicht richtig installiert oder muss aktualisiert werden.\n"
 "OpenPGP-Unterstützung ausgeschaltet"
 

-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609

 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"


@@ -6921,27 +7210,27 @@ msgstr ""
 "Sie müssen die Kontoeinstellungen mit \"OK\" speichern bevor Sie ein "
 "Schlüsselpaar erstellen können.\n"
 
 "Sie müssen die Kontoeinstellungen mit \"OK\" speichern bevor Sie ein "
 "Schlüsselpaar erstellen können.\n"
 

-#: src/plugins/pgpcore/sgpgme.c:610
+#: src/plugins/pgpcore/sgpgme.c:614

 msgid "No PGP key found"
 msgstr "kein PGP Schlüssel gefunden"
 
 msgid "No PGP key found"
 msgstr "kein PGP Schlüssel gefunden"
 

-#: src/plugins/pgpcore/sgpgme.c:611
+#: src/plugins/pgpcore/sgpgme.c:615

 msgid ""
 msgid ""

-"Sylpheed-Claws did not find a secret PGP key, which means that you won't be "
-"able to sign emails or receive encrypted emails.\n"
+"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 ""
 "Do you want to create a new key pair now?"
 msgstr ""

-"Sylpheed-Claws konnte keinen privaten Schlüssel finden, was bedeutet das sie "
+"Claws Mail konnte keinen privaten Schlüssel finden, was bedeutet das sie "

 "keine Nachrichten unterschreiben und keine verschlüsselten Nachrichten "
 "empfangen können.\n"
 "keine Nachrichten unterschreiben und keine verschlüsselten Nachrichten "
 "empfangen können.\n"

-"Soll jetzt ein neues Schlüsselpaar angelegt werden?"
+"Soll jetzt ein neues Schlüssel-paar angelegt werden?"

 
 

-#: src/plugins/pgpcore/sgpgme.c:681 src/plugins/pgpcore/sgpgme.c:697
+#: src/plugins/pgpcore/sgpgme.c:685 src/plugins/pgpcore/sgpgme.c:701

 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Das neue Schlüsselpaar konnte nicht erstellt werden: %s"
 
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Das neue Schlüsselpaar konnte nicht erstellt werden: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:688
+#: src/plugins/pgpcore/sgpgme.c:692

 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."


@@ -6949,11 +7238,11 @@ msgstr ""
 "Neues Schlüsselpaar wird erzeugt... Bitte die Maus bewegen um bei der "
 "Erzeugung der Entropy zu helfen..."
 
 "Neues Schlüsselpaar wird erzeugt... Bitte die Maus bewegen um bei der "
 "Erzeugung der Entropy zu helfen..."
 

-#: src/plugins/pgpcore/sgpgme.c:703
+#: src/plugins/pgpcore/sgpgme.c:707

 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "neues Schlüsselpaar konnte nicht erstellt werden: unbekannter Fehler"
 
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "neues Schlüsselpaar konnte nicht erstellt werden: unbekannter Fehler"
 

-#: src/plugins/pgpcore/sgpgme.c:707
+#: src/plugins/pgpcore/sgpgme.c:711

 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"


@@ -6966,39 +7255,27 @@ msgstr ""
 "\n"
 "Soll er zu einem Schlüsselserver exportiert werden?"
 
 "\n"
 "Soll er zu einem Schlüsselserver exportiert werden?"
 

-#: src/plugins/pgpcore/sgpgme.c:711
+#: src/plugins/pgpcore/sgpgme.c:715

 msgid "Key generated"
 msgstr "Schlüssel erstellt"
 
 msgid "Key generated"
 msgstr "Schlüssel erstellt"
 

-#: src/plugins/pgpcore/sgpgme.c:750
+#: src/plugins/pgpcore/sgpgme.c:754

 msgid "Key exported."
 msgstr "Schlüssel exportiert"
 
 msgid "Key exported."
 msgstr "Schlüssel exportiert"
 

-#: src/plugins/pgpcore/sgpgme.c:752
+#: src/plugins/pgpcore/sgpgme.c:756

 msgid "Couldn't export key."
 msgstr "Schlüssel konnte nicht exportiert werden."
 
 msgid "Couldn't export key."
 msgstr "Schlüssel konnte nicht exportiert werden."
 

-#: src/plugins/pgpcore/sgpgme.c:756
+#: src/plugins/pgpcore/sgpgme.c:760

 msgid "Key export isn't implemented in Windows."
 msgstr "Schlüsselexport funktioniert nicht unter Windows."
 
 msgid "Key export isn't implemented in Windows."
 msgstr "Schlüsselexport funktioniert nicht unter Windows."
 

-#: src/plugins/pgpcore/plugin.c:38
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin "
-"was built with"
-msgstr ""
-"Die Sylpheed-Claws Version ist neuer als die Version mit der das PGP/Core "
-"Plugin kompiliert wurde"
-
-#: src/plugins/pgpcore/plugin.c:43
-msgid "Your version of Sylpheed-Claws is too old for the PGP/Core plugin"
-msgstr "Die Sylpheed-Claws Version ist zu alt für das PGP/Core Plugin"
-
-#: src/plugins/pgpcore/plugin.c:63
+#: src/plugins/pgpcore/plugin.c:35

 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 

-#: src/plugins/pgpcore/plugin.c:68
+#: src/plugins/pgpcore/plugin.c:64

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -7020,7 +7297,7 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpcore/plugin.c:97
+#: src/plugins/pgpcore/plugin.c:93

 msgid "Core operations"
 msgstr "Kernoperationen"
 
 msgid "Core operations"
 msgstr "Kernoperationen"
 


@@ -7030,11 +7307,11 @@ msgstr "Schlüsselimport"
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgid ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgid ""

-"This key is not in your keyring. Do you want Sylpheed-Claws to try and "
-"import it from a keyserver?"
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"

 msgstr ""
 msgstr ""

-"Dieser Schlüssel ist nicht an Ihrem Schlüsselbund. Soll Sylpheed-Claws "
-"versuchen den Schlüssel von einem Schlüsselserver zu importieren?"
+"Dieser Schlüssel ist nicht an Ihrem Schlüsselbund. Soll Claws Mail versuchen "
+"den Schlüssel von einem Schlüsselserver zu importieren?"

 
 #: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""


@@ -7105,90 +7382,87 @@ msgstr "   Schlüsselimport funktioniert nicht unter Windows.\n"
 msgid "   This key is in your keyring.\n"
 msgstr "   Dieser Schlüssel ist an Ihrem Schlüsselbund.\n"
 
 msgid "   This key is in your keyring.\n"
 msgstr "   Dieser Schlüssel ist an Ihrem Schlüsselbund.\n"
 

-#: src/plugins/pgpinline/pgpinline.c:237 src/plugins/pgpinline/pgpinline.c:385
+#: src/plugins/pgpinline/pgpinline.c:241 src/plugins/pgpinline/pgpinline.c:393

 msgid "Couldn't get text data."
 msgstr "Textdaten konnten nicht geholt werden."
 
 msgid "Couldn't get text data."
 msgstr "Textdaten konnten nicht geholt werden."
 

-#: src/plugins/pgpinline/pgpinline.c:255
+#: src/plugins/pgpinline/pgpinline.c:259

 msgid "Couldn't convert text data to any sane charset."
 msgstr ""
 "Textdaten konnten zu keinem vernünftigen Zeichensatz konvertiert werden."
 
 msgid "Couldn't convert text data to any sane charset."
 msgstr ""
 "Textdaten konnten zu keinem vernünftigen Zeichensatz konvertiert werden."
 

-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:267 src/plugins/pgpinline/pgpinline.c:523
+#: src/plugins/pgpinline/pgpinline.c:644 src/plugins/pgpinline/pgpinline.c:691
+#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
+#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
+#: src/plugins/pgpmime/pgpmime.c:593
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "GPG Kontext konnte nicht initialisiert werden, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:386

 msgid "Couldn't parse mime part."
 msgstr "MIME Teil konnte nicht analysiert werden."
 
 msgid "Couldn't parse mime part."
 msgstr "MIME Teil konnte nicht analysiert werden."
 

-#: src/plugins/pgpinline/pgpinline.c:408 src/plugins/pgpmime/pgpmime.c:333
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:343

 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Entschlüsselte Datei %s konnte nicht geöffnet werden"
 
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Entschlüsselte Datei %s konnte nicht geöffnet werden"
 

-#: src/plugins/pgpinline/pgpinline.c:438
+#: src/plugins/pgpinline/pgpinline.c:446

 msgid "Couldn't scan decrypted file."
 msgstr "Entschlüsselte Datei konnte nicht gescannt werden."
 
 msgid "Couldn't scan decrypted file."
 msgstr "Entschlüsselte Datei konnte nicht gescannt werden."
 

-#: src/plugins/pgpinline/pgpinline.c:446
+#: src/plugins/pgpinline/pgpinline.c:454

 msgid "Couldn't scan decrypted file parts."
 msgstr "Entschlüsselte Dateiteile konnten nicht gescannt werden."
 
 msgid "Couldn't scan decrypted file parts."
 msgstr "Entschlüsselte Dateiteile konnten nicht gescannt werden."
 

-#: src/plugins/pgpinline/pgpinline.c:500
+#: src/plugins/pgpinline/pgpinline.c:508

 msgid "Couldn't create temporary file."
 msgstr "Temporäre Datei konnte nicht erstellt werden."
 
 msgid "Couldn't create temporary file."
 msgstr "Temporäre Datei konnte nicht erstellt werden."
 

-#: src/plugins/pgpinline/pgpinline.c:534 src/plugins/pgpmime/pgpmime.c:480
+#: src/plugins/pgpinline/pgpinline.c:546 src/plugins/pgpmime/pgpmime.c:494

 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Datensignierung fehlgeschlagen, %s"
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Datensignierung fehlgeschlagen, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:552 src/plugins/pgpmime/pgpmime.c:505
+#: src/plugins/pgpinline/pgpinline.c:564 src/plugins/pgpmime/pgpmime.c:519

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Datensignierung fehlgeschlagen wegen ungültigen Unterzeichner: %s"
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Datensignierung fehlgeschlagen wegen ungültigen Unterzeichner: %s"
 

-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:514
+#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:528

 msgid "Data signing failed, no results."
 msgstr "Datensignierung fehlgeschlagen, kein Ergebniss."
 
 msgid "Data signing failed, no results."
 msgstr "Datensignierung fehlgeschlagen, kein Ergebniss."
 

-#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:526
+#: src/plugins/pgpinline/pgpinline.c:583 src/plugins/pgpmime/pgpmime.c:539

 msgid "Data signing failed, no contents."
 msgstr "Datensignierung fehlgeschlagen, keine Daten."
 
 msgid "Data signing failed, no contents."
 msgstr "Datensignierung fehlgeschlagen, keine Daten."
 

-#: src/plugins/pgpinline/pgpinline.c:637 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:653 src/plugins/pgpmime/pgpmime.c:602

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "GPG Schlüssel %s konnte nicht hinzugefügt werden, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "GPG Schlüssel %s konnte nicht hinzugefügt werden, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpmime/pgpmime.c:612
+#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:630

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Temporäre Datei konnte nicht erstellt werden, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Temporäre Datei konnte nicht erstellt werden, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:683 src/plugins/pgpmime/pgpmime.c:638
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:655

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Verschlüsslung fehlgeschlagen, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Verschlüsslung fehlgeschlagen, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:746
+#: src/plugins/pgpinline/pgpinline.c:767

 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 

-#: src/plugins/pgpinline/plugin.c:36
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/inline "
-"plugin was built with"
-msgstr ""
-"Die Sylpheed-Claws Version ist neuer als die Version mit der das PGP/inline "
-"Plugin kompiliert wurde"
-
-#: src/plugins/pgpinline/plugin.c:41
-msgid "Your version of Sylpheed-Claws is too old for the PGP/inline plugin"
-msgstr "Die Sylpheed-Claws Version ist zu alt für das PGP/inline Plugin"
-
-#: src/plugins/pgpinline/plugin.c:57
+#: src/plugins/pgpinline/plugin.c:33

 msgid "PGP/inline"
 msgstr "PGP/inline"
 
 msgid "PGP/inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:62
+#: src/plugins/pgpinline/plugin.c:58

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -7214,23 +7488,11 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/plugin.c:35
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin "
-"was built with"
-msgstr ""
-"Die Sylpheed-Claws Version ist neuer als die Version mit der das PGP/MIME "
-"Plugin kompiliert wurde"
-
-#: src/plugins/pgpmime/plugin.c:40
-msgid "Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"
-msgstr "Die Sylpheed-Claws Version ist zu alt für das PGP/MIME Plugin"
-
-#: src/plugins/pgpmime/plugin.c:56
-msgid "PGP/MIME"
-msgstr "PGP/MIME"
-
-#: src/plugins/pgpmime/plugin.c:61
+#: src/plugins/pgpmime/plugin.c:33
+msgid "PGP/MIME"
+msgstr "PGP/MIME"
+
+#: src/plugins/pgpmime/plugin.c:58

 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"


@@ -7255,49 +7517,49 @@ msgstr ""
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/pgpmime.c:192
+#: src/plugins/pgpmime/pgpmime.c:201

 msgid "Signature boundary not found."
 msgstr "Signaturtrenner nicht gefunden."
 
 msgid "Signature boundary not found."
 msgstr "Signaturtrenner nicht gefunden."
 

-#: src/plugins/pgpmime/pgpmime.c:310
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "GPG Kontext konnte nicht initialisiert werden, %s"
-
-#: src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpmime/pgpmime.c:362

 msgid "Couldn't parse decrypted file."
 msgstr "Die entschlüsselte Datei konnte nich analysiert werden."
 
 msgid "Couldn't parse decrypted file."
 msgstr "Die entschlüsselte Datei konnte nich analysiert werden."
 

-#: src/plugins/pgpmime/pgpmime.c:358
+#: src/plugins/pgpmime/pgpmime.c:368

 msgid "Couldn't parse decrypted file parts."
 msgstr "Entschlüsselte Dateiteile konnten nicht analysiert werden."
 
 msgid "Couldn't parse decrypted file parts."
 msgstr "Entschlüsselte Dateiteile konnten nicht analysiert werden."
 

-#: src/plugins/pgpmime/pgpmime.c:404 src/plugins/pgpmime/pgpmime.c:443
+#: src/plugins/pgpmime/pgpmime.c:414 src/plugins/pgpmime/pgpmime.c:453

 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
 
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Temporäre Datei konnte nicht angelegt werden: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:704
+#: src/plugins/pgpmime/pgpmime.c:723

 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 

-#: src/plugins/spamassassin/spamassassin.c:159
+#: src/plugins/spamassassin/spamassassin.c:75
+#: src/plugins/spamassassin/spamassassin_gtk.c:549
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: src/plugins/spamassassin/spamassassin.c:161

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin Plugin kann nicht zum spamd verbinden.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin Plugin kann nicht zum spamd verbinden.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:175
+#: src/plugins/spamassassin/spamassassin.c:177

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin Filter fehlgeschlagen.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin Filter fehlgeschlagen.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:201
+#: src/plugins/spamassassin/spamassassin.c:203

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin Plugin ist durch seine Einstellungen deaktiviert.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin Plugin ist durch seine Einstellungen deaktiviert.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:206
+#: src/plugins/spamassassin/spamassassin.c:208

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: Nachricht wird gefiltert..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: Nachricht wird gefiltert..."
 

-#: src/plugins/spamassassin/spamassassin.c:275
+#: src/plugins/spamassassin/spamassassin.c:277

 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "


@@ -7307,41 +7569,24 @@ msgstr ""
 "Fehlerursache ist ein nicht erreichbaer spamd Prozess. Bitte stellen Sie "
 "sicher das spamd ausgeführt wird und erreichbar ist."
 
 "Fehlerursache ist ein nicht erreichbaer spamd Prozess. Bitte stellen Sie "
 "sicher das spamd ausgeführt wird und erreichbar ist."
 

-#: src/plugins/spamassassin/spamassassin.c:334
+#: src/plugins/spamassassin/spamassassin.c:336

 msgid ""
 msgid ""

-"Sylpheed-Claws needs network access in order to feed this mail(s) to the "
-"remote learner."
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws benötigt Netzwerkzugang um auf diese E-Mail zum lernen an "
+"Claws Mail benötigt Netzwerkzugang um diese E-Mail zum lernen an "

 "Spamassassin zu senden."
 
 "Spamassassin zu senden."
 

-#: src/plugins/spamassassin/spamassassin.c:469
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the SpamAssassin "
-"plugin was built with"
-msgstr ""
-"Die Sylpheed-Claws Version ist neuer als die Version mit der das "
-"SpamAssassin Plugin kompiliert wurde"
-
-#: src/plugins/spamassassin/spamassassin.c:474
-msgid "Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"
-msgstr "Die Sylpheed-Claws Version ist zu alt für das SpamAssassin Plugin"
-
-#: src/plugins/spamassassin/spamassassin.c:483
+#: src/plugins/spamassassin/spamassassin.c:479

 msgid "Failed to get username"
 msgstr "der Benutzername konnte nicht ermittelt werden"
 
 msgid "Failed to get username"
 msgstr "der Benutzername konnte nicht ermittelt werden"
 

-#: src/plugins/spamassassin/spamassassin.c:495
+#: src/plugins/spamassassin/spamassassin.c:491

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "SpamAssassin Plugin ist geladen aber durch seine Einstellungen deaktiviert.\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "SpamAssassin Plugin ist geladen aber durch seine Einstellungen deaktiviert.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:523
-#: src/plugins/spamassassin/spamassassin_gtk.c:549
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
-
-#: src/plugins/spamassassin/spamassassin.c:528
+#: src/plugins/spamassassin/spamassassin.c:524

 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "


@@ -7366,11 +7611,11 @@ msgstr ""
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/"
 "SpamAssassin"
 
 "Einstellungen befinden sich unter /Konfiguration/Einstellungen/Plugins/"
 "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:555

 msgid "Spam detection"
 msgstr "Spamerkennung"
 
 msgid "Spam detection"
 msgstr "Spamerkennung"
 

-#: src/plugins/spamassassin/spamassassin.c:560
+#: src/plugins/spamassassin/spamassassin.c:556

 msgid "Spam learning"
 msgstr "lernen von Spam"
 
 msgid "Spam learning"
 msgstr "lernen von Spam"
 


@@ -7444,6 +7689,7 @@ msgstr ""
 "Überprüfung abgebrochen."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
 "Überprüfung abgebrochen."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194

+#: src/prefs_summaries.c:900

 msgid "seconds"
 msgstr "Sekunden"
 
 msgid "seconds"
 msgstr "Sekunden"
 


@@ -7469,68 +7715,60 @@ msgstr ""
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem als Spam erkannte "
 "Nachrichten gespeichert werden"
 
 "Drücke diesen Knopf um einen Ordner auszuwählen in dem als Spam erkannte "
 "Nachrichten gespeichert werden"
 

-#: src/plugins/trayicon/trayicon.c:101
+#: src/plugins/trayicon/trayicon.c:59 src/plugins/trayicon/trayicon.c:497
+msgid "Trayicon"
+msgstr "Trayicon"
+
+#: src/plugins/trayicon/trayicon.c:106

 msgid "/_Get Mail"
 msgstr "holen"
 
 msgid "/_Get Mail"
 msgstr "holen"
 

-#: src/plugins/trayicon/trayicon.c:103
+#: src/plugins/trayicon/trayicon.c:108

 msgid "/_Email"
 msgstr "/_E-Mail"
 
 msgid "/_Email"
 msgstr "/_E-Mail"
 

-#: src/plugins/trayicon/trayicon.c:104
+#: src/plugins/trayicon/trayicon.c:109
+msgid "/_Email from account"
+msgstr "/_Email mit Konto"
+
+#: src/plugins/trayicon/trayicon.c:111

 msgid "/Open A_ddressbook"
 msgstr "/A_dressbuch öffnen"
 
 msgid "/Open A_ddressbook"
 msgstr "/A_dressbuch öffnen"
 

-#: src/plugins/trayicon/trayicon.c:106
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Work Offline"
 msgstr "/_Datei/_Offline arbeiten"
 
 msgid "/_Work Offline"
 msgstr "/_Datei/_Offline arbeiten"
 

-#: src/plugins/trayicon/trayicon.c:108
-msgid "/E_xit Sylpheed-Claws"
-msgstr "/Sylpheed-Claws _beenden"
+#: src/plugins/trayicon/trayicon.c:115
+msgid "/E_xit Claws Mail"
+msgstr "/Claws Mail _beenden"

 
 

-#: src/plugins/trayicon/trayicon.c:162
+#: src/plugins/trayicon/trayicon.c:204

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Neu: %d, ungelesen: %d, gesamt: %d"
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Neu: %d, ungelesen: %d, gesamt: %d"
 

-#: src/plugins/trayicon/trayicon.c:236
+#: src/plugins/trayicon/trayicon.c:278

 msgid "/Work Offline"
 msgstr "/_Datei/_Offline arbeiten"
 
 msgid "/Work Offline"
 msgstr "/_Datei/_Offline arbeiten"
 

-#: src/plugins/trayicon/trayicon.c:239
+#: src/plugins/trayicon/trayicon.c:281

 msgid "/Get Mail"
 msgstr "/E-Mails holen"
 
 msgid "/Get Mail"
 msgstr "/E-Mails holen"
 

-#: src/plugins/trayicon/trayicon.c:315
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Trayicon plugin "
-"was built with"
-msgstr ""
-"Die Sylpheed-Claws Version ist neuer als die Version mit der das Trayicon "
-"Plugin kompiliert wurde"
-
-#: src/plugins/trayicon/trayicon.c:320
-msgid "Your version of Sylpheed-Claws is too old for the Trayicon plugin"
-msgstr "Die Sylpheed-Claws Version ist zu alt für das Trayicon Plugin"
-
-#: src/plugins/trayicon/trayicon.c:326
+#: src/plugins/trayicon/trayicon.c:361

 msgid "Failed to register folder item update hook"
 msgstr "'folder item update hook' konnte nicht registriert werden"
 
 msgid "Failed to register folder item update hook"
 msgstr "'folder item update hook' konnte nicht registriert werden"
 

-#: src/plugins/trayicon/trayicon.c:332
+#: src/plugins/trayicon/trayicon.c:367

 msgid "Failed to register folder update hook"
 msgstr "'folder update hook' konnte nicht registriert werden"
 
 msgid "Failed to register folder update hook"
 msgstr "'folder update hook' konnte nicht registriert werden"
 

-#: src/plugins/trayicon/trayicon.c:338
+#: src/plugins/trayicon/trayicon.c:373 src/plugins/trayicon/trayicon.c:379

 msgid "Failed to register offline switch hook"
 msgstr "'offline switch hook' konnte nicht registriert werden"
 
 msgid "Failed to register offline switch hook"
 msgstr "'offline switch hook' konnte nicht registriert werden"
 

-#: src/plugins/trayicon/trayicon.c:367 src/plugins/trayicon/trayicon.c:449
-msgid "Trayicon"
-msgstr "Trayicon"
-
-#: src/plugins/trayicon/trayicon.c:372
+#: src/plugins/trayicon/trayicon.c:415

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -7545,7 +7783,7 @@ msgstr ""
 "enthält sie einen Brief. Ein Tooltip zeigt die Anzahl neuer, ungelesener und "
 "gesamt Nachrichten."
 
 "enthält sie einen Brief. Ein Tooltip zeigt die Anzahl neuer, ungelesener und "
 "gesamt Nachrichten."
 

-#: src/plugins/trayicon/trayicon.c:426
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit this program?"
 msgstr "Programm beenden?"
 
 msgid "Exit this program?"
 msgstr "Programm beenden?"
 


@@ -7604,12 +7842,12 @@ msgstr "Fehler bei der POP3-Sitzung\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP Befehl nicht unterstützt\n"
 
 msgid "TOP command unsupported\n"
 msgstr "TOP Befehl nicht unterstützt\n"
 

-#: src/prefs_account.c:233 src/prefs_account.c:1454 src/prefs_account.c:2138
-#: src/wizard.c:1017
+#: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145
+#: src/wizard.c:1122

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:236 src/prefs_account.c:1580 src/prefs_account.c:2155
+#: src/prefs_account.c:236 src/prefs_account.c:1587 src/prefs_account.c:2162

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 


@@ -7617,7 +7855,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:238 src/wizard.c:1027
+#: src/prefs_account.c:238 src/wizard.c:1132

 msgid "Local mbox file"
 msgstr "Lokale mbox-Datei"
 
 msgid "Local mbox file"
 msgstr "Lokale mbox-Datei"
 


@@ -7625,166 +7863,166 @@ msgstr "Lokale mbox-Datei"
 msgid "None (SMTP only)"
 msgstr "Keine (nur SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Keine (nur SMTP)"
 

-#: src/prefs_account.c:718
+#: src/prefs_account.c:725

 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 

-#: src/prefs_account.c:991
+#: src/prefs_account.c:998

 msgid "Preferences for new account"
 msgstr "Einstellungen eines neuen Kontos"
 
 msgid "Preferences for new account"
 msgstr "Einstellungen eines neuen Kontos"
 

-#: src/prefs_account.c:993
+#: src/prefs_account.c:1000

 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Konteneinstellungen"
 
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Konteneinstellungen"
 

-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1035

 msgid "_Basic"
 msgstr "_Allgemein"
 
 msgid "_Basic"
 msgstr "_Allgemein"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1037

 msgid "_Receive"
 msgstr "_Empfang"
 
 msgid "_Receive"
 msgstr "_Empfang"
 

-#: src/prefs_account.c:1034
+#: src/prefs_account.c:1041

 msgid "Co_mpose"
 msgstr "_Verfassen"
 
 msgid "Co_mpose"
 msgstr "_Verfassen"
 

-#: src/prefs_account.c:1036
+#: src/prefs_account.c:1043

 msgid "_Privacy"
 msgstr "_Datenschutz"
 
 msgid "_Privacy"
 msgstr "_Datenschutz"
 

-#: src/prefs_account.c:1039
+#: src/prefs_account.c:1046

 msgid "SS_L"
 msgstr "SS_L"
 
 msgid "SS_L"
 msgstr "SS_L"
 

-#: src/prefs_account.c:1042
+#: src/prefs_account.c:1049

 msgid "A_dvanced"
 msgstr "Er_weitert"
 
 msgid "A_dvanced"
 msgstr "Er_weitert"
 

-#: src/prefs_account.c:1100
+#: src/prefs_account.c:1107

 msgid "Name of account"
 msgstr "Kontoname"
 
 msgid "Name of account"
 msgstr "Kontoname"
 

-#: src/prefs_account.c:1109
+#: src/prefs_account.c:1116

 msgid "Set as default"
 msgstr "Als Standard setzen"
 
 msgid "Set as default"
 msgstr "Als Standard setzen"
 

-#: src/prefs_account.c:1113
+#: src/prefs_account.c:1120

 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 

-#: src/prefs_account.c:1122
+#: src/prefs_account.c:1129

 msgid "Full name"
 msgstr "Vollständiger Name"
 
 msgid "Full name"
 msgstr "Vollständiger Name"
 

-#: src/prefs_account.c:1128
+#: src/prefs_account.c:1135

 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 

-#: src/prefs_account.c:1134
+#: src/prefs_account.c:1141

 msgid "Organization"
 msgstr "Organisation"
 
 msgid "Organization"
 msgstr "Organisation"
 

-#: src/prefs_account.c:1158
+#: src/prefs_account.c:1165

 msgid "Server information"
 msgstr "Serverdaten"
 
 msgid "Server information"
 msgstr "Serverdaten"
 

-#: src/prefs_account.c:1198 src/wizard.c:1106
+#: src/prefs_account.c:1205 src/wizard.c:1216

 msgid ""
 msgid ""

-"<span weight=\"bold\">Warning: this version of Sylpheed-Claws\n"
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"

 "has been built without IMAP support.</span>"
 msgstr ""
 "has been built without IMAP support.</span>"
 msgstr ""

-"<span weight=\"bold\">Achtung: diese Version von Sylpheed-Claws wurde ohne "
-"IMAP Support kompiliert.</span>"
+"<span weight=\"bold\">Achtung: diese Version von Claws Mail\n"
+"wurde ohne IMAP Support kompiliert.</span>"

 
 

-#: src/prefs_account.c:1227
+#: src/prefs_account.c:1234

 msgid "This server requires authentication"
 msgstr "Dieser Server benötigt Beglaubigung"
 
 msgid "This server requires authentication"
 msgstr "Dieser Server benötigt Beglaubigung"
 

-#: src/prefs_account.c:1234
+#: src/prefs_account.c:1241

 msgid "Authenticate on connect"
 msgstr "Beglaubigung beim Verbinden"
 
 msgid "Authenticate on connect"
 msgstr "Beglaubigung beim Verbinden"
 

-#: src/prefs_account.c:1279
+#: src/prefs_account.c:1286

 msgid "News server"
 msgstr "Newsserver"
 
 msgid "News server"
 msgstr "Newsserver"
 

-#: src/prefs_account.c:1285
+#: src/prefs_account.c:1292

 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 
 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 

-#: src/prefs_account.c:1291
+#: src/prefs_account.c:1298

 msgid "Local mailbox"
 msgstr "Lokale Mailbox"
 
 msgid "Local mailbox"
 msgstr "Lokale Mailbox"
 

-#: src/prefs_account.c:1298
+#: src/prefs_account.c:1305

 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 

-#: src/prefs_account.c:1306
+#: src/prefs_account.c:1313

 msgid "Use mail command rather than SMTP server"
 msgstr "Mailkommando anstelle eines SMTP-Servers verwenden"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Mailkommando anstelle eines SMTP-Servers verwenden"
 

-#: src/prefs_account.c:1315
+#: src/prefs_account.c:1322

 msgid "command to send mails"
 msgstr "Befehl zum Versenden"
 
 msgid "command to send mails"
 msgstr "Befehl zum Versenden"
 

-#: src/prefs_account.c:1322 src/prefs_account.c:1772
+#: src/prefs_account.c:1329 src/prefs_account.c:1779

 msgid "User ID"
 msgstr "Benutzer-ID"
 
 msgid "User ID"
 msgstr "Benutzer-ID"
 

-#: src/prefs_account.c:1328 src/prefs_account.c:1781
+#: src/prefs_account.c:1335 src/prefs_account.c:1788

 msgid "Password"
 msgstr "Kennwort"
 
 msgid "Password"
 msgstr "Kennwort"
 

-#: src/prefs_account.c:1421
+#: src/prefs_account.c:1428

 msgid "Local"
 msgstr "Lokal"
 
 msgid "Local"
 msgstr "Lokal"
 

-#: src/prefs_account.c:1432 src/prefs_account.c:1527
+#: src/prefs_account.c:1439 src/prefs_account.c:1534

 msgid "Default inbox"
 msgstr "Standard-Eingangsordner"
 
 msgid "Default inbox"
 msgstr "Standard-Eingangsordner"
 

-#: src/prefs_account.c:1439 src/prefs_account.c:1447 src/prefs_account.c:1534
-#: src/prefs_account.c:1542
+#: src/prefs_account.c:1446 src/prefs_account.c:1454 src/prefs_account.c:1541
+#: src/prefs_account.c:1549

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ungefilterte Nachrichten werden in diesem Ordner gespeichert"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Ungefilterte Nachrichten werden in diesem Ordner gespeichert"
 

-#: src/prefs_account.c:1444 src/prefs_account.c:1539 src/prefs_account.c:1942
+#: src/prefs_account.c:1451 src/prefs_account.c:1546 src/prefs_account.c:1949

 msgid "Bro_wse"
 msgstr "Durchsuchen"
 
 msgid "Bro_wse"
 msgstr "Durchsuchen"
 

-#: src/prefs_account.c:1462
+#: src/prefs_account.c:1469

 msgid "Use secure authentication (APOP)"
 msgstr "Sichere Authentifizierung verwenden (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Sichere Authentifizierung verwenden (APOP)"
 

-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1472

 msgid "Remove messages on server when received"
 msgstr "Beim Empfangen Nachrichten vom Server löschen"
 
 msgid "Remove messages on server when received"
 msgstr "Beim Empfangen Nachrichten vom Server löschen"
 

-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1483

 msgid "Remove after"
 msgstr "Löschen nach"
 
 msgid "Remove after"
 msgstr "Löschen nach"
 

-#: src/prefs_account.c:1485
+#: src/prefs_account.c:1492

 msgid "0 days: remove immediately"
 msgstr "0 Tage: Sofort löschen"
 
 msgid "0 days: remove immediately"
 msgstr "0 Tage: Sofort löschen"
 

-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1496

 msgid "days"
 msgstr "Tagen"
 
 msgid "days"
 msgstr "Tagen"
 

-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1503

 msgid "Download all messages on server"
 msgstr "Alle Nachrichten vom Server holen"
 
 msgid "Download all messages on server"
 msgstr "Alle Nachrichten vom Server holen"
 

-#: src/prefs_account.c:1502
+#: src/prefs_account.c:1509

 msgid "Receive size limit"
 msgstr "Limit der Empfangsgröße"
 
 msgid "Receive size limit"
 msgstr "Limit der Empfangsgröße"
 

-#: src/prefs_account.c:1505
+#: src/prefs_account.c:1512

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -7793,69 +8031,69 @@ msgstr ""
 "ausgewählt werden, haben Sie die Möglichkeit diese vollständig zu downloaden "
 "oder zu löschen."
 
 "ausgewählt werden, haben Sie die Möglichkeit diese vollständig zu downloaden "
 "oder zu löschen."
 

-#: src/prefs_account.c:1515
+#: src/prefs_account.c:1522

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1549 src/prefs_account.c:2172
+#: src/prefs_account.c:1556 src/prefs_account.c:2179

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1561
+#: src/prefs_account.c:1568

 msgid "Maximum number of articles to download"
 msgstr "Maximalzahl herunterzuladender Artikel"
 
 msgid "Maximum number of articles to download"
 msgstr "Maximalzahl herunterzuladender Artikel"
 

-#: src/prefs_account.c:1573
+#: src/prefs_account.c:1580

 msgid "unlimited if 0 is specified"
 msgstr "unlimitiert, wenn 0 angegeben"
 
 msgid "unlimited if 0 is specified"
 msgstr "unlimitiert, wenn 0 angegeben"
 

-#: src/prefs_account.c:1591 src/prefs_account.c:1742
+#: src/prefs_account.c:1598 src/prefs_account.c:1749

 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 

-#: src/prefs_account.c:1601 src/prefs_account.c:1752 src/prefs_send.c:273
+#: src/prefs_account.c:1608 src/prefs_account.c:1759 src/prefs_send.c:273

 msgid "Automatic"
 msgstr "Automatisch"
 
 msgid "Automatic"
 msgstr "Automatisch"
 

-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1620

 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
 
 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
 

-#: src/prefs_account.c:1617
+#: src/prefs_account.c:1624

 msgid "(usually empty)"
 msgstr "(gewöhnlich leer)"
 
 msgid "(usually empty)"
 msgstr "(gewöhnlich leer)"
 

-#: src/prefs_account.c:1627
+#: src/prefs_account.c:1634

 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 
 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 

-#: src/prefs_account.c:1631
+#: src/prefs_account.c:1638

 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Alles holen' überprüft, ob neue E-Mails für dieses Konto vorhanden sind"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 "'Alles holen' überprüft, ob neue E-Mails für dieses Konto vorhanden sind"
 

-#: src/prefs_account.c:1693 src/prefs_customheader.c:205
+#: src/prefs_account.c:1700 src/prefs_customheader.c:205

 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Kopfzeile"
 
 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Kopfzeile"
 

-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1707

 msgid "Generate Message-ID"
 msgstr "Nachrichten-ID erzeugen"
 
 msgid "Generate Message-ID"
 msgstr "Nachrichten-ID erzeugen"
 

-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1714

 msgid "Add user-defined header"
 msgstr "Benutzerdefinierte Kopfzeile einfügen"
 
 msgid "Add user-defined header"
 msgstr "Benutzerdefinierte Kopfzeile einfügen"
 

-#: src/prefs_account.c:1719
+#: src/prefs_account.c:1726

 msgid "Authentication"
 msgstr "Beglaubigung"
 
 msgid "Authentication"
 msgstr "Beglaubigung"
 

-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1734

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 

-#: src/prefs_account.c:1803
+#: src/prefs_account.c:1810

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."


@@ -7863,214 +8101,218 @@ msgstr ""
 "Wenn diese Felder leer gelassen werden, werden die gleiche User-ID und das "
 "gleiche Passwort wie beim Empfang verwendet."
 
 "Wenn diese Felder leer gelassen werden, werden die gleiche User-ID und das "
 "gleiche Passwort wie beim Empfang verwendet."
 

-#: src/prefs_account.c:1814
+#: src/prefs_account.c:1821

 msgid "Authenticate with POP3 before sending"
 msgstr "Mit POP3 vor dem Senden beglaubigen"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Mit POP3 vor dem Senden beglaubigen"
 

-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1836

 msgid "POP authentication timeout: "
 msgstr "POP-Beglaubigung Timeout:"
 
 msgid "POP authentication timeout: "
 msgstr "POP-Beglaubigung Timeout:"
 

-#: src/prefs_account.c:1838
+#: src/prefs_account.c:1845

 msgid "minutes"
 msgstr "Minuten"
 
 msgid "minutes"
 msgstr "Minuten"
 

-#: src/prefs_account.c:1883 src/prefs_account.c:1934
+#: src/prefs_account.c:1890 src/prefs_account.c:1941

 msgid "Signature"
 msgstr "Unterschrift"
 
 msgid "Signature"
 msgstr "Unterschrift"
 

-#: src/prefs_account.c:1891
+#: src/prefs_account.c:1898

 msgid "Insert signature automatically"
 msgstr "Unterschrift automatisch hinzufügen"
 
 msgid "Insert signature automatically"
 msgstr "Unterschrift automatisch hinzufügen"
 

-#: src/prefs_account.c:1896
+#: src/prefs_account.c:1903

 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 
 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 

-#: src/prefs_account.c:1921
+#: src/prefs_account.c:1928

 msgid "Command output"
 msgstr "Befehlsausgabe"
 
 msgid "Command output"
 msgstr "Befehlsausgabe"
 

-#: src/prefs_account.c:1954
+#: src/prefs_account.c:1961

 msgid "Automatically set the following addresses"
 msgstr "Automatisch folgende Adressen setzen"
 
 msgid "Automatically set the following addresses"
 msgstr "Automatisch folgende Adressen setzen"
 

-#: src/prefs_account.c:1963 src/prefs_filtering_action.c:1083
+#: src/prefs_account.c:1970 src/prefs_filtering_action.c:1083

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 

-#: src/prefs_account.c:1976 src/prefs_template.c:189
+#: src/prefs_account.c:1983 src/prefs_template.c:189

 msgid "Bcc"
 msgstr "Bcc"
 
 msgid "Bcc"
 msgstr "Bcc"
 

-#: src/prefs_account.c:1989
+#: src/prefs_account.c:1996

 msgid "Reply-To"
 msgstr "Antwort an"
 
 msgid "Reply-To"
 msgstr "Antwort an"
 

-#: src/prefs_account.c:2041
+#: src/prefs_account.c:2048

 msgid "Default privacy system"
 msgstr "Standard-Datenschutzssystem"
 
 msgid "Default privacy system"
 msgstr "Standard-Datenschutzssystem"
 

-#: src/prefs_account.c:2050
+#: src/prefs_account.c:2057

 msgid "Always sign messages"
 msgstr "Nachrichten immer signieren"
 
 msgid "Always sign messages"
 msgstr "Nachrichten immer signieren"
 

-#: src/prefs_account.c:2052
+#: src/prefs_account.c:2059

 msgid "Always encrypt messages"
 msgstr "Nachrichten immer verschlüsselt"
 
 msgid "Always encrypt messages"
 msgstr "Nachrichten immer verschlüsselt"
 

-#: src/prefs_account.c:2054
+#: src/prefs_account.c:2061

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Nachrichten immer verschlüsseln, wenn auf verschlüsselte Nachrichten "
 "geantwortet wird"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 "Nachrichten immer verschlüsseln, wenn auf verschlüsselte Nachrichten "
 "geantwortet wird"
 

-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2064

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Verschlüssle Nachrichten zusätzlich mit dem eigenem Schlüssel"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Verschlüssle Nachrichten zusätzlich mit dem eigenem Schlüssel"
 

-#: src/prefs_account.c:2059
+#: src/prefs_account.c:2066

 msgid "Save sent encrypted messages as clear text"
 msgstr "Verschickte, verschlüsselte Nachrichten im Klartext speichern"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Verschickte, verschlüsselte Nachrichten im Klartext speichern"
 

-#: src/prefs_account.c:2146 src/prefs_account.c:2163 src/prefs_account.c:2179
+#: src/prefs_account.c:2153 src/prefs_account.c:2170 src/prefs_account.c:2186

 msgid "Don't use SSL"
 msgstr "Kein SSL verwenden"
 
 msgid "Don't use SSL"
 msgstr "Kein SSL verwenden"
 

-#: src/prefs_account.c:2149
+#: src/prefs_account.c:2156

 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung verwenden"
 
 msgid "Use SSL for POP3 connection"
 msgstr "SSL für POP3-Verbindung verwenden"
 

-#: src/prefs_account.c:2152 src/prefs_account.c:2169 src/prefs_account.c:2204
+#: src/prefs_account.c:2159 src/prefs_account.c:2176 src/prefs_account.c:2211

 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS-Kommando zum Starten einer SSL-Sitzung verwenden"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "STARTTLS-Kommando zum Starten einer SSL-Sitzung verwenden"
 

-#: src/prefs_account.c:2166
+#: src/prefs_account.c:2173

 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP-Verbindung verwenden"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "SSL für IMAP-Verbindung verwenden"
 

-#: src/prefs_account.c:2188
+#: src/prefs_account.c:2195

 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung verwenden"
 
 msgid "Use SSL for NNTP connection"
 msgstr "SSL für NNTP-Verbindung verwenden"
 

-#: src/prefs_account.c:2190
+#: src/prefs_account.c:2197

 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 

-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2205

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Kein SSL verwenden (aber, wenn nötig, STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Kein SSL verwenden (aber, wenn nötig, STARTTLS)"
 

-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2208

 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung verwenden"
 
 msgid "Use SSL for SMTP connection"
 msgstr "SSL für SMTP-Verbindung verwenden"
 

-#: src/prefs_account.c:2212
+#: src/prefs_account.c:2219

 msgid "Use non-blocking SSL"
 msgstr "Nicht-blockendes SSL verwenden"
 
 msgid "Use non-blocking SSL"
 msgstr "Nicht-blockendes SSL verwenden"
 

-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2231

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Bei Problemen mit der SSL Verbindung diese Option nicht wählen"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Bei Problemen mit der SSL Verbindung diese Option nicht wählen"
 

-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2357

 msgid "SMTP port"
 msgstr "SMTP-Port"
 
 msgid "SMTP port"
 msgstr "SMTP-Port"
 

-#: src/prefs_account.c:2356
+#: src/prefs_account.c:2363

 msgid "POP3 port"
 msgstr "POP3-Port"
 
 msgid "POP3 port"
 msgstr "POP3-Port"
 

-#: src/prefs_account.c:2362
+#: src/prefs_account.c:2369

 msgid "IMAP4 port"
 msgstr "IMAP-Port"
 
 msgid "IMAP4 port"
 msgstr "IMAP-Port"
 

-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2375

 msgid "NNTP port"
 msgstr "NNTP-Port"
 
 msgid "NNTP port"
 msgstr "NNTP-Port"
 

-#: src/prefs_account.c:2373
+#: src/prefs_account.c:2380

 msgid "Domain name"
 msgstr "Domäne-Name"
 
 msgid "Domain name"
 msgstr "Domäne-Name"
 

-#: src/prefs_account.c:2383
+#: src/prefs_account.c:2390

 msgid "Use command to communicate with server"
 msgstr "Kommando zur Kommunikation mit dem Server verwenden"
 
 msgid "Use command to communicate with server"
 msgstr "Kommando zur Kommunikation mit dem Server verwenden"
 

-#: src/prefs_account.c:2391
+#: src/prefs_account.c:2398

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Cross-gepostete Nachrichten als gelesen und mit Farbe markieren:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Cross-gepostete Nachrichten als gelesen und mit Farbe markieren:"
 

-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2445

 msgid "Browse"
 msgstr "Durchsuchen"
 
 msgid "Browse"
 msgstr "Durchsuchen"
 

-#: src/prefs_account.c:2451
+#: src/prefs_account.c:2458

 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten ablegen in"
 
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten ablegen in"
 

-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2460

 msgid "Put queued messages in"
 msgstr "Wartende Nachrichten ablegen in"
 
 msgid "Put queued messages in"
 msgstr "Wartende Nachrichten ablegen in"
 

-#: src/prefs_account.c:2455
+#: src/prefs_account.c:2462

 msgid "Put draft messages in"
 msgstr "Entwürfe ablegen in"
 
 msgid "Put draft messages in"
 msgstr "Entwürfe ablegen in"
 

-#: src/prefs_account.c:2457
+#: src/prefs_account.c:2464

 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten ablegen in"
 
 msgid "Put deleted messages in"
 msgstr "Gelöschte Nachrichten ablegen in"
 

-#: src/prefs_account.c:2500
+#: src/prefs_account.c:2507

 msgid "Account name is not entered."
 msgstr "Kontoname wurde nicht angegeben."
 
 msgid "Account name is not entered."
 msgstr "Kontoname wurde nicht angegeben."
 

-#: src/prefs_account.c:2504
+#: src/prefs_account.c:2511

 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 

-#: src/prefs_account.c:2511
+#: src/prefs_account.c:2518

 msgid "SMTP server is not entered."
 msgstr "Keinen SMTP-Server angegeben."
 
 msgid "SMTP server is not entered."
 msgstr "Keinen SMTP-Server angegeben."
 

-#: src/prefs_account.c:2516
+#: src/prefs_account.c:2523

 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID angegeben."
 
 msgid "User ID is not entered."
 msgstr "Keine Benutzer-ID angegeben."
 

-#: src/prefs_account.c:2521
+#: src/prefs_account.c:2528

 msgid "POP3 server is not entered."
 msgstr "Keinen POP3-Server angegeben."
 
 msgid "POP3 server is not entered."
 msgstr "Keinen POP3-Server angegeben."
 

-#: src/prefs_account.c:2526
+#: src/prefs_account.c:2535
+msgid "The default inbox folder doesn't exist."
+msgstr "Der Standard Posteingangsordner existiert nicht."
+
+#: src/prefs_account.c:2541

 msgid "IMAP4 server is not entered."
 msgstr "Keinen IMAP4-Server angegeben."
 
 msgid "IMAP4 server is not entered."
 msgstr "Keinen IMAP4-Server angegeben."
 

-#: src/prefs_account.c:2531
+#: src/prefs_account.c:2546

 msgid "NNTP server is not entered."
 msgstr "Keinen NNTP-Server angegeben."
 
 msgid "NNTP server is not entered."
 msgstr "Keinen NNTP-Server angegeben."
 

-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2552

 msgid "local mailbox filename is not entered."
 msgstr "Keine Dateinamen für die lokale Mailbox angegeben."
 
 msgid "local mailbox filename is not entered."
 msgstr "Keine Dateinamen für die lokale Mailbox angegeben."
 

-#: src/prefs_account.c:2543
+#: src/prefs_account.c:2558

 msgid "mail command is not entered."
 msgstr "Kein Mailkommando angegeben."
 
 msgid "mail command is not entered."
 msgstr "Kein Mailkommando angegeben."
 

-#: src/prefs_account.c:2608
+#: src/prefs_account.c:2623

 msgid "Select signature file"
 msgstr "Datei mit Unterschrift auswählen"
 
 msgid "Select signature file"
 msgstr "Datei mit Unterschrift auswählen"
 

-#: src/prefs_account.c:2701
+#: src/prefs_account.c:2716

 msgid "Protocol:"
 msgstr "Protokoll:"
 
 msgid "Protocol:"
 msgstr "Protokoll:"
 

-#: src/prefs_account.c:2853
+#: src/prefs_account.c:2869

 #, c-format
 #, c-format

-msgid "Unsupported (%s)"
-msgstr "Nicht unterstützt (%s)"
+msgid "%s (plugin not loaded)"
+msgstr "%s (Plugin nicht geladen)"

 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"
 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"


@@ -8085,7 +8327,7 @@ msgid "Command line"
 msgstr "Kommandozeile"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
 msgstr "Kommandozeile"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493

-#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:260
+#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:270

 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Ersetzen"
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Ersetzen"


@@ -8098,7 +8340,7 @@ msgstr "Informationen ..."
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811

-#: src/prefs_template.c:357
+#: src/prefs_template.c:367

 msgid "(New)"
 msgstr "(Neue)"
 
 msgid "(New)"
 msgstr "(Neue)"
 


@@ -8147,19 +8389,19 @@ msgstr "Soll diese Aktion wirklich gelöscht werden?"
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822

-#: src/prefs_template.c:416 src/prefs_template.c:433
+#: src/prefs_template.c:426 src/prefs_template.c:443

 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254

-#: src/prefs_filtering.c:1276 src/prefs_template.c:417
-#: src/prefs_template.c:434
+#: src/prefs_filtering.c:1276 src/prefs_template.c:427
+#: src/prefs_template.c:444

 msgid "The entry was not saved. Close anyway?"
 msgstr "Der Eintrag wurde nicht gespeichert. Trotzdem schließen?"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
 msgid "The entry was not saved. Close anyway?"
 msgstr "Der Eintrag wurde nicht gespeichert. Trotzdem schließen?"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824

-#: src/prefs_template.c:418 src/prefs_template.c:435
+#: src/prefs_template.c:428 src/prefs_template.c:445

 msgid "+_Continue editing"
 msgstr "+Mit dem Editieren fortfahren"
 
 msgid "+_Continue editing"
 msgstr "+Mit dem Editieren fortfahren"
 


@@ -8263,11 +8505,15 @@ msgstr ""
 msgid "Current actions"
 msgstr "Aktuelle Aktionen"
 
 msgid "Current actions"
 msgstr "Aktuelle Aktionen"
 

-#: src/prefs_common.c:262
+#: src/prefs_common.c:210
+msgid "Hello,\\n"
+msgstr "Hallo,\\n"
+
+#: src/prefs_common.c:272

 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Am %d\\nschrieb %f:\\n\\n%q"
 
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Am %d\\nschrieb %f:\\n\\n%q"
 

-#: src/prefs_common.c:268
+#: src/prefs_common.c:278

 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"
 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"


@@ -8275,85 +8521,97 @@ msgstr ""
 "\\n\\nStart weitergeleitete Nachricht:\\n\\n?d{Datum: %d\\n}?f{Von: %f\\n}?t"
 "{An: %t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Betreff: %s\\n}\\n\\n%M"
 
 "\\n\\nStart weitergeleitete Nachricht:\\n\\n?d{Datum: %d\\n}?f{Von: %f\\n}?t"
 "{An: %t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Betreff: %s\\n}\\n\\n%M"
 

-#: src/prefs_common.c:353
+#: src/prefs_common.c:363

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 

-#: src/prefs_compose_writing.c:106
+#: src/prefs_compose_writing.c:124

 msgid "Automatic account selection"
 msgstr "Automatische Kontoauswahl"
 
 msgid "Automatic account selection"
 msgstr "Automatische Kontoauswahl"
 

-#: src/prefs_compose_writing.c:114
+#: src/prefs_compose_writing.c:132

 msgid "when replying"
 msgstr "Beim Antworten"
 
 msgid "when replying"
 msgstr "Beim Antworten"
 

-#: src/prefs_compose_writing.c:116
+#: src/prefs_compose_writing.c:134

 msgid "when forwarding"
 msgstr "Beim Weiterleiten"
 
 msgid "when forwarding"
 msgstr "Beim Weiterleiten"
 

-#: src/prefs_compose_writing.c:118
+#: src/prefs_compose_writing.c:136

 msgid "when re-editing"
 msgstr "Beim Wiederbearbeiten"
 
 msgid "when re-editing"
 msgstr "Beim Wiederbearbeiten"
 

-#: src/prefs_compose_writing.c:120
+#: src/prefs_compose_writing.c:138

 msgid "Forwarding"
 msgstr "Weiterleiten"
 
 msgid "Forwarding"
 msgstr "Weiterleiten"
 

-#: src/prefs_compose_writing.c:128 src/prefs_filtering_action.c:160
+#: src/prefs_compose_writing.c:146 src/prefs_filtering_action.c:160

 msgid "Forward as attachment"
 msgstr "Weiterleiten als Anhang"
 
 msgid "Forward as attachment"
 msgstr "Weiterleiten als Anhang"
 

-#: src/prefs_compose_writing.c:131
+#: src/prefs_compose_writing.c:149

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Beim Umleiten den original 'Von'-Nachrichtenkopf beibehalten"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Beim Umleiten den original 'Von'-Nachrichtenkopf beibehalten"
 

-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:151

 msgid "Editing"
 msgstr "Verfassen"
 
 msgid "Editing"
 msgstr "Verfassen"
 

-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:159

 msgid "Automatically launch the external editor"
 msgstr "Externen Editor automatisch starten"
 
 msgid "Automatically launch the external editor"
 msgstr "Externen Editor automatisch starten"
 

-#: src/prefs_compose_writing.c:148
+#: src/prefs_compose_writing.c:166

 msgid "Autosave message text to Drafts folder every"
 msgstr "Automatisches Speichern in den Entwurfsordner aller"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Automatisches Speichern in den Entwurfsordner aller"
 

-#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:176 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "Zeichen"
 
 msgid "characters"
 msgstr "Zeichen"
 

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:184

 msgid "Undo level"
 msgstr "Anzahl der Undoschritte"
 
 msgid "Undo level"
 msgstr "Anzahl der Undoschritte"
 

-#: src/prefs_compose_writing.c:179
+#: src/prefs_compose_writing.c:197

 msgid "Reply button invokes mailing list reply"
 msgstr "Antwortknopf löst Mailinglistenantwort aus"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwortknopf löst Mailinglistenantwort aus"
 

-#: src/prefs_compose_writing.c:182
+#: src/prefs_compose_writing.c:200

 msgid "When dropping files into the Compose window"
 msgstr "Wenn Dateien im Verfassenfenster fallen gelassen werden"
 
 msgid "When dropping files into the Compose window"
 msgstr "Wenn Dateien im Verfassenfenster fallen gelassen werden"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:208

 msgid "Ask"
 msgstr "nachfragen"
 
 msgid "Ask"
 msgstr "nachfragen"
 

-#: src/prefs_compose_writing.c:191 src/toolbar.c:446
+#: src/prefs_compose_writing.c:209 src/toolbar.c:456

 msgid "Insert"
 msgstr "Einfügen"
 
 msgid "Insert"
 msgstr "Einfügen"
 

-#: src/prefs_compose_writing.c:192 src/toolbar.c:447
+#: src/prefs_compose_writing.c:210 src/toolbar.c:457

 msgid "Attach"
 msgstr "Anhang"
 
 msgid "Attach"
 msgstr "Anhang"
 

-#: src/prefs_compose_writing.c:297 src/prefs_folder_item.c:1118
-#: src/prefs_quote.c:285 src/prefs_spelling.c:401 src/prefs_wrapping.c:144
-#: src/toolbar.c:1511
+#: src/prefs_compose_writing.c:226
+msgid "Use format when composing new messages"
+msgstr "Benutze Vorlage zum verfassen neuer Nachrichten"
+
+#: src/prefs_compose_writing.c:228
+msgid "New message format"
+msgstr "Vorlage neue Nachricht"
+
+#: src/prefs_compose_writing.c:282 src/prefs_quote.c:206
+msgid " Description of symbols... "
+msgstr " Beschreibung der Symbole... "
+
+#: src/prefs_compose_writing.c:402 src/prefs_folder_item.c:1170
+#: src/prefs_quote.c:311 src/prefs_spelling.c:448 src/prefs_wrapping.c:144
+#: src/toolbar.c:1560

 msgid "Compose"
 msgstr "Verfassen"
 
 msgid "Compose"
 msgstr "Verfassen"
 

-#: src/prefs_compose_writing.c:298
+#: src/prefs_compose_writing.c:403

 msgid "Writing"
 msgstr "Verfassen"
 
 msgid "Writing"
 msgstr "Verfassen"
 


@@ -8500,7 +8758,7 @@ msgid "Copy"
 msgstr "Kopieren"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
 msgstr "Kopieren"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79

-#: src/summaryview.c:2365
+#: src/summaryview.c:2366

 msgid "Mark"
 msgstr "Markieren"
 
 msgid "Mark"
 msgstr "Markieren"
 


@@ -8520,7 +8778,7 @@ msgstr "Als gelesen markieren"
 msgid "Mark as unread"
 msgstr "Als ungelesen markieren"
 
 msgid "Mark as unread"
 msgstr "Als ungelesen markieren"
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:398 src/toolbar.c:489
+#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499

 msgid "Forward"
 msgstr "Weiterleiten"
 
 msgid "Forward"
 msgstr "Weiterleiten"
 


@@ -8529,7 +8787,7 @@ msgid "Redirect"
 msgstr "Umleiten"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
 msgstr "Umleiten"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429

-#: src/toolbar.c:174 src/toolbar.c:1651
+#: src/toolbar.c:178 src/toolbar.c:1711

 msgid "Execute"
 msgstr "Ausführen"
 
 msgid "Execute"
 msgstr "Ausführen"
 


@@ -8549,7 +8807,7 @@ msgstr "Benotung setzen"
 msgid "Hide"
 msgstr "Verstecken"
 
 msgid "Hide"
 msgstr "Verstecken"
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:177
+#: src/prefs_filtering_action.c:167 src/toolbar.c:181

 msgid "Ignore thread"
 msgstr "Thread ignorieren"
 
 msgid "Ignore thread"
 msgstr "Thread ignorieren"
 


@@ -8667,6 +8925,11 @@ msgstr "Aktuelle Aktionsliste"
 msgid "Filtering/Processing configuration"
 msgstr "Filter-/Verarbeitungseinstellungen"
 
 msgid "Filtering/Processing configuration"
 msgstr "Filter-/Verarbeitungseinstellungen"
 

+#: src/prefs_filtering.c:250 src/prefs_filtering.c:781
+#: src/prefs_filtering.c:872
+msgid "Filtering Account Menu|All"
+msgstr "Alle"
+

 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Bedingung"
 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Bedingung"


@@ -8724,7 +8987,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Unsichtbare Spalten"
 
 msgid "Hidden columns"
 msgstr "Unsichtbare Spalten"
 

-#: src/prefs_folder_column.c:280 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:797
+#: src/prefs_summaries.c:943 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Angezeigte Spalten"
 
 msgid "Displayed columns"
 msgstr "Angezeigte Spalten"
 


@@ -8733,7 +8997,7 @@ msgstr "Angezeigte Spalten"
 msgid " Use default "
 msgstr " Standard verwenden "
 
 msgid " Use default "
 msgstr " Standard verwenden "
 

-#: src/prefs_folder_item.c:199 src/prefs_folder_item.c:640
+#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:646

 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 "
 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 "


@@ -8743,7 +9007,7 @@ msgstr ""
 "Unterordner des Kontos mit Hilfe des Knopfes \"auf Unterordner anwenden\" "
 "übertragen werden.</i>"
 
 "Unterordner des Kontos mit Hilfe des Knopfes \"auf Unterordner anwenden\" "
 "übertragen werden.</i>"
 

-#: src/prefs_folder_item.c:211 src/prefs_folder_item.c:652
+#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:658

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -8751,82 +9015,86 @@ msgstr ""
 "Anwenden auf\n"
 "Unterordner"
 
 "Anwenden auf\n"
 "Unterordner"
 

-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:238

 msgid "Normal"
 msgstr "Normal"
 
 msgid "Normal"
 msgstr "Normal"
 

-#: src/prefs_folder_item.c:237
+#: src/prefs_folder_item.c:240

 msgid "Outbox"
 msgstr "Gesendete"
 
 msgid "Outbox"
 msgstr "Gesendete"
 

-#: src/prefs_folder_item.c:254
+#: src/prefs_folder_item.c:257

 msgid "Folder type"
 msgstr "Ordnertype"
 
 msgid "Folder type"
 msgstr "Ordnertype"
 

-#: src/prefs_folder_item.c:266
+#: src/prefs_folder_item.c:269

 msgid "Simplify Subject RegExp"
 msgstr "Regulärer Ausdruck Betreffvereinfachung"
 
 msgid "Simplify Subject RegExp"
 msgstr "Regulärer Ausdruck Betreffvereinfachung"
 

-#: src/prefs_folder_item.c:292
+#: src/prefs_folder_item.c:295

 msgid "Test RegExp"
 msgstr "Test Regulärer Ausdruck"
 
 msgid "Test RegExp"
 msgstr "Test Regulärer Ausdruck"
 

-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:327

 msgid "Folder chmod"
 msgstr "Ordner chmod"
 
 msgid "Folder chmod"
 msgstr "Ordner chmod"
 

-#: src/prefs_folder_item.c:350
+#: src/prefs_folder_item.c:353

 msgid "Folder color"
 msgstr "Ordnerfarbe"
 
 msgid "Folder color"
 msgstr "Ordnerfarbe"
 

-#: src/prefs_folder_item.c:364 src/prefs_folder_item.c:995
+#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1045

 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Farbe für den Ordner wählen"
 
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Farbe für den Ordner wählen"
 

-#: src/prefs_folder_item.c:381
+#: src/prefs_folder_item.c:384

 msgid "Process at startup"
 msgstr "Beim Start verarbeiten"
 
 msgid "Process at startup"
 msgstr "Beim Start verarbeiten"
 

-#: src/prefs_folder_item.c:395
+#: src/prefs_folder_item.c:398

 msgid "Scan for new mail"
 msgstr "Nach neuen E-Mails scannen"
 
 msgid "Scan for new mail"
 msgstr "Nach neuen E-Mails scannen"
 

-#: src/prefs_folder_item.c:408
+#: src/prefs_folder_item.c:411

 msgid "Synchronise for offline use"
 msgstr "Für Offline-Nutzung synchronisieren"
 
 msgid "Synchronise for offline use"
 msgstr "Für Offline-Nutzung synchronisieren"
 

-#: src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:667

 msgid "Request Return Receipt"
 msgstr "Empfangsbestätigung fordern"
 
 msgid "Request Return Receipt"
 msgstr "Empfangsbestätigung fordern"
 

-#: src/prefs_folder_item.c:676
+#: src/prefs_folder_item.c:682

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Kopie der ausgehenden Nachrichten in diesem Ordner speichern, anstelle von "
 "'Gesendet'"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Kopie der ausgehenden Nachrichten in diesem Ordner speichern, anstelle von "
 "'Gesendet'"
 

-#: src/prefs_folder_item.c:689
+#: src/prefs_folder_item.c:695

 msgid "Default To: "
 msgstr "Standard An:"
 
 msgid "Default To: "
 msgstr "Standard An:"
 

-#: src/prefs_folder_item.c:710
+#: src/prefs_folder_item.c:716

 msgid "Default To for replies: "
 msgstr "Standard 'An' für Antworten:"
 
 msgid "Default To for replies: "
 msgstr "Standard 'An' für Antworten:"
 

-#: src/prefs_folder_item.c:731
+#: src/prefs_folder_item.c:737

 msgid "Default account: "
 msgstr "Standardkonto: "
 
 msgid "Default account: "
 msgstr "Standardkonto: "
 

-#: src/prefs_folder_item.c:782
+#: src/prefs_folder_item.c:788

 msgid "Default dictionary: "
 msgstr "Standard Wörterbuch: "
 
 msgid "Default dictionary: "
 msgstr "Standard Wörterbuch: "
 

-#: src/prefs_folder_item.c:1101
+#: src/prefs_folder_item.c:821
+msgid "Default alternate dictionary: "
+msgstr "alternatives Standard-Wörterbuch: "
+
+#: src/prefs_folder_item.c:1153

 msgid "General"
 msgstr "Generell"
 
 msgid "General"
 msgstr "Generell"
 

-#: src/prefs_folder_item.c:1146
+#: src/prefs_folder_item.c:1198

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Einstellungen für Ordner %s"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Einstellungen für Ordner %s"


@@ -8847,7 +9115,7 @@ msgstr "Benutze andere Schriftart zum drucken"
 msgid "Message Printing"
 msgstr "Nachricht drucken"
 
 msgid "Message Printing"
 msgstr "Nachricht drucken"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1078

 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Anzeige"
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Anzeige"


@@ -9250,7 +9518,7 @@ msgstr "Farbe für Signaturen wählen"
 msgid "Signatures"
 msgstr "Unterschriften"
 
 msgid "Signatures"
 msgstr "Unterschriften"
 

-#: src/prefs_msg_colors.c:376
+#: src/prefs_msg_colors.c:376 src/prefs_summaries.c:761

 msgid "Folder list"
 msgstr "Ordnerliste"
 
 msgid "Folder list"
 msgstr "Ordnerliste"
 


@@ -9282,8 +9550,8 @@ msgstr "Markierfarben"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format

-msgid "Pick color for 'color %d'"
-msgstr "Farbe für 'Farbe %d' wählen"
+msgid "Tooltip|Pick color for 'color %d'"
+msgstr "Farbe für 'color %d' wählen"

 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated


@@ -9296,8 +9564,8 @@ msgstr "Text für 'Farbe %d' wählen"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format

-msgid "Pick color for 'color %d' "
-msgstr "Farbe für 'Farbe %d' wählen"
+msgid "Dialog title|Pick color for 'color %d'"
+msgstr "Farbe für 'color %d' wählen"

 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "
 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "


@@ -9391,115 +9659,107 @@ msgstr "Socket I/O Zeitüberschreitung"
 msgid "Never send Return Receipts"
 msgstr "niemals Empfangsbestätigung senden"
 
 msgid "Never send Return Receipts"
 msgstr "niemals Empfangsbestätigung senden"
 

-#: src/prefs_quote.c:90
+#: src/prefs_quote.c:92

 msgid "Reply will quote by default"
 msgstr "Antwort standardmäßig zitieren"
 
 msgid "Reply will quote by default"
 msgstr "Antwort standardmäßig zitieren"
 

-#: src/prefs_quote.c:92
+#: src/prefs_quote.c:94

 msgid "Reply format"
 msgstr "Antwortformat"
 
 msgid "Reply format"
 msgstr "Antwortformat"
 

-#: src/prefs_quote.c:107 src/prefs_quote.c:149
+#: src/prefs_quote.c:109 src/prefs_quote.c:161

 msgid "Quotation mark"
 msgstr "Zitatzeichen"
 
 msgid "Quotation mark"
 msgstr "Zitatzeichen"
 

-#: src/prefs_quote.c:134
+#: src/prefs_quote.c:146

 msgid "Forward format"
 msgstr "Weiterleitungsformat"
 
 msgid "Forward format"
 msgstr "Weiterleitungsformat"
 

-#: src/prefs_quote.c:184
-msgid " Description of symbols... "
-msgstr " Beschreibung der Symbole... "
-
-#: src/prefs_quote.c:193
+#: src/prefs_quote.c:215

 msgid "Quotation characters"
 msgstr "Zitatzeichen"
 
 msgid "Quotation characters"
 msgstr "Zitatzeichen"
 

-#: src/prefs_quote.c:208
+#: src/prefs_quote.c:230

 msgid "Treat these characters as quotation marks: "
 msgstr "Diese Zeichen als Zitatzeichen behandeln: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Diese Zeichen als Zitatzeichen behandeln: "
 

-#: src/prefs_quote.c:286
+#: src/prefs_quote.c:312

 msgid "Quoting"
 msgstr "Zitate"
 
 msgid "Quoting"
 msgstr "Zitate"
 

-#: src/prefs_receive.c:122
+#: src/prefs_receive.c:121

 msgid "External incorporation program"
 msgstr "Externes Programm"
 
 msgid "External incorporation program"
 msgstr "Externes Programm"
 

-#: src/prefs_receive.c:129
+#: src/prefs_receive.c:128

 msgid "Use external program for receiving mail"
 msgstr "Externes Programm benutzen, um E-Mails zu empfangen"
 
 msgid "Use external program for receiving mail"
 msgstr "Externes Programm benutzen, um E-Mails zu empfangen"
 

-#: src/prefs_receive.c:136
+#: src/prefs_receive.c:135

 msgid "Command"
 msgstr "Befehl"
 
 msgid "Command"
 msgstr "Befehl"
 

-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:144

 msgid "Automatic checking"
 msgstr "automatisches Prüfen"
 
 msgid "Automatic checking"
 msgstr "automatisches Prüfen"
 

-#: src/prefs_receive.c:156
-msgid "Automatically check for new mail"
-msgstr "Automatisch auf neue E-Mails prüfen"
-
-#: src/prefs_receive.c:158
-msgid "every"
-msgstr "alle"
+#: src/prefs_receive.c:155
+msgid "Automatically check for new mail every"
+msgstr "automatisch auf neue Nachrichten prüfen aller"

 
 

-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:173

 msgid "Check for new mail on startup"
 msgstr "Beim Programmstart neue E-Mails holen"
 
 msgid "Check for new mail on startup"
 msgstr "Beim Programmstart neue E-Mails holen"
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:176

 msgid "Dialogs"
 msgstr "Dialoge"
 
 msgid "Dialogs"
 msgstr "Dialoge"
 

-#: src/prefs_receive.c:188
+#: src/prefs_receive.c:182

 msgid "Show receive dialog"
 msgstr "Empfangsdialog anzeigen"
 
 msgid "Show receive dialog"
 msgstr "Empfangsdialog anzeigen"
 

-#: src/prefs_receive.c:196 src/prefs_send.c:169 src/prefs_summaries.c:958
+#: src/prefs_receive.c:190 src/prefs_send.c:169 src/prefs_summaries.c:855

 msgid "Always"
 msgstr "Immer"
 
 msgid "Always"
 msgstr "Immer"
 

-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:191

 msgid "Only on manual receiving"
 msgstr "Nur beim manuellem Empfang"
 
 msgid "Only on manual receiving"
 msgstr "Nur beim manuellem Empfang"
 

-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:205

 msgid "Close receive dialog when finished"
 msgstr "Wenn fertig, Empfangsdialog schließen"
 
 msgid "Close receive dialog when finished"
 msgstr "Wenn fertig, Empfangsdialog schließen"
 

-#: src/prefs_receive.c:214
+#: src/prefs_receive.c:208

 msgid "Don't popup error dialog on receive error"
 msgstr "Kein Popup-Fenster bei Empfangsfehlern"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Kein Popup-Fenster bei Empfangsfehlern"
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:210

 msgid "After receiving new mail"
 msgstr "Nach dem Empfang neuer E-Mails"
 
 msgid "After receiving new mail"
 msgstr "Nach dem Empfang neuer E-Mails"
 

-#: src/prefs_receive.c:222
+#: src/prefs_receive.c:216

 msgid "Go to inbox"
 msgstr "Zum Posteingang wechseln"
 
 msgid "Go to inbox"
 msgstr "Zum Posteingang wechseln"
 

-#: src/prefs_receive.c:224
+#: src/prefs_receive.c:218

 msgid "Update all local folders"
 msgstr "alle lokalen Ordner aktualisieren"
 
 msgid "Update all local folders"
 msgstr "alle lokalen Ordner aktualisieren"
 

-#: src/prefs_receive.c:226
+#: src/prefs_receive.c:220

 msgid "Run command"
 msgstr "Kommando ausführen"
 
 msgid "Run command"
 msgstr "Kommando ausführen"
 

-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:229

 msgid "after automatic check"
 msgstr "nach automatischer Überprüfung"
 
 msgid "after automatic check"
 msgstr "nach automatischer Überprüfung"
 

-#: src/prefs_receive.c:237
+#: src/prefs_receive.c:231

 msgid "after manual check"
 msgstr "nach manueller Überprüfung"
 
 msgid "after manual check"
 msgstr "nach manueller Überprüfung"
 

-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:239

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -9508,11 +9768,11 @@ msgstr ""
 "Auszuführendes Kommando:\n"
 "(%d als Anzahl der neuen Nachrichten verwenden)"
 
 "Auszuführendes Kommando:\n"
 "(%d als Anzahl der neuen Nachrichten verwenden)"
 

-#: src/prefs_receive.c:371 src/prefs_send.c:337
+#: src/prefs_receive.c:365 src/prefs_send.c:337

 msgid "Mail Handling"
 msgstr "Mail-Handling"
 
 msgid "Mail Handling"
 msgstr "Mail-Handling"
 

-#: src/prefs_receive.c:372
+#: src/prefs_receive.c:366

 msgid "Receiving"
 msgstr "Empfangen"
 
 msgid "Receiving"
 msgstr "Empfangen"
 


@@ -9673,164 +9933,172 @@ msgstr ""
 msgid "Sending"
 msgstr "Senden"
 
 msgid "Sending"
 msgstr "Senden"
 

-#: src/prefs_spelling.c:105
+#: src/prefs_spelling.c:91

 msgid "Select dictionaries location"
 msgstr "Ort der Wörterbücher wählen"
 
 msgid "Select dictionaries location"
 msgstr "Ort der Wörterbücher wählen"
 

-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:126

 msgid "Pick color for misspelled word"
 msgstr "Farbe für falsche Worte wählen"
 
 msgid "Pick color for misspelled word"
 msgstr "Farbe für falsche Worte wählen"
 

-#: src/prefs_spelling.c:186
+#: src/prefs_spelling.c:183

 msgid "Enable spell checker"
 msgstr "Rechtschreibprüfung aktivieren"
 
 msgid "Enable spell checker"
 msgstr "Rechtschreibprüfung aktivieren"
 

-#: src/prefs_spelling.c:191
+#: src/prefs_spelling.c:188

 msgid "Enable alternate dictionary"
 msgstr "Alternatives Wörterbuch aktivieren"
 
 msgid "Enable alternate dictionary"
 msgstr "Alternatives Wörterbuch aktivieren"
 

-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194

 msgid "Faster switching with last used dictionary"
 msgstr "Schnelleres Wechseln mit zuletzt verwendetem Wörterbuch"
 
 msgid "Faster switching with last used dictionary"
 msgstr "Schnelleres Wechseln mit zuletzt verwendetem Wörterbuch"
 

-#: src/prefs_spelling.c:199
+#: src/prefs_spelling.c:196

 msgid "Path to dictionaries"
 msgstr "Verzeichniss der Wörterbücher"
 
 msgid "Path to dictionaries"
 msgstr "Verzeichniss der Wörterbücher"
 

-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:211

 msgid "Automatic spelling"
 msgstr "automatische Rechtschreibprüfung"
 
 msgid "Automatic spelling"
 msgstr "automatische Rechtschreibprüfung"
 

-#: src/prefs_spelling.c:226
+#: src/prefs_spelling.c:223

 msgid "Re-check message when changing dictionary"
 msgstr "Nachricht erneut prüfen wenn das Wörterbuch gewechselt wird"
 
 msgid "Re-check message when changing dictionary"
 msgstr "Nachricht erneut prüfen wenn das Wörterbuch gewechselt wird"
 

-#: src/prefs_spelling.c:230
+#: src/prefs_spelling.c:227

 msgid "Dictionary"
 msgstr "Wörterbuch"
 
 msgid "Dictionary"
 msgstr "Wörterbuch"
 

-#: src/prefs_spelling.c:243
+#: src/prefs_spelling.c:240

 msgid "Default dictionary"
 msgstr "Standard-Wörterbuch"
 
 msgid "Default dictionary"
 msgstr "Standard-Wörterbuch"
 

-#: src/prefs_spelling.c:261
+#: src/prefs_spelling.c:258
+msgid "Default alternate dictionary"
+msgstr "alternatives Standard-Wörterbuch"
+
+#: src/prefs_spelling.c:277
+msgid "Check with both dictionaries"
+msgstr "mit beiden Wörterbüchern prüfen"
+
+#: src/prefs_spelling.c:283

 msgid "Default suggestion mode"
 msgstr "Standard-Vorschlagsmodus"
 
 msgid "Default suggestion mode"
 msgstr "Standard-Vorschlagsmodus"
 

-#: src/prefs_spelling.c:283
+#: src/prefs_spelling.c:305

 msgid "Misspelled word color"
 msgstr "Farbe falsch geschriebener Worte"
 
 msgid "Misspelled word color"
 msgstr "Farbe falsch geschriebener Worte"
 

-#: src/prefs_spelling.c:297
+#: src/prefs_spelling.c:319

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Farbe für falsche Worte wählen. Wähle Schwarz zum unterstreichen"
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Farbe für falsche Worte wählen. Wähle Schwarz zum unterstreichen"
 

-#: src/prefs_spelling.c:402
+#: src/prefs_spelling.c:449

 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr "den abgekürzten Namen des Wochentags"
 
 msgid "the full abbreviated weekday name"
 msgstr "den abgekürzten Namen des Wochentags"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr "den vollständigen Namen des Wochentags"
 
 msgid "the full weekday name"
 msgstr "den vollständigen Namen des Wochentags"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr "den abgekürzten Namen des Monats"
 
 msgid "the abbreviated month name"
 msgstr "den abgekürzten Namen des Monats"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr "den vollständigen Namen des Monats"
 
 msgid "the full month name"
 msgstr "den vollständigen Namen des Monats"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr "das bevorzugte lokale Zeit-/Datumsformat"
 
 msgid "the preferred date and time for the current locale"
 msgstr "das bevorzugte lokale Zeit-/Datumsformat"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr "das Jahrhundert (Jahr/100)"
 
 msgid "the century number (year/100)"
 msgstr "das Jahrhundert (Jahr/100)"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr "der Tag des Monats als Dezimalzahl"
 
 msgid "the day of the month as a decimal number"
 msgstr "der Tag des Monats als Dezimalzahl"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 24-Std. Uhr"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 24-Std. Uhr"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 12-Std. Uhr"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 12-Std. Uhr"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr "der Tag des Jahres als Dezimalzahl"
 
 msgid "the day of the year as a decimal number"
 msgstr "der Tag des Jahres als Dezimalzahl"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr "der Monat als Dezimalzahl"
 
 msgid "the month as a decimal number"
 msgstr "der Monat als Dezimalzahl"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr "die Minute als Dezimalzahl"
 
 msgid "the minute as a decimal number"
 msgstr "die Minute als Dezimalzahl"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr "die Sekunden als Dezimalzahl"
 
 msgid "the second as a decimal number"
 msgstr "die Sekunden als Dezimalzahl"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr "der Wochentag als Dezimalzahl"
 
 msgid "the day of the week as a decimal number"
 msgstr "der Wochentag als Dezimalzahl"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr "das bevorzugte lokale Datumsformat"
 
 msgid "the preferred date for the current locale"
 msgstr "das bevorzugte lokale Datumsformat"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr "die letzten beiden Stellen des Jahres"
 
 msgid "the last two digits of a year"
 msgstr "die letzten beiden Stellen des Jahres"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr "das Jahr als Dezimalzahl"
 
 msgid "the year as a decimal number"
 msgstr "das Jahr als Dezimalzahl"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr "die Zeitzone oder Abkürzung"
 
 msgid "the time zone or name or abbreviation"
 msgstr "die Zeitzone oder Abkürzung"
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
+#: src/prefs_summaries.c:911

 msgid "Date format"
 msgstr "Datumsformat"
 
 msgid "Date format"
 msgstr "Datumsformat"
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr "Spezifikationssymbol"
 
 msgid "Specifier"
 msgstr "Spezifikationssymbol"
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr "Beispiel"
 
 msgid "Example"
 msgstr "Beispiel"
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Select key bindings"
 msgstr "Tastenbindungen auswählen"
 
 msgid "Select key bindings"
 msgstr "Tastenbindungen auswählen"
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr "Voreinstellung wählen:"
 
 msgid "Select preset:"
 msgstr "Voreinstellung wählen:"
 

-#: src/prefs_summaries.c:352 src/prefs_summaries.c:699
+#: src/prefs_summaries.c:353 src/prefs_summaries.c:700

 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:361

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."


@@ -9839,131 +10107,130 @@ msgstr ""
 "Tastenkombination\n"
 "drückt, während sich der Mauszeiger über dem Eintrag befindet."
 
 "Tastenkombination\n"
 "drückt, während sich der Mauszeiger über dem Eintrag befindet."
 

-#: src/prefs_summaries.c:767
-msgid "Translate header names"
-msgstr "Übersetze Kopfzeilennamen"
-
-#: src/prefs_summaries.c:769
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"Die Standardkopfzeilen (wie 'From:', 'Subject:') werden in ihre Sprache "
-"übersetzt"
-
-#: src/prefs_summaries.c:773
+#: src/prefs_summaries.c:768

 msgid "Display unread number next to folder name"
 msgstr "Anzahl der ungelesenen E-Mails nach Ordnername anzeigen"
 
 msgid "Display unread number next to folder name"
 msgstr "Anzahl der ungelesenen E-Mails nach Ordnername anzeigen"
 

-#: src/prefs_summaries.c:780
+#: src/prefs_summaries.c:775

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Kürzen von Newsgruppen länger als"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Kürzen von Newsgruppen länger als"
 

-#: src/prefs_summaries.c:794
+#: src/prefs_summaries.c:789

 msgid "letters"
 msgstr "Zeichen"
 
 #: src/prefs_summaries.c:807
 msgid "letters"
 msgstr "Zeichen"
 
 #: src/prefs_summaries.c:807

-msgid "Display sender using address book"
-msgstr "Absender mittels Adressbuch darstellen"
-
-#: src/prefs_summaries.c:810
-msgid "Thread using subject in addition to standard headers"
-msgstr "Threads mit Unterstützung des Betreffs zusätzlich zum Standardheader"
-
-#: src/prefs_summaries.c:833
-msgid "Date format help"
-msgstr "Hilfe Datumsformat"
-
-#: src/prefs_summaries.c:837
-msgid "Set displayed columns"
-msgstr "Angezeigte Spalten setzen"
+msgid "Message list"
+msgstr " Nachrichtenliste"

 
 

-#: src/prefs_summaries.c:845
-msgid " Folder list... "
-msgstr " Ordnerliste... "
-
-#: src/prefs_summaries.c:853
-msgid " Message list... "
-msgstr " Nachrichtenliste... "
-
-#: src/prefs_summaries.c:874
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Bewegen oder Löschen von Nachrichten sofort ausführen"
-
-#: src/prefs_summaries.c:876
-msgid "Messages will be marked until execution if this is turned off"
-msgstr ""
-"Nachricht wird markiert bis zur Ausführung, wenn dies ausgeschaltet ist"
-
-#: src/prefs_summaries.c:882
-msgid "Confirm before marking all mails in a folder as read"
-msgstr ""
-"Nachfragen bevor alle Mails in einem Ordner als gelesen markiert werden"
-
-#: src/prefs_summaries.c:886
-msgid "Always open message when selected"
-msgstr "Nachrichten immer öffnen, wenn sie ausgewählt wurden"
-
-#: src/prefs_summaries.c:890
-msgid "Only mark message as read when opened in a new window"
-msgstr ""
-"Nachricht nur als gelesen markieren, wenn sie in einem neuen Fenster "
-"geöffnet wurde"
-
-#: src/prefs_summaries.c:903
+#: src/prefs_summaries.c:817

 msgid "When entering a folder"
 msgstr "Beim Öffnen eines Ordners"
 
 msgid "When entering a folder"
 msgstr "Beim Öffnen eines Ordners"
 

-#: src/prefs_summaries.c:919
+#: src/prefs_summaries.c:825

 msgid "Do nothing"
 msgstr "Nichts tun"
 
 msgid "Do nothing"
 msgstr "Nichts tun"
 

-#: src/prefs_summaries.c:920
+#: src/prefs_summaries.c:826

 msgid "Select first unread (or new or marked) message"
 msgstr "Erste ungelesene (neue oder markierte) Nachricht auswählen"
 
 msgid "Select first unread (or new or marked) message"
 msgstr "Erste ungelesene (neue oder markierte) Nachricht auswählen"
 

-#: src/prefs_summaries.c:922
+#: src/prefs_summaries.c:828

 msgid "Select first unread (or marked or new) message"
 msgstr "Erste ungelesene (markierte oder neue) Nachricht auswählen"
 
 msgid "Select first unread (or marked or new) message"
 msgstr "Erste ungelesene (markierte oder neue) Nachricht auswählen"
 

-#: src/prefs_summaries.c:924
+#: src/prefs_summaries.c:830

 msgid "Select first new (or unread or marked) message"
 msgstr "Erste neue (ungelesene oder markierte) Nachricht auswählen"
 
 msgid "Select first new (or unread or marked) message"
 msgstr "Erste neue (ungelesene oder markierte) Nachricht auswählen"
 

-#: src/prefs_summaries.c:926
+#: src/prefs_summaries.c:832

 msgid "Select first new (or marked or unread) message"
 msgstr "Erste neue (markierte oder ungelesene) Nachricht auswählen"
 
 msgid "Select first new (or marked or unread) message"
 msgstr "Erste neue (markierte oder ungelesene) Nachricht auswählen"
 

-#: src/prefs_summaries.c:928
+#: src/prefs_summaries.c:834

 msgid "Select first marked (or new or unread) message"
 msgstr "Erste markierte (neue oder ungelesene) Nachricht auswählen"
 
 msgid "Select first marked (or new or unread) message"
 msgstr "Erste markierte (neue oder ungelesene) Nachricht auswählen"
 

-#: src/prefs_summaries.c:930
+#: src/prefs_summaries.c:836

 msgid "Select first marked (or unread or new) message"
 msgstr "Erste markierte (ungelesene oder neue) Nachricht auswählen"
 
 msgid "Select first marked (or unread or new) message"
 msgstr "Erste markierte (ungelesene oder neue) Nachricht auswählen"
 

-#: src/prefs_summaries.c:942
+#: src/prefs_summaries.c:847

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "'Keine ungelesenen (oder neue) Nachrichten'-Dialog anzeigen"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "'Keine ungelesenen (oder neue) Nachrichten'-Dialog anzeigen"
 

-#: src/prefs_summaries.c:959
+#: src/prefs_summaries.c:856

 msgid "Assume 'Yes'"
 msgstr "'Ja' annehmen"
 
 msgid "Assume 'Yes'"
 msgstr "'Ja' annehmen"
 

-#: src/prefs_summaries.c:961
+#: src/prefs_summaries.c:858

 msgid "Assume 'No'"
 msgstr "'Nein' annehmen"
 
 msgid "Assume 'No'"
 msgstr "'Nein' annehmen"
 

-#: src/prefs_summaries.c:970
+#: src/prefs_summaries.c:866
+msgid "Always open message when selected"
+msgstr "Nachrichten immer öffnen, wenn sie ausgewählt wurden"
+
+#: src/prefs_summaries.c:869
+msgid "Thread using subject in addition to standard headers"
+msgstr "Threads mit Unterstützung des Betreffs zusätzlich zum Standardheader"
+
+#: src/prefs_summaries.c:875
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Bewegen oder Löschen von Nachrichten sofort ausführen"
+
+#: src/prefs_summaries.c:877
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr ""
+"Verschieben, Kopieren und Löschen von Nachrichten zurückhalten bis 'Extras/"
+"Ausführen' aufgerufen wird"
+
+#: src/prefs_summaries.c:882
+msgid "Only mark message as read when opened in a new window"
+msgstr ""
+"Nachricht nur als gelesen markieren, wenn sie in einem neuen Fenster "
+"geöffnet wurde"
+
+#: src/prefs_summaries.c:889
+msgid "Mark messages as read after"
+msgstr "Nachricht als gelesen markieren nach"
+
+#: src/prefs_summaries.c:905
+msgid "Display sender using address book"
+msgstr "Absender mittels Adressbuch darstellen"
+
+#: src/prefs_summaries.c:937
+msgid "Date format help"
+msgstr "Hilfe Datumsformat"
+
+#: src/prefs_summaries.c:955
+msgid "Confirm before marking all mails in a folder as read"
+msgstr ""
+"Nachfragen bevor alle Mails in einem Ordner als gelesen markiert werden"
+
+#: src/prefs_summaries.c:958
+msgid "Translate header names"
+msgstr "Übersetze Kopfzeilennamen"
+
+#: src/prefs_summaries.c:960
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"Die Standardkopfzeilen (wie 'From:', 'Subject:') werden in ihre Sprache "
+"übersetzt"
+
+#: src/prefs_summaries.c:967

 msgid " Set key bindings... "
 msgstr "Tastenbindungen setzen"
 
 msgid " Set key bindings... "
 msgstr "Tastenbindungen setzen"
 

-#: src/prefs_summaries.c:1077
+#: src/prefs_summaries.c:1079

 msgid "Summaries"
 msgstr "Gesamtansicht"
 
 msgid "Summaries"
 msgstr "Gesamtansicht"
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2359
+#: src/prefs_summary_column.c:81 src/summaryview.c:2360

 msgid "Attachment"
 msgstr "Anhang"
 
 msgid "Attachment"
 msgstr "Anhang"
 


@@ -9988,35 +10255,31 @@ msgstr ""
 msgid "This name is used as the Menu item"
 msgstr "Der Name wird als Menüeintrag verwendet"
 
 msgid "This name is used as the Menu item"
 msgstr "Der Name wird als Menüeintrag verwendet"
 

-#: src/prefs_template.c:276
+#: src/prefs_template.c:286

 msgid " Symbols... "
 msgstr " Symbole..."
 
 msgid " Symbols... "
 msgstr " Symbole..."
 

-#: src/prefs_template.c:305
+#: src/prefs_template.c:315

 msgid "Template configuration"
 msgstr "Vorlagenkonfiguration"
 
 msgid "Template configuration"
 msgstr "Vorlagenkonfiguration"
 

-#: src/prefs_template.c:526
-msgid "Template format error."
-msgstr "Vorlagen-Formatfehler."
-
-#: src/prefs_template.c:536
+#: src/prefs_template.c:557

 msgid "Template name is not set."
 msgstr "Vorlagenname ist nicht gesetzt."
 
 msgid "Template name is not set."
 msgstr "Vorlagenname ist nicht gesetzt."
 

-#: src/prefs_template.c:625
+#: src/prefs_template.c:667

 msgid "Delete template"
 msgstr "Vorlage löschen"
 
 msgid "Delete template"
 msgstr "Vorlage löschen"
 

-#: src/prefs_template.c:626
+#: src/prefs_template.c:668

 msgid "Do you really want to delete this template?"
 msgstr "Soll diese Vorlage wirklich gelöscht werden?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Soll diese Vorlage wirklich gelöscht werden?"
 

-#: src/prefs_template.c:763
+#: src/prefs_template.c:805

 msgid "Current templates"
 msgstr "Aktuelle Vorlagen"
 
 msgid "Current templates"
 msgstr "Aktuelle Vorlagen"
 

-#: src/prefs_template.c:788
+#: src/prefs_template.c:830

 msgid "Template"
 msgstr "Vorlage"
 
 msgid "Template"
 msgstr "Vorlage"
 


@@ -10118,10 +10381,6 @@ msgstr ""
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d Themes vorhanden (%d User, %d System, 1 intern)"
 
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d Themes vorhanden (%d User, %d System, 1 intern)"
 

-#: src/prefs_themes.c:706
-msgid "The Sylpheed-Claws Team"
-msgstr "Das Sylpheed Claws Team"
-

 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"


@@ -10197,8 +10456,8 @@ msgid "Message view toolbar configuration"
 msgstr "Konfiguration der Nachrichtenansichts-Toolbar"
 
 #: src/prefs_toolbar.c:643
 msgstr "Konfiguration der Nachrichtenansichts-Toolbar"
 
 #: src/prefs_toolbar.c:643

-msgid "Sylpheed-Claws Action"
-msgstr "Sylpheed-Claws Aktion"
+msgid "Claws Mail Action"
+msgstr "Claws Mail Aktion"

 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"
 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"


@@ -10268,10 +10527,6 @@ msgstr "Zeilenumbruch"
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 

-#: src/privacy.c:211 src/privacy.c:215 src/privacy.c:232 src/privacy.c:236
-msgid "No signature found"
-msgstr "Keine digitale Unterschrift gefunden"
-

 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Keine Informationen verfügbar"
 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Keine Informationen verfügbar"


@@ -10284,29 +10539,29 @@ msgstr "kein Empfängerschlüssel angegeben."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fehler BASE64-Entschlüsselung]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Fehler BASE64-Entschlüsselung]\n"
 

-#: src/procmsg.c:908 src/procmsg.c:911
+#: src/procmsg.c:918 src/procmsg.c:921

 msgid "Already trying to send."
 msgstr "es wird bereits versucht zu Senden."
 
 msgid "Already trying to send."
 msgstr "es wird bereits versucht zu Senden."
 

-#: src/procmsg.c:1499
+#: src/procmsg.c:1517

 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Die Datei %s konnte nicht geöffnet werden."
 
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Die Datei %s konnte nicht geöffnet werden."
 

-#: src/procmsg.c:1593
+#: src/procmsg.c:1615

 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Die Email konnte nicht verschlüsselt werden: %s"
 
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Die Email konnte nicht verschlüsselt werden: %s"
 

-#: src/procmsg.c:1626
+#: src/procmsg.c:1648

 msgid "Queued message header is broken."
 msgstr "Die Kopfzeilen der Nachricht im Postausgang sind kaputt."
 
 msgid "Queued message header is broken."
 msgstr "Die Kopfzeilen der Nachricht im Postausgang sind kaputt."
 

-#: src/procmsg.c:1647
+#: src/procmsg.c:1669

 msgid "An error happened during SMTP session."
 msgstr "Während der SMTP Sitzung ist ein Fehler aufgetreten."
 
 msgid "An error happened during SMTP session."
 msgstr "Während der SMTP Sitzung ist ein Fehler aufgetreten."
 

-#: src/procmsg.c:1661
+#: src/procmsg.c:1683

 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."


@@ -10314,28 +10569,28 @@ msgstr ""
 "Es wurde kein Account zum senden gefunden und ein Fehler ist während der "
 "SMTP Sitzung aufgetreten."
 
 "Es wurde kein Account zum senden gefunden und ein Fehler ist während der "
 "SMTP Sitzung aufgetreten."
 

-#: src/procmsg.c:1669
+#: src/procmsg.c:1691

 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "

-"generated by Sylpheed-Claws."
+"generated by Claws Mail."

 msgstr ""
 "Die Informationen zum Senden konnten nicht ermittelt werden. Eventuell wurde "
 msgstr ""
 "Die Informationen zum Senden konnten nicht ermittelt werden. Eventuell wurde "

-"diese Mail nicht von Sylpheed-Claws erstellt."
+"diese Mail nicht von Claws Mail erstellt."

 
 

-#: src/procmsg.c:1687
+#: src/procmsg.c:1709

 msgid "Couldn't create temporary file for news sending."
 msgstr "Temporäre Datei für das Senden der News konnte nicht erstellt werden."
 
 msgid "Couldn't create temporary file for news sending."
 msgstr "Temporäre Datei für das Senden der News konnte nicht erstellt werden."
 

-#: src/procmsg.c:1700
+#: src/procmsg.c:1722

 msgid "Error when writing temporary file for news sending."
 msgstr "Fehler beim Schreiben der temporären Datei für Newssendung."
 
 msgid "Error when writing temporary file for news sending."
 msgstr "Fehler beim Schreiben der temporären Datei für Newssendung."
 

-#: src/procmsg.c:1714
+#: src/procmsg.c:1736

 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Beim Senden der Nachricht zu %s ist ein Fehler aufgetreten."
 
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Beim Senden der Nachricht zu %s ist ein Fehler aufgetreten."
 

-#: src/procmsg.c:2194
+#: src/procmsg.c:2226

 msgid "Filtering messages...\n"
 msgstr "Nachrichten werden gefiltert...\n"
 
 msgid "Filtering messages...\n"
 msgstr "Nachrichten werden gefiltert...\n"
 


@@ -10495,12 +10750,12 @@ msgstr "Beschreibung der Symbole"
 msgid "The following symbols can be used:"
 msgstr "Die folgenden Symbole können verwendet werden:"
 
 msgid "The following symbols can be used:"
 msgstr "Die folgenden Symbole können verwendet werden:"
 

-#: src/quote_fmt_parse.y:461
+#: src/quote_fmt_parse.y:464

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Eingaben um '%s' zu ersetzen"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Eingaben um '%s' zu ersetzen"
 

-#: src/quote_fmt_parse.y:462
+#: src/quote_fmt_parse.y:465

 msgid "Enter variable"
 msgstr "Variable eingeben"
 
 msgid "Enter variable"
 msgstr "Variable eingeben"
 


@@ -10622,47 +10877,47 @@ msgstr "%s - Quelltext"
 msgid "Saved SSL Certificates"
 msgstr "gespeicherte SSL Zertifikate"
 
 msgid "Saved SSL Certificates"
 msgstr "gespeicherte SSL Zertifikate"
 

-#: src/ssl_manager.c:386
+#: src/ssl_manager.c:428

 msgid "Delete certificate"
 msgstr "Zertifikat löschen"
 
 msgid "Delete certificate"
 msgstr "Zertifikat löschen"
 

-#: src/ssl_manager.c:387
+#: src/ssl_manager.c:429

 msgid "Do you really want to delete this certificate?"
 msgstr "Soll dieses Zertifikat wirklich gelöscht werden?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Soll dieses Zertifikat wirklich gelöscht werden?"
 

-#: src/summary_search.c:202
+#: src/summary_search.c:230

 msgid "Search messages"
 msgstr "Nachrichten durchsuchen"
 
 msgid "Search messages"
 msgstr "Nachrichten durchsuchen"
 

-#: src/summary_search.c:224
+#: src/summary_search.c:252

 msgid "Match any of the following"
 msgstr "Übereinstimmung mit irgendetwas des Folgenden"
 
 msgid "Match any of the following"
 msgstr "Übereinstimmung mit irgendetwas des Folgenden"
 

-#: src/summary_search.c:225
+#: src/summary_search.c:253

 msgid "Match all of the following"
 msgstr "Übereinstimmung mit allem des Folgenden"
 
 msgid "Match all of the following"
 msgstr "Übereinstimmung mit allem des Folgenden"
 

-#: src/summary_search.c:284
+#: src/summary_search.c:352

 msgid "From:"
 msgstr "Von:"
 
 msgid "From:"
 msgstr "Von:"
 

-#: src/summary_search.c:305
+#: src/summary_search.c:373

 msgid "Body:"
 msgstr "Körper:"
 
 msgid "Body:"
 msgstr "Körper:"
 

-#: src/summary_search.c:312
+#: src/summary_search.c:380

 msgid "Condition:"
 msgstr "Bedingung:"
 
 msgid "Condition:"
 msgstr "Bedingung:"
 

-#: src/summary_search.c:342
+#: src/summary_search.c:410

 msgid "Find _all"
 msgstr "_Alle finden"
 
 msgid "Find _all"
 msgstr "_Alle finden"
 

-#: src/summary_search.c:543
+#: src/summary_search.c:645

 msgid "Beginning of list reached; continue from end?"
 msgstr "Anfang der Liste erreicht. Weiter vom Ende?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "Anfang der Liste erreicht. Weiter vom Ende?"
 

-#: src/summary_search.c:545
+#: src/summary_search.c:647

 msgid "End of list reached; continue from beginning?"
 msgstr "Ende der Liste erreicht. Weiter vom Anfang?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Ende der Liste erreicht. Weiter vom Anfang?"
 


@@ -10686,11 +10941,11 @@ msgstr "/_Antwort an/Abs_ender"
 msgid "/Repl_y to/mailing _list"
 msgstr "/Antwort an/_Mailingliste"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Antwort an/_Mailingliste"
 

-#: src/summaryview.c:424 src/toolbar.c:234
+#: src/summaryview.c:424 src/toolbar.c:239

 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 

-#: src/summaryview.c:425 src/toolbar.c:235
+#: src/summaryview.c:425 src/toolbar.c:240

 msgid "/For_ward as attachment"
 msgstr "/_Weiterleiten als Anhang"
 
 msgid "/For_ward as attachment"
 msgstr "/_Weiterleiten als Anhang"
 


@@ -10950,19 +11205,19 @@ msgstr " Einträge gewählt"
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 

-#: src/summaryview.c:2503
+#: src/summaryview.c:2504

 msgid "Sorting summary..."
 msgstr "Ordneransicht wird sortiert..."
 
 msgid "Sorting summary..."
 msgstr "Ordneransicht wird sortiert..."
 

-#: src/summaryview.c:2584
+#: src/summaryview.c:2585

 msgid "Setting summary from message data..."
 msgstr "Ordneransicht wird aus Nachrichtendaten gesetzt..."
 
 msgid "Setting summary from message data..."
 msgstr "Ordneransicht wird aus Nachrichtendaten gesetzt..."
 

-#: src/summaryview.c:2762
+#: src/summaryview.c:2763

 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 

-#: src/summaryview.c:2800
+#: src/summaryview.c:2801

 msgid "(No Recipient)"
 msgstr "(Kein Empfänger)"
 
 msgid "(No Recipient)"
 msgstr "(Kein Empfänger)"
 


@@ -11002,27 +11257,27 @@ msgstr "_Anhängen"
 msgid "_Overwrite"
 msgstr "_Überschreiben"
 
 msgid "_Overwrite"
 msgstr "_Überschreiben"
 

-#: src/summaryview.c:4423
+#: src/summaryview.c:4431

 msgid "Building threads..."
 msgstr "Threads werden erstellt..."
 
 msgid "Building threads..."
 msgstr "Threads werden erstellt..."
 

-#: src/summaryview.c:4642
+#: src/summaryview.c:4650

 msgid "Skip these rules"
 msgstr "Diese Regel überspringen"
 
 msgid "Skip these rules"
 msgstr "Diese Regel überspringen"
 

-#: src/summaryview.c:4645
+#: src/summaryview.c:4653

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Diese Regeln anwenden egal zu welchem Konto sie gehöhren"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Diese Regeln anwenden egal zu welchem Konto sie gehöhren"
 

-#: src/summaryview.c:4648
+#: src/summaryview.c:4656

 msgid "Apply these rules if they apply to the current account"
 msgstr "Die Regeln anwenden, wenn sie zum aktuellen Konto gehöhren"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "Die Regeln anwenden, wenn sie zum aktuellen Konto gehöhren"
 

-#: src/summaryview.c:4677
+#: src/summaryview.c:4685

 msgid "Filtering"
 msgstr "Filter"
 
 msgid "Filtering"
 msgstr "Filter"
 

-#: src/summaryview.c:4678
+#: src/summaryview.c:4686

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -11030,19 +11285,19 @@ msgstr ""
 "Einige Filterregeln ghöhren zu einem bestimmtem Konto.\n"
 "Bitte wähle was mit diesen geschehen soll:"
 
 "Einige Filterregeln ghöhren zu einem bestimmtem Konto.\n"
 "Bitte wähle was mit diesen geschehen soll:"
 

-#: src/summaryview.c:4680
+#: src/summaryview.c:4688

 msgid "+_Filter"
 msgstr "+_Filtern"
 
 msgid "+_Filter"
 msgstr "+_Filtern"
 

-#: src/summaryview.c:4707
+#: src/summaryview.c:4715

 msgid "Filtering..."
 msgstr "Filterung läuft..."
 
 msgid "Filtering..."
 msgstr "Filterung läuft..."
 

-#: src/summaryview.c:4780
+#: src/summaryview.c:4788

 msgid "Processing configuration"
 msgstr "Verarbeitungsregeln"
 
 msgid "Processing configuration"
 msgstr "Verarbeitungsregeln"
 

-#: src/summaryview.c:6220
+#: src/summaryview.c:6233

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -11081,7 +11336,7 @@ msgstr "[%s  %s (%d bytes)]"
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 

-#: src/textview.c:811
+#: src/textview.c:812

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -11095,79 +11350,79 @@ msgstr ""
 "\n"
 "  Benutze "
 
 "\n"
 "  Benutze "
 

-#: src/textview.c:816
+#: src/textview.c:817

 msgid "'View Log'"
 msgstr "Protokoll Anzeigen"
 
 msgid "'View Log'"
 msgstr "Protokoll Anzeigen"
 

-#: src/textview.c:817
+#: src/textview.c:818

 msgid " in the Tools menu for more information."
 msgstr " im Extrasmenü für mehr Informationen."
 
 msgid " in the Tools menu for more information."
 msgstr " im Extrasmenü für mehr Informationen."
 

-#: src/textview.c:838
+#: src/textview.c:839

 msgid "  The following can be performed on this part by\n"
 msgstr "  Folgende Dinge können durch Rechtsklicken auf das\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  Folgende Dinge können durch Rechtsklicken auf das\n"
 

-#: src/textview.c:839
+#: src/textview.c:840

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  Icon mit diesem Teil der Nachricht gemacht werden:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  Icon mit diesem Teil der Nachricht gemacht werden:\n"
 

-#: src/textview.c:841
+#: src/textview.c:842

 msgid "     - To save, select "
 msgstr "     - Zum speichern "
 
 msgid "     - To save, select "
 msgstr "     - Zum speichern "
 

-#: src/textview.c:842
+#: src/textview.c:843

 msgid "'Save as...'"
 msgstr "'Speichern als...'"
 
 msgid "'Save as...'"
 msgstr "'Speichern als...'"
 

-#: src/textview.c:843
+#: src/textview.c:844

 msgid " (Shortcut key: 'y')\n"
 msgstr " (Kurzwahltaste: 'y')\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (Kurzwahltaste: 'y')\n"
 

-#: src/textview.c:844
+#: src/textview.c:845

 msgid "     - To display as text, select "
 msgstr "     - Zum Darstellen als Text "
 
 msgid "     - To display as text, select "
 msgstr "     - Zum Darstellen als Text "
 

-#: src/textview.c:845
+#: src/textview.c:846

 msgid "'Display as text'"
 msgstr "'Darstellen als Text'"
 
 msgid "'Display as text'"
 msgstr "'Darstellen als Text'"
 

-#: src/textview.c:846
+#: src/textview.c:847

 msgid " (Shortcut key: 't')\n"
 msgstr " (Kurzwahltaste: 't')\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (Kurzwahltaste: 't')\n"
 

-#: src/textview.c:847
+#: src/textview.c:848

 msgid "     - To open with an external program, select "
 msgstr "     - Zum Öffnen in einem externen Programm "
 
 msgid "     - To open with an external program, select "
 msgstr "     - Zum Öffnen in einem externen Programm "
 

-#: src/textview.c:848
+#: src/textview.c:849

 msgid "'Open'"
 msgstr "'Öffnen'"
 
 msgid "'Open'"
 msgstr "'Öffnen'"
 

-#: src/textview.c:849
+#: src/textview.c:850

 msgid " (Shortcut key: 'l')\n"
 msgstr " (Kurzwahltaste: 'l')\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (Kurzwahltaste: 'l')\n"
 

-#: src/textview.c:850
+#: src/textview.c:851

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativ doppelklicken oder mit der mittleren "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativ doppelklicken oder mit der mittleren "
 

-#: src/textview.c:851
+#: src/textview.c:852

 msgid "mouse button)\n"
 msgstr "Maustaste klicken)\n"
 
 msgid "mouse button)\n"
 msgstr "Maustaste klicken)\n"
 

-#: src/textview.c:852
+#: src/textview.c:853

 msgid "     - Or use "
 msgstr "     - oder benutze "
 
 msgid "     - Or use "
 msgstr "     - oder benutze "
 

-#: src/textview.c:853
+#: src/textview.c:854

 msgid "'Open with...'"
 msgstr "'Öffne mit...'"
 
 msgid "'Open with...'"
 msgstr "'Öffne mit...'"
 

-#: src/textview.c:854
+#: src/textview.c:855

 msgid " (Shortcut key: 'o')\n"
 msgstr " (Kurzwahltaste: 'o')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (Kurzwahltaste: 'o')\n"
 

-#: src/textview.c:943
+#: src/textview.c:944

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -11178,7 +11433,7 @@ msgstr ""
 "....%s\n"
 "Rückgabewert %d\n"
 
 "....%s\n"
 "Rückgabewert %d\n"
 

-#: src/textview.c:2488
+#: src/textview.c:2492

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -11197,226 +11452,242 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
 "\n"
 "Trotzdem öffnen?"
 

-#: src/textview.c:2497
+#: src/textview.c:2501

 msgid "Phishing attempt warning"
 msgstr "Phishingversuch (Betrugsversuch) Warnung"
 
 msgid "Phishing attempt warning"
 msgstr "Phishingversuch (Betrugsversuch) Warnung"
 

-#: src/textview.c:2498
+#: src/textview.c:2502

 msgid "_Open URL"
 msgstr "/_URL Öffnen"
 
 msgid "_Open URL"
 msgstr "/_URL Öffnen"
 

-#: src/toolbar.c:162 src/toolbar.c:1486
+#: src/toolbar.c:166 src/toolbar.c:1535

 msgid "Receive Mail on all Accounts"
 msgstr "E-Mails von allen Konten empfangen"
 
 msgid "Receive Mail on all Accounts"
 msgstr "E-Mails von allen Konten empfangen"
 

-#: src/toolbar.c:163 src/toolbar.c:1500
+#: src/toolbar.c:167 src/toolbar.c:1549

 msgid "Receive Mail on current Account"
 msgstr "E-Mails vom aktuellen Konto empfangen"
 
 msgid "Receive Mail on current Account"
 msgstr "E-Mails vom aktuellen Konto empfangen"
 

-#: src/toolbar.c:164 src/toolbar.c:1506
+#: src/toolbar.c:168 src/toolbar.c:1555

 msgid "Send Queued Messages"
 msgstr "Wartende Nachrichten senden"
 
 msgid "Send Queued Messages"
 msgstr "Wartende Nachrichten senden"
 

-#: src/toolbar.c:165 src/toolbar.c:1519
+#: src/toolbar.c:169 src/toolbar.c:1568

 msgid "Compose Email"
 msgstr "E-Mail verfassen"
 
 msgid "Compose Email"
 msgstr "E-Mail verfassen"
 

-#: src/toolbar.c:166 src/toolbar.c:1523
+#: src/toolbar.c:170 src/toolbar.c:1572

 msgid "Compose News"
 msgstr "News verfassen"
 
 msgid "Compose News"
 msgstr "News verfassen"
 

-#: src/toolbar.c:167 src/toolbar.c:1554 src/toolbar.c:1564
+#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624

 msgid "Reply to Message"
 msgstr "Auf Nachricht antworten"
 
 msgid "Reply to Message"
 msgstr "Auf Nachricht antworten"
 

-#: src/toolbar.c:168 src/toolbar.c:1571 src/toolbar.c:1581
+#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641

 msgid "Reply to Sender"
 msgstr "An Absender antworten"
 
 msgid "Reply to Sender"
 msgstr "An Absender antworten"
 

-#: src/toolbar.c:169 src/toolbar.c:1588 src/toolbar.c:1598
+#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658

 msgid "Reply to All"
 msgstr "An Alle antworten"
 
 msgid "Reply to All"
 msgstr "An Alle antworten"
 

-#: src/toolbar.c:170 src/toolbar.c:1605 src/toolbar.c:1615
+#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675

 msgid "Reply to Mailing-list"
 msgstr "An Mailingliste antworten"
 
 msgid "Reply to Mailing-list"
 msgstr "An Mailingliste antworten"
 

-#: src/toolbar.c:171 src/toolbar.c:1622 src/toolbar.c:1632
+#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692

 msgid "Forward Message"
 msgstr "Nachricht weiterleiten"
 
 msgid "Forward Message"
 msgstr "Nachricht weiterleiten"
 

-#: src/toolbar.c:172 src/toolbar.c:1639
+#: src/toolbar.c:176 src/toolbar.c:1699

 msgid "Trash Message"
 msgstr "Nachricht verwerfen"
 
 msgid "Trash Message"
 msgstr "Nachricht verwerfen"
 

-#: src/toolbar.c:173 src/toolbar.c:1645
+#: src/toolbar.c:177 src/toolbar.c:1705

 msgid "Delete Message"
 msgstr "Nachricht löschen"
 
 msgid "Delete Message"
 msgstr "Nachricht löschen"
 

-#: src/toolbar.c:175 src/toolbar.c:1657
+#: src/toolbar.c:179 src/toolbar.c:1717

 msgid "Go to Previous Unread Message"
 msgstr "Zu vorheriger ungelesener Nachricht gehen"
 
 msgid "Go to Previous Unread Message"
 msgstr "Zu vorheriger ungelesener Nachricht gehen"
 

-#: src/toolbar.c:176 src/toolbar.c:1664
+#: src/toolbar.c:180 src/toolbar.c:1724

 msgid "Go to Next Unread Message"
 msgstr "Zur nächsten Nachricht gehen"
 
 msgid "Go to Next Unread Message"
 msgstr "Zur nächsten Nachricht gehen"
 

-#: src/toolbar.c:179
+#: src/toolbar.c:183

 msgid "Learn Spam or Ham"
 msgstr "Lerne Spam oder Ham"
 
 msgid "Learn Spam or Ham"
 msgstr "Lerne Spam oder Ham"
 

-#: src/toolbar.c:181 src/toolbar.c:1673
+#: src/toolbar.c:185 src/toolbar.c:1733

 msgid "Send Message"
 msgstr "Nachricht senden"
 
 msgid "Send Message"
 msgstr "Nachricht senden"
 

-#: src/toolbar.c:182 src/toolbar.c:1679
+#: src/toolbar.c:186 src/toolbar.c:1739

 msgid "Put into queue folder and send later"
 msgstr "In Postausgang ablegen und später senden"
 
 msgid "Put into queue folder and send later"
 msgstr "In Postausgang ablegen und später senden"
 

-#: src/toolbar.c:183 src/toolbar.c:1685
+#: src/toolbar.c:187 src/toolbar.c:1745

 msgid "Save to draft folder"
 msgstr "In Entwurfsordner speichern"
 
 msgid "Save to draft folder"
 msgstr "In Entwurfsordner speichern"
 

-#: src/toolbar.c:184 src/toolbar.c:1691
+#: src/toolbar.c:188 src/toolbar.c:1751

 msgid "Insert file"
 msgstr "Datei einfügen"
 
 msgid "Insert file"
 msgstr "Datei einfügen"
 

-#: src/toolbar.c:185 src/toolbar.c:1697
+#: src/toolbar.c:189 src/toolbar.c:1757

 msgid "Attach file"
 msgstr "Datei anhängen"
 
 msgid "Attach file"
 msgstr "Datei anhängen"
 

-#: src/toolbar.c:186 src/toolbar.c:1703
+#: src/toolbar.c:190 src/toolbar.c:1763

 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 
 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 

-#: src/toolbar.c:187 src/toolbar.c:1709
+#: src/toolbar.c:191 src/toolbar.c:1769

 msgid "Edit with external editor"
 msgstr "Mit externem Editor bearbeiten"
 
 msgid "Edit with external editor"
 msgstr "Mit externem Editor bearbeiten"
 

-#: src/toolbar.c:188 src/toolbar.c:1715
+#: src/toolbar.c:192 src/toolbar.c:1775

 msgid "Wrap long lines of current paragraph"
 msgstr "Lange Zeilen des aktuellen Absatzes umbrechen"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Lange Zeilen des aktuellen Absatzes umbrechen"
 

-#: src/toolbar.c:189 src/toolbar.c:1721
+#: src/toolbar.c:193 src/toolbar.c:1781

 msgid "Wrap all long lines"
 msgstr "Umbrechen aller langen Zeilen"
 
 msgid "Wrap all long lines"
 msgstr "Umbrechen aller langen Zeilen"
 

-#: src/toolbar.c:192 src/toolbar.c:1734
+#: src/toolbar.c:196 src/toolbar.c:1794

 msgid "Check spelling"
 msgstr "Rechtschreibung prüfen"
 
 msgid "Check spelling"
 msgstr "Rechtschreibung prüfen"
 

-#: src/toolbar.c:194
-msgid "Sylpheed-Claws Actions Feature"
-msgstr "Sylpheed-Claws Aktion Feature"
+#: src/toolbar.c:198
+msgid "Claws Mail Actions Feature"
+msgstr "Claws Mail Aktion Feature"
+
+#: src/toolbar.c:199 src/toolbar.c:1817
+msgid "Cancel receiving"
+msgstr "Empfang abbrechen"

 
 

-#: src/toolbar.c:214
+#: src/toolbar.c:219

 msgid "/Reply with _quote"
 msgstr "/Antwort mit _Zitat"
 
 msgid "/Reply with _quote"
 msgstr "/Antwort mit _Zitat"
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/_Reply without quote"
 msgstr "/_Antwort ohne Zitat"
 
 msgid "/_Reply without quote"
 msgstr "/_Antwort ohne Zitat"
 

-#: src/toolbar.c:219
+#: src/toolbar.c:224

 msgid "/Reply to all with _quote"
 msgstr "/Antwort an a_lle mit Zitat"
 
 msgid "/Reply to all with _quote"
 msgstr "/Antwort an a_lle mit Zitat"
 

-#: src/toolbar.c:220
+#: src/toolbar.c:225

 msgid "/_Reply to all without quote"
 msgstr "/Antwort an _alle ohne Zitat"
 
 msgid "/_Reply to all without quote"
 msgstr "/Antwort an _alle ohne Zitat"
 

-#: src/toolbar.c:224
+#: src/toolbar.c:229

 msgid "/Reply to list with _quote"
 msgstr "/Antwort an Liste mit Zitat"
 
 msgid "/Reply to list with _quote"
 msgstr "/Antwort an Liste mit Zitat"
 

-#: src/toolbar.c:225
+#: src/toolbar.c:230

 msgid "/_Reply to list without quote"
 msgstr "/Antwort an Liste ohne Zitat"
 
 msgid "/_Reply to list without quote"
 msgstr "/Antwort an Liste ohne Zitat"
 

-#: src/toolbar.c:229
+#: src/toolbar.c:234

 msgid "/Reply to sender with _quote"
 msgstr "/Antwort an Abs_ender mit Zitat"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Antwort an Abs_ender mit Zitat"
 

-#: src/toolbar.c:230
+#: src/toolbar.c:235

 msgid "/_Reply to sender without quote"
 msgstr "/Antwort an Absender _ohne Zitat"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Antwort an Absender _ohne Zitat"
 

-#: src/toolbar.c:236
+#: src/toolbar.c:241

 msgid "/Redirec_t"
 msgstr "/U_mleiten"
 
 msgid "/Redirec_t"
 msgstr "/U_mleiten"
 

-#: src/toolbar.c:389
+#: src/toolbar.c:245
+msgid "/Learn as _Spam"
+msgstr "lernen als _Spam"
+
+#: src/toolbar.c:246
+msgid "/Learn as _Ham"
+msgstr "lernen als _Ham"
+
+#: src/toolbar.c:399

 msgid "Get Mail"
 msgstr "holen"
 
 msgid "Get Mail"
 msgstr "holen"
 

-#: src/toolbar.c:395 src/toolbar.c:486
+#: src/toolbar.c:403
+msgid "Toolbar|Compose"
+msgstr "Verfassen"
+
+#: src/toolbar.c:405 src/toolbar.c:496

 msgid "Reply"
 msgstr "Antwort"
 
 msgid "Reply"
 msgstr "Antwort"
 

-#: src/toolbar.c:396 src/toolbar.c:487
+#: src/toolbar.c:406 src/toolbar.c:497

 msgid "All"
 msgstr "Alle"
 
 msgid "All"
 msgstr "Alle"
 

-#: src/toolbar.c:397 src/toolbar.c:488
+#: src/toolbar.c:407 src/toolbar.c:498

 msgid "Sender"
 msgstr "Absender"
 
 msgid "Sender"
 msgstr "Absender"
 

-#: src/toolbar.c:402 src/toolbar.c:493
+#: src/toolbar.c:412 src/toolbar.c:503

 msgid "Spam"
 msgstr "Spam"
 
 msgid "Spam"
 msgstr "Spam"
 

-#: src/toolbar.c:405 src/toolbar.c:495
+#: src/toolbar.c:415 src/toolbar.c:505

 msgid "Next"
 msgstr "Nächste"
 
 msgid "Next"
 msgstr "Nächste"
 

-#: src/toolbar.c:443
+#: src/toolbar.c:453

 msgid "Send later"
 msgstr "Später senden"
 
 msgid "Send later"
 msgstr "Später senden"
 

-#: src/toolbar.c:444
+#: src/toolbar.c:454

 msgid "Draft"
 msgstr "Entwürfe"
 
 msgid "Draft"
 msgstr "Entwürfe"
 

-#: src/toolbar.c:1493
+#: src/toolbar.c:1542

 msgid "Receive Mail on selected Account"
 msgstr "E-Mails vom gewählten Konten empfangen"
 
 msgid "Receive Mail on selected Account"
 msgstr "E-Mails vom gewählten Konten empfangen"
 

-#: src/toolbar.c:1530
+#: src/toolbar.c:1579

 msgid "Compose with selected Account"
 msgstr "Verfassen mit gewählten Konto"
 
 msgid "Compose with selected Account"
 msgstr "Verfassen mit gewählten Konto"
 

-#: src/toolbar.c:1536
+#: src/toolbar.c:1585

 msgid "Ham"
 msgstr "Ham (kein Spam)"
 
 msgid "Ham"
 msgstr "Ham (kein Spam)"
 

-#: src/toolbar.c:1544
+#: src/toolbar.c:1593

 msgid "Learn Spam"
 msgstr "lerne Spam"
 
 msgid "Learn Spam"
 msgstr "lerne Spam"
 

-#: src/toolbar.c:1548
+#: src/toolbar.c:1597

 msgid "Learn Ham"
 msgstr "lerne Ham"
 
 msgid "Learn Ham"
 msgstr "lerne Ham"
 

-#: src/wizard.c:459
-msgid "Welcome to Sylpheed-Claws "
-msgstr "Willkommen zu Sylpheed-Claws "
+#: src/toolbar.c:1607
+msgid "Learn as..."
+msgstr "lernen als..."

 
 

-#: src/wizard.c:469
-msgid "Sylpheed-Claws Team"
-msgstr "Sylpheed-Claws Team"
+#: src/wizard.c:461
+msgid "Welcome Mail Subject|Welcome to Claws Mail"
+msgstr "Willkommen zu Claws Mail"

 
 

-#: src/wizard.c:475
+#: src/wizard.c:484

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"

-"Welcome to Sylpheed-Claws\n"
-"-------------------------\n"
+"Welcome to Claws Mail\n"
+"---------------------\n"

 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"
 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"

-"Sylpheed-Claws has lots of extra features accessible via plugins,\n"
+"Claws Mail has lots of extra features accessible via plugins,\n"

 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"
 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"


@@ -11427,7 +11698,7 @@ msgid ""
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"

-"You can find further information in the Sylpheed-Claws manual,\n"
+"You can find further information in the Claws Mail manual,\n"

 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"
 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"


@@ -11441,7 +11712,7 @@ msgid ""
 "\n"
 "LICENSE\n"
 "-------\n"
 "\n"
 "LICENSE\n"
 "-------\n"

-"Sylpheed-Claws is free software, released under the terms\n"
+"Claws Mail is free software, released under the terms\n"

 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"


@@ -11449,19 +11720,19 @@ msgid ""
 "\n"
 "DONATIONS\n"
 "---------\n"
 "\n"
 "DONATIONS\n"
 "---------\n"

-"If you wish to donate to the Sylpheed-Claws project you can do\n"
+"If you wish to donate to the Claws Mail project you can do\n"

 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"
 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"

-"Willkommen zu Sylpheed-Claws\n"
+"Willkommen zu Claws Mail\n"

 "----------------------------\n"
 "\n"
 "Jetzt wo Sie Ihr Mailkonto konfiguriert haben, können Sie ihre\n"
 "Mails abholen indem sie auf den 'holen' Knopf links in der\n"
 "Werkzeugleiste klicken.\n"
 "\n"
 "----------------------------\n"
 "\n"
 "Jetzt wo Sie Ihr Mailkonto konfiguriert haben, können Sie ihre\n"
 "Mails abholen indem sie auf den 'holen' Knopf links in der\n"
 "Werkzeugleiste klicken.\n"
 "\n"

-"Sylpheed-Claws stellt sehr viele zusätzliche Funktionen über Plugins\n"
+"Claws Mail stellt sehr viele zusätzliche Funktionen über Plugins\n"

 "zur Verfügung. So zum Beispiel: Spamfilter und Training (Bogofilter oder\n"
 "SpamAssassin), Wahrung der Privatsphäre (PGP/Miment), einen RSS\n"
 "Aggregator, einen Kalender und vieles, vieles mehr. Plugins können unter\n"
 "zur Verfügung. So zum Beispiel: Spamfilter und Training (Bogofilter oder\n"
 "SpamAssassin), Wahrung der Privatsphäre (PGP/Miment), einen RSS\n"
 "Aggregator, einen Kalender und vieles, vieles mehr. Plugins können unter\n"


@@ -11472,7 +11743,7 @@ msgstr ""
 "Allgemeine Einstellungen können Sie im Menü '/Konfiguration/Einstellungen'\n"
 "ändern.\n"
 "\n"
 "Allgemeine Einstellungen können Sie im Menü '/Konfiguration/Einstellungen'\n"
 "ändern.\n"
 "\n"

-"Nützliche Informationen finden Sie im Sylpheed-Claws Handbuch,\n"
+"Nützliche Informationen finden Sie im Claws Mail Handbuch,\n"

 "welche Sie über den Menüpunkt '/Hilfe/Handbuch' oder Online über\n"
 "die unten stehende URL benutzten können.\n"
 "\n"
 "welche Sie über den Menüpunkt '/Hilfe/Handbuch' oder Online über\n"
 "die unten stehende URL benutzten können.\n"
 "\n"


@@ -11486,7 +11757,7 @@ msgstr ""
 "\n"
 "LIZENZ\n"
 "------\n"
 "\n"
 "LIZENZ\n"
 "------\n"

-"Sylpheed-Claws ist freie Software, freigegeben im Sinne der\n"
+"Claws Mail ist freie Software, freigegeben im Sinne der\n"

 "GNU General Public License, Version 2 oder später, wie sie von der\n"
 "Free Software Foundation, 51 Franklin Street Fifth Floor Boston\n"
 "MA 02110-1301 USA, veröffentlicht wird.\n"
 "GNU General Public License, Version 2 oder später, wie sie von der\n"
 "Free Software Foundation, 51 Franklin Street Fifth Floor Boston\n"
 "MA 02110-1301 USA, veröffentlicht wird.\n"


@@ -11494,59 +11765,75 @@ msgstr ""
 "\n"
 "SPENDEN\n"
 "-------\n"
 "\n"
 "SPENDEN\n"
 "-------\n"

-"Wenn Sie dem Sylpheed-Claws Projekt etwas spenden möchten können Sie\n"
+"Wenn Sie dem Claws Mail Projekt etwas spenden möchten können Sie\n"

 "das unter <%s> tun.\n"
 "\n"
 
 "das unter <%s> tun.\n"
 "\n"
 

-#: src/wizard.c:551
+#: src/wizard.c:564

 msgid "Please enter the mailbox name."
 msgstr "Bitten den Namen des Postfachs eingeben."
 
 msgid "Please enter the mailbox name."
 msgstr "Bitten den Namen des Postfachs eingeben."
 

-#: src/wizard.c:579
+#: src/wizard.c:592

 msgid "Please enter your name and email address."
 msgstr "Bitten geben Sie ihren Namen und ihre E-Mail-Adresse ein."
 
 msgid "Please enter your name and email address."
 msgstr "Bitten geben Sie ihren Namen und ihre E-Mail-Adresse ein."
 

-#: src/wizard.c:590
+#: src/wizard.c:603

 msgid "Please enter your receiving server and username."
 msgstr "Bitte geben Sie Posteingangsserver und Benutzernamen an."
 
 msgid "Please enter your receiving server and username."
 msgstr "Bitte geben Sie Posteingangsserver und Benutzernamen an."
 

-#: src/wizard.c:600
+#: src/wizard.c:613

 msgid "Please enter your username."
 msgstr "Bitte geben Sie ihren Benutzernamen ein."
 
 msgid "Please enter your username."
 msgstr "Bitte geben Sie ihren Benutzernamen ein."
 

-#: src/wizard.c:610
+#: src/wizard.c:623

 msgid "Please enter your SMTP server."
 msgstr "Bitte geben Sie ihren Postausgangsserver (SMTP) ein."
 
 msgid "Please enter your SMTP server."
 msgstr "Bitte geben Sie ihren Postausgangsserver (SMTP) ein."
 

-#: src/wizard.c:621
+#: src/wizard.c:634

 msgid "Please enter your SMTP username."
 msgstr "Bitte geben Sie ihren SMTP-Benutzernamen ein."
 
 msgid "Please enter your SMTP username."
 msgstr "Bitte geben Sie ihren SMTP-Benutzernamen ein."
 

-#: src/wizard.c:832
+#: src/wizard.c:881

 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Ihr Name:</span>"
 
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Ihr Name:</span>"
 

-#: src/wizard.c:837
+#: src/wizard.c:886

 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Ihre E-Mail-Adresse:</span>"
 
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Ihre E-Mail-Adresse:</span>"
 

-#: src/wizard.c:841
+#: src/wizard.c:890

 msgid "Your organization:"
 msgstr "Organisation: "
 
 msgid "Your organization:"
 msgstr "Organisation: "
 

-#: src/wizard.c:861
+#: src/wizard.c:913
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr ""
+"Es kann auch ein absolutes Verzeichnis angegeben werden, z.B.: \"/home/white/"
+"Documents/Mail\""
+
+#: src/wizard.c:917

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Postfach-Name:</span>"
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Postfach-Name:</span>"
 

-#: src/wizard.c:891
+#: src/wizard.c:954
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr ""
+"Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
+"B.: \"mail.example.com:25\""
+
+#: src/wizard.c:958

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adresse des Postausgangsservers (SMTP):</span>"
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adresse des Postausgangsservers (SMTP):</span>"
 

-#: src/wizard.c:894
+#: src/wizard.c:961

 msgid "Use authentication"
 msgstr "benutze Authentifizierung"
 
 msgid "Use authentication"
 msgstr "benutze Authentifizierung"
 

-#: src/wizard.c:908
+#: src/wizard.c:975

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11555,7 +11842,7 @@ msgstr ""
 "<span size=\"small\">(leer lassen um den selben wie beim Posteingangsserver "
 "zu verwenden)</span>"
 
 "<span size=\"small\">(leer lassen um den selben wie beim Posteingangsserver "
 "zu verwenden)</span>"
 

-#: src/wizard.c:921
+#: src/wizard.c:988

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11564,105 +11851,297 @@ msgstr ""
 "<span size=\"small\">(leer lassen um das selbe wie beim Posteingangssserver "
 "zu verwenden)</span>"
 
 "<span size=\"small\">(leer lassen um das selbe wie beim Posteingangssserver "
 "zu verwenden)</span>"
 

-#: src/wizard.c:949 src/wizard.c:964 src/wizard.c:1055
+#: src/wizard.c:1000
+msgid "Use SSL to connect to SMTP server"
+msgstr "SSL bei Verbindungen zum SMTP-Server verwenden"
+
+#: src/wizard.c:1007 src/wizard.c:1230
+msgid "Use SSL via STARTTLS"
+msgstr "benutze SSL über STARTTLS"
+
+#: src/wizard.c:1037 src/wizard.c:1056 src/wizard.c:1165

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Server-Adresse:</span>"
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Server-Adresse:</span>"
 

-#: src/wizard.c:980
+#: src/wizard.c:1076

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">loales Postfach:</span>"
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">loales Postfach:</span>"
 

-#: src/wizard.c:1022
+#: src/wizard.c:1127

 msgid "IMAP"
 msgstr "IMAP"
 
 msgid "IMAP"
 msgstr "IMAP"
 

-#: src/wizard.c:1047
+#: src/wizard.c:1152

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Servertype:</span>"
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Servertype:</span>"
 

-#: src/wizard.c:1066
+#: src/wizard.c:1161
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr ""
+"Ein Port kann am Ende durch einen Doppelpunkt getrennt angegeben werden, z."
+"B.: \"mail.example.com:110\""
+
+#: src/wizard.c:1176

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Benutzername:</span>"
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Benutzername:</span>"
 

-#: src/wizard.c:1082
+#: src/wizard.c:1192

 msgid "Password:"
 msgstr "Kennwort:"
 
 msgid "Password:"
 msgstr "Kennwort:"
 

-#: src/wizard.c:1094
+#: src/wizard.c:1204

 msgid "IMAP server directory:"
 msgstr "IMAP Serververzeichnis:"
 
 msgid "IMAP server directory:"
 msgstr "IMAP Serververzeichnis:"
 

-#: src/wizard.c:1125
-msgid "Use SSL to connect to SMTP server"
-msgstr "SSL bei Verbindungen zum SMTP-Server verwenden"
-
-#: src/wizard.c:1132
+#: src/wizard.c:1223

 msgid "Use SSL to connect to receiving server"
 msgstr "SSL bei Verbindungen zum POP3-Server verwenden"
 
 msgid "Use SSL to connect to receiving server"
 msgstr "SSL bei Verbindungen zum POP3-Server verwenden"
 

-#: src/wizard.c:1248
-msgid "Sylpheed-Claws Setup Wizard"
-msgstr "Sylpheed-Claws Setup-Assistent"
+#: src/wizard.c:1347
+msgid "Claws Mail Setup Wizard"
+msgstr "Claws Mail Setup-Assistent"

 
 

-#: src/wizard.c:1280
-msgid "Welcome to Sylpheed-Claws"
-msgstr "Willkommen zu Sylpheed-Claws"
+#: src/wizard.c:1379
+msgid "Welcome to Claws Mail"
+msgstr "Willkommen zu Claws Mail"

 
 

-#: src/wizard.c:1288
+#: src/wizard.c:1387

 msgid ""
 msgid ""

-"Welcome to the Sylpheed-Claws setup wizard.\n"
+"Welcome to the Claws Mail setup wizard.\n"

 "\n"
 "We will begin by defining some basic information about you and your most "
 "\n"
 "We will begin by defining some basic information about you and your most "

-"common mail options so that you can start to use Sylpheed-Claws in less than "
+"common mail options so that you can start to use Claws Mail in less than "

 "five minutes."
 msgstr ""
 "five minutes."
 msgstr ""

-"Willkommen im Sylpheed-Claws Setup-Assistenten.\n"
+"Willkommen im Claws Mail Setup-Assistenten.\n"

 "\n"
 "\n"

-"Offenbar verwenden Sie Sylpheed-Claws zum ersten\n"
+"Offenbar verwenden Sie Claws Mail zum ersten\n"

 "Mal. Es sind nun einige grundlegende Einstellungen\n"
 "über Sie und Ihr E-Mail-Konto zu machen, so dass\n"
 "Mal. Es sind nun einige grundlegende Einstellungen\n"
 "über Sie und Ihr E-Mail-Konto zu machen, so dass\n"

-"Sie Sylpheed-Claws in weniger als fünf Minuten\n"
+"Sie Claws Mail in weniger als fünf Minuten\n"

 "benutzen können."
 
 "benutzen können."
 

-#: src/wizard.c:1301
+#: src/wizard.c:1400

 msgid "About You"
 msgstr "Über Sie"
 
 msgid "About You"
 msgstr "Über Sie"
 

-#: src/wizard.c:1303 src/wizard.c:1312 src/wizard.c:1321 src/wizard.c:1331
-#: src/wizard.c:1341
+#: src/wizard.c:1402 src/wizard.c:1411 src/wizard.c:1420 src/wizard.c:1430

 msgid "Bold fields must be completed"
 msgstr "Fette Felder müssen ausgefüllt werden"
 
 msgid "Bold fields must be completed"
 msgstr "Fette Felder müssen ausgefüllt werden"
 

-#: src/wizard.c:1310
+#: src/wizard.c:1409

 msgid "Receiving mail"
 msgstr "Empfangen von E-Mails"
 
 msgid "Receiving mail"
 msgstr "Empfangen von E-Mails"
 

-#: src/wizard.c:1319
+#: src/wizard.c:1418

 msgid "Sending mail"
 msgstr "Versenden von E-Mails"
 
 msgid "Sending mail"
 msgstr "Versenden von E-Mails"
 

-#: src/wizard.c:1329
+#: src/wizard.c:1428

 msgid "Saving mail on disk"
 msgstr "Abspeichern der E-Mails"
 
 msgid "Saving mail on disk"
 msgstr "Abspeichern der E-Mails"
 

-#: src/wizard.c:1339
-msgid "Security"
-msgstr "Sicherheit"
-
-#: src/wizard.c:1349
+#: src/wizard.c:1438

 msgid "Configuration finished"
 msgstr "Konfiguration beendet"
 
 msgid "Configuration finished"
 msgstr "Konfiguration beendet"
 

-#: src/wizard.c:1357
+#: src/wizard.c:1446

 msgid ""
 msgid ""

-"Sylpheed-Claws is now ready.\n"
+"Claws Mail is now ready.\n"

 "\n"
 "Click Save to start."
 msgstr ""
 "\n"
 "Click Save to start."
 msgstr ""

-"Sylpheed-Claws ist fertig konfiguriert.\n"
+"Claws Mail ist jetzt fertig konfiguriert.\n"

 "\n"
 "Zum Starten 'speichern' klicken."
 
 "\n"
 "Zum Starten 'speichern' klicken."
 

+#~ msgid "not initialized\n"
+#~ msgstr "nicht initialisiert\n"
+
+#~ msgid "selecting folder '%s'\n"
+#~ msgstr "wähle Ordner '%s' aus\n"
+
+#~ msgid "selecting message %d\n"
+#~ msgstr "wähle Nachricht %d\n"
+
+#~ msgid " Edit... "
+#~ msgstr " Bearbeiten... "
+
+#~ msgid "Set displayed columns"
+#~ msgstr "Angezeigte Spalten setzen"
+
+#~ msgid " Folder list... "
+#~ msgstr " Ordnerliste... "
+
+#~ msgid "Messages will be marked until execution if this is turned off"
+#~ msgstr ""
+#~ "Nachricht wird markiert bis zur Ausführung, wenn dies ausgeschaltet ist"
+
+#, fuzzy
+#~ msgid " seconds"
+#~ msgstr "Sekunden"
+
+#~ msgid "Message To format error."
+#~ msgstr "Vorlangenfehler im An: Eintrag."
+
+#~ msgid "Message Cc format error."
+#~ msgstr "Vorlangenfehler im Cc: Eintrag."
+
+#~ msgid "Message Bcc format error."
+#~ msgstr "Vorlangenfehler im Bcc: Eintrag."
+
+#~ msgid "Message subject format error."
+#~ msgstr ""
+#~ "Antwort-/Weiterleitungs-Formatfehler.Vorlangenfehler im Betreff: Eintrag."
+
+#, fuzzy
+#~ msgid "Message reply quote format error."
+#~ msgstr "Antwort-/Weiterleitungs-Formatfehler."
+
+#, fuzzy
+#~ msgid "Message forward quote format error."
+#~ msgstr "Antwort-/Weiterleitungs-Formatfehler."
+
+#~ msgid "every"
+#~ msgstr "alle"
+
+#, fuzzy
+#~ msgid "The Claws Mail Team\n"
+#~ msgstr "Das Sylpheed-Claws Team\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Icons\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Icons\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your version of Claws Mail is newer than the version the ClamAV plugin "
+#~ "was built with"
+#~ msgstr ""
+#~ "Die Version von Sylpheed-Claws ist neuer als die mit der das ClamAV "
+#~ "Plugin kompiliert wurde"
+
+#, fuzzy
+#~ msgid "Your version of Claws Mail is too old for the ClamAV plugin"
+#~ msgstr "Die Version von Sylpheed-Claws ist zu alt für das ClamAV Plugin"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your claws-mail version is newer than the version the plugin was built "
+#~ "with"
+#~ msgstr ""
+#~ "Die Version von Sylpheed-Claws ist neuer also die Version mit der Plugin "
+#~ "kompiliert wurde"
+
+#, fuzzy
+#~ msgid "Your claws-mail version is too old"
+#~ msgstr "Die Sylpheed-Claws Version ist zu alt"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your version of Claws Mail is newer than the version the PGP/Core plugin "
+#~ "was built with"
+#~ msgstr ""
+#~ "Die Sylpheed-Claws Version ist neuer als die Version mit der das PGP/Core "
+#~ "Plugin kompiliert wurde"
+
+#, fuzzy
+#~ msgid "Your version of Claws Mail is too old for the PGP/Core plugin"
+#~ msgstr "Die Sylpheed-Claws Version ist zu alt für das PGP/Core Plugin"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your version of Claws Mail is newer than the version the PGP/inline "
+#~ "plugin was built with"
+#~ msgstr ""
+#~ "Die Sylpheed-Claws Version ist neuer als die Version mit der das PGP/"
+#~ "inline Plugin kompiliert wurde"
+
+#, fuzzy
+#~ msgid "Your version of Claws Mail is too old for the PGP/inline plugin"
+#~ msgstr "Die Sylpheed-Claws Version ist zu alt für das PGP/inline Plugin"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your version of Claws Mail is newer than the version the PGP/MIME plugin "
+#~ "was built with"
+#~ msgstr ""
+#~ "Die Sylpheed-Claws Version ist neuer als die Version mit der das PGP/MIME "
+#~ "Plugin kompiliert wurde"
+
+#, fuzzy
+#~ msgid "Your version of Claws Mail is too old for the PGP/MIME plugin"
+#~ msgstr "Die Sylpheed-Claws Version ist zu alt für das PGP/MIME Plugin"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your version of Claws Mail is newer than the version the SpamAssassin "
+#~ "plugin was built with"
+#~ msgstr ""
+#~ "Die Sylpheed-Claws Version ist neuer als die Version mit der das "
+#~ "SpamAssassin Plugin kompiliert wurde"
+
+#, fuzzy
+#~ msgid "Your version of Claws Mail is too old for the SpamAssassin plugin"
+#~ msgstr "Die Sylpheed-Claws Version ist zu alt für das SpamAssassin Plugin"
+
+#, fuzzy
+#~ msgid ""
+#~ "Your version of Claws Mail is newer than the version the Trayicon plugin "
+#~ "was built with"
+#~ msgstr ""
+#~ "Die Sylpheed-Claws Version ist neuer als die Version mit der das Trayicon "
+#~ "Plugin kompiliert wurde"
+
+#, fuzzy
+#~ msgid "Your version of Claws Mail is too old for the Trayicon plugin"
+#~ msgstr "Die Sylpheed-Claws Version ist zu alt für das Trayicon Plugin"
+
+#, fuzzy
+#~ msgid "Welcome to Claws Mail "
+#~ msgstr "Willkommen zu Sylpheed-Claws "
+
+#, fuzzy
+#~ msgid "Sylpheed-Claws 2.6.0"
+#~ msgstr "Sylpheed-Claws Team"
+
+#, fuzzy
+#~ msgid "Sylpheed-Claws 1.9.15"
+#~ msgstr "Sylpheed-Claws Team"
+
+#, fuzzy
+#~ msgid "Sylpheed-Claws 1.0.5"
+#~ msgstr "Sylpheed-Claws Team"
+
+#~ msgid "Unsupported (%s)"
+#~ msgstr "Nicht unterstützt (%s)"
+
+#~ msgid "Security"
+#~ msgstr "Sicherheit"
+
+#~ msgid "/---"
+#~ msgstr "/---"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "1.0.5 or previous"
+#~ msgstr "1.0.5 oder älter"
+
+#~ msgid "1.9.15 or previous"
+#~ msgstr "1.9.15 oder älter"
+
+#~ msgid "Welcome to Sylpheed-Claws"
+#~ msgstr "Willkommen zu Sylpheed-Claws"
+
+#~ msgid "Pick color for 'color %d' "
+#~ msgstr "Farbe für 'Farbe %d' wählen"
+

 #~ msgid "Ask whether to insert or attach"
 #~ msgstr "fragen ob einfügen oder anhängen"
 
 #~ msgid "Ask whether to insert or attach"
 #~ msgstr "fragen ob einfügen oder anhängen"
 


@@ -11701,9 +12180,6 @@ msgstr ""
 #~ msgid "Please select key for '%s'"
 #~ msgstr "Bitte Schlüssel für '%s' wählen"
 
 #~ msgid "Please select key for '%s'"
 #~ msgstr "Bitte Schlüssel für '%s' wählen"
 

-#~ msgid " Edit... "
-#~ msgstr " Bearbeiten... "
-

 #~ msgid "Audio player"
 #~ msgstr "Audio Player"
 
 #~ msgid "Audio player"
 #~ msgstr "Audio Player"
 

diff --git a/po/en_GB.po b/po/en_GB.po
index 7b9b215dc9be6f96e14c064a03d7cfd84ee91065..c37db3713ac28f90e874d82699f7bf5fee746139 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,10 +1,9 @@
 # British English translation of Claws Mail
 # British English translation of Claws Mail

-

 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"

-"POT-Creation-Date: 2006-12-13 11:23+0000\n"
+"POT-Creation-Date: 2007-01-08 07:07+0000\n"

 "PO-Revision-Date: 2006-12-13 12:15+0100\n"
 "Last-Translator: Paul Mangan <paul@claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul@claws-mail.org>\n"
 "PO-Revision-Date: 2006-12-13 12:15+0100\n"
 "Last-Translator: Paul Mangan <paul@claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul@claws-mail.org>\n"


@@ -77,7 +76,7 @@ msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
 #: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132
 msgstr ""
 
 #: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132

-#: src/compose.c:5814 src/compose.c:6105 src/editaddress.c:1041
+#: src/compose.c:5824 src/compose.c:6115 src/editaddress.c:1041

 #: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213


@@ -176,7 +175,7 @@ msgid "Add to address book"
 msgstr ""
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
 msgstr ""
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377

-#: src/toolbar.c:449
+#: src/toolbar.c:459

 msgid "Address"
 msgstr ""
 
 msgid "Address"
 msgstr ""
 


@@ -284,7 +283,7 @@ msgstr ""
 msgid "/_Address/_Mail To"
 msgstr ""
 
 msgid "/_Address/_Mail To"
 msgstr ""
 

-#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:799
+#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:800

 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr ""
 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr ""


@@ -301,9 +300,9 @@ msgstr ""
 msgid "/_Tools/Import _Pine file..."
 msgstr ""
 
 msgid "/_Tools/Import _Pine file..."
 msgstr ""
 

-#: src/addressbook.c:453 src/mainwindow.c:808 src/mainwindow.c:831
-#: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
-#: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
+#: src/addressbook.c:453 src/mainwindow.c:809 src/mainwindow.c:832
+#: src/mainwindow.c:834 src/mainwindow.c:843 src/mainwindow.c:846
+#: src/mainwindow.c:850 src/messageview.c:306 src/messageview.c:327

 msgid "/_Tools/---"
 msgstr ""
 
 msgid "/_Tools/---"
 msgstr ""
 


@@ -315,18 +314,18 @@ msgstr ""
 msgid "/_Tools/Export LDI_F..."
 msgstr ""
 
 msgid "/_Tools/Export LDI_F..."
 msgstr ""
 

-#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:874
+#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:875

 #: src/messageview.c:330
 msgid "/_Help"
 msgstr ""
 
 #: src/messageview.c:330
 msgid "/_Help"
 msgstr ""
 

-#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:880
+#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:881

 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr ""
 
 #: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545
 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr ""
 
 #: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545

-#: src/mainwindow.c:518 src/messageview.c:164
+#: src/mainwindow.c:519 src/messageview.c:164

 msgid "/_Edit"
 msgstr ""
 
 msgid "/_Edit"
 msgstr ""
 


@@ -460,207 +459,207 @@ msgstr ""
 msgid "Error starting TLS connection"
 msgstr ""
 
 msgid "Error starting TLS connection"
 msgstr ""
 

-#: src/addressbook.c:888
+#: src/addressbook.c:897

 msgid "Sources"
 msgstr ""
 
 msgid "Sources"
 msgstr ""
 

-#: src/addressbook.c:892 src/prefs_other.c:101 src/toolbar.c:190
-#: src/toolbar.c:1727
+#: src/addressbook.c:901 src/prefs_other.c:101 src/toolbar.c:194
+#: src/toolbar.c:1787

 msgid "Address book"
 msgstr ""
 
 msgid "Address book"
 msgstr ""
 

-#: src/addressbook.c:1024
+#: src/addressbook.c:1033

 msgid "Lookup name:"
 msgstr ""
 
 msgid "Lookup name:"
 msgstr ""
 

-#: src/addressbook.c:1097 src/compose.c:2123 src/compose.c:4436
-#: src/compose.c:5660 src/compose.c:6423 src/compose.c:9444
+#: src/addressbook.c:1106 src/compose.c:2129 src/compose.c:4446
+#: src/compose.c:5670 src/compose.c:6435 src/compose.c:9456

 #: src/summary_search.c:359
 msgid "To:"
 msgstr ""
 
 #: src/summary_search.c:359
 msgid "To:"
 msgstr ""
 

-#: src/addressbook.c:1101 src/compose.c:2107 src/compose.c:4176
-#: src/compose.c:4435 src/compose.c:9453
+#: src/addressbook.c:1110 src/compose.c:2113 src/compose.c:4182
+#: src/compose.c:4445 src/compose.c:9465

 msgid "Cc:"
 msgstr ""
 
 msgid "Cc:"
 msgstr ""
 

-#: src/addressbook.c:1105 src/compose.c:2110 src/compose.c:4207
+#: src/addressbook.c:1114 src/compose.c:2116 src/compose.c:4213

 msgid "Bcc:"
 msgstr ""
 
 msgid "Bcc:"
 msgstr ""
 

-#: src/addressbook.c:1343 src/addressbook.c:1389
+#: src/addressbook.c:1363 src/addressbook.c:1409

 msgid "Delete address(es)"
 msgstr ""
 
 msgid "Delete address(es)"
 msgstr ""
 

-#: src/addressbook.c:1344
+#: src/addressbook.c:1364

 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 

-#: src/addressbook.c:1383
+#: src/addressbook.c:1403

 msgid "Delete group"
 msgstr ""
 
 msgid "Delete group"
 msgstr ""
 

-#: src/addressbook.c:1384
+#: src/addressbook.c:1404

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 

-#: src/addressbook.c:1390
+#: src/addressbook.c:1410

 msgid "Really delete the address(es)?"
 msgstr ""
 
 msgid "Really delete the address(es)?"
 msgstr ""
 

-#: src/addressbook.c:1994
+#: src/addressbook.c:2014

 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 

-#: src/addressbook.c:2005
+#: src/addressbook.c:2025

 msgid "Cannot paste into an address group."
 msgstr ""
 
 msgid "Cannot paste into an address group."
 msgstr ""
 

-#: src/addressbook.c:2688
+#: src/addressbook.c:2708

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr ""
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr ""
 

-#: src/addressbook.c:2691 src/addressbook.c:2717 src/addressbook.c:2724
+#: src/addressbook.c:2711 src/addressbook.c:2737 src/addressbook.c:2744

 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr ""
 
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr ""
 

-#: src/addressbook.c:2700
+#: src/addressbook.c:2720

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
 
 #, c-format
 msgid ""
 "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:2703 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2723 src/imap_gtk.c:286 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr ""
 
 msgid "Delete folder"
 msgstr ""
 

-#: src/addressbook.c:2704
+#: src/addressbook.c:2724

 msgid "+Delete _folder only"
 msgstr ""
 
 msgid "+Delete _folder only"
 msgstr ""
 

-#: src/addressbook.c:2704
+#: src/addressbook.c:2724

 msgid "Delete folder and _addresses"
 msgstr ""
 
 msgid "Delete folder and _addresses"
 msgstr ""
 

-#: src/addressbook.c:2715
+#: src/addressbook.c:2735

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 

-#: src/addressbook.c:2722
+#: src/addressbook.c:2742

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 

-#: src/addressbook.c:3575
+#: src/addressbook.c:3595

 msgid "New user, could not save index file."
 msgstr ""
 
 msgid "New user, could not save index file."
 msgstr ""
 

-#: src/addressbook.c:3579
+#: src/addressbook.c:3599

 msgid "New user, could not save address book files."
 msgstr ""
 
 msgid "New user, could not save address book files."
 msgstr ""
 

-#: src/addressbook.c:3589
+#: src/addressbook.c:3609

 msgid "Old address book converted successfully."
 msgstr ""
 
 msgid "Old address book converted successfully."
 msgstr ""
 

-#: src/addressbook.c:3594
+#: src/addressbook.c:3614

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 

-#: src/addressbook.c:3607
+#: src/addressbook.c:3627

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 

-#: src/addressbook.c:3613
+#: src/addressbook.c:3633

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 

-#: src/addressbook.c:3618
+#: src/addressbook.c:3638

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 

-#: src/addressbook.c:3625 src/addressbook.c:3631
+#: src/addressbook.c:3645 src/addressbook.c:3651

 msgid "Addressbook conversion error"
 msgstr ""
 
 msgid "Addressbook conversion error"
 msgstr ""
 

-#: src/addressbook.c:3669
+#: src/addressbook.c:3689

 msgid "Addressbook Error"
 msgstr ""
 
 msgid "Addressbook Error"
 msgstr ""
 

-#: src/addressbook.c:3670
+#: src/addressbook.c:3690

 msgid "Could not read address index"
 msgstr ""
 
 msgid "Could not read address index"
 msgstr ""
 

-#: src/addressbook.c:3997
+#: src/addressbook.c:4017

 msgid "Busy searching..."
 msgstr ""
 
 msgid "Busy searching..."
 msgstr ""
 

-#: src/addressbook.c:4068
+#: src/addressbook.c:4088

 #, c-format
 msgid "Search '%s'"
 msgstr ""
 
 #, c-format
 msgid "Search '%s'"
 msgstr ""
 

-#: src/addressbook.c:4293
+#: src/addressbook.c:4313

 msgid "Interface"
 msgstr ""
 
 msgid "Interface"
 msgstr ""
 

-#: src/addressbook.c:4309 src/exphtmldlg.c:375 src/expldifdlg.c:394
+#: src/addressbook.c:4329 src/exphtmldlg.c:375 src/expldifdlg.c:394

 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr ""
 
 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr ""
 

-#: src/addressbook.c:4325
+#: src/addressbook.c:4345

 msgid "Person"
 msgstr ""
 
 msgid "Person"
 msgstr ""
 

-#: src/addressbook.c:4341
+#: src/addressbook.c:4361

 msgid "EMail Address"
 msgstr ""
 
 msgid "EMail Address"
 msgstr ""
 

-#: src/addressbook.c:4357
+#: src/addressbook.c:4377

 msgid "Group"
 msgstr ""
 
 msgid "Group"
 msgstr ""
 

-#: src/addressbook.c:4373 src/exporthtml.c:922 src/folderview.c:469
+#: src/addressbook.c:4393 src/exporthtml.c:922 src/folderview.c:470

 #: src/prefs_account.c:2417 src/prefs_folder_column.c:79
 msgid "Folder"
 msgstr ""
 
 #: src/prefs_account.c:2417 src/prefs_folder_column.c:79
 msgid "Folder"
 msgstr ""
 

-#: src/addressbook.c:4389
+#: src/addressbook.c:4409

 msgid "vCard"
 msgstr ""
 
 msgid "vCard"
 msgstr ""
 

-#: src/addressbook.c:4405 src/addressbook.c:4421
+#: src/addressbook.c:4425 src/addressbook.c:4441

 msgid "JPilot"
 msgstr ""
 
 msgid "JPilot"
 msgstr ""
 

-#: src/addressbook.c:4437
+#: src/addressbook.c:4457

 msgid "LDAP servers"
 msgstr ""
 
 msgid "LDAP servers"
 msgstr ""
 

-#: src/addressbook.c:4453
+#: src/addressbook.c:4473

 msgid "LDAP Query"
 msgstr ""
 
 msgid "LDAP Query"
 msgstr ""
 

-#: src/addressbook.c:4769 src/matcher.c:303 src/matcher.c:756
+#: src/addressbook.c:4789 src/matcher.c:303 src/matcher.c:756

 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106


@@ -723,9 +722,9 @@ msgstr ""
 msgid "Address Count"
 msgstr ""
 
 msgid "Address Count"
 msgstr ""
 

-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4787
-#: src/compose.c:9365 src/messageview.c:578 src/messageview.c:591
-#: src/plugins/pgpcore/sgpgme.c:574
+#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4797
+#: src/compose.c:9377 src/messageview.c:580 src/messageview.c:593
+#: src/plugins/pgpcore/sgpgme.c:575

 msgid "Warning"
 msgstr ""
 
 msgid "Warning"
 msgstr ""
 


@@ -762,11 +761,11 @@ msgstr ""
 msgid "Personal address"
 msgstr ""
 
 msgid "Personal address"
 msgstr ""
 

-#: src/alertpanel.c:141 src/compose.c:7573
+#: src/alertpanel.c:141 src/compose.c:7585

 msgid "Notice"
 msgstr ""
 
 msgid "Notice"
 msgstr ""
 

-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4727 src/inc.c:616
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4737 src/inc.c:616

 #: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239
 msgid "Error"
 msgstr ""
 #: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239
 msgid "Error"
 msgstr ""


@@ -804,77 +803,103 @@ msgstr ""
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr ""
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr ""
 

-#: src/common/nntp.c:181 src/common/nntp.c:244
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:840
+msgid "SSL handshake failed\n"
+msgstr ""
+
+#: src/common/nntp.c:182 src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr ""
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr ""
 

-#: src/common/nntp.c:204 src/common/nntp.c:250
+#: src/common/nntp.c:205 src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr ""
 
 msgid "protocol error\n"
 msgstr ""
 

-#: src/common/nntp.c:300
+#: src/common/nntp.c:301

 msgid "Error occurred while posting\n"
 msgstr ""
 
 msgid "Error occurred while posting\n"
 msgstr ""
 

-#: src/common/nntp.c:380
+#: src/common/nntp.c:381

 msgid "Error occurred while sending command\n"
 msgstr ""
 
 msgid "Error occurred while sending command\n"
 msgstr ""
 

-#: src/common/plugin.c:52
+#: src/common/plugin.c:53

 msgid "Nothing"
 msgstr ""
 
 msgid "Nothing"
 msgstr ""
 

-#: src/common/plugin.c:53
+#: src/common/plugin.c:54

 msgid "a viewer"
 msgstr ""
 
 msgid "a viewer"
 msgstr ""
 

-#: src/common/plugin.c:54
+#: src/common/plugin.c:55

 msgid "folders"
 msgstr ""
 
 msgid "folders"
 msgstr ""
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "filtering"
 msgstr ""
 
 msgid "filtering"
 msgstr ""
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a privacy interface"
 msgstr ""
 
 msgid "a privacy interface"
 msgstr ""
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "a notifier"
 msgstr ""
 
 msgid "a notifier"
 msgstr ""
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "an utility"
 msgstr ""
 
 msgid "an utility"
 msgstr ""
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "things"
 msgstr ""
 
 msgid "things"
 msgstr ""
 

-#: src/common/plugin.c:257
+#: src/common/plugin.c:258

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr ""
 

-#: src/common/plugin.c:292
+#: src/common/plugin.c:293

 msgid "Plugin already loaded"
 msgstr ""
 
 msgid "Plugin already loaded"
 msgstr ""
 

-#: src/common/plugin.c:302
+#: src/common/plugin.c:303

 msgid "Failed to allocate memory for Plugin"
 msgstr ""
 
 msgid "Failed to allocate memory for Plugin"
 msgstr ""
 

-#: src/common/plugin.c:329
+#: src/common/plugin.c:330

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr ""
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr ""
 

-#: src/common/plugin.c:336
+#: src/common/plugin.c:337

 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 
 msgid "This module is for Claws Mail GTK1."
 msgstr ""
 

+#: src/common/plugin.c:550
+#, c-format
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr ""
+
+#: src/common/plugin.c:553
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr ""
+
+#: src/common/plugin.c:562
+#, c-format
+msgid "Your version of Claws Mail is too old for the '%s' plugin."
+msgstr ""
+
+#: src/common/plugin.c:564
+msgid "Your version of Claws Mail is too old for the plugin."
+msgstr ""
+

 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 msgstr ""
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 msgstr ""


@@ -1152,11 +1177,11 @@ msgstr ""
 msgid "/_Remove"
 msgstr ""
 
 msgid "/_Remove"
 msgstr ""
 

-#: src/compose.c:525 src/folderview.c:293
+#: src/compose.c:525 src/folderview.c:294

 msgid "/_Properties..."
 msgstr ""
 
 msgid "/_Properties..."
 msgstr ""
 

-#: src/compose.c:530 src/mainwindow.c:740 src/messageview.c:285
+#: src/compose.c:530 src/mainwindow.c:741 src/messageview.c:285

 msgid "/_Message"
 msgstr ""
 
 msgid "/_Message"
 msgstr ""
 


@@ -1168,9 +1193,9 @@ msgstr ""
 msgid "/_Message/Send _later"
 msgstr ""
 
 msgid "/_Message/Send _later"
 msgstr ""
 

-#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:750
-#: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
-#: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
+#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:751
+#: src/mainwindow.c:761 src/mainwindow.c:774 src/mainwindow.c:780
+#: src/mainwindow.c:797 src/messageview.c:288 src/messageview.c:296

 msgid "/_Message/---"
 msgstr ""
 
 msgid "/_Message/---"
 msgstr ""
 


@@ -1203,7 +1228,7 @@ msgid "/_Edit/_Redo"
 msgstr ""
 
 #: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645
 msgstr ""
 
 #: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645

-#: src/mainwindow.c:522 src/messageview.c:167
+#: src/mainwindow.c:523 src/messageview.c:167

 msgid "/_Edit/---"
 msgstr ""
 
 msgid "/_Edit/---"
 msgstr ""
 


@@ -1211,7 +1236,7 @@ msgstr ""
 msgid "/_Edit/Cu_t"
 msgstr ""
 
 msgid "/_Edit/Cu_t"
 msgstr ""
 

-#: src/compose.c:550 src/mainwindow.c:519 src/messageview.c:165
+#: src/compose.c:550 src/mainwindow.c:520 src/messageview.c:165

 msgid "/_Edit/_Copy"
 msgstr ""
 
 msgid "/_Edit/_Copy"
 msgstr ""
 


@@ -1235,7 +1260,7 @@ msgstr ""
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr ""
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr ""
 

-#: src/compose.c:559 src/mainwindow.c:520 src/messageview.c:166
+#: src/compose.c:559 src/mainwindow.c:521 src/messageview.c:166

 msgid "/_Edit/Select _all"
 msgstr ""
 
 msgid "/_Edit/Select _all"
 msgstr ""
 


@@ -1559,134 +1584,134 @@ msgstr ""
 msgid "/_Tools/_Template"
 msgstr ""
 
 msgid "/_Tools/_Template"
 msgstr ""
 

-#: src/compose.c:776 src/mainwindow.c:832 src/messageview.c:328
+#: src/compose.c:776 src/mainwindow.c:833 src/messageview.c:328

 msgid "/_Tools/Actio_ns"
 msgstr ""
 
 msgid "/_Tools/Actio_ns"
 msgstr ""
 

-#: src/compose.c:1036 src/prefs_compose_writing.c:374
+#: src/compose.c:1039 src/prefs_compose_writing.c:384

 msgid "New message subject format error."
 msgstr ""
 
 msgid "New message subject format error."
 msgstr ""
 

-#: src/compose.c:1065 src/prefs_compose_writing.c:378
+#: src/compose.c:1068 src/prefs_compose_writing.c:388

 msgid "New message body format error."
 msgstr ""
 
 msgid "New message body format error."
 msgstr ""
 

-#: src/compose.c:1432
+#: src/compose.c:1438 src/prefs_quote.c:281

 msgid "Message reply format error."
 msgstr ""
 
 msgid "Message reply format error."
 msgstr ""
 

-#: src/compose.c:1549
+#: src/compose.c:1555 src/prefs_quote.c:286

 msgid "Message forward format error."
 msgstr ""
 
 msgid "Message forward format error."
 msgstr ""
 

-#: src/compose.c:1669
+#: src/compose.c:1675

 msgid "Fw: multiple emails"
 msgstr ""
 
 msgid "Fw: multiple emails"
 msgstr ""
 

-#: src/compose.c:2044
+#: src/compose.c:2050

 msgid "Message redirect format error."
 msgstr ""
 
 msgid "Message redirect format error."
 msgstr ""
 

-#: src/compose.c:2113
+#: src/compose.c:2119

 msgid "Reply-To:"
 msgstr ""
 
 msgid "Reply-To:"
 msgstr ""
 

-#: src/compose.c:2116 src/compose.c:5657 src/compose.c:6425 src/compose.c:9463
+#: src/compose.c:2122 src/compose.c:5667 src/compose.c:6437 src/compose.c:9475

 msgid "Newsgroups:"
 msgstr ""
 
 msgid "Newsgroups:"
 msgstr ""
 

-#: src/compose.c:2119
+#: src/compose.c:2125

 msgid "Followup-To:"
 msgstr ""
 
 msgid "Followup-To:"
 msgstr ""
 

-#: src/compose.c:2298
+#: src/compose.c:2304

 #, c-format
 msgid "The file '%s' has been attached."
 msgstr ""
 
 #, c-format
 msgid "The file '%s' has been attached."
 msgstr ""
 

-#: src/compose.c:2302
+#: src/compose.c:2308

 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 

-#: src/compose.c:2533
+#: src/compose.c:2539

 msgid "Quote mark format error."
 msgstr ""
 
 msgid "Quote mark format error."
 msgstr ""
 

-#: src/compose.c:3127
+#: src/compose.c:3133

 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 

-#: src/compose.c:3131
+#: src/compose.c:3137

 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 

-#: src/compose.c:3158
+#: src/compose.c:3164

 #, c-format
 msgid "Message: %s"
 msgstr ""
 
 #, c-format
 msgid "Message: %s"
 msgstr ""
 

-#: src/compose.c:3977
+#: src/compose.c:3983

 msgid " [Edited]"
 msgstr ""
 
 msgid " [Edited]"
 msgstr ""
 

-#: src/compose.c:3983
+#: src/compose.c:3989

 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 

-#: src/compose.c:3986
+#: src/compose.c:3992

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 

-#: src/compose.c:4011 src/messageview.c:613
+#: src/compose.c:4017 src/messageview.c:615

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 

-#: src/compose.c:4189 src/compose.c:4220 src/compose.c:4251 src/toolbar.c:391
-#: src/toolbar.c:442
+#: src/compose.c:4195 src/compose.c:4226 src/compose.c:4258 src/toolbar.c:401
+#: src/toolbar.c:452

 msgid "Send"
 msgstr ""
 
 msgid "Send"
 msgstr ""
 

-#: src/compose.c:4190
+#: src/compose.c:4196

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr ""
 

-#: src/compose.c:4191 src/compose.c:4222 src/compose.c:4253 src/compose.c:4727
+#: src/compose.c:4197 src/compose.c:4228 src/compose.c:4260 src/compose.c:4737

 msgid "+_Send"
 msgstr ""
 
 msgid "+_Send"
 msgstr ""
 

-#: src/compose.c:4221
+#: src/compose.c:4227

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr ""
 

-#: src/compose.c:4238
+#: src/compose.c:4244

 msgid "Recipient is not specified."
 msgstr ""
 
 msgid "Recipient is not specified."
 msgstr ""
 

-#: src/compose.c:4252
+#: src/compose.c:4259

 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 
 msgid "Subject is empty. Send it anyway?"
 msgstr ""
 

-#: src/compose.c:4298 src/compose.c:7926
+#: src/compose.c:4306 src/compose.c:7938

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 

-#: src/compose.c:4301 src/compose.c:7929
+#: src/compose.c:4309 src/compose.c:7941

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 

-#: src/compose.c:4305 src/compose.c:7923
+#: src/compose.c:4313 src/compose.c:7935

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1694,7 +1719,7 @@ msgid ""
 "Signature failed: %s"
 msgstr ""
 
 "Signature failed: %s"
 msgstr ""
 

-#: src/compose.c:4308
+#: src/compose.c:4316

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1702,24 +1727,24 @@ msgid ""
 "%s."
 msgstr ""
 
 "%s."
 msgstr ""
 

-#: src/compose.c:4310
+#: src/compose.c:4318

 msgid "Could not queue message for sending."
 msgstr ""
 
 msgid "Could not queue message for sending."
 msgstr ""
 

-#: src/compose.c:4325 src/compose.c:4384
+#: src/compose.c:4333 src/compose.c:4394

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
 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:4378
+#: src/compose.c:4388

 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 

-#: src/compose.c:4724
+#: src/compose.c:4734

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1727,7 +1752,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
 "Send it as %s?"
 msgstr ""
 

-#: src/compose.c:4783
+#: src/compose.c:4793

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1736,131 +1761,131 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
 "Send it anyway?"
 msgstr ""
 

-#: src/compose.c:4971
+#: src/compose.c:4981

 msgid "No account for sending mails available!"
 msgstr ""
 
 msgid "No account for sending mails available!"
 msgstr ""
 

-#: src/compose.c:4981
+#: src/compose.c:4991

 msgid "No account for posting news available!"
 msgstr ""
 
 msgid "No account for posting news available!"
 msgstr ""
 

-#: src/compose.c:5674
+#: src/compose.c:5684

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 

-#: src/compose.c:5802
+#: src/compose.c:5812

 msgid "Mime type"
 msgstr ""
 
 msgid "Mime type"
 msgstr ""
 

-#: src/compose.c:5808 src/compose.c:6104 src/mimeview.c:212
+#: src/compose.c:5818 src/compose.c:6114 src/mimeview.c:212

 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr ""
 
 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr ""
 

-#: src/compose.c:5869
+#: src/compose.c:5879

 msgid "Save Message to "
 msgstr ""
 
 msgid "Save Message to "
 msgstr ""
 

-#: src/compose.c:5891 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:5901 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr ""
 
 msgid "_Browse"
 msgstr ""
 

-#: src/compose.c:6103 src/compose.c:7333
+#: src/compose.c:6113 src/compose.c:7345

 msgid "MIME type"
 msgstr ""
 
 msgid "MIME type"
 msgstr ""
 

-#: src/compose.c:6175
+#: src/compose.c:6185

 msgid "Hea_der"
 msgstr ""
 
 msgid "Hea_der"
 msgstr ""
 

-#: src/compose.c:6179
+#: src/compose.c:6189

 msgid "_Attachments"
 msgstr ""
 
 msgid "_Attachments"
 msgstr ""
 

-#: src/compose.c:6183
+#: src/compose.c:6193

 msgid "Othe_rs"
 msgstr ""
 
 msgid "Othe_rs"
 msgstr ""
 

-#: src/compose.c:6198 src/summary_search.c:366
+#: src/compose.c:6208 src/summary_search.c:366

 msgid "Subject:"
 msgstr ""
 
 msgid "Subject:"
 msgstr ""
 

-#: src/compose.c:6387
+#: src/compose.c:6399

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 

-#: src/compose.c:6499
+#: src/compose.c:6511

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr ""
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr ""
 

-#: src/compose.c:6530
+#: src/compose.c:6542

 msgid "Account to use for this email"
 msgstr ""
 
 msgid "Account to use for this email"
 msgstr ""
 

-#: src/compose.c:6532
+#: src/compose.c:6544

 msgid "Sender address to be used"
 msgstr ""
 
 msgid "Sender address to be used"
 msgstr ""
 

-#: src/compose.c:6693
+#: src/compose.c:6705

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
 
 #, 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:6855 src/prefs_template.c:539
+#: src/compose.c:6867 src/prefs_template.c:549

 msgid "Template body format error."
 msgstr ""
 
 msgid "Template body format error."
 msgstr ""
 

-#: src/compose.c:6963
-msgid "Message To format error."
+#: src/compose.c:6975 src/prefs_template.c:587
+msgid "Template To format error."

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:6976
-msgid "Message Cc format error."
+#: src/compose.c:6988 src/prefs_template.c:592
+msgid "Template Cc format error."

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:6989
-msgid "Message Bcc format error."
+#: src/compose.c:7001 src/prefs_template.c:597
+msgid "Template Bcc format error."

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:7003
-msgid "Message subject format error."
+#: src/compose.c:7015 src/prefs_template.c:602
+msgid "Template subject format error."

 msgstr ""
 
 msgstr ""
 

-#: src/compose.c:7227
+#: src/compose.c:7239

 msgid "Invalid MIME type."
 msgstr ""
 
 msgid "Invalid MIME type."
 msgstr ""
 

-#: src/compose.c:7242
+#: src/compose.c:7254

 msgid "File doesn't exist or is empty."
 msgstr ""
 
 msgid "File doesn't exist or is empty."
 msgstr ""
 

-#: src/compose.c:7315
+#: src/compose.c:7327

 msgid "Properties"
 msgstr ""
 
 msgid "Properties"
 msgstr ""
 

-#: src/compose.c:7366
+#: src/compose.c:7378

 msgid "Encoding"
 msgstr ""
 
 msgid "Encoding"
 msgstr ""
 

-#: src/compose.c:7386
+#: src/compose.c:7398

 msgid "Path"
 msgstr ""
 
 msgid "Path"
 msgstr ""
 

-#: src/compose.c:7387 src/prefs_toolbar.c:1060
+#: src/compose.c:7399 src/prefs_toolbar.c:1060

 msgid "File name"
 msgstr ""
 
 msgid "File name"
 msgstr ""
 

-#: src/compose.c:7570
+#: src/compose.c:7582

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1868,19 +1893,19 @@ msgid ""
 "process group id: %d"
 msgstr ""
 
 "process group id: %d"
 msgstr ""
 

-#: src/compose.c:7612
+#: src/compose.c:7624

 msgid "Compose: input from monitoring process\n"
 msgstr ""
 
 msgid "Compose: input from monitoring process\n"
 msgstr ""
 

-#: src/compose.c:7893 src/messageview.c:718
+#: src/compose.c:7905 src/messageview.c:720

 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 

-#: src/compose.c:7918
+#: src/compose.c:7930

 msgid "Could not queue message."
 msgstr ""
 
 msgid "Could not queue message."
 msgstr ""
 

-#: src/compose.c:7920
+#: src/compose.c:7932

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1888,82 +1913,82 @@ msgid ""
 "%s."
 msgstr ""
 
 "%s."
 msgstr ""
 

-#: src/compose.c:8040
+#: src/compose.c:8052

 msgid "Could not save draft."
 msgstr ""
 
 msgid "Could not save draft."
 msgstr ""
 

-#: src/compose.c:8115 src/compose.c:8138
+#: src/compose.c:8127 src/compose.c:8150

 msgid "Select file"
 msgstr ""
 
 msgid "Select file"
 msgstr ""
 

-#: src/compose.c:8151
+#: src/compose.c:8163

 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 

-#: src/compose.c:8153
+#: src/compose.c:8165

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 

-#: src/compose.c:8201
+#: src/compose.c:8213

 msgid "Discard message"
 msgstr ""
 
 msgid "Discard message"
 msgstr ""
 

-#: src/compose.c:8202
+#: src/compose.c:8214

 msgid "This message has been modified. Discard it?"
 msgstr ""
 
 msgid "This message has been modified. Discard it?"
 msgstr ""
 

-#: src/compose.c:8203
+#: src/compose.c:8215

 msgid "_Discard"
 msgstr ""
 
 msgid "_Discard"
 msgstr ""
 

-#: src/compose.c:8203
+#: src/compose.c:8215

 msgid "_Save to Drafts"
 msgstr ""
 
 msgid "_Save to Drafts"
 msgstr ""
 

-#: src/compose.c:8247
+#: src/compose.c:8259

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr ""
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr ""
 

-#: src/compose.c:8249
+#: src/compose.c:8261

 msgid "Apply template"
 msgstr ""
 
 msgid "Apply template"
 msgstr ""
 

-#: src/compose.c:8250
+#: src/compose.c:8262

 msgid "_Replace"
 msgstr ""
 
 msgid "_Replace"
 msgstr ""
 

-#: src/compose.c:8250
+#: src/compose.c:8262

 msgid "_Insert"
 msgstr ""
 
 msgid "_Insert"
 msgstr ""
 

-#: src/compose.c:8938
+#: src/compose.c:8950

 msgid "Insert or attach?"
 msgstr ""
 
 msgid "Insert or attach?"
 msgstr ""
 

-#: src/compose.c:8939
+#: src/compose.c:8951

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 
 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:8941
+#: src/compose.c:8953

 msgid "+_Insert"
 msgstr ""
 
 msgid "+_Insert"
 msgstr ""
 

-#: src/compose.c:8941
+#: src/compose.c:8953

 msgid "_Attach"
 msgstr ""
 
 msgid "_Attach"
 msgstr ""
 

-#: src/compose.c:9140
+#: src/compose.c:9152

 msgid "Quote format error."
 msgstr ""
 
 msgid "Quote format error."
 msgstr ""
 

-#: src/compose.c:9359
+#: src/compose.c:9371

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -2141,11 +2166,11 @@ msgstr ""
 msgid "Input the new name of folder:"
 msgstr ""
 
 msgid "Input the new name of folder:"
 msgstr ""
 

-#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:134 src/mh_gtk.c:127
+#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:139 src/mh_gtk.c:130

 msgid "New folder"
 msgstr ""
 
 msgid "New folder"
 msgstr ""
 

-#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:128
+#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr ""
 
 msgid "Input the name of new folder:"
 msgstr ""
 


@@ -2232,6 +2257,7 @@ msgstr ""
 "be appropriate for the \"mydomain.com\" organisation. An IP address may also "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 "be appropriate for the \"mydomain.com\" organisation. An IP address may also "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."

+

 #: src/editldap.c:470
 msgid "TLS"
 msgstr ""
 #: src/editldap.c:470
 msgid "TLS"
 msgstr ""


@@ -2392,7 +2418,7 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:488
+#: src/editldap.c:810 src/gtk/quicksearch.c:490

 msgid "Extended"
 msgstr ""
 
 msgid "Extended"
 msgstr ""
 


@@ -2471,13 +2497,13 @@ msgstr ""
 msgid "Stylesheet"
 msgstr ""
 
 msgid "Stylesheet"
 msgstr ""
 

-#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
-#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:1003 src/prefs_account.c:667
-#: src/summaryview.c:4983
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1678
+#: src/gtk/gtkaspell.c:2411 src/mainwindow.c:1004 src/prefs_account.c:667
+#: src/summaryview.c:4991

 msgid "None"
 msgstr ""
 
 msgid "None"
 msgstr ""
 

-#: src/exphtmldlg.c:458 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:458 src/prefs_summaries.c:350 src/prefs_summaries.c:691

 msgid "Default"
 msgstr ""
 
 msgid "Default"
 msgstr ""
 


@@ -2681,7 +2707,7 @@ msgstr ""
 msgid "Distguished Name"
 msgstr ""
 
 msgid "Distguished Name"
 msgstr ""
 

-#: src/export.c:120 src/summaryview.c:6355
+#: src/export.c:120 src/summaryview.c:6370

 msgid "Export to mbox file"
 msgstr ""
 
 msgid "Export to mbox file"
 msgstr ""
 


@@ -2741,48 +2767,53 @@ msgstr ""
 msgid "Not specified."
 msgstr ""
 
 msgid "Not specified."
 msgstr ""
 

-#: src/folder.c:1277 src/foldersel.c:371 src/prefs_folder_item.c:236
+#: src/folder.c:1283 src/foldersel.c:371 src/prefs_folder_item.c:239

 msgid "Inbox"
 msgstr ""
 
 msgid "Inbox"
 msgstr ""
 

-#: src/folder.c:1281 src/foldersel.c:375
+#: src/folder.c:1287 src/foldersel.c:375

 msgid "Sent"
 msgstr ""
 
 msgid "Sent"
 msgstr ""
 

-#: src/folder.c:1285 src/foldersel.c:379 src/prefs_folder_item.c:239
+#: src/folder.c:1291 src/foldersel.c:379 src/prefs_folder_item.c:242

 msgid "Queue"
 msgstr ""
 
 msgid "Queue"
 msgstr ""
 

-#: src/folder.c:1289 src/foldersel.c:383 src/prefs_folder_item.c:240
-#: src/toolbar.c:366 src/toolbar.c:400 src/toolbar.c:491
+#: src/folder.c:1295 src/foldersel.c:383 src/prefs_folder_item.c:243
+#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501

 msgid "Trash"
 msgid "Trash"

-msgstr ""
+msgstr "Wastebin"

 
 

-#: src/folder.c:1293 src/foldersel.c:387 src/prefs_folder_item.c:238
+#: src/folder.c:1299 src/foldersel.c:387 src/prefs_folder_item.c:241

 msgid "Drafts"
 msgstr ""
 
 msgid "Drafts"
 msgstr ""
 

-#: src/folder.c:1572
+#: src/folder.c:1578

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr ""
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr ""
 

-#: src/folder.c:2508
+#: src/folder.c:2514

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr ""
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr ""
 

-#: src/folder.c:2797
+#: src/folder.c:2803
+#, c-format
+msgid "Copying %s to %s...\n"
+msgstr ""
+
+#: src/folder.c:2803

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 

-#: src/folder.c:3079
+#: src/folder.c:3090

 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 

-#: src/folder.c:3790
+#: src/folder.c:3801

 msgid "Processing messages..."
 msgstr ""
 
 msgid "Processing messages..."
 msgstr ""
 


@@ -2790,207 +2821,229 @@ msgstr ""
 msgid "Select folder"
 msgstr ""
 
 msgid "Select folder"
 msgstr ""
 

-#: src/foldersel.c:558 src/imap_gtk.c:138 src/mh_gtk.c:129
+#: src/foldersel.c:558 src/imap_gtk.c:143 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr ""
 
 msgid "NewFolder"
 msgstr ""
 

-#: src/foldersel.c:566 src/imap_gtk.c:146 src/imap_gtk.c:152 src/mh_gtk.c:135
-#: src/mh_gtk.c:238
+#: src/foldersel.c:566 src/imap_gtk.c:151 src/imap_gtk.c:157 src/mh_gtk.c:138
+#: src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
 

-#: src/foldersel.c:576 src/imap_gtk.c:162 src/imap_gtk.c:216 src/mh_gtk.c:145
-#: src/mh_gtk.c:245
+#: src/foldersel.c:576 src/imap_gtk.c:167 src/imap_gtk.c:221 src/mh_gtk.c:148
+#: src/mh_gtk.c:248

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 

-#: src/foldersel.c:583 src/imap_gtk.c:168 src/mh_gtk.c:151
+#: src/foldersel.c:583 src/imap_gtk.c:173 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr ""
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr ""
 

-#: src/folderview.c:290
+#: src/folderview.c:291

 msgid "/Mark all re_ad"
 msgstr ""
 
 msgid "/Mark all re_ad"
 msgstr ""
 

-#: src/folderview.c:292
+#: src/folderview.c:293

 msgid "/_Search folder..."
 msgstr ""
 
 msgid "/_Search folder..."
 msgstr ""
 

-#: src/folderview.c:294
+#: src/folderview.c:295

 msgid "/Process_ing..."
 msgstr ""
 
 msgid "/Process_ing..."
 msgstr ""
 

-#: src/folderview.c:299
+#: src/folderview.c:300

 msgid "/Empty _trash..."
 msgid "/Empty _trash..."

-msgstr ""
+msgstr "/Empty was_tebin..."

 
 

-#: src/folderview.c:304
+#: src/folderview.c:305

 msgid "/Send _queue..."
 msgstr ""
 
 msgid "/Send _queue..."
 msgstr ""
 

-#: src/folderview.c:423 src/folderview.c:470 src/prefs_folder_column.c:80
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:80

 msgid "New"
 msgstr ""
 
 msgid "New"
 msgstr ""
 

-#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:81
+#: src/folderview.c:425 src/folderview.c:472 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr ""
 
 msgid "Unread"
 msgstr ""
 

-#: src/folderview.c:425 src/prefs_folder_column.c:82
+#: src/folderview.c:426 src/prefs_folder_column.c:82

 msgid "Total"
 msgstr ""
 
 #. TRANSLATORS: This in Number sign in American style
 msgid "Total"
 msgstr ""
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:473 src/summaryview.c:491
+#: src/folderview.c:474 src/summaryview.c:491

 msgid "#"
 msgstr "No."
 
 msgid "#"
 msgstr "No."
 

-#: src/folderview.c:718
+#: src/folderview.c:719

 msgid "Setting folder info..."
 msgstr ""
 
 msgid "Setting folder info..."
 msgstr ""
 

-#: src/folderview.c:772 src/summaryview.c:3453
+#: src/folderview.c:773 src/summaryview.c:3453

 msgid "Mark all as read"
 msgstr ""
 
 msgid "Mark all as read"
 msgstr ""
 

-#: src/folderview.c:773 src/summaryview.c:3454
+#: src/folderview.c:774 src/summaryview.c:3454

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 

-#: src/folderview.c:1059 src/imap.c:3199 src/mainwindow.c:3924 src/setup.c:90
+#: src/folderview.c:1060 src/imap.c:3190 src/mainwindow.c:3934 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr ""
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr ""
 

-#: src/folderview.c:1063 src/imap.c:3204 src/mainwindow.c:3929 src/setup.c:95
+#: src/folderview.c:1064 src/imap.c:3195 src/mainwindow.c:3939 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr ""
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr ""
 

-#: src/folderview.c:1090
+#: src/folderview.c:1091

 msgid "Rebuild folder tree"
 msgstr ""
 
 msgid "Rebuild folder tree"
 msgstr ""
 

-#: src/folderview.c:1091
+#: src/folderview.c:1092

 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 

-#: src/folderview.c:1101
+#: src/folderview.c:1102

 msgid "Rebuilding folder tree..."
 msgstr ""
 
 msgid "Rebuilding folder tree..."
 msgstr ""
 

-#: src/folderview.c:1103
+#: src/folderview.c:1104

 msgid "Scanning folder tree..."
 msgstr ""
 
 msgid "Scanning folder tree..."
 msgstr ""
 

-#: src/folderview.c:1174
+#: src/folderview.c:1175

 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 

-#: src/folderview.c:1227
+#: src/folderview.c:1228

 msgid "Checking for new messages in all folders..."
 msgstr ""
 
 msgid "Checking for new messages in all folders..."
 msgstr ""
 

-#: src/folderview.c:2089
+#: src/folderview.c:2090

 #, c-format
 msgid "Closing Folder %s..."
 msgstr ""
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr ""
 

-#: src/folderview.c:2128
+#: src/folderview.c:2129

 #, c-format
 msgid "Opening Folder %s..."
 msgstr ""
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr ""
 

-#: src/folderview.c:2141
+#: src/folderview.c:2142

 msgid "Folder could not be opened."
 msgstr ""
 
 msgid "Folder could not be opened."
 msgstr ""
 

-#: src/folderview.c:2302 src/mainwindow.c:2079
+#: src/folderview.c:2303 src/mainwindow.c:2080

 msgid "Empty trash"
 msgid "Empty trash"

-msgstr ""
+msgstr "Empty wastebin"

 
 

-#: src/folderview.c:2303
+#: src/folderview.c:2304

 msgid "Delete all messages in trash?"
 msgid "Delete all messages in trash?"

-msgstr ""
+msgstr "Delete all messages in wastebin?"

 
 

-#: src/folderview.c:2304 src/mainwindow.c:2081
+#: src/folderview.c:2305 src/mainwindow.c:2082

 msgid "+_Empty trash"
 msgid "+_Empty trash"

-msgstr ""
+msgstr "+_Empty wastebin"

 
 

-#: src/folderview.c:2348 src/inc.c:1465 src/toolbar.c:2122
+#: src/folderview.c:2349 src/inc.c:1465 src/toolbar.c:2196

 msgid "Offline warning"
 msgstr ""
 
 msgid "Offline warning"
 msgstr ""
 

-#: src/folderview.c:2349 src/toolbar.c:2123
+#: src/folderview.c:2350 src/toolbar.c:2197

 msgid "You're working offline. Override?"
 msgstr ""
 
 msgid "You're working offline. Override?"
 msgstr ""
 

-#: src/folderview.c:2360 src/toolbar.c:2142
+#: src/folderview.c:2361 src/toolbar.c:2216

 msgid "Send queued messages"
 msgstr ""
 
 msgid "Send queued messages"
 msgstr ""
 

-#: src/folderview.c:2361 src/toolbar.c:2143
+#: src/folderview.c:2362 src/toolbar.c:2217

 msgid "Send all queued messages?"
 msgstr ""
 
 msgid "Send all queued messages?"
 msgstr ""
 

-#: src/folderview.c:2362 src/messageview.c:579 src/messageview.c:596
-#: src/prefs_account.c:1039 src/toolbar.c:2144
+#: src/folderview.c:2363 src/messageview.c:581 src/messageview.c:598
+#: src/prefs_account.c:1039 src/toolbar.c:2218

 msgid "_Send"
 msgstr ""
 
 msgid "_Send"
 msgstr ""
 

-#: src/folderview.c:2370 src/toolbar.c:2162
+#: src/folderview.c:2371 src/toolbar.c:2236

 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 

-#: src/folderview.c:2373 src/main.c:1549 src/toolbar.c:2165
+#: src/folderview.c:2374 src/main.c:1549 src/toolbar.c:2239

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 

-#: src/folderview.c:2440
+#: src/folderview.c:2441
+#, c-format
+msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgstr ""
+
+#: src/folderview.c:2442

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr ""
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr ""
 

-#: src/folderview.c:2443
+#: src/folderview.c:2444
+msgid "Copy folder"
+msgstr ""
+
+#: src/folderview.c:2444

 msgid "Move folder"
 msgstr ""
 
 msgid "Move folder"
 msgstr ""
 

-#: src/folderview.c:2454
+#: src/folderview.c:2455
+#, c-format
+msgid "Copying %s to %s..."
+msgstr ""
+
+#: src/folderview.c:2455

 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 

-#: src/folderview.c:2483
+#: src/folderview.c:2486

 msgid "Source and destination are the same."
 msgstr ""
 
 msgid "Source and destination are the same."
 msgstr ""
 

-#: src/folderview.c:2486
+#: src/folderview.c:2489
+msgid "Can't copy a folder to one of its children."
+msgstr ""
+
+#: src/folderview.c:2490

 msgid "Can't move a folder to one of its children."
 msgstr ""
 
 msgid "Can't move a folder to one of its children."
 msgstr ""
 

-#: src/folderview.c:2489
+#: src/folderview.c:2493

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr ""
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr ""
 

-#: src/folderview.c:2492
+#: src/folderview.c:2496
+msgid "Copy failed!"
+msgstr ""
+
+#: src/folderview.c:2496

 msgid "Move failed!"
 msgstr ""
 
 msgid "Move failed!"
 msgstr ""
 

-#: src/folderview.c:2528
+#: src/folderview.c:2532

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 

-#: src/gedit-print.c:147 src/messageview.c:1502 src/summaryview.c:4124
-#: src/toolbar.c:178
+#: src/gedit-print.c:147 src/messageview.c:1525 src/summaryview.c:4124
+#: src/toolbar.c:182

 msgid "Print"
 msgstr ""
 
 msgid "Print"
 msgstr ""
 


@@ -3069,33 +3122,22 @@ msgstr ""
 msgid "%d newsgroups received (%s read)"
 msgstr ""
 
 msgid "%d newsgroups received (%s read)"
 msgstr ""
 

-#: src/gtk/about.c:78 src/textview.c:216
+#: src/gtk/about.c:79 src/textview.c:216

 msgid "/_Open with Web browser"
 msgstr ""
 
 msgid "/_Open with Web browser"
 msgstr ""
 

-#: src/gtk/about.c:79 src/textview.c:217
+#: src/gtk/about.c:80 src/textview.c:217

 msgid "/Copy this _link"
 msgstr ""
 
 msgid "/Copy this _link"
 msgstr ""
 

-#: src/gtk/about.c:121
-msgid "About Claws Mail"
-msgstr ""
-
-#: src/gtk/about.c:172
-msgid ""
-"Copyright (C) 1999-2006\n"
-"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Claws Mail team"
-msgstr ""
-
-#: src/gtk/about.c:214
+#: src/gtk/about.c:138

 msgid ""
 "Claws Mail is a lightweight, fast and highly-configurable email client.\n"
 "\n"
 "For further information visit the Claws Mail website:\n"
 msgstr ""
 
 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:220
+#: src/gtk/about.c:144

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3103,14 +3145,14 @@ msgid ""
 "donate to the Claws Mail project you can do so at:\n"
 msgstr ""
 
 "donate to the Claws Mail project you can do so at:\n"
 msgstr ""
 

-#: src/gtk/about.c:235
+#: src/gtk/about.c:159

 msgid ""
 "\n"
 "\n"
 "System Information\n"
 msgstr ""
 
 msgid ""
 "\n"
 "\n"
 "System Information\n"
 msgstr ""
 

-#: src/gtk/about.c:241
+#: src/gtk/about.c:165

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3118,7 +3160,7 @@ msgid ""
 "Operating System: %s %s (%s)"
 msgstr ""
 
 "Operating System: %s %s (%s)"
 msgstr ""
 

-#: src/gtk/about.c:250
+#: src/gtk/about.c:174

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3126,7 +3168,7 @@ msgid ""
 "Operating System: %s"
 msgstr ""
 
 "Operating System: %s"
 msgstr ""
 

-#: src/gtk/about.c:259
+#: src/gtk/about.c:183

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3134,104 +3176,80 @@ msgid ""
 "Operating System: unknown"
 msgstr ""
 
 "Operating System: unknown"
 msgstr ""
 

-#: src/gtk/about.c:281
-msgid "_Info"
-msgstr ""
-
-#: src/gtk/about.c:309
-msgid "The Claws Mail Team\n"
-msgstr ""
-
-#: src/gtk/about.c:326
-msgid ""
-"\n"
-"Previous team members\n"
+#: src/gtk/about.c:240 src/prefs_themes.c:706 src/wizard.c:467
+msgid "The Claws Mail Team"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/about.c:343
-msgid ""
-"\n"
-"The translation team\n"
+#: src/gtk/about.c:259
+msgid "Previous team members"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/about.c:360
-msgid ""
-"\n"
-"Documentation team\n"
+#: src/gtk/about.c:278
+msgid "The translation team"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/about.c:377
-msgid ""
-"\n"
-"Logo\n"
+#: src/gtk/about.c:297
+msgid "Documentation team"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/about.c:394
-msgid ""
-"\n"
-"Icons\n"
+#: src/gtk/about.c:316
+msgid "Logo"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/about.c:411
-msgid ""
-"\n"
-"Contributors\n"
+#: src/gtk/about.c:335
+msgid "Icons"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/about.c:430
-msgid "_Authors"
+#: src/gtk/about.c:354
+msgid "Contributors"

 msgstr ""
 
 msgstr ""
 

-#: src/gtk/about.c:450
+#: src/gtk/about.c:402

 msgid "Compiled-in Features\n"
 msgstr ""
 
 msgid "Compiled-in Features\n"
 msgstr ""
 

-#: src/gtk/about.c:466
+#: src/gtk/about.c:418

 msgid ""
 "IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
 msgstr ""
 
 msgid ""
 "IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
 msgstr ""
 

-#: src/gtk/about.c:477
+#: src/gtk/about.c:429

 msgid "iconv|allows converting to and from different character sets\n"
 msgstr ""
 
 msgid "iconv|allows converting to and from different character sets\n"
 msgstr ""
 

-#: src/gtk/about.c:487
+#: src/gtk/about.c:439

 msgid "compface|adds support for the X-Face header\n"
 msgstr ""
 
 msgid "compface|adds support for the X-Face header\n"
 msgstr ""
 

-#: src/gtk/about.c:497
+#: src/gtk/about.c:449

 msgid "OpenSSL|adds support for encrypted connections to servers\n"
 msgstr ""
 
 msgid "OpenSSL|adds support for encrypted connections to servers\n"
 msgstr ""
 

-#: src/gtk/about.c:507
+#: src/gtk/about.c:459

 msgid "LDAP|adds support for LDAP shared addressbooks\n"
 msgstr ""
 
 msgid "LDAP|adds support for LDAP shared addressbooks\n"
 msgstr ""
 

-#: src/gtk/about.c:517
+#: src/gtk/about.c:469

 msgid "JPilot|adds support for PalmOS addressbooks\n"
 msgstr ""
 
 msgid "JPilot|adds support for PalmOS addressbooks\n"
 msgstr ""
 

-#: src/gtk/about.c:527
+#: src/gtk/about.c:479

 msgid "GNU/aspell|adds support for spell checking\n"
 msgstr ""
 
 msgid "GNU/aspell|adds support for spell checking\n"
 msgstr ""
 

-#: src/gtk/about.c:537
+#: src/gtk/about.c:489

 msgid "libetpan|adds support for IMAP servers\n"
 msgstr ""
 
 msgid "libetpan|adds support for IMAP servers\n"
 msgstr ""
 

-#: src/gtk/about.c:547
+#: src/gtk/about.c:499

 msgid "libgnomeprint|adds support for a complete print dialog\n"
 msgstr "adds support for a complete print dialogue\n"
 
 msgid "libgnomeprint|adds support for a complete print dialog\n"
 msgstr "adds support for a complete print dialogue\n"
 

-#: src/gtk/about.c:557
+#: src/gtk/about.c:509

 msgid "libSM|adds support for session handling\n"
 msgstr ""
 
 msgid "libSM|adds support for session handling\n"
 msgstr ""
 

-#: src/gtk/about.c:561
-msgid "_Features"
-msgstr ""
-
-#: src/gtk/about.c:581
+#: src/gtk/about.c:541

 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 "
 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 "


@@ -3240,7 +3258,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/gtk/about.c:587
+#: src/gtk/about.c:547

 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 "
 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 "


@@ -3249,7 +3267,7 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/gtk/about.c:593
+#: src/gtk/about.c:553

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "


@@ -3257,45 +3275,72 @@ msgid ""
 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 

-#: src/gtk/about.c:607
+#: src/gtk/about.c:571

 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgstr ""
 
 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgstr ""
 

-#: src/gtk/about.c:611
+#: src/gtk/about.c:575

 msgid ").\n"
 msgstr ""
 
 msgid ").\n"
 msgstr ""
 

-#: src/gtk/about.c:623
+#: src/gtk/about.c:668
+msgid "About Claws Mail"
+msgstr ""
+
+#: src/gtk/about.c:719
+msgid ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"
+msgstr ""
+
+#: src/gtk/about.c:733
+msgid "_Info"
+msgstr ""
+
+#: src/gtk/about.c:739
+msgid "_Authors"
+msgstr ""
+
+#: src/gtk/about.c:745
+msgid "_Features"
+msgstr ""
+
+#: src/gtk/about.c:751

 msgid "_License"
 msgstr ""
 
 msgid "_License"
 msgstr ""
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:309
+#: src/gtk/about.c:759
+msgid "_Release Notes"
+msgstr ""
+
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:313

 msgid "Orange"
 msgstr ""
 
 msgid "Orange"
 msgstr ""
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:313
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:317

 msgid "Red"
 msgstr ""
 
 msgid "Red"
 msgstr ""
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:317
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:321

 msgid "Pink"
 msgstr ""
 
 msgid "Pink"
 msgstr ""
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:321
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:325

 msgid "Sky blue"
 msgstr ""
 
 msgid "Sky blue"
 msgstr ""
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:325
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:329

 msgid "Blue"
 msgstr ""
 
 msgid "Blue"
 msgstr ""
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:329
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:333

 msgid "Green"
 msgstr ""
 
 msgid "Green"
 msgstr ""
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:333
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:337

 msgid "Brown"
 msgstr ""
 
 msgid "Brown"
 msgstr ""
 


@@ -3419,100 +3464,111 @@ msgstr ""
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr ""
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:606
+#: src/gtk/gtkaspell.c:632

 msgid "No dictionary selected."
 msgstr ""
 
 msgid "No dictionary selected."
 msgstr ""
 

-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
+#: src/gtk/gtkaspell.c:868 src/gtk/gtkaspell.c:1869 src/gtk/gtkaspell.c:2164

 msgid "Normal Mode"
 msgstr ""
 
 msgid "Normal Mode"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
+#: src/gtk/gtkaspell.c:870 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2176

 msgid "Bad Spellers Mode"
 msgstr ""
 
 msgid "Bad Spellers Mode"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:909

 msgid "Unknown suggestion mode."
 msgstr ""
 
 msgid "Unknown suggestion mode."
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1154
+#: src/gtk/gtkaspell.c:1200

 msgid "No misspelled word found."
 msgstr ""
 
 msgid "No misspelled word found."
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1502
+#: src/gtk/gtkaspell.c:1548

 msgid "Replace unknown word"
 msgstr ""
 
 msgid "Replace unknown word"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1517
+#: src/gtk/gtkaspell.c:1563

 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr ""
 
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1562
+#: src/gtk/gtkaspell.c:1608

 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgstr ""
 
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
+#: src/gtk/gtkaspell.c:1863 src/gtk/gtkaspell.c:2152

 msgid "Fast Mode"
 msgstr ""
 
 msgid "Fast Mode"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1970

 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr ""
 
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1930
+#: src/gtk/gtkaspell.c:1984

 msgid "Accept in this session"
 msgstr ""
 
 msgid "Accept in this session"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1940
+#: src/gtk/gtkaspell.c:1994

 msgid "Add to personal dictionary"
 msgstr ""
 
 msgid "Add to personal dictionary"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1950
+#: src/gtk/gtkaspell.c:2004

 msgid "Replace with..."
 msgstr ""
 
 msgid "Replace with..."
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1963
+#: src/gtk/gtkaspell.c:2017

 #, c-format
 msgid "Check with %s"
 msgstr ""
 
 #, c-format
 msgid "Check with %s"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1985
+#: src/gtk/gtkaspell.c:2039

 msgid "(no suggestions)"
 msgstr ""
 
 msgid "(no suggestions)"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
+#: src/gtk/gtkaspell.c:2050 src/gtk/gtkaspell.c:2229

 msgid "More..."
 msgstr ""
 
 msgid "More..."
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2060
+#: src/gtk/gtkaspell.c:2114

 #, c-format
 msgid "Dictionary: %s"
 msgstr ""
 
 #, c-format
 msgid "Dictionary: %s"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2073
+#: src/gtk/gtkaspell.c:2127

 #, c-format
 msgid "Use alternate (%s)"
 msgstr ""
 
 #, c-format
 msgid "Use alternate (%s)"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2138
+msgid "Use both dictionaries"
+msgstr ""
+
+#: src/gtk/gtkaspell.c:2192 src/prefs_spelling.c:218

 msgid "Check while typing"
 msgstr ""
 
 msgid "Check while typing"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2137
+#: src/gtk/gtkaspell.c:2208

 msgid "Change dictionary"
 msgstr ""
 
 msgid "Change dictionary"
 msgstr ""
 

-#: src/gtk/gtkaspell.c:2270
+#: src/gtk/gtkaspell.c:2340

 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 "%s"
 msgstr ""
 

+#: src/gtk/gtkaspell.c:2386
+#, c-format
+msgid ""
+"The spell checker could not change the alternate dictionary.\n"
+"%s"
+msgstr ""
+

 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr ""
 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr ""


@@ -3616,7 +3672,7 @@ msgstr ""
 msgid "Protocol log"
 msgstr ""
 
 msgid "Protocol log"
 msgstr ""
 

-#: src/gtk/logwindow.c:373
+#: src/gtk/logwindow.c:384

 msgid "Clear _Log"
 msgstr ""
 
 msgid "Clear _Log"
 msgstr ""
 


@@ -3654,7 +3710,7 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
 msgid "Plugins"
 msgstr ""
 

-#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:211

 msgid "Description"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 


@@ -3701,176 +3757,176 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
 msgid "Status"
 msgstr ""
 

-#: src/gtk/quicksearch.c:329
+#: src/gtk/quicksearch.c:331

 msgid "all messages"
 msgstr ""
 
 msgid "all messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:330
+#: src/gtk/quicksearch.c:332

 msgid "messages whose age is greater than #"
 msgstr ""
 
 msgid "messages whose age is greater than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:331
+#: src/gtk/quicksearch.c:333

 msgid "messages whose age is less than #"
 msgstr ""
 
 msgid "messages whose age is less than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:332
+#: src/gtk/quicksearch.c:334

 msgid "messages which contain S in the message body"
 msgstr ""
 
 msgid "messages which contain S in the message body"
 msgstr ""
 

-#: src/gtk/quicksearch.c:333
+#: src/gtk/quicksearch.c:335

 msgid "messages which contain S in the whole message"
 msgstr ""
 
 msgid "messages which contain S in the whole message"
 msgstr ""
 

-#: src/gtk/quicksearch.c:334
+#: src/gtk/quicksearch.c:336

 msgid "messages carbon-copied to S"
 msgstr ""
 
 msgid "messages carbon-copied to S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:335
+#: src/gtk/quicksearch.c:337

 msgid "message is either to: or cc: to S"
 msgstr ""
 
 msgid "message is either to: or cc: to S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:336
+#: src/gtk/quicksearch.c:338

 msgid "deleted messages"
 msgstr ""
 
 msgid "deleted messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:339

 msgid "messages which contain S in the Sender field"
 msgstr ""
 
 msgid "messages which contain S in the Sender field"
 msgstr ""
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:340

 msgid "true if execute \"S\" succeeds"
 msgstr ""
 
 msgid "true if execute \"S\" succeeds"
 msgstr ""
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:341

 msgid "messages originating from user S"
 msgstr ""
 
 msgid "messages originating from user S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:342

 msgid "forwarded messages"
 msgstr ""
 
 msgid "forwarded messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:343

 msgid "messages which contain header S"
 msgstr ""
 
 msgid "messages which contain header S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:344

 msgid "messages which contain S in Message-ID header"
 msgstr ""
 
 msgid "messages which contain S in Message-ID header"
 msgstr ""
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:345

 msgid "messages which contain S in inreplyto header"
 msgstr ""
 
 msgid "messages which contain S in inreplyto header"
 msgstr ""
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:346

 msgid "messages which are marked with color #"
 msgstr "messages which are marked with colour #"
 
 msgid "messages which are marked with color #"
 msgstr "messages which are marked with colour #"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:347

 msgid "locked messages"
 msgstr ""
 
 msgid "locked messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:348

 msgid "messages which are in newsgroup S"
 msgstr ""
 
 msgid "messages which are in newsgroup S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:349

 msgid "new messages"
 msgstr ""
 
 msgid "new messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:350

 msgid "old messages"
 msgstr ""
 
 msgid "old messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:351

 msgid "incomplete messages (not entirely downloaded)"
 msgstr ""
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr ""
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:352

 msgid "messages which have been replied to"
 msgstr ""
 
 msgid "messages which have been replied to"
 msgstr ""
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:353

 msgid "read messages"
 msgstr ""
 
 msgid "read messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:354

 msgid "messages which contain S in subject"
 msgstr ""
 
 msgid "messages which contain S in subject"
 msgstr ""
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:355

 msgid "messages whose score is equal to #"
 msgstr ""
 
 msgid "messages whose score is equal to #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:356

 msgid "messages whose score is greater than #"
 msgstr ""
 
 msgid "messages whose score is greater than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:357

 msgid "messages whose score is lower than #"
 msgstr ""
 
 msgid "messages whose score is lower than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:358

 msgid "messages whose size is equal to #"
 msgstr ""
 
 msgid "messages whose size is equal to #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:359

 msgid "messages whose size is greater than #"
 msgstr ""
 
 msgid "messages whose size is greater than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:360

 msgid "messages whose size is smaller than #"
 msgstr ""
 
 msgid "messages whose size is smaller than #"
 msgstr ""
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:361

 msgid "messages which have been sent to S"
 msgstr ""
 
 msgid "messages which have been sent to S"
 msgstr ""
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:362

 msgid "marked messages"
 msgstr ""
 
 msgid "marked messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:363

 msgid "unread messages"
 msgstr ""
 
 msgid "unread messages"
 msgstr ""
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:364

 msgid "messages which contain S in References header"
 msgstr ""
 
 msgid "messages which contain S in References header"
 msgstr ""
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:365

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:366

 msgid "messages which contain S in X-Label header"
 msgstr ""
 
 msgid "messages which contain S in X-Label header"
 msgstr ""
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:368

 msgid "logical AND operator"
 msgstr ""
 
 msgid "logical AND operator"
 msgstr ""
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:369

 msgid "logical OR operator"
 msgstr ""
 
 msgid "logical OR operator"
 msgstr ""
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:370

 msgid "logical NOT operator"
 msgstr ""
 
 msgid "logical NOT operator"
 msgstr ""
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:371

 msgid "case sensitive search"
 msgstr ""
 
 msgid "case sensitive search"
 msgstr ""
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:373

 msgid "all filtering expressions are allowed"
 msgstr ""
 
 msgid "all filtering expressions are allowed"
 msgstr ""
 

-#: src/gtk/quicksearch.c:379 src/summary_search.c:397
+#: src/gtk/quicksearch.c:381 src/summary_search.c:397

 msgid "Extended Search"
 msgstr ""
 
 msgid "Extended Search"
 msgstr ""
 

-#: src/gtk/quicksearch.c:380
+#: src/gtk/quicksearch.c:382

 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"
 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"


@@ -3878,51 +3934,51 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
 "The following symbols can be used:"
 msgstr ""
 

-#: src/gtk/quicksearch.c:476 src/prefs_compose_writing.c:239
+#: src/gtk/quicksearch.c:478 src/prefs_compose_writing.c:239

 #: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
 #: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
 #: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486
 msgid "Subject"
 msgstr ""
 
 #: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
 #: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
 #: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486
 msgid "Subject"
 msgstr ""
 

-#: src/gtk/quicksearch.c:480 src/prefs_filtering_action.c:1081
+#: src/gtk/quicksearch.c:482 src/prefs_filtering_action.c:1081

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr ""
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr ""
 

-#: src/gtk/quicksearch.c:484 src/prefs_filtering_action.c:1082
+#: src/gtk/quicksearch.c:486 src/prefs_filtering_action.c:1082

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr ""
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr ""
 

-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:497

 msgid "Recursive"
 msgstr ""
 
 msgid "Recursive"
 msgstr ""
 

-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:507

 msgid "Sticky"
 msgstr ""
 
 msgid "Sticky"
 msgstr ""
 

-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:517

 msgid "Type-ahead"
 msgstr ""
 
 msgid "Type-ahead"
 msgstr ""
 

-#: src/gtk/quicksearch.c:546
+#: src/gtk/quicksearch.c:548

 msgid " Clear "
 msgstr ""
 
 msgid " Clear "
 msgstr ""
 

-#: src/gtk/quicksearch.c:567 src/summary_search.c:350
+#: src/gtk/quicksearch.c:569 src/summary_search.c:350

 msgid "Edit search criteria"
 msgstr ""
 
 msgid "Edit search criteria"
 msgstr ""
 

-#: src/gtk/quicksearch.c:573
+#: src/gtk/quicksearch.c:575

 msgid " Extended Symbols... "
 msgstr ""
 
 msgid " Extended Symbols... "
 msgstr ""
 

-#: src/gtk/quicksearch.c:1020 src/summaryview.c:1073
+#: src/gtk/quicksearch.c:1025 src/summaryview.c:1073

 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""
 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""


@@ -4044,19 +4100,19 @@ msgstr ""
 msgid "(No Subject)"
 msgstr ""
 
 msgid "(No Subject)"
 msgstr ""
 

-#: src/image_viewer.c:283
+#: src/image_viewer.c:284

 msgid "Filename:"
 msgstr ""
 
 msgid "Filename:"
 msgstr ""
 

-#: src/image_viewer.c:290
+#: src/image_viewer.c:291

 msgid "Filesize:"
 msgstr ""
 
 msgid "Filesize:"
 msgstr ""
 

-#: src/image_viewer.c:311
+#: src/image_viewer.c:312

 msgid "Load Image"
 msgstr ""
 
 msgid "Load Image"
 msgstr ""
 

-#: src/image_viewer.c:317
+#: src/image_viewer.c:318

 msgid "Content-Type:"
 msgstr ""
 
 msgid "Content-Type:"
 msgstr ""
 


@@ -4088,16 +4144,16 @@ msgstr ""
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 

-#: src/imap.c:706 src/imap.c:2222 src/imap.c:2746 src/imap.c:2831
-#: src/imap.c:3165 src/imap.c:3920
+#: src/imap.c:717 src/imap.c:2239 src/imap.c:2737 src/imap.c:2822
+#: src/imap.c:3156 src/imap.c:3914

 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 

-#: src/imap.c:780 src/inc.c:770 src/news.c:295 src/send_message.c:299
+#: src/imap.c:789 src/inc.c:770 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr ""
 
 msgid "Insecure connection"
 msgstr ""
 

-#: src/imap.c:781 src/inc.c:771 src/news.c:296 src/send_message.c:300
+#: src/imap.c:790 src/inc.c:771 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Claws Mail. \n"


@@ -4106,128 +4162,128 @@ msgid ""
 "not be secure."
 msgstr ""
 
 "not be secure."
 msgstr ""
 

-#: src/imap.c:787 src/inc.c:777 src/news.c:302 src/send_message.c:306
+#: src/imap.c:796 src/inc.c:777 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr ""
 
 msgid "Con_tinue connecting"
 msgstr ""
 

-#: src/imap.c:797
+#: src/imap.c:806

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr ""
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr ""
 

-#: src/imap.c:829
+#: src/imap.c:844

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr ""
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr ""
 

-#: src/imap.c:832
+#: src/imap.c:847

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr ""
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr ""
 

-#: src/imap.c:861 src/imap.c:2554
+#: src/imap.c:876 src/imap.c:2545

 msgid "Can't start TLS session.\n"
 msgstr ""
 
 msgid "Can't start TLS session.\n"
 msgstr ""
 

-#: src/imap.c:898
+#: src/imap.c:913

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr ""
 

-#: src/imap.c:909 src/imap.c:912
+#: src/imap.c:924 src/imap.c:927

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 

-#: src/imap.c:1086
+#: src/imap.c:1100

 msgid "Adding messages..."
 msgstr ""
 
 msgid "Adding messages..."
 msgstr ""
 

-#: src/imap.c:1236 src/mh.c:500
+#: src/imap.c:1252 src/mh.c:500

 msgid "Copying messages..."
 msgstr ""
 
 msgid "Copying messages..."
 msgstr ""
 

-#: src/imap.c:1411
+#: src/imap.c:1428

 msgid "can't set deleted flags\n"
 msgstr ""
 
 msgid "can't set deleted flags\n"
 msgstr ""
 

-#: src/imap.c:1417 src/imap.c:3672
+#: src/imap.c:1434 src/imap.c:3665

 msgid "can't expunge\n"
 msgstr ""
 
 msgid "can't expunge\n"
 msgstr ""
 

-#: src/imap.c:1861
+#: src/imap.c:1878

 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 

-#: src/imap.c:1877
+#: src/imap.c:1894

 msgid "can't create mailbox\n"
 msgstr ""
 
 msgid "can't create mailbox\n"
 msgstr ""
 

-#: src/imap.c:1958
+#: src/imap.c:1975

 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 

-#: src/imap.c:1989
+#: src/imap.c:2006

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 

-#: src/imap.c:2053
+#: src/imap.c:2070

 msgid "can't delete mailbox\n"
 msgstr ""
 
 msgid "can't delete mailbox\n"
 msgstr ""
 

-#: src/imap.c:2334
+#: src/imap.c:2316

 msgid "LIST failed\n"
 msgstr ""
 
 msgid "LIST failed\n"
 msgstr ""
 

-#: src/imap.c:2442
+#: src/imap.c:2433

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 

-#: src/imap.c:2551
+#: src/imap.c:2542

 msgid "Server requires TLS to log in.\n"
 msgstr ""
 
 msgid "Server requires TLS to log in.\n"
 msgstr ""
 

-#: src/imap.c:2560
+#: src/imap.c:2551

 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 

-#: src/imap.c:2565
+#: src/imap.c:2556

 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without OpenSSL support.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Connection to %s failed: server requires TLS, but Claws Mail has been "
 "compiled without OpenSSL support.\n"
 msgstr ""
 

-#: src/imap.c:2573
+#: src/imap.c:2564

 msgid "Server logins are disabled.\n"
 msgstr ""
 
 msgid "Server logins are disabled.\n"
 msgstr ""
 

-#: src/imap.c:2751
+#: src/imap.c:2742

 msgid "Fetching message..."
 msgstr ""
 
 msgid "Fetching message..."
 msgstr ""
 

-#: src/imap.c:2918
+#: src/imap.c:2909

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 

-#: src/imap.c:2948
+#: src/imap.c:2939

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
 

-#: src/imap.c:2992
+#: src/imap.c:2983

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr ""
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr ""
 

-#: src/imap.c:3657
+#: src/imap.c:3650

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 

-#: src/imap.c:4382
+#: src/imap.c:4376

 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 "
 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 "


@@ -4240,66 +4296,70 @@ msgstr ""
 msgid "/Create _new folder..."
 msgstr ""
 
 msgid "/Create _new folder..."
 msgstr ""
 

-#: src/imap_gtk.c:56 src/mh_gtk.c:51
+#: src/imap_gtk.c:57 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr ""
 
 msgid "/_Rename folder..."
 msgstr ""
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:58 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr ""
 
 msgid "/M_ove folder..."
 msgstr ""
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:59 src/mh_gtk.c:54
+msgid "/Cop_y folder..."
+msgstr ""
+
+#: src/imap_gtk.c:61 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr ""
 
 msgid "/_Delete folder..."
 msgstr ""
 

-#: src/imap_gtk.c:60 src/news_gtk.c:55
+#: src/imap_gtk.c:63 src/news_gtk.c:55

 msgid "/Synchronise"
 msgstr ""
 
 msgid "/Synchronise"
 msgstr ""
 

-#: src/imap_gtk.c:61 src/news_gtk.c:56
+#: src/imap_gtk.c:64 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr ""
 
 msgid "/Down_load messages"
 msgstr ""
 

-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:58
+#: src/imap_gtk.c:66 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr ""
 
 msgid "/_Check for new messages"
 msgstr ""
 

-#: src/imap_gtk.c:64 src/mh_gtk.c:56
+#: src/imap_gtk.c:67 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr ""
 
 msgid "/C_heck for new folders"
 msgstr ""
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:57
+#: src/imap_gtk.c:68 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr ""
 
 msgid "/R_ebuild folder tree"
 msgstr ""
 

-#: src/imap_gtk.c:135
+#: src/imap_gtk.c:140

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 "and no mails, append '/' at the end of the name)"
 msgstr ""
 
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 "and no mails, append '/' at the end of the name)"
 msgstr ""
 

-#: src/imap_gtk.c:193 src/mh_gtk.c:228
+#: src/imap_gtk.c:198 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 

-#: src/imap_gtk.c:195 src/mh_gtk.c:230
+#: src/imap_gtk.c:200 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr ""
 
 msgid "Rename folder"
 msgstr ""
 

-#: src/imap_gtk.c:204 src/imap_gtk.c:209
+#: src/imap_gtk.c:209 src/imap_gtk.c:214

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr ""
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr ""
 

-#: src/imap_gtk.c:226 src/mh_gtk.c:255
+#: src/imap_gtk.c:231 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgstr ""
 
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgstr ""
 

-#: src/imap_gtk.c:280 src/mh_gtk.c:176
+#: src/imap_gtk.c:283 src/mh_gtk.c:179

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -4308,12 +4368,12 @@ msgid ""
 "Do you really want to delete?"
 msgstr ""
 
 "Do you really want to delete?"
 msgstr ""
 

-#: src/imap_gtk.c:302 src/mh_gtk.c:198 src/news_gtk.c:238
+#: src/imap_gtk.c:305 src/mh_gtk.c:201 src/news_gtk.c:241

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr ""
 

-#: src/imap_gtk.c:362 src/news_gtk.c:299
+#: src/imap_gtk.c:365 src/news_gtk.c:302

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr ""
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr ""


@@ -4749,18 +4809,6 @@ msgid ""
 "available. This will cause crashes. You need to recompile Claws Mail."
 msgstr ""
 
 "available. This will cause crashes. You need to recompile Claws Mail."
 msgstr ""
 

-#: src/main.c:610
-msgid "Sylpheed-Claws 2.6.0"
-msgstr ""
-
-#: src/main.c:612
-msgid "Sylpheed-Claws 1.9.15"
-msgstr ""
-
-#: src/main.c:614
-msgid "Sylpheed-Claws 1.0.5"
-msgstr ""
-

 #: src/main.c:810
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 #: src/main.c:810
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "


@@ -4826,7 +4874,7 @@ msgstr ""
 #: src/main.c:1087
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 #: src/main.c:1087
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"

-"                         folder is a folder id like '#mh/Mailbox/inbox'"
+"                         folder is a folder id like 'folder/sub_folder'"

 msgstr ""
 
 #: src/main.c:1089
 msgstr ""
 
 #: src/main.c:1089


@@ -4894,975 +4942,960 @@ msgstr ""
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 

-#: src/mainwindow.c:496 src/messageview.c:158
+#: src/mainwindow.c:497 src/messageview.c:158

 msgid "/_File"
 msgstr ""
 
 msgid "/_File"
 msgstr ""
 

-#: src/mainwindow.c:497
+#: src/mainwindow.c:498

 msgid "/_File/_Add mailbox"
 msgstr ""
 
 msgid "/_File/_Add mailbox"
 msgstr ""
 

-#: src/mainwindow.c:498
+#: src/mainwindow.c:499

 msgid "/_File/_Add mailbox/MH..."
 msgstr ""
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr ""
 

-#: src/mainwindow.c:499 src/mainwindow.c:501 src/mainwindow.c:506
-#: src/mainwindow.c:508 src/mainwindow.c:511 src/mainwindow.c:514
+#: src/mainwindow.c:500 src/mainwindow.c:502 src/mainwindow.c:507
+#: src/mainwindow.c:509 src/mainwindow.c:512 src/mainwindow.c:515

 #: src/messageview.c:161
 msgid "/_File/---"
 msgstr ""
 
 #: src/messageview.c:161
 msgid "/_File/---"
 msgstr ""
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:501

 msgid "/_File/Change folder order..."
 msgstr ""
 
 msgid "/_File/Change folder order..."
 msgstr ""
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:503

 msgid "/_File/_Import mbox file..."
 msgstr ""
 
 msgid "/_File/_Import mbox file..."
 msgstr ""
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:504

 msgid "/_File/_Export to mbox file..."
 msgstr ""
 
 msgid "/_File/_Export to mbox file..."
 msgstr ""
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:505

 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr ""
 
 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr ""
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:508

 msgid "/_File/Empty all _Trash folders"
 msgid "/_File/Empty all _Trash folders"

-msgstr ""
+msgstr "/_File/Empty all Was_tebin folders"

 
 

-#: src/mainwindow.c:509 src/messageview.c:159
+#: src/mainwindow.c:510 src/messageview.c:159

 msgid "/_File/_Save as..."
 msgstr ""
 
 msgid "/_File/_Save as..."
 msgstr ""
 

-#: src/mainwindow.c:510 src/messageview.c:160
+#: src/mainwindow.c:511 src/messageview.c:160

 msgid "/_File/_Print..."
 msgstr ""
 
 msgid "/_File/_Print..."
 msgstr ""
 

-#: src/mainwindow.c:512
+#: src/mainwindow.c:513

 msgid "/_File/_Work offline"
 msgstr ""
 
 msgid "/_File/_Work offline"
 msgstr ""
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:514

 msgid "/_File/Synchronise folders"
 msgstr ""
 
 msgid "/_File/Synchronise folders"
 msgstr ""
 

-#: src/mainwindow.c:516
+#: src/mainwindow.c:517

 msgid "/_File/E_xit"
 msgstr ""
 
 msgid "/_File/E_xit"
 msgstr ""
 

-#: src/mainwindow.c:521
+#: src/mainwindow.c:522

 msgid "/_Edit/Select _thread"
 msgstr ""
 
 msgid "/_Edit/Select _thread"
 msgstr ""
 

-#: src/mainwindow.c:523 src/messageview.c:168
+#: src/mainwindow.c:524 src/messageview.c:168

 msgid "/_Edit/_Find in current message..."
 msgstr ""
 
 msgid "/_Edit/_Find in current message..."
 msgstr ""
 

-#: src/mainwindow.c:525
+#: src/mainwindow.c:526

 msgid "/_Edit/_Search folder..."
 msgstr ""
 
 msgid "/_Edit/_Search folder..."
 msgstr ""
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:527

 msgid "/_Edit/_Quick search"
 msgstr ""
 
 msgid "/_Edit/_Quick search"
 msgstr ""
 

-#: src/mainwindow.c:527 src/messageview.c:171 src/summaryview.c:472
+#: src/mainwindow.c:528 src/messageview.c:171 src/summaryview.c:472

 msgid "/_View"
 msgstr ""
 
 msgid "/_View"
 msgstr ""
 

-#: src/mainwindow.c:528
+#: src/mainwindow.c:529

 msgid "/_View/Show or hi_de"
 msgstr ""
 
 msgid "/_View/Show or hi_de"
 msgstr ""
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:530

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr ""
 

-#: src/mainwindow.c:531
+#: src/mainwindow.c:532

 msgid "/_View/Show or hi_de/_Message view"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr ""
 

-#: src/mainwindow.c:533
+#: src/mainwindow.c:534

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr ""
 

-#: src/mainwindow.c:535
+#: src/mainwindow.c:536

 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr ""
 

-#: src/mainwindow.c:537
+#: src/mainwindow.c:538

 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr ""
 

-#: src/mainwindow.c:539
+#: src/mainwindow.c:540

 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr ""
 

-#: src/mainwindow.c:541
+#: src/mainwindow.c:542

 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr ""
 

-#: src/mainwindow.c:543
+#: src/mainwindow.c:544

 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr ""
 
 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr ""
 

-#: src/mainwindow.c:545
+#: src/mainwindow.c:546

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr ""
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr ""
 

-#: src/mainwindow.c:547
+#: src/mainwindow.c:548

 msgid "/_View/Set displayed _columns"
 msgstr ""
 
 msgid "/_View/Set displayed _columns"
 msgstr ""
 

-#: src/mainwindow.c:548
+#: src/mainwindow.c:549

 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr ""
 
 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr ""
 

-#: src/mainwindow.c:549
+#: src/mainwindow.c:550

 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr ""
 
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr ""
 

-#: src/mainwindow.c:551 src/mainwindow.c:554 src/mainwindow.c:582
-#: src/mainwindow.c:612 src/mainwindow.c:729 src/mainwindow.c:737
+#: src/mainwindow.c:552 src/mainwindow.c:555 src/mainwindow.c:583
+#: src/mainwindow.c:613 src/mainwindow.c:730 src/mainwindow.c:738

 #: src/messageview.c:277
 msgid "/_View/---"
 msgstr ""
 
 #: src/messageview.c:277
 msgid "/_View/---"
 msgstr ""
 

-#: src/mainwindow.c:552
+#: src/mainwindow.c:553

 msgid "/_View/Separate f_older tree"
 msgstr ""
 
 msgid "/_View/Separate f_older tree"
 msgstr ""
 

-#: src/mainwindow.c:553
+#: src/mainwindow.c:554

 msgid "/_View/Separate _message view"
 msgstr ""
 
 msgid "/_View/Separate _message view"
 msgstr ""
 

-#: src/mainwindow.c:555
+#: src/mainwindow.c:556

 msgid "/_View/_Sort"
 msgstr ""
 
 msgid "/_View/_Sort"
 msgstr ""
 

-#: src/mainwindow.c:556
+#: src/mainwindow.c:557

 msgid "/_View/_Sort/by _number"
 msgstr ""
 
 msgid "/_View/_Sort/by _number"
 msgstr ""
 

-#: src/mainwindow.c:557
+#: src/mainwindow.c:558

 msgid "/_View/_Sort/by S_ize"
 msgstr ""
 
 msgid "/_View/_Sort/by S_ize"
 msgstr ""
 

-#: src/mainwindow.c:558
+#: src/mainwindow.c:559

 msgid "/_View/_Sort/by _Date"
 msgstr ""
 
 msgid "/_View/_Sort/by _Date"
 msgstr ""
 

-#: src/mainwindow.c:559
+#: src/mainwindow.c:560

 msgid "/_View/_Sort/by _From"
 msgstr ""
 
 msgid "/_View/_Sort/by _From"
 msgstr ""
 

-#: src/mainwindow.c:560
+#: src/mainwindow.c:561

 msgid "/_View/_Sort/by _To"
 msgstr ""
 
 msgid "/_View/_Sort/by _To"
 msgstr ""
 

-#: src/mainwindow.c:561
+#: src/mainwindow.c:562

 msgid "/_View/_Sort/by S_ubject"
 msgstr ""
 
 msgid "/_View/_Sort/by S_ubject"
 msgstr ""
 

-#: src/mainwindow.c:562
+#: src/mainwindow.c:563

 msgid "/_View/_Sort/by _color label"
 msgstr "/_View/_Sort/by _colour label"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/_View/_Sort/by _colour label"
 

-#: src/mainwindow.c:564
+#: src/mainwindow.c:565

 msgid "/_View/_Sort/by _mark"
 msgstr ""
 
 msgid "/_View/_Sort/by _mark"
 msgstr ""
 

-#: src/mainwindow.c:565
+#: src/mainwindow.c:566

 msgid "/_View/_Sort/by _status"
 msgstr ""
 
 msgid "/_View/_Sort/by _status"
 msgstr ""
 

-#: src/mainwindow.c:566
+#: src/mainwindow.c:567

 msgid "/_View/_Sort/by a_ttachment"
 msgstr ""
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr ""
 

-#: src/mainwindow.c:568
+#: src/mainwindow.c:569

 msgid "/_View/_Sort/by score"
 msgstr ""
 
 msgid "/_View/_Sort/by score"
 msgstr ""
 

-#: src/mainwindow.c:569
+#: src/mainwindow.c:570

 msgid "/_View/_Sort/by locked"
 msgstr ""
 
 msgid "/_View/_Sort/by locked"
 msgstr ""
 

-#: src/mainwindow.c:570
+#: src/mainwindow.c:571

 msgid "/_View/_Sort/D_on't sort"
 msgstr ""
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr ""
 

-#: src/mainwindow.c:571 src/mainwindow.c:574
+#: src/mainwindow.c:572 src/mainwindow.c:575

 msgid "/_View/_Sort/---"
 msgstr ""
 
 msgid "/_View/_Sort/---"
 msgstr ""
 

-#: src/mainwindow.c:572
+#: src/mainwindow.c:573

 msgid "/_View/_Sort/Ascending"
 msgstr ""
 
 msgid "/_View/_Sort/Ascending"
 msgstr ""
 

-#: src/mainwindow.c:573
+#: src/mainwindow.c:574

 msgid "/_View/_Sort/Descending"
 msgstr ""
 
 msgid "/_View/_Sort/Descending"
 msgstr ""
 

-#: src/mainwindow.c:575
+#: src/mainwindow.c:576

 msgid "/_View/_Sort/_Attract by subject"
 msgstr ""
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr ""
 

-#: src/mainwindow.c:577
+#: src/mainwindow.c:578

 msgid "/_View/Th_read view"
 msgstr ""
 
 msgid "/_View/Th_read view"
 msgstr ""
 

-#: src/mainwindow.c:578
+#: src/mainwindow.c:579

 msgid "/_View/E_xpand all threads"
 msgstr ""
 
 msgid "/_View/E_xpand all threads"
 msgstr ""
 

-#: src/mainwindow.c:579
+#: src/mainwindow.c:580

 msgid "/_View/Co_llapse all threads"
 msgstr ""
 
 msgid "/_View/Co_llapse all threads"
 msgstr ""
 

-#: src/mainwindow.c:580
+#: src/mainwindow.c:581

 msgid "/_View/_Hide read messages"
 msgstr ""
 
 msgid "/_View/_Hide read messages"
 msgstr ""
 

-#: src/mainwindow.c:583
+#: src/mainwindow.c:584

 msgid "/_View/_Go to"
 msgstr ""
 
 msgid "/_View/_Go to"
 msgstr ""
 

-#: src/mainwindow.c:584
+#: src/mainwindow.c:585

 msgid "/_View/_Go to/_Previous message"
 msgstr ""
 
 msgid "/_View/_Go to/_Previous message"
 msgstr ""
 

-#: src/mainwindow.c:585
+#: src/mainwindow.c:586

 msgid "/_View/_Go to/_Next message"
 msgstr ""
 
 msgid "/_View/_Go to/_Next message"
 msgstr ""
 

-#: src/mainwindow.c:586 src/mainwindow.c:591 src/mainwindow.c:594
-#: src/mainwindow.c:599 src/mainwindow.c:604 src/mainwindow.c:609
+#: src/mainwindow.c:587 src/mainwindow.c:592 src/mainwindow.c:595
+#: src/mainwindow.c:600 src/mainwindow.c:605 src/mainwindow.c:610

 msgid "/_View/_Go to/---"
 msgstr ""
 
 msgid "/_View/_Go to/---"
 msgstr ""
 

-#: src/mainwindow.c:587
+#: src/mainwindow.c:588

 msgid "/_View/_Go to/P_revious unread message"
 msgstr ""
 
 msgid "/_View/_Go to/P_revious unread message"
 msgstr ""
 

-#: src/mainwindow.c:589
+#: src/mainwindow.c:590

 msgid "/_View/_Go to/N_ext unread message"
 msgstr ""
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr ""
 

-#: src/mainwindow.c:592
+#: src/mainwindow.c:593

 msgid "/_View/_Go to/Previous ne_w message"
 msgstr ""
 
 msgid "/_View/_Go to/Previous ne_w message"
 msgstr ""
 

-#: src/mainwindow.c:593
+#: src/mainwindow.c:594

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr ""
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr ""
 

-#: src/mainwindow.c:595
+#: src/mainwindow.c:596

 msgid "/_View/_Go to/Previous _marked message"
 msgstr ""
 
 msgid "/_View/_Go to/Previous _marked message"
 msgstr ""
 

-#: src/mainwindow.c:597
+#: src/mainwindow.c:598

 msgid "/_View/_Go to/Next m_arked message"
 msgstr ""
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr ""
 

-#: src/mainwindow.c:600
+#: src/mainwindow.c:601

 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/_View/_Go to/Previous _labelled message"
 
 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/_View/_Go to/Previous _labelled message"
 

-#: src/mainwindow.c:602
+#: src/mainwindow.c:603

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_View/_Go to/Next la_belled message"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_View/_Go to/Next la_belled message"
 

-#: src/mainwindow.c:605
+#: src/mainwindow.c:606

 msgid "/_View/_Go to/Last read message"
 msgstr ""
 
 msgid "/_View/_Go to/Last read message"
 msgstr ""
 

-#: src/mainwindow.c:607
+#: src/mainwindow.c:608

 msgid "/_View/_Go to/Parent message"
 msgstr ""
 
 msgid "/_View/_Go to/Parent message"
 msgstr ""
 

-#: src/mainwindow.c:610
+#: src/mainwindow.c:611

 msgid "/_View/_Go to/Next unread _folder"
 msgstr ""
 
 msgid "/_View/_Go to/Next unread _folder"
 msgstr ""
 

-#: src/mainwindow.c:611
+#: src/mainwindow.c:612

 msgid "/_View/_Go to/_Other folder..."
 msgstr ""
 
 msgid "/_View/_Go to/_Other folder..."
 msgstr ""
 

-#: src/mainwindow.c:615 src/mainwindow.c:622 src/messageview.c:174
+#: src/mainwindow.c:616 src/mainwindow.c:623 src/messageview.c:174

 msgid "/_View/Character _encoding/---"
 msgstr ""
 
 msgid "/_View/Character _encoding/---"
 msgstr ""
 

-#: src/mainwindow.c:619 src/messageview.c:178
+#: src/mainwindow.c:620 src/messageview.c:178

 msgid "/_View/Character _encoding"
 msgstr ""
 
 msgid "/_View/Character _encoding"
 msgstr ""
 

-#: src/mainwindow.c:620 src/messageview.c:179
+#: src/mainwindow.c:621 src/messageview.c:179

 msgid "/_View/Character _encoding/_Auto detect"
 msgstr ""
 
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr ""
 

-#: src/mainwindow.c:623 src/messageview.c:182
+#: src/mainwindow.c:624 src/messageview.c:182

 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr ""
 
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr ""
 

-#: src/mainwindow.c:625 src/messageview.c:185
+#: src/mainwindow.c:626 src/messageview.c:185

 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr ""
 

-#: src/mainwindow.c:629 src/messageview.c:188
+#: src/mainwindow.c:630 src/messageview.c:188

 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr ""
 

-#: src/mainwindow.c:631 src/messageview.c:190
+#: src/mainwindow.c:632 src/messageview.c:190

 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr ""
 

-#: src/mainwindow.c:633 src/messageview.c:192
+#: src/mainwindow.c:634 src/messageview.c:192

 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr ""
 

-#: src/mainwindow.c:637 src/messageview.c:195
+#: src/mainwindow.c:638 src/messageview.c:195

 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr ""
 

-#: src/mainwindow.c:641 src/messageview.c:198
+#: src/mainwindow.c:642 src/messageview.c:198

 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr ""
 
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr ""
 

-#: src/mainwindow.c:643 src/messageview.c:200
+#: src/mainwindow.c:644 src/messageview.c:200

 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr ""
 

-#: src/mainwindow.c:647 src/messageview.c:203
+#: src/mainwindow.c:648 src/messageview.c:203

 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr ""
 

-#: src/mainwindow.c:651 src/messageview.c:206
+#: src/mainwindow.c:652 src/messageview.c:206

 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr ""
 

-#: src/mainwindow.c:653 src/messageview.c:208
+#: src/mainwindow.c:654 src/messageview.c:208

 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr ""
 

-#: src/mainwindow.c:657 src/messageview.c:211
+#: src/mainwindow.c:658 src/messageview.c:211

 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr ""
 

-#: src/mainwindow.c:659 src/messageview.c:213
+#: src/mainwindow.c:660 src/messageview.c:213

 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr ""
 

-#: src/mainwindow.c:663 src/messageview.c:216
+#: src/mainwindow.c:664 src/messageview.c:216

 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr ""
 

-#: src/mainwindow.c:667 src/messageview.c:219
+#: src/mainwindow.c:668 src/messageview.c:219

 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr ""
 

-#: src/mainwindow.c:669 src/messageview.c:221
+#: src/mainwindow.c:670 src/messageview.c:221

 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr ""
 

-#: src/mainwindow.c:671 src/messageview.c:223
+#: src/mainwindow.c:672 src/messageview.c:223

 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr ""
 

-#: src/mainwindow.c:673 src/messageview.c:225
+#: src/mainwindow.c:674 src/messageview.c:225

 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr ""
 

-#: src/mainwindow.c:677 src/messageview.c:228
+#: src/mainwindow.c:678 src/messageview.c:228

 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr ""
 

-#: src/mainwindow.c:679 src/messageview.c:230
+#: src/mainwindow.c:680 src/messageview.c:230

 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr ""
 

-#: src/mainwindow.c:681 src/messageview.c:232
+#: src/mainwindow.c:682 src/messageview.c:232

 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr ""
 

-#: src/mainwindow.c:683 src/messageview.c:234
+#: src/mainwindow.c:684 src/messageview.c:234

 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr ""
 

-#: src/mainwindow.c:687 src/messageview.c:237
+#: src/mainwindow.c:688 src/messageview.c:237

 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr ""
 

-#: src/mainwindow.c:689 src/messageview.c:239
+#: src/mainwindow.c:690 src/messageview.c:239

 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr ""
 

-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:692 src/messageview.c:241

 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr ""
 

-#: src/mainwindow.c:693 src/messageview.c:243
+#: src/mainwindow.c:694 src/messageview.c:243

 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr ""
 

-#: src/mainwindow.c:695 src/messageview.c:245
+#: src/mainwindow.c:696 src/messageview.c:245

 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr ""
 

-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:700 src/messageview.c:248

 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr ""
 

-#: src/mainwindow.c:701 src/messageview.c:250
+#: src/mainwindow.c:702 src/messageview.c:250

 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr ""
 

-#: src/mainwindow.c:705 src/messageview.c:253
+#: src/mainwindow.c:706 src/messageview.c:253

 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr ""
 

-#: src/mainwindow.c:707 src/messageview.c:255
+#: src/mainwindow.c:708 src/messageview.c:255

 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr ""
 
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr ""
 

-#: src/mainwindow.c:714 src/mainwindow.c:720 src/messageview.c:262
+#: src/mainwindow.c:715 src/mainwindow.c:721 src/messageview.c:262

 #: src/messageview.c:268
 msgid "/_View/Decode/---"
 msgstr ""
 
 #: src/messageview.c:268
 msgid "/_View/Decode/---"
 msgstr ""
 

-#: src/mainwindow.c:717 src/messageview.c:265
+#: src/mainwindow.c:718 src/messageview.c:265

 msgid "/_View/Decode"
 msgstr ""
 
 msgid "/_View/Decode"
 msgstr ""
 

-#: src/mainwindow.c:718 src/messageview.c:266
+#: src/mainwindow.c:719 src/messageview.c:266

 msgid "/_View/Decode/_Auto detect"
 msgstr ""
 
 msgid "/_View/Decode/_Auto detect"
 msgstr ""
 

-#: src/mainwindow.c:721 src/messageview.c:269
+#: src/mainwindow.c:722 src/messageview.c:269

 msgid "/_View/Decode/_8bit"
 msgstr ""
 
 msgid "/_View/Decode/_8bit"
 msgstr ""
 

-#: src/mainwindow.c:722 src/messageview.c:270
+#: src/mainwindow.c:723 src/messageview.c:270

 msgid "/_View/Decode/_Quoted printable"
 msgstr ""
 
 msgid "/_View/Decode/_Quoted printable"
 msgstr ""
 

-#: src/mainwindow.c:723 src/messageview.c:271
+#: src/mainwindow.c:724 src/messageview.c:271

 msgid "/_View/Decode/_Base64"
 msgstr ""
 
 msgid "/_View/Decode/_Base64"
 msgstr ""
 

-#: src/mainwindow.c:724 src/messageview.c:272
+#: src/mainwindow.c:725 src/messageview.c:272

 msgid "/_View/Decode/_Uuencode"
 msgstr ""
 
 msgid "/_View/Decode/_Uuencode"
 msgstr ""
 

-#: src/mainwindow.c:730 src/summaryview.c:473
+#: src/mainwindow.c:731 src/summaryview.c:473

 msgid "/_View/Open in new _window"
 msgstr ""
 
 msgid "/_View/Open in new _window"
 msgstr ""
 

-#: src/mainwindow.c:731 src/messageview.c:278
+#: src/mainwindow.c:732 src/messageview.c:278

 msgid "/_View/Mess_age source"
 msgstr ""
 
 msgid "/_View/Mess_age source"
 msgstr ""
 

-#: src/mainwindow.c:732
+#: src/mainwindow.c:733

 msgid "/_View/All headers"
 msgstr ""
 
 msgid "/_View/All headers"
 msgstr ""
 

-#: src/mainwindow.c:733 src/messageview.c:280
+#: src/mainwindow.c:734 src/messageview.c:280

 msgid "/_View/Quotes"
 msgstr ""
 
 msgid "/_View/Quotes"
 msgstr ""
 

-#: src/mainwindow.c:734 src/messageview.c:281
+#: src/mainwindow.c:735 src/messageview.c:281

 msgid "/_View/Quotes/_Fold all"
 msgstr ""
 
 msgid "/_View/Quotes/_Fold all"
 msgstr ""
 

-#: src/mainwindow.c:735 src/messageview.c:282
+#: src/mainwindow.c:736 src/messageview.c:282

 msgid "/_View/Quotes/Fold from level _2"
 msgstr ""
 
 msgid "/_View/Quotes/Fold from level _2"
 msgstr ""
 

-#: src/mainwindow.c:736 src/messageview.c:283
+#: src/mainwindow.c:737 src/messageview.c:283

 msgid "/_View/Quotes/Fold from level _3"
 msgstr ""
 
 msgid "/_View/Quotes/Fold from level _3"
 msgstr ""
 

-#: src/mainwindow.c:738
+#: src/mainwindow.c:739

 msgid "/_View/_Update summary"
 msgstr ""
 
 msgid "/_View/_Update summary"
 msgstr ""
 

-#: src/mainwindow.c:741
+#: src/mainwindow.c:742

 msgid "/_Message/Recei_ve"
 msgstr ""
 
 msgid "/_Message/Recei_ve"
 msgstr ""
 

-#: src/mainwindow.c:742
+#: src/mainwindow.c:743

 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr ""
 
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr ""
 

-#: src/mainwindow.c:744
+#: src/mainwindow.c:745

 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr ""
 
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr ""
 

-#: src/mainwindow.c:746
+#: src/mainwindow.c:747

 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr ""
 
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr ""
 

-#: src/mainwindow.c:748
+#: src/mainwindow.c:749

 msgid "/_Message/Recei_ve/---"
 msgstr ""
 
 msgid "/_Message/Recei_ve/---"
 msgstr ""
 

-#: src/mainwindow.c:749
+#: src/mainwindow.c:750

 msgid "/_Message/_Send queued messages"
 msgstr ""
 
 msgid "/_Message/_Send queued messages"
 msgstr ""
 

-#: src/mainwindow.c:751
+#: src/mainwindow.c:752

 msgid "/_Message/Compose a_n email message"
 msgstr ""
 
 msgid "/_Message/Compose a_n email message"
 msgstr ""
 

-#: src/mainwindow.c:752
+#: src/mainwindow.c:753

 msgid "/_Message/Compose a news message"
 msgstr ""
 
 msgid "/_Message/Compose a news message"
 msgstr ""
 

-#: src/mainwindow.c:753 src/messageview.c:289
+#: src/mainwindow.c:754 src/messageview.c:289

 msgid "/_Message/_Reply"
 msgstr ""
 
 msgid "/_Message/_Reply"
 msgstr ""
 

-#: src/mainwindow.c:754
+#: src/mainwindow.c:755

 msgid "/_Message/Repl_y to"
 msgstr ""
 
 msgid "/_Message/Repl_y to"
 msgstr ""
 

-#: src/mainwindow.c:755 src/messageview.c:290
+#: src/mainwindow.c:756 src/messageview.c:290

 msgid "/_Message/Repl_y to/_all"
 msgstr ""
 
 msgid "/_Message/Repl_y to/_all"
 msgstr ""
 

-#: src/mainwindow.c:756 src/messageview.c:292
+#: src/mainwindow.c:757 src/messageview.c:292

 msgid "/_Message/Repl_y to/_sender"
 msgstr ""
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr ""
 

-#: src/mainwindow.c:757 src/messageview.c:294
+#: src/mainwindow.c:758 src/messageview.c:294

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr ""
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr ""
 

-#: src/mainwindow.c:759
+#: src/mainwindow.c:760

 msgid "/_Message/Follow-up and reply to"
 msgstr ""
 
 msgid "/_Message/Follow-up and reply to"
 msgstr ""
 

-#: src/mainwindow.c:761 src/messageview.c:297
+#: src/mainwindow.c:762 src/messageview.c:297

 msgid "/_Message/_Forward"
 msgstr ""
 
 msgid "/_Message/_Forward"
 msgstr ""
 

-#: src/mainwindow.c:762 src/messageview.c:298
+#: src/mainwindow.c:763 src/messageview.c:298

 msgid "/_Message/For_ward as attachment"
 msgstr ""
 
 msgid "/_Message/For_ward as attachment"
 msgstr ""
 

-#: src/mainwindow.c:763
+#: src/mainwindow.c:764

 msgid "/_Message/Redirect"
 msgstr ""
 
 msgid "/_Message/Redirect"
 msgstr ""
 

-#: src/mainwindow.c:765
+#: src/mainwindow.c:766

 msgid "/_Message/Mailing-_List"
 msgstr ""
 
 msgid "/_Message/Mailing-_List"
 msgstr ""
 

-#: src/mainwindow.c:766
+#: src/mainwindow.c:767

 msgid "/_Message/Mailing-_List/Post"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Post"
 msgstr ""
 

-#: src/mainwindow.c:767
+#: src/mainwindow.c:768

 msgid "/_Message/Mailing-_List/Help"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Help"
 msgstr ""
 

-#: src/mainwindow.c:768
+#: src/mainwindow.c:769

 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr ""
 

-#: src/mainwindow.c:769
+#: src/mainwindow.c:770

 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr ""
 

-#: src/mainwindow.c:770
+#: src/mainwindow.c:771

 msgid "/_Message/Mailing-_List/View archive"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/View archive"
 msgstr ""
 

-#: src/mainwindow.c:771
+#: src/mainwindow.c:772

 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr ""
 
 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr ""
 

-#: src/mainwindow.c:774
+#: src/mainwindow.c:775

 msgid "/_Message/M_ove..."
 msgstr ""
 
 msgid "/_Message/M_ove..."
 msgstr ""
 

-#: src/mainwindow.c:775
+#: src/mainwindow.c:776

 msgid "/_Message/_Copy..."
 msgstr ""
 
 msgid "/_Message/_Copy..."
 msgstr ""
 

-#: src/mainwindow.c:776
+#: src/mainwindow.c:777

 msgid "/_Message/Move to _trash"
 msgid "/_Message/Move to _trash"

-msgstr ""
+msgstr "/_Message/Move to was_tebin"

 
 

-#: src/mainwindow.c:777
+#: src/mainwindow.c:778

 msgid "/_Message/_Delete..."
 msgstr ""
 
 msgid "/_Message/_Delete..."
 msgstr ""
 

-#: src/mainwindow.c:778
+#: src/mainwindow.c:779

 msgid "/_Message/Cancel a news message"
 msgstr ""
 
 msgid "/_Message/Cancel a news message"
 msgstr ""
 

-#: src/mainwindow.c:780
+#: src/mainwindow.c:781

 msgid "/_Message/_Mark"
 msgstr ""
 
 msgid "/_Message/_Mark"
 msgstr ""
 

-#: src/mainwindow.c:781
+#: src/mainwindow.c:782

 msgid "/_Message/_Mark/_Mark"
 msgstr ""
 
 msgid "/_Message/_Mark/_Mark"
 msgstr ""
 

-#: src/mainwindow.c:782
+#: src/mainwindow.c:783

 msgid "/_Message/_Mark/_Unmark"
 msgstr ""
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr ""
 

-#: src/mainwindow.c:783 src/mainwindow.c:789 src/mainwindow.c:792
+#: src/mainwindow.c:784 src/mainwindow.c:790 src/mainwindow.c:793

 msgid "/_Message/_Mark/---"
 msgstr ""
 
 msgid "/_Message/_Mark/---"
 msgstr ""
 

-#: src/mainwindow.c:784
+#: src/mainwindow.c:785

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr ""
 

-#: src/mainwindow.c:785
+#: src/mainwindow.c:786

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr ""
 

-#: src/mainwindow.c:786
+#: src/mainwindow.c:787

 msgid "/_Message/_Mark/Mark all _read"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr ""
 

-#: src/mainwindow.c:787
+#: src/mainwindow.c:788

 msgid "/_Message/_Mark/Ignore thread"
 msgstr ""
 
 msgid "/_Message/_Mark/Ignore thread"
 msgstr ""
 

-#: src/mainwindow.c:788
+#: src/mainwindow.c:789

 msgid "/_Message/_Mark/Unignore thread"
 msgstr ""
 
 msgid "/_Message/_Mark/Unignore thread"
 msgstr ""
 

-#: src/mainwindow.c:790
+#: src/mainwindow.c:791

 msgid "/_Message/_Mark/Mark as _spam"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark as _spam"
 msgstr ""
 

-#: src/mainwindow.c:791
+#: src/mainwindow.c:792

 msgid "/_Message/_Mark/Mark as _ham"
 msgstr ""
 
 msgid "/_Message/_Mark/Mark as _ham"
 msgstr ""
 

-#: src/mainwindow.c:793
+#: src/mainwindow.c:794

 msgid "/_Message/_Mark/Lock"
 msgstr ""
 
 msgid "/_Message/_Mark/Lock"
 msgstr ""
 

-#: src/mainwindow.c:794
+#: src/mainwindow.c:795

 msgid "/_Message/_Mark/Unlock"
 msgstr ""
 
 msgid "/_Message/_Mark/Unlock"
 msgstr ""
 

-#: src/mainwindow.c:795
+#: src/mainwindow.c:796

 msgid "/_Message/Color la_bel"
 msgstr "/_Message/Colour la_bel"
 
 msgid "/_Message/Color la_bel"
 msgstr "/_Message/Colour la_bel"
 

-#: src/mainwindow.c:797
+#: src/mainwindow.c:798

 msgid "/_Message/Re-_edit"
 msgstr ""
 
 msgid "/_Message/Re-_edit"
 msgstr ""
 

-#: src/mainwindow.c:800
+#: src/mainwindow.c:801

 msgid "/_Tools/_Address book..."
 msgstr ""
 
 msgid "/_Tools/_Address book..."
 msgstr ""
 

-#: src/mainwindow.c:801 src/messageview.c:304
+#: src/mainwindow.c:802 src/messageview.c:304

 msgid "/_Tools/Add sender to address boo_k"
 msgstr ""
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr ""
 

-#: src/mainwindow.c:803
+#: src/mainwindow.c:804

 msgid "/_Tools/_Harvest addresses"
 msgstr ""
 
 msgid "/_Tools/_Harvest addresses"
 msgstr ""
 

-#: src/mainwindow.c:804
+#: src/mainwindow.c:805

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr ""
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr ""
 

-#: src/mainwindow.c:806
+#: src/mainwindow.c:807

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr ""
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr ""
 

-#: src/mainwindow.c:809
+#: src/mainwindow.c:810

 msgid "/_Tools/_Filter all messages in folder"
 msgstr ""
 
 msgid "/_Tools/_Filter all messages in folder"
 msgstr ""
 

-#: src/mainwindow.c:811
+#: src/mainwindow.c:812

 msgid "/_Tools/Filter _selected messages"
 msgstr ""
 
 msgid "/_Tools/Filter _selected messages"
 msgstr ""
 

-#: src/mainwindow.c:813 src/messageview.c:307
+#: src/mainwindow.c:814 src/messageview.c:307

 msgid "/_Tools/_Create filter rule"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule"
 msgstr ""
 

-#: src/mainwindow.c:814 src/messageview.c:309
+#: src/mainwindow.c:815 src/messageview.c:309

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr ""
 

-#: src/mainwindow.c:816 src/messageview.c:311
+#: src/mainwindow.c:817 src/messageview.c:311

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr ""
 

-#: src/mainwindow.c:818 src/messageview.c:313
+#: src/mainwindow.c:819 src/messageview.c:313

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr ""
 

-#: src/mainwindow.c:820 src/messageview.c:315
+#: src/mainwindow.c:821 src/messageview.c:315

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr ""
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr ""
 

-#: src/mainwindow.c:822
+#: src/mainwindow.c:823

 msgid "/_Tools/C_reate processing rule"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule"
 msgstr ""
 

-#: src/mainwindow.c:823
+#: src/mainwindow.c:824

 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr ""
 

-#: src/mainwindow.c:825
+#: src/mainwindow.c:826

 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr ""
 

-#: src/mainwindow.c:827
+#: src/mainwindow.c:828

 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr ""
 

-#: src/mainwindow.c:829
+#: src/mainwindow.c:830

 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr ""
 
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr ""
 

-#: src/mainwindow.c:834
+#: src/mainwindow.c:835

 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr ""
 
 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr ""
 

-#: src/mainwindow.c:836
+#: src/mainwindow.c:837

 msgid "/_Tools/Delete du_plicated messages"
 msgstr ""
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr ""
 

-#: src/mainwindow.c:838
+#: src/mainwindow.c:839

 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr ""
 
 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr ""
 

-#: src/mainwindow.c:840
+#: src/mainwindow.c:841

 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr ""
 
 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr ""
 

-#: src/mainwindow.c:843
+#: src/mainwindow.c:844

 msgid "/_Tools/E_xecute"
 msgstr ""
 
 msgid "/_Tools/E_xecute"
 msgstr ""
 

-#: src/mainwindow.c:846
+#: src/mainwindow.c:847

 msgid "/_Tools/SSL cer_tificates..."
 msgstr ""
 
 msgid "/_Tools/SSL cer_tificates..."
 msgstr ""
 

-#: src/mainwindow.c:850
+#: src/mainwindow.c:851

 msgid "/_Tools/_Log window"
 msgstr ""
 
 msgid "/_Tools/_Log window"
 msgstr ""
 

-#: src/mainwindow.c:852
+#: src/mainwindow.c:853

 msgid "/_Configuration"
 msgstr ""
 
 msgid "/_Configuration"
 msgstr ""
 

-#: src/mainwindow.c:853
+#: src/mainwindow.c:854

 msgid "/_Configuration/C_hange current account"
 msgstr ""
 
 msgid "/_Configuration/C_hange current account"
 msgstr ""
 

-#: src/mainwindow.c:855
+#: src/mainwindow.c:856

 msgid "/_Configuration/_Preferences for current account..."
 msgstr ""
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr ""
 

-#: src/mainwindow.c:857
+#: src/mainwindow.c:858

 msgid "/_Configuration/Create _new account..."
 msgstr ""
 
 msgid "/_Configuration/Create _new account..."
 msgstr ""
 

-#: src/mainwindow.c:859
+#: src/mainwindow.c:860

 msgid "/_Configuration/_Edit accounts..."
 msgstr ""
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr ""
 

-#: src/mainwindow.c:861
+#: src/mainwindow.c:862

 msgid "/_Configuration/---"
 msgstr ""
 
 msgid "/_Configuration/---"
 msgstr ""
 

-#: src/mainwindow.c:862
+#: src/mainwindow.c:863

 msgid "/_Configuration/P_references..."
 msgstr ""
 
 msgid "/_Configuration/P_references..."
 msgstr ""
 

-#: src/mainwindow.c:864
+#: src/mainwindow.c:865

 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr ""
 
 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr ""
 

-#: src/mainwindow.c:866
+#: src/mainwindow.c:867

 msgid "/_Configuration/Post-pro_cessing..."
 msgstr ""
 
 msgid "/_Configuration/Post-pro_cessing..."
 msgstr ""
 

-#: src/mainwindow.c:868
+#: src/mainwindow.c:869

 msgid "/_Configuration/_Filtering..."
 msgstr ""
 
 msgid "/_Configuration/_Filtering..."
 msgstr ""
 

-#: src/mainwindow.c:870
+#: src/mainwindow.c:871

 msgid "/_Configuration/_Templates..."
 msgstr ""
 
 msgid "/_Configuration/_Templates..."
 msgstr ""
 

-#: src/mainwindow.c:871
+#: src/mainwindow.c:872

 msgid "/_Configuration/_Actions..."
 msgstr ""
 
 msgid "/_Configuration/_Actions..."
 msgstr ""
 

-#: src/mainwindow.c:872
+#: src/mainwindow.c:873

 msgid "/_Configuration/Plu_gins..."
 msgstr ""
 
 msgid "/_Configuration/Plu_gins..."
 msgstr ""
 

-#: src/mainwindow.c:875
+#: src/mainwindow.c:876

 msgid "/_Help/_Manual"
 msgstr ""
 
 msgid "/_Help/_Manual"
 msgstr ""
 

-#: src/mainwindow.c:876
+#: src/mainwindow.c:877

 msgid "/_Help/_Online User-contributed FAQ"
 msgstr ""
 
 msgid "/_Help/_Online User-contributed FAQ"
 msgstr ""
 

-#: src/mainwindow.c:878
+#: src/mainwindow.c:879

 msgid "/_Help/Icon _Legend"
 msgstr ""
 
 msgid "/_Help/Icon _Legend"
 msgstr ""
 

-#: src/mainwindow.c:879
+#: src/mainwindow.c:880

 msgid "/_Help/---"
 msgstr ""
 
 msgid "/_Help/---"
 msgstr ""
 

-#: src/mainwindow.c:1227
+#: src/mainwindow.c:1228

 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 

-#: src/mainwindow.c:1241
+#: src/mainwindow.c:1242

 msgid "You are online. Click the icon to go offline"
 msgstr ""
 
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 

-#: src/mainwindow.c:1244
+#: src/mainwindow.c:1245

 msgid "You are offline. Click the icon to go online"
 msgstr ""
 
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 

-#: src/mainwindow.c:1260
+#: src/mainwindow.c:1261

 msgid "Select account"
 msgstr ""
 
 msgid "Select account"
 msgstr ""
 

-#: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738
-#: src/mainwindow.c:1774 src/mainwindow.c:1817
-#: src/plugins/trayicon/trayicon.c:141 src/prefs_folder_item.c:756
+#: src/mainwindow.c:1662 src/mainwindow.c:1703 src/mainwindow.c:1739
+#: src/mainwindow.c:1775 src/mainwindow.c:1818
+#: src/plugins/trayicon/trayicon.c:143 src/prefs_folder_item.c:764

 msgid "Untitled"
 msgstr ""
 
 msgid "Untitled"
 msgstr ""
 

-#: src/mainwindow.c:1818
+#: src/mainwindow.c:1819

 msgid "none"
 msgstr ""
 
 msgid "none"
 msgstr ""
 

-#: src/mainwindow.c:2080
+#: src/mainwindow.c:2081

 msgid "Delete all messages in trash folders?"
 msgid "Delete all messages in trash folders?"

-msgstr ""
+msgstr "Delete all messages in wastebin folders?"

 
 

-#: src/mainwindow.c:2099
+#: src/mainwindow.c:2100

 msgid "Add mailbox"
 msgstr ""
 
 msgid "Add mailbox"
 msgstr ""
 

-#: src/mainwindow.c:2100
+#: src/mainwindow.c:2101

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 

-#: src/mainwindow.c:2106
+#: src/mainwindow.c:2107

 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr ""
 
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr ""
 

-#: src/mainwindow.c:2111 src/setup.c:51
+#: src/mainwindow.c:2112 src/setup.c:51

 msgid "Mailbox"
 msgstr ""
 
 msgid "Mailbox"
 msgstr ""
 

-#: src/mainwindow.c:2116 src/setup.c:54
+#: src/mainwindow.c:2117 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 ""
 
 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:2432
+#: src/mainwindow.c:2437

 msgid "No posting allowed"
 msgstr ""
 
 msgid "No posting allowed"
 msgstr ""
 

-#: src/mainwindow.c:2699
+#: src/mainwindow.c:2704

 msgid "Claws Mail - Folder View"
 msgstr ""
 
 msgid "Claws Mail - Folder View"
 msgstr ""
 

-#: src/mainwindow.c:2735 src/messageview.c:449 src/messageview.c:855
+#: src/mainwindow.c:2740 src/messageview.c:449 src/messageview.c:861

 msgid "Claws Mail - Message View"
 msgstr ""
 
 msgid "Claws Mail - Message View"
 msgstr ""
 

-#: src/mainwindow.c:3085
+#: src/mainwindow.c:3090

 msgid "Mbox import has failed."
 msgstr ""
 
 msgid "Mbox import has failed."
 msgstr ""
 

-#: src/mainwindow.c:3094 src/mainwindow.c:3103
+#: src/mainwindow.c:3099 src/mainwindow.c:3108

 msgid "Export to mbox has failed."
 msgstr ""
 
 msgid "Export to mbox has failed."
 msgstr ""
 

-#: src/mainwindow.c:3126 src/plugins/trayicon/trayicon.c:478
+#: src/mainwindow.c:3131 src/plugins/trayicon/trayicon.c:474

 msgid "Exit"
 msgstr ""
 
 msgid "Exit"
 msgstr ""
 

-#: src/mainwindow.c:3126
+#: src/mainwindow.c:3131

 msgid "Exit Claws Mail?"
 msgstr ""
 
 msgid "Exit Claws Mail?"
 msgstr ""
 

-#: src/mainwindow.c:3272
+#: src/mainwindow.c:3282

 msgid "Folder synchronisation"
 msgstr ""
 
 msgid "Folder synchronisation"
 msgstr ""
 

-#: src/mainwindow.c:3273
+#: src/mainwindow.c:3283

 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 
 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 

-#: src/mainwindow.c:3274
+#: src/mainwindow.c:3284

 msgid "+_Synchronise"
 msgstr ""
 
 msgid "+_Synchronise"
 msgstr ""
 

-#: src/mainwindow.c:3605
+#: src/mainwindow.c:3615

 msgid "Deleting duplicated messages..."
 msgstr ""
 
 msgid "Deleting duplicated messages..."
 msgstr ""
 

-#: src/mainwindow.c:3642
+#: src/mainwindow.c:3652

 #, 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] ""
 
 #, 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:3801 src/summaryview.c:4775
+#: src/mainwindow.c:3811 src/summaryview.c:4783

 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 

-#: src/mainwindow.c:3810
+#: src/mainwindow.c:3820

 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 

-#: src/mainwindow.c:3819 src/summaryview.c:4786
+#: src/mainwindow.c:3829 src/summaryview.c:4794

 msgid "Filtering configuration"
 msgstr ""
 
 msgid "Filtering configuration"
 msgstr ""
 

-#: src/mainwindow.c:4073
-#, c-format
-msgid "not initialized\n"
-msgstr ""
-
-#: src/mainwindow.c:4085 src/mainwindow.c:4096
-#, c-format
-msgid "selecting folder '%s'\n"
-msgstr ""
-
-#: src/mainwindow.c:4100
-#, c-format
-msgid "selecting message %d\n"
-msgstr ""
-

 #: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
 #: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
 msgid "Filtering Matcher Menu|All"
 #: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
 #: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
 msgid "Filtering Matcher Menu|All"


@@ -5893,8 +5926,8 @@ msgstr ""
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 

-#: src/mbox.c:483 src/messageview.c:1143 src/mimeview.c:1421
-#: src/textview.c:2653
+#: src/mbox.c:483 src/messageview.c:1149 src/mimeview.c:1443
+#: src/textview.c:2654

 msgid "Overwrite"
 msgstr ""
 
 msgid "Overwrite"
 msgstr ""
 


@@ -5977,11 +6010,11 @@ msgstr ""
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr ""
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr ""
 

-#: src/messageview.c:564
+#: src/messageview.c:566

 msgid "<No Return-Path found>"
 msgstr ""
 
 msgid "<No Return-Path found>"
 msgstr ""
 

-#: src/messageview.c:572
+#: src/messageview.c:574

 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"


@@ -5991,11 +6024,11 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
 "It is advised to not to send the return receipt."
 msgstr ""
 

-#: src/messageview.c:579 src/messageview.c:596
+#: src/messageview.c:581 src/messageview.c:598

 msgid "_Don't Send"
 msgstr ""
 
 msgid "_Don't Send"
 msgstr ""
 

-#: src/messageview.c:592
+#: src/messageview.c:594

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -6003,117 +6036,117 @@ msgid ""
 "It is advised to not to send the return receipt."
 msgstr ""
 
 "It is advised to not to send the return receipt."
 msgstr ""
 

-#: src/messageview.c:809 src/procmime.c:873
+#: src/messageview.c:815 src/procmime.c:873

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 

-#: src/messageview.c:1138 src/mimeview.c:1559 src/summaryview.c:4065
-#: src/summaryview.c:4068 src/textview.c:2641
+#: src/messageview.c:1144 src/mimeview.c:1582 src/summaryview.c:4065
+#: src/summaryview.c:4068 src/textview.c:2642

 msgid "Save as"
 msgstr ""
 
 msgid "Save as"
 msgstr ""
 

-#: src/messageview.c:1144
+#: src/messageview.c:1150

 msgid "Overwrite existing file?"
 msgstr ""
 
 msgid "Overwrite existing file?"
 msgstr ""
 

-#: src/messageview.c:1152 src/summaryview.c:4085 src/summaryview.c:4088
+#: src/messageview.c:1158 src/summaryview.c:4085 src/summaryview.c:4088

 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 
 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 

-#: src/messageview.c:1233
+#: src/messageview.c:1239

 msgid "You asked for a return receipt in this message."
 msgstr ""
 
 msgid "You asked for a return receipt in this message."
 msgstr ""
 

-#: src/messageview.c:1237
+#: src/messageview.c:1243

 msgid "This message asks for a return receipt."
 msgstr ""
 
 msgid "This message asks for a return receipt."
 msgstr ""
 

-#: src/messageview.c:1238
+#: src/messageview.c:1244

 msgid "Send receipt"
 msgstr ""
 
 msgid "Send receipt"
 msgstr ""
 

-#: src/messageview.c:1281
+#: src/messageview.c:1287

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 

-#: src/messageview.c:1287
+#: src/messageview.c:1293

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
 

-#: src/messageview.c:1291 src/messageview.c:1313
+#: src/messageview.c:1297 src/messageview.c:1319

 msgid "Mark for download"
 msgstr ""
 
 msgid "Mark for download"
 msgstr ""
 

-#: src/messageview.c:1292 src/messageview.c:1304
+#: src/messageview.c:1298 src/messageview.c:1310

 msgid "Mark for deletion"
 msgstr ""
 
 msgid "Mark for deletion"
 msgstr ""
 

-#: src/messageview.c:1297
+#: src/messageview.c:1303

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
 
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
 

-#: src/messageview.c:1302 src/messageview.c:1315
+#: src/messageview.c:1308 src/messageview.c:1321

 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr ""
 
 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr ""
 

-#: src/messageview.c:1308
+#: src/messageview.c:1314

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
 
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
 

-#: src/messageview.c:1384
+#: src/messageview.c:1390

 msgid "Return Receipt Notification"
 msgstr ""
 
 msgid "Return Receipt Notification"
 msgstr ""
 

-#: src/messageview.c:1385
+#: src/messageview.c:1391

 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 ""
 
 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:1389
+#: src/messageview.c:1395

 msgid "_Send Notification"
 msgstr ""
 
 msgid "_Send Notification"
 msgstr ""
 

-#: src/messageview.c:1389
+#: src/messageview.c:1395

 msgid "+_Cancel"
 msgstr ""
 
 msgid "+_Cancel"
 msgstr ""
 

-#: src/messageview.c:1456
+#: src/messageview.c:1462

 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 

-#: src/messageview.c:1503 src/summaryview.c:4125
+#: src/messageview.c:1526 src/summaryview.c:4125

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Enter the print command line:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 

-#: src/messageview.c:1509 src/summaryview.c:4131
+#: src/messageview.c:1532 src/summaryview.c:4131

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 "'%s'"
 msgstr ""
 
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 "'%s'"
 msgstr ""
 

-#: src/messageview.c:1775 src/messageview.c:1781 src/summaryview.c:3521
-#: src/summaryview.c:5527
+#: src/messageview.c:1807 src/messageview.c:1813 src/summaryview.c:3521
+#: src/summaryview.c:5542

 msgid "An error happened while learning.\n"
 msgstr ""
 
 msgid "An error happened while learning.\n"
 msgstr ""
 


@@ -6130,22 +6163,22 @@ msgstr ""
 msgid "Deleting messages..."
 msgstr ""
 
 msgid "Deleting messages..."
 msgstr ""
 

-#: src/mh_gtk.c:59
+#: src/mh_gtk.c:62

 msgid "/Remove _mailbox..."
 msgstr ""
 
 msgid "/Remove _mailbox..."
 msgstr ""
 

-#: src/mh_gtk.c:323
+#: src/mh_gtk.c:324

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
 

-#: src/mh_gtk.c:325
+#: src/mh_gtk.c:326

 msgid "Remove mailbox"
 msgstr ""
 
 msgid "Remove mailbox"
 msgstr ""
 

-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:327

 msgid "_Remove"
 msgstr ""
 
 msgid "_Remove"
 msgstr ""
 


@@ -6173,58 +6206,58 @@ msgstr ""
 msgid "MIME Type"
 msgstr ""
 
 msgid "MIME Type"
 msgstr ""
 

-#: src/mimeview.c:720
+#: src/mimeview.c:742

 msgid "Check signature"
 msgstr ""
 
 msgid "Check signature"
 msgstr ""
 

-#: src/mimeview.c:725 src/mimeview.c:730 src/mimeview.c:735
+#: src/mimeview.c:747 src/mimeview.c:752 src/mimeview.c:757

 msgid "View full information"
 msgstr ""
 
 msgid "View full information"
 msgstr ""
 

-#: src/mimeview.c:740 src/mimeview.c:744
+#: src/mimeview.c:762 src/mimeview.c:766

 msgid "Check again"
 msgstr ""
 
 msgid "Check again"
 msgstr ""
 

-#: src/mimeview.c:753
+#: src/mimeview.c:775

 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr ""
 

-#: src/mimeview.c:758
+#: src/mimeview.c:780

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 

-#: src/mimeview.c:968
+#: src/mimeview.c:990

 msgid "Checking signature..."
 msgstr ""
 
 msgid "Checking signature..."
 msgstr ""
 

-#: src/mimeview.c:1010
+#: src/mimeview.c:1032

 msgid "Go back to email"
 msgstr ""
 
 msgid "Go back to email"
 msgstr ""
 

-#: src/mimeview.c:1348 src/mimeview.c:1429 src/mimeview.c:1605
-#: src/mimeview.c:1638
+#: src/mimeview.c:1370 src/mimeview.c:1451 src/mimeview.c:1628
+#: src/mimeview.c:1661

 msgid "Couldn't save the part of multipart message."
 msgstr ""
 
 msgid "Couldn't save the part of multipart message."
 msgstr ""
 

-#: src/mimeview.c:1418 src/textview.c:2651
+#: src/mimeview.c:1440 src/textview.c:2652

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr ""
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr ""
 

-#: src/mimeview.c:1456
+#: src/mimeview.c:1478

 msgid "Select destination folder"
 msgstr ""
 
 msgid "Select destination folder"
 msgstr ""
 

-#: src/mimeview.c:1463
+#: src/mimeview.c:1485

 #, c-format
 msgid "'%s' is not a directory."
 msgstr ""
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr ""
 

-#: src/mimeview.c:1684 src/mimeview.c:1692 src/textview.c:2582
+#: src/mimeview.c:1707 src/mimeview.c:1715 src/textview.c:2583

 msgid "Open with"
 msgstr ""
 
 msgid "Open with"
 msgstr ""
 

-#: src/mimeview.c:1685 src/mimeview.c:1693 src/textview.c:2583
+#: src/mimeview.c:1708 src/mimeview.c:1716 src/textview.c:2584

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6317,43 +6350,33 @@ msgstr ""
 msgid "/_Unsubscribe newsgroup"
 msgstr ""
 
 msgid "/_Unsubscribe newsgroup"
 msgstr ""
 

-#: src/news_gtk.c:223
+#: src/news_gtk.c:226

 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr ""
 
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr ""
 

-#: src/news_gtk.c:224
+#: src/news_gtk.c:227

 msgid "Unsubscribe newsgroup"
 msgstr ""
 
 msgid "Unsubscribe newsgroup"
 msgstr ""
 

-#: src/news_gtk.c:225
+#: src/news_gtk.c:228

 msgid "_Unsubscribe"
 msgstr ""
 
 msgid "_Unsubscribe"
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:118
-msgid "ClamAV: scanning message..."
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin.c:198
-msgid ""
-"Your version of Claws Mail is newer than the version the ClamAV plugin was "
-"built with"
+#: src/plugins/clamav/clamav_plugin.c:43
+#: src/plugins/clamav/clamav_plugin_gtk.c:212
+msgid "Clam AntiVirus"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:203
-msgid "Your version of Claws Mail is too old for the ClamAV plugin"
+#: src/plugins/clamav/clamav_plugin.c:120
+msgid "ClamAV: scanning message..."

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:209
+#: src/plugins/clamav/clamav_plugin.c:205

 msgid "Failed to register mail filtering hook"
 msgstr ""
 
 msgid "Failed to register mail filtering hook"
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:252
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin.c:257
+#: src/plugins/clamav/clamav_plugin.c:253

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -6364,7 +6387,7 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
 
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:284
+#: src/plugins/clamav/clamav_plugin.c:280

 msgid "Virus detection"
 msgstr ""
 
 msgid "Virus detection"
 msgstr ""
 


@@ -6400,34 +6423,26 @@ msgstr ""
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr ""
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 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"
 msgstr ""
 
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:150
 msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 

-#: src/plugins/demo/demo.c:45
-msgid ""
-"Your claws-mail version is newer than the version the plugin was built with"
-msgstr ""
-
-#: src/plugins/demo/demo.c:50
-msgid "Your claws-mail version is too old"
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+msgid "Demo"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/demo/demo.c:56
+#: src/plugins/demo/demo.c:52

 msgid "Failed to register log text hook"
 msgstr ""
 
 msgid "Failed to register log text hook"
 msgstr ""
 

-#: src/plugins/demo/demo.c:74 src/plugins/demo/demo.c:103
-msgid "Demo"
-msgstr ""
-
-#: src/plugins/demo/demo.c:79
+#: src/plugins/demo/demo.c:75

 msgid ""
 "This Plugin is only a demo of how to write plugins for Claws Mail. It "
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 msgid ""
 "This Plugin is only a demo of how to write plugins for Claws Mail. It "
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"

-"It is not really useful"
+"It is not really useful."

 msgstr ""
 
 #: src/plugins/dillo_viewer/dillo_prefs.c:76
 msgstr ""
 
 #: src/plugins/dillo_viewer/dillo_prefs.c:76


@@ -6454,28 +6469,18 @@ msgstr ""
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr ""
 
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr ""
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:169
-msgid ""
-"Your version of Claws Mail is newer than the version the Dillo plugin was "
-"built with"
-msgstr ""
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:174
-msgid "Your version of Claws Mail is too old for the Dillo plugin"
-msgstr ""
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:194
+#: src/plugins/dillo_viewer/dillo_viewer.c:39

 msgid "Dillo HTML Viewer"
 msgstr ""
 
 msgid "Dillo HTML Viewer"
 msgstr ""
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:199
+#: src/plugins/dillo_viewer/dillo_viewer.c:195

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
 msgstr ""
 
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser"
 msgstr ""
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:223
+#: src/plugins/dillo_viewer/dillo_viewer.c:219

 msgid "text/html"
 msgstr ""
 
 msgid "text/html"
 msgstr ""
 


@@ -6538,7 +6543,7 @@ msgstr ""
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:165

 msgid "minute(s)"
 msgstr ""
 
 msgid "minute(s)"
 msgstr ""
 


@@ -6646,7 +6651,7 @@ msgstr ""
 msgid "Undefined"
 msgstr ""
 
 msgid "Undefined"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:193

 #: src/prefs_send.c:170
 msgid "Never"
 msgstr ""
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr ""


@@ -6753,76 +6758,76 @@ msgstr ""
 msgid "Couldn't initialize data, %s"
 msgstr ""
 
 msgid "Couldn't initialize data, %s"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:491
+#: src/plugins/pgpcore/sgpgme.c:492

 #, c-format
 msgid "Secret key not found (%s)"
 msgstr ""
 
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:499
+#: src/plugins/pgpcore/sgpgme.c:500

 msgid "Secret key specification is ambiguous"
 msgstr ""
 
 msgid "Secret key specification is ambiguous"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:509
+#: src/plugins/pgpcore/sgpgme.c:510

 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:545
+#: src/plugins/pgpcore/sgpgme.c:546

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:551
+#: src/plugins/pgpcore/sgpgme.c:552

 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 "version %s is required.\n"
 msgstr ""
 
 #, 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:559
+#: src/plugins/pgpcore/sgpgme.c:560

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:575
+#: src/plugins/pgpcore/sgpgme.c:576

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
 
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:609
+#: src/plugins/pgpcore/sgpgme.c:610

 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr ""
 
 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:614
+#: src/plugins/pgpcore/sgpgme.c:615

 msgid "No PGP key found"
 msgstr ""
 
 msgid "No PGP key found"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:616

 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 ""
 
 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:685 src/plugins/pgpcore/sgpgme.c:701
+#: src/plugins/pgpcore/sgpgme.c:686 src/plugins/pgpcore/sgpgme.c:702

 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:692
+#: src/plugins/pgpcore/sgpgme.c:693

 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:707
+#: src/plugins/pgpcore/sgpgme.c:708

 msgid "Couldn't generate a new key pair: unknown error"
 msgstr ""
 
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:711
+#: src/plugins/pgpcore/sgpgme.c:712

 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"


@@ -6831,37 +6836,27 @@ msgid ""
 "Do you want to export it to a keyserver?"
 msgstr ""
 
 "Do you want to export it to a keyserver?"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:715
+#: src/plugins/pgpcore/sgpgme.c:716

 msgid "Key generated"
 msgstr ""
 
 msgid "Key generated"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:754
+#: src/plugins/pgpcore/sgpgme.c:755

 msgid "Key exported."
 msgstr ""
 
 msgid "Key exported."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:756
+#: src/plugins/pgpcore/sgpgme.c:757

 msgid "Couldn't export key."
 msgstr ""
 
 msgid "Couldn't export key."
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:760
+#: src/plugins/pgpcore/sgpgme.c:761

 msgid "Key export isn't implemented in Windows."
 msgstr ""
 
 msgid "Key export isn't implemented in Windows."
 msgstr ""
 

-#: src/plugins/pgpcore/plugin.c:38
-msgid ""
-"Your version of Claws Mail is newer than the version the PGP/Core plugin was "
-"built with"
-msgstr ""
-
-#: src/plugins/pgpcore/plugin.c:43
-msgid "Your version of Claws Mail is too old for the PGP/Core plugin"
-msgstr ""
-
-#: src/plugins/pgpcore/plugin.c:63
+#: src/plugins/pgpcore/plugin.c:35

 msgid "PGP/Core"
 msgstr ""
 
 msgid "PGP/Core"
 msgstr ""
 

-#: src/plugins/pgpcore/plugin.c:68
+#: src/plugins/pgpcore/plugin.c:64

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -6874,7 +6869,7 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 

-#: src/plugins/pgpcore/plugin.c:97
+#: src/plugins/pgpcore/plugin.c:93

 msgid "Core operations"
 msgstr ""
 
 msgid "Core operations"
 msgstr ""
 


@@ -7019,21 +7014,11 @@ msgstr ""
 msgid "PGP/Inline"
 msgstr ""
 
 msgid "PGP/Inline"
 msgstr ""
 

-#: src/plugins/pgpinline/plugin.c:36
-msgid ""
-"Your version of Claws Mail is newer than the version the PGP/inline plugin "
-"was built with"
-msgstr ""
-
-#: src/plugins/pgpinline/plugin.c:41
-msgid "Your version of Claws Mail is too old for the PGP/inline plugin"
-msgstr ""
-
-#: src/plugins/pgpinline/plugin.c:57
+#: src/plugins/pgpinline/plugin.c:33

 msgid "PGP/inline"
 msgstr ""
 
 msgid "PGP/inline"
 msgstr ""
 

-#: src/plugins/pgpinline/plugin.c:62
+#: src/plugins/pgpinline/plugin.c:58

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -7048,21 +7033,11 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 

-#: src/plugins/pgpmime/plugin.c:35
-msgid ""
-"Your version of Claws Mail is newer than the version the PGP/MIME plugin was "
-"built with"
-msgstr ""
-
-#: src/plugins/pgpmime/plugin.c:40
-msgid "Your version of Claws Mail is too old for the PGP/MIME plugin"
-msgstr ""
-
-#: src/plugins/pgpmime/plugin.c:56
+#: src/plugins/pgpmime/plugin.c:33

 msgid "PGP/MIME"
 msgstr ""
 
 msgid "PGP/MIME"
 msgstr ""
 

-#: src/plugins/pgpmime/plugin.c:61
+#: src/plugins/pgpmime/plugin.c:58

 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"


@@ -7097,59 +7072,49 @@ msgstr ""
 msgid "PGP/Mime"
 msgstr ""
 
 msgid "PGP/Mime"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:159
+#: src/plugins/spamassassin/spamassassin.c:75
+#: src/plugins/spamassassin/spamassassin_gtk.c:549
+msgid "SpamAssassin"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin.c:161

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr ""
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:175
+#: src/plugins/spamassassin/spamassassin.c:177

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr ""
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:201
+#: src/plugins/spamassassin/spamassassin.c:203

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr ""
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:206
+#: src/plugins/spamassassin/spamassassin.c:208

 msgid "SpamAssassin: filtering message..."
 msgstr ""
 
 msgid "SpamAssassin: filtering message..."
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:275
+#: src/plugins/spamassassin/spamassassin.c:277

 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 "accessible."
 msgstr ""
 
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 "accessible."
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:334
+#: src/plugins/spamassassin/spamassassin.c:336

 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgstr ""
 
 msgid ""
 "Claws Mail needs network access in order to feed this mail(s) to the remote "
 "learner."
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:469
-msgid ""
-"Your version of Claws Mail is newer than the version the SpamAssassin plugin "
-"was built with"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin.c:474
-msgid "Your version of Claws Mail is too old for the SpamAssassin plugin"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin.c:483
+#: src/plugins/spamassassin/spamassassin.c:479

 msgid "Failed to get username"
 msgstr ""
 
 msgid "Failed to get username"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:495
+#: src/plugins/spamassassin/spamassassin.c:491

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:523
-#: src/plugins/spamassassin/spamassassin_gtk.c:549
-msgid "SpamAssassin"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin.c:528
+#: src/plugins/spamassassin/spamassassin.c:524

 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "


@@ -7163,11 +7128,11 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:555

 msgid "Spam detection"
 msgstr ""
 
 msgid "Spam detection"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:560
+#: src/plugins/spamassassin/spamassassin.c:556

 msgid "Spam learning"
 msgstr ""
 
 msgid "Spam learning"
 msgstr ""
 


@@ -7238,6 +7203,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
 msgstr ""
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194

+#: src/prefs_summaries.c:900

 msgid "seconds"
 msgstr ""
 
 msgid "seconds"
 msgstr ""
 


@@ -7254,75 +7220,67 @@ msgid ""
 "Folder for storing identified spam. Leave empty to use the default trash "
 "folder"
 msgstr ""
 "Folder for storing identified spam. Leave empty to use the default trash "
 "folder"
 msgstr ""

+"Folder for storing identified spam. Leave empty to use the default wastebin "
+"folder"

 
 #: src/plugins/spamassassin/spamassassin_gtk.c:391
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:391
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:104
-msgid "/_Get Mail"
+#: src/plugins/trayicon/trayicon.c:59 src/plugins/trayicon/trayicon.c:497
+msgid "Trayicon"

 msgstr ""
 
 #: src/plugins/trayicon/trayicon.c:106
 msgstr ""
 
 #: src/plugins/trayicon/trayicon.c:106

+msgid "/_Get Mail"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon.c:108

 msgid "/_Email"
 msgstr ""
 
 msgid "/_Email"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:107
+#: src/plugins/trayicon/trayicon.c:109

 msgid "/_Email from account"
 msgstr ""
 
 msgid "/_Email from account"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:109
+#: src/plugins/trayicon/trayicon.c:111

 msgid "/Open A_ddressbook"
 msgstr ""
 
 msgid "/Open A_ddressbook"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:111
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Work Offline"
 msgstr ""
 
 msgid "/_Work Offline"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:113
+#: src/plugins/trayicon/trayicon.c:115

 msgid "/E_xit Claws Mail"
 msgstr ""
 
 msgid "/E_xit Claws Mail"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:202
+#: src/plugins/trayicon/trayicon.c:204

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr ""
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:276
+#: src/plugins/trayicon/trayicon.c:278

 msgid "/Work Offline"
 msgstr ""
 
 msgid "/Work Offline"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:279
+#: src/plugins/trayicon/trayicon.c:281

 msgid "/Get Mail"
 msgstr ""
 
 msgid "/Get Mail"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:354
-msgid ""
-"Your version of Claws Mail is newer than the version the Trayicon plugin was "
-"built with"
-msgstr ""
-
-#: src/plugins/trayicon/trayicon.c:359
-msgid "Your version of Claws Mail is too old for the Trayicon plugin"
-msgstr ""
-
-#: src/plugins/trayicon/trayicon.c:365
+#: src/plugins/trayicon/trayicon.c:361

 msgid "Failed to register folder item update hook"
 msgstr ""
 
 msgid "Failed to register folder item update hook"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:371
+#: src/plugins/trayicon/trayicon.c:367

 msgid "Failed to register folder update hook"
 msgstr ""
 
 msgid "Failed to register folder update hook"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:377 src/plugins/trayicon/trayicon.c:383
+#: src/plugins/trayicon/trayicon.c:373 src/plugins/trayicon/trayicon.c:379

 msgid "Failed to register offline switch hook"
 msgstr ""
 
 msgid "Failed to register offline switch hook"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:414 src/plugins/trayicon/trayicon.c:501
-msgid "Trayicon"
-msgstr ""
-
-#: src/plugins/trayicon/trayicon.c:419
+#: src/plugins/trayicon/trayicon.c:415

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -7331,7 +7289,7 @@ msgid ""
 "letter. A tooltip shows new, unread and total number of messages."
 msgstr ""
 
 "letter. A tooltip shows new, unread and total number of messages."
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:478
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit this program?"
 msgstr ""
 
 msgid "Exit this program?"
 msgstr ""
 


@@ -7391,7 +7349,7 @@ msgid "TOP command unsupported\n"
 msgstr ""
 
 #: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145
 msgstr ""
 
 #: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145

-#: src/wizard.c:1115
+#: src/wizard.c:1122

 msgid "POP3"
 msgstr ""
 
 msgid "POP3"
 msgstr ""
 


@@ -7403,7 +7361,7 @@ msgstr ""
 msgid "News (NNTP)"
 msgstr ""
 
 msgid "News (NNTP)"
 msgstr ""
 

-#: src/prefs_account.c:238 src/wizard.c:1125
+#: src/prefs_account.c:238 src/wizard.c:1132

 msgid "Local mbox file"
 msgstr ""
 
 msgid "Local mbox file"
 msgstr ""
 


@@ -7477,7 +7435,7 @@ msgstr "Organisation"
 msgid "Server information"
 msgstr ""
 
 msgid "Server information"
 msgstr ""
 

-#: src/prefs_account.c:1205 src/wizard.c:1209
+#: src/prefs_account.c:1205 src/wizard.c:1216

 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"
 msgid ""
 "<span weight=\"bold\">Warning: this version of Claws Mail\n"
 "has been built without IMAP support.</span>"


@@ -7865,7 +7823,7 @@ msgid "Command line"
 msgstr ""
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
 msgstr ""
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493

-#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:260
+#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:270

 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr ""
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr ""


@@ -7878,7 +7836,7 @@ msgstr ""
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811

-#: src/prefs_template.c:357
+#: src/prefs_template.c:367

 msgid "(New)"
 msgstr ""
 
 msgid "(New)"
 msgstr ""
 


@@ -7924,19 +7882,19 @@ msgstr ""
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822

-#: src/prefs_template.c:416 src/prefs_template.c:433
+#: src/prefs_template.c:426 src/prefs_template.c:443

 msgid "Entry not saved"
 msgstr ""
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
 msgid "Entry not saved"
 msgstr ""
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254

-#: src/prefs_filtering.c:1276 src/prefs_template.c:417
-#: src/prefs_template.c:434
+#: src/prefs_filtering.c:1276 src/prefs_template.c:427
+#: src/prefs_template.c:444

 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824

-#: src/prefs_template.c:418 src/prefs_template.c:435
+#: src/prefs_template.c:428 src/prefs_template.c:445

 msgid "+_Continue editing"
 msgstr ""
 
 msgid "+_Continue editing"
 msgstr ""
 


@@ -8035,17 +7993,17 @@ msgstr ""
 msgid "Hello,\\n"
 msgstr ""
 
 msgid "Hello,\\n"
 msgstr ""
 

-#: src/prefs_common.c:268
+#: src/prefs_common.c:272

 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr ""
 
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr ""
 

-#: src/prefs_common.c:274
+#: src/prefs_common.c:278

 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 ""
 
 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:359
+#: src/prefs_common.c:363

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr ""
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr ""
 


@@ -8109,11 +8067,11 @@ msgstr ""
 msgid "Ask"
 msgstr ""
 
 msgid "Ask"
 msgstr ""
 

-#: src/prefs_compose_writing.c:209 src/toolbar.c:446
+#: src/prefs_compose_writing.c:209 src/toolbar.c:456

 msgid "Insert"
 msgstr ""
 
 msgid "Insert"
 msgstr ""
 

-#: src/prefs_compose_writing.c:210 src/toolbar.c:447
+#: src/prefs_compose_writing.c:210 src/toolbar.c:457

 msgid "Attach"
 msgstr ""
 
 msgid "Attach"
 msgstr ""
 


@@ -8125,17 +8083,17 @@ msgstr ""
 msgid "New message format"
 msgstr ""
 
 msgid "New message format"
 msgstr ""
 

-#: src/prefs_compose_writing.c:272 src/prefs_quote.c:186
+#: src/prefs_compose_writing.c:282 src/prefs_quote.c:206

 msgid " Description of symbols... "
 msgstr ""
 
 msgid " Description of symbols... "
 msgstr ""
 

-#: src/prefs_compose_writing.c:392 src/prefs_folder_item.c:1118
-#: src/prefs_quote.c:291 src/prefs_spelling.c:401 src/prefs_wrapping.c:144
-#: src/toolbar.c:1511
+#: src/prefs_compose_writing.c:402 src/prefs_folder_item.c:1172
+#: src/prefs_quote.c:311 src/prefs_spelling.c:448 src/prefs_wrapping.c:144
+#: src/toolbar.c:1560

 msgid "Compose"
 msgstr ""
 
 msgid "Compose"
 msgstr ""
 

-#: src/prefs_compose_writing.c:393
+#: src/prefs_compose_writing.c:403

 msgid "Writing"
 msgstr ""
 
 msgid "Writing"
 msgstr ""
 


@@ -8297,7 +8255,7 @@ msgstr ""
 msgid "Mark as unread"
 msgstr ""
 
 msgid "Mark as unread"
 msgstr ""
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:398 src/toolbar.c:489
+#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499

 msgid "Forward"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 


@@ -8306,7 +8264,7 @@ msgid "Redirect"
 msgstr ""
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
 msgstr ""
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429

-#: src/toolbar.c:174 src/toolbar.c:1651
+#: src/toolbar.c:178 src/toolbar.c:1711

 msgid "Execute"
 msgstr ""
 
 msgid "Execute"
 msgstr ""
 


@@ -8326,7 +8284,7 @@ msgstr ""
 msgid "Hide"
 msgstr ""
 
 msgid "Hide"
 msgstr ""
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:177
+#: src/prefs_filtering_action.c:167 src/toolbar.c:181

 msgid "Ignore thread"
 msgstr ""
 
 msgid "Ignore thread"
 msgstr ""
 


@@ -8499,7 +8457,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr ""
 
 msgid "Hidden columns"
 msgstr ""
 

-#: src/prefs_folder_column.c:280 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:797
+#: src/prefs_summaries.c:943 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr ""
 
 msgid "Displayed columns"
 msgstr ""
 


@@ -8508,93 +8467,97 @@ msgstr ""
 msgid " Use default "
 msgstr ""
 
 msgid " Use default "
 msgstr ""
 

-#: src/prefs_folder_item.c:199 src/prefs_folder_item.c:640
+#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:648

 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 ""
 
 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:211 src/prefs_folder_item.c:652
+#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:660

 msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
 
 msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
 

-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:238

 msgid "Normal"
 msgstr ""
 
 msgid "Normal"
 msgstr ""
 

-#: src/prefs_folder_item.c:237
+#: src/prefs_folder_item.c:240

 msgid "Outbox"
 msgstr ""
 
 msgid "Outbox"
 msgstr ""
 

-#: src/prefs_folder_item.c:254
+#: src/prefs_folder_item.c:257

 msgid "Folder type"
 msgstr ""
 
 msgid "Folder type"
 msgstr ""
 

-#: src/prefs_folder_item.c:266
+#: src/prefs_folder_item.c:269

 msgid "Simplify Subject RegExp"
 msgstr ""
 
 msgid "Simplify Subject RegExp"
 msgstr ""
 

-#: src/prefs_folder_item.c:292
+#: src/prefs_folder_item.c:295

 msgid "Test RegExp"
 msgstr ""
 
 msgid "Test RegExp"
 msgstr ""
 

-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:327

 msgid "Folder chmod"
 msgstr ""
 
 msgid "Folder chmod"
 msgstr ""
 

-#: src/prefs_folder_item.c:350
+#: src/prefs_folder_item.c:353

 msgid "Folder color"
 msgstr "Folder colour"
 
 msgid "Folder color"
 msgstr "Folder colour"
 

-#: src/prefs_folder_item.c:364 src/prefs_folder_item.c:995
+#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1047

 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Pick colour for folder"
 
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Pick colour for folder"
 

-#: src/prefs_folder_item.c:381
+#: src/prefs_folder_item.c:384

 msgid "Process at startup"
 msgstr ""
 
 msgid "Process at startup"
 msgstr ""
 

-#: src/prefs_folder_item.c:395
+#: src/prefs_folder_item.c:398

 msgid "Scan for new mail"
 msgstr ""
 
 msgid "Scan for new mail"
 msgstr ""
 

-#: src/prefs_folder_item.c:408
+#: src/prefs_folder_item.c:411

 msgid "Synchronise for offline use"
 msgstr ""
 
 msgid "Synchronise for offline use"
 msgstr ""
 

-#: src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:669

 msgid "Request Return Receipt"
 msgstr ""
 
 msgid "Request Return Receipt"
 msgstr ""
 

-#: src/prefs_folder_item.c:676
+#: src/prefs_folder_item.c:684

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 

-#: src/prefs_folder_item.c:689
+#: src/prefs_folder_item.c:697

 msgid "Default To: "
 msgstr ""
 
 msgid "Default To: "
 msgstr ""
 

-#: src/prefs_folder_item.c:710
+#: src/prefs_folder_item.c:718

 msgid "Default To for replies: "
 msgstr ""
 
 msgid "Default To for replies: "
 msgstr ""
 

-#: src/prefs_folder_item.c:731
+#: src/prefs_folder_item.c:739

 msgid "Default account: "
 msgstr ""
 
 msgid "Default account: "
 msgstr ""
 

-#: src/prefs_folder_item.c:782
+#: src/prefs_folder_item.c:790

 msgid "Default dictionary: "
 msgstr ""
 
 msgid "Default dictionary: "
 msgstr ""
 

-#: src/prefs_folder_item.c:1101
+#: src/prefs_folder_item.c:823
+msgid "Default alternate dictionary: "
+msgstr ""
+
+#: src/prefs_folder_item.c:1155

 msgid "General"
 msgstr ""
 
 msgid "General"
 msgstr ""
 

-#: src/prefs_folder_item.c:1146
+#: src/prefs_folder_item.c:1200

 #, c-format
 msgid "Properties for folder %s"
 msgstr ""
 #, c-format
 msgid "Properties for folder %s"
 msgstr ""


@@ -8615,7 +8578,7 @@ msgstr ""
 msgid "Message Printing"
 msgstr ""
 
 msgid "Message Printing"
 msgstr ""
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1078

 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr ""
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr ""


@@ -9006,7 +8969,7 @@ msgstr "Pick colour for signatures"
 msgid "Signatures"
 msgstr ""
 
 msgid "Signatures"
 msgstr ""
 

-#: src/prefs_msg_colors.c:376
+#: src/prefs_msg_colors.c:376 src/prefs_summaries.c:761

 msgid "Folder list"
 msgstr ""
 
 msgid "Folder list"
 msgstr ""
 


@@ -9015,8 +8978,8 @@ msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""

-"Pick colour for Target folder. Target folder is used when the option 'Execute "
-"immediately when moving or deleting messages' is turned off"
+"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:398
 msgid "Target folder"
 
 #: src/prefs_msg_colors.c:398
 msgid "Target folder"


@@ -9129,7 +9092,7 @@ msgstr ""
 
 #: src/prefs_other.c:169
 msgid "Empty trash on exit"
 
 #: src/prefs_other.c:169
 msgid "Empty trash on exit"

-msgstr ""
+msgstr "Empty wastebin on exit"

 
 #: src/prefs_other.c:171
 msgid "Ask before emptying"
 
 #: src/prefs_other.c:171
 msgid "Ask before emptying"


@@ -9155,122 +9118,110 @@ msgstr ""
 msgid "Reply format"
 msgstr ""
 
 msgid "Reply format"
 msgstr ""
 

-#: src/prefs_quote.c:109 src/prefs_quote.c:151
+#: src/prefs_quote.c:109 src/prefs_quote.c:161

 msgid "Quotation mark"
 msgstr ""
 
 msgid "Quotation mark"
 msgstr ""
 

-#: src/prefs_quote.c:136
+#: src/prefs_quote.c:146

 msgid "Forward format"
 msgstr ""
 
 msgid "Forward format"
 msgstr ""
 

-#: src/prefs_quote.c:195
+#: src/prefs_quote.c:215

 msgid "Quotation characters"
 msgstr ""
 
 msgid "Quotation characters"
 msgstr ""
 

-#: src/prefs_quote.c:210
+#: src/prefs_quote.c:230

 msgid "Treat these characters as quotation marks: "
 msgstr ""
 
 msgid "Treat these characters as quotation marks: "
 msgstr ""
 

-#: src/prefs_quote.c:261
-msgid "Message reply quote format error."
-msgstr ""
-
-#: src/prefs_quote.c:266
-msgid "Message forward quote format error."
-msgstr ""
-
-#: src/prefs_quote.c:292
+#: src/prefs_quote.c:312

 msgid "Quoting"
 msgstr ""
 
 msgid "Quoting"
 msgstr ""
 

-#: src/prefs_receive.c:122
+#: src/prefs_receive.c:121

 msgid "External incorporation program"
 msgstr ""
 
 msgid "External incorporation program"
 msgstr ""
 

-#: src/prefs_receive.c:129
+#: src/prefs_receive.c:128

 msgid "Use external program for receiving mail"
 msgstr ""
 
 msgid "Use external program for receiving mail"
 msgstr ""
 

-#: src/prefs_receive.c:136
+#: src/prefs_receive.c:135

 msgid "Command"
 msgstr ""
 
 msgid "Command"
 msgstr ""
 

-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:144

 msgid "Automatic checking"
 msgstr ""
 
 msgid "Automatic checking"
 msgstr ""
 

-#: src/prefs_receive.c:156
-msgid "Automatically check for new mail"
+#: src/prefs_receive.c:155
+msgid "Automatically check for new mail every"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_receive.c:158
-msgid "every"
-msgstr ""
-
-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:173

 msgid "Check for new mail on startup"
 msgstr ""
 
 msgid "Check for new mail on startup"
 msgstr ""
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:176

 msgid "Dialogs"
 msgstr "Dialogues"
 
 msgid "Dialogs"
 msgstr "Dialogues"
 

-#: src/prefs_receive.c:188
+#: src/prefs_receive.c:182

 msgid "Show receive dialog"
 msgstr "Show receive dialogue"
 
 msgid "Show receive dialog"
 msgstr "Show receive dialogue"
 

-#: src/prefs_receive.c:196 src/prefs_send.c:169 src/prefs_summaries.c:958
+#: src/prefs_receive.c:190 src/prefs_send.c:169 src/prefs_summaries.c:855

 msgid "Always"
 msgstr ""
 
 msgid "Always"
 msgstr ""
 

-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:191

 msgid "Only on manual receiving"
 msgstr ""
 
 msgid "Only on manual receiving"
 msgstr ""
 

-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:205

 msgid "Close receive dialog when finished"
 msgstr "Close receive dialogue when finished"
 
 msgid "Close receive dialog when finished"
 msgstr "Close receive dialogue when finished"
 

-#: src/prefs_receive.c:214
+#: src/prefs_receive.c:208

 msgid "Don't popup error dialog on receive error"
 msgstr "Don't popup error dialogue on receive error"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Don't popup error dialogue on receive error"
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:210

 msgid "After receiving new mail"
 msgstr ""
 
 msgid "After receiving new mail"
 msgstr ""
 

-#: src/prefs_receive.c:222
+#: src/prefs_receive.c:216

 msgid "Go to inbox"
 msgstr ""
 
 msgid "Go to inbox"
 msgstr ""
 

-#: src/prefs_receive.c:224
+#: src/prefs_receive.c:218

 msgid "Update all local folders"
 msgstr ""
 
 msgid "Update all local folders"
 msgstr ""
 

-#: src/prefs_receive.c:226
+#: src/prefs_receive.c:220

 msgid "Run command"
 msgstr ""
 
 msgid "Run command"
 msgstr ""
 

-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:229

 msgid "after automatic check"
 msgstr ""
 
 msgid "after automatic check"
 msgstr ""
 

-#: src/prefs_receive.c:237
+#: src/prefs_receive.c:231

 msgid "after manual check"
 msgstr ""
 
 msgid "after manual check"
 msgstr ""
 

-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:239

 #, c-format
 msgid ""
 "Command to execute:\n"
 "(use %d as number of new mails)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Command to execute:\n"
 "(use %d as number of new mails)"
 msgstr ""
 

-#: src/prefs_receive.c:371 src/prefs_send.c:337
+#: src/prefs_receive.c:365 src/prefs_send.c:337

 msgid "Mail Handling"
 msgstr ""
 
 msgid "Mail Handling"
 msgstr ""
 

-#: src/prefs_receive.c:372
+#: src/prefs_receive.c:366

 msgid "Receiving"
 msgstr ""
 
 msgid "Receiving"
 msgstr ""
 


@@ -9427,284 +9378,290 @@ msgstr ""
 msgid "Sending"
 msgstr ""
 
 msgid "Sending"
 msgstr ""
 

-#: src/prefs_spelling.c:105
+#: src/prefs_spelling.c:91

 msgid "Select dictionaries location"
 msgstr ""
 
 msgid "Select dictionaries location"
 msgstr ""
 

-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:126

 msgid "Pick color for misspelled word"
 msgstr "Pick colour for misspelled word"
 
 msgid "Pick color for misspelled word"
 msgstr "Pick colour for misspelled word"
 

-#: src/prefs_spelling.c:186
+#: src/prefs_spelling.c:183

 msgid "Enable spell checker"
 msgstr ""
 
 msgid "Enable spell checker"
 msgstr ""
 

-#: src/prefs_spelling.c:191
+#: src/prefs_spelling.c:188

 msgid "Enable alternate dictionary"
 msgstr ""
 
 msgid "Enable alternate dictionary"
 msgstr ""
 

-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194

 msgid "Faster switching with last used dictionary"
 msgstr ""
 
 msgid "Faster switching with last used dictionary"
 msgstr ""
 

-#: src/prefs_spelling.c:199
+#: src/prefs_spelling.c:196

 msgid "Path to dictionaries"
 msgstr ""
 
 msgid "Path to dictionaries"
 msgstr ""
 

-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:211

 msgid "Automatic spelling"
 msgstr ""
 
 msgid "Automatic spelling"
 msgstr ""
 

-#: src/prefs_spelling.c:226
+#: src/prefs_spelling.c:223

 msgid "Re-check message when changing dictionary"
 msgstr ""
 
 msgid "Re-check message when changing dictionary"
 msgstr ""
 

-#: src/prefs_spelling.c:230
+#: src/prefs_spelling.c:227

 msgid "Dictionary"
 msgstr ""
 
 msgid "Dictionary"
 msgstr ""
 

-#: src/prefs_spelling.c:243
+#: src/prefs_spelling.c:240

 msgid "Default dictionary"
 msgstr ""
 
 msgid "Default dictionary"
 msgstr ""
 

-#: src/prefs_spelling.c:261
-msgid "Default suggestion mode"
+#: src/prefs_spelling.c:258
+msgid "Default alternate dictionary"
+msgstr ""
+
+#: src/prefs_spelling.c:277
+msgid "Check with both dictionaries"

 msgstr ""
 
 #: src/prefs_spelling.c:283
 msgstr ""
 
 #: src/prefs_spelling.c:283

+msgid "Default suggestion mode"
+msgstr ""
+
+#: src/prefs_spelling.c:305

 msgid "Misspelled word color"
 msgstr "Misspelled word colour:"
 
 msgid "Misspelled word color"
 msgstr "Misspelled word colour:"
 

-#: src/prefs_spelling.c:297
+#: src/prefs_spelling.c:319

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Pick colour for misspelled word. Use black to underline"
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Pick colour for misspelled word. Use black to underline"
 

-#: src/prefs_spelling.c:402
+#: src/prefs_spelling.c:449

 msgid "Spell Checking"
 msgstr ""
 
 msgid "Spell Checking"
 msgstr ""
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr ""
 
 msgid "the full abbreviated weekday name"
 msgstr ""
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr ""
 
 msgid "the full weekday name"
 msgstr ""
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr ""
 
 msgid "the abbreviated month name"
 msgstr ""
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr ""
 
 msgid "the full month name"
 msgstr ""
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr ""
 
 msgid "the preferred date and time for the current locale"
 msgstr ""
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr ""
 
 msgid "the century number (year/100)"
 msgstr ""
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr ""
 
 msgid "the day of the month as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr ""
 
 msgid "the day of the year as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr ""
 
 msgid "the month as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr ""
 
 msgid "the minute as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr ""
 
 msgid "either AM or PM"
 msgstr ""
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr ""
 
 msgid "the second as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr ""
 
 msgid "the day of the week as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr ""
 
 msgid "the preferred date for the current locale"
 msgstr ""
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr ""
 
 msgid "the last two digits of a year"
 msgstr ""
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr ""
 
 msgid "the year as a decimal number"
 msgstr ""
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr ""
 
 msgid "the time zone or name or abbreviation"
 msgstr ""
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
+#: src/prefs_summaries.c:911

 msgid "Date format"
 msgstr ""
 
 msgid "Date format"
 msgstr ""
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr ""
 
 msgid "Specifier"
 msgstr ""
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr ""
 
 msgid "Example"
 msgstr ""
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Select key bindings"
 msgstr ""
 
 msgid "Select key bindings"
 msgstr ""
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr ""
 
 msgid "Select preset:"
 msgstr ""
 

-#: src/prefs_summaries.c:352 src/prefs_summaries.c:699
+#: src/prefs_summaries.c:353 src/prefs_summaries.c:700

 msgid "Old Sylpheed"
 msgstr ""
 
 msgid "Old Sylpheed"
 msgstr ""
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:361

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgstr ""
 
 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_summaries.c:767
-msgid "Translate header names"
-msgstr ""
-
-#: src/prefs_summaries.c:769
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-
-#: src/prefs_summaries.c:773
+#: src/prefs_summaries.c:768

 msgid "Display unread number next to folder name"
 msgstr ""
 
 msgid "Display unread number next to folder name"
 msgstr ""
 

-#: src/prefs_summaries.c:780
+#: src/prefs_summaries.c:775

 msgid "Abbreviate newsgroup names longer than"
 msgstr ""
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr ""
 

-#: src/prefs_summaries.c:794
+#: src/prefs_summaries.c:789

 msgid "letters"
 msgstr ""
 
 #: src/prefs_summaries.c:807
 msgid "letters"
 msgstr ""
 
 #: src/prefs_summaries.c:807

-msgid "Display sender using address book"
+msgid "Message list"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:810
-msgid "Thread using subject in addition to standard headers"
+#: src/prefs_summaries.c:817
+msgid "When entering a folder"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:833
-msgid "Date format help"
+#: src/prefs_summaries.c:825
+msgid "Do nothing"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:837
-msgid "Set displayed columns"
+#: src/prefs_summaries.c:826
+msgid "Select first unread (or new or marked) message"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:845
-msgid " Folder list... "
+#: src/prefs_summaries.c:828
+msgid "Select first unread (or marked or new) message"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:853
-msgid " Message list... "
+#: src/prefs_summaries.c:830
+msgid "Select first new (or unread or marked) message"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:874
-msgid "Execute immediately when moving or deleting messages"
+#: src/prefs_summaries.c:832
+msgid "Select first new (or marked or unread) message"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:876
-msgid "Messages will be marked until execution if this is turned off"
+#: src/prefs_summaries.c:834
+msgid "Select first marked (or new or unread) message"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:882
-msgid "Confirm before marking all mails in a folder as read"
+#: src/prefs_summaries.c:836
+msgid "Select first marked (or unread or new) message"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:886
-msgid "Always open message when selected"
+#: src/prefs_summaries.c:847
+msgid "Show \"no unread (or new) message\" dialog"
+msgstr "Show \"no unread (or new) message\" dialogue"
+
+#: src/prefs_summaries.c:856
+msgid "Assume 'Yes'"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:890
-msgid "Only mark message as read when opened in a new window"
+#: src/prefs_summaries.c:858
+msgid "Assume 'No'"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:903
-msgid "When entering a folder"
+#: src/prefs_summaries.c:866
+msgid "Always open message when selected"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:919
-msgid "Do nothing"
+#: src/prefs_summaries.c:869
+msgid "Thread using subject in addition to standard headers"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:920
-msgid "Select first unread (or new or marked) message"
+#: src/prefs_summaries.c:875
+msgid "Execute immediately when moving or deleting messages"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:922
-msgid "Select first unread (or marked or new) message"
+#: src/prefs_summaries.c:877
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:924
-msgid "Select first new (or unread or marked) message"
+#: src/prefs_summaries.c:882
+msgid "Only mark message as read when opened in a new window"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:926
-msgid "Select first new (or marked or unread) message"
+#: src/prefs_summaries.c:889
+msgid "Mark messages as read after"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:928
-msgid "Select first marked (or new or unread) message"
+#: src/prefs_summaries.c:905
+msgid "Display sender using address book"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:930
-msgid "Select first marked (or unread or new) message"
+#: src/prefs_summaries.c:937
+msgid "Date format help"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:942
-msgid "Show \"no unread (or new) message\" dialog"
-msgstr "Show \"no unread (or new) message\" dialogue"
+#: src/prefs_summaries.c:955
+msgid "Confirm before marking all mails in a folder as read"
+msgstr ""

 
 

-#: src/prefs_summaries.c:959
-msgid "Assume 'Yes'"
+#: src/prefs_summaries.c:958
+msgid "Translate header names"

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:961
-msgid "Assume 'No'"
+#: src/prefs_summaries.c:960
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."

 msgstr ""
 
 msgstr ""
 

-#: src/prefs_summaries.c:970
+#: src/prefs_summaries.c:967

 msgid " Set key bindings... "
 msgstr ""
 
 msgid " Set key bindings... "
 msgstr ""
 

-#: src/prefs_summaries.c:1077
+#: src/prefs_summaries.c:1079

 msgid "Summaries"
 msgstr ""
 
 msgid "Summaries"
 msgstr ""
 


@@ -9730,47 +9687,31 @@ msgstr ""
 msgid "This name is used as the Menu item"
 msgstr ""
 
 msgid "This name is used as the Menu item"
 msgstr ""
 

-#: src/prefs_template.c:276
+#: src/prefs_template.c:286

 msgid " Symbols... "
 msgstr ""
 
 msgid " Symbols... "
 msgstr ""
 

-#: src/prefs_template.c:305
+#: src/prefs_template.c:315

 msgid "Template configuration"
 msgstr ""
 
 msgid "Template configuration"
 msgstr ""
 

-#: src/prefs_template.c:547
+#: src/prefs_template.c:557

 msgid "Template name is not set."
 msgstr ""
 
 msgid "Template name is not set."
 msgstr ""
 

-#: src/prefs_template.c:577
-msgid "Template To format error."
-msgstr ""
-
-#: src/prefs_template.c:582
-msgid "Template Cc format error."
-msgstr ""
-
-#: src/prefs_template.c:587
-msgid "Template Bcc format error."
-msgstr ""
-
-#: src/prefs_template.c:592
-msgid "Template subject format error."
-msgstr ""
-
-#: src/prefs_template.c:657
+#: src/prefs_template.c:667

 msgid "Delete template"
 msgstr ""
 
 msgid "Delete template"
 msgstr ""
 

-#: src/prefs_template.c:658
+#: src/prefs_template.c:668

 msgid "Do you really want to delete this template?"
 msgstr ""
 
 msgid "Do you really want to delete this template?"
 msgstr ""
 

-#: src/prefs_template.c:795
+#: src/prefs_template.c:805

 msgid "Current templates"
 msgstr ""
 
 msgid "Current templates"
 msgstr ""
 

-#: src/prefs_template.c:820
+#: src/prefs_template.c:830

 msgid "Template"
 msgstr ""
 
 msgid "Template"
 msgstr ""
 


@@ -9864,10 +9805,6 @@ msgstr ""
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr ""
 
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr ""
 

-#: src/prefs_themes.c:706
-msgid "The Claws Mail Team"
-msgstr ""
-

 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"


@@ -10028,50 +9965,50 @@ msgstr ""
 msgid "Already trying to send."
 msgstr ""
 
 msgid "Already trying to send."
 msgstr ""
 

-#: src/procmsg.c:1515
+#: src/procmsg.c:1517

 #, c-format
 msgid "Couldn't open file %s."
 msgstr ""
 
 #, c-format
 msgid "Couldn't open file %s."
 msgstr ""
 

-#: src/procmsg.c:1613
+#: src/procmsg.c:1615

 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr ""
 

-#: src/procmsg.c:1646
+#: src/procmsg.c:1648

 msgid "Queued message header is broken."
 msgstr ""
 
 msgid "Queued message header is broken."
 msgstr ""
 

-#: src/procmsg.c:1667
+#: src/procmsg.c:1669

 msgid "An error happened during SMTP session."
 msgstr ""
 
 msgid "An error happened during SMTP session."
 msgstr ""
 

-#: src/procmsg.c:1681
+#: src/procmsg.c:1683

 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr ""
 

-#: src/procmsg.c:1689
+#: src/procmsg.c:1691

 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 
 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr ""
 

-#: src/procmsg.c:1707
+#: src/procmsg.c:1709

 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 
 msgid "Couldn't create temporary file for news sending."
 msgstr ""
 

-#: src/procmsg.c:1720
+#: src/procmsg.c:1722

 msgid "Error when writing temporary file for news sending."
 msgstr ""
 
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 

-#: src/procmsg.c:1734
+#: src/procmsg.c:1736

 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr ""
 
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr ""
 

-#: src/procmsg.c:2214
+#: src/procmsg.c:2226

 msgid "Filtering messages...\n"
 msgstr ""
 
 msgid "Filtering messages...\n"
 msgstr ""
 


@@ -10403,11 +10340,11 @@ msgstr ""
 msgid "/Repl_y to/mailing _list"
 msgstr ""
 
 msgid "/Repl_y to/mailing _list"
 msgstr ""
 

-#: src/summaryview.c:424 src/toolbar.c:234
+#: src/summaryview.c:424 src/toolbar.c:239

 msgid "/_Forward"
 msgstr ""
 
 msgid "/_Forward"
 msgstr ""
 

-#: src/summaryview.c:425 src/toolbar.c:235
+#: src/summaryview.c:425 src/toolbar.c:240

 msgid "/For_ward as attachment"
 msgstr ""
 
 msgid "/For_ward as attachment"
 msgstr ""
 


@@ -10425,7 +10362,7 @@ msgstr ""
 
 #: src/summaryview.c:430
 msgid "/Move to _trash"
 
 #: src/summaryview.c:430
 msgid "/Move to _trash"

-msgstr ""
+msgstr "/Move to was_tebin"

 
 #: src/summaryview.c:431
 msgid "/_Delete..."
 
 #: src/summaryview.c:431
 msgid "/_Delete..."


@@ -10718,45 +10655,45 @@ msgstr ""
 msgid "_Overwrite"
 msgstr ""
 
 msgid "_Overwrite"
 msgstr ""
 

-#: src/summaryview.c:4423
+#: src/summaryview.c:4431

 msgid "Building threads..."
 msgstr ""
 
 msgid "Building threads..."
 msgstr ""
 

-#: src/summaryview.c:4642
+#: src/summaryview.c:4650

 msgid "Skip these rules"
 msgstr ""
 
 msgid "Skip these rules"
 msgstr ""
 

-#: src/summaryview.c:4645
+#: src/summaryview.c:4653

 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 

-#: src/summaryview.c:4648
+#: src/summaryview.c:4656

 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 
 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 

-#: src/summaryview.c:4677
+#: src/summaryview.c:4685

 msgid "Filtering"
 msgstr ""
 
 msgid "Filtering"
 msgstr ""
 

-#: src/summaryview.c:4678
+#: src/summaryview.c:4686

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 

-#: src/summaryview.c:4680
+#: src/summaryview.c:4688

 msgid "+_Filter"
 msgstr ""
 
 msgid "+_Filter"
 msgstr ""
 

-#: src/summaryview.c:4707
+#: src/summaryview.c:4715

 msgid "Filtering..."
 msgstr ""
 
 msgid "Filtering..."
 msgstr ""
 

-#: src/summaryview.c:4780
+#: src/summaryview.c:4788

 msgid "Processing configuration"
 msgstr ""
 
 msgid "Processing configuration"
 msgstr ""
 

-#: src/summaryview.c:6220
+#: src/summaryview.c:6235

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -10793,7 +10730,7 @@ msgstr ""
 msgid "[%s (%d bytes)]"
 msgstr ""
 
 msgid "[%s (%d bytes)]"
 msgstr ""
 

-#: src/textview.c:811
+#: src/textview.c:812

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -10802,79 +10739,79 @@ msgid ""
 "  Use "
 msgstr ""
 
 "  Use "
 msgstr ""
 

-#: src/textview.c:816
+#: src/textview.c:817

 msgid "'View Log'"
 msgstr ""
 
 msgid "'View Log'"
 msgstr ""
 

-#: src/textview.c:817
+#: src/textview.c:818

 msgid " in the Tools menu for more information."
 msgstr ""
 
 msgid " in the Tools menu for more information."
 msgstr ""
 

-#: src/textview.c:838
+#: src/textview.c:839

 msgid "  The following can be performed on this part by\n"
 msgstr ""
 
 msgid "  The following can be performed on this part by\n"
 msgstr ""
 

-#: src/textview.c:839
+#: src/textview.c:840

 msgid "  right-clicking the icon or list item:\n"
 msgstr ""
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr ""
 

-#: src/textview.c:841
+#: src/textview.c:842

 msgid "     - To save, select "
 msgstr ""
 
 msgid "     - To save, select "
 msgstr ""
 

-#: src/textview.c:842
+#: src/textview.c:843

 msgid "'Save as...'"
 msgstr ""
 
 msgid "'Save as...'"
 msgstr ""
 

-#: src/textview.c:843
+#: src/textview.c:844

 msgid " (Shortcut key: 'y')\n"
 msgstr ""
 
 msgid " (Shortcut key: 'y')\n"
 msgstr ""
 

-#: src/textview.c:844
+#: src/textview.c:845

 msgid "     - To display as text, select "
 msgstr ""
 
 msgid "     - To display as text, select "
 msgstr ""
 

-#: src/textview.c:845
+#: src/textview.c:846

 msgid "'Display as text'"
 msgstr ""
 
 msgid "'Display as text'"
 msgstr ""
 

-#: src/textview.c:846
+#: src/textview.c:847

 msgid " (Shortcut key: 't')\n"
 msgstr ""
 
 msgid " (Shortcut key: 't')\n"
 msgstr ""
 

-#: src/textview.c:847
+#: src/textview.c:848

 msgid "     - To open with an external program, select "
 msgstr ""
 
 msgid "     - To open with an external program, select "
 msgstr ""
 

-#: src/textview.c:848
+#: src/textview.c:849

 msgid "'Open'"
 msgstr ""
 
 msgid "'Open'"
 msgstr ""
 

-#: src/textview.c:849
+#: src/textview.c:850

 msgid " (Shortcut key: 'l')\n"
 msgstr ""
 
 msgid " (Shortcut key: 'l')\n"
 msgstr ""
 

-#: src/textview.c:850
+#: src/textview.c:851

 msgid "       (alternately double-click, or click the middle "
 msgstr ""
 
 msgid "       (alternately double-click, or click the middle "
 msgstr ""
 

-#: src/textview.c:851
+#: src/textview.c:852

 msgid "mouse button)\n"
 msgstr ""
 
 msgid "mouse button)\n"
 msgstr ""
 

-#: src/textview.c:852
+#: src/textview.c:853

 msgid "     - Or use "
 msgstr ""
 
 msgid "     - Or use "
 msgstr ""
 

-#: src/textview.c:853
+#: src/textview.c:854

 msgid "'Open with...'"
 msgstr ""
 
 msgid "'Open with...'"
 msgstr ""
 

-#: src/textview.c:854
+#: src/textview.c:855

 msgid " (Shortcut key: 'o')\n"
 msgstr ""
 
 msgid " (Shortcut key: 'o')\n"
 msgstr ""
 

-#: src/textview.c:943
+#: src/textview.c:944

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -10882,7 +10819,7 @@ msgid ""
 "Exit code %d\n"
 msgstr ""
 
 "Exit code %d\n"
 msgstr ""
 

-#: src/textview.c:2491
+#: src/textview.c:2492

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -10894,216 +10831,228 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
 "Open it anyway?"
 msgstr ""
 

-#: src/textview.c:2500
+#: src/textview.c:2501

 msgid "Phishing attempt warning"
 msgstr ""
 
 msgid "Phishing attempt warning"
 msgstr ""
 

-#: src/textview.c:2501
+#: src/textview.c:2502

 msgid "_Open URL"
 msgstr ""
 
 msgid "_Open URL"
 msgstr ""
 

-#: src/toolbar.c:162 src/toolbar.c:1486
+#: src/toolbar.c:166 src/toolbar.c:1535

 msgid "Receive Mail on all Accounts"
 msgstr ""
 
 msgid "Receive Mail on all Accounts"
 msgstr ""
 

-#: src/toolbar.c:163 src/toolbar.c:1500
+#: src/toolbar.c:167 src/toolbar.c:1549

 msgid "Receive Mail on current Account"
 msgstr ""
 
 msgid "Receive Mail on current Account"
 msgstr ""
 

-#: src/toolbar.c:164 src/toolbar.c:1506
+#: src/toolbar.c:168 src/toolbar.c:1555

 msgid "Send Queued Messages"
 msgstr ""
 
 msgid "Send Queued Messages"
 msgstr ""
 

-#: src/toolbar.c:165 src/toolbar.c:1519
+#: src/toolbar.c:169 src/toolbar.c:1568

 msgid "Compose Email"
 msgstr ""
 
 msgid "Compose Email"
 msgstr ""
 

-#: src/toolbar.c:166 src/toolbar.c:1523
+#: src/toolbar.c:170 src/toolbar.c:1572

 msgid "Compose News"
 msgstr ""
 
 msgid "Compose News"
 msgstr ""
 

-#: src/toolbar.c:167 src/toolbar.c:1554 src/toolbar.c:1564
+#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624

 msgid "Reply to Message"
 msgstr ""
 
 msgid "Reply to Message"
 msgstr ""
 

-#: src/toolbar.c:168 src/toolbar.c:1571 src/toolbar.c:1581
+#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641

 msgid "Reply to Sender"
 msgstr ""
 
 msgid "Reply to Sender"
 msgstr ""
 

-#: src/toolbar.c:169 src/toolbar.c:1588 src/toolbar.c:1598
+#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658

 msgid "Reply to All"
 msgstr ""
 
 msgid "Reply to All"
 msgstr ""
 

-#: src/toolbar.c:170 src/toolbar.c:1605 src/toolbar.c:1615
+#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675

 msgid "Reply to Mailing-list"
 msgstr ""
 
 msgid "Reply to Mailing-list"
 msgstr ""
 

-#: src/toolbar.c:171 src/toolbar.c:1622 src/toolbar.c:1632
+#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692

 msgid "Forward Message"
 msgstr ""
 
 msgid "Forward Message"
 msgstr ""
 

-#: src/toolbar.c:172 src/toolbar.c:1639
+#: src/toolbar.c:176 src/toolbar.c:1699

 msgid "Trash Message"
 msgstr ""
 
 msgid "Trash Message"
 msgstr ""
 

-#: src/toolbar.c:173 src/toolbar.c:1645
+#: src/toolbar.c:177 src/toolbar.c:1705

 msgid "Delete Message"
 msgstr ""
 
 msgid "Delete Message"
 msgstr ""
 

-#: src/toolbar.c:175 src/toolbar.c:1657
+#: src/toolbar.c:179 src/toolbar.c:1717

 msgid "Go to Previous Unread Message"
 msgstr ""
 
 msgid "Go to Previous Unread Message"
 msgstr ""
 

-#: src/toolbar.c:176 src/toolbar.c:1664
+#: src/toolbar.c:180 src/toolbar.c:1724

 msgid "Go to Next Unread Message"
 msgstr ""
 
 msgid "Go to Next Unread Message"
 msgstr ""
 

-#: src/toolbar.c:179
+#: src/toolbar.c:183

 msgid "Learn Spam or Ham"
 msgstr ""
 
 msgid "Learn Spam or Ham"
 msgstr ""
 

-#: src/toolbar.c:181 src/toolbar.c:1673
+#: src/toolbar.c:185 src/toolbar.c:1733

 msgid "Send Message"
 msgstr ""
 
 msgid "Send Message"
 msgstr ""
 

-#: src/toolbar.c:182 src/toolbar.c:1679
+#: src/toolbar.c:186 src/toolbar.c:1739

 msgid "Put into queue folder and send later"
 msgstr ""
 
 msgid "Put into queue folder and send later"
 msgstr ""
 

-#: src/toolbar.c:183 src/toolbar.c:1685
+#: src/toolbar.c:187 src/toolbar.c:1745

 msgid "Save to draft folder"
 msgstr ""
 
 msgid "Save to draft folder"
 msgstr ""
 

-#: src/toolbar.c:184 src/toolbar.c:1691
+#: src/toolbar.c:188 src/toolbar.c:1751

 msgid "Insert file"
 msgstr ""
 
 msgid "Insert file"
 msgstr ""
 

-#: src/toolbar.c:185 src/toolbar.c:1697
+#: src/toolbar.c:189 src/toolbar.c:1757

 msgid "Attach file"
 msgstr ""
 
 msgid "Attach file"
 msgstr ""
 

-#: src/toolbar.c:186 src/toolbar.c:1703
+#: src/toolbar.c:190 src/toolbar.c:1763

 msgid "Insert signature"
 msgstr ""
 
 msgid "Insert signature"
 msgstr ""
 

-#: src/toolbar.c:187 src/toolbar.c:1709
+#: src/toolbar.c:191 src/toolbar.c:1769

 msgid "Edit with external editor"
 msgstr ""
 
 msgid "Edit with external editor"
 msgstr ""
 

-#: src/toolbar.c:188 src/toolbar.c:1715
+#: src/toolbar.c:192 src/toolbar.c:1775

 msgid "Wrap long lines of current paragraph"
 msgstr ""
 
 msgid "Wrap long lines of current paragraph"
 msgstr ""
 

-#: src/toolbar.c:189 src/toolbar.c:1721
+#: src/toolbar.c:193 src/toolbar.c:1781

 msgid "Wrap all long lines"
 msgstr ""
 
 msgid "Wrap all long lines"
 msgstr ""
 

-#: src/toolbar.c:192 src/toolbar.c:1734
+#: src/toolbar.c:196 src/toolbar.c:1794

 msgid "Check spelling"
 msgstr ""
 
 msgid "Check spelling"
 msgstr ""
 

-#: src/toolbar.c:194
+#: src/toolbar.c:198

 msgid "Claws Mail Actions Feature"
 msgstr ""
 
 msgid "Claws Mail Actions Feature"
 msgstr ""
 

-#: src/toolbar.c:214
+#: src/toolbar.c:199 src/toolbar.c:1817
+msgid "Cancel receiving"
+msgstr ""
+
+#: src/toolbar.c:219

 msgid "/Reply with _quote"
 msgstr ""
 
 msgid "/Reply with _quote"
 msgstr ""
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/_Reply without quote"
 msgstr ""
 
 msgid "/_Reply without quote"
 msgstr ""
 

-#: src/toolbar.c:219
+#: src/toolbar.c:224

 msgid "/Reply to all with _quote"
 msgstr ""
 
 msgid "/Reply to all with _quote"
 msgstr ""
 

-#: src/toolbar.c:220
+#: src/toolbar.c:225

 msgid "/_Reply to all without quote"
 msgstr ""
 
 msgid "/_Reply to all without quote"
 msgstr ""
 

-#: src/toolbar.c:224
+#: src/toolbar.c:229

 msgid "/Reply to list with _quote"
 msgstr ""
 
 msgid "/Reply to list with _quote"
 msgstr ""
 

-#: src/toolbar.c:225
+#: src/toolbar.c:230

 msgid "/_Reply to list without quote"
 msgstr ""
 
 msgid "/_Reply to list without quote"
 msgstr ""
 

-#: src/toolbar.c:229
+#: src/toolbar.c:234

 msgid "/Reply to sender with _quote"
 msgstr ""
 
 msgid "/Reply to sender with _quote"
 msgstr ""
 

-#: src/toolbar.c:230
+#: src/toolbar.c:235

 msgid "/_Reply to sender without quote"
 msgstr ""
 
 msgid "/_Reply to sender without quote"
 msgstr ""
 

-#: src/toolbar.c:236
+#: src/toolbar.c:241

 msgid "/Redirec_t"
 msgstr ""
 
 msgid "/Redirec_t"
 msgstr ""
 

-#: src/toolbar.c:389
+#: src/toolbar.c:245
+msgid "/Learn as _Spam"
+msgstr ""
+
+#: src/toolbar.c:246
+msgid "/Learn as _Ham"
+msgstr ""
+
+#: src/toolbar.c:399

 msgid "Get Mail"
 msgstr ""
 
 msgid "Get Mail"
 msgstr ""
 

-#: src/toolbar.c:393
+#: src/toolbar.c:403

 msgid "Toolbar|Compose"
 msgstr ""
 
 msgid "Toolbar|Compose"
 msgstr ""
 

-#: src/toolbar.c:395 src/toolbar.c:486
+#: src/toolbar.c:405 src/toolbar.c:496

 msgid "Reply"
 msgstr ""
 
 msgid "Reply"
 msgstr ""
 

-#: src/toolbar.c:396 src/toolbar.c:487
+#: src/toolbar.c:406 src/toolbar.c:497

 msgid "All"
 msgstr ""
 
 msgid "All"
 msgstr ""
 

-#: src/toolbar.c:397 src/toolbar.c:488
+#: src/toolbar.c:407 src/toolbar.c:498

 msgid "Sender"
 msgstr ""
 
 msgid "Sender"
 msgstr ""
 

-#: src/toolbar.c:402 src/toolbar.c:493
+#: src/toolbar.c:412 src/toolbar.c:503

 msgid "Spam"
 msgstr ""
 
 msgid "Spam"
 msgstr ""
 

-#: src/toolbar.c:405 src/toolbar.c:495
+#: src/toolbar.c:415 src/toolbar.c:505

 msgid "Next"
 msgstr ""
 
 msgid "Next"
 msgstr ""
 

-#: src/toolbar.c:443
+#: src/toolbar.c:453

 msgid "Send later"
 msgstr ""
 
 msgid "Send later"
 msgstr ""
 

-#: src/toolbar.c:444
+#: src/toolbar.c:454

 msgid "Draft"
 msgstr ""
 
 msgid "Draft"
 msgstr ""
 

-#: src/toolbar.c:1493
+#: src/toolbar.c:1542

 msgid "Receive Mail on selected Account"
 msgstr ""
 
 msgid "Receive Mail on selected Account"
 msgstr ""
 

-#: src/toolbar.c:1530
+#: src/toolbar.c:1579

 msgid "Compose with selected Account"
 msgstr ""
 
 msgid "Compose with selected Account"
 msgstr ""
 

-#: src/toolbar.c:1536
+#: src/toolbar.c:1585

 msgid "Ham"
 msgstr ""
 
 msgid "Ham"
 msgstr ""
 

-#: src/toolbar.c:1544
+#: src/toolbar.c:1593

 msgid "Learn Spam"
 msgstr ""
 
 msgid "Learn Spam"
 msgstr ""
 

-#: src/toolbar.c:1548
+#: src/toolbar.c:1597

 msgid "Learn Ham"
 msgstr ""
 
 msgid "Learn Ham"
 msgstr ""
 

-#: src/wizard.c:461
-msgid "Welcome to Claws Mail "
+#: src/toolbar.c:1607
+msgid "Learn as..."

 msgstr ""
 
 msgstr ""
 

-#: src/wizard.c:467
-msgid "Claws Mail Team"
+#: src/wizard.c:461
+msgid "Welcome Mail Subject|Welcome to Claws Mail"

 msgstr ""
 
 #: src/wizard.c:484
 msgstr ""
 
 #: src/wizard.c:484


@@ -11111,7 +11060,7 @@ msgstr ""
 msgid ""
 "\n"
 "Welcome to Claws Mail\n"
 msgid ""
 "\n"
 "Welcome to Claws Mail\n"

-"-------------------------\n"
+"---------------------\n"

 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"


@@ -11191,91 +11140,97 @@ msgstr ""
 msgid "Your organization:"
 msgstr "Your organisation:"
 
 msgid "Your organization:"
 msgstr "Your organisation:"
 

-#: src/wizard.c:910
+#: src/wizard.c:913
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr ""
+
+#: src/wizard.c:917

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr ""
 

-#: src/wizard.c:947
+#: src/wizard.c:954

 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 

-#: src/wizard.c:951
+#: src/wizard.c:958

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr ""
 

-#: src/wizard.c:954
+#: src/wizard.c:961

 msgid "Use authentication"
 msgstr ""
 
 msgid "Use authentication"
 msgstr ""
 

-#: src/wizard.c:968
+#: src/wizard.c:975

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgstr ""
 
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgstr ""
 

-#: src/wizard.c:981
+#: src/wizard.c:988

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgstr ""
 
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgstr ""
 

-#: src/wizard.c:993
+#: src/wizard.c:1000

 msgid "Use SSL to connect to SMTP server"
 msgstr ""
 
 msgid "Use SSL to connect to SMTP server"
 msgstr ""
 

-#: src/wizard.c:1000 src/wizard.c:1223
+#: src/wizard.c:1007 src/wizard.c:1230

 msgid "Use SSL via STARTTLS"
 msgstr ""
 
 msgid "Use SSL via STARTTLS"
 msgstr ""
 

-#: src/wizard.c:1030 src/wizard.c:1049 src/wizard.c:1158
+#: src/wizard.c:1037 src/wizard.c:1056 src/wizard.c:1165

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr ""
 

-#: src/wizard.c:1069
+#: src/wizard.c:1076

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr ""
 

-#: src/wizard.c:1120
+#: src/wizard.c:1127

 msgid "IMAP"
 msgstr ""
 
 msgid "IMAP"
 msgstr ""
 

-#: src/wizard.c:1145
+#: src/wizard.c:1152

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr ""
 

-#: src/wizard.c:1154
+#: src/wizard.c:1161

 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 

-#: src/wizard.c:1169
+#: src/wizard.c:1176

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr ""
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr ""
 

-#: src/wizard.c:1185
+#: src/wizard.c:1192

 msgid "Password:"
 msgstr ""
 
 msgid "Password:"
 msgstr ""
 

-#: src/wizard.c:1197
+#: src/wizard.c:1204

 msgid "IMAP server directory:"
 msgstr ""
 
 msgid "IMAP server directory:"
 msgstr ""
 

-#: src/wizard.c:1216
+#: src/wizard.c:1223

 msgid "Use SSL to connect to receiving server"
 msgstr ""
 
 msgid "Use SSL to connect to receiving server"
 msgstr ""
 

-#: src/wizard.c:1340
+#: src/wizard.c:1347

 msgid "Claws Mail Setup Wizard"
 msgstr ""
 
 msgid "Claws Mail Setup Wizard"
 msgstr ""
 

-#: src/wizard.c:1372
+#: src/wizard.c:1379

 msgid "Welcome to Claws Mail"
 msgstr ""
 
 msgid "Welcome to Claws Mail"
 msgstr ""
 

-#: src/wizard.c:1380
+#: src/wizard.c:1387

 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"


@@ -11284,31 +11239,31 @@ msgid ""
 "five minutes."
 msgstr ""
 
 "five minutes."
 msgstr ""
 

-#: src/wizard.c:1393
+#: src/wizard.c:1400

 msgid "About You"
 msgstr ""
 
 msgid "About You"
 msgstr ""
 

-#: src/wizard.c:1395 src/wizard.c:1404 src/wizard.c:1413 src/wizard.c:1423
+#: src/wizard.c:1402 src/wizard.c:1411 src/wizard.c:1420 src/wizard.c:1430

 msgid "Bold fields must be completed"
 msgstr ""
 
 msgid "Bold fields must be completed"
 msgstr ""
 

-#: src/wizard.c:1402
+#: src/wizard.c:1409

 msgid "Receiving mail"
 msgstr ""
 
 msgid "Receiving mail"
 msgstr ""
 

-#: src/wizard.c:1411
+#: src/wizard.c:1418

 msgid "Sending mail"
 msgstr ""
 
 msgid "Sending mail"
 msgstr ""
 

-#: src/wizard.c:1421
+#: src/wizard.c:1428

 msgid "Saving mail on disk"
 msgstr ""
 
 msgid "Saving mail on disk"
 msgstr ""
 

-#: src/wizard.c:1431
+#: src/wizard.c:1438

 msgid "Configuration finished"
 msgstr ""
 
 msgid "Configuration finished"
 msgstr ""
 

-#: src/wizard.c:1439
+#: src/wizard.c:1446

 msgid ""
 "Claws Mail is now ready.\n"
 "\n"
 msgid ""
 "Claws Mail is now ready.\n"
 "\n"

diff --git a/po/fi.po b/po/fi.po
index aba5ca7b30b497efd1c6f53c5d8874cbd2f8170e..5bd5924b729cfcf6980e9f067b9cb7c1ee02e86a 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 # Finnish translations for sylpheed-claws package.
 # This file is distributed under the same license as the sylpheed-claws package.
 # Finnish translations for sylpheed-claws package.
 # This file is distributed under the same license as the sylpheed-claws package.

-# Flammie Pirinen <flammie@iki.fi>, 2005.
+# Flammie Pirinen <flammie@iki.fi>, 2005—2007

 # Sanastoani:
 # To: = Vastaanottaja:
 # Cc: = Kopio:
 # Sanastoani:
 # To: = Vastaanottaja:
 # Cc: = Kopio:


@@ -9,7 +9,8 @@
 # Newsgroups: = Uutisryhmät:
 # Followup-To: = Keskustelunsiirto:
 # Certificate = Varmenne
 # Newsgroups: = Uutisryhmät:
 # Followup-To: = Keskustelunsiirto:
 # Certificate = Varmenne

-# Subject = Otsikko
+# Subject = Aihe (oli: Otsikko)
+# Type-Ahead (find) = Näppäilyennakointihaku

 # lainausmerkit ”, ellipsi … (UTF-8-merkkejä)
 # Kääntäjän kommenteissa XXX:llä on merkitty epävarmoja ja heikkoja tai
 # ongelmallisia käännöksiä
 # lainausmerkit ”, ellipsi … (UTF-8-merkkejä)
 # Kääntäjän kommenteissa XXX:llä on merkitty epävarmoja ja heikkoja tai
 # ongelmallisia käännöksiä


@@ -17,9 +18,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claws\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claws\n"

-"Report-Msgid-Bugs-To: paul@sylpheed.org\n"
-"POT-Creation-Date: 2006-09-18 10:12+0100\n"
-"PO-Revision-Date: 2006-09-19 02:55+0300\n"
+"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
+"POT-Creation-Date: 2007-01-03 04:40+0200\n"
+"PO-Revision-Date: 2007-01-03 06:43+0200\n"

 "Last-Translator: Flammie Pirinen <flammie@iki.fi>\n"
 "Language-Team: Finnish <laatu@lokalisointi.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Flammie Pirinen <flammie@iki.fi>\n"
 "Language-Team: Finnish <laatu@lokalisointi.org>\n"
 "MIME-Version: 1.0\n"


@@ -78,17 +79,25 @@ msgstr "(Nimetön)"
 msgid "Delete account"
 msgstr "Poista tili"
 
 msgid "Delete account"
 msgstr "Poista tili"
 

-#: src/account.c:1458
+#: src/account.c:1461
+msgid "Accounts List Default Column Name|D"
+msgstr "O"
+
+#: src/account.c:1467

 msgid "Default account"
 msgstr "Oletustili"
 
 msgid "Default account"
 msgstr "Oletustili"
 

-#: src/account.c:1472
+#: src/account.c:1475
+msgid "Accounts List Get Column Name|G"
+msgstr "H"
+
+#: src/account.c:1481

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Hae viestit hakee viestit merkityiltä tileiltä"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Hae viestit hakee viestit merkityiltä tileiltä"
 

-#: src/account.c:1479 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5568 src/compose.c:5859 src/editaddress.c:953
-#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:279
+#: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132
+#: src/compose.c:5821 src/compose.c:6112 src/editaddress.c:1041
+#: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364


@@ -96,11 +105,11 @@ msgstr "Hae viestit hakee viestit merkityiltä tileiltä"
 msgid "Name"
 msgstr "Nimi"
 
 msgid "Name"
 msgstr "Nimi"
 

-#: src/account.c:1486 src/prefs_account.c:1165 src/prefs_account.c:2682
+#: src/account.c:1495 src/prefs_account.c:1176 src/prefs_account.c:2712

 msgid "Protocol"
 msgstr "Käytäntö"
 
 msgid "Protocol"
 msgstr "Käytäntö"
 

-#: src/account.c:1493 src/ssl_manager.c:102
+#: src/account.c:1502 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Palvelin"
 
 msgid "Server"
 msgstr "Palvelin"
 


@@ -163,7 +172,7 @@ msgstr "--- Komennon %s suoritus loppui\n"
 msgid "Action's input/output"
 msgstr "Toiminnon syötteet ja tulosteet"
 
 msgid "Action's input/output"
 msgstr "Toiminnon syötteet ja tulosteet"
 

-#: src/action.c:1527
+#: src/action.c:1529

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -174,11 +183,11 @@ msgstr ""
 "(”%%h” korvautuu parametreilläsi)\n"
 " %s"
 
 "(”%%h” korvautuu parametreilläsi)\n"
 " %s"
 

-#: src/action.c:1532
+#: src/action.c:1534

 msgid "Action's hidden user argument"
 msgstr "Toiminnon piilotettu käyttäjäparametri"
 
 msgid "Action's hidden user argument"
 msgstr "Toiminnon piilotettu käyttäjäparametri"
 

-#: src/action.c:1536
+#: src/action.c:1538

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -189,7 +198,7 @@ msgstr ""
 "(”%%u” korvautuu parametreilläsi)\n"
 " %s"
 
 "(”%%u” korvautuu parametreilläsi)\n"
 " %s"
 

-#: src/action.c:1541
+#: src/action.c:1543

 msgid "Action's user argument"
 msgstr "Toiminnon käyttäjäparametri"
 
 msgid "Action's user argument"
 msgstr "Toiminnon käyttäjäparametri"
 


@@ -198,12 +207,12 @@ msgid "Add to address book"
 msgstr "Lisää osoitekirjaan"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
 msgstr "Lisää osoitekirjaan"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377

-#: src/toolbar.c:449
+#: src/toolbar.c:459

 msgid "Address"
 msgstr "Osoite"
 
 msgid "Address"
 msgstr "Osoite"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:761
-#: src/editaddress.c:825 src/editgroup.c:281
+#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:849
+#: src/editaddress.c:913 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Huomiot"
 
 msgid "Remarks"
 msgstr "Huomiot"
 


@@ -211,342 +220,348 @@ msgstr "Huomiot"
 msgid "Select Address Book Folder"
 msgstr "Valitse osoitekirjan hakemisto"
 
 msgid "Select Address Book Folder"
 msgstr "Valitse osoitekirjan hakemisto"
 

-#: src/addressbook.c:133 src/editaddress.c:759 src/editaddress.c:807
-#: src/editgroup.c:280 src/expldifdlg.c:521 src/exporthtml.c:638
+#: src/addressbook.c:133 src/editaddress.c:847 src/editaddress.c:895
+#: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638

 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 

-#: src/addressbook.c:416
+#: src/addressbook.c:419

 msgid "/_Book"
 msgstr "_Kirjat"
 
 msgid "/_Book"
 msgstr "_Kirjat"
 

-#: src/addressbook.c:417
+#: src/addressbook.c:420

 msgid "/_Book/New _Book"
 msgstr "Uusi _osoitekirja"
 
 msgid "/_Book/New _Book"
 msgstr "Uusi _osoitekirja"
 

-#: src/addressbook.c:418
+#: src/addressbook.c:421

 msgid "/_Book/New _Folder"
 msgstr "Uusi _hakemisto"
 
 msgid "/_Book/New _Folder"
 msgstr "Uusi _hakemisto"
 

-#: src/addressbook.c:419
+#: src/addressbook.c:422

 msgid "/_Book/New _vCard"
 msgstr "Uusi _vCard-käyntikortti"
 
 msgid "/_Book/New _vCard"
 msgstr "Uusi _vCard-käyntikortti"
 

-#: src/addressbook.c:421
+#: src/addressbook.c:424

 msgid "/_Book/New _JPilot"
 msgstr "Uusi _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "Uusi _JPilot"
 

-#: src/addressbook.c:424
+#: src/addressbook.c:427

 msgid "/_Book/New LDAP _Server"
 msgstr "Uusi LDAP-p_alvelin"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "Uusi LDAP-p_alvelin"
 

-#: src/addressbook.c:426 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:432

 msgid "/_Book/---"
 msgstr "---"
 
 msgid "/_Book/---"
 msgstr "---"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:430

 msgid "/_Book/_Edit book"
 msgstr "_Muokkaa kirjaa"
 
 msgid "/_Book/_Edit book"
 msgstr "_Muokkaa kirjaa"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:431

 msgid "/_Book/_Delete book"
 msgstr "_Poista kirja"
 
 msgid "/_Book/_Delete book"
 msgstr "_Poista kirja"
 

-#: src/addressbook.c:430
+#: src/addressbook.c:433

 msgid "/_Book/_Save"
 msgstr "_Tallenna"
 
 msgid "/_Book/_Save"
 msgstr "_Tallenna"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:434

 msgid "/_Book/_Close"
 msgstr "_Sulje"
 
 msgid "/_Book/_Close"
 msgstr "_Sulje"
 

-#: src/addressbook.c:432
+#: src/addressbook.c:435

 msgid "/_Address"
 msgstr "_Osoite"
 
 msgid "/_Address"
 msgstr "_Osoite"
 

-#: src/addressbook.c:433
+#: src/addressbook.c:436

 msgid "/_Address/_Select all"
 msgstr "_Valitse kaikki"
 
 msgid "/_Address/_Select all"
 msgstr "_Valitse kaikki"
 

-#: src/addressbook.c:434 src/addressbook.c:438 src/addressbook.c:441
-#: src/addressbook.c:444
+#: src/addressbook.c:437 src/addressbook.c:441 src/addressbook.c:444
+#: src/addressbook.c:447

 msgid "/_Address/---"
 msgstr "---"
 
 msgid "/_Address/---"
 msgstr "---"
 

-#: src/addressbook.c:435
+#: src/addressbook.c:438

 msgid "/_Address/C_ut"
 msgstr "_Leikkaa"
 
 msgid "/_Address/C_ut"
 msgstr "_Leikkaa"
 

-#: src/addressbook.c:436
+#: src/addressbook.c:439

 msgid "/_Address/_Copy"
 msgstr "_Kopioi"
 
 msgid "/_Address/_Copy"
 msgstr "_Kopioi"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:440

 msgid "/_Address/_Paste"
 msgstr "_Liitä"
 
 msgid "/_Address/_Paste"
 msgstr "_Liitä"
 

-#: src/addressbook.c:439
+#: src/addressbook.c:442

 msgid "/_Address/_Edit"
 msgstr "_Muokkaa"
 
 msgid "/_Address/_Edit"
 msgstr "_Muokkaa"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:443

 msgid "/_Address/_Delete"
 msgstr "_Poista"
 
 msgid "/_Address/_Delete"
 msgstr "_Poista"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:445

 msgid "/_Address/New _Address"
 msgstr "Uusi _osoite"
 
 msgid "/_Address/New _Address"
 msgstr "Uusi _osoite"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:446

 msgid "/_Address/New _Group"
 msgstr "Uusi _ryhmä"
 
 msgid "/_Address/New _Group"
 msgstr "Uusi _ryhmä"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:448

 msgid "/_Address/_Mail To"
 msgstr "_Kirjoita viesti"
 
 msgid "/_Address/_Mail To"
 msgstr "_Kirjoita viesti"
 

-#: src/addressbook.c:446 src/compose.c:756 src/mainwindow.c:799
+#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:799

 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "_Työkalut"
 
 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "_Työkalut"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:450

 msgid "/_Tools/Import _LDIF file..."
 msgstr "Tuo _LDIF-tiedostosta…"
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "Tuo _LDIF-tiedostosta…"
 

-#: src/addressbook.c:448
+#: src/addressbook.c:451

 msgid "/_Tools/Import M_utt file..."
 msgstr "Tuo _Mutt-tiedostosta…"
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "Tuo _Mutt-tiedostosta…"
 

-#: src/addressbook.c:449
+#: src/addressbook.c:452

 msgid "/_Tools/Import _Pine file..."
 msgstr "Tuo _Pine-tiedostosta…"
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "Tuo _Pine-tiedostosta…"
 

-#: src/addressbook.c:450 src/mainwindow.c:808 src/mainwindow.c:831
+#: src/addressbook.c:453 src/mainwindow.c:808 src/mainwindow.c:831

 #: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
 #: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
 msgid "/_Tools/---"
 msgstr "---"
 
 #: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
 #: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
 msgid "/_Tools/---"
 msgstr "---"
 

-#: src/addressbook.c:451
+#: src/addressbook.c:454

 msgid "/_Tools/Export _HTML..."
 msgstr "Vie _HTML-tiedostoon…"
 
 msgid "/_Tools/Export _HTML..."
 msgstr "Vie _HTML-tiedostoon…"
 

-#: src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Tools/Export LDI_F..."
 msgstr "Vie LDI_F-tiedostoon…"
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "Vie LDI_F-tiedostoon…"
 

-#: src/addressbook.c:453 src/compose.c:761 src/mainwindow.c:874
+#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:874

 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "O_hje"
 
 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "O_hje"
 

-#: src/addressbook.c:454 src/compose.c:762 src/mainwindow.c:880
+#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:880

 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "_Tietoja"
 
 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "_Tietoja"
 

-#: src/addressbook.c:459 src/addressbook.c:473 src/compose.c:535
+#: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545

 #: src/mainwindow.c:518 src/messageview.c:164
 msgid "/_Edit"
 msgstr "_Muokkaa"
 
 #: src/mainwindow.c:518 src/messageview.c:164
 msgid "/_Edit"
 msgstr "_Muokkaa"
 

-#: src/addressbook.c:460 src/addressbook.c:474
+#: src/addressbook.c:463 src/addressbook.c:479

 msgid "/_Delete"
 msgstr "_Poista"
 
 msgid "/_Delete"
 msgstr "_Poista"
 

-#: src/addressbook.c:461 src/addressbook.c:463 src/addressbook.c:472
-#: src/addressbook.c:475 src/addressbook.c:478 src/addressbook.c:482
-#: src/compose.c:514 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
-#: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:54
-#: src/news_gtk.c:57 src/news_gtk.c:59 src/plugins/trayicon/trayicon.c:95
-#: src/plugins/trayicon/trayicon.c:98 src/plugins/trayicon/trayicon.c:100
-#: src/summaryview.c:422 src/summaryview.c:426 src/summaryview.c:431
-#: src/summaryview.c:449 src/summaryview.c:470 src/summaryview.c:476
-msgid "/---"
-msgstr "---"
+#: src/addressbook.c:465
+msgid "/New _Book"
+msgstr "Uusi _osoitekirja"

 
 

-#: src/addressbook.c:462
+#: src/addressbook.c:466

 msgid "/New _Folder"
 msgstr "Uusi _hakemisto"
 
 msgid "/New _Folder"
 msgstr "Uusi _hakemisto"
 

-#: src/addressbook.c:464 src/addressbook.c:479
+#: src/addressbook.c:467 src/addressbook.c:482
+msgid "/New _Group"
+msgstr "Uusi _ryhmä"
+
+#: src/addressbook.c:469 src/addressbook.c:484

 msgid "/C_ut"
 msgstr "_Leikkaa"
 
 msgid "/C_ut"
 msgstr "_Leikkaa"
 

-#: src/addressbook.c:465 src/addressbook.c:480
+#: src/addressbook.c:470 src/addressbook.c:485

 msgid "/_Copy"
 msgstr "_Kopioi"
 
 msgid "/_Copy"
 msgstr "_Kopioi"
 

-#: src/addressbook.c:466 src/addressbook.c:481
+#: src/addressbook.c:471 src/addressbook.c:486

 msgid "/_Paste"
 msgstr "L_iitä"
 
 msgid "/_Paste"
 msgstr "L_iitä"
 

-#: src/addressbook.c:471
+#: src/addressbook.c:476

 msgid "/_Select all"
 msgstr "Valitse _kaikki"
 
 msgid "/_Select all"
 msgstr "Valitse _kaikki"
 

-#: src/addressbook.c:476
+#: src/addressbook.c:481

 msgid "/New _Address"
 msgstr "Uusi _osoite"
 
 msgid "/New _Address"
 msgstr "Uusi _osoite"
 

-#: src/addressbook.c:477
-msgid "/New _Group"
-msgstr "Uusi _ryhmä"
-
-#: src/addressbook.c:484
+#: src/addressbook.c:489

 msgid "/_Mail To"
 msgstr "_Kirjoita viesti"
 
 msgid "/_Mail To"
 msgstr "_Kirjoita viesti"
 

-#: src/addressbook.c:486
+#: src/addressbook.c:491

 msgid "/_Browse Entry"
 msgstr "_Selaa osoitteita"
 
 msgid "/_Browse Entry"
 msgstr "_Selaa osoitteita"
 

-#: src/addressbook.c:499 src/crash.c:450 src/crash.c:469 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:127 src/prefs_themes.c:683
+#: src/addressbook.c:504 src/crash.c:453 src/crash.c:472 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_themes.c:683

 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Tuntematon"
 

-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:126
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:126

 msgid "Success"
 msgstr "Onnistui"
 
 msgid "Success"
 msgstr "Onnistui"
 

-#: src/addressbook.c:507 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127

 msgid "Bad arguments"
 msgstr "Virheellisiä parametrejä"
 
 msgid "Bad arguments"
 msgstr "Virheellisiä parametrejä"
 

-#: src/addressbook.c:508 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128

 msgid "File not specified"
 msgstr "Tiedostoa ei annettu"
 
 msgid "File not specified"
 msgstr "Tiedostoa ei annettu"
 

-#: src/addressbook.c:509 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129

 msgid "Error opening file"
 msgstr "Virhe tiedostoa avattaessa"
 
 msgid "Error opening file"
 msgstr "Virhe tiedostoa avattaessa"
 

-#: src/addressbook.c:510 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130

 msgid "Error reading file"
 msgstr "Virhe tiedostoa luettaessa"
 
 msgid "Error reading file"
 msgstr "Virhe tiedostoa luettaessa"
 

-#: src/addressbook.c:511 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131

 msgid "End of file encountered"
 msgstr "Tiedoston loppu tuli vastaan"
 
 msgid "End of file encountered"
 msgstr "Tiedoston loppu tuli vastaan"
 

-#: src/addressbook.c:512 src/importldif.c:132
+#: src/addressbook.c:517 src/importldif.c:132

 msgid "Error allocating memory"
 msgstr "Virhe muistia varattaessa"
 
 msgid "Error allocating memory"
 msgstr "Virhe muistia varattaessa"
 

-#: src/addressbook.c:513 src/importldif.c:133
+#: src/addressbook.c:518 src/importldif.c:133

 msgid "Bad file format"
 msgstr "Virheellinen tiedostomuoto"
 
 msgid "Bad file format"
 msgstr "Virheellinen tiedostomuoto"
 

-#: src/addressbook.c:514 src/importldif.c:134
+#: src/addressbook.c:519 src/importldif.c:134

 msgid "Error writing to file"
 msgstr "Virhe kirjoitettaessa tiedostoon"
 
 msgid "Error writing to file"
 msgstr "Virhe kirjoitettaessa tiedostoon"
 

-#: src/addressbook.c:515 src/importldif.c:135
+#: src/addressbook.c:520 src/importldif.c:135

 msgid "Error opening directory"
 msgstr "Virhe avattaessa hakemistoa"
 
 msgid "Error opening directory"
 msgstr "Virhe avattaessa hakemistoa"
 

-#: src/addressbook.c:516 src/importldif.c:136
+#: src/addressbook.c:521 src/importldif.c:136

 msgid "No path specified"
 msgstr "Polku on määrittelemättä"
 
 msgid "No path specified"
 msgstr "Polku on määrittelemättä"
 

-#: src/addressbook.c:526
+#: src/addressbook.c:531

 msgid "Error connecting to LDAP server"
 msgstr "Virhe yhdistettäessä LDAP-palvelimeen"
 
 msgid "Error connecting to LDAP server"
 msgstr "Virhe yhdistettäessä LDAP-palvelimeen"
 

-#: src/addressbook.c:527
+#: src/addressbook.c:532

 msgid "Error initializing LDAP"
 msgstr "Virhe LDAPin alustuksessa"
 
 msgid "Error initializing LDAP"
 msgstr "Virhe LDAPin alustuksessa"
 

-#: src/addressbook.c:528
+#: src/addressbook.c:533

 msgid "Error binding to LDAP server"
 msgstr "Virhe LDAP-palvelimen bindauksessa"
 
 msgid "Error binding to LDAP server"
 msgstr "Virhe LDAP-palvelimen bindauksessa"
 

-#: src/addressbook.c:529
+#: src/addressbook.c:534

 msgid "Error searching LDAP database"
 msgstr "Virhe LDAP-tietokantaa etsittäessä"
 
 msgid "Error searching LDAP database"
 msgstr "Virhe LDAP-tietokantaa etsittäessä"
 

-#: src/addressbook.c:530
+#: src/addressbook.c:535

 msgid "Timeout performing LDAP operation"
 msgstr "Aikatkaisu LDAP-komentoa suoritettaessa"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Aikatkaisu LDAP-komentoa suoritettaessa"
 

-#: src/addressbook.c:531
+#: src/addressbook.c:536

 msgid "Error in LDAP search criteria"
 msgstr "Virhe LDAP-hakuehdoissa"
 
 msgid "Error in LDAP search criteria"
 msgstr "Virhe LDAP-hakuehdoissa"
 

-#: src/addressbook.c:532
+#: src/addressbook.c:537

 msgid "No LDAP entries found for search criteria"
 msgstr "Hakuehtoja vastaavia LDAP-kenttiä ei löytynyt"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "Hakuehtoja vastaavia LDAP-kenttiä ei löytynyt"
 

-#: src/addressbook.c:533
+#: src/addressbook.c:538

 msgid "LDAP search terminated on request"
 msgstr "LDAP-haku lopetettu pyynnöstä"
 
 msgid "LDAP search terminated on request"
 msgstr "LDAP-haku lopetettu pyynnöstä"
 

-#: src/addressbook.c:534
+#: src/addressbook.c:539

 msgid "Error starting TLS connection"
 msgstr "Virhe TLS-yhteyttä avattaessa"
 
 msgid "Error starting TLS connection"
 msgstr "Virhe TLS-yhteyttä avattaessa"
 

-#: src/addressbook.c:849
+#: src/addressbook.c:897

 msgid "Sources"
 msgstr "Lähteet"
 
 msgid "Sources"
 msgstr "Lähteet"
 

-#: src/addressbook.c:853 src/prefs_other.c:101 src/toolbar.c:190
-#: src/toolbar.c:1731
+#: src/addressbook.c:901 src/prefs_other.c:101 src/toolbar.c:194
+#: src/toolbar.c:1787

 msgid "Address book"
 msgstr "Osoitekirja"
 
 msgid "Address book"
 msgstr "Osoitekirja"
 

-#: src/addressbook.c:976
+#: src/addressbook.c:1033

 msgid "Lookup name:"
 msgstr "Haettava nimi:"
 
 msgid "Lookup name:"
 msgstr "Haettava nimi:"
 

-#: src/addressbook.c:1036 src/compose.c:1987 src/compose.c:4227
-#: src/compose.c:5430 src/compose.c:6175 src/summary_search.c:282
+#: src/addressbook.c:1106 src/compose.c:2129 src/compose.c:4443
+#: src/compose.c:5667 src/compose.c:6432 src/compose.c:9453
+#: src/summary_search.c:359

 msgid "To:"
 msgstr "Vastaanottaja:"
 
 msgid "To:"
 msgstr "Vastaanottaja:"
 

-#: src/addressbook.c:1040 src/compose.c:1971 src/compose.c:3994
-#: src/compose.c:4226
+#: src/addressbook.c:1110 src/compose.c:2113 src/compose.c:4182
+#: src/compose.c:4442 src/compose.c:9462

 msgid "Cc:"
 msgstr "Kopio:"
 
 msgid "Cc:"
 msgstr "Kopio:"
 

-#: src/addressbook.c:1044 src/compose.c:1974 src/compose.c:4025
+#: src/addressbook.c:1114 src/compose.c:2116 src/compose.c:4213

 msgid "Bcc:"
 msgstr "Piilokopio:"
 
 msgid "Bcc:"
 msgstr "Piilokopio:"
 

-#: src/addressbook.c:1279 src/addressbook.c:1302
+#: src/addressbook.c:1363 src/addressbook.c:1409

 msgid "Delete address(es)"
 msgstr "Poista osoitteita"
 
 msgid "Delete address(es)"
 msgstr "Poista osoitteita"
 

-#: src/addressbook.c:1280
+#: src/addressbook.c:1364

 msgid "This address data is readonly and cannot be deleted."
 msgstr "Tämä osoitetieto on kirjoitussuojattua, eikä sitä voi poistaa."
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Tämä osoitetieto on kirjoitussuojattua, eikä sitä voi poistaa."
 

-#: src/addressbook.c:1303
+#: src/addressbook.c:1403
+msgid "Delete group"
+msgstr "Poista ryhmä"
+
+#: src/addressbook.c:1404
+msgid ""
+"Really delete the group(s)?\n"
+"The addresses it contains will not be lost."
+msgstr ""
+"Poistetaanko ryhmiä?\n"
+"Sisältyvät osoitteet häviävät poistossa."
+
+#: src/addressbook.c:1410

 msgid "Really delete the address(es)?"
 msgstr "Poistetaanko osoitteita?"
 
 msgid "Really delete the address(es)?"
 msgstr "Poistetaanko osoitteita?"
 

-#: src/addressbook.c:1898
+#: src/addressbook.c:2014

 msgid "Cannot paste. Target address book is readonly."
 msgstr "Liittäminen ei onnistu: kohdeosoitekirja on kirjoitussuojattu."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Liittäminen ei onnistu: kohdeosoitekirja on kirjoitussuojattu."
 

-#: src/addressbook.c:1909
+#: src/addressbook.c:2025

 msgid "Cannot paste into an address group."
 msgstr "Ei voida liittää osoiteryhmään."
 
 msgid "Cannot paste into an address group."
 msgstr "Ei voida liittää osoiteryhmään."
 

-#: src/addressbook.c:2565
+#: src/addressbook.c:2708

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Poistetaanko hakutulokset ja osoitteet ”%s”?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Poistetaanko hakutulokset ja osoitteet ”%s”?"
 

-#: src/addressbook.c:2568 src/addressbook.c:2594
+#: src/addressbook.c:2711 src/addressbook.c:2737 src/addressbook.c:2744

 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Poista"
 
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Poista"
 

-#: src/addressbook.c:2577
+#: src/addressbook.c:2720

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -555,19 +570,28 @@ msgstr ""
 "Poistetaanko kansio ja kaikki osoitteet kohteessa ”%s”?Jos vain kansio "
 "poistetaan, osoitteet siirretään yläkansioon."
 
 "Poistetaanko kansio ja kaikki osoitteet kohteessa ”%s”?Jos vain kansio "
 "poistetaan, osoitteet siirretään yläkansioon."
 

-#: src/addressbook.c:2580 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2723 src/imap_gtk.c:284 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Poista kansio"
 
 msgid "Delete folder"
 msgstr "Poista kansio"
 

-#: src/addressbook.c:2581
+#: src/addressbook.c:2724

 msgid "+Delete _folder only"
 msgid "+Delete _folder only"

-msgstr "Poista kansio"
+msgstr "Poista _kansio"

 
 

-#: src/addressbook.c:2581
+#: src/addressbook.c:2724

 msgid "Delete folder and _addresses"
 msgstr "Poista kansio _osoitteineen"
 
 msgid "Delete folder and _addresses"
 msgstr "Poista kansio _osoitteineen"
 

-#: src/addressbook.c:2592
+#: src/addressbook.c:2735
+#, c-format
+msgid ""
+"Do you want to delete '%s'?\n"
+"The addresses it contains will not be lost."
+msgstr ""
+"Poistetaanko ”%s”?\n"
+"Sen sisältämät osoitteet häviävät poistossa."
+
+#: src/addressbook.c:2742

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -576,19 +600,19 @@ msgstr ""
 "Poistetaanko ”%s”?\n"
 "Sen sisältämät osoitteet häviävät poistossa."
 
 "Poistetaanko ”%s”?\n"
 "Sen sisältämät osoitteet häviävät poistossa."
 

-#: src/addressbook.c:3403
+#: src/addressbook.c:3595

 msgid "New user, could not save index file."
 msgstr "Uusi käyttäjä, ei voitu tallentaa indeksitiedostoa."
 
 msgid "New user, could not save index file."
 msgstr "Uusi käyttäjä, ei voitu tallentaa indeksitiedostoa."
 

-#: src/addressbook.c:3407
+#: src/addressbook.c:3599

 msgid "New user, could not save address book files."
 msgstr "Uusi käyttäjä, ei voitu tallentaa osoitekirjatiedostoihin."
 
 msgid "New user, could not save address book files."
 msgstr "Uusi käyttäjä, ei voitu tallentaa osoitekirjatiedostoihin."
 

-#: src/addressbook.c:3417
+#: src/addressbook.c:3609

 msgid "Old address book converted successfully."
 msgstr "Vanha osoitekirja muunnettu onnistuneesti."
 
 msgid "Old address book converted successfully."
 msgstr "Vanha osoitekirja muunnettu onnistuneesti."
 

-#: src/addressbook.c:3422
+#: src/addressbook.c:3614

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -596,7 +620,7 @@ msgstr ""
 "Vanha osoitekirja muunnettu,\n"
 "uutta osoiteindeksiä ei voitu tallentaa."
 
 "Vanha osoitekirja muunnettu,\n"
 "uutta osoiteindeksiä ei voitu tallentaa."
 

-#: src/addressbook.c:3435
+#: src/addressbook.c:3627

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -604,7 +628,7 @@ msgstr ""
 "Ei voitu muuntaa osoitekirjaa,\n"
 "luotiin tiedostot tyhjälle osoitekirjalle."
 
 "Ei voitu muuntaa osoitekirjaa,\n"
 "luotiin tiedostot tyhjälle osoitekirjalle."
 

-#: src/addressbook.c:3441
+#: src/addressbook.c:3633

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -612,7 +636,7 @@ msgstr ""
 "Ei voitu muuntaa osoitekirjaa,\n"
 "ei voitu luoda tiedostoja uusia osoitekirjatiedostoja."
 
 "Ei voitu muuntaa osoitekirjaa,\n"
 "ei voitu luoda tiedostoja uusia osoitekirjatiedostoja."
 

-#: src/addressbook.c:3446
+#: src/addressbook.c:3638

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -620,70 +644,70 @@ msgstr ""
 "Ei voitu muuntaa osoitekirjaa\n"
 "eikä luoda tiedostoja uudelle osoitekirjalle."
 
 "Ei voitu muuntaa osoitekirjaa\n"
 "eikä luoda tiedostoja uudelle osoitekirjalle."
 

-#: src/addressbook.c:3453 src/addressbook.c:3459
+#: src/addressbook.c:3645 src/addressbook.c:3651

 msgid "Addressbook conversion error"
 msgstr "Osoitekirjan muunnosvirhe"
 
 msgid "Addressbook conversion error"
 msgstr "Osoitekirjan muunnosvirhe"
 

-#: src/addressbook.c:3497
+#: src/addressbook.c:3689

 msgid "Addressbook Error"
 msgstr "Osoitekirjan virhe"
 
 msgid "Addressbook Error"
 msgstr "Osoitekirjan virhe"
 

-#: src/addressbook.c:3498
+#: src/addressbook.c:3690

 msgid "Could not read address index"
 msgstr "Ei voitu lukea osoiteindeksiä"
 
 msgid "Could not read address index"
 msgstr "Ei voitu lukea osoiteindeksiä"
 

-#: src/addressbook.c:3825
+#: src/addressbook.c:4017

 msgid "Busy searching..."
 msgstr "Etsitään…"
 
 msgid "Busy searching..."
 msgstr "Etsitään…"
 

-#: src/addressbook.c:3896
+#: src/addressbook.c:4088

 #, c-format
 msgid "Search '%s'"
 msgstr "Etsi ”%s”"
 
 #, c-format
 msgid "Search '%s'"
 msgstr "Etsi ”%s”"
 

-#: src/addressbook.c:4121
+#: src/addressbook.c:4313

 msgid "Interface"
 msgstr "Rajapinta"
 
 msgid "Interface"
 msgstr "Rajapinta"
 

-#: src/addressbook.c:4137 src/exphtmldlg.c:378 src/expldifdlg.c:394
+#: src/addressbook.c:4329 src/exphtmldlg.c:375 src/expldifdlg.c:394

 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Osoitekirja"
 
 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Osoitekirja"
 

-#: src/addressbook.c:4153
+#: src/addressbook.c:4345

 msgid "Person"
 msgstr "Henkilö"
 
 msgid "Person"
 msgstr "Henkilö"
 

-#: src/addressbook.c:4169
+#: src/addressbook.c:4361

 msgid "EMail Address"
 msgstr "Sähköpostiosoite"
 
 msgid "EMail Address"
 msgstr "Sähköpostiosoite"
 

-#: src/addressbook.c:4185
+#: src/addressbook.c:4377

 msgid "Group"
 msgstr "Ryhmä"
 
 msgid "Group"
 msgstr "Ryhmä"
 

-#: src/addressbook.c:4201 src/exporthtml.c:922 src/folderview.c:462
-#: src/prefs_account.c:2395 src/prefs_folder_column.c:79
+#: src/addressbook.c:4393 src/exporthtml.c:922 src/folderview.c:470
+#: src/prefs_account.c:2417 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Kansio"
 
 msgid "Folder"
 msgstr "Kansio"
 

-#: src/addressbook.c:4217
+#: src/addressbook.c:4409

 msgid "vCard"
 msgstr "vCard-käyntikortti"
 
 msgid "vCard"
 msgstr "vCard-käyntikortti"
 

-#: src/addressbook.c:4233 src/addressbook.c:4249
+#: src/addressbook.c:4425 src/addressbook.c:4441

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4265
+#: src/addressbook.c:4457

 msgid "LDAP servers"
 msgstr "LDAP-palvelimet"
 
 msgid "LDAP servers"
 msgstr "LDAP-palvelimet"
 

-#: src/addressbook.c:4281
+#: src/addressbook.c:4473

 msgid "LDAP Query"
 msgstr "LDAP-haku"
 
 msgid "LDAP Query"
 msgstr "LDAP-haku"
 

-#: src/addressbook.c:4597 src/matcher.c:303 src/matcher.c:756
+#: src/addressbook.c:4789 src/matcher.c:303 src/matcher.c:756

 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106


@@ -723,7 +747,7 @@ msgstr ""
 msgid "Folder :"
 msgstr "Hakemisto:"
 
 msgid "Folder :"
 msgstr "Hakemisto:"
 

-#: src/addrgather.c:365 src/exphtmldlg.c:546 src/expldifdlg.c:626
+#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Osoitekirja:"
 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Osoitekirja:"


@@ -748,9 +772,9 @@ msgstr "Otsakkeen nimi"
 msgid "Address Count"
 msgstr "Osoitteiden määrä"
 
 msgid "Address Count"
 msgstr "Osoitteiden määrä"
 

-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4562
-#: src/compose.c:9028 src/messageview.c:578 src/messageview.c:591
-#: src/plugins/pgpcore/sgpgme.c:565
+#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4794
+#: src/compose.c:9374 src/messageview.c:578 src/messageview.c:591
+#: src/plugins/pgpcore/sgpgme.c:574

 msgid "Warning"
 msgstr "Varoitus"
 
 msgid "Warning"
 msgstr "Varoitus"
 


@@ -758,7 +782,7 @@ msgstr "Varoitus"
 msgid "Header Fields"
 msgstr "Otsakekentät"
 
 msgid "Header Fields"
 msgstr "Otsakekentät"
 

-#: src/addrgather.c:539 src/exphtmldlg.c:666 src/expldifdlg.c:738
+#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Lopeta"
 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Lopeta"


@@ -787,12 +811,12 @@ msgstr "Yhteinen osoite"
 msgid "Personal address"
 msgstr "Henkilökohtainen osoite"
 
 msgid "Personal address"
 msgstr "Henkilökohtainen osoite"
 

-#: src/alertpanel.c:141 src/compose.c:7248
+#: src/alertpanel.c:141 src/compose.c:7582

 msgid "Notice"
 msgstr "Huomautus"
 
 msgid "Notice"
 msgstr "Huomautus"
 

-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4504 src/inc.c:594
-#: src/plugins/pgpcore/sgpgme.c:139 src/plugins/pgpcore/sgpgme.c:230
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4734 src/inc.c:616
+#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239

 msgid "Error"
 msgstr "Virhe"
 
 msgid "Error"
 msgstr "Virhe"
 


@@ -829,77 +853,102 @@ msgstr "Attribuutin arvo"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "NNTP-palvelimeen %s:%d ei saatu yhteyttä\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "NNTP-palvelimeen %s:%d ei saatu yhteyttä\n"
 

-#: src/common/nntp.c:181 src/common/nntp.c:244
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:840
+msgid "SSL handshake failed\n"
+msgstr "SSL-kättely epäonnistui\n"
+
+#: src/common/nntp.c:182 src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr "protokollavirhe: %s\n"
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "protokollavirhe: %s\n"
 

-#: src/common/nntp.c:204 src/common/nntp.c:250
+#: src/common/nntp.c:205 src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr "protokollavirhe\n"
 
 msgid "protocol error\n"
 msgstr "protokollavirhe\n"
 

-#: src/common/nntp.c:300
+#: src/common/nntp.c:301

 msgid "Error occurred while posting\n"
 msgstr "Virhe postitettaessa\n"
 
 msgid "Error occurred while posting\n"
 msgstr "Virhe postitettaessa\n"
 

-#: src/common/nntp.c:380
+#: src/common/nntp.c:381

 msgid "Error occurred while sending command\n"
 msgstr "Virhe lähetettäessä komentoa\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "Virhe lähetettäessä komentoa\n"
 

-#: src/common/plugin.c:52
+#: src/common/plugin.c:53

 msgid "Nothing"
 msgstr "Ei mitään"
 
 msgid "Nothing"
 msgstr "Ei mitään"
 

-#: src/common/plugin.c:53
+#: src/common/plugin.c:54

 msgid "a viewer"
 msgstr "näytin"
 
 msgid "a viewer"
 msgstr "näytin"
 

-#: src/common/plugin.c:54
+#: src/common/plugin.c:55

 msgid "folders"
 msgstr "kansiot"
 
 msgid "folders"
 msgstr "kansiot"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "filtering"
 msgstr "suodatus"
 
 msgid "filtering"
 msgstr "suodatus"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a privacy interface"
 msgstr "yksityisyysrajapinta"
 
 msgid "a privacy interface"
 msgstr "yksityisyysrajapinta"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "a notifier"
 msgstr "ilmoitin"
 
 msgid "a notifier"
 msgstr "ilmoitin"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "an utility"
 msgstr "toiminto"
 
 msgid "an utility"
 msgstr "toiminto"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "things"
 msgstr "juttuja"
 
 msgid "things"
 msgstr "juttuja"
 

-#: src/common/plugin.c:257
+#: src/common/plugin.c:258

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."

-msgstr ""
-"Tämä liitännäinen on %s (%s),samoin kuin olemassaoleva %s."
+msgstr "Tämä liitännäinen on %s (%s),samoin kuin olemassaoleva %s."

 
 

-#: src/common/plugin.c:292
+#: src/common/plugin.c:293

 msgid "Plugin already loaded"
 msgstr "Liitännäinen on jo ladattu"
 
 msgid "Plugin already loaded"
 msgstr "Liitännäinen on jo ladattu"
 

-#: src/common/plugin.c:302
+#: src/common/plugin.c:303

 msgid "Failed to allocate memory for Plugin"
 msgstr "Muistin varaaminen liitännäiselle epäonnistui"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Muistin varaaminen liitännäiselle epäonnistui"
 

-#: src/common/plugin.c:329
+#: src/common/plugin.c:330

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Tämä moduuli ei ole GPL-yhteensopivasti lisensoitu."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Tämä moduuli ei ole GPL-yhteensopivasti lisensoitu."
 

-#: src/common/plugin.c:336
-msgid "This module is for Sylpheed-Claws GTK1."
-msgstr "Tämä moduuli on Sylpheed-Clawsin GTK+1-versiolle."
+#: src/common/plugin.c:337
+msgid "This module is for Claws Mail GTK1."
+msgstr "Tämä moduuli on Claws Mailin GTK+1-versiolle."
+
+#: src/common/plugin.c:550
+#, c-format
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr "Claws Mail on uudempi kuin mille liitännäinen %s on käännetty"
+
+#: src/common/plugin.c:553
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr "Claws Mail on uudempi kuin mille liitännäinen on käännetty"
+
+#: src/common/plugin.c:562
+#, c-format
+msgid "Your version of Claws Mail is too old for the '%s' plugin."
+msgstr "Claws Mail on liian vanha liitännäiselle %s"
+
+#: src/common/plugin.c:564
+msgid "Your version of Claws Mail is too old for the plugin."
+msgstr "Claws Mail on liian vanha liitännäiselle"

 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"


@@ -923,7 +972,7 @@ msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Liian iso viesti (yläraja koolle on %s)\n"
 
 #: src/common/smtp.c:635 src/pop.c:835
 msgstr "Liian iso viesti (yläraja koolle on %s)\n"
 
 #: src/common/smtp.c:635 src/pop.c:835

-msgid "can't start TLS session\n"
+msgid "couldn't start TLS session\n"

 msgstr "TLS-istunnon käynnistys ei onnistu\n"
 
 #: src/common/socket.c:1405
 msgstr "TLS-istunnon käynnistys ei onnistu\n"
 
 #: src/common/socket.c:1405


@@ -940,16 +989,16 @@ msgstr "Virhe ssl-kontekstin luonnissa\n"
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL-yhdistäminen epäonnistui (%s)\n"
 
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL-yhdistäminen epäonnistui (%s)\n"
 

-#: src/common/ssl_certificate.c:189 src/common/ssl_certificate.c:200
-#: src/common/ssl_certificate.c:206 src/common/ssl_certificate.c:213
-#: src/common/ssl_certificate.c:224 src/common/ssl_certificate.c:230
+#: src/common/ssl_certificate.c:208 src/common/ssl_certificate.c:219
+#: src/common/ssl_certificate.c:225 src/common/ssl_certificate.c:232
+#: src/common/ssl_certificate.c:243 src/common/ssl_certificate.c:249

 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<ei varmenteen tiedoissa>"
 
 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<ei varmenteen tiedoissa>"
 

-#: src/common/ssl_certificate.c:239
+#: src/common/ssl_certificate.c:258

 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"


@@ -962,487 +1011,718 @@ msgstr ""
 "  Sormenjälki: %s\n"
 "  Allekirjoituksen tila: %s"
 
 "  Sormenjälki: %s\n"
 "  Allekirjoituksen tila: %s"
 

-#: src/common/ssl_certificate.c:348
-msgid "Can't load X509 default paths"
+#: src/common/ssl_certificate.c:385
+msgid "Couldn't load X509 default paths"

 msgstr "X509-oletuspolkujen lataus ei onnistu"
 
 #: src/common/string_match.c:79
 msgid "(Subject cleared by RegExp)"
 msgstr "(Säännöllisin  poistettu otsikko)"
 
 msgstr "X509-oletuspolkujen lataus ei onnistu"
 
 #: src/common/string_match.c:79
 msgid "(Subject cleared by RegExp)"
 msgstr "(Säännöllisin  poistettu otsikko)"
 

-#: src/common/utils.c:355
+#: src/common/utils.c:348

 #, c-format
 msgid "%dB"
 msgstr "%d t"
 
 #, c-format
 msgid "%dB"
 msgstr "%d t"
 

-#: src/common/utils.c:356
+#: src/common/utils.c:349

 #, c-format
 #, c-format

-msgid "%d.%dKB"
-msgstr "%d,%d kt"
+msgid "%d.%02dKB"
+msgstr "%d,%02d kt"

 
 

-#: src/common/utils.c:357
+#: src/common/utils.c:350

 #, c-format
 #, c-format

-msgid "%.2fMB"
-msgstr "%.2f Mt"
+msgid "%d.%02dMB"
+msgstr "%d,%02d kt"

 
 

-#: src/common/utils.c:358
+#: src/common/utils.c:351

 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f Gt"
 
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2f Gt"
 

-#: src/compose.c:512
+#: src/common/utils.c:4799
+msgid "Complete day name for use by strftime|Sunday"
+msgstr "sunnuntai"
+
+#: src/common/utils.c:4800
+msgid "Complete day name for use by strftime|Monday"
+msgstr "maanantai"
+
+#: src/common/utils.c:4801
+msgid "Complete day name for use by strftime|Tuesday"
+msgstr "tiistai"
+
+#: src/common/utils.c:4802
+msgid "Complete day name for use by strftime|Wednesday"
+msgstr "keskiviikko"
+
+#: src/common/utils.c:4803
+msgid "Complete day name for use by strftime|Thursday"
+msgstr "torstai"
+
+#: src/common/utils.c:4804
+msgid "Complete day name for use by strftime|Friday"
+msgstr "perjantai"
+
+#: src/common/utils.c:4805
+msgid "Complete day name for use by strftime|Saturday"
+msgstr "lauantai"
+
+#: src/common/utils.c:4807
+msgid "Complete month name for use by strftime|January"
+msgstr "tammikuu"
+
+#: src/common/utils.c:4808
+msgid "Complete month name for use by strftime|February"
+msgstr "helmikuu"
+
+#: src/common/utils.c:4809
+msgid "Complete month name for use by strftime|March"
+msgstr "maaliskuu"
+
+#: src/common/utils.c:4810
+msgid "Complete month name for use by strftime|April"
+msgstr "huhtikuu"
+
+#: src/common/utils.c:4811
+msgid "Complete month name for use by strftime|May"
+msgstr "toukokuu"
+
+#: src/common/utils.c:4812
+msgid "Complete month name for use by strftime|June"
+msgstr "kesäkuu"
+
+#: src/common/utils.c:4813
+msgid "Complete month name for use by strftime|July"
+msgstr "heinäkuu"
+
+#: src/common/utils.c:4814
+msgid "Complete month name for use by strftime|August"
+msgstr "elokuu"
+
+#: src/common/utils.c:4815
+msgid "Complete month name for use by strftime|September"
+msgstr "syyskuu"
+
+#: src/common/utils.c:4816
+msgid "Complete month name for use by strftime|October"
+msgstr "lokakuu"
+
+#: src/common/utils.c:4817
+msgid "Complete month name for use by strftime|November"
+msgstr "marraskuu"
+
+#: src/common/utils.c:4818
+msgid "Complete month name for use by strftime|December"
+msgstr "joulukuu"
+
+#: src/common/utils.c:4820
+msgid "Abbr. day name for use by strftime|Sun"
+msgstr "su"
+
+#: src/common/utils.c:4821
+msgid "Abbr. day name for use by strftime|Mon"
+msgstr "ma"
+
+#: src/common/utils.c:4822
+msgid "Abbr. day name for use by strftime|Tue"
+msgstr "ti"
+
+#: src/common/utils.c:4823
+msgid "Abbr. day name for use by strftime|Wed"
+msgstr "ke"
+
+#: src/common/utils.c:4824
+msgid "Abbr. day name for use by strftime|Thu"
+msgstr "to"
+
+#: src/common/utils.c:4825
+msgid "Abbr. day name for use by strftime|Fri"
+msgstr "pe"
+
+#: src/common/utils.c:4826
+msgid "Abbr. day name for use by strftime|Sat"
+msgstr "la"
+
+#: src/common/utils.c:4828
+msgid "Abbr. month name for use by strftime|Jan"
+msgstr "tammi"
+
+#: src/common/utils.c:4829
+msgid "Abbr. month name for use by strftime|Feb"
+msgstr "helmi"
+
+#: src/common/utils.c:4830
+msgid "Abbr. month name for use by strftime|Mar"
+msgstr "maalis"
+
+#: src/common/utils.c:4831
+msgid "Abbr. month name for use by strftime|Apr"
+msgstr "huhti"
+
+#: src/common/utils.c:4832
+msgid "Abbr. month name for use by strftime|May"
+msgstr "touko"
+
+#: src/common/utils.c:4833
+msgid "Abbr. month name for use by strftime|Jun"
+msgstr "kesä"
+
+#: src/common/utils.c:4834
+msgid "Abbr. month name for use by strftime|Jul"
+msgstr "heinä"
+
+#: src/common/utils.c:4835
+msgid "Abbr. month name for use by strftime|Aug"
+msgstr "elo"
+
+#: src/common/utils.c:4836
+msgid "Abbr. month name for use by strftime|Sep"
+msgstr "syys"
+
+#: src/common/utils.c:4837
+msgid "Abbr. month name for use by strftime|Oct"
+msgstr "loka"
+
+#: src/common/utils.c:4838
+msgid "Abbr. month name for use by strftime|Nov"
+msgstr "marras"
+
+#: src/common/utils.c:4839
+msgid "Abbr. month name for use by strftime|Dec"
+msgstr "joulu"
+
+#: src/common/utils.c:4841
+msgid "For use by strftime (morning)|AM"
+msgstr "Ap."
+
+#: src/common/utils.c:4842
+msgid "For use by strftime (afternoon)|PM"
+msgstr "Ip."
+
+#: src/common/utils.c:4843
+msgid "For use by strftime (morning, lowercase)|am"
+msgstr "ap."
+
+#: src/common/utils.c:4844
+msgid "For use by strftime (afternoon, lowercase)|pm"
+msgstr "ip."
+
+#: src/common/utils.c:4846
+msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
+msgstr "%Ana, %-d.%-m.%Y %H.%M.%S"
+
+#: src/common/utils.c:4847
+msgid "For use by strftime (default date format)|%m/%d/%y"
+msgstr "%-d.%-m.%Y"
+
+#: src/common/utils.c:4848
+msgid "For use by strftime (default time format)|%H:%M:%S"
+msgstr "%H.%M.%S"
+
+#: src/common/utils.c:4850
+msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
+msgstr "%H.%M.%S"
+
+#: src/compose.c:522

 msgid "/_Add..."
 msgstr "_Lisää…"
 
 msgid "/_Add..."
 msgstr "_Lisää…"
 

-#: src/compose.c:513
+#: src/compose.c:523

 msgid "/_Remove"
 msgstr "_Poista"
 
 msgid "/_Remove"
 msgstr "_Poista"
 

-#: src/compose.c:515 src/folderview.c:292
+#: src/compose.c:525 src/folderview.c:294

 msgid "/_Properties..."
 msgstr "_Asetukset"
 
 msgid "/_Properties..."
 msgstr "_Asetukset"
 

-#: src/compose.c:520 src/mainwindow.c:740 src/messageview.c:285
+#: src/compose.c:530 src/mainwindow.c:740 src/messageview.c:285

 msgid "/_Message"
 msgstr "_Viesti"
 
 msgid "/_Message"
 msgstr "_Viesti"
 

-#: src/compose.c:521
+#: src/compose.c:531

 msgid "/_Message/_Send"
 msgstr "_Lähetä"
 
 msgid "/_Message/_Send"
 msgstr "_Lähetä"
 

-#: src/compose.c:523
+#: src/compose.c:533

 msgid "/_Message/Send _later"
 msgstr "Lähetä _myöhemmin"
 
 msgid "/_Message/Send _later"
 msgstr "Lähetä _myöhemmin"
 

-#: src/compose.c:525 src/compose.c:529 src/compose.c:532 src/mainwindow.c:750
+#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:750

 #: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
 #: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "---"
 
 #: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
 #: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "---"
 

-#: src/compose.c:526
+#: src/compose.c:536

 msgid "/_Message/_Attach file"
 msgstr "Liitä _tiedosto"
 
 msgid "/_Message/_Attach file"
 msgstr "Liitä _tiedosto"
 

-#: src/compose.c:527
+#: src/compose.c:537

 msgid "/_Message/_Insert file"
 msgstr "Liitä tiedosto _osaksi viestiä"
 
 msgid "/_Message/_Insert file"
 msgstr "Liitä tiedosto _osaksi viestiä"
 

-#: src/compose.c:528
+#: src/compose.c:538

 msgid "/_Message/Insert si_gnature"
 msgstr "Liitä _allekirjoitus"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "Liitä _allekirjoitus"
 

-#: src/compose.c:530
+#: src/compose.c:540

 msgid "/_Message/_Save"
 msgstr "T_allenna"
 
 msgid "/_Message/_Save"
 msgstr "T_allenna"
 

-#: src/compose.c:533
+#: src/compose.c:543

 msgid "/_Message/_Close"
 msgstr "S_ulje"
 
 msgid "/_Message/_Close"
 msgstr "S_ulje"
 

-#: src/compose.c:536
+#: src/compose.c:546

 msgid "/_Edit/_Undo"
 msgstr "_Kumoa"
 
 msgid "/_Edit/_Undo"
 msgstr "_Kumoa"
 

-#: src/compose.c:537
+#: src/compose.c:547

 msgid "/_Edit/_Redo"
 msgstr "_Tee uudelleen"
 
 msgid "/_Edit/_Redo"
 msgstr "_Tee uudelleen"
 

-#: src/compose.c:538 src/compose.c:626 src/compose.c:629 src/compose.c:635
+#: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645

 #: src/mainwindow.c:522 src/messageview.c:167
 msgid "/_Edit/---"
 msgstr "---"
 
 #: src/mainwindow.c:522 src/messageview.c:167
 msgid "/_Edit/---"
 msgstr "---"
 

-#: src/compose.c:539
+#: src/compose.c:549

 msgid "/_Edit/Cu_t"
 msgstr "_Leikkaa"
 
 msgid "/_Edit/Cu_t"
 msgstr "_Leikkaa"
 

-#: src/compose.c:540 src/mainwindow.c:519 src/messageview.c:165
+#: src/compose.c:550 src/mainwindow.c:519 src/messageview.c:165

 msgid "/_Edit/_Copy"
 msgstr "_Kopioi"
 
 msgid "/_Edit/_Copy"
 msgstr "_Kopioi"
 

-#: src/compose.c:541
+#: src/compose.c:551

 msgid "/_Edit/_Paste"
 msgstr "_Liitä"
 
 msgid "/_Edit/_Paste"
 msgstr "_Liitä"
 

-#: src/compose.c:542
+#: src/compose.c:552

 msgid "/_Edit/Special paste"
 msgstr "Liitä"
 
 msgid "/_Edit/Special paste"
 msgstr "Liitä"
 

-#: src/compose.c:543
+#: src/compose.c:553

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "l_ainattuna"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "l_ainattuna"
 

-#: src/compose.c:545
+#: src/compose.c:555

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "r_ivitettynä"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "r_ivitettynä"
 

-#: src/compose.c:547
+#: src/compose.c:557

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "_rivittämättömänä"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "_rivittämättömänä"
 

-#: src/compose.c:549 src/mainwindow.c:520 src/messageview.c:166
+#: src/compose.c:559 src/mainwindow.c:520 src/messageview.c:166

 msgid "/_Edit/Select _all"
 msgstr "Valitse _kaikki"
 
 msgid "/_Edit/Select _all"
 msgstr "Valitse _kaikki"
 

-#: src/compose.c:550
+#: src/compose.c:560

 msgid "/_Edit/A_dvanced"
 msgstr "Erikoismuokkauskeinot"
 
 msgid "/_Edit/A_dvanced"
 msgstr "Erikoismuokkauskeinot"
 

-#: src/compose.c:551
+#: src/compose.c:561

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "Siirry merkin verran taaksepäin"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "Siirry merkin verran taaksepäin"
 

-#: src/compose.c:556
+#: src/compose.c:566

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "Siirry merkin verran eteenpäin"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "Siirry merkin verran eteenpäin"
 

-#: src/compose.c:561
+#: src/compose.c:571

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "Siirry sanan verran taaksepäin"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "Siirry sanan verran taaksepäin"
 

-#: src/compose.c:566
+#: src/compose.c:576

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "Siirry sanan verran eteenpäin"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "Siirry sanan verran eteenpäin"
 

-#: src/compose.c:571
+#: src/compose.c:581

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "Siirry rivin alkuun"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "Siirry rivin alkuun"
 

-#: src/compose.c:576
+#: src/compose.c:586

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "Siirry rivin loppuun"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "Siirry rivin loppuun"
 

-#: src/compose.c:581
+#: src/compose.c:591

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "Siirry edelliselle riville"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "Siirry edelliselle riville"
 

-#: src/compose.c:586
+#: src/compose.c:596

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "Siirry seuraavalle riville"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "Siirry seuraavalle riville"
 

-#: src/compose.c:591
+#: src/compose.c:601

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "Poista merkki takaa"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "Poista merkki takaa"
 

-#: src/compose.c:596
+#: src/compose.c:606

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "Poista merkki edestä"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "Poista merkki edestä"
 

-#: src/compose.c:601
+#: src/compose.c:611

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "Poista sana takaa"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "Poista sana takaa"
 

-#: src/compose.c:606
+#: src/compose.c:616

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "Poista sana edestä"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "Poista sana edestä"
 

-#: src/compose.c:611
+#: src/compose.c:621

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "Poista rivi"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "Poista rivi"
 

-#: src/compose.c:616
+#: src/compose.c:626

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "Poista koko rivi"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "Poista koko rivi"
 

-#: src/compose.c:621
+#: src/compose.c:631

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "Poista rivin loppuun"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "Poista rivin loppuun"
 

-#: src/compose.c:627
+#: src/compose.c:637

 msgid "/_Edit/_Find"
 msgstr "_Etsi"
 
 msgid "/_Edit/_Find"
 msgstr "_Etsi"
 

-#: src/compose.c:630
+#: src/compose.c:640

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "Rivitä tämä kappale"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "Rivitä tämä kappale"
 

-#: src/compose.c:632
+#: src/compose.c:642

 msgid "/_Edit/Wrap all long _lines"
 msgstr "Rivitä kaikki pitkät _rivit"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "Rivitä kaikki pitkät _rivit"
 

-#: src/compose.c:634
+#: src/compose.c:644

 msgid "/_Edit/Aut_o wrapping"
 msgstr "Automaattinen rivitys"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "Automaattinen rivitys"
 

-#: src/compose.c:636
+#: src/compose.c:646

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "Muokkaa ulkoisella muokkainsovelluksella"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "Muokkaa ulkoisella muokkainsovelluksella"
 

-#: src/compose.c:639
+#: src/compose.c:649

 msgid "/_Spelling"
 msgstr "_Oikoluku"
 
 msgid "/_Spelling"
 msgstr "_Oikoluku"
 

-#: src/compose.c:640
+#: src/compose.c:650

 msgid "/_Spelling/_Check all or check selection"
 msgstr "_Tarkista kaikki tai valittu"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "_Tarkista kaikki tai valittu"
 

-#: src/compose.c:642
+#: src/compose.c:652

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "_Korosta virheelliset sanat"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "_Korosta virheelliset sanat"
 

-#: src/compose.c:644
+#: src/compose.c:654

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "Tarkista _edellinen väärinkirjoitettu sana"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "Tarkista _edellinen väärinkirjoitettu sana"
 

-#: src/compose.c:646
+#: src/compose.c:656

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "Tarkista _seuraava väärinkirjoitettu sana"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "Tarkista _seuraava väärinkirjoitettu sana"
 

-#: src/compose.c:648
+#: src/compose.c:658

 msgid "/_Spelling/---"
 msgstr "---"
 
 msgid "/_Spelling/---"
 msgstr "---"
 

-#: src/compose.c:649
+#: src/compose.c:659

 msgid "/_Spelling/Options"
 msgstr "Asetukset"
 
 msgid "/_Spelling/Options"
 msgstr "Asetukset"
 

-#: src/compose.c:652
+#: src/compose.c:662

 msgid "/_Options"
 msgstr "_Asetukset"
 
 msgid "/_Options"
 msgstr "_Asetukset"
 

-#: src/compose.c:653
-msgid "/_Options/Privacy System"
-msgstr "Suojaus ja salaus"
+#: src/compose.c:663
+msgid "/_Options/Reply _mode"
+msgstr "_Vastaustapa"
+
+#: src/compose.c:664
+msgid "/_Options/Reply _mode/_Normal"
+msgstr "_Tavallinen"

 
 

-#: src/compose.c:654
-msgid "/_Options/Privacy System/None"
+#: src/compose.c:665
+msgid "/_Options/Reply _mode/_All"
+msgstr "_kaikille"
+
+#: src/compose.c:666
+msgid "/_Options/Reply _mode/_Sender"
+msgstr "_lähettäjälle"
+
+#: src/compose.c:667
+msgid "/_Options/Reply _mode/_Mailing-list"
+msgstr "_postituslistalle"
+
+#: src/compose.c:668 src/compose.c:673 src/compose.c:680 src/compose.c:682
+#: src/compose.c:684
+msgid "/_Options/---"
+msgstr "---"
+
+#: src/compose.c:669
+msgid "/_Options/Privacy _System"
+msgstr "Suojaus ja salaus -järjestelmä"
+
+#: src/compose.c:670
+msgid "/_Options/Privacy _System/None"

 msgstr "Ei mitään"
 
 msgstr "Ei mitään"
 

-#: src/compose.c:655
+#: src/compose.c:671

 msgid "/_Options/Si_gn"
 msgstr "Allekirjoita"
 
 msgid "/_Options/Si_gn"
 msgstr "Allekirjoita"
 

-#: src/compose.c:656
+#: src/compose.c:672

 msgid "/_Options/_Encrypt"
 msgstr "Salaa"
 
 msgid "/_Options/_Encrypt"
 msgstr "Salaa"
 

-#: src/compose.c:657 src/compose.c:664 src/compose.c:666 src/compose.c:668
-msgid "/_Options/---"
-msgstr "---"
-
-#: src/compose.c:658
+#: src/compose.c:674

 msgid "/_Options/_Priority"
 msgstr "_Tärkeysarvo"
 
 msgid "/_Options/_Priority"
 msgstr "_Tärkeysarvo"
 

-#: src/compose.c:659
+#: src/compose.c:675

 msgid "/_Options/Priority/_Highest"
 msgstr "Korke_in"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "Korke_in"
 

-#: src/compose.c:660
+#: src/compose.c:676

 msgid "/_Options/Priority/Hi_gh"
 msgstr "Korke_a"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "Korke_a"
 

-#: src/compose.c:661
+#: src/compose.c:677

 msgid "/_Options/Priority/_Normal"
 msgstr "_Tavallinen"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "_Tavallinen"
 

-#: src/compose.c:662
+#: src/compose.c:678

 msgid "/_Options/Priority/Lo_w"
 msgstr "_Matala"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "_Matala"
 

-#: src/compose.c:663
+#: src/compose.c:679

 msgid "/_Options/Priority/_Lowest"
 msgstr "Matali_n"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "Matali_n"
 

-#: src/compose.c:665
+#: src/compose.c:681

 msgid "/_Options/_Request Return Receipt"
 msgstr "Pyydä saapumisilmoitus"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "Pyydä saapumisilmoitus"
 

-#: src/compose.c:667
+#: src/compose.c:683

 msgid "/_Options/Remo_ve references"
 msgstr "_Poista valinnat"
 
 msgid "/_Options/Remo_ve references"
 msgstr "_Poista valinnat"
 

-#: src/compose.c:674
+#: src/compose.c:690

 msgid "/_Options/Character _encoding"
 msgstr "_Merkistökoodaus"
 
 msgid "/_Options/Character _encoding"
 msgstr "_Merkistökoodaus"
 

-#: src/compose.c:675
+#: src/compose.c:691

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "Tunnista _automaattisesti"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "Tunnista _automaattisesti"
 

-#: src/compose.c:677 src/compose.c:683 src/compose.c:691 src/compose.c:695
-#: src/compose.c:701 src/compose.c:705 src/compose.c:711 src/compose.c:717
-#: src/compose.c:721 src/compose.c:731 src/compose.c:735 src/compose.c:745
-#: src/compose.c:749
+#: src/compose.c:693 src/compose.c:699 src/compose.c:707 src/compose.c:711
+#: src/compose.c:717 src/compose.c:721 src/compose.c:727 src/compose.c:733
+#: src/compose.c:737 src/compose.c:747 src/compose.c:751 src/compose.c:761
+#: src/compose.c:765

 msgid "/_Options/Character _encoding/---"
 msgstr "---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "---"
 

-#: src/compose.c:679
+#: src/compose.c:695

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "7-bittinen ASCII (US-ASC_II)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "7-bittinen ASCII (US-ASC_II)"
 

-#: src/compose.c:681
+#: src/compose.c:697

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "Unicode (_UTF-8)"
 

-#: src/compose.c:685
+#: src/compose.c:701

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "Länsieurooppalainen (ISO-8859-_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "Länsieurooppalainen (ISO-8859-_1)"
 

-#: src/compose.c:687
+#: src/compose.c:703

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "Länsieurooppalainen (ISO-8859-1_5)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "Länsieurooppalainen (ISO-8859-1_5)"
 

-#: src/compose.c:689
+#: src/compose.c:705

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "Länsieurooppalainen (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "Länsieurooppalainen (Windows-1252)"
 

-#: src/compose.c:693
+#: src/compose.c:709

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "Keskieurooppalainen (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "Keskieurooppalainen (ISO-8859-_2)"
 

-#: src/compose.c:697
+#: src/compose.c:713

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "_Balttilainen (ISO-8859-13)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "_Balttilainen (ISO-8859-13)"
 

-#: src/compose.c:699
+#: src/compose.c:715

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "Balttilainen (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "Balttilainen (ISO-8859-_4)"
 

-#: src/compose.c:703
+#: src/compose.c:719

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "Kreikkalainen (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "Kreikkalainen (ISO-8859-_7)"
 

-#: src/compose.c:707
+#: src/compose.c:723

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "Kreikkalainen (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "Kreikkalainen (ISO-8859-_7)"
 

-#: src/compose.c:709
+#: src/compose.c:725

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "Kyrillinen (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "Kyrillinen (Windows-1251)"
 

-#: src/compose.c:713
+#: src/compose.c:729

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "Arabialainen (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "Arabialainen (ISO-8859-_6)"
 

-#: src/compose.c:715
+#: src/compose.c:731

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "Arabialainen (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "Arabialainen (Windows-1256)"
 

-#: src/compose.c:719
+#: src/compose.c:735

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "Turkkilainen (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "Turkkilainen (ISO-8859-_9)"
 

-#: src/compose.c:723
+#: src/compose.c:739

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "K_yrillinen (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "K_yrillinen (ISO-8859-_5)"
 

-#: src/compose.c:725
+#: src/compose.c:741

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "Kyrillinen (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "Kyrillinen (KOI8-_R)"
 

-#: src/compose.c:727
+#: src/compose.c:743

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "Kyrillinen (KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "Kyrillinen (KOI8-U)"
 

-#: src/compose.c:729
+#: src/compose.c:745

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "Kyrillinen (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "Kyrillinen (Windows-1251)"
 

-#: src/compose.c:733
+#: src/compose.c:749

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "Japanilainen (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "Japanilainen (ISO-2022-_JP)"
 

-#: src/compose.c:737
+#: src/compose.c:753

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "Kiinalainen (yksinkertaistettu) (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "Kiinalainen (yksinkertaistettu) (_GB2312)"
 

-#: src/compose.c:739
+#: src/compose.c:755

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "Kiinalainen (yksinkertaistettu) (_GBK)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "Kiinalainen (yksinkertaistettu) (_GBK)"
 

-#: src/compose.c:741
+#: src/compose.c:757

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "Kiinalainen (perinteinen) (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "Kiinalainen (perinteinen) (_Big5)"
 

-#: src/compose.c:743
+#: src/compose.c:759

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "Kiinalainen (perinteinen) (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "Kiinalainen (perinteinen) (EUC-_TW)"
 

-#: src/compose.c:747
+#: src/compose.c:763

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "Korealainen (EUC-_KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "Korealainen (EUC-_KR)"
 

-#: src/compose.c:751
+#: src/compose.c:767

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 

-#: src/compose.c:753
+#: src/compose.c:769

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 

-#: src/compose.c:757
+#: src/compose.c:773

 msgid "/_Tools/Show _ruler"
 msgstr "Näytä _viivain"
 
 msgid "/_Tools/Show _ruler"
 msgstr "Näytä _viivain"
 

-#: src/compose.c:758 src/messageview.c:303
+#: src/compose.c:774 src/messageview.c:303

 msgid "/_Tools/_Address book"
 msgstr "_Osoitekirja"
 
 msgid "/_Tools/_Address book"
 msgstr "_Osoitekirja"
 

-#: src/compose.c:759
+#: src/compose.c:775

 msgid "/_Tools/_Template"
 msgstr "_Malline"
 
 msgid "/_Tools/_Template"
 msgstr "_Malline"
 

-#: src/compose.c:760 src/mainwindow.c:832 src/messageview.c:328
+#: src/compose.c:776 src/mainwindow.c:832 src/messageview.c:328

 msgid "/_Tools/Actio_ns"
 msgstr "_Toiminnot"
 
 msgid "/_Tools/Actio_ns"
 msgstr "_Toiminnot"
 

-#: src/compose.c:1554
+#: src/compose.c:1039 src/prefs_compose_writing.c:384
+msgid "New message subject format error."
+msgstr "Viestin aiheen muodon virhe."
+
+#: src/compose.c:1068 src/prefs_compose_writing.c:388
+msgid "New message body format error."
+msgstr "Viestin sisällön muodon virhe."
+
+#: src/compose.c:1438 src/prefs_quote.c:281
+msgid "Message reply format error."
+msgstr "Viestin vastineen muodon virhe."
+
+#: src/compose.c:1555 src/prefs_quote.c:286
+msgid "Message forward format error."
+msgstr "Viestin edelleenlähetyksen muodon virhe."
+
+#: src/compose.c:1675

 msgid "Fw: multiple emails"
 msgstr "Ed: useita sähköposteja"
 
 msgid "Fw: multiple emails"
 msgstr "Ed: useita sähköposteja"
 

-#: src/compose.c:1977
+#: src/compose.c:2050
+msgid "Message redirect format error."
+msgstr "Viestin uudelleenohjauksen muodon virhe."
+
+#: src/compose.c:2119

 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 

-#: src/compose.c:1980 src/compose.c:5427 src/compose.c:6177
+#: src/compose.c:2122 src/compose.c:5664 src/compose.c:6434 src/compose.c:9472

 msgid "Newsgroups:"
 msgstr "Uutisryhmät:"
 
 msgid "Newsgroups:"
 msgstr "Uutisryhmät:"
 

-#: src/compose.c:1983
+#: src/compose.c:2125

 msgid "Followup-To:"
 msgstr "Keskustelunsiirto:"
 
 msgid "Followup-To:"
 msgstr "Keskustelunsiirto:"
 

-#: src/compose.c:2380
+#: src/compose.c:2304
+#, c-format
+msgid "The file '%s' has been attached."
+msgstr "Tiedosto %s liitettiin."
+
+#: src/compose.c:2308
+msgid "Couldn't attach a file (charset conversion failed)."
+msgstr ""
+"Liitetiedoston liittäminen epäonnistui (merkistön muunnos epäonnistui)."
+
+#: src/compose.c:2539

 msgid "Quote mark format error."
 msgstr "Lainausten merkintöjen muotovirhe."
 
 msgid "Quote mark format error."
 msgstr "Lainausten merkintöjen muotovirhe."
 

-#: src/compose.c:2396
-msgid "Message reply/forward format error."
-msgstr "Viestin vastineen tai edelleenlähetyksen muodon virhe."
-
-#: src/compose.c:2953
+#: src/compose.c:3133

 #, c-format
 msgid "File %s is empty."
 msgstr "Tiedosto %s on tyhjä."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Tiedosto %s on tyhjä."
 

-#: src/compose.c:2957
+#: src/compose.c:3137

 #, c-format
 msgid "Can't read %s."
 msgstr "Tiedostoa %s ei voitu lukea."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "Tiedostoa %s ei voitu lukea."
 

-#: src/compose.c:2984
+#: src/compose.c:3164

 #, c-format
 msgid "Message: %s"
 msgstr "Viesti: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Viesti: %s"
 

-#: src/compose.c:3796
+#: src/compose.c:3983

 msgid " [Edited]"
 msgstr " [Muokattu]"
 
 # "sylpheed-claws - Muokataan viestiä (MUOKATTU)"
 msgid " [Edited]"
 msgstr " [Muokattu]"
 
 # "sylpheed-claws - Muokataan viestiä (MUOKATTU)"

-#: src/compose.c:3802
+#: src/compose.c:3989

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s — Muokataan viestiä%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s — Muokataan viestiä%s"
 

-#: src/compose.c:3805
+#: src/compose.c:3992

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[ei otsikkoa] — Muokataan viestiä%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[ei otsikkoa] — Muokataan viestiä%s"
 

-#: src/compose.c:3830 src/messageview.c:613
+#: src/compose.c:4017 src/messageview.c:613

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1450,32 +1730,32 @@ msgstr ""
 "Postin lähetykseen ei ole määritelty tiliä.\n"
 "Valitse postitili ennen lähettämistä."
 
 "Postin lähetykseen ei ole määritelty tiliä.\n"
 "Valitse postitili ennen lähettämistä."
 

-#: src/compose.c:4007 src/compose.c:4038 src/compose.c:4069 src/toolbar.c:391
-#: src/toolbar.c:442
+#: src/compose.c:4195 src/compose.c:4226 src/compose.c:4258 src/toolbar.c:401
+#: src/toolbar.c:452

 msgid "Send"
 msgstr "Lähetä"
 
 msgid "Send"
 msgstr "Lähetä"
 

-#: src/compose.c:4008
+#: src/compose.c:4196

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Ainoa vastaanottaja on oletuskopio-osoite. Lähetetäänkö silti?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Ainoa vastaanottaja on oletuskopio-osoite. Lähetetäänkö silti?"
 

-#: src/compose.c:4009 src/compose.c:4040 src/compose.c:4071 src/compose.c:4504
+#: src/compose.c:4197 src/compose.c:4228 src/compose.c:4260 src/compose.c:4734

 msgid "+_Send"
 msgstr "_Lähetä"
 
 msgid "+_Send"
 msgstr "_Lähetä"
 

-#: src/compose.c:4039
+#: src/compose.c:4227

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Ainoa vastaanottaja on oletuspiilokopio-osoite. Lähetetäänkö silti?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Ainoa vastaanottaja on oletuspiilokopio-osoite. Lähetetäänkö silti?"
 

-#: src/compose.c:4056
+#: src/compose.c:4244

 msgid "Recipient is not specified."
 msgstr "Vastaanottajaa ei ole määritelty."
 
 msgid "Recipient is not specified."
 msgstr "Vastaanottajaa ei ole määritelty."
 

-#: src/compose.c:4070
+#: src/compose.c:4259

 msgid "Subject is empty. Send it anyway?"
 msgstr "Otsikko on tyhjä, lähetetäänkö silti?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Otsikko on tyhjä, lähetetäänkö silti?"
 

-#: src/compose.c:4112 src/compose.c:7601
+#: src/compose.c:4305 src/compose.c:7935

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1485,7 +1765,7 @@ msgstr ""
 "\n"
 "Merkistön muunnos epäonnistui."
 
 "\n"
 "Merkistön muunnos epäonnistui."
 

-#: src/compose.c:4115 src/compose.c:7604
+#: src/compose.c:4308 src/compose.c:7938

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1495,7 +1775,7 @@ msgstr ""
 "\n"
 "Vastaanottajan salausavainta ei saatu."
 
 "\n"
 "Vastaanottajan salausavainta ei saatu."
 

-#: src/compose.c:4119 src/compose.c:7598
+#: src/compose.c:4312 src/compose.c:7932

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1506,7 +1786,7 @@ msgstr ""
 "\n"
 "Allekirjoitus epäonnistui: %s"
 
 "\n"
 "Allekirjoitus epäonnistui: %s"
 

-#: src/compose.c:4122
+#: src/compose.c:4315

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1517,11 +1797,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4124
+#: src/compose.c:4317

 msgid "Could not queue message for sending."
 msgstr "Viestin lisääminen jonoon lähettämistä varten ei onnistunut."
 
 msgid "Could not queue message for sending."
 msgstr "Viestin lisääminen jonoon lähettämistä varten ei onnistunut."
 

-#: src/compose.c:4138 src/compose.c:4178
+#: src/compose.c:4332 src/compose.c:4391

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1530,7 +1810,7 @@ msgstr ""
 "Käytä pääikkunan Lähetä jonottavat viestit -painiketta yrittääksesi "
 "uudelleen."
 
 "Käytä pääikkunan Lähetä jonottavat viestit -painiketta yrittääksesi "
 "uudelleen."
 

-#: src/compose.c:4172
+#: src/compose.c:4385

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -1540,7 +1820,7 @@ msgstr ""
 "Käytä pääikkunan Lähetä jonottavat viestit -painiketta yrittääksesi "
 "uudelleen."
 
 "Käytä pääikkunan Lähetä jonottavat viestit -painiketta yrittääksesi "
 "uudelleen."
 

-#: src/compose.c:4501
+#: src/compose.c:4731

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1550,7 +1830,7 @@ msgstr ""
 "Viestin merkistön muutos merkistöstä merkistölle %s\n"
 "ei onnistu, lähetetäänkö se joka merkistöllä %s?"
 
 "Viestin merkistön muutos merkistöstä merkistölle %s\n"
 "ei onnistu, lähetetäänkö se joka merkistöllä %s?"
 

-#: src/compose.c:4558
+#: src/compose.c:4790

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1563,60 +1843,60 @@ msgstr ""
 "\n"
 "Lähetetäänkö joka tapauksessa?"
 
 "\n"
 "Lähetetäänkö joka tapauksessa?"
 

-#: src/compose.c:4743
+#: src/compose.c:4978

 msgid "No account for sending mails available!"
 msgstr "Sähköpostin lähettämiseen tarkoitettu tiliä ei ole saatavilla!"
 
 msgid "No account for sending mails available!"
 msgstr "Sähköpostin lähettämiseen tarkoitettu tiliä ei ole saatavilla!"
 

-#: src/compose.c:4753
+#: src/compose.c:4988

 msgid "No account for posting news available!"
 msgstr "Nyyssien lähettämiseen tarkoitettua tiliä ei ole saatavilla!"
 
 msgid "No account for posting news available!"
 msgstr "Nyyssien lähettämiseen tarkoitettua tiliä ei ole saatavilla!"
 

-#: src/compose.c:5444
+#: src/compose.c:5681

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Käytä tabulaattoria automaattiseen täydennykseen osoitekirjasta"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Käytä tabulaattoria automaattiseen täydennykseen osoitekirjasta"
 

-#: src/compose.c:5556
+#: src/compose.c:5809

 msgid "Mime type"
 msgstr "MIME-tyyppi"
 
 msgid "Mime type"
 msgstr "MIME-tyyppi"
 

-#: src/compose.c:5562 src/compose.c:5858 src/mimeview.c:212
+#: src/compose.c:5815 src/compose.c:6111 src/mimeview.c:212

 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86

-#: src/summaryview.c:489
+#: src/summaryview.c:490

 msgid "Size"
 msgstr "Koko"
 
 msgid "Size"
 msgstr "Koko"
 

-#: src/compose.c:5623
+#: src/compose.c:5876

 msgid "Save Message to "
 msgstr "Tallenna viesti kohteeseen "
 
 msgid "Save Message to "
 msgstr "Tallenna viesti kohteeseen "
 

-#: src/compose.c:5645 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:5898 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Selaa"
 
 msgid "_Browse"
 msgstr "_Selaa"
 

-#: src/compose.c:5857 src/compose.c:7008
+#: src/compose.c:6110 src/compose.c:7342

 msgid "MIME type"
 msgstr "MIME-tyyppi"
 
 msgid "MIME type"
 msgstr "MIME-tyyppi"
 

-#: src/compose.c:5929
+#: src/compose.c:6182

 msgid "Hea_der"
 msgstr "_Otsake"
 
 msgid "Hea_der"
 msgstr "_Otsake"
 

-#: src/compose.c:5933
+#: src/compose.c:6186

 msgid "_Attachments"
 msgstr "_Liitteet"
 
 msgid "_Attachments"
 msgstr "_Liitteet"
 

-#: src/compose.c:5937
+#: src/compose.c:6190

 msgid "Othe_rs"
 msgstr "_Muut"
 
 msgid "Othe_rs"
 msgstr "_Muut"
 

-#: src/compose.c:5952 src/summary_search.c:289
+#: src/compose.c:6205 src/summary_search.c:366

 msgid "Subject:"
 msgstr "Otsikko:"
 
 msgid "Subject:"
 msgstr "Otsikko:"
 

-#: src/compose.c:6140
+#: src/compose.c:6396

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1625,20 +1905,20 @@ msgstr ""
 "Oikolukua ei voitu käynnistää.\n"
 "%s"
 
 "Oikolukua ei voitu käynnistää.\n"
 "%s"
 

-#: src/compose.c:6251
+#: src/compose.c:6508

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Lähettäjä: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Lähettäjä: <i>%s</i>"
 

-#: src/compose.c:6282
+#: src/compose.c:6539

 msgid "Account to use for this email"
 msgstr "Viestissä käytettävä tili"
 
 msgid "Account to use for this email"
 msgstr "Viestissä käytettävä tili"
 

-#: src/compose.c:6284
+#: src/compose.c:6541

 msgid "Sender address to be used"
 msgstr "Käytettävä lähettäjäosoite"
 
 msgid "Sender address to be used"
 msgstr "Käytettävä lähettäjäosoite"
 

-#: src/compose.c:6408
+#: src/compose.c:6702

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "


@@ -1647,47 +1927,51 @@ msgstr ""
 "Salausjärjestelmää %s ei voi ladata. Viestien salaus tai allekirjoitus tälle "
 "viestille ei onnistu."
 
 "Salausjärjestelmää %s ei voi ladata. Viestien salaus tai allekirjoitus tälle "
 "viestille ei onnistu."
 

-#: src/compose.c:6647
-msgid "Message To format error."
-msgstr "Viestin vastaanottajan muodon virhe."
+#: src/compose.c:6864 src/prefs_template.c:549
+msgid "Template body format error."
+msgstr "Mallineen sisällön muotovirhe."

 
 

-#: src/compose.c:6660
-msgid "Message Cc format error."
-msgstr "Viestin kopioiden muodon virhe."
+#: src/compose.c:6972 src/prefs_template.c:587
+msgid "Template To format error."
+msgstr "Mallineen vastaanottajan muotovirhe."

 
 

-#: src/compose.c:6673
-msgid "Message Bcc format error."
-msgstr "Viestin piilokopioiden muodon virhe."
+#: src/compose.c:6985 src/prefs_template.c:592
+msgid "Template Cc format error."
+msgstr "Mallineen kopioiden muotovirhe."

 
 

-#: src/compose.c:6687
-msgid "Message subject format error."
+#: src/compose.c:6998 src/prefs_template.c:597
+msgid "Template Bcc format error."
+msgstr "Mallineen piilokopioiden muotovirhe."
+
+#: src/compose.c:7012 src/prefs_template.c:602
+msgid "Template subject format error."

 msgstr "Viestin aiheen muodon virhe."
 
 msgstr "Viestin aiheen muodon virhe."
 

-#: src/compose.c:6902
+#: src/compose.c:7236

 msgid "Invalid MIME type."
 msgstr "Virheellinen MIME-tyyppi."
 
 msgid "Invalid MIME type."
 msgstr "Virheellinen MIME-tyyppi."
 

-#: src/compose.c:6917
+#: src/compose.c:7251

 msgid "File doesn't exist or is empty."
 msgstr "Tiedostoa ei ole tai se on tyhjä"
 
 msgid "File doesn't exist or is empty."
 msgstr "Tiedostoa ei ole tai se on tyhjä"
 

-#: src/compose.c:6990
+#: src/compose.c:7324

 msgid "Properties"
 msgstr "Asetukset"
 
 msgid "Properties"
 msgstr "Asetukset"
 

-#: src/compose.c:7041
+#: src/compose.c:7375

 msgid "Encoding"
 msgstr "Koodaus"
 
 msgid "Encoding"
 msgstr "Koodaus"
 

-#: src/compose.c:7061
+#: src/compose.c:7395

 msgid "Path"
 msgstr "Polku"
 
 msgid "Path"
 msgstr "Polku"
 

-#: src/compose.c:7062 src/prefs_toolbar.c:1060
+#: src/compose.c:7396 src/prefs_toolbar.c:1060

 msgid "File name"
 msgstr "Tiedostonimi"
 
 msgid "File name"
 msgstr "Tiedostonimi"
 

-#: src/compose.c:7245
+#: src/compose.c:7579

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1698,20 +1982,19 @@ msgstr ""
 "Suljetaanko se väkisin?\n"
 "prosessiryhmän id: %d"
 
 "Suljetaanko se väkisin?\n"
 "prosessiryhmän id: %d"
 

-#: src/compose.c:7287
+#: src/compose.c:7621

 msgid "Compose: input from monitoring process\n"
 msgstr "Kirjoitustila: syöte valvotulta prosessilta\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Kirjoitustila: syöte valvotulta prosessilta\n"
 

-#: src/compose.c:7568 src/messageview.c:718
-msgid "Sylpheed-Claws needs network access in order to send this email."
+#: src/compose.c:7902 src/messageview.c:718
+msgid "Claws Mail needs network access in order to send this email."

 msgstr "Sähköpostin lähettämiseen tarvitaan verkkoyhteyttä."
 
 msgstr "Sähköpostin lähettämiseen tarvitaan verkkoyhteyttä."
 

-#: src/compose.c:7593
+#: src/compose.c:7927

 msgid "Could not queue message."
 msgid "Could not queue message."

-msgstr ""
-"Viestin lisääminen jonoon ei onnistunut."
+msgstr "Viestin lisääminen jonoon ei onnistunut."

 
 

-#: src/compose.c:7595
+#: src/compose.c:7929

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1722,20 +2005,20 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:7715
+#: src/compose.c:8049

 msgid "Could not save draft."
 msgstr "Ei voitu tallentaa luonnosta."
 
 msgid "Could not save draft."
 msgstr "Ei voitu tallentaa luonnosta."
 

-#: src/compose.c:7790 src/compose.c:7813
+#: src/compose.c:8124 src/compose.c:8147

 msgid "Select file"
 msgstr "Valitse tiedosto"
 
 msgid "Select file"
 msgstr "Valitse tiedosto"
 

-#: src/compose.c:7826
+#: src/compose.c:8160

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Tiedostoa ”%s” ei voitu lukea."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Tiedostoa ”%s” ei voitu lukea."
 

-#: src/compose.c:7828
+#: src/compose.c:8162

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1744,59 +2027,63 @@ msgstr ""
 "Tiedosto ”%s” sisältää nykyiseen koodaukseen\n"
 "sopimattomia merkkejä, lisäykset saattavat olla virheellisiä."
 
 "Tiedosto ”%s” sisältää nykyiseen koodaukseen\n"
 "sopimattomia merkkejä, lisäykset saattavat olla virheellisiä."
 

-#: src/compose.c:7876
+#: src/compose.c:8210

 msgid "Discard message"
 msgstr "Poista viesti"
 
 msgid "Discard message"
 msgstr "Poista viesti"
 

-#: src/compose.c:7877
+#: src/compose.c:8211

 msgid "This message has been modified. Discard it?"
 msgstr "Tätä viestiä on muokattu, poistetaanko se?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Tätä viestiä on muokattu, poistetaanko se?"
 

-#: src/compose.c:7878
+#: src/compose.c:8212

 msgid "_Discard"
 msgstr "_Poista"
 
 msgid "_Discard"
 msgstr "_Poista"
 

-#: src/compose.c:7878
+#: src/compose.c:8212

 msgid "_Save to Drafts"
 msgstr "_Pane luonnoksiin"
 
 msgid "_Save to Drafts"
 msgstr "_Pane luonnoksiin"
 

-#: src/compose.c:7922
+#: src/compose.c:8256

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Haluatko käyttää mallinetta ”%s”?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Haluatko käyttää mallinetta ”%s”?"
 

-#: src/compose.c:7924
+#: src/compose.c:8258

 msgid "Apply template"
 msgstr "Käytä mallinetta"
 
 msgid "Apply template"
 msgstr "Käytä mallinetta"
 

-#: src/compose.c:7925
+#: src/compose.c:8259

 msgid "_Replace"
 msgstr "_Korvaa"
 
 msgid "_Replace"
 msgstr "_Korvaa"
 

-#: src/compose.c:7925
+#: src/compose.c:8259

 msgid "_Insert"
 msgstr "_Lisää"
 
 msgid "_Insert"
 msgstr "_Lisää"
 

-#: src/compose.c:8613
+#: src/compose.c:8947

 msgid "Insert or attach?"
 msgstr "Liitä vai sisällytä?"
 
 msgid "Insert or attach?"
 msgstr "Liitä vai sisällytä?"
 

-#: src/compose.c:8614
+#: src/compose.c:8948

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 "Haluatko sisällyttää tiedostot viestin sisältöön vai liitetiedostoiksi?"
 
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr ""
 "Haluatko sisällyttää tiedostot viestin sisältöön vai liitetiedostoiksi?"
 

-#: src/compose.c:8616
+#: src/compose.c:8950

 msgid "+_Insert"
 msgstr "_Sisällytä"
 
 msgid "+_Insert"
 msgstr "_Sisällytä"
 

-#: src/compose.c:8616
+#: src/compose.c:8950

 msgid "_Attach"
 msgstr "_Liitä"
 
 msgid "_Attach"
 msgstr "_Liitä"
 

-#: src/compose.c:9022
+#: src/compose.c:9149
+msgid "Quote format error."
+msgstr "Lainausten merkintöjen muotovirhe."
+
+#: src/compose.c:9368

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -1807,12 +2094,12 @@ msgstr ""
 
 #: src/crash.c:142
 #, c-format
 
 #: src/crash.c:142
 #, c-format

-msgid "Sylpheed-Claws process (%ld) received signal %ld"
-msgstr "Sylpheed-Clawsin prosessi (%ld) vastaanotti signaalin %ld"
+msgid "Claws Mail process (%ld) received signal %ld"
+msgstr "Claws Mailin prosessi (%ld) vastaanotti signaalin %ld"

 
 #: src/crash.c:188
 
 #: src/crash.c:188

-msgid "Sylpheed-Claws has crashed"
-msgstr "Sylpheed-Claws kaatui"
+msgid "Claws Mail has crashed"
+msgstr "Claws Mail kaatui"

 
 #: src/crash.c:204
 #, c-format
 
 #: src/crash.c:204
 #, c-format


@@ -1843,61 +2130,69 @@ msgstr "Tee virheilmoitus"
 msgid "Save crash information"
 msgstr "Tallenna kaatumistiedot"
 
 msgid "Save crash information"
 msgstr "Tallenna kaatumistiedot"
 

-#: src/editaddress.c:153
+#: src/editaddress.c:183

 msgid "Add New Person"
 msgstr "Lisää henkilö"
 
 msgid "Add New Person"
 msgstr "Lisää henkilö"
 

-#: src/editaddress.c:154
+#: src/editaddress.c:184

 msgid "Edit Person Details"
 msgstr "Muokkaa henkilötietoja"
 
 msgid "Edit Person Details"
 msgstr "Muokkaa henkilötietoja"
 

-#: src/editaddress.c:316
+#: src/editaddress.c:355

 msgid "An Email address must be supplied."
 msgstr "Sähköpostiosoite pitää olla."
 
 msgid "An Email address must be supplied."
 msgstr "Sähköpostiosoite pitää olla."
 

-#: src/editaddress.c:490
+#: src/editaddress.c:529

 msgid "A Name and Value must be supplied."
 msgstr "Nimi ja arvo on oltava."
 
 msgid "A Name and Value must be supplied."
 msgstr "Nimi ja arvo on oltava."
 

-#: src/editaddress.c:560
+#: src/editaddress.c:618
+msgid "Discard"
+msgstr "Poista"
+
+#: src/editaddress.c:619
+msgid "Apply"
+msgstr "Toteuta"
+
+#: src/editaddress.c:649 src/editaddress.c:698

 msgid "Edit Person Data"
 msgstr "Muokkaa henkilön tietoja"
 
 msgid "Edit Person Data"
 msgstr "Muokkaa henkilön tietoja"
 

-#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:799
+#: src/editaddress.c:759 src/expldifdlg.c:508 src/exporthtml.c:799

 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Näyttönimi"
 
 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Näyttönimi"
 

-#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:827
+#: src/editaddress.c:765 src/editaddress.c:769 src/ldif.c:827

 msgid "Last Name"
 msgstr "Sukunimi"
 
 msgid "Last Name"
 msgstr "Sukunimi"
 

-#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:823
+#: src/editaddress.c:766 src/editaddress.c:768 src/ldif.c:823

 msgid "First Name"
 msgstr "Etunimi"
 
 msgid "First Name"
 msgstr "Etunimi"
 

-#: src/editaddress.c:683
+#: src/editaddress.c:771

 msgid "Nickname"
 msgstr "Lempinimi"
 
 msgid "Nickname"
 msgstr "Lempinimi"
 

-#: src/editaddress.c:760 src/editaddress.c:816
+#: src/editaddress.c:848 src/editaddress.c:904

 msgid "Alias"
 msgstr "Alias"
 
 msgid "Alias"
 msgstr "Alias"
 

-#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:222
+#: src/editaddress.c:1042 src/editaddress.c:1099 src/prefs_customheader.c:222

 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Arvo"
 
 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Arvo"
 

-#: src/editaddress.c:1070
+#: src/editaddress.c:1161

 msgid "_User Data"
 msgstr "_Käyttäjätieto"
 
 msgid "_User Data"
 msgstr "_Käyttäjätieto"
 

-#: src/editaddress.c:1071
+#: src/editaddress.c:1162

 msgid "_Email Addresses"
 msgstr "_Sähköpostiosoitteet"
 
 msgid "_Email Addresses"
 msgstr "_Sähköpostiosoitteet"
 

-#: src/editaddress.c:1072
+#: src/editaddress.c:1163

 msgid "O_ther Attributes"
 msgstr "_Muut tiedot"
 
 msgid "O_ther Attributes"
 msgstr "_Muut tiedot"
 


@@ -1922,7 +2217,7 @@ msgid " Check File "
 msgstr " Tarkasta tiedosto "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr " Tarkasta tiedosto "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1895
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1917

 msgid "File"
 msgstr "Tiedosto"
 
 msgid "File"
 msgstr "Tiedosto"
 


@@ -1930,51 +2225,51 @@ msgstr "Tiedosto"
 msgid "Add New Addressbook"
 msgstr "Lisää uusi osoitekirja"
 
 msgid "Add New Addressbook"
 msgstr "Lisää uusi osoitekirja"
 

-#: src/editgroup.c:103
+#: src/editgroup.c:100

 msgid "A Group Name must be supplied."
 msgstr "Ryhmänimi pitää olla"
 
 msgid "A Group Name must be supplied."
 msgstr "Ryhmänimi pitää olla"
 

-#: src/editgroup.c:286
+#: src/editgroup.c:293

 msgid "Edit Group Data"
 msgstr "Muokkaa ryhmän tietoja"
 
 msgid "Edit Group Data"
 msgstr "Muokkaa ryhmän tietoja"
 

-#: src/editgroup.c:314 src/exporthtml.c:635
+#: src/editgroup.c:323 src/exporthtml.c:635

 msgid "Group Name"
 msgstr "Ryhmänimi"
 
 msgid "Group Name"
 msgstr "Ryhmänimi"
 

-#: src/editgroup.c:333
+#: src/editgroup.c:342

 msgid "Addresses in Group"
 msgstr "Osoitteet ryhmässä"
 
 msgid "Addresses in Group"
 msgstr "Osoitteet ryhmässä"
 

-#: src/editgroup.c:364
+#: src/editgroup.c:373

 msgid "Available Addresses"
 msgstr "Saatavilla olevat osoitteet"
 
 msgid "Available Addresses"
 msgstr "Saatavilla olevat osoitteet"
 

-#: src/editgroup.c:425
+#: src/editgroup.c:445

 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr "Siirrä sähköpostisoitteita ryhmään ja pois nuolipainikkeilla"
 
 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr "Siirrä sähköpostisoitteita ryhmään ja pois nuolipainikkeilla"
 

-#: src/editgroup.c:473
+#: src/editgroup.c:493

 msgid "Edit Group Details"
 msgstr "Muokkaa ryhmän tietoja"
 
 msgid "Edit Group Details"
 msgstr "Muokkaa ryhmän tietoja"
 

-#: src/editgroup.c:476
+#: src/editgroup.c:496

 msgid "Add New Group"
 msgstr "Lisää uusi ryhmä"
 
 msgid "Add New Group"
 msgstr "Lisää uusi ryhmä"
 

-#: src/editgroup.c:526
+#: src/editgroup.c:546

 msgid "Edit folder"
 msgstr "Muokkaa hakemistoa"
 
 msgid "Edit folder"
 msgstr "Muokkaa hakemistoa"
 

-#: src/editgroup.c:526
+#: src/editgroup.c:546

 msgid "Input the new name of folder:"
 msgstr "Anna hakemistolle uusi nimi:"
 
 msgid "Input the new name of folder:"
 msgstr "Anna hakemistolle uusi nimi:"
 

-#: src/editgroup.c:529 src/foldersel.c:556 src/imap_gtk.c:134 src/mh_gtk.c:127
+#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:137 src/mh_gtk.c:130

 msgid "New folder"
 msgstr "Uusi hakemisto"
 
 msgid "New folder"
 msgstr "Uusi hakemisto"
 

-#: src/editgroup.c:530 src/foldersel.c:557 src/mh_gtk.c:128
+#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr "Anna uudelle hakemistolle nimi:"
 
 msgid "Input the name of new folder:"
 msgstr "Anna uudelle hakemistolle nimi:"
 


@@ -2055,11 +2350,11 @@ 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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "

-"computer as Sylpheed-Claws."
+"computer as Claws Mail."

 msgstr ""
 "Tämä on palvelimen verkkonimi. Esimerkiksi ”ldap.example.com” voi olla "
 "sopiva myös example.com-yritykselle. Myös IP-osoitetta voi käyttää. Jos LDAP-"
 msgstr ""
 "Tämä on palvelimen verkkonimi. Esimerkiksi ”ldap.example.com” voi olla "
 "sopiva myös example.com-yritykselle. Myös IP-osoitetta voi käyttää. Jos LDAP-"

-"palvelin on samalla koneella kuin Sylpheed-Claws, voi osoitteeksi määrittää "
+"palvelin on samalla koneella kuin Claws Mail, voi osoitteeksi määrittää "

 "”localhost”."
 
 #: src/editldap.c:470
 "”localhost”."
 
 #: src/editldap.c:470


@@ -2104,12 +2399,12 @@ msgstr "Tällä painikkeella testataan palvelinyhteyttä."
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Tämä määrittää palvelinhakujen hakemiston. Esimerkiksi:\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Tämä määrittää palvelinhakujen hakemiston. Esimerkiksi:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 


@@ -2207,12 +2502,12 @@ msgstr "Bind DN"
 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 "
 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 "

-"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "

 "performing a search."
 msgstr ""
 "LDAP-käyttäjänimi, jota käytetään yhdistettäessä palvelimeen. Tätä käytetään "
 "yleensä vain suojattujen palvelimien kanssa. Tämä nimi on tyypillisesti "
 "performing a search."
 msgstr ""
 "LDAP-käyttäjänimi, jota käytetään yhdistettäessä palvelimeen. Tätä käytetään "
 "yleensä vain suojattujen palvelimien kanssa. Tämä nimi on tyypillisesti "

-"muotoa ”cn=user,dc=sylpheed,dc=com”. Tämä kohta jätetään usein tyhjäksi "
+"muotoa ”cn=user,dc=claws-mail,dc=com”. Tämä kohta jätetään usein tyhjäksi "

 "etsittäessä."
 
 #: src/editldap.c:741
 "etsittäessä."
 
 #: src/editldap.c:741


@@ -2248,7 +2543,7 @@ msgstr "Perus"
 msgid "Search"
 msgstr "Haku"
 
 msgid "Search"
 msgstr "Haku"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:411
+#: src/editldap.c:810 src/gtk/quicksearch.c:490

 msgid "Extended"
 msgstr "Laaja"
 
 msgid "Extended"
 msgstr "Laaja"
 


@@ -2272,19 +2567,19 @@ msgstr "Muokka vCard-tietoja"
 msgid "Add New vCard Entry"
 msgstr "Lisää vCard-tieto"
 
 msgid "Add New vCard Entry"
 msgstr "Lisää vCard-tieto"
 

-#: src/exphtmldlg.c:113
+#: src/exphtmldlg.c:110

 msgid "Please specify output directory and file to create."
 msgstr "Anna hakemisto ja tiedosto luotavaksi."
 
 msgid "Please specify output directory and file to create."
 msgstr "Anna hakemisto ja tiedosto luotavaksi."
 

-#: src/exphtmldlg.c:116
+#: src/exphtmldlg.c:113

 msgid "Select stylesheet and formatting."
 msgstr "Valitse tyylisivu ja -asetukset."
 
 msgid "Select stylesheet and formatting."
 msgstr "Valitse tyylisivu ja -asetukset."
 

-#: src/exphtmldlg.c:119 src/expldifdlg.c:117
+#: src/exphtmldlg.c:116 src/expldifdlg.c:117

 msgid "File exported successfully."
 msgstr "Tiedoston tuonti onnistui"
 
 msgid "File exported successfully."
 msgstr "Tiedoston tuonti onnistui"
 

-#: src/exphtmldlg.c:184
+#: src/exphtmldlg.c:181

 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"


@@ -2293,11 +2588,11 @@ msgstr ""
 "HTML-tulostehakemisto ”%s”\n"
 "puuttuu. Luodaanko uusi hakemisto?"
 
 "HTML-tulostehakemisto ”%s”\n"
 "puuttuu. Luodaanko uusi hakemisto?"
 

-#: src/exphtmldlg.c:187 src/expldifdlg.c:193
+#: src/exphtmldlg.c:184 src/expldifdlg.c:193

 msgid "Create Directory"
 msgstr "Luo hakemisto"
 
 msgid "Create Directory"
 msgstr "Luo hakemisto"
 

-#: src/exphtmldlg.c:196
+#: src/exphtmldlg.c:193

 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"


@@ -2306,102 +2601,102 @@ msgstr ""
 "Ei voitu luoda hakemistoa HTML-tiedostoille:\n"
 "%s"
 
 "Ei voitu luoda hakemistoa HTML-tiedostoille:\n"
 "%s"
 

-#: src/exphtmldlg.c:198 src/expldifdlg.c:204
+#: src/exphtmldlg.c:195 src/expldifdlg.c:204

 msgid "Failed to Create Directory"
 msgstr "Hakemiston luonti epäonnistui"
 
 msgid "Failed to Create Directory"
 msgstr "Hakemiston luonti epäonnistui"
 

-#: src/exphtmldlg.c:240
+#: src/exphtmldlg.c:237

 msgid "Error creating HTML file"
 msgstr "Virhe HTML-tiedostoa luotaessa"
 
 msgid "Error creating HTML file"
 msgstr "Virhe HTML-tiedostoa luotaessa"
 

-#: src/exphtmldlg.c:326
+#: src/exphtmldlg.c:323

 msgid "Select HTML output file"
 msgstr "Valitse HTML-tulostetiedosto"
 
 msgid "Select HTML output file"
 msgstr "Valitse HTML-tulostetiedosto"
 

-#: src/exphtmldlg.c:390
+#: src/exphtmldlg.c:387

 msgid "HTML Output File"
 msgstr "HTML-tulostetiedosto"
 
 msgid "HTML Output File"
 msgstr "HTML-tulostetiedosto"
 

-#: src/exphtmldlg.c:399 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "_Selaa"
 
 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "_Selaa"
 

-#: src/exphtmldlg.c:452
+#: src/exphtmldlg.c:449

 msgid "Stylesheet"
 msgstr "Tyylisivu"
 
 msgid "Stylesheet"
 msgstr "Tyylisivu"
 

-#: src/exphtmldlg.c:460 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
-#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:1004 src/prefs_account.c:661
-#: src/summaryview.c:4927
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1678
+#: src/gtk/gtkaspell.c:2411 src/mainwindow.c:1003 src/prefs_account.c:667
+#: src/summaryview.c:4991

 msgid "None"
 msgstr "Ei mitään"
 
 msgid "None"
 msgstr "Ei mitään"
 

-#: src/exphtmldlg.c:461 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:458 src/prefs_summaries.c:350 src/prefs_summaries.c:691

 msgid "Default"
 msgstr "Oletus"
 
 msgid "Default"
 msgstr "Oletus"
 

-#: src/exphtmldlg.c:462 src/plugins/pgpcore/sgpgme.c:135
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:144

 msgid "Full"
 msgstr "Täysi"
 
 msgid "Full"
 msgstr "Täysi"
 

-#: src/exphtmldlg.c:463
+#: src/exphtmldlg.c:460

 msgid "Custom"
 msgstr "Mukautettu"
 
 msgid "Custom"
 msgstr "Mukautettu"
 

-#: src/exphtmldlg.c:464
+#: src/exphtmldlg.c:461

 msgid "Custom-2"
 msgstr "Mukautettu-2"
 
 msgid "Custom-2"
 msgstr "Mukautettu-2"
 

-#: src/exphtmldlg.c:465
+#: src/exphtmldlg.c:462

 msgid "Custom-3"
 msgstr "Mukautettu-3"
 
 msgid "Custom-3"
 msgstr "Mukautettu-3"
 

-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:463

 msgid "Custom-4"
 msgstr "Mukautettu-4"
 
 msgid "Custom-4"
 msgstr "Mukautettu-4"
 

-#: src/exphtmldlg.c:473
+#: src/exphtmldlg.c:470

 msgid "Full Name Format"
 msgstr "Täyden nimen muoto"
 
 msgid "Full Name Format"
 msgstr "Täyden nimen muoto"
 

-#: src/exphtmldlg.c:481
+#: src/exphtmldlg.c:478

 msgid "First Name, Last Name"
 msgstr "Etunimi, sukunimi"
 
 msgid "First Name, Last Name"
 msgstr "Etunimi, sukunimi"
 

-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:479

 msgid "Last Name, First Name"
 msgstr "Sukunimi, etunimi"
 
 msgid "Last Name, First Name"
 msgstr "Sukunimi, etunimi"
 

-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:486

 msgid "Color Banding"
 msgstr "Värien bändäys"
 
 msgid "Color Banding"
 msgstr "Värien bändäys"
 

-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:492

 msgid "Format Email Links"
 msgstr "Muotoile sähköpostilinkit"
 
 msgid "Format Email Links"
 msgstr "Muotoile sähköpostilinkit"
 

-#: src/exphtmldlg.c:501
+#: src/exphtmldlg.c:498

 msgid "Format User Attributes"
 msgstr "Muotoile käyttäjä attribuutit"
 
 msgid "Format User Attributes"
 msgstr "Muotoile käyttäjä attribuutit"
 

-#: src/exphtmldlg.c:556 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919

 msgid "File Name :"
 msgstr "Tiedostonimi:"
 
 msgid "File Name :"
 msgstr "Tiedostonimi:"
 

-#: src/exphtmldlg.c:566
+#: src/exphtmldlg.c:563

 msgid "Open with Web Browser"
 msgstr "Avaa veppiselain"
 
 msgid "Open with Web Browser"
 msgstr "Avaa veppiselain"
 

-#: src/exphtmldlg.c:598
+#: src/exphtmldlg.c:595

 msgid "Export Address Book to HTML File"
 msgstr "Tuo osoitekirja HTML-tiedostoksi"
 
 msgid "Export Address Book to HTML File"
 msgstr "Tuo osoitekirja HTML-tiedostoksi"
 

-#: src/exphtmldlg.c:664 src/expldifdlg.c:736 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027

 msgid "File Info"
 msgstr "Tiedoston tiedot"
 
 msgid "File Info"
 msgstr "Tiedoston tiedot"
 

-#: src/exphtmldlg.c:665
+#: src/exphtmldlg.c:662

 msgid "Format"
 msgstr "Muoto"
 
 msgid "Format"
 msgstr "Muoto"
 


@@ -2463,12 +2758,12 @@ msgstr "Pääte"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Päätteen avulla tehdeään erillisnimi (DN) LDAPilleEsimerkiksi:\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Päätteen avulla tehdeään erillisnimi (DN) LDAPilleEsimerkiksi:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 


@@ -2484,28 +2779,28 @@ msgstr "Yksilöllinen tunniste"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Osoitekirjan yksilöllöistä tunnistetta käytetään DN:n tekemiseen:\n"
 msgstr ""
 "Osoitekirjan yksilöllöistä tunnistetta käytetään DN:n tekemiseen:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Osoitekirjan näyttönimeä käytetään DN:n tekemiseen:\n"
 msgstr ""
 "Osoitekirjan näyttönimeä käytetään DN:n tekemiseen:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Henkilön ensimmäistä sähköpostiosoitetta käytetään DN:n tekemiseen:\n"
 msgstr ""
 "Henkilön ensimmäistä sähköpostiosoitetta käytetään DN:n tekemiseen:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@example.com,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:543
 msgid ""
 
 #: src/expldifdlg.c:543
 msgid ""


@@ -2552,11 +2847,11 @@ msgstr ""
 msgid "Export Address Book to LDIF File"
 msgstr "Vie osoitekirja LDIF-tiedostoon"
 
 msgid "Export Address Book to LDIF File"
 msgstr "Vie osoitekirja LDIF-tiedostoon"
 

-#: src/expldifdlg.c:737
+#: src/expldifdlg.c:736

 msgid "Distguished Name"
 msgstr "Distinguished Name"
 
 msgid "Distguished Name"
 msgstr "Distinguished Name"
 

-#: src/export.c:120 src/summaryview.c:6275
+#: src/export.c:120 src/summaryview.c:6368

 msgid "Export to mbox file"
 msgstr "Vie mbox-tiedostoon"
 
 msgid "Export to mbox file"
 msgstr "Vie mbox-tiedostoon"
 


@@ -2581,7 +2876,7 @@ msgid "Source folder can't be left empty."
 msgstr "Lähdekansio ei voi olla tyhjä"
 
 #: src/export.c:229
 msgstr "Lähdekansio ei voi olla tyhjä"
 
 #: src/export.c:229

-msgid "Can't find the source folder."
+msgid "Couldn't find the source folder."

 msgstr "Lähdekansiota ei löydy."
 
 #: src/export.c:252
 msgstr "Lähdekansiota ei löydy."
 
 #: src/export.c:252


@@ -2597,8 +2892,8 @@ msgid "Attributes"
 msgstr "Attribuutit"
 
 #: src/exporthtml.c:1010
 msgstr "Attribuutit"
 
 #: src/exporthtml.c:1010

-msgid "Sylpheed-Claws Address Book"
-msgstr "Sylpheed-Clawsin osoitekirja"
+msgid "Claws Mail Address Book"
+msgstr "Claws Mailin osoitekirja"

 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."
 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."


@@ -2616,48 +2911,53 @@ msgstr "Nimi on liian pitkä."
 msgid "Not specified."
 msgstr "Määrittelemättä."
 
 msgid "Not specified."
 msgstr "Määrittelemättä."
 

-#: src/folder.c:1277 src/foldersel.c:371 src/prefs_folder_item.c:208
+#: src/folder.c:1283 src/foldersel.c:371 src/prefs_folder_item.c:239

 msgid "Inbox"
 msgstr "Saapuneet"
 
 msgid "Inbox"
 msgstr "Saapuneet"
 

-#: src/folder.c:1281 src/foldersel.c:375
+#: src/folder.c:1287 src/foldersel.c:375

 msgid "Sent"
 msgstr "Lähetetyt"
 
 msgid "Sent"
 msgstr "Lähetetyt"
 

-#: src/folder.c:1285 src/foldersel.c:379 src/prefs_folder_item.c:211
+#: src/folder.c:1291 src/foldersel.c:379 src/prefs_folder_item.c:242

 msgid "Queue"
 msgstr "Jono"
 
 msgid "Queue"
 msgstr "Jono"
 

-#: src/folder.c:1289 src/foldersel.c:383 src/prefs_folder_item.c:212
-#: src/toolbar.c:366 src/toolbar.c:400 src/toolbar.c:491
+#: src/folder.c:1295 src/foldersel.c:383 src/prefs_folder_item.c:243
+#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501

 msgid "Trash"
 msgstr "Roskis"
 
 msgid "Trash"
 msgstr "Roskis"
 

-#: src/folder.c:1293 src/foldersel.c:387 src/prefs_folder_item.c:210
+#: src/folder.c:1299 src/foldersel.c:387 src/prefs_folder_item.c:241

 msgid "Drafts"
 msgstr "Luonnokset"
 
 msgid "Drafts"
 msgstr "Luonnokset"
 

-#: src/folder.c:1572
+#: src/folder.c:1578

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Käsitellään (%s)…\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Käsitellään (%s)…\n"
 

-#: src/folder.c:2509
+#: src/folder.c:2514

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Haetaan viestejä kohteessa %s…\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Haetaan viestejä kohteessa %s…\n"
 

-#: src/folder.c:2798
+#: src/folder.c:2803
+#, c-format
+msgid "Copying %s to %s...\n"
+msgstr "Kopioidaan kohteesta %s kohteeseen %s…\n"
+
+#: src/folder.c:2803

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Siirretään kohteesta %s kohteeseen %s…\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Siirretään kohteesta %s kohteeseen %s…\n"
 

-#: src/folder.c:3067
+#: src/folder.c:3090

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Päivitetään välimuistia kohteelle %s…"
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Päivitetään välimuistia kohteelle %s…"
 

-#: src/folder.c:3772
+#: src/folder.c:3801

 msgid "Processing messages..."
 msgstr "Käsitellään viestejä…"
 
 msgid "Processing messages..."
 msgstr "Käsitellään viestejä…"
 


@@ -2665,113 +2965,109 @@ msgstr "Käsitellään viestejä…"
 msgid "Select folder"
 msgstr "Valitse hakemisto"
 
 msgid "Select folder"
 msgstr "Valitse hakemisto"
 

-#: src/foldersel.c:558 src/imap_gtk.c:138 src/mh_gtk.c:129
+#: src/foldersel.c:558 src/imap_gtk.c:141 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr "UusiKansio"
 
 msgid "NewFolder"
 msgstr "UusiKansio"
 

-#: src/foldersel.c:566 src/imap_gtk.c:146 src/imap_gtk.c:152 src/mh_gtk.c:135
-#: src/mh_gtk.c:238
+#: src/foldersel.c:566 src/imap_gtk.c:149 src/imap_gtk.c:155 src/mh_gtk.c:138
+#: src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "merkkiä ’%c’ ei voi sisällyttää kansion nimeen."
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "merkkiä ’%c’ ei voi sisällyttää kansion nimeen."
 

-#: src/foldersel.c:576 src/imap_gtk.c:162 src/imap_gtk.c:216 src/mh_gtk.c:145
-#: src/mh_gtk.c:245
+#: src/foldersel.c:576 src/imap_gtk.c:165 src/imap_gtk.c:219 src/mh_gtk.c:148
+#: src/mh_gtk.c:248

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Kansio ”%s” on jo olemassa."
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Kansio ”%s” on jo olemassa."
 

-#: src/foldersel.c:583 src/imap_gtk.c:168 src/mh_gtk.c:151
+#: src/foldersel.c:583 src/imap_gtk.c:171 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kansiota ”%s” ei voi luoda."
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Kansiota ”%s” ei voi luoda."
 

-#: src/folderview.c:290
+#: src/folderview.c:291

 msgid "/Mark all re_ad"
 msgstr "Merkitse kaikki _luetuiksi"
 
 msgid "/Mark all re_ad"
 msgstr "Merkitse kaikki _luetuiksi"
 

-#: src/folderview.c:291
+#: src/folderview.c:293

 msgid "/_Search folder..."
 msgstr "_Hae hakemistosta…"
 
 msgid "/_Search folder..."
 msgstr "_Hae hakemistosta…"
 

-#: src/folderview.c:293
+#: src/folderview.c:295

 msgid "/Process_ing..."
 msgstr "_Käsittely…"
 
 msgid "/Process_ing..."
 msgstr "_Käsittely…"
 

-#: src/folderview.c:298
+#: src/folderview.c:300

 msgid "/Empty _trash..."
 msgstr "_Tyhjennä roskakori…"
 
 msgid "/Empty _trash..."
 msgstr "_Tyhjennä roskakori…"
 

-#: src/folderview.c:303
+#: src/folderview.c:305

 msgid "/Send _queue..."
 msgstr "Lähetetään _jonottavat…"
 
 msgid "/Send _queue..."
 msgstr "Lähetetään _jonottavat…"
 

-#: src/folderview.c:463 src/prefs_folder_column.c:80
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:80

 msgid "New"
 msgstr "Uusi"
 
 msgid "New"
 msgstr "Uusi"
 

-#: src/folderview.c:464 src/prefs_folder_column.c:81
+#: src/folderview.c:425 src/folderview.c:472 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr "Lukematta"
 
 msgid "Unread"
 msgstr "Lukematta"
 

+#: src/folderview.c:426 src/prefs_folder_column.c:82
+msgid "Total"
+msgstr "Yhteensä"
+

 #. TRANSLATORS: This in Number sign in American style
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:466 src/summaryview.c:490
+#: src/folderview.c:474 src/summaryview.c:491

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 

-#: src/folderview.c:710
+#: src/folderview.c:719

 msgid "Setting folder info..."
 msgstr "Asetetaan hakemiston tietoja…"
 
 msgid "Setting folder info..."
 msgstr "Asetetaan hakemiston tietoja…"
 

-#: src/folderview.c:764 src/summaryview.c:3400
+#: src/folderview.c:773 src/summaryview.c:3453

 msgid "Mark all as read"
 msgstr "Merkitse kaikki luetuksi"
 
 msgid "Mark all as read"
 msgstr "Merkitse kaikki luetuksi"
 

-#: src/folderview.c:765 src/summaryview.c:3401
+#: src/folderview.c:774 src/summaryview.c:3454

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Merkitäänkö kaikki kansion viestit luetuiksi?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Merkitäänkö kaikki kansion viestit luetuiksi?"
 

-#: src/folderview.c:1054
-msgid ""
-"You have one or more IMAP accounts defined. However this version of Sylpheed-"
-"Claws has been built without IMAP support; your IMAP account(s) are "
-"disabled.\n"
-"\n"
-"You probably need to install libetpan and recompile Sylpheed-Claws."
-msgstr ""
-"Käytössä on IMAP-tilejä, mutta tämä versio Sylpheed-Clawsista ei sisällä "
-"IMAP-tukea, joten IMAP-tilit on poistettu käytöstä.\n"
-"\n"
-"Tilien toimimiseksi pitäisi asentaa libetpan ja Sylpheed-Claws uudelleen."
-
-#: src/folderview.c:1071 src/imap.c:3143 src/mainwindow.c:3917 src/setup.c:90
+#: src/folderview.c:1060 src/imap.c:3190 src/mainwindow.c:3923 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Luetaan hakemistoa %s%c%s…"
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Luetaan hakemistoa %s%c%s…"
 

-#: src/folderview.c:1075 src/imap.c:3148 src/mainwindow.c:3922 src/setup.c:95
+#: src/folderview.c:1064 src/imap.c:3195 src/mainwindow.c:3928 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Luetaan hakemistoa %s…"
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Luetaan hakemistoa %s…"
 

-#: src/folderview.c:1102
+#: src/folderview.c:1091

 msgid "Rebuild folder tree"
 msgstr "Uudelleenkasaa kansioopuu"
 
 msgid "Rebuild folder tree"
 msgstr "Uudelleenkasaa kansioopuu"
 

-#: src/folderview.c:1103
+#: src/folderview.c:1092

 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "Kansiopuun rakennus tuhoaa paikallisen välimuistin. Rakennetaanko?"
 
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "Kansiopuun rakennus tuhoaa paikallisen välimuistin. Rakennetaanko?"
 

-#: src/folderview.c:1113
+#: src/folderview.c:1102

 msgid "Rebuilding folder tree..."
 msgstr "Rakennetaan uudelleen kansiopuuta…"
 
 msgid "Rebuilding folder tree..."
 msgstr "Rakennetaan uudelleen kansiopuuta…"
 

-#: src/folderview.c:1115
+#: src/folderview.c:1104

 msgid "Scanning folder tree..."
 msgstr "Luetaan kansiopuuta…"
 
 msgid "Scanning folder tree..."
 msgstr "Luetaan kansiopuuta…"
 

-#: src/folderview.c:1233
+#: src/folderview.c:1175
+#, c-format
+msgid "Couldn't scan folder %s\n"
+msgstr "Kansiota %s ei pysty lukemaan\n"
+
+#: src/folderview.c:1228

 msgid "Checking for new messages in all folders..."
 msgstr "Tarkastetaan uudet viestit kaikissa kansioissa…"
 
 msgid "Checking for new messages in all folders..."
 msgstr "Tarkastetaan uudet viestit kaikissa kansioissa…"
 


@@ -2799,78 +3095,101 @@ msgstr "Poistetaanko kaikki viestit roskiksesta?"
 
 #: src/folderview.c:2305 src/mainwindow.c:2081
 msgid "+_Empty trash"
 
 #: src/folderview.c:2305 src/mainwindow.c:2081
 msgid "+_Empty trash"

-msgstr "Tyhjää roskis"
+msgstr "_Tyhjää roskat"

 
 

-#: src/folderview.c:2349 src/inc.c:1444 src/toolbar.c:2126
+#: src/folderview.c:2349 src/inc.c:1465 src/toolbar.c:2196

 msgid "Offline warning"
 msgstr "Yhteydettömyysvaroitus"
 
 msgid "Offline warning"
 msgstr "Yhteydettömyysvaroitus"
 

-#: src/folderview.c:2350 src/toolbar.c:2127
+#: src/folderview.c:2350 src/toolbar.c:2197

 msgid "You're working offline. Override?"
 msgstr "Olet poissa linjoilta. Palataanko?"
 
 msgid "You're working offline. Override?"
 msgstr "Olet poissa linjoilta. Palataanko?"
 

-#: src/folderview.c:2361 src/toolbar.c:2146
+#: src/folderview.c:2361 src/toolbar.c:2216

 msgid "Send queued messages"
 msgstr "Lähetä jonottavat viestit"
 
 msgid "Send queued messages"
 msgstr "Lähetä jonottavat viestit"
 

-#: src/folderview.c:2362 src/toolbar.c:2147
+#: src/folderview.c:2362 src/toolbar.c:2217

 msgid "Send all queued messages?"
 msgstr "Lähetetäänkö kaikki jonottavat viestit?"
 
 #: src/folderview.c:2363 src/messageview.c:579 src/messageview.c:596
 msgid "Send all queued messages?"
 msgstr "Lähetetäänkö kaikki jonottavat viestit?"
 
 #: src/folderview.c:2363 src/messageview.c:579 src/messageview.c:596

-#: src/prefs_account.c:1030 src/toolbar.c:2148
+#: src/prefs_account.c:1039 src/toolbar.c:2218

 msgid "_Send"
 msgstr "_Lähetä"
 
 msgid "_Send"
 msgstr "_Lähetä"
 

-#: src/folderview.c:2371 src/toolbar.c:2166
+#: src/folderview.c:2371 src/toolbar.c:2236

 msgid "Some errors occurred while sending queued messages."
 msgstr "Jonottavien viestien lähetyksessä tapahtui virheitä."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Jonottavien viestien lähetyksessä tapahtui virheitä."
 

-#: src/folderview.c:2374 src/main.c:1285 src/toolbar.c:2169
+#: src/folderview.c:2374 src/main.c:1549 src/toolbar.c:2239

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"

-msgstr "Jonottavien viestien lähetyksessä tapahtui virheitä:\n"
+msgstr ""
+"Jonottavien viestien lähetyksessä tapahtui virheitä:\n"

 "%s"
 
 #: src/folderview.c:2441
 #, c-format
 "%s"
 
 #: src/folderview.c:2441
 #, c-format

+msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgstr "Kopioidaanko kansiosta %s kansion %s alikansio?"
+
+#: src/folderview.c:2442
+#, c-format

 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Tehdäänkö kansiosta %s kansion %s alikansio?"
 
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Tehdäänkö kansiosta %s kansion %s alikansio?"
 

+#: src/folderview.c:2444
+msgid "Copy folder"
+msgstr "Kopioi kansio"
+

 #: src/folderview.c:2444
 msgid "Move folder"
 msgstr "Siirrä kansio"
 
 #: src/folderview.c:2444
 msgid "Move folder"
 msgstr "Siirrä kansio"
 

+#: src/folderview.c:2455
+#, c-format
+msgid "Copying %s to %s..."
+msgstr "Kopioidaan kohteesta %s kohteeseen %s…"
+

 #: src/folderview.c:2455
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Siirretään kohteesta %s kohteeseen %s…"
 
 #: src/folderview.c:2455
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Siirretään kohteesta %s kohteeseen %s…"
 

-#: src/folderview.c:2484
+#: src/folderview.c:2486

 msgid "Source and destination are the same."
 msgstr "Lähde ja kohde ovat samoja."
 
 msgid "Source and destination are the same."
 msgstr "Lähde ja kohde ovat samoja."
 

-#: src/folderview.c:2487
+#: src/folderview.c:2489
+msgid "Can't copy a folder to one of its children."
+msgstr "Ei voida kopioida hakemistoa lapsekseen."
+
+#: src/folderview.c:2490

 msgid "Can't move a folder to one of its children."
 msgstr "Ei voida siirtää hakemistoa lapsekseen."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Ei voida siirtää hakemistoa lapsekseen."
 

-#: src/folderview.c:2490
+#: src/folderview.c:2493

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Hakemistoa ei voida siirtää postilaatikkojen välillä."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Hakemistoa ei voida siirtää postilaatikkojen välillä."
 

-#: src/folderview.c:2493
+#: src/folderview.c:2496
+msgid "Copy failed!"
+msgstr "Kopiointi epäonnistui!"
+
+#: src/folderview.c:2496

 msgid "Move failed!"
 msgstr "Siirto epäonnistui!"
 
 msgid "Move failed!"
 msgstr "Siirto epäonnistui!"
 

-#: src/folderview.c:2529
+#: src/folderview.c:2532

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Kansion %s asetuksia luetaan"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Kansion %s asetuksia luetaan"
 

-#: src/gedit-print.c:147 src/messageview.c:1504 src/summaryview.c:4070
-#: src/toolbar.c:178
+#: src/gedit-print.c:147 src/messageview.c:1519 src/summaryview.c:4124
+#: src/toolbar.c:182

 msgid "Print"
 msgstr "Tulosta"
 
 msgid "Print"
 msgstr "Tulosta"
 


@@ -2940,7 +3259,7 @@ msgstr "tuntematon"
 msgid "Can't retrieve newsgroup list."
 msgstr "Keskusteluryhmälistaa ei voida hakea."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Keskusteluryhmälistaa ei voida hakea."
 

-#: src/grouplistdialog.c:447 src/summaryview.c:1219
+#: src/grouplistdialog.c:447 src/summaryview.c:1265

 msgid "Done."
 msgstr "Valmis."
 
 msgid "Done."
 msgstr "Valmis."
 


@@ -2949,19 +3268,47 @@ msgstr "Valmis."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d keskusteluryhmää haettu (%s luettu)"
 
 msgid "%d newsgroups received (%s read)"
 msgstr "%d keskusteluryhmää haettu (%s luettu)"
 

-#: src/gtk/about.c:78 src/textview.c:232
+#: src/gtk/about.c:79 src/textview.c:216

 msgid "/_Open with Web browser"
 msgstr "_Avaa veppiselaimessa"
 
 msgid "/_Open with Web browser"
 msgstr "_Avaa veppiselaimessa"
 

-#: src/gtk/about.c:79 src/textview.c:233
+#: src/gtk/about.c:80 src/textview.c:217

 msgid "/Copy this _link"
 msgstr "_Kopioi linkin kohde"
 
 msgid "/Copy this _link"
 msgstr "_Kopioi linkin kohde"
 

-#: src/gtk/about.c:119
-msgid "About Sylpheed-Claws"
-msgstr "Tietoja Sylpheed-Clawsista."
+#: src/gtk/about.c:138
+msgid ""
+"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
+"\n"
+"For further information visit the Claws Mail website:\n"
+msgstr ""
+"Claws Mail on keveä, nopea ja muokattava sähköpostistin.\n"
+"\n"
+"Lisätietoja saa Claw Mail veppisivuilta:\n"

 
 

-#: src/gtk/about.c:161
+#: src/gtk/about.c:144
+msgid ""
+"\n"
+"\n"
+"Claws Mail is free software released under the GPL license. If you wish to "
+"donate to the Claws Mail project you can do so at:\n"
+msgstr ""
+"\n"
+"\n"
+"Claws Mail on GPL-lisenssin alainen vapaa ohjelmisto. Jos haluat auttaa "
+"Claws Mail -projektia, voit tehdä niin osoitteessa:\n"
+
+#: src/gtk/about.c:159
+msgid ""
+"\n"
+"\n"
+"System Information\n"
+msgstr ""
+"\n"
+"\n"
+"Järjestelmän tietoja\n"
+
+#: src/gtk/about.c:165

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2972,7 +3319,7 @@ msgstr ""
 "Locale: %s (merkistö: %s)\n"
 "Käyttöjärjestelmä: %s %s (%s)"
 
 "Locale: %s (merkistö: %s)\n"
 "Käyttöjärjestelmä: %s %s (%s)"
 

-#: src/gtk/about.c:170
+#: src/gtk/about.c:174

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2983,7 +3330,7 @@ msgstr ""
 "Locale: %s (merkistö: %s)\n"
 "Käyttöjärjestelmä: %s"
 
 "Locale: %s (merkistö: %s)\n"
 "Käyttöjärjestelmä: %s"
 

-#: src/gtk/about.c:179
+#: src/gtk/about.c:183

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2994,111 +3341,82 @@ msgstr ""
 "Locale: %s (merkistö: %s)\n"
 "Käyttöjärjestelmä: tuntematon"
 
 "Locale: %s (merkistö: %s)\n"
 "Käyttöjärjestelmä: tuntematon"
 

-#: src/gtk/about.c:194
-#, c-format
-msgid ""
-"Compiled-in features:\n"
-"%s"
-msgstr ""
-"Ohjelman mukaan käännetyt ominaisuudet:\n"
-"%s"
+#: src/gtk/about.c:240 src/prefs_themes.c:706 src/wizard.c:467
+msgid "The Claws Mail Team"
+msgstr "Claws Mail -tiimi"

 
 

-#: src/gtk/about.c:237
-msgid ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Sylpheed-Claws team"
-msgstr ""
-"Copyright © 1999—2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"ja Sylpheed-Claws-tiimi"
+#: src/gtk/about.c:259
+msgid "Previous team members"
+msgstr "Aiemmat tiimin jäsenet"

 
 

-#: src/gtk/about.c:280
-msgid ""
-"Sylpheed-Claws is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Sylpheed-Claws website:\n"
-msgstr ""
-"Sylpheed-Claws on keveä, nopea ja muokattava sähköpostistin.\n"
-"\n"
-"Lisätietoja saa Sylpheed-Clawsin veppisivuilta:\n"
+#: src/gtk/about.c:278
+msgid "The translation team"
+msgstr "Käännöstiimi"

 
 

-#: src/gtk/about.c:286
-msgid ""
-"\n"
-"\n"
-"Sylpheed-Claws is free software released under the GPL license. If you wish "
-"to donate to the Sylpheed-Claws project you can do so at:\n"
-msgstr ""
-"\n"
-"\n"
-"Sylpheed-Claws on GPL-lisenssin alainen vapaa ohjelmisto. Jos haluat auttaa "
-"Sylpheed-Claws-projektia, voit tehdä niin osoitteessa:\n"
+#: src/gtk/about.c:297
+msgid "Documentation team"
+msgstr "Dokumentointitiimi"

 
 

-#: src/gtk/about.c:293
-msgid "\n"
-msgstr "\n"
+#: src/gtk/about.c:316
+msgid "Logo"
+msgstr "Logo"

 
 

-#: src/gtk/about.c:304
-msgid "_Info"
-msgstr "_Tietoja"
+#: src/gtk/about.c:335
+msgid "Icons"
+msgstr "Kuvakkeet"

 
 

-#: src/gtk/about.c:332
-msgid "The Sylpheed-Claws Team\n"
-msgstr "Sylpheed-Claws-tiimi\n"
+#: src/gtk/about.c:354
+msgid "Contributors"
+msgstr "Avustajat"

 
 

-#: src/gtk/about.c:349
-msgid ""
-"\n"
-"Previous team members\n"
-msgstr ""
-"\n"
-"Aiemmat tiimin jäsenet\n"
+#: src/gtk/about.c:402
+msgid "Compiled-in Features\n"
+msgstr "Ohjelman mukaan käännetyt ominaisuudet\n"

 
 

-#: src/gtk/about.c:366
+#: src/gtk/about.c:418

 msgid ""
 msgid ""

-"\n"
-"The translation team\n"
+"IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"

 msgstr ""
 msgstr ""

-"\n"
-"Käännöstiimi\n"
+"lisää tuen uudelle IPV6-Internet-osoituskäytännölle\n"

 
 

-#: src/gtk/about.c:383
-msgid ""
-"\n"
-"Documentation team\n"
-msgstr ""
-"\n"
-"Dokumentointitiimi\n"
+#: src/gtk/about.c:429
+msgid "iconv|allows converting to and from different character sets\n"
+msgstr "mahdollistaa merkistömuunnokset\n"

 
 

-#: src/gtk/about.c:400
-msgid ""
-"\n"
-"Logo\n"
-msgstr ""
-"\n"
-"Logo\n"
+#: src/gtk/about.c:439
+msgid "compface|adds support for the X-Face header\n"
+msgstr "lisää X-Face-tuen\n"

 
 

-#: src/gtk/about.c:417
-msgid ""
-"\n"
-"Icons\n"
-msgstr ""
-"\n"
-"Kuvake\n"
+#: src/gtk/about.c:449
+msgid "OpenSSL|adds support for encrypted connections to servers\n"
+msgstr "lisää salattujen yhteysten tuen\n"

 
 

-#: src/gtk/about.c:434
-msgid ""
-"\n"
-"Contributors\n"
-msgstr ""
-"\n"
-"Avustajat\n"
+#: src/gtk/about.c:459
+msgid "LDAP|adds support for LDAP shared addressbooks\n"
+msgstr "lisää LDAP-osoitekirjatuen\n"

 
 

-#: src/gtk/about.c:453
-msgid "_Authors"
-msgstr "_Tekijät"
+#: src/gtk/about.c:469
+msgid "JPilot|adds support for PalmOS addressbooks\n"
+msgstr "lisää PalmOS-osoitekirjatuen\n"
+
+#: src/gtk/about.c:479
+msgid "GNU/aspell|adds support for spell checking\n"
+msgstr "lisää oikeinkirjoitustarkistustuen\n"
+
+#: src/gtk/about.c:489
+msgid "libetpan|adds support for IMAP servers\n"
+msgstr "lisää IMAP-palvelintuen\n"
+
+#: src/gtk/about.c:499
+msgid "libgnomeprint|adds support for a complete print dialog\n"
+msgstr "ottaa käyttöön monipuolisen tulostusvalikon\n"
+
+#: src/gtk/about.c:509
+msgid "libSM|adds support for session handling\n"
+msgstr "lisää sessiotuen\n"

 
 # www.turre.com
 
 # www.turre.com

-#: src/gtk/about.c:473
+#: src/gtk/about.c:541

 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 "
 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 "


@@ -3118,7 +3436,7 @@ msgstr ""
 "version mukaisesti.\n"
 "\n"
 
 "version mukaisesti.\n"
 "\n"
 

-#: src/gtk/about.c:479
+#: src/gtk/about.c:547

 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 "
 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 "


@@ -3132,7 +3450,7 @@ msgstr ""
 "GPL lisenssistä lisää yksityiskohtia.\n"
 "\n"
 
 "GPL lisenssistä lisää yksityiskohtia.\n"
 "\n"
 

-#: src/gtk/about.c:485
+#: src/gtk/about.c:553

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "


@@ -3144,7 +3462,7 @@ msgstr ""
 "Fifth Floor, Boston, MA 02111-1301, USA.\n"
 "\n"
 
 "Fifth Floor, Boston, MA 02111-1301, USA.\n"
 "\n"
 

-#: src/gtk/about.c:499
+#: src/gtk/about.c:571

 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("


@@ -3152,39 +3470,68 @@ msgstr ""
 "Tässä ohjelmassa on mukana OpenSSL Projectin ohjelma OpenSSL Toolkitiä "
 "varten ("
 
 "Tässä ohjelmassa on mukana OpenSSL Projectin ohjelma OpenSSL Toolkitiä "
 "varten ("
 

-#: src/gtk/about.c:503
+#: src/gtk/about.c:575

 msgid ").\n"
 msgstr ").\n"
 
 msgid ").\n"
 msgstr ").\n"
 

-#: src/gtk/about.c:515
+#: src/gtk/about.c:668
+msgid "About Claws Mail"
+msgstr "Tietoja Claws Mailista."
+
+#: src/gtk/about.c:719
+msgid ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"
+msgstr ""
+"Copyright © 1999—2007 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"ja Claws Mail -tiimi"
+
+#: src/gtk/about.c:733
+msgid "_Info"
+msgstr "_Tietoja"
+
+#: src/gtk/about.c:739
+msgid "_Authors"
+msgstr "_Tekijät"
+
+#: src/gtk/about.c:745
+msgid "_Features"
+msgstr "_Ominaisuudet"
+
+#: src/gtk/about.c:751

 msgid "_License"
 msgstr "_Lisenssi"
 
 msgid "_License"
 msgstr "_Lisenssi"
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:300
+#: src/gtk/about.c:759
+msgid "_Release Notes"
+msgstr "_Julkaisutiedotteet"
+
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:313

 msgid "Orange"
 msgstr "Oranssi"
 
 msgid "Orange"
 msgstr "Oranssi"
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:304
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:317

 msgid "Red"
 msgstr "Punainen"
 
 msgid "Red"
 msgstr "Punainen"
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:308
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:321

 msgid "Pink"
 msgstr "Pinkki"
 
 msgid "Pink"
 msgstr "Pinkki"
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:312
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:325

 msgid "Sky blue"
 msgstr "Taivaansininen"
 
 msgid "Sky blue"
 msgstr "Taivaansininen"
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:316
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:329

 msgid "Blue"
 msgstr "Sininen"
 
 msgid "Blue"
 msgstr "Sininen"
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:320
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:333

 msgid "Green"
 msgstr "Vihreä"
 
 msgid "Green"
 msgstr "Vihreä"
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:324
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:337

 msgid "Brown"
 msgstr "Ruskea"
 
 msgid "Brown"
 msgstr "Ruskea"
 


@@ -3310,36 +3657,36 @@ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr ""
 "Fontti, jota käytetään otsakkeille ja alatunnisteille (kuten Monospace 10)"
 
 msgstr ""
 "Fontti, jota käytetään otsakkeille ja alatunnisteille (kuten Monospace 10)"
 

-#: src/gtk/gtkaspell.c:606
+#: src/gtk/gtkaspell.c:632

 msgid "No dictionary selected."
 msgstr "Ei sanakirjaa valittuna"
 
 msgid "No dictionary selected."
 msgstr "Ei sanakirjaa valittuna"
 

-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
+#: src/gtk/gtkaspell.c:868 src/gtk/gtkaspell.c:1869 src/gtk/gtkaspell.c:2164

 msgid "Normal Mode"
 msgstr "Normaali tila"
 
 msgid "Normal Mode"
 msgstr "Normaali tila"
 

-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
+#: src/gtk/gtkaspell.c:870 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2176

 msgid "Bad Spellers Mode"
 msgstr "Väärinkirjoittajien tila"
 
 msgid "Bad Spellers Mode"
 msgstr "Väärinkirjoittajien tila"
 

-#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:909

 msgid "Unknown suggestion mode."
 msgstr "Tuntemattomien ehdotusten tila."
 
 msgid "Unknown suggestion mode."
 msgstr "Tuntemattomien ehdotusten tila."
 

-#: src/gtk/gtkaspell.c:1154
+#: src/gtk/gtkaspell.c:1200

 msgid "No misspelled word found."
 msgstr "Väärinkirjoitettuja sanoja ei löytynyt."
 
 msgid "No misspelled word found."
 msgstr "Väärinkirjoitettuja sanoja ei löytynyt."
 

-#: src/gtk/gtkaspell.c:1502
+#: src/gtk/gtkaspell.c:1548

 msgid "Replace unknown word"
 msgstr "Korvaa tuntematon sana"
 
 msgid "Replace unknown word"
 msgstr "Korvaa tuntematon sana"
 

-#: src/gtk/gtkaspell.c:1517
+#: src/gtk/gtkaspell.c:1563

 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Korvaa ”%s”: </span>"
 
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Korvaa ”%s”: </span>"
 

-#: src/gtk/gtkaspell.c:1562
+#: src/gtk/gtkaspell.c:1608

 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"


@@ -3347,62 +3694,75 @@ msgstr ""
 "Ctrl-näppäimen pitäminen pohjassa enteriä\n"
 "painettaessa opettaa virheitä.\n"
 
 "Ctrl-näppäimen pitäminen pohjassa enteriä\n"
 "painettaessa opettaa virheitä.\n"
 

-#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
+#: src/gtk/gtkaspell.c:1863 src/gtk/gtkaspell.c:2152

 msgid "Fast Mode"
 msgstr "Nopea tila"
 
 msgid "Fast Mode"
 msgstr "Nopea tila"
 

-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1970

 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "”%s” tuntematon kohteessa %s"
 
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "”%s” tuntematon kohteessa %s"
 

-#: src/gtk/gtkaspell.c:1930
+#: src/gtk/gtkaspell.c:1984

 msgid "Accept in this session"
 msgstr "Hyväksy tällä kertaa"
 
 msgid "Accept in this session"
 msgstr "Hyväksy tällä kertaa"
 

-#: src/gtk/gtkaspell.c:1940
+#: src/gtk/gtkaspell.c:1994

 msgid "Add to personal dictionary"
 msgstr "Lisää henkilökohtaiseen sanakirjaan"
 
 msgid "Add to personal dictionary"
 msgstr "Lisää henkilökohtaiseen sanakirjaan"
 

-#: src/gtk/gtkaspell.c:1950
+#: src/gtk/gtkaspell.c:2004

 msgid "Replace with..."
 msgstr "Korvaa…"
 
 msgid "Replace with..."
 msgstr "Korvaa…"
 

-#: src/gtk/gtkaspell.c:1963
+#: src/gtk/gtkaspell.c:2017

 #, c-format
 msgid "Check with %s"
 msgstr "Tarkista sovelluksella %s"
 
 #, c-format
 msgid "Check with %s"
 msgstr "Tarkista sovelluksella %s"
 

-#: src/gtk/gtkaspell.c:1985
+#: src/gtk/gtkaspell.c:2039

 msgid "(no suggestions)"
 msgstr "(ei ehdotuksia)"
 
 msgid "(no suggestions)"
 msgstr "(ei ehdotuksia)"
 

-#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
+#: src/gtk/gtkaspell.c:2050 src/gtk/gtkaspell.c:2229

 msgid "More..."
 msgstr "Lisää…"
 
 msgid "More..."
 msgstr "Lisää…"
 

-#: src/gtk/gtkaspell.c:2060
+#: src/gtk/gtkaspell.c:2114

 #, c-format
 msgid "Dictionary: %s"
 msgstr "Sanakirja: %s"
 
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Sanakirja: %s"
 

-#: src/gtk/gtkaspell.c:2073
+#: src/gtk/gtkaspell.c:2127

 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Käytä vaihtoehtoa (%s)"
 
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Käytä vaihtoehtoa (%s)"
 

-#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2138
+msgid "Use both dictionaries"
+msgstr "Käytä molempia sanakirjoja:"
+
+#: src/gtk/gtkaspell.c:2192 src/prefs_spelling.c:218

 msgid "Check while typing"
 msgstr "Tarkista kirjoitettaessa"
 
 msgid "Check while typing"
 msgstr "Tarkista kirjoitettaessa"
 

-#: src/gtk/gtkaspell.c:2137
+#: src/gtk/gtkaspell.c:2208

 msgid "Change dictionary"
 msgstr "Vaihda hakemistoa"
 
 msgid "Change dictionary"
 msgstr "Vaihda hakemistoa"
 

-#: src/gtk/gtkaspell.c:2270
+#: src/gtk/gtkaspell.c:2340
+#, c-format
+msgid ""
+"The spell checker could not change dictionary.\n"
+"%s"
+msgstr ""
+"Oikoluvun sanakirjaa ei voitu vaihtaa.\n"
+"%s"
+
+#: src/gtk/gtkaspell.c:2386

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"The spell checker could not change dictionary.\n"
+"The spell checker could not change the alternate dictionary.\n"

 "%s"
 msgstr ""
 "Oikoluvun sanakirjaa ei voitu vaihtaa.\n"
 "%s"
 msgstr ""
 "Oikoluvun sanakirjaa ei voitu vaihtaa.\n"


@@ -3496,16 +3856,16 @@ msgstr ""
 "<span weight=\"bold\">Seuraavat kuvakkeet kertovat viestien ja kansioiden "
 "tilan:</span>"
 
 "<span weight=\"bold\">Seuraavat kuvakkeet kertovat viestien ja kansioiden "
 "tilan:</span>"
 

-#: src/gtk/inputdialog.c:186
+#: src/gtk/inputdialog.c:189

 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Anna salasana käyttäjälle %s kohteessa %s:"
 
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Anna salasana käyttäjälle %s kohteessa %s:"
 

-#: src/gtk/inputdialog.c:188
+#: src/gtk/inputdialog.c:191

 msgid "Input password"
 msgstr "Anna salasana"
 
 msgid "Input password"
 msgstr "Anna salasana"
 

-#: src/gtk/inputdialog.c:275
+#: src/gtk/inputdialog.c:278

 msgid "Remember this"
 msgstr "Muista tämä"
 
 msgid "Remember this"
 msgstr "Muista tämä"
 


@@ -3513,7 +3873,7 @@ msgstr "Muista tämä"
 msgid "Protocol log"
 msgstr "Protokollaloki"
 
 msgid "Protocol log"
 msgstr "Protokollaloki"
 

-#: src/gtk/logwindow.c:373
+#: src/gtk/logwindow.c:384

 msgid "Clear _Log"
 msgstr "Tyhjennä _loki"
 
 msgid "Clear _Log"
 msgstr "Tyhjennä _loki"
 


@@ -3557,13 +3917,13 @@ msgstr ""
 msgid "Plugins"
 msgstr "Liitännäiset"
 
 msgid "Plugins"
 msgstr "Liitännäiset"
 

-#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:211

 msgid "Description"
 msgstr "Kuvaus"
 
 #: src/gtk/pluginwindow.c:336
 msgid "Description"
 msgstr "Kuvaus"
 
 #: src/gtk/pluginwindow.c:336

-msgid "More plugins are available from the Sylpheed-Claws website."
-msgstr "Lisää liitännäisiä voi noutaa Sylpheed-Clawsin kotisivuilta."
+msgid "More plugins are available from the Claws Mail website."
+msgstr "Lisää liitännäisiä voi noutaa Claws Mailin verkkosivuilta."

 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."
 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."


@@ -3593,187 +3953,187 @@ msgstr "Ladatut liitännäiset"
 msgid "Page Index"
 msgstr "Hakemisto"
 
 msgid "Page Index"
 msgstr "Hakemisto"
 

-#: src/gtk/progressdialog.c:141 src/prefs_account.c:760
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:769

 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Tili"
 
 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Tili"
 

-#: src/gtk/progressdialog.c:149 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80
+#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
+#: src/prefs_summary_column.c:80 src/summaryview.c:2376

 msgid "Status"
 msgstr "Tila"
 
 msgid "Status"
 msgstr "Tila"
 

-#: src/gtk/quicksearch.c:252
+#: src/gtk/quicksearch.c:331

 msgid "all messages"
 msgstr "kaikki viestit"
 
 msgid "all messages"
 msgstr "kaikki viestit"
 

-#: src/gtk/quicksearch.c:253
+#: src/gtk/quicksearch.c:332

 msgid "messages whose age is greater than #"
 msgstr "viestit, jotka ovat uudempia kuin #"
 
 msgid "messages whose age is greater than #"
 msgstr "viestit, jotka ovat uudempia kuin #"
 

-#: src/gtk/quicksearch.c:254
+#: src/gtk/quicksearch.c:333

 msgid "messages whose age is less than #"
 msgstr "viestit, jotka ovat vanhempia kuin #"
 
 msgid "messages whose age is less than #"
 msgstr "viestit, jotka ovat vanhempia kuin #"
 

-#: src/gtk/quicksearch.c:255
+#: src/gtk/quicksearch.c:334

 msgid "messages which contain S in the message body"
 msgstr "viestit, jotka sisältävät S:n viestitekstissään"
 
 msgid "messages which contain S in the message body"
 msgstr "viestit, jotka sisältävät S:n viestitekstissään"
 

-#: src/gtk/quicksearch.c:256
+#: src/gtk/quicksearch.c:335

 msgid "messages which contain S in the whole message"
 msgstr "viestit, jotka sisältävät S:n jossakin"
 
 msgid "messages which contain S in the whole message"
 msgstr "viestit, jotka sisältävät S:n jossakin"
 

-#: src/gtk/quicksearch.c:257
+#: src/gtk/quicksearch.c:336

 msgid "messages carbon-copied to S"
 msgstr "viestit, jonka kopiot on lähetty S:lle"
 
 msgid "messages carbon-copied to S"
 msgstr "viestit, jonka kopiot on lähetty S:lle"
 

-#: src/gtk/quicksearch.c:258
+#: src/gtk/quicksearch.c:337

 msgid "message is either to: or cc: to S"
 msgstr "viestit, jotka on lähetty tai kopioitu S:lle"
 
 msgid "message is either to: or cc: to S"
 msgstr "viestit, jotka on lähetty tai kopioitu S:lle"
 

-#: src/gtk/quicksearch.c:259
+#: src/gtk/quicksearch.c:338

 msgid "deleted messages"
 msgstr "poistetut viestit"
 
 msgid "deleted messages"
 msgstr "poistetut viestit"
 

-#: src/gtk/quicksearch.c:260
+#: src/gtk/quicksearch.c:339

 msgid "messages which contain S in the Sender field"
 msgstr "viestit, jotka on lähettänyt S"
 
 msgid "messages which contain S in the Sender field"
 msgstr "viestit, jotka on lähettänyt S"
 

-#: src/gtk/quicksearch.c:261
+#: src/gtk/quicksearch.c:340

 msgid "true if execute \"S\" succeeds"
 msgstr "tosi, jos ”S”:n suorittaminen onnistuu"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "tosi, jos ”S”:n suorittaminen onnistuu"
 

-#: src/gtk/quicksearch.c:262
+#: src/gtk/quicksearch.c:341

 msgid "messages originating from user S"
 msgstr "viestit, jotka ovat lähtöisin käyttäjältä S"
 
 msgid "messages originating from user S"
 msgstr "viestit, jotka ovat lähtöisin käyttäjältä S"
 

-#: src/gtk/quicksearch.c:263
+#: src/gtk/quicksearch.c:342

 msgid "forwarded messages"
 msgstr "edelleenvälitetyt viestit"
 
 msgid "forwarded messages"
 msgstr "edelleenvälitetyt viestit"
 

-#: src/gtk/quicksearch.c:264
+#: src/gtk/quicksearch.c:343

 msgid "messages which contain header S"
 msgstr "viestit, joissa on otsake S"
 
 msgid "messages which contain header S"
 msgstr "viestit, joissa on otsake S"
 

-#: src/gtk/quicksearch.c:265
+#: src/gtk/quicksearch.c:344

 msgid "messages which contain S in Message-ID header"
 msgstr "viestit, joiden viestin tunnus -otsakkeessa on S"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "viestit, joiden viestin tunnus -otsakkeessa on S"
 

-#: src/gtk/quicksearch.c:266
+#: src/gtk/quicksearch.c:345

 msgid "messages which contain S in inreplyto header"
 msgstr "viestit, joiden vastausosoiteotsakkeessa on S"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "viestit, joiden vastausosoiteotsakkeessa on S"
 

-#: src/gtk/quicksearch.c:267
+#: src/gtk/quicksearch.c:346

 msgid "messages which are marked with color #"
 msgstr "viestit, jotka on värjätty värillä #"
 
 msgid "messages which are marked with color #"
 msgstr "viestit, jotka on värjätty värillä #"
 

-#: src/gtk/quicksearch.c:268
+#: src/gtk/quicksearch.c:347

 msgid "locked messages"
 msgstr "lukitut viestit"
 
 msgid "locked messages"
 msgstr "lukitut viestit"
 

-#: src/gtk/quicksearch.c:269
+#: src/gtk/quicksearch.c:348

 msgid "messages which are in newsgroup S"
 msgstr "viestit, jotka ovat uutisryhmässä S"
 
 msgid "messages which are in newsgroup S"
 msgstr "viestit, jotka ovat uutisryhmässä S"
 

-#: src/gtk/quicksearch.c:270
+#: src/gtk/quicksearch.c:349

 msgid "new messages"
 msgstr "uudet viestit"
 
 msgid "new messages"
 msgstr "uudet viestit"
 

-#: src/gtk/quicksearch.c:271
+#: src/gtk/quicksearch.c:350

 msgid "old messages"
 msgstr "vanhat viestit"
 
 msgid "old messages"
 msgstr "vanhat viestit"
 

-#: src/gtk/quicksearch.c:272
+#: src/gtk/quicksearch.c:351

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "osittaiset viestit (joita ei ole kokonaan ladattu)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "osittaiset viestit (joita ei ole kokonaan ladattu)"
 

-#: src/gtk/quicksearch.c:273
+#: src/gtk/quicksearch.c:352

 msgid "messages which have been replied to"
 msgstr "vastatut viestit"
 
 msgid "messages which have been replied to"
 msgstr "vastatut viestit"
 

-#: src/gtk/quicksearch.c:274
+#: src/gtk/quicksearch.c:353

 msgid "read messages"
 msgstr "luetut viestit"
 
 msgid "read messages"
 msgstr "luetut viestit"
 

-#: src/gtk/quicksearch.c:275
+#: src/gtk/quicksearch.c:354

 msgid "messages which contain S in subject"
 msgstr "viestit, joiden otsikossa on S"
 
 msgid "messages which contain S in subject"
 msgstr "viestit, joiden otsikossa on S"
 

-#: src/gtk/quicksearch.c:276
+#: src/gtk/quicksearch.c:355

 msgid "messages whose score is equal to #"
 msgstr "viestit, joiden pistemäärä on #"
 
 msgid "messages whose score is equal to #"
 msgstr "viestit, joiden pistemäärä on #"
 

-#: src/gtk/quicksearch.c:277
+#: src/gtk/quicksearch.c:356

 msgid "messages whose score is greater than #"
 msgstr "viestit, joiden pistemäärä on suurempi kuin #"
 
 msgid "messages whose score is greater than #"
 msgstr "viestit, joiden pistemäärä on suurempi kuin #"
 

-#: src/gtk/quicksearch.c:278
+#: src/gtk/quicksearch.c:357

 msgid "messages whose score is lower than #"
 msgstr "viestit, joiden pistemäärä on pienempi kuin #"
 
 msgid "messages whose score is lower than #"
 msgstr "viestit, joiden pistemäärä on pienempi kuin #"
 

-#: src/gtk/quicksearch.c:279
+#: src/gtk/quicksearch.c:358

 msgid "messages whose size is equal to #"
 msgstr "viestit, joiden koko on #"
 
 msgid "messages whose size is equal to #"
 msgstr "viestit, joiden koko on #"
 

-#: src/gtk/quicksearch.c:280
+#: src/gtk/quicksearch.c:359

 msgid "messages whose size is greater than #"
 msgstr "viestit, joiden koko on suurempi kuin #"
 
 msgid "messages whose size is greater than #"
 msgstr "viestit, joiden koko on suurempi kuin #"
 

-#: src/gtk/quicksearch.c:281
+#: src/gtk/quicksearch.c:360

 msgid "messages whose size is smaller than #"
 msgstr "viestit, joiden koko on pienempi kuin #"
 
 msgid "messages whose size is smaller than #"
 msgstr "viestit, joiden koko on pienempi kuin #"
 

-#: src/gtk/quicksearch.c:282
+#: src/gtk/quicksearch.c:361

 msgid "messages which have been sent to S"
 msgstr "viestit, jotka on lähetetty S:lle"
 
 msgid "messages which have been sent to S"
 msgstr "viestit, jotka on lähetetty S:lle"
 

-#: src/gtk/quicksearch.c:283
+#: src/gtk/quicksearch.c:362

 msgid "marked messages"
 msgstr "merkityt viestit"
 
 msgid "marked messages"
 msgstr "merkityt viestit"
 

-#: src/gtk/quicksearch.c:284
+#: src/gtk/quicksearch.c:363

 msgid "unread messages"
 msgstr "lukemattomat viestit"
 
 msgid "unread messages"
 msgstr "lukemattomat viestit"
 

-#: src/gtk/quicksearch.c:285
+#: src/gtk/quicksearch.c:364

 msgid "messages which contain S in References header"
 msgstr "viestit, joiden viittaukset-otsakkeessa on S"
 
 msgid "messages which contain S in References header"
 msgstr "viestit, joiden viittaukset-otsakkeessa on S"
 

-#: src/gtk/quicksearch.c:286
+#: src/gtk/quicksearch.c:365

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "viestit, jotka saavat komennon palauttamaan 0:n — %F on viestitiedosto"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "viestit, jotka saavat komennon palauttamaan 0:n — %F on viestitiedosto"
 

-#: src/gtk/quicksearch.c:287
+#: src/gtk/quicksearch.c:366

 msgid "messages which contain S in X-Label header"
 msgstr "viestit, joiden X-label-otsakkeessa on S"
 
 msgid "messages which contain S in X-Label header"
 msgstr "viestit, joiden X-label-otsakkeessa on S"
 

-#: src/gtk/quicksearch.c:289
+#: src/gtk/quicksearch.c:368

 msgid "logical AND operator"
 msgstr "looginen JA-operaattori"
 
 msgid "logical AND operator"
 msgstr "looginen JA-operaattori"
 

-#: src/gtk/quicksearch.c:290
+#: src/gtk/quicksearch.c:369

 msgid "logical OR operator"
 msgstr "looginen TAI-operaattori"
 
 msgid "logical OR operator"
 msgstr "looginen TAI-operaattori"
 

-#: src/gtk/quicksearch.c:291
+#: src/gtk/quicksearch.c:370

 msgid "logical NOT operator"
 msgstr "looginen EI-operaattori"
 
 msgid "logical NOT operator"
 msgstr "looginen EI-operaattori"
 

-#: src/gtk/quicksearch.c:292
+#: src/gtk/quicksearch.c:371

 msgid "case sensitive search"
 msgstr "kirjaintasot erotteleva haku"
 
 msgid "case sensitive search"
 msgstr "kirjaintasot erotteleva haku"
 

-#: src/gtk/quicksearch.c:294
+#: src/gtk/quicksearch.c:373

 msgid "all filtering expressions are allowed"
 msgstr "kaikki suodatusilmaukset sallittu"
 
 msgid "all filtering expressions are allowed"
 msgstr "kaikki suodatusilmaukset sallittu"
 

-#: src/gtk/quicksearch.c:302 src/summary_search.c:320
+#: src/gtk/quicksearch.c:381 src/summary_search.c:397

 msgid "Extended Search"
 msgstr "Laajennettu haku"
 
 msgid "Extended Search"
 msgstr "Laajennettu haku"
 

-#: src/gtk/quicksearch.c:303
+#: src/gtk/quicksearch.c:382

 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"
 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"


@@ -3785,47 +4145,51 @@ msgstr ""
 "\n"
 "Seuraavia merkintöjä voi käyttää:"
 
 "\n"
 "Seuraavia merkintöjä voi käyttää:"
 

-#: src/gtk/quicksearch.c:399 src/prefs_filtering_action.c:1080
-#: src/prefs_matcher.c:158 src/prefs_matcher.c:1866
-#: src/prefs_summary_column.c:82 src/prefs_template.c:190 src/quote_fmt.c:47
-#: src/summaryview.c:485
+#: src/gtk/quicksearch.c:478 src/prefs_compose_writing.c:239
+#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
+#: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
+#: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486

 msgid "Subject"
 msgstr "Otsikko"
 
 msgid "Subject"
 msgstr "Otsikko"
 

-#: src/gtk/quicksearch.c:403 src/prefs_filtering_action.c:1081
+#: src/gtk/quicksearch.c:482 src/prefs_filtering_action.c:1081

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867

-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:486
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487

 msgid "From"
 msgstr "Lähettäjä"
 
 msgid "From"
 msgstr "Lähettäjä"
 

-#: src/gtk/quicksearch.c:407 src/prefs_filtering_action.c:1082
+#: src/gtk/quicksearch.c:486 src/prefs_filtering_action.c:1082

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48

-#: src/summaryview.c:487
+#: src/summaryview.c:488

 msgid "To"
 msgstr "Vastaanottaja"
 
 msgid "To"
 msgstr "Vastaanottaja"
 

-#: src/gtk/quicksearch.c:418
+#: src/gtk/quicksearch.c:497

 msgid "Recursive"
 msgstr "Rekursiivinen"
 
 msgid "Recursive"
 msgstr "Rekursiivinen"
 

-#: src/gtk/quicksearch.c:428
+#: src/gtk/quicksearch.c:507

 msgid "Sticky"
 msgstr "Tahmea"
 
 msgid "Sticky"
 msgstr "Tahmea"
 

-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:517
+msgid "Type-ahead"
+msgstr "Näppäilyennakointihaku"
+
+#: src/gtk/quicksearch.c:548

 msgid " Clear "
 msgstr "Tyhjennä"
 
 msgid " Clear "
 msgstr "Tyhjennä"
 

-#: src/gtk/quicksearch.c:480 src/summary_search.c:273
+#: src/gtk/quicksearch.c:569 src/summary_search.c:350

 msgid "Edit search criteria"
 msgstr "Muokkaa hakuehtoja"
 
 msgid "Edit search criteria"
 msgstr "Muokkaa hakuehtoja"
 

-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:575

 msgid " Extended Symbols... "
 msgstr "Laajennetut symbolit…"
 
 msgid " Extended Symbols... "
 msgstr "Laajennetut symbolit…"
 

-#: src/gtk/quicksearch.c:917 src/summaryview.c:1041
+#: src/gtk/quicksearch.c:1025 src/summaryview.c:1073

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Etsitään kohteessa %s…\n"
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Etsitään kohteessa %s…\n"


@@ -3943,11 +4307,11 @@ msgstr "_Katsele varmenteita"
 msgid "Changed SSL Certificate"
 msgstr "Muuttunut SSL-varmenne"
 
 msgid "Changed SSL Certificate"
 msgstr "Muuttunut SSL-varmenne"
 

-#: src/headerview.c:195 src/summaryview.c:2728 src/summaryview.c:2739
+#: src/headerview.c:195 src/summaryview.c:2784 src/summaryview.c:2795

 msgid "(No From)"
 msgstr "(Ei lähettäjää)"
 
 msgid "(No From)"
 msgstr "(Ei lähettäjää)"
 

-#: src/headerview.c:210 src/summaryview.c:2763 src/summaryview.c:2766
+#: src/headerview.c:210 src/summaryview.c:2819 src/summaryview.c:2822

 msgid "(No Subject)"
 msgstr "(Ei otsikkoa)"
 
 msgid "(No Subject)"
 msgstr "(Ei otsikkoa)"
 


@@ -3967,7 +4331,7 @@ msgstr "Lataa kuva"
 msgid "Content-Type:"
 msgstr "Sisältömuoto:"
 
 msgid "Content-Type:"
 msgstr "Sisältömuoto:"
 

-#: src/imap.c:623
+#: src/imap.c:632

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3979,210 +4343,227 @@ msgstr ""
 "CRAM-MD5-kirjautumiset toimivat vain jos libetpanissa on SASL-tuki ja CRAM-"
 "MD5 SASL-liitännäinen on on asennettu."
 
 "CRAM-MD5-kirjautumiset toimivat vain jos libetpanissa on SASL-tuki ja CRAM-"
 "MD5 SASL-liitännäinen on on asennettu."
 

-#: src/imap.c:630
+#: src/imap.c:639

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 "Yhdistäminen kohteeseen %s epäonnistui: kirjautuminen sisään ei toiminut.%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 "Yhdistäminen kohteeseen %s epäonnistui: kirjautuminen sisään ei toiminut.%s"
 

-#: src/imap.c:634
+#: src/imap.c:643

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 "Yhdistäminen kohteeseen %s epäonnistui: kirjautuminen sisään ei toiminut.%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 "Yhdistäminen kohteeseen %s epäonnistui: kirjautuminen sisään ei toiminut.%s\n"
 

-#: src/imap.c:651
+#: src/imap.c:660

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Yhteydenotto kohteeseen %s epäonnistui"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Yhteydenotto kohteeseen %s epäonnistui"
 

-#: src/imap.c:656 src/imap.c:659
+#: src/imap.c:665 src/imap.c:668

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-yhteys kohteeseen %s on katkennut, yhdistetään uudelleen…\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-yhteys kohteeseen %s on katkennut, yhdistetään uudelleen…\n"
 

-#: src/imap.c:697 src/imap.c:2163 src/imap.c:2687 src/imap.c:2771
-#: src/imap.c:3109 src/imap.c:3864
-msgid "Sylpheed-Claws needs network access in order to access the IMAP server."
+#: src/imap.c:717 src/imap.c:2239 src/imap.c:2737 src/imap.c:2822
+#: src/imap.c:3156 src/imap.c:3914
+msgid "Claws Mail needs network access in order to access the IMAP server."

 msgstr "IMAP-palvelimeen ei saada yhteyttä ilman verkkoyhteyttä."
 
 msgstr "IMAP-palvelimeen ei saada yhteyttä ilman verkkoyhteyttä."
 

-#: src/imap.c:771 src/inc.c:749 src/news.c:295 src/send_message.c:299
+#: src/imap.c:789 src/inc.c:770 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Suojaamaton yhteys"
 
 msgid "Insecure connection"
 msgstr "Suojaamaton yhteys"
 

-#: src/imap.c:772 src/inc.c:750 src/news.c:296 src/send_message.c:300
+#: src/imap.c:790 src/inc.c:771 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "

-"available in this build of Sylpheed-Claws. \n"
+"available in this build of Claws Mail. \n"

 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Tämä yhteys on asetettu käyttämään SSL:ää, mutta SSL ei ole käytettävissä "
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Tämä yhteys on asetettu käyttämään SSL:ää, mutta SSL ei ole käytettävissä "

-"tässä Sylpheed-Clawsin versiossa. \n"
+"tässä Claws Mailin versiossa. \n"

 "\n"
 "\n"

-"Haluatko silti yhdistää palvelimelle? Tämä yhteys ei ole suojattu."
+"Haluatko silti yhdistää palvelimelle? Yhteys ei ole silloin suojattua."

 
 

-#: src/imap.c:778 src/inc.c:756 src/news.c:302 src/send_message.c:306
+#: src/imap.c:796 src/inc.c:777 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "_Yhdistä joka tapauksessa"
 
 msgid "Con_tinue connecting"
 msgstr "_Yhdistä joka tapauksessa"
 

-#: src/imap.c:788
+#: src/imap.c:806

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Yhdistetään IMAP4-palvelimeen: %s…"
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Yhdistetään IMAP4-palvelimeen: %s…"
 

-#: src/imap.c:820
+#: src/imap.c:844

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä"
 

-#: src/imap.c:823
+#: src/imap.c:847

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4-palvelimeen %s:%d ei saada yhteyttä\n"
 

-#: src/imap.c:852 src/imap.c:2495
+#: src/imap.c:876 src/imap.c:2545

 msgid "Can't start TLS session.\n"
 msgstr "TLS-session aloitus ei onnistu.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "TLS-session aloitus ei onnistu.\n"
 

-#: src/imap.c:889
+#: src/imap.c:913

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Yhdistetään IMAP4-palvelimeen: %s…\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Yhdistetään IMAP4-palvelimeen: %s…\n"
 

-#: src/imap.c:900 src/imap.c:903
+#: src/imap.c:924 src/imap.c:927

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Yhdistetään IMAP-palvelimeen: %s…"
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Yhdistetään IMAP-palvelimeen: %s…"
 

-#: src/imap.c:1077
+#: src/imap.c:1100

 msgid "Adding messages..."
 msgstr "Lisätään viestejä…"
 
 msgid "Adding messages..."
 msgstr "Lisätään viestejä…"
 

-#: src/imap.c:1225 src/mh.c:504
+#: src/imap.c:1252 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Kopioidaan viestejä…"
 
 msgid "Copying messages..."
 msgstr "Kopioidaan viestejä…"
 

-#: src/imap.c:1352
+#: src/imap.c:1428

 msgid "can't set deleted flags\n"
 msgstr "poistomerkkejä ei voitu asettaa\n"
 
 msgid "can't set deleted flags\n"
 msgstr "poistomerkkejä ei voitu asettaa\n"
 

-#: src/imap.c:1358 src/imap.c:3616
+#: src/imap.c:1434 src/imap.c:3665

 msgid "can't expunge\n"
 msgstr "ei voida hävittää\n"
 
 msgid "can't expunge\n"
 msgstr "ei voida hävittää\n"
 

-#: src/imap.c:1802
+#: src/imap.c:1878

 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei voitu luoda postilaatikkoa: LIST epäonnistui\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei voitu luoda postilaatikkoa: LIST epäonnistui\n"
 

-#: src/imap.c:1818
+#: src/imap.c:1894

 msgid "can't create mailbox\n"
 msgstr "ei voitu luoda postilaatikkoa\n"
 
 msgid "can't create mailbox\n"
 msgstr "ei voitu luoda postilaatikkoa\n"
 

-#: src/imap.c:1899
+#: src/imap.c:1975

 msgid "New folder name must not contain the namespace path separator"
 msgstr "Uuden kansion nimessä ei saa olla nimiavaruuden polkuerotinta"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Uuden kansion nimessä ei saa olla nimiavaruuden polkuerotinta"
 

-#: src/imap.c:1930
+#: src/imap.c:2006

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei voida uudelleennimetä postilaatikkoa %s %s:ksi\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei voida uudelleennimetä postilaatikkoa %s %s:ksi\n"
 

-#: src/imap.c:1994
+#: src/imap.c:2070

 msgid "can't delete mailbox\n"
 msgstr "ei voida poistaa postilaatikkoa\n"
 
 msgid "can't delete mailbox\n"
 msgstr "ei voida poistaa postilaatikkoa\n"
 

-#: src/imap.c:2275
+#: src/imap.c:2316

 msgid "LIST failed\n"
 msgstr "LIST epäonnistui\n"
 
 msgid "LIST failed\n"
 msgstr "LIST epäonnistui\n"
 

-#: src/imap.c:2383
+#: src/imap.c:2433

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "hakemistoa %s ei voida valita\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "hakemistoa %s ei voida valita\n"
 

-#: src/imap.c:2492
+#: src/imap.c:2542

 msgid "Server requires TLS to log in.\n"
 msgstr "Palvelin vaatii TLS:ää kirjautumiseen\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "Palvelin vaatii TLS:ää kirjautumiseen\n"
 

-#: src/imap.c:2501
+#: src/imap.c:2551

 msgid "Can't refresh capabilities.\n"
 msgstr "Ominaisuuksia ei voida päivittää.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "Ominaisuuksia ei voida päivittää.\n"
 

-#: src/imap.c:2506
+#: src/imap.c:2556

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Connection to %s failed: server requires TLS, but Sylpheed-Claws has been "
+"Connection to %s failed: server requires TLS, but Claws Mail has been "

 "compiled without OpenSSL support.\n"
 msgstr ""
 "Yhteydenotto palvelimelle %s epäonnistui: palvelin vaatii TLS:ää, mutta "
 "compiled without OpenSSL support.\n"
 msgstr ""
 "Yhteydenotto palvelimelle %s epäonnistui: palvelin vaatii TLS:ää, mutta "

-"Sylpheed-Claws on käännetty ilman tukea.\n"
+"Claws Mail on käännetty ilman OpenSSL-tukea.\n"

 
 

-#: src/imap.c:2514
+#: src/imap.c:2564

 msgid "Server logins are disabled.\n"
 msgstr "Palvelimelle kirjautuminen on poissa käytöstä.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "Palvelimelle kirjautuminen on poissa käytöstä.\n"
 

-#: src/imap.c:2692
+#: src/imap.c:2742

 msgid "Fetching message..."
 msgstr "Haetaan viestiä…"
 
 msgid "Fetching message..."
 msgstr "Haetaan viestiä…"
 

-#: src/imap.c:2858
+#: src/imap.c:2909

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei voi muuntaa UTF-7:ää merkitöön %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei voi muuntaa UTF-7:ää merkitöön %s\n"
 

-#: src/imap.c:2888
+#: src/imap.c:2939

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei voi muuntaa merkitöstä %s UTF-7:ään\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei voi muuntaa merkitöstä %s UTF-7:ään\n"
 

-#: src/imap.c:2932
+#: src/imap.c:2983

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv ei voi muuntaa UTF-8:sta UTF-7:ään\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv ei voi muuntaa UTF-8:sta UTF-7:ään\n"
 

-#: src/imap.c:3601
+#: src/imap.c:3650

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "poistomerkkejä ei voitu asettaa: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "poistomerkkejä ei voitu asettaa: %d\n"
 

+#: src/imap.c:4378
+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 "
+"disabled.\n"
+"\n"
+"You probably need to install libetpan and recompile Claws Mail."
+msgstr ""
+"Käytössä on IMAP-tilejä, mutta tämä versio Claws Mailista ei sisällä "
+"IMAP-tukea, joten IMAP-tilit on poistettu käytöstä.\n"
+"\n"
+"Tilien toimimiseksi pitäisi asentaa libetpan ja Claws Mail uudelleen."
+

 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "Luo _uusi kansio…"
 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "Luo _uusi kansio…"
 

-#: src/imap_gtk.c:56 src/mh_gtk.c:51
+#: src/imap_gtk.c:57 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr "Nimeä kansio uu_delleen…"
 
 msgid "/_Rename folder..."
 msgstr "Nimeä kansio uu_delleen…"
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:58 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr "_Siirrä kansio…"
 
 msgid "/M_ove folder..."
 msgstr "_Siirrä kansio…"
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:59 src/mh_gtk.c:54
+msgid "/Cop_y folder..."
+msgstr "_Kopioi kansio…"
+
+#: src/imap_gtk.c:61 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr "_Poista kansio…"
 
 msgid "/_Delete folder..."
 msgstr "_Poista kansio…"
 

-#: src/imap_gtk.c:60 src/news_gtk.c:55
+#: src/imap_gtk.c:63 src/news_gtk.c:55

 msgid "/Synchronise"
 msgstr "Ajantasaista"
 
 msgid "/Synchronise"
 msgstr "Ajantasaista"
 

-#: src/imap_gtk.c:61 src/news_gtk.c:56
+#: src/imap_gtk.c:64 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr "_Hae viestejä"
 
 msgid "/Down_load messages"
 msgstr "_Hae viestejä"
 

-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:58
+#: src/imap_gtk.c:66 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr "_Tarkasta onko uusia viestejä"
 
 msgid "/_Check for new messages"
 msgstr "_Tarkasta onko uusia viestejä"
 

-#: src/imap_gtk.c:64 src/mh_gtk.c:56
+#: src/imap_gtk.c:67 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr "_Tarkasta onko uusia viestejä"
 
 msgid "/C_heck for new folders"
 msgstr "_Tarkasta onko uusia viestejä"
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:57
+#: src/imap_gtk.c:68 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr "Uudelleenkasaa hakemisto_puu"
 
 msgid "/R_ebuild folder tree"
 msgstr "Uudelleenkasaa hakemisto_puu"
 

-#: src/imap_gtk.c:135
+#: src/imap_gtk.c:138

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"


@@ -4192,21 +4573,21 @@ msgstr ""
 "(jos teet kansiota johon tulee alikansioita,\n"
 " lisää nimen perään vinoviiva /)"
 
 "(jos teet kansiota johon tulee alikansioita,\n"
 " lisää nimen perään vinoviiva /)"
 

-#: src/imap_gtk.c:193 src/mh_gtk.c:228
+#: src/imap_gtk.c:196 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Anna uusi nimi kansiolle ”%s”:"
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Anna uusi nimi kansiolle ”%s”:"
 

-#: src/imap_gtk.c:195 src/mh_gtk.c:230
+#: src/imap_gtk.c:198 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr "Uudelleennimeä kansio"
 
 msgid "Rename folder"
 msgstr "Uudelleennimeä kansio"
 

-#: src/imap_gtk.c:204 src/imap_gtk.c:209
+#: src/imap_gtk.c:207 src/imap_gtk.c:212

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "merkkiä ’%c’ ei voi sisällyttää kansion nimeen."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "merkkiä ’%c’ ei voi sisällyttää kansion nimeen."
 

-#: src/imap_gtk.c:226 src/mh_gtk.c:255
+#: src/imap_gtk.c:229 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -4214,7 +4595,7 @@ msgstr ""
 "Kansiota ei voinut uudelleennimetä.\n"
 "Uuden kansion nimi ei ole sallittu."
 
 "Kansiota ei voinut uudelleennimetä.\n"
 "Uuden kansion nimi ei ole sallittu."
 

-#: src/imap_gtk.c:280 src/mh_gtk.c:176
+#: src/imap_gtk.c:281 src/mh_gtk.c:179

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -4227,12 +4608,12 @@ msgstr ""
 "\n"
 "Poistetaanko varmasti?"
 
 "\n"
 "Poistetaanko varmasti?"
 

-#: src/imap_gtk.c:302 src/mh_gtk.c:198 src/news_gtk.c:238
+#: src/imap_gtk.c:303 src/mh_gtk.c:201 src/news_gtk.c:238

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei voi poistaa kansiota ”%s”."
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei voi poistaa kansiota ”%s”."
 

-#: src/imap_gtk.c:362 src/news_gtk.c:299
+#: src/imap_gtk.c:363 src/news_gtk.c:299

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Virhe haettaessa viestiä kohteessa ”%s”."
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Virhe haettaessa viestiä kohteessa ”%s”."


@@ -4323,7 +4704,7 @@ msgstr "Valitse tuotava LDIF-tiedosto."
 msgid "R"
 msgstr "V"
 
 msgid "R"
 msgstr "V"
 

-#: src/importldif.c:726 src/summaryview.c:483
+#: src/importldif.c:726 src/summaryview.c:484

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 


@@ -4421,138 +4802,138 @@ msgid "Import Pine file into Address Book"
 msgstr "Tuo Pine-tiedosto osoitekirjaksi"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304
 msgstr "Tuo Pine-tiedosto osoitekirjaksi"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304

-msgid "Sylpheed-Claws needs network access in order to get mails."
+msgid "Claws Mail needs network access in order to get mails."

 msgstr "Verkkoyhteyttä tarvitaan viestien hakemiseksi."
 
 msgstr "Verkkoyhteyttä tarvitaan viestien hakemiseksi."
 

-#: src/inc.c:374
+#: src/inc.c:384

 msgid "Retrieving new messages"
 msgstr "Haetaan uusia viestejä"
 
 msgid "Retrieving new messages"
 msgstr "Haetaan uusia viestejä"
 

-#: src/inc.c:421
+#: src/inc.c:443

 msgid "Standby"
 msgstr "Odotetaan"
 
 msgid "Standby"
 msgstr "Odotetaan"
 

-#: src/inc.c:550 src/inc.c:600
+#: src/inc.c:572 src/inc.c:622

 msgid "Cancelled"
 msgstr "Peruutettu"
 
 msgid "Cancelled"
 msgstr "Peruutettu"
 

-#: src/inc.c:561
+#: src/inc.c:583

 msgid "Retrieving"
 msgstr "Haetaan"
 
 msgid "Retrieving"
 msgstr "Haetaan"
 

-#: src/inc.c:570
+#: src/inc.c:592

 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Valmista (%d viesti (%s) haettu)"
 msgstr[1] "Valmista (%d viestiä (%s) haettu)"
 
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "Valmista (%d viesti (%s) haettu)"
 msgstr[1] "Valmista (%d viestiä (%s) haettu)"
 

-#: src/inc.c:576
+#: src/inc.c:598

 msgid "Done (no new messages)"
 msgstr "Valmista (ei uusia viestejä)"
 
 msgid "Done (no new messages)"
 msgstr "Valmista (ei uusia viestejä)"
 

-#: src/inc.c:581
+#: src/inc.c:603

 msgid "Connection failed"
 msgstr "Yhdistäminen epäonnistui"
 
 msgid "Connection failed"
 msgstr "Yhdistäminen epäonnistui"
 

-#: src/inc.c:584
+#: src/inc.c:606

 msgid "Auth failed"
 msgstr "Autentikointi epäonnistui"
 
 msgid "Auth failed"
 msgstr "Autentikointi epäonnistui"
 

-#: src/inc.c:587 src/prefs_summary_column.c:89
+#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2372

 msgid "Locked"
 msgstr "Lukittu"
 
 msgid "Locked"
 msgstr "Lukittu"
 

-#: src/inc.c:597 src/plugins/spamassassin/spamassassin_gtk.c:345
+#: src/inc.c:619 src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "Aikakatkaisu"
 
 msgid "Timeout"
 msgstr "Aikakatkaisu"
 

-#: src/inc.c:691
+#: src/inc.c:712

 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Suoritettu (%d uusi viesti)"
 msgstr[1] "Suoritettu (%d uutta viestiä)"
 
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "Suoritettu (%d uusi viesti)"
 msgstr[1] "Suoritettu (%d uutta viestiä)"
 

-#: src/inc.c:695
+#: src/inc.c:716

 msgid "Finished (no new messages)"
 msgstr "Suoritettu (ei uusia viestejä)"
 
 msgid "Finished (no new messages)"
 msgstr "Suoritettu (ei uusia viestejä)"
 

-#: src/inc.c:733
+#: src/inc.c:754

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: haetaan uusia viestejä"
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: haetaan uusia viestejä"
 

-#: src/inc.c:765
+#: src/inc.c:786

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Yhdistetään POP3-palvelimelle: %s…"
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Yhdistetään POP3-palvelimelle: %s…"
 

-#: src/inc.c:782
+#: src/inc.c:803

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "POP3-palvelimelle  %s:%d ei voitu yhdistää:"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "POP3-palvelimelle  %s:%d ei voitu yhdistää:"
 

-#: src/inc.c:786
+#: src/inc.c:807

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3-palvelimelle  %s:%d ei voitu yhdistää:\n"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "POP3-palvelimelle  %s:%d ei voitu yhdistää:\n"
 

-#: src/inc.c:866 src/send_message.c:472
+#: src/inc.c:887 src/send_message.c:472

 msgid "Authenticating..."
 msgstr "Varmennetaan…"
 
 msgid "Authenticating..."
 msgstr "Varmennetaan…"
 

-#: src/inc.c:868
+#: src/inc.c:889

 #, c-format
 msgid "Retrieving messages from %s (%s) ..."
 msgstr "Haetaan viestejä kohteesta %s (%s)…"
 
 #, c-format
 msgid "Retrieving messages from %s (%s) ..."
 msgstr "Haetaan viestejä kohteesta %s (%s)…"
 

-#: src/inc.c:874
+#: src/inc.c:895

 msgid "Getting the number of new messages (STAT)..."
 msgstr "Haetaan uusien viestien määrää (STAT)…"
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Haetaan uusien viestien määrää (STAT)…"
 

-#: src/inc.c:878
+#: src/inc.c:899

 msgid "Getting the number of new messages (LAST)..."
 msgstr "Haetaan uusien viestien määrää (LAST)…"
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Haetaan uusien viestien määrää (LAST)…"
 

-#: src/inc.c:882
+#: src/inc.c:903

 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Haetaan uusien viestien määrää (UIDL)…"
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Haetaan uusien viestien määrää (UIDL)…"
 

-#: src/inc.c:886
+#: src/inc.c:907

 msgid "Getting the size of messages (LIST)..."
 msgstr "Haetaan viestien kokoja (LIST)…"
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Haetaan viestien kokoja (LIST)…"
 

-#: src/inc.c:893 src/send_message.c:490
+#: src/inc.c:914 src/send_message.c:490

 msgid "Quitting"
 msgstr "Lopetetaan"
 
 msgid "Quitting"
 msgstr "Lopetetaan"
 

-#: src/inc.c:918
+#: src/inc.c:939

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Haetaan viestiä (%d/%d) (%s/%s)"
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Haetaan viestiä (%d/%d) (%s/%s)"
 

-#: src/inc.c:937
+#: src/inc.c:958

 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Haetaan (%d viesti (%s) haettu)"
 msgstr[1] "Haetaan (%d viestiä (%s) haettu)"
 
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "Haetaan (%d viesti (%s) haettu)"
 msgstr[1] "Haetaan (%d viestiä (%s) haettu)"
 

-#: src/inc.c:1093
+#: src/inc.c:1114

 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 

-#: src/inc.c:1097
+#: src/inc.c:1118

 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Yhdistäminen kohteeseen %s:%d epäonnistui"
 
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Yhdistäminen kohteeseen %s:%d epäonnistui"
 

-#: src/inc.c:1102
+#: src/inc.c:1123

 msgid "Error occurred while processing mail."
 msgstr "Virhe käsiteltäessä postia."
 
 msgid "Error occurred while processing mail."
 msgstr "Virhe käsiteltäessä postia."
 

-#: src/inc.c:1108
+#: src/inc.c:1129

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"


@@ -4561,37 +4942,37 @@ msgstr ""
 "Virhe käsiteltäessä postia:\n"
 "%s"
 
 "Virhe käsiteltäessä postia:\n"
 "%s"
 

-#: src/inc.c:1114
+#: src/inc.c:1135

 msgid "No disk space left."
 msgstr "Levytila on loppu"
 
 msgid "No disk space left."
 msgstr "Levytila on loppu"
 

-#: src/inc.c:1119
+#: src/inc.c:1140

 msgid "Can't write file."
 msgstr "Tiedostoon kirjoittaminen ei onnistu."
 
 msgid "Can't write file."
 msgstr "Tiedostoon kirjoittaminen ei onnistu."
 

-#: src/inc.c:1124
+#: src/inc.c:1145

 msgid "Socket error."
 msgstr "Sokettivirhe."
 
 msgid "Socket error."
 msgstr "Sokettivirhe."
 

-#: src/inc.c:1127
+#: src/inc.c:1148

 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Sokettivirhe yhteydessä %s:%d."
 
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Sokettivirhe yhteydessä %s:%d."
 

-#: src/inc.c:1132 src/send_message.c:400 src/send_message.c:615
+#: src/inc.c:1153 src/send_message.c:400 src/send_message.c:637

 msgid "Connection closed by the remote host."
 msgstr "Etäpalvelin katkaisi yhteyden."
 
 msgid "Connection closed by the remote host."
 msgstr "Etäpalvelin katkaisi yhteyden."
 

-#: src/inc.c:1135
+#: src/inc.c:1156

 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Etäpalvelin %s:%d katkaisi yhteyden."
 
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Etäpalvelin %s:%d katkaisi yhteyden."
 

-#: src/inc.c:1140
+#: src/inc.c:1161

 msgid "Mailbox is locked."
 msgstr "Postilaatikko on lukittu"
 
 msgid "Mailbox is locked."
 msgstr "Postilaatikko on lukittu"
 

-#: src/inc.c:1144
+#: src/inc.c:1165

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 #, c-format
 msgid ""
 "Mailbox is locked:\n"


@@ -4600,11 +4981,11 @@ msgstr ""
 "Postilaatikko on lukittu:\n"
 "%s"
 
 "Postilaatikko on lukittu:\n"
 "%s"
 

-#: src/inc.c:1150 src/send_message.c:600
+#: src/inc.c:1171 src/send_message.c:622

 msgid "Authentication failed."
 msgstr "Autentikointi epäonnistui."
 
 msgid "Authentication failed."
 msgstr "Autentikointi epäonnistui."
 

-#: src/inc.c:1156 src/send_message.c:603
+#: src/inc.c:1177 src/send_message.c:625

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -4613,25 +4994,25 @@ msgstr ""
 "Autentikointi epäonnistui:\n"
 "%s"
 
 "Autentikointi epäonnistui:\n"
 "%s"
 

-#: src/inc.c:1161 src/send_message.c:619
+#: src/inc.c:1182 src/send_message.c:641

 msgid "Session timed out."
 msgstr "Sessio vanheni."
 
 msgid "Session timed out."
 msgstr "Sessio vanheni."
 

-#: src/inc.c:1164
+#: src/inc.c:1185

 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Yhteys %s:%d aikakatkaistiin."
 
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Yhteys %s:%d aikakatkaistiin."
 

-#: src/inc.c:1202
+#: src/inc.c:1223

 msgid "Incorporation cancelled\n"
 msgstr "Yhdistäminen peruutettu\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Yhdistäminen peruutettu\n"
 

-#: src/inc.c:1439
+#: src/inc.c:1460

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sOlet poissa linjoilta. Ohitetaanko %d minuutiksi?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%sOlet poissa linjoilta. Ohitetaanko %d minuutiksi?"
 

-#: src/inc.c:1446
+#: src/inc.c:1467

 msgid "On_ly once"
 msgstr "_Vain kerran"
 
 msgid "On_ly once"
 msgstr "_Vain kerran"
 


@@ -4639,7 +5020,7 @@ msgstr "_Vain kerran"
 msgid "Nick Name"
 msgstr "Lempinimi"
 
 msgid "Nick Name"
 msgstr "Lempinimi"
 

-#: src/main.c:175
+#: src/main.c:180

 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 #, c-format
 msgid ""
 "File '%s' already exists.\n"


@@ -4648,88 +5029,89 @@ msgstr ""
 "Tiedosto %s on jo olemassa.\n"
 "Kansion tekeminen ei onnistu."
 
 "Tiedosto %s on jo olemassa.\n"
 "Kansion tekeminen ei onnistu."
 

-#: src/main.c:264
+#: src/main.c:270

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Configuration for Sylpheed-Claws %s found.\n"
+"Configuration for %s (or previous) found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"Sylpheed Clawsin %s asetukset löydetty.\n"
-"Päivitetäänkö tähän versioon?"
-
-#: src/main.c:267
-msgid "1.0.5 or previous"
-msgstr "1.0.5 tai vanhemman"
-
-#: src/main.c:267
-msgid "1.9.15 or previous"
-msgstr "1.9.15 tai vanhemman"
+"%s -asetukset (tai vanhemmat) löydetty.\n"
+"Päivitetäänkö ne tähän versioon?"

 
 

-#: src/main.c:270
+#: src/main.c:274

 msgid "Migration of configuration"
 msgstr "Asetustenpäivitys"
 
 msgid "Migration of configuration"
 msgstr "Asetustenpäivitys"
 

-#: src/main.c:276
+#: src/main.c:280

 msgid "Copying configuration..."
 msgstr "Kopioidaan asetukset…"
 
 msgid "Copying configuration..."
 msgstr "Kopioidaan asetukset…"
 

-#: src/main.c:281
+#: src/main.c:285

 msgid "Migration failed!"
 msgstr "Siirto epäonnistui!"
 
 msgid "Migration failed!"
 msgstr "Siirto epäonnistui!"
 

-#: src/main.c:348
+#: src/main.c:572

 msgid "g_thread is not supported by glib.\n"
 msgstr "glib ei tue g_threadia\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib ei tue g_threadia\n"
 

-#: src/main.c:354
+#: src/main.c:578

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with a more recent GTK+ library than is "
+"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 "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "

-"recompile Sylpheed-Claws."
+"recompile Claws Mail."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws on käännetty tuoreemmalle GTK+-kirjastolle kuin mikä on "
-"käytössä. Tämä aiheuttaa kaatumisia. Päivitä GTK+ tai käännä Sylpheed-"
-"-Claws uudestaan."
+"Claws Mail on käännetty tuoreemmalle GTK+-kirjastolle kuin mikä on "
+"käytössä. Tämä aiheuttaa kaatumisia. Päivitä GTK+ tai käännä Claws Mail "
+"uudestaan."

 
 

-#: src/main.c:363
+#: src/main.c:587

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with an older GTK+ library than is "
-"currently available. This will cause crashes. You need to recompile Sylpheed-"
-"Claws."
+"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 ""
 msgstr ""

-"Sylpheed-Claws on käännetty vanhemmalle GTK+-kirjastolle kuin mikä on "
-"käytössä. Tämä aiheuttaa kaatumisia. Käännä Sylpheed-Claws uudestaan."
+"Claws Mail on käännetty vanhemmalle GTK+-kirjastolle kuin mikä on "
+"käytössä. Tämä aiheuttaa kaatumisia. Käännä Claws Mail uudestaan."

 
 

-#: src/main.c:570
+#: src/main.c:810

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr "Osa liitännäisistä ei latautunut. Taraista asetuksista lisätietoja."
 
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr "Osa liitännäisistä ei latautunut. Taraista asetuksista lisätietoja."
 

-#: src/main.c:580
+#: src/main.c:822
+msgid ""
+"Claws Mail has detected a configured mailbox, but is it incomplete. It is "
+"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
+"mailbox's folder to try to fix it."
+msgstr ""
+"Claws tunnisti vajavaisesti asetetun sähköpostilaatikon. Tämä voi johtua "
+"vaikkapa viallisesti IMAP-tilistä. Koeta korjata asia komennolla "
+"Uudelleenkasaa kansiopuu viallisessa kansiossa."
+
+#: src/main.c:828

 msgid ""
 msgid ""

-"Sylpheed-Claws has detected a configured mailbox, but could not load it. It "
-"is probably provided by an out-of-date external plugin. Please reinstall the "
+"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 ""
 "plugin and try again."
 msgstr ""

-"Sylpheed-Claws tunnisti postilaatikon, muttei osaa avata sitä. Luultavasti "
-"käytössä on vanhentunut liitännäinen. Asenna liitännäiset uudelleen ja yritä "
-"uudestaan."
+"Löydetty postilaatikko on Claws Mailin tuntema, mutta avaus ei onnistunut. "
+"Luultavasti käytössä on vanhentunut liitännäinen. Asenna liitännäiset "
+"uudelleen ja yritä uudestaan."

 
 

-#: src/main.c:812
+#: src/main.c:1074

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Käyttö: %s [ASETUKSET]…\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Käyttö: %s [ASETUKSET]…\n"
 

-#: src/main.c:814
+#: src/main.c:1076

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [osoite]     avaa viestinkirjoitusikkuna"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [osoite]     avaa viestinkirjoitusikkuna"
 

-#: src/main.c:815
+#: src/main.c:1077

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      tilaa annetu URI jos mahdollista"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      tilaa annetu URI jos mahdollista"
 

-#: src/main.c:816
+#: src/main.c:1078

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -4739,23 +5121,23 @@ msgstr ""
 "                         Avaa viestinkirjoitusikkuna annetut tiedostot\n"
 "                         valmiiksi viestiin liitettyinä"
 
 "                         Avaa viestinkirjoitusikkuna annetut tiedostot\n"
 "                         valmiiksi viestiin liitettyinä"
 

-#: src/main.c:819
+#: src/main.c:1081

 msgid "  --receive              receive new messages"
 msgstr "  --receive              hae uudet viestit"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              hae uudet viestit"
 

-#: src/main.c:820
+#: src/main.c:1082

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          hae uudet viestit kaikille tileille"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          hae uudet viestit kaikille tileille"
 

-#: src/main.c:821
+#: src/main.c:1083

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 lähetä kaikki jonottavat viestit"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 lähetä kaikki jonottavat viestit"
 

-#: src/main.c:822
+#: src/main.c:1084

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [kansio]…     näytä viestien määrän"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [kansio]…     näytä viestien määrän"
 

-#: src/main.c:823
+#: src/main.c:1085

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -4763,77 +5145,77 @@ msgstr ""
 "  --status-full [kansio]…\n"
 "                         näytä kansioiden tilat"
 
 "  --status-full [kansio]…\n"
 "                         näytä kansioiden tilat"
 

-#: src/main.c:825
+#: src/main.c:1087

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"

-"                         folder is a folder id like '#mh/Mailbox/inbox'"
+"                         folder is a folder id like 'folder/sub_folder'"

 msgstr ""
 "  --select kansio[/viesti]\n"
 "                         siirryy valittuun kansioon tai viestiin\n"
 msgstr ""
 "  --select kansio[/viesti]\n"
 "                         siirryy valittuun kansioon tai viestiin\n"

-"                         kansion tunnus on tyyppiä ”#mh/Mailbox/inbox”"
+"                         kansion tunnus on tyyppiä ”kansio/alikansio”"

 
 

-#: src/main.c:827
+#: src/main.c:1089

 msgid "  --online               switch to online mode"
 msgstr "  --online               siirry yhdistettyyn tilaan"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               siirry yhdistettyyn tilaan"
 

-#: src/main.c:828
+#: src/main.c:1090

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              siirry yhdistämättömään tilaan"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              siirry yhdistämättömään tilaan"
 

-#: src/main.c:829
-msgid "  --exit                 exit Sylpheed-Claws"
-msgstr "  --exit                 poistu Sylpheed-Clawsista"
+#: src/main.c:1091
+msgid "  --exit                 exit Claws Mail"
+msgstr "  --exit                 poistu Claws Mailista"

 
 

-#: src/main.c:830
+#: src/main.c:1092

 msgid "  --debug                debug mode"
 msgstr "  --debug                vianetsintätila"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                vianetsintätila"
 

-#: src/main.c:831
+#: src/main.c:1093

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 näytä tämä ohje ja lopeta"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 näytä tämä ohje ja lopeta"
 

-#: src/main.c:832
+#: src/main.c:1094

 msgid "  --version              output version information and exit"
 msgstr "  --version              näytä versiotiedot ja lopeta"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              näytä versiotiedot ja lopeta"
 

-#: src/main.c:833
+#: src/main.c:1095

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           näytä asetushakemisto"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           näytä asetushakemisto"
 

-#: src/main.c:898
+#: src/main.c:1160

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Käsitellään (%s)…"
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Käsitellään (%s)…"
 

-#: src/main.c:901
+#: src/main.c:1163

 msgid "top level folder"
 msgstr "ylimmän tason kansio"
 
 msgid "top level folder"
 msgstr "ylimmän tason kansio"
 

-#: src/main.c:968
+#: src/main.c:1227

 msgid "Really quit?"
 msgstr "Lopetetaanko ohjelma?"
 
 msgid "Really quit?"
 msgstr "Lopetetaanko ohjelma?"
 

-#: src/main.c:969
+#: src/main.c:1228

 msgid "Composing message exists."
 msgstr "Viestin kirjoittaminen käynnissä."
 
 msgid "Composing message exists."
 msgstr "Viestin kirjoittaminen käynnissä."
 

-#: src/main.c:970
+#: src/main.c:1229

 msgid "_Save to Draft"
 msgstr "_Pane luonnoksiin"
 
 msgid "_Save to Draft"
 msgstr "_Pane luonnoksiin"
 

-#: src/main.c:970
+#: src/main.c:1229

 msgid "_Discard them"
 msgstr "_Poista"
 
 msgid "_Discard them"
 msgstr "_Poista"
 

-#: src/main.c:970
+#: src/main.c:1229

 msgid "Do_n't quit"
 msgstr "_Älä lopeta"
 
 msgid "Do_n't quit"
 msgstr "_Älä lopeta"
 

-#: src/main.c:985
+#: src/main.c:1244

 msgid "Queued messages"
 msgstr "Jonottavat viestit"
 
 msgid "Queued messages"
 msgstr "Jonottavat viestit"
 

-#: src/main.c:986
+#: src/main.c:1245

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Lähettämättömiä viestejä on jonossa, lopetetaanko?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Lähettämättömiä viestejä on jonossa, lopetetaanko?"
 


@@ -4911,7 +5293,7 @@ msgstr "_Hae kansiosta…"
 msgid "/_Edit/_Quick search"
 msgstr "_Pikahaku"
 
 msgid "/_Edit/_Quick search"
 msgstr "_Pikahaku"
 

-#: src/mainwindow.c:527 src/messageview.c:171 src/summaryview.c:471
+#: src/mainwindow.c:527 src/messageview.c:171 src/summaryview.c:472

 msgid "/_View"
 msgstr "_Näytä"
 
 msgid "/_View"
 msgstr "_Näytä"
 


@@ -5299,7 +5681,7 @@ msgstr "_Base64"
 msgid "/_View/Decode/_Uuencode"
 msgstr "_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "_Uuencode"
 

-#: src/mainwindow.c:730 src/summaryview.c:472
+#: src/mainwindow.c:730 src/summaryview.c:473

 msgid "/_View/Open in new _window"
 msgstr "_Avaa uudessa ikkunassa"
 
 msgid "/_View/Open in new _window"
 msgstr "_Avaa uudessa ikkunassa"
 


@@ -5671,24 +6053,25 @@ msgstr "_Kuvakkeiden merkitykset"
 msgid "/_Help/---"
 msgstr "---"
 
 msgid "/_Help/---"
 msgstr "---"
 

-#: src/mainwindow.c:1228
+#: src/mainwindow.c:1227

 msgid "Some error(s) happened. Click here to view log."
 msgstr "Virheitä havaittiin. Avaa loki tästä."
 
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Virheitä havaittiin. Avaa loki tästä."
 

-#: src/mainwindow.c:1242
+#: src/mainwindow.c:1241

 msgid "You are online. Click the icon to go offline"
 msgstr "Yhteystila päällä. Paina kuvaketta siirtyäksesi pois yhteystilasta."
 
 msgid "You are online. Click the icon to go offline"
 msgstr "Yhteystila päällä. Paina kuvaketta siirtyäksesi pois yhteystilasta."
 

-#: src/mainwindow.c:1245
+#: src/mainwindow.c:1244

 msgid "You are offline. Click the icon to go online"
 msgstr "Yhteystila pois päältä. Paina kuvaketta yhteystilaan."
 
 msgid "You are offline. Click the icon to go online"
 msgstr "Yhteystila pois päältä. Paina kuvaketta yhteystilaan."
 

-#: src/mainwindow.c:1261
+#: src/mainwindow.c:1260

 msgid "Select account"
 msgstr "Valitse tili"
 
 msgid "Select account"
 msgstr "Valitse tili"
 

-#: src/mainwindow.c:1662 src/mainwindow.c:1703 src/mainwindow.c:1739
-#: src/mainwindow.c:1775 src/mainwindow.c:1817 src/prefs_folder_item.c:668
+#: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738
+#: src/mainwindow.c:1774 src/mainwindow.c:1817
+#: src/plugins/trayicon/trayicon.c:143 src/prefs_folder_item.c:762

 msgid "Untitled"
 msgstr "Nimetön"
 
 msgid "Untitled"
 msgstr "Nimetön"
 


@@ -5737,152 +6120,159 @@ msgstr ""
 msgid "No posting allowed"
 msgstr "Viestien lähetys kielletty"
 
 msgid "No posting allowed"
 msgstr "Viestien lähetys kielletty"
 

-#: src/mainwindow.c:2697
-msgid "Sylpheed-Claws - Folder View"
-msgstr "Sylpheed-Claws — Kansionäkymä"
+#: src/mainwindow.c:2699
+msgid "Claws Mail - Folder View"
+msgstr "Claws Mail — Kansionäkymä"

 
 

-#: src/mainwindow.c:2733 src/messageview.c:449 src/messageview.c:855
-msgid "Sylpheed-Claws - Message View"
-msgstr "Sylpheed-Claws — Viestinäkymä"
+#: src/mainwindow.c:2735 src/messageview.c:449 src/messageview.c:855
+msgid "Claws Mail - Message View"
+msgstr "Claws Mail — Viestinäkymä"

 
 

-#: src/mainwindow.c:3083
+#: src/mainwindow.c:3085

 msgid "Mbox import has failed."
 msgstr "Virhe tuotaessa mbox-tiedostoa."
 
 msgid "Mbox import has failed."
 msgstr "Virhe tuotaessa mbox-tiedostoa."
 

-#: src/mainwindow.c:3092 src/mainwindow.c:3101
+#: src/mainwindow.c:3094 src/mainwindow.c:3103

 msgid "Export to mbox has failed."
 msgstr "Mbox-vienti epäonnistui"
 
 msgid "Export to mbox has failed."
 msgstr "Mbox-vienti epäonnistui"
 

-#: src/mainwindow.c:3124 src/plugins/trayicon/trayicon.c:399
+#: src/mainwindow.c:3126 src/plugins/trayicon/trayicon.c:474

 msgid "Exit"
 msgstr "Poistu"
 
 msgid "Exit"
 msgstr "Poistu"
 

-#: src/mainwindow.c:3124
-msgid "Exit Sylpheed-Claws?"
-msgstr "Poistu Sylpheed-Clawsista"
+#: src/mainwindow.c:3126
+msgid "Exit Claws Mail?"
+msgstr "Poistutaanko Claws Mailista?"

 
 

-#: src/mainwindow.c:3270
+#: src/mainwindow.c:3271

 msgid "Folder synchronisation"
 msgstr "Kansion ajantasaistus"
 
 msgid "Folder synchronisation"
 msgstr "Kansion ajantasaistus"
 

-#: src/mainwindow.c:3271
+#: src/mainwindow.c:3272

 msgid "Do you want to synchronise your folders now?"
 msgstr "Ajantasaistentaanko kansiot?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Ajantasaistentaanko kansiot?"
 

-#: src/mainwindow.c:3272
+#: src/mainwindow.c:3273

 msgid "+_Synchronise"
 msgstr "_Ajantasaista"
 
 msgid "+_Synchronise"
 msgstr "_Ajantasaista"
 

-#: src/mainwindow.c:3601
+#: src/mainwindow.c:3604

 msgid "Deleting duplicated messages..."
 msgstr "Poistetaan kaksoiskappaleet…"
 
 msgid "Deleting duplicated messages..."
 msgstr "Poistetaan kaksoiskappaleet…"
 

-#: src/mainwindow.c:3635
+#: src/mainwindow.c:3641

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Poistettiin %d kaksoiskappale %d kansiosta.\n"
 msgstr[1] "Poistettiin %d kappaletta %d kansiosta.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Poistettiin %d kaksoiskappale %d kansiosta.\n"
 msgstr[1] "Poistettiin %d kappaletta %d kansiosta.\n"
 

-#: src/mainwindow.c:3794 src/summaryview.c:4719
+#: src/mainwindow.c:3800 src/summaryview.c:4783

 msgid "Processing rules to apply before folder rules"
 msgstr "Käsittelysäännöt, jotka merkitsevät ennen kansion sääntöjä"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Käsittelysäännöt, jotka merkitsevät ennen kansion sääntöjä"
 

-#: src/mainwindow.c:3803
+#: src/mainwindow.c:3809

 msgid "Processing rules to apply after folder rules"
 msgstr "Käsittelysäännöt, jotka merkitsevät kansion sääntöjen jälkeen"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Käsittelysäännöt, jotka merkitsevät kansion sääntöjen jälkeen"
 

-#: src/mainwindow.c:3812 src/summaryview.c:4730
+#: src/mainwindow.c:3818 src/summaryview.c:4794

 msgid "Filtering configuration"
 msgstr "Suodatusasetukset"
 
 msgid "Filtering configuration"
 msgstr "Suodatusasetukset"
 

-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4072

 #, c-format
 msgid "not initialized\n"
 msgstr "ei alustettu\n"
 
 #, c-format
 msgid "not initialized\n"
 msgstr "ei alustettu\n"
 

-#: src/mainwindow.c:4078 src/mainwindow.c:4089
+#: src/mainwindow.c:4084 src/mainwindow.c:4095

 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "valitaan kansio %s\n"
 
 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "valitaan kansio %s\n"
 

-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4099

 #, c-format
 msgid "selecting message %d\n"
 msgstr "valitaan viesti %d\n"
 
 #, c-format
 msgid "selecting message %d\n"
 msgstr "valitaan viesti %d\n"
 

+#: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
+#: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
+msgid "Filtering Matcher Menu|All"
+msgstr "Kaikki"
+

 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(ei mitään)"
 
 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(ei mitään)"
 

-#: src/mbox.c:85
+#: src/mbox.c:98

 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 "%s\n"
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 "%s\n"

-msgstr "Ei voitu lukea mbox-viestitiedostoa:\n"
+msgstr ""
+"Ei voitu lukea mbox-viestitiedostoa:\n"

 "%s\n"
 
 "%s\n"
 

-#: src/mbox.c:121
+#: src/mbox.c:134

 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Tuodaan mboxista... (%d viestiä tuotu)"
 
 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Tuodaan mboxista... (%d viestiä tuotu)"
 

-#: src/mbox.c:468
+#: src/mbox.c:481

 msgid "Overwrite mbox file"
 msgstr "Korvaa olemassaoleva mbox-tiedosto"
 
 msgid "Overwrite mbox file"
 msgstr "Korvaa olemassaoleva mbox-tiedosto"
 

-#: src/mbox.c:469
+#: src/mbox.c:482

 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tiedosto on jo olemassa, korvataanko?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tiedosto on jo olemassa, korvataanko?"
 

-#: src/mbox.c:470 src/messageview.c:1145 src/mimeview.c:1422
+#: src/mbox.c:483 src/messageview.c:1143 src/mimeview.c:1443

 #: src/textview.c:2654
 msgid "Overwrite"
 msgstr "Korvaa"
 
 #: src/textview.c:2654
 msgid "Overwrite"
 msgstr "Korvaa"
 

-#: src/mbox.c:479
+#: src/mbox.c:492

 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"

-msgstr "Mbox-tiedostoa ei pysty luomaan:\n"
+msgstr ""
+"Mbox-tiedostoa ei pysty luomaan:\n"

 "%s\n"
 
 "%s\n"
 

-#: src/mbox.c:483
+#: src/mbox.c:500

 msgid "Exporting to mbox..."
 msgstr "Viedään mbox-tiedostoon..."
 
 msgid "Exporting to mbox..."
 msgstr "Viedään mbox-tiedostoon..."
 

-#: src/message_search.c:131
+#: src/message_search.c:169

 msgid "Find in current message"
 msgstr "Etsi nykyisestä viestistä"
 
 msgid "Find in current message"
 msgstr "Etsi nykyisestä viestistä"
 

-#: src/message_search.c:149
+#: src/message_search.c:187

 msgid "Find text:"
 msgstr "Etsi teksti:"
 
 msgid "Find text:"
 msgstr "Etsi teksti:"
 

-#: src/message_search.c:164 src/prefs_matcher.c:649 src/summary_search.c:315
+#: src/message_search.c:210 src/prefs_matcher.c:649 src/summary_search.c:392

 msgid "Case sensitive"
 msgstr "Kirjaintasot erotteleva"
 
 msgid "Case sensitive"
 msgstr "Kirjaintasot erotteleva"
 

-#: src/message_search.c:240 src/summary_search.c:521
+#: src/message_search.c:323 src/summary_search.c:637

 msgid "Search failed"
 msgstr "Haku epäonnistui"
 
 msgid "Search failed"
 msgstr "Haku epäonnistui"
 

-#: src/message_search.c:241 src/summary_search.c:522
+#: src/message_search.c:324 src/summary_search.c:638

 msgid "Search string not found."
 msgstr "Merkkijonoa ei löytynyt."
 
 msgid "Search string not found."
 msgstr "Merkkijonoa ei löytynyt."
 

-#: src/message_search.c:250
+#: src/message_search.c:333

 msgid "Beginning of message reached; continue from end?"
 msgstr "Viestin alku tuli vastaan, jatketaanko lopusta?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "Viestin alku tuli vastaan, jatketaanko lopusta?"
 

-#: src/message_search.c:253
+#: src/message_search.c:336

 msgid "End of message reached; continue from beginning?"
 msgstr "Viestin loppu tuli vastaan, jatketaanko alusta?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Viestin loppu tuli vastaan, jatketaanko alusta?"
 

-#: src/message_search.c:256 src/summary_search.c:533
+#: src/message_search.c:339 src/summary_search.c:649

 msgid "Search finished"
 msgstr "Haku päättyi"
 
 msgid "Search finished"
 msgstr "Haku päättyi"
 


@@ -5956,39 +6346,39 @@ msgstr ""
 "lähetetty suoraan sinulle.\n"
 "Saapumisilmoitus kannattaa peruuttaa."
 
 "lähetetty suoraan sinulle.\n"
 "Saapumisilmoitus kannattaa peruuttaa."
 

-#: src/messageview.c:809 src/procmime.c:825
+#: src/messageview.c:809 src/procmime.c:873

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Ei voitu salata: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Ei voitu salata: %s"
 

-#: src/messageview.c:1140 src/mimeview.c:1560 src/summaryview.c:4011
-#: src/summaryview.c:4014 src/textview.c:2642
+#: src/messageview.c:1138 src/mimeview.c:1582 src/summaryview.c:4065
+#: src/summaryview.c:4068 src/textview.c:2642

 msgid "Save as"
 msgstr "Tallenna nimellä"
 
 msgid "Save as"
 msgstr "Tallenna nimellä"
 

-#: src/messageview.c:1146
+#: src/messageview.c:1144

 msgid "Overwrite existing file?"
 msgstr "Korvataanko olemassaoleva tiedosto?"
 
 msgid "Overwrite existing file?"
 msgstr "Korvataanko olemassaoleva tiedosto?"
 

-#: src/messageview.c:1154 src/summaryview.c:4031 src/summaryview.c:4034
-#: src/summaryview.c:4049
+#: src/messageview.c:1152 src/summaryview.c:4085 src/summaryview.c:4088
+#: src/summaryview.c:4103

 #, c-format
 #, c-format

-msgid "Can't save the file '%s'."
+msgid "Couldn't save the file '%s'."

 msgstr "Tiedostoa ”%s” ei voida tallentaa."
 
 msgstr "Tiedostoa ”%s” ei voida tallentaa."
 

-#: src/messageview.c:1235
+#: src/messageview.c:1233

 msgid "You asked for a return receipt in this message."
 msgstr "Pyysit saapumisilmoituspyyntöä tässä viestissä."
 
 msgid "You asked for a return receipt in this message."
 msgstr "Pyysit saapumisilmoituspyyntöä tässä viestissä."
 

-#: src/messageview.c:1239
+#: src/messageview.c:1237

 msgid "This message asks for a return receipt."
 msgstr "Viestissä on saapumisilmoituspyyntö."
 
 msgid "This message asks for a return receipt."
 msgstr "Viestissä on saapumisilmoituspyyntö."
 

-#: src/messageview.c:1240
+#: src/messageview.c:1238

 msgid "Send receipt"
 msgstr "Lähetä ilmoitus."
 
 msgid "Send receipt"
 msgstr "Lähetä ilmoitus."
 

-#: src/messageview.c:1283
+#: src/messageview.c:1281

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -5996,7 +6386,7 @@ msgstr ""
 "Tämä viesti on osittain haettu,\n"
 "ja poistettu jo palvelimelta."
 
 "Tämä viesti on osittain haettu,\n"
 "ja poistettu jo palvelimelta."
 

-#: src/messageview.c:1289
+#: src/messageview.c:1287

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6005,15 +6395,15 @@ msgstr ""
 "Tämä viesti on osittain haettu;\n"
 "se on %s."
 
 "Tämä viesti on osittain haettu;\n"
 "se on %s."
 

-#: src/messageview.c:1293 src/messageview.c:1315
+#: src/messageview.c:1291 src/messageview.c:1313

 msgid "Mark for download"
 msgstr "Merkitse ladattavaksi"
 
 msgid "Mark for download"
 msgstr "Merkitse ladattavaksi"
 

-#: src/messageview.c:1294 src/messageview.c:1306
+#: src/messageview.c:1292 src/messageview.c:1304

 msgid "Mark for deletion"
 msgstr "Merkitse poistettavaksi"
 
 msgid "Mark for deletion"
 msgstr "Merkitse poistettavaksi"
 

-#: src/messageview.c:1299
+#: src/messageview.c:1297

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6022,12 +6412,12 @@ msgstr ""
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja ladataan kokonaan."
 
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja ladataan kokonaan."
 

-#: src/messageview.c:1304 src/messageview.c:1317
+#: src/messageview.c:1302 src/messageview.c:1315

 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Poista merkintä"
 
 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Poista merkintä"
 

-#: src/messageview.c:1310
+#: src/messageview.c:1308

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6036,11 +6426,11 @@ msgstr ""
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja poistetaan."
 
 "Tämä viesti on osittain ladattu;\n"
 "se on %s ja poistetaan."
 

-#: src/messageview.c:1386
+#: src/messageview.c:1384

 msgid "Return Receipt Notification"
 msgstr "Saapumisilmoituspyyntö"
 
 msgid "Return Receipt Notification"
 msgstr "Saapumisilmoituspyyntö"
 

-#: src/messageview.c:1387
+#: src/messageview.c:1385

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -6049,19 +6439,19 @@ msgstr ""
 "Viesti on lähetetty useisille tileistäsi.\n"
 "Valitse mitä niistä käytät saapumisilmoituksen lähettämiseen:"
 
 "Viesti on lähetetty useisille tileistäsi.\n"
 "Valitse mitä niistä käytät saapumisilmoituksen lähettämiseen:"
 

-#: src/messageview.c:1391
+#: src/messageview.c:1389

 msgid "_Send Notification"
 msgstr "_Lähetä ilmoitus"
 
 msgid "_Send Notification"
 msgstr "_Lähetä ilmoitus"
 

-#: src/messageview.c:1391
+#: src/messageview.c:1389

 msgid "+_Cancel"
 msgstr "_Peru"
 
 msgid "+_Cancel"
 msgstr "_Peru"
 

-#: src/messageview.c:1458
+#: src/messageview.c:1456

 msgid "Cannot print: the message doesn't contain text."
 msgstr "Tulostus ei onnistu: viestissä ei ole sisältötekstiä"
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Tulostus ei onnistu: viestissä ei ole sisältötekstiä"
 

-#: src/messageview.c:1505 src/summaryview.c:4071
+#: src/messageview.c:1520 src/summaryview.c:4125

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6070,7 +6460,7 @@ msgstr ""
 "Anna tulostuskomento:\n"
 "(”%s” korvautuu tiedostonimellä)"
 
 "Anna tulostuskomento:\n"
 "(”%s” korvautuu tiedostonimellä)"
 

-#: src/messageview.c:1511 src/summaryview.c:4077
+#: src/messageview.c:1526 src/summaryview.c:4131

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6079,29 +6469,29 @@ msgstr ""
 "Tulostuskomento on virheellinen:\n"
 "”%s”"
 
 "Tulostuskomento on virheellinen:\n"
 "”%s”"
 

-#: src/messageview.c:1777 src/messageview.c:1783 src/summaryview.c:3466
-#: src/summaryview.c:5471
+#: src/messageview.c:1796 src/messageview.c:1802 src/summaryview.c:3521
+#: src/summaryview.c:5540

 msgid "An error happened while learning.\n"
 msgstr "Virhe luokiteltaessa roskapostia muistiin.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "Virhe luokiteltaessa roskapostia muistiin.\n"
 

-#: src/mh.c:427
+#: src/mh.c:423

 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ei voida kopioida viestiä %s kohteeseen %s\n"
 
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ei voida kopioida viestiä %s kohteeseen %s\n"
 

-#: src/mh.c:502
+#: src/mh.c:498

 msgid "Moving messages..."
 msgstr "Siirretään viestejä…"
 
 msgid "Moving messages..."
 msgstr "Siirretään viestejä…"
 

-#: src/mh.c:642
+#: src/mh.c:638

 msgid "Deleting messages..."
 msgstr "Poistetaan viestiä…"
 
 msgid "Deleting messages..."
 msgstr "Poistetaan viestiä…"
 

-#: src/mh_gtk.c:59
+#: src/mh_gtk.c:62

 msgid "/Remove _mailbox..."
 msgstr "Poista _postilaatikko…"
 
 msgid "/Remove _mailbox..."
 msgstr "Poista _postilaatikko…"
 

-#: src/mh_gtk.c:323
+#: src/mh_gtk.c:324

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"


@@ -6110,11 +6500,11 @@ msgstr ""
 "Poistetaanko postilaatikko ”%s”?\n"
 "(Viestejä ei poisteta levyltä)"
 
 "Poistetaanko postilaatikko ”%s”?\n"
 "(Viestejä ei poisteta levyltä)"
 

-#: src/mh_gtk.c:325
+#: src/mh_gtk.c:326

 msgid "Remove mailbox"
 msgstr "Poista postilaatikko"
 
 msgid "Remove mailbox"
 msgstr "Poista postilaatikko"
 

-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:327

 msgid "_Remove"
 msgstr "_Poista"
 
 msgid "_Remove"
 msgstr "_Poista"
 


@@ -6130,7 +6520,7 @@ msgstr "Avaa _ohjelmalla…"
 msgid "/_Display as text"
 msgstr "_Näytä tekstinä"
 
 msgid "/_Display as text"
 msgstr "_Näytä tekstinä"
 

-#: src/mimeview.c:171 src/summaryview.c:477
+#: src/mimeview.c:171 src/summaryview.c:478

 msgid "/_Save as..."
 msgstr "_Tallenna nimellä…"
 
 msgid "/_Save as..."
 msgstr "_Tallenna nimellä…"
 


@@ -6142,60 +6532,60 @@ msgstr "Tallenna _kaikki…"
 msgid "MIME Type"
 msgstr "MIME-tyyppi"
 
 msgid "MIME Type"
 msgstr "MIME-tyyppi"
 

-#: src/mimeview.c:721
+#: src/mimeview.c:742

 msgid "Check signature"
 msgstr "Lisää allekirjoitus"
 
 msgid "Check signature"
 msgstr "Lisää allekirjoitus"
 

-#: src/mimeview.c:726 src/mimeview.c:731 src/mimeview.c:736
+#: src/mimeview.c:747 src/mimeview.c:752 src/mimeview.c:757

 msgid "View full information"
 msgstr "Henkilökohtaiset tiedot"
 
 msgid "View full information"
 msgstr "Henkilökohtaiset tiedot"
 

-#: src/mimeview.c:741 src/mimeview.c:745
+#: src/mimeview.c:762 src/mimeview.c:766

 msgid "Check again"
 msgstr "Tarkasta uudelleen"
 
 msgid "Check again"
 msgstr "Tarkasta uudelleen"
 

-#: src/mimeview.c:754
+#: src/mimeview.c:775

 msgid "Click the icon or hit 'C' to check it."
 msgstr "Paina kuvaketta tai C:tä tarkastaaksesi"
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Paina kuvaketta tai C:tä tarkastaaksesi"
 

-#: src/mimeview.c:759
+#: src/mimeview.c:780

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Aikakatkaisu allekirjoitusta haettaessa, paina kuvaketta tai C:tä "
 "yrittääksesi uudelleen."
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Aikakatkaisu allekirjoitusta haettaessa, paina kuvaketta tai C:tä "
 "yrittääksesi uudelleen."
 

-#: src/mimeview.c:969
+#: src/mimeview.c:990

 msgid "Checking signature..."
 msgstr "Haetaan viestiä…"
 
 msgid "Checking signature..."
 msgstr "Haetaan viestiä…"
 

-#: src/mimeview.c:1011
+#: src/mimeview.c:1032

 msgid "Go back to email"
 msgstr "Palaa sähköpostiin"
 
 msgid "Go back to email"
 msgstr "Palaa sähköpostiin"
 

-#: src/mimeview.c:1349 src/mimeview.c:1430 src/mimeview.c:1606
-#: src/mimeview.c:1639
-msgid "Can't save the part of multipart message."
+#: src/mimeview.c:1370 src/mimeview.c:1451 src/mimeview.c:1628
+#: src/mimeview.c:1661
+msgid "Couldn't save the part of multipart message."

 msgstr "Ei voida tallentaa osaa moniosaviestistä."
 
 msgstr "Ei voida tallentaa osaa moniosaviestistä."
 

-#: src/mimeview.c:1419 src/textview.c:2652
+#: src/mimeview.c:1440 src/textview.c:2652

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Korvataanko tiedosto ”%s”?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Korvataanko tiedosto ”%s”?"
 

-#: src/mimeview.c:1457
+#: src/mimeview.c:1478

 msgid "Select destination folder"
 msgstr "Valitse kohdekansio"
 
 msgid "Select destination folder"
 msgstr "Valitse kohdekansio"
 

-#: src/mimeview.c:1464
+#: src/mimeview.c:1485

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "”%s” ei ole hakemisto."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "”%s” ei ole hakemisto."
 

-#: src/mimeview.c:1685 src/mimeview.c:1693 src/textview.c:2583
+#: src/mimeview.c:1707 src/mimeview.c:1715 src/textview.c:2583

 msgid "Open with"
 msgstr "Avaa ohjelmalla"
 
 msgid "Open with"
 msgstr "Avaa ohjelmalla"
 

-#: src/mimeview.c:1686 src/mimeview.c:1694 src/textview.c:2584
+#: src/mimeview.c:1708 src/mimeview.c:1716 src/textview.c:2584

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6210,7 +6600,7 @@ msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "luodaan NNTP-yhteys %s:%d…\n"
 
 #: src/news.c:328
 msgstr "luodaan NNTP-yhteys %s:%d…\n"
 
 #: src/news.c:328

-msgid "Sylpheed-Claws needs network access in order to access the News server."
+msgid "Claws Mail needs network access in order to access the News server."

 msgstr "Ilman verkkoytheyttä ei voi yhdistää nyyssipalvelimelle."
 
 #: src/news.c:345
 msgstr "Ilman verkkoytheyttä ei voi yhdistää nyyssipalvelimelle."
 
 #: src/news.c:345


@@ -6223,22 +6613,22 @@ msgid "can't retrieve newsgroup list\n"
 msgstr "ei voida hakea uutisryhmälistaa\n"
 
 #: src/news.c:588
 msgstr "ei voida hakea uutisryhmälistaa\n"
 
 #: src/news.c:588

-msgid "can't post article.\n"
-msgstr "ei voida postittaa viestiä\n"
+msgid "couldn't post article.\n"
+msgstr "ei voida lähettää viestiä.\n"

 
 #: src/news.c:614
 #, c-format
 
 #: src/news.c:614
 #, c-format

-msgid "can't retrieve article %d\n"
+msgid "couldn't retrieve article %d\n"

 msgstr "ei voida hakea viestiä %d\n"
 
 #: src/news.c:663
 #, c-format
 msgstr "ei voida hakea viestiä %d\n"
 
 #: src/news.c:663
 #, c-format

-msgid "can't select group: %s\n"
+msgid "couldn't select group: %s\n"

 msgstr "ei voida valita ryhmää: %s\n"
 
 #: src/news.c:888
 #, c-format
 msgstr "ei voida valita ryhmää: %s\n"
 
 #: src/news.c:888
 #, c-format

-msgid "can't set group: %s\n"
+msgid "couldn't set group: %s\n"

 msgstr "ei voida asettaa ryhmää: %s\n"
 
 #: src/news.c:897
 msgstr "ei voida asettaa ryhmää: %s\n"
 
 #: src/news.c:897


@@ -6257,7 +6647,7 @@ msgid "getting xover %d in %s...\n"
 msgstr "haetaan xover %d kohteesta %s…\n"
 
 #: src/news.c:962 src/news.c:1056
 msgstr "haetaan xover %d kohteesta %s…\n"
 
 #: src/news.c:962 src/news.c:1056

-msgid "can't get xover\n"
+msgid "couldn't get xover\n"

 msgstr "ei voida hakea xoveria\n"
 
 #: src/news.c:972 src/news.c:1068
 msgstr "ei voida hakea xoveria\n"
 
 #: src/news.c:972 src/news.c:1068


@@ -6270,7 +6660,7 @@ msgid "invalid xover line: %s\n"
 msgstr "virheellinen xover-rivi: %s\n"
 
 #: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133
 msgstr "virheellinen xover-rivi: %s\n"
 
 #: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133

-msgid "can't get xhdr\n"
+msgid "couldn't get xhdr\n"

 msgstr "ei voida hakea xhdr:ää\n"
 
 #: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146
 msgstr "ei voida hakea xhdr:ää\n"
 
 #: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146


@@ -6303,31 +6693,20 @@ msgstr "Poista ryhmätilauksia"
 msgid "_Unsubscribe"
 msgstr "_Poista ryhmän tilaus"
 
 msgid "_Unsubscribe"
 msgstr "_Poista ryhmän tilaus"
 

-#: src/plugins/clamav/clamav_plugin.c:118
+#: src/plugins/clamav/clamav_plugin.c:43
+#: src/plugins/clamav/clamav_plugin_gtk.c:212
+msgid "Clam AntiVirus"
+msgstr "Clam Antivirus"
+
+#: src/plugins/clamav/clamav_plugin.c:120

 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: skannataan viestiä…"
 
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: skannataan viestiä…"
 

-#: src/plugins/clamav/clamav_plugin.c:197
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the ClamAV plugin "
-"was built with"
-msgstr ""
-"Sylpheed-Claws on uudempi kuin mille ClamAV-liitännäinen on käännetty"
-
-#: src/plugins/clamav/clamav_plugin.c:202
-msgid "Your version of Sylpheed-Claws is too old for the ClamAV plugin"
-msgstr "Sylpheed-Claws on liian vanha ClamAV-liitännäiselle"
-
-#: src/plugins/clamav/clamav_plugin.c:208
+#: src/plugins/clamav/clamav_plugin.c:205

 msgid "Failed to register mail filtering hook"
 msgstr "Viestisuodatuskoukun rekisteröinti epäonnistui"
 
 msgid "Failed to register mail filtering hook"
 msgstr "Viestisuodatuskoukun rekisteröinti epäonnistui"
 

-#: src/plugins/clamav/clamav_plugin.c:251
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr "Clam Antivirus"
-
-#: src/plugins/clamav/clamav_plugin.c:256
+#: src/plugins/clamav/clamav_plugin.c:253

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -6345,7 +6724,7 @@ msgstr ""
 "\n"
 "Asetukset löytyvät valikosta Asetukset→Asetukset→Liitännäiset→Clam Antivirus"
 
 "\n"
 "Asetukset löytyvät valikosta Asetukset→Asetukset→Liitännäiset→Clam Antivirus"
 

-#: src/plugins/clamav/clamav_plugin.c:283
+#: src/plugins/clamav/clamav_plugin.c:280

 msgid "Virus detection"
 msgstr "Viruksentunnistus"
 
 msgid "Virus detection"
 msgstr "Viruksentunnistus"
 


@@ -6389,32 +6768,22 @@ msgid "Click this button to select a folder for storing infected mail"
 msgstr ""
 "Tästä  napista valitaan kansio tartunnan saaneiden postien säilytykseen"
 
 msgstr ""
 "Tästä  napista valitaan kansio tartunnan saaneiden postien säilytykseen"
 

-#: src/plugins/demo/demo.c:45
-msgid ""
-"Your sylpheed-claws version is newer than the version the plugin was built "
-"with"
-msgstr "Sylpheed-Claws on uudempi kuin mille liitännäinen on käännetty"
-
-#: src/plugins/demo/demo.c:50
-msgid "Your sylpheed-claws version is too old"
-msgstr "Sylpheed-Claws on liian vanha"
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+msgid "Demo"
+msgstr "Demo"

 
 

-#: src/plugins/demo/demo.c:56
+#: src/plugins/demo/demo.c:52

 msgid "Failed to register log text hook"
 msgstr "Lokitekstikoukun rekisteröinti epäonnistui"
 
 msgid "Failed to register log text hook"
 msgstr "Lokitekstikoukun rekisteröinti epäonnistui"
 

-#: src/plugins/demo/demo.c:74 src/plugins/demo/demo.c:103
-msgid "Demo"
-msgstr "Demo"
-
-#: src/plugins/demo/demo.c:79
+#: src/plugins/demo/demo.c:75

 msgid ""
 msgid ""

-"This Plugin is only a demo of how to write plugins for Sylpheed-Claws. It "
+"This Plugin is only a demo of how to write plugins for Claws Mail. It "

 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"

-"It is not really useful"
+"It is not really useful."

 msgstr ""
 msgstr ""

-"Tämä liitännäinen on vain esimerkki siitä, miten Sylpheed-Clawsiin tehdään "
+"Tämä liitännäinen on vain esimerkki siitä, miten Claws Mailiin tehdään "

 "liitännäisiä. Se asentaa koukun uudelle lokitulosteelle ja kirjoittaa sen "
 "vakiotulostevirtaan.\n"
 "\n"
 "liitännäisiä. Se asentaa koukun uudelle lokitulosteelle ja kirjoittaa sen "
 "vakiotulostevirtaan.\n"
 "\n"


@@ -6444,22 +6813,11 @@ msgstr "Kokoruututila (piilottaa vuorovaikuttimet)"
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Vastaa Dillon --fullwindow-valitsinta"
 
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Vastaa Dillon --fullwindow-valitsinta"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:169
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Dillo plugin "
-"was built with"
-msgstr ""
-"Sylpheed-Claws on uudempi kuin mille Dillo-liitännäinen on käännetty"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:174
-msgid "Your version of Sylpheed-Claws is too old for the Dillo plugin"
-msgstr "Sylpheed-Claws on liian vanha Dillo-liitännäiselle"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:194
+#: src/plugins/dillo_viewer/dillo_viewer.c:39

 msgid "Dillo HTML Viewer"
 msgstr "HTML-näytin Dillo"
 
 msgid "Dillo HTML Viewer"
 msgstr "HTML-näytin Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:199
+#: src/plugins/dillo_viewer/dillo_viewer.c:195

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -6469,7 +6827,7 @@ msgstr ""
 "\n"
 "Asetukset ovat valikossa Asetukset→Asetukset→Liitännäiset→Dillo-selain"
 
 "\n"
 "Asetukset ovat valikossa Asetukset→Asetukset→Liitännäiset→Dillo-selain"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:223
+#: src/plugins/dillo_viewer/dillo_viewer.c:219

 msgid "text/html"
 msgstr "text/html"
 
 msgid "text/html"
 msgstr "text/html"
 


@@ -6505,7 +6863,8 @@ msgid ""
 "\n"
 "%.*s\n"
 msgstr ""
 "\n"
 "%.*s\n"
 msgstr ""

-"<span weight=\"bold\" size=\"larger\">Anna uudestaan salasana avaimille:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Anna uudestaan salasana avaimille:</"
+"span>\n"

 "\n"
 "%.*s\n"
 
 "\n"
 "%.*s\n"
 


@@ -6541,7 +6900,7 @@ msgstr "Vanhenee"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Asettamalla nollaksi salasana muistetaan session ajan"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Asettamalla nollaksi salasana muistetaan session ajan"
 

-#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:165

 msgid "minute(s)"
 msgstr "minuutissa"
 
 msgid "minute(s)"
 msgstr "minuutissa"
 


@@ -6644,63 +7003,68 @@ msgstr ""
 msgid "Trust key"
 msgstr "Avaimen luotettavuus"
 
 msgid "Trust key"
 msgstr "Avaimen luotettavuus"
 

-#: src/plugins/pgpcore/sgpgme.c:129
+#: src/plugins/pgpcore/sgpgme.c:76 src/privacy.c:211 src/privacy.c:215
+#: src/privacy.c:232 src/privacy.c:236
+msgid "No signature found"
+msgstr "Ei allekirjoitusta"
+
+#: src/plugins/pgpcore/sgpgme.c:138

 msgid "Undefined"
 msgstr "Määrittelemättä"
 
 msgid "Undefined"
 msgstr "Määrittelemättä"
 

-#: src/plugins/pgpcore/sgpgme.c:131 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:193

 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Ei koskaan"
 
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Ei koskaan"
 

-#: src/plugins/pgpcore/sgpgme.c:133
+#: src/plugins/pgpcore/sgpgme.c:142

 msgid "Marginal"
 msgstr "Marginaalinen"
 
 msgid "Marginal"
 msgstr "Marginaalinen"
 

-#: src/plugins/pgpcore/sgpgme.c:137
+#: src/plugins/pgpcore/sgpgme.c:146

 msgid "Ultimate"
 msgstr "Täysi"
 
 msgid "Ultimate"
 msgstr "Täysi"
 

-#: src/plugins/pgpcore/sgpgme.c:171
+#: src/plugins/pgpcore/sgpgme.c:180

 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Allekirjoitusta ei voida tarkastaa: %s"
 
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Allekirjoitusta ei voida tarkastaa: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:175 src/plugins/pgpcore/sgpgme.c:179
-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:188
+#: src/plugins/pgpcore/sgpgme.c:235

 msgid "The signature has not been checked."
 msgstr "Allekirjoitusta ei ole tarkastettu."
 
 msgid "The signature has not been checked."
 msgstr "Allekirjoitusta ei ole tarkastettu."
 

-#: src/plugins/pgpcore/sgpgme.c:185 src/plugins/pgpcore/sgpgme.c:187
+#: src/plugins/pgpcore/sgpgme.c:194 src/plugins/pgpcore/sgpgme.c:196

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP-ydin: Avainta ei saatu — gpg-agent ei ole käynnissä."
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP-ydin: Avainta ei saatu — gpg-agent ei ole käynnissä."
 

-#: src/plugins/pgpcore/sgpgme.c:200
+#: src/plugins/pgpcore/sgpgme.c:209

 #, c-format
 msgid "Good signature from %s."
 msgstr "Toimiva allekirjoitus käyttäjälle %s."
 
 #, c-format
 msgid "Good signature from %s."
 msgstr "Toimiva allekirjoitus käyttäjälle %s."
 

-#: src/plugins/pgpcore/sgpgme.c:206
+#: src/plugins/pgpcore/sgpgme.c:215

 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Toimiva allekirjoitus (ilman luottoa) käyttäjälle %s."
 
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Toimiva allekirjoitus (ilman luottoa) käyttäjälle %s."
 

-#: src/plugins/pgpcore/sgpgme.c:211
+#: src/plugins/pgpcore/sgpgme.c:220

 #, c-format
 msgid "Expired signature from %s."
 msgstr "Vanhentunut allekirjoitus käyttäjälle %s."
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Vanhentunut allekirjoitus käyttäjälle %s."
 

-#: src/plugins/pgpcore/sgpgme.c:214
+#: src/plugins/pgpcore/sgpgme.c:223

 #, c-format
 msgid "Expired key from %s."
 msgstr "Vanhentunut avain käyttäjälle %s."
 
 #, c-format
 msgid "Expired key from %s."
 msgstr "Vanhentunut avain käyttäjälle %s."
 

-#: src/plugins/pgpcore/sgpgme.c:217
+#: src/plugins/pgpcore/sgpgme.c:226

 #, c-format
 msgid "Bad signature from %s."
 msgstr "Virheellinen allekirjoitus käyttäjälle ”%s”"
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Virheellinen allekirjoitus käyttäjälle ”%s”"
 

-#: src/plugins/pgpcore/sgpgme.c:221
+#: src/plugins/pgpcore/sgpgme.c:230

 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Avain 0x%s tämän allekirjoituksen varmentamiseen puuttuu."
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Avain 0x%s tämän allekirjoituksen varmentamiseen puuttuu."


@@ -6708,77 +7072,77 @@ msgstr "Avain 0x%s tämän allekirjoituksen varmentamiseen puuttuu."
 # eg:
 # Allekirjoitus on tehty su 27. maaliskuuta 2005 01:56:28
 # avaimelle 1234567890ABCDEF
 # eg:
 # Allekirjoitus on tehty su 27. maaliskuuta 2005 01:56:28
 # avaimelle 1234567890ABCDEF

-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:272

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Allekirjoitus on tehty %s avaimelle %s\n"
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Allekirjoitus on tehty %s avaimelle %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:270
+#: src/plugins/pgpcore/sgpgme.c:279

 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Oikea allekirjoitus käyttäjälle %s (Luottamus: %s)\n"
 
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Oikea allekirjoitus käyttäjälle %s (Luottamus: %s)\n"
 

-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:284

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Vanhentunut allekirjoitus käyttäjälle ”%s”\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Vanhentunut allekirjoitus käyttäjälle ”%s”\n"
 

-#: src/plugins/pgpcore/sgpgme.c:280
+#: src/plugins/pgpcore/sgpgme.c:289

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Virheellinen allekirjoitus käyttäjälle ”%s”\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Virheellinen allekirjoitus käyttäjälle ”%s”\n"
 

-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:300

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "  (tunnetaan myös nimellä) ”%s”\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "  (tunnetaan myös nimellä) ”%s”\n"
 

-#: src/plugins/pgpcore/sgpgme.c:297
+#: src/plugins/pgpcore/sgpgme.c:306

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Ensiöavaimen sormenjälki: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Ensiöavaimen sormenjälki: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:311

 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VAROITUS: Allekirjoittajan osoite %s ja DNS-osoite eivät täsmää\n"
 
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "VAROITUS: Allekirjoittajan osoite %s ja DNS-osoite eivät täsmää\n"
 

-#: src/plugins/pgpcore/sgpgme.c:308
+#: src/plugins/pgpcore/sgpgme.c:317

 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Allekirjoittajan varmistettu osoite on %s\n"
 
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Allekirjoittajan varmistettu osoite on %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:350
+#: src/plugins/pgpcore/sgpgme.c:359

 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Ei voitu hakea dataa viestille %s"
 
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Ei voitu hakea dataa viestille %s"
 

-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:375

 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Ei voitu alustaa dataa %s"
 
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Ei voitu alustaa dataa %s"
 

-#: src/plugins/pgpcore/sgpgme.c:482
+#: src/plugins/pgpcore/sgpgme.c:491

 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Salaista avainta ei löydetty (%s)"
 
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Salaista avainta ei löydetty (%s)"
 

-#: src/plugins/pgpcore/sgpgme.c:490
+#: src/plugins/pgpcore/sgpgme.c:499

 msgid "Secret key specification is ambiguous"
 msgstr "Salaisen avaimen määritelmä on moniselitteinen"
 
 msgid "Secret key specification is ambiguous"
 msgstr "Salaisen avaimen määritelmä on moniselitteinen"
 

-#: src/plugins/pgpcore/sgpgme.c:500
+#: src/plugins/pgpcore/sgpgme.c:509

 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Virhe salaista avainta haettaessa: %s"
 
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Virhe salaista avainta haettaessa: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:536
+#: src/plugins/pgpcore/sgpgme.c:545

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."

-msgstr "Gpgme-käytäntö %s on käyttökelvoton: sovellutusta %s ei ole "
-"asennettu oikein"
+msgstr ""
+"Gpgme-käytäntö %s on käyttökelvoton: sovellutusta %s ei ole asennettu oikein"

 
 

-#: src/plugins/pgpcore/sgpgme.c:542
+#: src/plugins/pgpcore/sgpgme.c:551

 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "


@@ -6787,12 +7151,12 @@ msgstr ""
 "Gpgme-käytäntö %s on käyttökelvoton: sovellutuksen %s versio %s on "
 "asennettu, mutta %s on vaatimuksena.\n"
 
 "Gpgme-käytäntö %s on käyttökelvoton: sovellutuksen %s versio %s on "
 "asennettu, mutta %s on vaatimuksena.\n"
 

-#: src/plugins/pgpcore/sgpgme.c:550
+#: src/plugins/pgpcore/sgpgme.c:559

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-käytäntö %s on käyttökelvoton (tuntemattomasta syystä)"
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme-käytäntö %s on käyttökelvoton (tuntemattomasta syystä)"
 

-#: src/plugins/pgpcore/sgpgme.c:566
+#: src/plugins/pgpcore/sgpgme.c:575

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -6800,62 +7164,76 @@ msgstr ""
 "GnuPG:tä ei ole asennettu oikein, tai se pitää päivittää.\n"
 "OpenPGP-tuki otettu pois päältä."
 
 "GnuPG:tä ei ole asennettu oikein, tai se pitää päivittää.\n"
 "OpenPGP-tuki otettu pois päältä."
 

-#: src/plugins/pgpcore/sgpgme.c:600
+#: src/plugins/pgpcore/sgpgme.c:609
+msgid ""
+"You have to save the account's information with \"OK\" before being able to "
+"generate a key pair.\n"
+msgstr ""
+"Tilin tiedot pitää tallentaa napista OK ennen avainparin luontia.\n"
+
+#: src/plugins/pgpcore/sgpgme.c:614

 msgid "No PGP key found"
 msgstr "PGP-avaimia ei löytynyt"
 
 msgid "No PGP key found"
 msgstr "PGP-avaimia ei löytynyt"
 

-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:615

 msgid ""
 msgid ""

-"Sylpheed-Claws did not find a secret PGP key, which means that you won't be "
-"able to sign emails or receive encrypted emails.\n"
+"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 ""
 "Do you want to create a new key pair now?"
 msgstr ""

-"Sylpheed-Claws ei löytänyt salaista PGP-avainta, mikä tarkoittaa, ettei "
+"Claws Mail ei löytänyt yksityistä PGP-avainta, mikä tarkoittaa, ettei "

 "viestejä voi allekirjoittaa tai vastaanottaa salattuja viestejä.\n"
 "Luodaanko uusi avainpari?"
 
 "viestejä voi allekirjoittaa tai vastaanottaa salattuja viestejä.\n"
 "Luodaanko uusi avainpari?"
 

-#: src/plugins/pgpcore/sgpgme.c:671 src/plugins/pgpcore/sgpgme.c:687
+#: src/plugins/pgpcore/sgpgme.c:685 src/plugins/pgpcore/sgpgme.c:701

 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Avainparia ei voitu luoda: %s"
 
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Avainparia ei voitu luoda: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:678
+#: src/plugins/pgpcore/sgpgme.c:692

 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."

-msgstr ""
-"Avainparia luodaan... Heiluttele hiirtä entropian aikaansaamiseksi..."
+msgstr "Avainparia luodaan... Heiluttele hiirtä entropian aikaansaamiseksi..."

 
 

-#: src/plugins/pgpcore/sgpgme.c:693
+#: src/plugins/pgpcore/sgpgme.c:707

 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Avainparia ei voitu luoda: tuntematon virhe"
 
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Avainparia ei voitu luoda: tuntematon virhe"
 

-#: src/plugins/pgpcore/sgpgme.c:697
+#: src/plugins/pgpcore/sgpgme.c:711

 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"

-"%s"
+"%s\n"
+"\n"
+"Do you want to export it to a keyserver?"

 msgstr ""
 "Avainpari luotiin. Sormenjälki on:\n"
 msgstr ""
 "Avainpari luotiin. Sormenjälki on:\n"

-"%s"
+"%s\n"
+"\n"
+"Lähetetäänkö se avainpalvelimelle?"

 
 

-#: src/plugins/pgpcore/plugin.c:37
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin "
-"was built with"
-msgstr ""
-"Sylpheed-Claws on uudempi kuin jota varten PGP-Core-liitännäinen on "
-"käännetty"
+#: src/plugins/pgpcore/sgpgme.c:715
+msgid "Key generated"
+msgstr "Avain luotu"
+
+#: src/plugins/pgpcore/sgpgme.c:754
+msgid "Key exported."
+msgstr "Avain tuotu."

 
 

-#: src/plugins/pgpcore/plugin.c:42
-msgid "Your version of Sylpheed-Claws is too old for the PGP/Core plugin"
-msgstr "Sylpheed-Claws on liian vanha PGP-Core-liitännäiselle"
+#: src/plugins/pgpcore/sgpgme.c:756
+msgid "Couldn't export key."
+msgstr "Ei voi tuoda avainta."

 
 

-#: src/plugins/pgpcore/plugin.c:60
+#: src/plugins/pgpcore/sgpgme.c:760
+msgid "Key export isn't implemented in Windows."
+msgstr "Avaimen hakua ei tueta Windows-järjestelmissä."
+
+#: src/plugins/pgpcore/plugin.c:35

 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 

-#: src/plugins/pgpcore/plugin.c:65
+#: src/plugins/pgpcore/plugin.c:64

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -6876,95 +7254,170 @@ msgstr ""
 "\n"
 "GPGME © 2001 Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME © 2001 Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpcore/plugin.c:94
+#: src/plugins/pgpcore/plugin.c:93

 msgid "Core operations"
 msgstr "Ydintoiminnot"
 
 msgid "Core operations"
 msgstr "Ydintoiminnot"
 

-#: src/plugins/pgpinline/pgpinline.c:237 src/plugins/pgpinline/pgpinline.c:385
+#: src/plugins/pgpcore/pgp_viewer.c:118
+msgid "Key import"
+msgstr "Avaimen tuonti"
+
+#: src/plugins/pgpcore/pgp_viewer.c:119
+msgid ""
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"
+msgstr ""
+"Tätä avainta ei löydy avainrenkaastasi. Yritetäänkö viedä se "
+"avainpalvelimelle?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
+msgid ""
+"\n"
+"  Key ID "
+msgstr ""
+"\n"
+"  Avaimen tunniste "
+
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:186
+msgid "   This key is not in your keyring.\n"
+msgstr "   Avain puuttuu avainrenkaastasi.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:130
+msgid "   It should be possible to import it "
+msgstr "   Se pitäisi onnistua hakea "
+
+#: src/plugins/pgpcore/pgp_viewer.c:132
+msgid ""
+"when working online,\n"
+"   or "
+msgstr ""
+"kun verkkoyhteys toimii,\n"
+"   tai "
+
+#: src/plugins/pgpcore/pgp_viewer.c:133
+msgid ""
+"with the following command: \n"
+"\n"
+"     "
+msgstr ""
+"seuraavalla komennolla: \n"
+"\n"
+"     "
+
+#: src/plugins/pgpcore/pgp_viewer.c:140
+msgid ""
+"\n"
+"  Importing key ID "
+msgstr ""
+"\n"
+"  Haetaan avainta "
+
+#: src/plugins/pgpcore/pgp_viewer.c:179
+msgid "   This key has been imported to your keyring.\n"
+msgstr "   Avain on haettu avainrenkaaseesi.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:181
+msgid "   This key couldn't be imported to your keyring.\n"
+msgstr "   Avainta ei voitua hakea avainrenkaaseesi.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid ""
+"   You can try to import it manually with the command:\n"
+"\n"
+"     "
+msgstr ""
+"   Voit koettaa hakea sitä seuraavalla komennolla:\n"
+"\n"
+"     "
+
+#: src/plugins/pgpcore/pgp_viewer.c:187
+msgid "   Key import isn't implemented in Windows.\n"
+msgstr "   Avaimen haku ei ole toteutettu Windowsissa.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:196
+msgid "   This key is in your keyring.\n"
+msgstr "   Avain on avainrenkaassa.\n"
+
+#: src/plugins/pgpinline/pgpinline.c:241 src/plugins/pgpinline/pgpinline.c:393

 msgid "Couldn't get text data."
 msgstr "Ei hakea tekstidataa."
 
 msgid "Couldn't get text data."
 msgstr "Ei hakea tekstidataa."
 

-#: src/plugins/pgpinline/pgpinline.c:255
+#: src/plugins/pgpinline/pgpinline.c:259

 msgid "Couldn't convert text data to any sane charset."
 msgstr "Tekstidataa ei voitu muuntaa järjelliseen merkistökoodaukseen."
 
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Tekstidataa ei voitu muuntaa järjelliseen merkistökoodaukseen."
 

-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:267 src/plugins/pgpinline/pgpinline.c:523
+#: src/plugins/pgpinline/pgpinline.c:644 src/plugins/pgpinline/pgpinline.c:691
+#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
+#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
+#: src/plugins/pgpmime/pgpmime.c:593
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "GPG-kontekstin alustus epäonnistui, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:386

 msgid "Couldn't parse mime part."
 msgstr "Ei voitu jäsentää MIME-osaa."
 
 msgid "Couldn't parse mime part."
 msgstr "Ei voitu jäsentää MIME-osaa."
 

-#: src/plugins/pgpinline/pgpinline.c:408 src/plugins/pgpmime/pgpmime.c:333
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:343

 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Ei voitu avata purettua tiedostoa %s"
 
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Ei voitu avata purettua tiedostoa %s"
 

-#: src/plugins/pgpinline/pgpinline.c:438
+#: src/plugins/pgpinline/pgpinline.c:446

 msgid "Couldn't scan decrypted file."
 msgstr "Purettua tiedostoa ei voitu lukea."
 
 msgid "Couldn't scan decrypted file."
 msgstr "Purettua tiedostoa ei voitu lukea."
 

-#: src/plugins/pgpinline/pgpinline.c:446
+#: src/plugins/pgpinline/pgpinline.c:454

 msgid "Couldn't scan decrypted file parts."
 msgstr "Puretun tiedoston osia ei voitu lukea."
 
 msgid "Couldn't scan decrypted file parts."
 msgstr "Puretun tiedoston osia ei voitu lukea."
 

-#: src/plugins/pgpinline/pgpinline.c:500
+#: src/plugins/pgpinline/pgpinline.c:508

 msgid "Couldn't create temporary file."
 msgid "Couldn't create temporary file."

-msgstr ""
-"Väliaikaistiedoston luonti ei onnistunut."
+msgstr "Väliaikaistiedoston luonti ei onnistunut."

 
 

-#: src/plugins/pgpinline/pgpinline.c:534 src/plugins/pgpmime/pgpmime.c:480
+#: src/plugins/pgpinline/pgpinline.c:546 src/plugins/pgpmime/pgpmime.c:494

 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Allekirjoitus epäonnistui, %s"
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Allekirjoitus epäonnistui, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:552 src/plugins/pgpmime/pgpmime.c:505
+#: src/plugins/pgpinline/pgpinline.c:564 src/plugins/pgpmime/pgpmime.c:519

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Allekirjoitus epäonnistui huonon allekirjoittajan takia: %s"
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Allekirjoitus epäonnistui huonon allekirjoittajan takia: %s"
 

-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:514
+#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:528

 msgid "Data signing failed, no results."
 msgstr "Allekirjoitus epäonnistui, ei tuloksia"
 
 msgid "Data signing failed, no results."
 msgstr "Allekirjoitus epäonnistui, ei tuloksia"
 

-#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:526
+#: src/plugins/pgpinline/pgpinline.c:583 src/plugins/pgpmime/pgpmime.c:539

 msgid "Data signing failed, no contents."
 msgstr "Allekirjoitus epäonnistui, ei sisältöä"
 
 msgid "Data signing failed, no contents."
 msgstr "Allekirjoitus epäonnistui, ei sisältöä"
 

-#: src/plugins/pgpinline/pgpinline.c:637 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:653 src/plugins/pgpmime/pgpmime.c:602

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Ei voitu lisätä GPG-avainta %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Ei voitu lisätä GPG-avainta %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpmime/pgpmime.c:612
+#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:630

 #, c-format
 msgid "Couldn't create temporary file, %s"
 #, c-format
 msgid "Couldn't create temporary file, %s"

-msgstr ""
-"Väliaikaistiedoston luonti ei onnistunut %s"
+msgstr "Väliaikaistiedoston luonti ei onnistunut %s"

 
 

-#: src/plugins/pgpinline/pgpinline.c:683 src/plugins/pgpmime/pgpmime.c:638
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:655

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Salaus epäonnistui %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Salaus epäonnistui %s"
 

-#: src/plugins/pgpinline/pgpinline.c:746
+#: src/plugins/pgpinline/pgpinline.c:767

 msgid "PGP/Inline"
 msgstr "PGP-Inline"
 
 msgid "PGP/Inline"
 msgstr "PGP-Inline"
 

-#: src/plugins/pgpinline/plugin.c:36
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/inline "
-"plugin was built with"
-msgstr ""
-"Sylpheed-Claws on uudempi kuin jota varten PGP-inline-liitännäinen "
-"on käännetty"
-
-#: src/plugins/pgpinline/plugin.c:41
-msgid "Your version of Sylpheed-Claws is too old for the PGP/inline plugin"
-msgstr "Sylpheed-Claws on liian vanha PGP-inline-liitännäiselle"
-
-#: src/plugins/pgpinline/plugin.c:57
+#: src/plugins/pgpinline/plugin.c:33

 msgid "PGP/inline"
 msgstr "PGP-inline"
 
 msgid "PGP/inline"
 msgstr "PGP-inline"
 

-#: src/plugins/pgpinline/plugin.c:62
+#: src/plugins/pgpinline/plugin.c:58

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -6986,22 +7439,11 @@ msgstr ""
 "\n"
 "GPGME © 2001 Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME © 2001 Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/plugin.c:35
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin "
-"was built with"
-msgstr ""
-"Sylpheed-Claws on uudempi kuin jota varten PGP-MIME on käännetty"
-
-#: src/plugins/pgpmime/plugin.c:40
-msgid "Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"
-msgstr "Sylpheed-Claws on liian vanha PGP-MIME-liitännäiselle"
-
-#: src/plugins/pgpmime/plugin.c:56
+#: src/plugins/pgpmime/plugin.c:33

 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:61
+#: src/plugins/pgpmime/plugin.c:58

 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"


@@ -7026,50 +7468,49 @@ msgstr ""
 "\n"
 "GPGME © 2001 Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME © 2001 Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/pgpmime.c:192
+#: src/plugins/pgpmime/pgpmime.c:201

 msgid "Signature boundary not found."
 msgstr "Allekirjoituksen rajaa ei löytynyt."
 
 msgid "Signature boundary not found."
 msgstr "Allekirjoituksen rajaa ei löytynyt."
 

-#: src/plugins/pgpmime/pgpmime.c:310
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "GPG-kontekstin alustus epäonnistui, %s"
-
-#: src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpmime/pgpmime.c:362

 msgid "Couldn't parse decrypted file."
 msgstr "Purettua tiedostoa ei pystytty lukemaan."
 
 msgid "Couldn't parse decrypted file."
 msgstr "Purettua tiedostoa ei pystytty lukemaan."
 

-#: src/plugins/pgpmime/pgpmime.c:358
+#: src/plugins/pgpmime/pgpmime.c:368

 msgid "Couldn't parse decrypted file parts."
 msgstr "Purettuja tiedoston osia ei pystytty lukemaan."
 
 msgid "Couldn't parse decrypted file parts."
 msgstr "Purettuja tiedoston osia ei pystytty lukemaan."
 

-#: src/plugins/pgpmime/pgpmime.c:404 src/plugins/pgpmime/pgpmime.c:443
+#: src/plugins/pgpmime/pgpmime.c:414 src/plugins/pgpmime/pgpmime.c:453

 #, c-format
 msgid "Couldn't create temporary file: %s"
 #, c-format
 msgid "Couldn't create temporary file: %s"

-msgstr ""
-"Väliaikaistiedoston luonti ei onnistunut: %s."
+msgstr "Väliaikaistiedoston luonti ei onnistunut: %s."

 
 

-#: src/plugins/pgpmime/pgpmime.c:704
+#: src/plugins/pgpmime/pgpmime.c:723

 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 
 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 

-#: src/plugins/spamassassin/spamassassin.c:159
+#: src/plugins/spamassassin/spamassassin.c:75
+#: src/plugins/spamassassin/spamassassin_gtk.c:549
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: src/plugins/spamassassin/spamassassin.c:161

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin-liitännäinen ei saanut yhteyttä spamd:hen.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin-liitännäinen ei saanut yhteyttä spamd:hen.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:175
+#: src/plugins/spamassassin/spamassassin.c:177

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin-liitännäisen suodatus epäonnistui.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin-liitännäisen suodatus epäonnistui.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:201
+#: src/plugins/spamassassin/spamassassin.c:203

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Spamassassin-liitännäinen on poistettu käytöstä asetuksista.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "Spamassassin-liitännäinen on poistettu käytöstä asetuksista.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:206
+#: src/plugins/spamassassin/spamassassin.c:208

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: Suodatetaan viestejä…"
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: Suodatetaan viestejä…"
 

-#: src/plugins/spamassassin/spamassassin.c:274
+#: src/plugins/spamassassin/spamassassin.c:277

 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "


@@ -7078,40 +7519,23 @@ msgstr ""
 "SpamAssassin-liitännäinen ei voinut suodattaa viestiä. Spamd saattaa olla "
 "tavoittamattomissa. Varmista että spamd on käynnissä ja tavoitettavissa."
 
 "SpamAssassin-liitännäinen ei voinut suodattaa viestiä. Spamd saattaa olla "
 "tavoittamattomissa. Varmista että spamd on käynnissä ja tavoitettavissa."
 

-#: src/plugins/spamassassin/spamassassin.c:333
+#: src/plugins/spamassassin/spamassassin.c:336

 msgid ""
 msgid ""

-"Sylpheed-Claws needs network access in order to feed this mail(s) to the "
-"remote learner."
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."

 msgstr ""
 "Ilman verkkoyhteyttä viestejä ei voi lähettää etäpalvelimelle, joka arvioisi "
 "niiden roskuutta."
 
 msgstr ""
 "Ilman verkkoyhteyttä viestejä ei voi lähettää etäpalvelimelle, joka arvioisi "
 "niiden roskuutta."
 

-#: src/plugins/spamassassin/spamassassin.c:468
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the SpamAssassin "
-"plugin was built with"
-msgstr ""
-"Sylpheed-Claws on uudempi kuin jota varten SpamAssassin-liitännäinen on "
-"käännetty"
-
-#: src/plugins/spamassassin/spamassassin.c:473
-msgid "Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"
-msgstr "Sylpheed-Claws on liian vanha SpamAssassinille"
-
-#: src/plugins/spamassassin/spamassassin.c:482
+#: src/plugins/spamassassin/spamassassin.c:479

 msgid "Failed to get username"
 msgstr "Käyttäjänimen haku epäonnistui"
 
 msgid "Failed to get username"
 msgstr "Käyttäjänimen haku epäonnistui"
 

-#: src/plugins/spamassassin/spamassassin.c:494
+#: src/plugins/spamassassin/spamassassin.c:491

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "Spamassassin-liitännäinen on ladattu, mutta asetettu pois käytöstä.\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "Spamassassin-liitännäinen on ladattu, mutta asetettu pois käytöstä.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:522
-#: src/plugins/spamassassin/spamassassin_gtk.c:549
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
-
-#: src/plugins/spamassassin/spamassassin.c:527
+#: src/plugins/spamassassin/spamassassin.c:524

 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "


@@ -7136,11 +7560,11 @@ msgstr ""
 "\n"
 "Asetukset ovat valikossa Asetukset→Asetukset→Liitännäiset→SpamAssasin"
 
 "\n"
 "Asetukset ovat valikossa Asetukset→Asetukset→Liitännäiset→SpamAssasin"
 

-#: src/plugins/spamassassin/spamassassin.c:558
+#: src/plugins/spamassassin/spamassassin.c:555

 msgid "Spam detection"
 msgstr "Roskapostin tunnistus"
 
 msgid "Spam detection"
 msgstr "Roskapostin tunnistus"
 

-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:556

 msgid "Spam learning"
 msgstr "Roskapostin oppiminen"
 
 msgid "Spam learning"
 msgstr "Roskapostin oppiminen"
 


@@ -7213,6 +7637,7 @@ msgstr ""
 "keskeytetään."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
 "keskeytetään."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194

+#: src/prefs_summaries.c:900

 msgid "seconds"
 msgstr "sekuntia"
 
 msgid "seconds"
 msgstr "sekuntia"
 


@@ -7236,64 +7661,60 @@ msgstr ""
 msgid "Click this button to select a folder for storing spam"
 msgstr "Tästä napista valitaan kansio roskapostin säilytykseen"
 
 msgid "Click this button to select a folder for storing spam"
 msgstr "Tästä napista valitaan kansio roskapostin säilytykseen"
 

-#: src/plugins/trayicon/trayicon.c:94
+#: src/plugins/trayicon/trayicon.c:59 src/plugins/trayicon/trayicon.c:497
+msgid "Trayicon"
+msgstr "Ilmoitusaluekuvake"
+
+#: src/plugins/trayicon/trayicon.c:106

 msgid "/_Get Mail"
 msgstr "_Hae"
 
 msgid "/_Get Mail"
 msgstr "_Hae"
 

-#: src/plugins/trayicon/trayicon.c:96
+#: src/plugins/trayicon/trayicon.c:108

 msgid "/_Email"
 msgstr "S_ähköposti"
 
 msgid "/_Email"
 msgstr "S_ähköposti"
 

-#: src/plugins/trayicon/trayicon.c:97
+#: src/plugins/trayicon/trayicon.c:109
+msgid "/_Email from account"
+msgstr "Tilin sä_hköposti"
+
+#: src/plugins/trayicon/trayicon.c:111

 msgid "/Open A_ddressbook"
 msgstr "Avaa _osoitekirja"
 
 msgid "/Open A_ddressbook"
 msgstr "Avaa _osoitekirja"
 

-#: src/plugins/trayicon/trayicon.c:99
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Work Offline"
 msgstr "_Yhteydetön tila"
 
 msgid "/_Work Offline"
 msgstr "_Yhteydetön tila"
 

-#: src/plugins/trayicon/trayicon.c:101
-msgid "/E_xit Sylpheed-Claws"
-msgstr "P_oistu Sylpheed-Clawsista"
+#: src/plugins/trayicon/trayicon.c:115
+msgid "/E_xit Claws Mail"
+msgstr "P_oistu Claws Mailista"

 
 

-#: src/plugins/trayicon/trayicon.c:155
+#: src/plugins/trayicon/trayicon.c:204

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Uusia %d, lukematta %d, Yhteensä %d"
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Uusia %d, lukematta %d, Yhteensä %d"
 

-#: src/plugins/trayicon/trayicon.c:223
+#: src/plugins/trayicon/trayicon.c:278

 msgid "/Work Offline"
 msgstr "Yhteydetön tila"
 
 msgid "/Work Offline"
 msgstr "Yhteydetön tila"
 

-#: src/plugins/trayicon/trayicon.c:226
+#: src/plugins/trayicon/trayicon.c:281

 msgid "/Get Mail"
 msgstr "Hae kaikki"
 
 msgid "/Get Mail"
 msgstr "Hae kaikki"
 

-#: src/plugins/trayicon/trayicon.c:295
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Trayicon plugin "
-"was built with"
-msgstr ""
-"Sylpheed-Claws on uudempi kuin jota varten Trayicon-liitännäinen on "
-"käännetty"
-
-#: src/plugins/trayicon/trayicon.c:300
-msgid "Your version of Sylpheed-Claws is too old for the Trayicon plugin"
-msgstr "Sylpheed-Claws on liian vanha Trayicon-liitännäiselle"
-
-#: src/plugins/trayicon/trayicon.c:306
+#: src/plugins/trayicon/trayicon.c:361

 msgid "Failed to register folder item update hook"
 msgstr "Kansio-olionpäivityskoukun rekisteröinti epäonnistui"
 
 msgid "Failed to register folder item update hook"
 msgstr "Kansio-olionpäivityskoukun rekisteröinti epäonnistui"
 

-#: src/plugins/trayicon/trayicon.c:312
+#: src/plugins/trayicon/trayicon.c:367

 msgid "Failed to register folder update hook"
 msgstr "Kansionpäivityskoukun rekisteröinti epäonnistui"
 
 msgid "Failed to register folder update hook"
 msgstr "Kansionpäivityskoukun rekisteröinti epäonnistui"
 

-#: src/plugins/trayicon/trayicon.c:340 src/plugins/trayicon/trayicon.c:422
-msgid "Trayicon"
-msgstr "Ilmoitusaluekuvake"
+#: src/plugins/trayicon/trayicon.c:373 src/plugins/trayicon/trayicon.c:379
+msgid "Failed to register offline switch hook"
+msgstr "Yhteydettömän kansionpäivityskoukun rekisteröinti epäonnistui"

 
 

-#: src/plugins/trayicon/trayicon.c:345
+#: src/plugins/trayicon/trayicon.c:415

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -7308,7 +7729,7 @@ msgstr ""
 "siinä on kirjeitä. Ponnahdusvihjeessä kerrotaan uusien, lukemattomien ja "
 "kaikkien viestien määrät."
 
 "siinä on kirjeitä. Ponnahdusvihjeessä kerrotaan uusien, lukemattomien ja "
 "kaikkien viestien määrät."
 

-#: src/plugins/trayicon/trayicon.c:399
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit this program?"
 msgstr "Poistutaanko ohjelmasta?"
 
 msgid "Exit this program?"
 msgstr "Poistutaanko ohjelmasta?"
 


@@ -7367,179 +7788,187 @@ msgstr "virhe POP3-session aikana\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP-komentoa ei tueta\n"
 
 msgid "TOP command unsupported\n"
 msgstr "TOP-komentoa ei tueta\n"
 

-#: src/prefs_account.c:231 src/prefs_account.c:1440 src/prefs_account.c:2123
-#: src/wizard.c:997
+#: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145
+#: src/wizard.c:1122

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:234 src/prefs_account.c:1566 src/prefs_account.c:2140
+#: src/prefs_account.c:236 src/prefs_account.c:1587 src/prefs_account.c:2162

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:235
+#: src/prefs_account.c:237

 msgid "News (NNTP)"
 msgstr "USENET-keskusteluryhmät (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "USENET-keskusteluryhmät (NNTP)"
 

-#: src/prefs_account.c:236 src/wizard.c:1007
+#: src/prefs_account.c:238 src/wizard.c:1132

 msgid "Local mbox file"
 msgstr "Paikallinen mbox-tiedosto"
 
 msgid "Local mbox file"
 msgstr "Paikallinen mbox-tiedosto"
 

-#: src/prefs_account.c:237
+#: src/prefs_account.c:239

 msgid "None (SMTP only)"
 msgstr "Ei mitään (SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Ei mitään (SMTP)"
 

-#: src/prefs_account.c:716
+#: src/prefs_account.c:725

 #, c-format
 msgid "Account%d"
 msgstr "Tili%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "Tili%d"
 

-#: src/prefs_account.c:989
+#: src/prefs_account.c:998

 msgid "Preferences for new account"
 msgstr "Uuden tilin asetukset"
 
 msgid "Preferences for new account"
 msgstr "Uuden tilin asetukset"
 

-#: src/prefs_account.c:991
+#: src/prefs_account.c:1000

 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s — Tilin asetukset"
 
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s — Tilin asetukset"
 

-#: src/prefs_account.c:1026
+#: src/prefs_account.c:1035

 msgid "_Basic"
 msgstr "_Perus"
 
 msgid "_Basic"
 msgstr "_Perus"
 

-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1037

 msgid "_Receive"
 msgstr "_Haku"
 
 msgid "_Receive"
 msgstr "_Haku"
 

-#: src/prefs_account.c:1032
+#: src/prefs_account.c:1041

 msgid "Co_mpose"
 msgstr "_Viestin kirjoitus"
 
 msgid "Co_mpose"
 msgstr "_Viestin kirjoitus"
 

-#: src/prefs_account.c:1034
+#: src/prefs_account.c:1043

 msgid "_Privacy"
 msgstr "_Yksityisyys"
 
 msgid "_Privacy"
 msgstr "_Yksityisyys"
 

-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1046

 msgid "SS_L"
 msgstr "_SSL"
 
 msgid "SS_L"
 msgstr "_SSL"
 

-#: src/prefs_account.c:1040
+#: src/prefs_account.c:1049

 msgid "A_dvanced"
 msgstr "_Lisäasetukset"
 
 msgid "A_dvanced"
 msgstr "_Lisäasetukset"
 

-#: src/prefs_account.c:1096
+#: src/prefs_account.c:1107

 msgid "Name of account"
 msgstr "Tilin nimi"
 
 msgid "Name of account"
 msgstr "Tilin nimi"
 

-#: src/prefs_account.c:1105
+#: src/prefs_account.c:1116

 msgid "Set as default"
 msgstr "Aseta oletustiliksi"
 
 msgid "Set as default"
 msgstr "Aseta oletustiliksi"
 

-#: src/prefs_account.c:1109
+#: src/prefs_account.c:1120

 msgid "Personal information"
 msgstr "Henkilökohtaiset tiedot"
 
 msgid "Personal information"
 msgstr "Henkilökohtaiset tiedot"
 

-#: src/prefs_account.c:1118
+#: src/prefs_account.c:1129

 msgid "Full name"
 msgstr "Koko nimi"
 
 msgid "Full name"
 msgstr "Koko nimi"
 

-#: src/prefs_account.c:1124
+#: src/prefs_account.c:1135

 msgid "Mail address"
 msgstr "Postiosoite"
 
 msgid "Mail address"
 msgstr "Postiosoite"
 

-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1141

 msgid "Organization"
 msgstr "Organisaatio"
 
 msgid "Organization"
 msgstr "Organisaatio"
 

-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1165

 msgid "Server information"
 msgstr "Palvelimen tiedot"
 
 msgid "Server information"
 msgstr "Palvelimen tiedot"
 

-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1205 src/wizard.c:1216
+msgid ""
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"
+"has been built without IMAP support.</span>"
+msgstr ""
+"<span weight=\"bold\">Varoitus: tämä Claws Mail on\n"
+"käännetty ilman IMAP-tukea</span>"
+
+#: src/prefs_account.c:1234

 msgid "This server requires authentication"
 msgstr "Palvelin vaatii todennuksen"
 
 msgid "This server requires authentication"
 msgstr "Palvelin vaatii todennuksen"
 

-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1241

 msgid "Authenticate on connect"
 msgstr "Todenna yhdistettäessä"
 
 msgid "Authenticate on connect"
 msgstr "Todenna yhdistettäessä"
 

-#: src/prefs_account.c:1265
+#: src/prefs_account.c:1286

 msgid "News server"
 msgstr "Keskusteluryhmäpalvelin"
 
 msgid "News server"
 msgstr "Keskusteluryhmäpalvelin"
 

-#: src/prefs_account.c:1271
+#: src/prefs_account.c:1292

 msgid "Server for receiving"
 msgstr "Vastaanottopalvelin"
 
 msgid "Server for receiving"
 msgstr "Vastaanottopalvelin"
 

-#: src/prefs_account.c:1277
+#: src/prefs_account.c:1298

 msgid "Local mailbox"
 msgstr "Paikallinen postilaatikko"
 
 msgid "Local mailbox"
 msgstr "Paikallinen postilaatikko"
 

-#: src/prefs_account.c:1284
+#: src/prefs_account.c:1305

 msgid "SMTP server (send)"
 msgstr "SMTP-palvelin (lähettämiseen)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP-palvelin (lähettämiseen)"
 

-#: src/prefs_account.c:1292
+#: src/prefs_account.c:1313

 msgid "Use mail command rather than SMTP server"
 msgstr "Käytä postituskomentoa SMTP-palvelimen asemesta"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Käytä postituskomentoa SMTP-palvelimen asemesta"
 

-#: src/prefs_account.c:1301
+#: src/prefs_account.c:1322

 msgid "command to send mails"
 msgstr "postin lähetyskomento"
 
 msgid "command to send mails"
 msgstr "postin lähetyskomento"
 

-#: src/prefs_account.c:1308 src/prefs_account.c:1757
+#: src/prefs_account.c:1329 src/prefs_account.c:1779

 msgid "User ID"
 msgstr "Käyttäjätunnus"
 
 msgid "User ID"
 msgstr "Käyttäjätunnus"
 

-#: src/prefs_account.c:1314 src/prefs_account.c:1766
+#: src/prefs_account.c:1335 src/prefs_account.c:1788

 msgid "Password"
 msgstr "Salasana"
 
 msgid "Password"
 msgstr "Salasana"
 

-#: src/prefs_account.c:1407
+#: src/prefs_account.c:1428

 msgid "Local"
 msgstr "Paikallinen"
 
 msgid "Local"
 msgstr "Paikallinen"
 

-#: src/prefs_account.c:1418 src/prefs_account.c:1513
+#: src/prefs_account.c:1439 src/prefs_account.c:1534

 msgid "Default inbox"
 msgstr "Oletusarvoinen saapuneet-kansio"
 
 msgid "Default inbox"
 msgstr "Oletusarvoinen saapuneet-kansio"
 

-#: src/prefs_account.c:1425 src/prefs_account.c:1433 src/prefs_account.c:1520
-#: src/prefs_account.c:1528
+#: src/prefs_account.c:1446 src/prefs_account.c:1454 src/prefs_account.c:1541
+#: src/prefs_account.c:1549

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Suodattamattomat viestit tallennetaan tänne"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Suodattamattomat viestit tallennetaan tänne"
 

-#: src/prefs_account.c:1430 src/prefs_account.c:1525 src/prefs_account.c:1927
+#: src/prefs_account.c:1451 src/prefs_account.c:1546 src/prefs_account.c:1949

 msgid "Bro_wse"
 msgstr "_Selaa"
 
 msgid "Bro_wse"
 msgstr "_Selaa"
 

-#: src/prefs_account.c:1448
+#: src/prefs_account.c:1469

 msgid "Use secure authentication (APOP)"
 msgstr "Käytä turvallista tunnistautumista (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Käytä turvallista tunnistautumista (APOP)"
 

-#: src/prefs_account.c:1451
+#: src/prefs_account.c:1472

 msgid "Remove messages on server when received"
 msgstr "Poista viestit palvelimelta hakemisen jälkeen"
 
 msgid "Remove messages on server when received"
 msgstr "Poista viestit palvelimelta hakemisen jälkeen"
 

-#: src/prefs_account.c:1462
+#: src/prefs_account.c:1483

 msgid "Remove after"
 msgstr "Poista"
 
 msgid "Remove after"
 msgstr "Poista"
 

-#: src/prefs_account.c:1471
+#: src/prefs_account.c:1492

 msgid "0 days: remove immediately"
 msgstr "0 päivän: poistetaan heti"
 
 msgid "0 days: remove immediately"
 msgstr "0 päivän: poistetaan heti"
 

-#: src/prefs_account.c:1475
+#: src/prefs_account.c:1496

 msgid "days"
 msgstr "päivän jälkeen"
 
 msgid "days"
 msgstr "päivän jälkeen"
 

-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1503

 msgid "Download all messages on server"
 msgstr "Lataa kaikki viestit palvelimelta"
 
 msgid "Download all messages on server"
 msgstr "Lataa kaikki viestit palvelimelta"
 

-#: src/prefs_account.c:1488
+#: src/prefs_account.c:1509

 msgid "Receive size limit"
 msgstr "Hakemisen koon yläraja"
 
 msgid "Receive size limit"
 msgstr "Hakemisen koon yläraja"
 

-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1512

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -7547,68 +7976,68 @@ msgstr ""
 "Tätä suuremmat viestit ladataan vain osittain. Kun ne valitaan ne voi ladata "
 "kokonaan tai poistaa."
 
 "Tätä suuremmat viestit ladataan vain osittain. Kun ne valitaan ne voi ladata "
 "kokonaan tai poistaa."
 

-#: src/prefs_account.c:1501
+#: src/prefs_account.c:1522

 msgid "KB"
 msgstr "Kt"
 
 msgid "KB"
 msgstr "Kt"
 

-#: src/prefs_account.c:1535 src/prefs_account.c:2157
+#: src/prefs_account.c:1556 src/prefs_account.c:2179

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1568

 msgid "Maximum number of articles to download"
 msgstr "Ladattavien viestien määrän yläraja"
 
 msgid "Maximum number of articles to download"
 msgstr "Ladattavien viestien määrän yläraja"
 

-#: src/prefs_account.c:1559
+#: src/prefs_account.c:1580

 msgid "unlimited if 0 is specified"
 msgstr "rajoittamaton, jos luku on nolla"
 
 msgid "unlimited if 0 is specified"
 msgstr "rajoittamaton, jos luku on nolla"
 

-#: src/prefs_account.c:1577 src/prefs_account.c:1727
+#: src/prefs_account.c:1598 src/prefs_account.c:1749

 msgid "Authentication method"
 msgstr "Varmennuskeino"
 
 msgid "Authentication method"
 msgstr "Varmennuskeino"
 

-#: src/prefs_account.c:1587 src/prefs_account.c:1737 src/prefs_send.c:273
+#: src/prefs_account.c:1608 src/prefs_account.c:1759 src/prefs_send.c:273

 msgid "Automatic"
 msgstr "Automaattinen"
 
 msgid "Automatic"
 msgstr "Automaattinen"
 

-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1620

 msgid "IMAP server directory"
 msgstr "IMAP-palvelimen hakemisto"
 
 msgid "IMAP server directory"
 msgstr "IMAP-palvelimen hakemisto"
 

-#: src/prefs_account.c:1602
+#: src/prefs_account.c:1624

 msgid "(usually empty)"
 msgstr "(yleensä tyhjä)"
 
 msgid "(usually empty)"
 msgstr "(yleensä tyhjä)"
 

-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1634

 msgid "Filter messages on receiving"
 msgstr "Suodata viestit haettaessa"
 
 msgid "Filter messages on receiving"
 msgstr "Suodata viestit haettaessa"
 

-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1638

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "”Hae kaikki” tarkastaa tämän tilin uudet viestit"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "”Hae kaikki” tarkastaa tämän tilin uudet viestit"
 

-#: src/prefs_account.c:1678 src/prefs_customheader.c:205
+#: src/prefs_account.c:1700 src/prefs_customheader.c:205

 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Otsake"
 
 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Otsake"
 

-#: src/prefs_account.c:1685
+#: src/prefs_account.c:1707

 msgid "Generate Message-ID"
 msgstr "Luo viestin tunniste"
 
 msgid "Generate Message-ID"
 msgstr "Luo viestin tunniste"
 

-#: src/prefs_account.c:1692
+#: src/prefs_account.c:1714

 msgid "Add user-defined header"
 msgstr "Lisää mukautettu otsakekenttä"
 
 msgid "Add user-defined header"
 msgstr "Lisää mukautettu otsakekenttä"
 

-#: src/prefs_account.c:1704
+#: src/prefs_account.c:1726

 msgid "Authentication"
 msgstr "Todennus"
 
 msgid "Authentication"
 msgstr "Todennus"
 

-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1734

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-todennus (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-todennus (SMTP AUTH)"
 

-#: src/prefs_account.c:1788
+#: src/prefs_account.c:1810

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."


@@ -7616,212 +8045,216 @@ msgstr ""
 "Jos nämä kentät jätetään tyhjiksi, käytetään samaa käyttäjätunnusta ja "
 "salasanaa kuin viestejä haettaessa."
 
 "Jos nämä kentät jätetään tyhjiksi, käytetään samaa käyttäjätunnusta ja "
 "salasanaa kuin viestejä haettaessa."
 

-#: src/prefs_account.c:1799
+#: src/prefs_account.c:1821

 msgid "Authenticate with POP3 before sending"
 msgstr "Todenna POP3:lla ennen lähetystä"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Todenna POP3:lla ennen lähetystä"
 

-#: src/prefs_account.c:1814
+#: src/prefs_account.c:1836

 msgid "POP authentication timeout: "
 msgstr "POP-todennuksen aikakatkaisu: "
 
 msgid "POP authentication timeout: "
 msgstr "POP-todennuksen aikakatkaisu: "
 

-#: src/prefs_account.c:1823
+#: src/prefs_account.c:1845

 msgid "minutes"
 msgstr "minuuttia"
 
 msgid "minutes"
 msgstr "minuuttia"
 

-#: src/prefs_account.c:1868 src/prefs_account.c:1919
+#: src/prefs_account.c:1890 src/prefs_account.c:1941

 msgid "Signature"
 msgstr "Allekirjoitus"
 
 msgid "Signature"
 msgstr "Allekirjoitus"
 

-#: src/prefs_account.c:1876
+#: src/prefs_account.c:1898

 msgid "Insert signature automatically"
 msgstr "Lisää allekirjoitus automaattisesti"
 
 msgid "Insert signature automatically"
 msgstr "Lisää allekirjoitus automaattisesti"
 

-#: src/prefs_account.c:1881
+#: src/prefs_account.c:1903

 msgid "Signature separator"
 msgstr "Allekirjoituksen erotin"
 
 msgid "Signature separator"
 msgstr "Allekirjoituksen erotin"
 

-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1928

 msgid "Command output"
 msgstr "Komennon tuloste"
 
 msgid "Command output"
 msgstr "Komennon tuloste"
 

-#: src/prefs_account.c:1939
+#: src/prefs_account.c:1961

 msgid "Automatically set the following addresses"
 msgstr "Aseta seuraavat osoitteet automaattisesti"
 
 msgid "Automatically set the following addresses"
 msgstr "Aseta seuraavat osoitteet automaattisesti"
 

-#: src/prefs_account.c:1948 src/prefs_filtering_action.c:1083
+#: src/prefs_account.c:1970 src/prefs_filtering_action.c:1083

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Kopiot"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Kopiot"
 

-#: src/prefs_account.c:1961 src/prefs_template.c:189
+#: src/prefs_account.c:1983 src/prefs_template.c:189

 msgid "Bcc"
 msgstr "Piilokopiot"
 
 msgid "Bcc"
 msgstr "Piilokopiot"
 

-#: src/prefs_account.c:1974
+#: src/prefs_account.c:1996

 msgid "Reply-To"
 msgstr "Vastausosoite"
 
 msgid "Reply-To"
 msgstr "Vastausosoite"
 

-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2048

 msgid "Default privacy system"
 msgstr "Oletusarvoinen yksityisyysturvajärjestelmä"
 
 msgid "Default privacy system"
 msgstr "Oletusarvoinen yksityisyysturvajärjestelmä"
 

-#: src/prefs_account.c:2035
+#: src/prefs_account.c:2057

 msgid "Always sign messages"
 msgstr "Allekirjoita viestit aina"
 
 msgid "Always sign messages"
 msgstr "Allekirjoita viestit aina"
 

-#: src/prefs_account.c:2037
+#: src/prefs_account.c:2059

 msgid "Always encrypt messages"
 msgstr "Salaa viestit aina"
 
 msgid "Always encrypt messages"
 msgstr "Salaa viestit aina"
 

-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2061

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Salaa viestit oletusarvoisesti vastattaessa salattuun viestiin."
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Salaa viestit oletusarvoisesti vastattaessa salattuun viestiin."
 

-#: src/prefs_account.c:2042
+#: src/prefs_account.c:2064

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Salaa viestit omalla avaimella vastaanottajan lisäksi"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Salaa viestit omalla avaimella vastaanottajan lisäksi"
 

-#: src/prefs_account.c:2044
+#: src/prefs_account.c:2066

 msgid "Save sent encrypted messages as clear text"
 msgstr "Tallenna lähetetyt salatut viestit salaamattomina"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Tallenna lähetetyt salatut viestit salaamattomina"
 

-#: src/prefs_account.c:2131 src/prefs_account.c:2148 src/prefs_account.c:2164
+#: src/prefs_account.c:2153 src/prefs_account.c:2170 src/prefs_account.c:2186

 msgid "Don't use SSL"
 msgstr "Älä käytä SSL:ää"
 
 msgid "Don't use SSL"
 msgstr "Älä käytä SSL:ää"
 

-#: src/prefs_account.c:2134
+#: src/prefs_account.c:2156

 msgid "Use SSL for POP3 connection"
 msgstr "Käytä SSL:ää POP3-yhteydelle"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Käytä SSL:ää POP3-yhteydelle"
 

-#: src/prefs_account.c:2137 src/prefs_account.c:2154 src/prefs_account.c:2189
+#: src/prefs_account.c:2159 src/prefs_account.c:2176 src/prefs_account.c:2211

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Aloita SSL-sessio STARTTLS-komennolla"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Aloita SSL-sessio STARTTLS-komennolla"
 

-#: src/prefs_account.c:2151
+#: src/prefs_account.c:2173

 msgid "Use SSL for IMAP4 connection"
 msgstr "Käytä SSL:ää IMAP4-yhteydelle"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Käytä SSL:ää IMAP4-yhteydelle"
 

-#: src/prefs_account.c:2173
+#: src/prefs_account.c:2195

 msgid "Use SSL for NNTP connection"
 msgstr "Käytä SSL:ää NNTP-yhteydelle"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Käytä SSL:ää NNTP-yhteydelle"
 

-#: src/prefs_account.c:2175
+#: src/prefs_account.c:2197

 msgid "Send (SMTP)"
 msgstr "Lähetys (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Lähetys (SMTP)"
 

-#: src/prefs_account.c:2183
+#: src/prefs_account.c:2205

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Älä käytä SSL:ää (mutta käytä STARTTLS:ää tarvittaessa)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Älä käytä SSL:ää (mutta käytä STARTTLS:ää tarvittaessa)"
 

-#: src/prefs_account.c:2186
+#: src/prefs_account.c:2208

 msgid "Use SSL for SMTP connection"
 msgstr "Käytä SSL:ää SMTP-yhteydelle"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Käytä SSL:ää SMTP-yhteydelle"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2219

 msgid "Use non-blocking SSL"
 msgstr "Käytä blokkaamatonta SSL:ää"
 
 msgid "Use non-blocking SSL"
 msgstr "Käytä blokkaamatonta SSL:ää"
 

-#: src/prefs_account.c:2209
+#: src/prefs_account.c:2231

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Aseta tämä pois päältä jos SSL-yhteydessä on ongelmia"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Aseta tämä pois päältä jos SSL-yhteydessä on ongelmia"
 

-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2357

 msgid "SMTP port"
 msgstr "SMTP-portti"
 
 msgid "SMTP port"
 msgstr "SMTP-portti"
 

-#: src/prefs_account.c:2341
+#: src/prefs_account.c:2363

 msgid "POP3 port"
 msgstr "POP3-portti"
 
 msgid "POP3 port"
 msgstr "POP3-portti"
 

-#: src/prefs_account.c:2347
+#: src/prefs_account.c:2369

 msgid "IMAP4 port"
 msgstr "IMAP4-portti"
 
 msgid "IMAP4 port"
 msgstr "IMAP4-portti"
 

-#: src/prefs_account.c:2353
+#: src/prefs_account.c:2375

 msgid "NNTP port"
 msgstr "NNTP-portti"
 
 msgid "NNTP port"
 msgstr "NNTP-portti"
 

-#: src/prefs_account.c:2358
+#: src/prefs_account.c:2380

 msgid "Domain name"
 msgstr "Verkkotunnus"
 
 msgid "Domain name"
 msgstr "Verkkotunnus"
 

-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2390

 msgid "Use command to communicate with server"
 msgstr "Käytä palvelimen kanssa kommunikointiin komentoa"
 
 msgid "Use command to communicate with server"
 msgstr "Käytä palvelimen kanssa kommunikointiin komentoa"
 

-#: src/prefs_account.c:2376
+#: src/prefs_account.c:2398

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Merkitse yhteislähetetyt viestit luetuiksi ja värillä:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Merkitse yhteislähetetyt viestit luetuiksi ja värillä:"
 

-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2445

 msgid "Browse"
 msgstr "Selaa"
 
 msgid "Browse"
 msgstr "Selaa"
 

-#: src/prefs_account.c:2436
+#: src/prefs_account.c:2458

 msgid "Put sent messages in"
 msgstr "Pane lähetetyt viestit kansioon"
 
 msgid "Put sent messages in"
 msgstr "Pane lähetetyt viestit kansioon"
 

-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2460

 msgid "Put queued messages in"
 msgstr "Pane poistetut viestit kansioon"
 
 msgid "Put queued messages in"
 msgstr "Pane poistetut viestit kansioon"
 

-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2462

 msgid "Put draft messages in"
 msgstr "Pane luonnokset kansioon"
 
 msgid "Put draft messages in"
 msgstr "Pane luonnokset kansioon"
 

-#: src/prefs_account.c:2442
+#: src/prefs_account.c:2464

 msgid "Put deleted messages in"
 msgstr "Pane poistetut viestit kansioon"
 
 msgid "Put deleted messages in"
 msgstr "Pane poistetut viestit kansioon"
 

-#: src/prefs_account.c:2485
+#: src/prefs_account.c:2507

 msgid "Account name is not entered."
 msgstr "Tilin nimeä ei syötetty."
 
 msgid "Account name is not entered."
 msgstr "Tilin nimeä ei syötetty."
 

-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2511

 msgid "Mail address is not entered."
 msgstr "Postiosoitetta ei syötetty."
 
 msgid "Mail address is not entered."
 msgstr "Postiosoitetta ei syötetty."
 

-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2518

 msgid "SMTP server is not entered."
 msgstr "SMTP-palvelinta ei syötetty."
 
 msgid "SMTP server is not entered."
 msgstr "SMTP-palvelinta ei syötetty."
 

-#: src/prefs_account.c:2501
+#: src/prefs_account.c:2523

 msgid "User ID is not entered."
 msgstr "Käyttäjän tunnistetta ei syötetty."
 
 msgid "User ID is not entered."
 msgstr "Käyttäjän tunnistetta ei syötetty."
 

-#: src/prefs_account.c:2506
+#: src/prefs_account.c:2528

 msgid "POP3 server is not entered."
 msgstr "POP3-palvelinta ei syötetty."
 
 msgid "POP3 server is not entered."
 msgstr "POP3-palvelinta ei syötetty."
 

-#: src/prefs_account.c:2511
+#: src/prefs_account.c:2535
+msgid "The default inbox folder doesn't exist."
+msgstr "Oletusjuurikansio inbox puuttuu."
+
+#: src/prefs_account.c:2541

 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-palvelinta ei syötetty."
 
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4-palvelinta ei syötetty."
 

-#: src/prefs_account.c:2516
+#: src/prefs_account.c:2546

 msgid "NNTP server is not entered."
 msgstr "NNTP-palvelinta ei syötetty."
 
 msgid "NNTP server is not entered."
 msgstr "NNTP-palvelinta ei syötetty."
 

-#: src/prefs_account.c:2522
+#: src/prefs_account.c:2552

 msgid "local mailbox filename is not entered."
 msgstr "paikallisen postilaatikon tiedostonimeä ei syötetty."
 
 msgid "local mailbox filename is not entered."
 msgstr "paikallisen postilaatikon tiedostonimeä ei syötetty."
 

-#: src/prefs_account.c:2528
+#: src/prefs_account.c:2558

 msgid "mail command is not entered."
 msgstr "lähetyskomentoa ei syötetty."
 
 msgid "mail command is not entered."
 msgstr "lähetyskomentoa ei syötetty."
 

-#: src/prefs_account.c:2593
+#: src/prefs_account.c:2623

 msgid "Select signature file"
 msgstr "Valitse allekirjoitustiedosto"
 
 msgid "Select signature file"
 msgstr "Valitse allekirjoitustiedosto"
 

-#: src/prefs_account.c:2686
+#: src/prefs_account.c:2716

 msgid "Protocol:"
 msgstr "Käytäntö:"
 
 msgid "Protocol:"
 msgstr "Käytäntö:"
 

-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2869

 #, c-format
 #, c-format

-msgid "Unsupported (%s)"
-msgstr "Ei tuettu (%s)"
+msgid "%s (plugin not loaded)"
+msgstr "%s (liitännäistä lataamatta)"

 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"
 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"


@@ -7836,7 +8269,7 @@ msgid "Command line"
 msgstr "Komentorivi"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
 msgstr "Komentorivi"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493

-#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:259
+#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:270

 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Korvaa"
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Korvaa"


@@ -7849,7 +8282,7 @@ msgstr "Tietoja…"
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811

-#: src/prefs_template.c:355
+#: src/prefs_template.c:367

 msgid "(New)"
 msgstr "(Uusi)"
 
 msgid "(New)"
 msgstr "(Uusi)"
 


@@ -7898,19 +8331,19 @@ msgstr "Poistetaanko tämä toiminto?"
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822

-#: src/prefs_template.c:405 src/prefs_template.c:422
+#: src/prefs_template.c:426 src/prefs_template.c:443

 msgid "Entry not saved"
 msgstr "Kenttää on tallentamatta"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
 msgid "Entry not saved"
 msgstr "Kenttää on tallentamatta"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254

-#: src/prefs_filtering.c:1276 src/prefs_template.c:406
-#: src/prefs_template.c:423
+#: src/prefs_filtering.c:1276 src/prefs_template.c:427
+#: src/prefs_template.c:444

 msgid "The entry was not saved. Close anyway?"
 msgstr "Kenttää ei ole tallennettu, suljetaanko joka tapauksessa?"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
 msgid "The entry was not saved. Close anyway?"
 msgstr "Kenttää ei ole tallennettu, suljetaanko joka tapauksessa?"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824

-#: src/prefs_template.c:407 src/prefs_template.c:424
+#: src/prefs_template.c:428 src/prefs_template.c:445

 msgid "+_Continue editing"
 msgstr "_Jatka muokkausta"
 
 msgid "+_Continue editing"
 msgstr "_Jatka muokkausta"
 


@@ -8008,11 +8441,15 @@ msgstr ""
 msgid "Current actions"
 msgstr "Nykyiset toiminnot"
 
 msgid "Current actions"
 msgstr "Nykyiset toiminnot"
 

-#: src/prefs_common.c:259
+#: src/prefs_common.c:210
+msgid "Hello,\\n"
+msgstr "Hei,\\n"
+
+#: src/prefs_common.c:272

 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "%d\\n%f kirjoitti:\\n\\n%q"
 
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "%d\\n%f kirjoitti:\\n\\n%q"
 

-#: src/prefs_common.c:265
+#: src/prefs_common.c:278

 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"
 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"


@@ -8021,85 +8458,97 @@ msgstr ""
 "{Vastaanottaja: %t\\n}?c{Kopiot: %c\\n}?n{Uutisryhmät: %n\\n}?s?s{Otsikko: %s"
 "\\n}\\n\\n%M"
 
 "{Vastaanottaja: %t\\n}?c{Kopiot: %c\\n}?n{Uutisryhmät: %n\\n}?s?s{Otsikko: %s"
 "\\n}\\n\\n%M"
 

-#: src/prefs_common.c:350
+#: src/prefs_common.c:363

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d.%m.%y %H.%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d.%m.%y %H.%M"
 

-#: src/prefs_compose_writing.c:106
+#: src/prefs_compose_writing.c:124

 msgid "Automatic account selection"
 msgstr "Automaattinen tilin valinta"
 
 msgid "Automatic account selection"
 msgstr "Automaattinen tilin valinta"
 

-#: src/prefs_compose_writing.c:114
+#: src/prefs_compose_writing.c:132

 msgid "when replying"
 msgstr "vastattaessa"
 
 msgid "when replying"
 msgstr "vastattaessa"
 

-#: src/prefs_compose_writing.c:116
+#: src/prefs_compose_writing.c:134

 msgid "when forwarding"
 msgstr "edelleenlähetettäessä"
 
 msgid "when forwarding"
 msgstr "edelleenlähetettäessä"
 

-#: src/prefs_compose_writing.c:118
+#: src/prefs_compose_writing.c:136

 msgid "when re-editing"
 msgstr "uudelleenmuokattaessa"
 
 msgid "when re-editing"
 msgstr "uudelleenmuokattaessa"
 

-#: src/prefs_compose_writing.c:120
+#: src/prefs_compose_writing.c:138

 msgid "Forwarding"
 msgstr "Edelleenlähetys"
 
 msgid "Forwarding"
 msgstr "Edelleenlähetys"
 

-#: src/prefs_compose_writing.c:128 src/prefs_filtering_action.c:160
+#: src/prefs_compose_writing.c:146 src/prefs_filtering_action.c:160

 msgid "Forward as attachment"
 msgstr "Edelleenlähetä liitteenä"
 
 msgid "Forward as attachment"
 msgstr "Edelleenlähetä liitteenä"
 

-#: src/prefs_compose_writing.c:131
+#: src/prefs_compose_writing.c:149

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Säilytä alkuperäinen Lähettäjä-otsake uudelleenohjattaessa"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Säilytä alkuperäinen Lähettäjä-otsake uudelleenohjattaessa"
 

-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:151

 msgid "Editing"
 msgstr "Muokkaus"
 
 msgid "Editing"
 msgstr "Muokkaus"
 

-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:159

 msgid "Automatically launch the external editor"
 msgstr "Käynnistä ulkoinen editori automaattisesti"
 
 msgid "Automatically launch the external editor"
 msgstr "Käynnistä ulkoinen editori automaattisesti"
 

-#: src/prefs_compose_writing.c:148
+#: src/prefs_compose_writing.c:166

 msgid "Autosave message text to Drafts folder every"
 msgstr "Tallenna automaattisesti luonnoksiin joka"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Tallenna automaattisesti luonnoksiin joka"
 

-#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:176 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "merkin välein"
 
 msgid "characters"
 msgstr "merkin välein"
 

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:184

 msgid "Undo level"
 msgstr "Kumoustasot"
 
 msgid "Undo level"
 msgstr "Kumoustasot"
 

-#: src/prefs_compose_writing.c:179
+#: src/prefs_compose_writing.c:197

 msgid "Reply button invokes mailing list reply"
 msgstr "Vastausnappi toimii postituslistavastauksena"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Vastausnappi toimii postituslistavastauksena"
 

-#: src/prefs_compose_writing.c:182
+#: src/prefs_compose_writing.c:200

 msgid "When dropping files into the Compose window"
 msgstr "Kun tiedostoja pudotetaan viestinkirjoitusikkunaan"
 
 msgid "When dropping files into the Compose window"
 msgstr "Kun tiedostoja pudotetaan viestinkirjoitusikkunaan"
 

-#: src/prefs_compose_writing.c:190
-msgid "Ask whether to insert or attach"
-msgstr "Kysy, liitetäänkö vai sisällytetäänkö"
+#: src/prefs_compose_writing.c:208
+msgid "Ask"
+msgstr "Kysy"
+
+#: src/prefs_compose_writing.c:209 src/toolbar.c:456
+msgid "Insert"
+msgstr "Lisää"
+
+#: src/prefs_compose_writing.c:210 src/toolbar.c:457
+msgid "Attach"
+msgstr "Liitä"

 
 

-#: src/prefs_compose_writing.c:191
-msgid "Always insert"
-msgstr "Sisällytä aina"
+#: src/prefs_compose_writing.c:226
+msgid "Use format when composing new messages"
+msgstr "Käytä muotoa kun kirjoitetaan uutta viestiä"

 
 

-#: src/prefs_compose_writing.c:192
-msgid "Always attach"
-msgstr "Liitä aina"
+#: src/prefs_compose_writing.c:228
+msgid "New message format"
+msgstr "Uuden viestin muoto"
+
+#: src/prefs_compose_writing.c:282 src/prefs_quote.c:206
+msgid " Description of symbols... "
+msgstr " Merkintöjen selitykset… "

 
 

-#: src/prefs_compose_writing.c:297 src/prefs_folder_item.c:935
-#: src/prefs_quote.c:285 src/prefs_spelling.c:401 src/prefs_wrapping.c:144
-#: src/toolbar.c:1515
+#: src/prefs_compose_writing.c:402 src/prefs_folder_item.c:1170
+#: src/prefs_quote.c:311 src/prefs_spelling.c:448 src/prefs_wrapping.c:144
+#: src/toolbar.c:1560

 msgid "Compose"
 msgstr "Viestin kirjoitus"
 
 msgid "Compose"
 msgstr "Viestin kirjoitus"
 

-#: src/prefs_compose_writing.c:298
+#: src/prefs_compose_writing.c:403

 msgid "Writing"
 msgstr "Kirjoitetaan"
 
 msgid "Writing"
 msgstr "Kirjoitetaan"
 


@@ -8155,8 +8604,8 @@ msgstr "Kuva ei ole oikeassa muodossa (XBM)."
 #: src/prefs_customheader.c:613
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 #: src/prefs_customheader.c:613
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""

-"Compfacea ei voitu käynnistää. Varmista että se on polkumuuttujan "
-"$PATH varrella"
+"Compfacea ei voitu käynnistää. Varmista että se on polkumuuttujan $PATH "
+"varrella"

 
 #: src/prefs_customheader.c:664
 msgid "This file contains newlines."
 
 #: src/prefs_customheader.c:664
 msgid "This file contains newlines."


@@ -8220,8 +8669,8 @@ 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 ""
 "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 ""

-"Tämä valinta MIME-osien näytön viestinäkymässä skriptin avulla kun "
-"Näytä tekstinä on valittu"
+"Tämä valinta MIME-osien näytön viestinäkymässä skriptin avulla kun Näytä "
+"tekstinä on valittu"

 
 #: src/prefs_ext_prog.c:196
 msgid "Print command"
 
 #: src/prefs_ext_prog.c:196
 msgid "Print command"


@@ -8245,6 +8694,7 @@ msgid "Copy"
 msgstr "Kopioi"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
 msgstr "Kopioi"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79

+#: src/summaryview.c:2366

 msgid "Mark"
 msgstr "Merkitse"
 
 msgid "Mark"
 msgstr "Merkitse"
 


@@ -8264,7 +8714,7 @@ msgstr "Merkitse luetuksi"
 msgid "Mark as unread"
 msgstr "Merkitse lukemattomaksi"
 
 msgid "Mark as unread"
 msgstr "Merkitse lukemattomaksi"
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:398 src/toolbar.c:489
+#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499

 msgid "Forward"
 msgstr "Edelleenlähetä"
 
 msgid "Forward"
 msgstr "Edelleenlähetä"
 


@@ -8273,7 +8723,7 @@ msgid "Redirect"
 msgstr "Uudelleenohjaa"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
 msgstr "Uudelleenohjaa"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429

-#: src/toolbar.c:174 src/toolbar.c:1655
+#: src/toolbar.c:178 src/toolbar.c:1711

 msgid "Execute"
 msgstr "Suorita"
 
 msgid "Execute"
 msgstr "Suorita"
 


@@ -8293,7 +8743,7 @@ msgstr "Aseta pisteet"
 msgid "Hide"
 msgstr "Piilota"
 
 msgid "Hide"
 msgstr "Piilota"
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:177
+#: src/prefs_filtering_action.c:167 src/toolbar.c:181

 msgid "Ignore thread"
 msgstr "Ohita ketju"
 
 msgid "Ignore thread"
 msgstr "Ohita ketju"
 


@@ -8318,7 +8768,7 @@ msgid "Recipient"
 msgstr "Vastaanottaja"
 
 #: src/prefs_filtering_action.c:439 src/prefs_summary_column.c:88
 msgstr "Vastaanottaja"
 
 #: src/prefs_filtering_action.c:439 src/prefs_summary_column.c:88

-#: src/summaryview.c:491
+#: src/summaryview.c:492

 msgid "Score"
 msgstr "Pisteet"
 
 msgid "Score"
 msgstr "Pisteet"
 


@@ -8347,12 +8797,12 @@ msgid "No action was defined."
 msgstr "Toiminto on määrittelemättä"
 
 #: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1865
 msgstr "Toiminto on määrittelemättä"
 
 #: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1865

-#: src/quote_fmt.c:58
+#: src/quote_fmt.c:62

 msgid "literal %"
 msgstr "% sellaisenaan"
 
 #: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1870
 msgid "literal %"
 msgstr "% sellaisenaan"
 
 #: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1870

-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:488
+#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:489

 msgid "Date"
 msgstr "Päiväys"
 
 msgid "Date"
 msgstr "Päiväys"
 


@@ -8403,7 +8853,7 @@ msgstr ""
 "\n"
 "Seuraavia merkintöjä voi käyttää:"
 
 "\n"
 "Seuraavia merkintöjä voi käyttää:"
 

-#: src/prefs_filtering_action.c:1404
+#: src/prefs_filtering_action.c:1408

 msgid "Current action list"
 msgstr "Nykyinen toimintolista"
 
 msgid "Current action list"
 msgstr "Nykyinen toimintolista"
 


@@ -8411,6 +8861,11 @@ msgstr "Nykyinen toimintolista"
 msgid "Filtering/Processing configuration"
 msgstr "Suodatus- ja käsittelyasetukset"
 
 msgid "Filtering/Processing configuration"
 msgstr "Suodatus- ja käsittelyasetukset"
 

+#: src/prefs_filtering.c:250 src/prefs_filtering.c:781
+#: src/prefs_filtering.c:872
+msgid "Filtering Account Menu|All"
+msgstr "Kaikki"
+

 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Ehto"
 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Ehto"


@@ -8451,10 +8906,6 @@ msgstr "Pane päälle"
 msgid "Rule"
 msgstr "Sääntö"
 
 msgid "Rule"
 msgstr "Sääntö"
 

-#: src/prefs_folder_column.c:82
-msgid "Total"
-msgstr "Yhteensä"
-

 #: src/prefs_folder_column.c:205
 msgid "Folder list columns configuration"
 msgstr "Viestiluettelon näyttöasetukset"
 #: src/prefs_folder_column.c:205
 msgid "Folder list columns configuration"
 msgstr "Viestiluettelon näyttöasetukset"


@@ -8471,7 +8922,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Piilotetut kohdat"
 
 msgid "Hidden columns"
 msgstr "Piilotetut kohdat"
 

-#: src/prefs_folder_column.c:280 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:797
+#: src/prefs_summaries.c:943 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Näytetyt kohdat"
 
 msgid "Displayed columns"
 msgstr "Näytetyt kohdat"
 


@@ -8480,7 +8932,17 @@ msgstr "Näytetyt kohdat"
 msgid " Use default "
 msgstr " Käytä oletusta "
 
 msgid " Use default "
 msgstr " Käytä oletusta "
 

-#: src/prefs_folder_item.c:183 src/prefs_folder_item.c:566
+#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:646
+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 ""
+"<i>Näitä asetuksia ei tallenneta tallenneta kansioasetuksiksi, koska "
+"kyseessä on juurikansio. Voit kuitenkin käyttää niitä koko postilaatikon "
+"asetuksina ruksimalla Pätee myös alikansioihin -valinnan.</i>"
+
+#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:658

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -8488,76 +8950,84 @@ msgstr ""
 "Pätee myös\n"
 "alikansioihin"
 
 "Pätee myös\n"
 "alikansioihin"
 

-#: src/prefs_folder_item.c:207
+#: src/prefs_folder_item.c:238

 msgid "Normal"
 msgstr "Normaali"
 
 msgid "Normal"
 msgstr "Normaali"
 

-#: src/prefs_folder_item.c:209
+#: src/prefs_folder_item.c:240

 msgid "Outbox"
 msgstr "Lähtevät"
 
 msgid "Outbox"
 msgstr "Lähtevät"
 

-#: src/prefs_folder_item.c:226
-msgid "Folder type:"
-msgstr "Kansiotyyppi:"
+#: src/prefs_folder_item.c:257
+msgid "Folder type"
+msgstr "Kansiotyyppi"

 
 

-#: src/prefs_folder_item.c:238
-msgid "Simplify Subject RegExp: "
-msgstr "Yksinkertaista otsikon säännöllinen lauseke: "
+#: src/prefs_folder_item.c:269
+msgid "Simplify Subject RegExp"
+msgstr "Yksinkertaista otsikon säännöllinen lauseke"

 
 

-#: src/prefs_folder_item.c:258
-msgid "Folder chmod: "
-msgstr "Kansion käyttöoikeudet: "
+#: src/prefs_folder_item.c:295
+msgid "Test RegExp"
+msgstr "Testaa säännöllinen lauseke"

 
 

-#: src/prefs_folder_item.c:284
-msgid "Folder color: "
-msgstr "Kansion väri: "
+#: src/prefs_folder_item.c:327
+msgid "Folder chmod"
+msgstr "Kansion käyttöoikeudet"

 
 

-#: src/prefs_folder_item.c:298 src/prefs_folder_item.c:906
+#: src/prefs_folder_item.c:353
+msgid "Folder color"
+msgstr "Kansion väri"
+
+#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1045

 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Valitse uusi väri kansiolle"
 
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Valitse uusi väri kansiolle"
 

-#: src/prefs_folder_item.c:315
+#: src/prefs_folder_item.c:384

 msgid "Process at startup"
 msgstr "Käsittely käynnistyksessä"
 
 msgid "Process at startup"
 msgstr "Käsittely käynnistyksessä"
 

-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:398

 msgid "Scan for new mail"
 msgstr "Lue uusien viestien varalta"
 
 msgid "Scan for new mail"
 msgstr "Lue uusien viestien varalta"
 

-#: src/prefs_folder_item.c:342
+#: src/prefs_folder_item.c:411

 msgid "Synchronise for offline use"
 msgstr "Ajantasaista yhteydetöntä käyttöä varten"
 
 msgid "Synchronise for offline use"
 msgstr "Ajantasaista yhteydetöntä käyttöä varten"
 

-#: src/prefs_folder_item.c:575
+#: src/prefs_folder_item.c:667

 msgid "Request Return Receipt"
 msgstr "Pyydä saapumisilmoitus"
 
 msgid "Request Return Receipt"
 msgstr "Pyydä saapumisilmoitus"
 

-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:682

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Ota kopiot lähtevistä viesteistä tähän kansioon lähettetyjen sijaan"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Ota kopiot lähtevistä viesteistä tähän kansioon lähettetyjen sijaan"
 

-#: src/prefs_folder_item.c:603
+#: src/prefs_folder_item.c:695

 msgid "Default To: "
 msgstr "Oletusarvoinen vastaanottaja: "
 
 msgid "Default To: "
 msgstr "Oletusarvoinen vastaanottaja: "
 

-#: src/prefs_folder_item.c:623
+#: src/prefs_folder_item.c:716

 msgid "Default To for replies: "
 msgstr "Oletusarvoinen vastaanottaja vastauksissa: "
 
 msgid "Default To for replies: "
 msgstr "Oletusarvoinen vastaanottaja vastauksissa: "
 

-#: src/prefs_folder_item.c:643
+#: src/prefs_folder_item.c:737

 msgid "Default account: "
 msgstr "Oletustili: "
 
 msgid "Default account: "
 msgstr "Oletustili: "
 

-#: src/prefs_folder_item.c:694
+#: src/prefs_folder_item.c:788

 msgid "Default dictionary: "
 msgstr "Oletussanakirja: "
 
 msgid "Default dictionary: "
 msgstr "Oletussanakirja: "
 

-#: src/prefs_folder_item.c:918
+#: src/prefs_folder_item.c:821
+msgid "Default alternate dictionary: "
+msgstr "Oletusvaihtoehtosanakirja: "
+
+#: src/prefs_folder_item.c:1153

 msgid "General"
 msgstr "Yleiset"
 
 msgid "General"
 msgstr "Yleiset"
 

-#: src/prefs_folder_item.c:961
+#: src/prefs_folder_item.c:1198

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Kansion %s asetukset"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Kansion %s asetukset"


@@ -8578,7 +9048,7 @@ msgstr "Käytä eri fonttia tulostamiseen"
 msgid "Message Printing"
 msgstr "Viestin tulostaminen"
 
 msgid "Message Printing"
 msgstr "Viestin tulostaminen"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1078

 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Näyttö"
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Näyttö"


@@ -8587,7 +9057,7 @@ msgstr "Näyttö"
 msgid "Fonts"
 msgstr "Fontit"
 
 msgid "Fonts"
 msgstr "Fontit"
 

-#: src/prefs_gtk.c:871
+#: src/prefs_gtk.c:908

 msgid "Preferences"
 msgstr "Asetukset"
 
 msgid "Preferences"
 msgstr "Asetukset"
 


@@ -8798,8 +9268,8 @@ msgid ""
 msgstr ""
 "Osoitekirja-kansiopolkua ei ole asetettu.\n"
 "\n"
 msgstr ""
 "Osoitekirja-kansiopolkua ei ole asetettu.\n"
 "\n"

-"Jos haluat täsmätä kohteen %s koko osoitekirjaan, valitse "
-"Mikä tahansa osoitekirja-kansiopudotusvalikosta."
+"Jos haluat täsmätä kohteen %s koko osoitekirjaan, valitse Mikä tahansa "
+"osoitekirja-kansiopudotusvalikosta."

 
 #: src/prefs_matcher.c:1823
 msgid ""
 
 #: src/prefs_matcher.c:1823
 msgid ""


@@ -8979,7 +9449,7 @@ msgstr "Valitse väri allekirjoituksille"
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 
 msgid "Signatures"
 msgstr "Allekirjoitukset"
 

-#: src/prefs_msg_colors.c:376
+#: src/prefs_msg_colors.c:376 src/prefs_summaries.c:761

 msgid "Folder list"
 msgstr "Kansioluettelo"
 
 msgid "Folder list"
 msgstr "Kansioluettelo"
 


@@ -9011,8 +9481,8 @@ msgstr "Värimerkinnät"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format

-msgid "Pick color for 'color %d'"
-msgstr "Valitse väri 'color %d'"
+msgid "Tooltip|Pick color for 'color %d'"
+msgstr "Valitse väri säännölle 'color %d'"

 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated


@@ -9025,8 +9495,8 @@ msgstr "Valitse nimiö väri 'color %d'"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format

-msgid "Pick color for 'color %d' "
-msgstr "Valitse väri 'color %d' "
+msgid "Dialog title|Pick color for 'color %d'"
+msgstr "Säännön 'color %d' väri"

 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "
 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "


@@ -9120,115 +9590,107 @@ msgstr "Pistokkeen tietoliikenteen aikakatkaisu"
 msgid "Never send Return Receipts"
 msgstr "Älä lähetä saapumisilmoituksia"
 
 msgid "Never send Return Receipts"
 msgstr "Älä lähetä saapumisilmoituksia"
 

-#: src/prefs_quote.c:90
+#: src/prefs_quote.c:92

 msgid "Reply will quote by default"
 msgstr "Vastaaminen lainaa oletusarvoisesti"
 
 msgid "Reply will quote by default"
 msgstr "Vastaaminen lainaa oletusarvoisesti"
 

-#: src/prefs_quote.c:92
+#: src/prefs_quote.c:94

 msgid "Reply format"
 msgstr "Vastauksen muoto"
 
 msgid "Reply format"
 msgstr "Vastauksen muoto"
 

-#: src/prefs_quote.c:107 src/prefs_quote.c:149
+#: src/prefs_quote.c:109 src/prefs_quote.c:161

 msgid "Quotation mark"
 msgstr "Lainauksen merkintä"
 
 msgid "Quotation mark"
 msgstr "Lainauksen merkintä"
 

-#: src/prefs_quote.c:134
+#: src/prefs_quote.c:146

 msgid "Forward format"
 msgstr "Edelleenlähetyksen muoto"
 
 msgid "Forward format"
 msgstr "Edelleenlähetyksen muoto"
 

-#: src/prefs_quote.c:184
-msgid " Description of symbols... "
-msgstr " Merkintöjen selitykset… "
-
-#: src/prefs_quote.c:193
+#: src/prefs_quote.c:215

 msgid "Quotation characters"
 msgstr "Lainausmerkinnät"
 
 msgid "Quotation characters"
 msgstr "Lainausmerkinnät"
 

-#: src/prefs_quote.c:208
+#: src/prefs_quote.c:230

 msgid "Treat these characters as quotation marks: "
 msgstr "Käsittele nämä merkit lainauksen merkintöinä: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Käsittele nämä merkit lainauksen merkintöinä: "
 

-#: src/prefs_quote.c:286
+#: src/prefs_quote.c:312

 msgid "Quoting"
 msgstr "Lainaukset"
 
 msgid "Quoting"
 msgstr "Lainaukset"
 

-#: src/prefs_receive.c:122
+#: src/prefs_receive.c:121

 msgid "External incorporation program"
 msgstr "Ulkoinen komento"
 
 msgid "External incorporation program"
 msgstr "Ulkoinen komento"
 

-#: src/prefs_receive.c:129
+#: src/prefs_receive.c:128

 msgid "Use external program for receiving mail"
 msgstr "Käytä ulkoista ohjelmaa hakuun"
 
 msgid "Use external program for receiving mail"
 msgstr "Käytä ulkoista ohjelmaa hakuun"
 

-#: src/prefs_receive.c:136
+#: src/prefs_receive.c:135

 msgid "Command"
 msgstr "Komento"
 
 msgid "Command"
 msgstr "Komento"
 

-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:144

 msgid "Automatic checking"
 msgstr "Automaattinen haku"
 
 msgid "Automatic checking"
 msgstr "Automaattinen haku"
 

-#: src/prefs_receive.c:156
-msgid "Automatically check for new mail"
-msgstr "Hae uudet viestit automaattisesti"
-
-#: src/prefs_receive.c:158
-msgid "every"
-msgstr "joka"
+#: src/prefs_receive.c:155
+msgid "Automatically check for new mail every"
+msgstr "Hae uudet viestit automaattisesti joka"

 
 

-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:173

 msgid "Check for new mail on startup"
 msgstr "Hae uudet viestit käynnistyessä"
 
 msgid "Check for new mail on startup"
 msgstr "Hae uudet viestit käynnistyessä"
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:176

 msgid "Dialogs"
 msgstr "Ikkunat"
 
 msgid "Dialogs"
 msgstr "Ikkunat"
 

-#: src/prefs_receive.c:188
+#: src/prefs_receive.c:182

 msgid "Show receive dialog"
 msgstr "Näytä hakuikkuna"
 
 msgid "Show receive dialog"
 msgstr "Näytä hakuikkuna"
 

-#: src/prefs_receive.c:196 src/prefs_send.c:169 src/prefs_summaries.c:958
+#: src/prefs_receive.c:190 src/prefs_send.c:169 src/prefs_summaries.c:855

 msgid "Always"
 msgstr "Aina"
 
 msgid "Always"
 msgstr "Aina"
 

-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:191

 msgid "Only on manual receiving"
 msgstr "Vain kun haku on käynnistetty käsin"
 
 msgid "Only on manual receiving"
 msgstr "Vain kun haku on käynnistetty käsin"
 

-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:205

 msgid "Close receive dialog when finished"
 msgstr "Sulje hakuikkuna kun viestit on haettu"
 
 msgid "Close receive dialog when finished"
 msgstr "Sulje hakuikkuna kun viestit on haettu"
 

-#: src/prefs_receive.c:214
+#: src/prefs_receive.c:208

 msgid "Don't popup error dialog on receive error"
 msgstr "Älä avaa virheikkunaa saantivirheille"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Älä avaa virheikkunaa saantivirheille"
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:210

 msgid "After receiving new mail"
 msgstr "Uusien viestien tultua"
 
 msgid "After receiving new mail"
 msgstr "Uusien viestien tultua"
 

-#: src/prefs_receive.c:222
+#: src/prefs_receive.c:216

 msgid "Go to inbox"
 msgstr "Mene saapuneisiin"
 
 msgid "Go to inbox"
 msgstr "Mene saapuneisiin"
 

-#: src/prefs_receive.c:224
+#: src/prefs_receive.c:218

 msgid "Update all local folders"
 msgstr "Päivitä kaikki paikalliset kansiot"
 
 msgid "Update all local folders"
 msgstr "Päivitä kaikki paikalliset kansiot"
 

-#: src/prefs_receive.c:226
+#: src/prefs_receive.c:220

 msgid "Run command"
 msgstr "Suorita komento"
 
 msgid "Run command"
 msgstr "Suorita komento"
 

-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:229

 msgid "after automatic check"
 msgstr "automaattisen tarkastuksen jälkeen"
 
 msgid "after automatic check"
 msgstr "automaattisen tarkastuksen jälkeen"
 

-#: src/prefs_receive.c:237
+#: src/prefs_receive.c:231

 msgid "after manual check"
 msgstr "käsin tarkastuksen jälkeen"
 
 msgid "after manual check"
 msgstr "käsin tarkastuksen jälkeen"
 

-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:239

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -9237,11 +9699,11 @@ msgstr ""
 "Suoritettava komento:\n"
 "(%d on uusien viestien määrä)"
 
 "Suoritettava komento:\n"
 "(%d on uusien viestien määrä)"
 

-#: src/prefs_receive.c:371 src/prefs_send.c:337
+#: src/prefs_receive.c:365 src/prefs_send.c:337

 msgid "Mail Handling"
 msgstr "Viestien käsittely"
 
 msgid "Mail Handling"
 msgstr "Viestien käsittely"
 

-#: src/prefs_receive.c:372
+#: src/prefs_receive.c:366

 msgid "Receiving"
 msgstr "Viestien vastaanotto"
 
 msgid "Receiving"
 msgstr "Viestien vastaanotto"
 


@@ -9402,165 +9864,173 @@ msgstr ""
 msgid "Sending"
 msgstr "Lähetetään"
 
 msgid "Sending"
 msgstr "Lähetetään"
 

-#: src/prefs_spelling.c:105
+#: src/prefs_spelling.c:91

 msgid "Select dictionaries location"
 msgstr "Valitse sanakirjojen sijainti"
 
 msgid "Select dictionaries location"
 msgstr "Valitse sanakirjojen sijainti"
 

-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:126

 msgid "Pick color for misspelled word"
 msgstr "Valitse väri väärinkirjoitetulle sanalle"
 
 msgid "Pick color for misspelled word"
 msgstr "Valitse väri väärinkirjoitetulle sanalle"
 

-#: src/prefs_spelling.c:186
+#: src/prefs_spelling.c:183

 msgid "Enable spell checker"
 msgstr "Käytä oikolukua"
 
 msgid "Enable spell checker"
 msgstr "Käytä oikolukua"
 

-#: src/prefs_spelling.c:191
+#: src/prefs_spelling.c:188

 msgid "Enable alternate dictionary"
 msgstr "Käytä vaihtoehtoista sanakirjaa"
 
 msgid "Enable alternate dictionary"
 msgstr "Käytä vaihtoehtoista sanakirjaa"
 

-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194

 msgid "Faster switching with last used dictionary"
 msgstr "Nopea vaihtaminen viimeksi käytettyyn sanakirjaan"
 
 msgid "Faster switching with last used dictionary"
 msgstr "Nopea vaihtaminen viimeksi käytettyyn sanakirjaan"
 

-#: src/prefs_spelling.c:199
+#: src/prefs_spelling.c:196

 msgid "Path to dictionaries"
 msgstr "Sanakirjahakemisto:"
 
 msgid "Path to dictionaries"
 msgstr "Sanakirjahakemisto:"
 

-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:211

 msgid "Automatic spelling"
 msgstr "Automaattinen oikoluku"
 
 msgid "Automatic spelling"
 msgstr "Automaattinen oikoluku"
 

-#: src/prefs_spelling.c:226
+#: src/prefs_spelling.c:223

 msgid "Re-check message when changing dictionary"
 msgstr "Uudelleentarkasta sanakirjan vaihduttua"
 
 msgid "Re-check message when changing dictionary"
 msgstr "Uudelleentarkasta sanakirjan vaihduttua"
 

-#: src/prefs_spelling.c:230
+#: src/prefs_spelling.c:227

 msgid "Dictionary"
 msgstr "Sanakirja"
 
 msgid "Dictionary"
 msgstr "Sanakirja"
 

-#: src/prefs_spelling.c:243
+#: src/prefs_spelling.c:240

 msgid "Default dictionary"
 msgstr "Oletussanakirja"
 
 msgid "Default dictionary"
 msgstr "Oletussanakirja"
 

-#: src/prefs_spelling.c:261
+#: src/prefs_spelling.c:258
+msgid "Default alternate dictionary"
+msgstr "Oletusvaihtoehtosanakirja"
+
+#: src/prefs_spelling.c:277
+msgid "Check with both dictionaries"
+msgstr "Tarkista molemmilla sanakirjoilla"
+
+#: src/prefs_spelling.c:283

 msgid "Default suggestion mode"
 msgstr "Oletusehdotustila"
 
 msgid "Default suggestion mode"
 msgstr "Oletusehdotustila"
 

-#: src/prefs_spelling.c:283
+#: src/prefs_spelling.c:305

 msgid "Misspelled word color"
 msgstr "Väärinkirjoitetun sanan väri"
 
 msgid "Misspelled word color"
 msgstr "Väärinkirjoitetun sanan väri"
 

-#: src/prefs_spelling.c:297
+#: src/prefs_spelling.c:319

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Valitse väri väärinkirjoitetulle sanalle. Musta alleviivaa"
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Valitse väri väärinkirjoitetulle sanalle. Musta alleviivaa"
 

-#: src/prefs_spelling.c:402
+#: src/prefs_spelling.c:449

 msgid "Spell Checking"
 msgstr "Oikoluku"
 
 msgid "Spell Checking"
 msgstr "Oikoluku"
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr "täysimittainen lyhennetty viikonpäivän nimi"
 
 msgid "the full abbreviated weekday name"
 msgstr "täysimittainen lyhennetty viikonpäivän nimi"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr "täysimittainen viikonpäivän nimi"
 
 msgid "the full weekday name"
 msgstr "täysimittainen viikonpäivän nimi"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr "lyhennetty kuukauden nimi"
 
 msgid "the abbreviated month name"
 msgstr "lyhennetty kuukauden nimi"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr "täysimittainen kuukauden nimi"
 
 msgid "the full month name"
 msgstr "täysimittainen kuukauden nimi"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr "käytetyn localen suositeltu päiväysmuoto"
 
 msgid "the preferred date and time for the current locale"
 msgstr "käytetyn localen suositeltu päiväysmuoto"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr "vuosisatalukema (vuosi/100)"
 
 msgid "the century number (year/100)"
 msgstr "vuosisatalukema (vuosi/100)"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr "kuukaudenpäivä desimaalilukuna"
 
 msgid "the day of the month as a decimal number"
 msgstr "kuukaudenpäivä desimaalilukuna"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "tunnit desimaalilukuna 24-tuntisen kellon mukaan"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "tunnit desimaalilukuna 24-tuntisen kellon mukaan"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "tunnit desimaalilukuna 12-tuntisen kellon mukaan"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "tunnit desimaalilukuna 12-tuntisen kellon mukaan"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr "vuodenpäivä desimaalilukuna"
 
 msgid "the day of the year as a decimal number"
 msgstr "vuodenpäivä desimaalilukuna"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr "kuukausi desimaalilukuna"
 
 msgid "the month as a decimal number"
 msgstr "kuukausi desimaalilukuna"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr "minuutti desimaalilukuna"
 
 # kotoistus.org
 msgid "the minute as a decimal number"
 msgstr "minuutti desimaalilukuna"
 
 # kotoistus.org

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr "vuorokaudenaikatunniste (ap. tai ip.)"
 
 msgid "either AM or PM"
 msgstr "vuorokaudenaikatunniste (ap. tai ip.)"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr "sekunnit desimaalilukuna"
 
 msgid "the second as a decimal number"
 msgstr "sekunnit desimaalilukuna"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr "viikonpäivä desimaalilukuna"
 
 msgid "the day of the week as a decimal number"
 msgstr "viikonpäivä desimaalilukuna"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr "päivämäärä localen suositellussa muodossa"
 
 msgid "the preferred date for the current locale"
 msgstr "päivämäärä localen suositellussa muodossa"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr "vuosiluvun kaksi viimeistä numeroa"
 
 msgid "the last two digits of a year"
 msgstr "vuosiluvun kaksi viimeistä numeroa"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr "vuosi desimaalilukuna"
 
 msgid "the year as a decimal number"
 msgstr "vuosi desimaalilukuna"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr "aikavyöhykkeen nimi tai lyhenne"
 
 msgid "the time zone or name or abbreviation"
 msgstr "aikavyöhykkeen nimi tai lyhenne"
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
+#: src/prefs_summaries.c:911

 msgid "Date format"
 msgstr "Päiväyksen muoto"
 
 msgid "Date format"
 msgstr "Päiväyksen muoto"
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr "Määritys"
 
 msgid "Specifier"
 msgstr "Määritys"
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr "Esimerkki"
 
 msgid "Example"
 msgstr "Esimerkki"
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Select key bindings"
 msgstr " Aseta näppäintoiminnot"
 
 msgid "Select key bindings"
 msgstr " Aseta näppäintoiminnot"
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr "Valitse asetusto:"
 
 msgid "Select preset:"
 msgstr "Valitse asetusto:"
 

-#: src/prefs_summaries.c:352 src/prefs_summaries.c:699
+#: src/prefs_summaries.c:353 src/prefs_summaries.c:700

 msgid "Old Sylpheed"
 msgstr "Vanha Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Vanha Sylpheed"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:361

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."


@@ -9568,125 +10038,125 @@ msgstr ""
 "Jokaista valikko-oikopolkua voi myös muuttaa painamalla\n"
 "mitä tahansa näppäimiä pohjassa kun asettaa hiiren osoittimen sen päälle."
 
 "Jokaista valikko-oikopolkua voi myös muuttaa painamalla\n"
 "mitä tahansa näppäimiä pohjassa kun asettaa hiiren osoittimen sen päälle."
 

-#: src/prefs_summaries.c:767
-msgid "Translate header names"
-msgstr "Suomenna otsakkeiden nimet"
-
-#: src/prefs_summaries.c:769
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr "Näyttää standardiotsakkeet (Lähettäjä, Aihe, jne.) suomeksi."
-
-#: src/prefs_summaries.c:773
+#: src/prefs_summaries.c:768

 msgid "Display unread number next to folder name"
 msgstr "Näytä lukemattomien viestien määrä kansionimen vieressä"
 
 msgid "Display unread number next to folder name"
 msgstr "Näytä lukemattomien viestien määrä kansionimen vieressä"
 

-#: src/prefs_summaries.c:780
+#: src/prefs_summaries.c:775

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Lyhennä keskusteluryhmien nimet, jotka ovat pidempiä kuin"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Lyhennä keskusteluryhmien nimet, jotka ovat pidempiä kuin"
 

-#: src/prefs_summaries.c:794
+#: src/prefs_summaries.c:789

 msgid "letters"
 msgstr "merkkiä"
 
 #: src/prefs_summaries.c:807
 msgid "letters"
 msgstr "merkkiä"
 
 #: src/prefs_summaries.c:807

-msgid "Display sender using address book"
-msgstr "Näytä lähettäjän nimi osoitekirjasta"
-
-#: src/prefs_summaries.c:810
-msgid "Thread using subject in addition to standard headers"
-msgstr "Käytä otsikkoa standardiotsakkeiden lisäksi säikeistettäessä"
-
-#: src/prefs_summaries.c:833
-msgid "Date format help"
-msgstr "Päiväyksen muodon ohje"
-
-#: src/prefs_summaries.c:837
-msgid "Set displayed columns"
-msgstr "Valitse näytettävät tiedot"
-
-#: src/prefs_summaries.c:845
-msgid " Folder list... "
-msgstr " kansioluettelossa…"
-
-#: src/prefs_summaries.c:853
-msgid " Message list... "
-msgstr " viestiluettelossa…"
-
-#: src/prefs_summaries.c:874
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Suorita heti kun siirretään tai poistetaan viestejä"
-
-#: src/prefs_summaries.c:876
-msgid "Messages will be marked until execution if this is turned off"
-msgstr "Viestit merkitään suorittamista odottaessaan, jos tämä on pois päältä"
-
-#: src/prefs_summaries.c:882
-msgid "Confirm before marking all mails in a folder as read"
-msgstr "Vahvista ennen kuin merkitään kaikki kansion viestit luetuiksi"
-
-#: src/prefs_summaries.c:886
-msgid "Always open message when selected"
-msgstr "Avaa viestit aina kun ne on valittu"
-
-#: src/prefs_summaries.c:890
-msgid "Only mark message as read when opened in a new window"
-msgstr "Merkitse viestit luetuksi vain, jos ne avataan uudessa ikkunassa"
+msgid "Message list"
+msgstr "Viestiluettelo"

 
 

-#: src/prefs_summaries.c:903
+#: src/prefs_summaries.c:817

 msgid "When entering a folder"
 msgstr "Kansiota avattaessa"
 
 msgid "When entering a folder"
 msgstr "Kansiota avattaessa"
 

-#: src/prefs_summaries.c:919
+#: src/prefs_summaries.c:825

 msgid "Do nothing"
 msgstr "Älä tee mitään"
 
 msgid "Do nothing"
 msgstr "Älä tee mitään"
 

-#: src/prefs_summaries.c:920
+#: src/prefs_summaries.c:826

 msgid "Select first unread (or new or marked) message"
 msgstr "Valitse ensimmäinen lukematon (tai uusi tai merkitty) viesti"
 
 msgid "Select first unread (or new or marked) message"
 msgstr "Valitse ensimmäinen lukematon (tai uusi tai merkitty) viesti"
 

-#: src/prefs_summaries.c:922
+#: src/prefs_summaries.c:828

 msgid "Select first unread (or marked or new) message"
 msgstr "Valitse ensimmäinen lukematon (tai merkitty tai uusi) viesti"
 
 msgid "Select first unread (or marked or new) message"
 msgstr "Valitse ensimmäinen lukematon (tai merkitty tai uusi) viesti"
 

-#: src/prefs_summaries.c:924
+#: src/prefs_summaries.c:830

 msgid "Select first new (or unread or marked) message"
 msgstr "Valitse ensimmäinen uusi (tai lukematon tai merkitty) viesti"
 
 msgid "Select first new (or unread or marked) message"
 msgstr "Valitse ensimmäinen uusi (tai lukematon tai merkitty) viesti"
 

-#: src/prefs_summaries.c:926
+#: src/prefs_summaries.c:832

 msgid "Select first new (or marked or unread) message"
 msgstr "Valitse ensimmäinen uusi (tai merkitty tai lukematon) viesti"
 
 msgid "Select first new (or marked or unread) message"
 msgstr "Valitse ensimmäinen uusi (tai merkitty tai lukematon) viesti"
 

-#: src/prefs_summaries.c:928
+#: src/prefs_summaries.c:834

 msgid "Select first marked (or new or unread) message"
 msgstr "Valitse ensimmäinen merkitty (tai uusi tai lukematon) viesti"
 
 msgid "Select first marked (or new or unread) message"
 msgstr "Valitse ensimmäinen merkitty (tai uusi tai lukematon) viesti"
 

-#: src/prefs_summaries.c:930
+#: src/prefs_summaries.c:836

 msgid "Select first marked (or unread or new) message"
 msgstr "Valitse ensimmäinen merkitty (tai lukematon tai uusi) viesti"
 
 msgid "Select first marked (or unread or new) message"
 msgstr "Valitse ensimmäinen merkitty (tai lukematon tai uusi) viesti"
 

-#: src/prefs_summaries.c:942
+#: src/prefs_summaries.c:847

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Näytä ”Ei enää lukemattomia (tai uusia) viestejä”-ikkuna"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Näytä ”Ei enää lukemattomia (tai uusia) viestejä”-ikkuna"
 

-#: src/prefs_summaries.c:959
+#: src/prefs_summaries.c:856

 msgid "Assume 'Yes'"
 msgstr "Oletusarvona Kyllä"
 
 msgid "Assume 'Yes'"
 msgstr "Oletusarvona Kyllä"
 

-#: src/prefs_summaries.c:961
+#: src/prefs_summaries.c:858

 msgid "Assume 'No'"
 msgstr "Oletusarvona Ei"
 
 msgid "Assume 'No'"
 msgstr "Oletusarvona Ei"
 

-#: src/prefs_summaries.c:970
+#: src/prefs_summaries.c:866
+msgid "Always open message when selected"
+msgstr "Avaa viestit aina kun ne on valittu"
+
+#: src/prefs_summaries.c:869
+msgid "Thread using subject in addition to standard headers"
+msgstr "Käytä otsikkoa standardiotsakkeiden lisäksi säikeistettäessä"
+
+#: src/prefs_summaries.c:875
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Suorita heti kun siirretään tai poistetaan viestejä"
+
+#: src/prefs_summaries.c:877
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr ""
+"Siirtäminen, kopioiminen ja poistaminen toteutetaan vasta valinnalla "
+"Työkalut→Suorita"
+
+#: src/prefs_summaries.c:882
+msgid "Only mark message as read when opened in a new window"
+msgstr "Merkitse viestit luetuksi vain, jos ne avataan uudessa ikkunassa"
+
+#: src/prefs_summaries.c:889
+msgid "Mark messages as read after"
+msgstr "Merkitse luetuksi kun aikaa on kulunut"
+
+#: src/prefs_summaries.c:905
+msgid "Display sender using address book"
+msgstr "Näytä lähettäjän nimi osoitekirjasta"
+
+#: src/prefs_summaries.c:937
+msgid "Date format help"
+msgstr "Päiväyksen muodon ohje"
+
+#: src/prefs_summaries.c:955
+msgid "Confirm before marking all mails in a folder as read"
+msgstr "Vahvista ennen kuin merkitään kaikki kansion viestit luetuiksi"
+
+#: src/prefs_summaries.c:958
+msgid "Translate header names"
+msgstr "Suomenna otsakkeiden nimet"
+
+#: src/prefs_summaries.c:960
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr "Näyttää standardiotsakkeet (Lähettäjä, Aihe, jne.) suomeksi."
+
+#: src/prefs_summaries.c:967

 msgid " Set key bindings... "
 msgstr " Aseta näppäintoiminnot…"
 
 msgid " Set key bindings... "
 msgstr " Aseta näppäintoiminnot…"
 

-#: src/prefs_summaries.c:1077
+#: src/prefs_summaries.c:1079

 msgid "Summaries"
 msgstr "Yhteenvetonäkymä"
 
 msgid "Summaries"
 msgstr "Yhteenvetonäkymä"
 

-#: src/prefs_summary_column.c:81
+#: src/prefs_summary_column.c:81 src/summaryview.c:2360

 msgid "Attachment"
 msgstr "Liite"
 
 msgid "Attachment"
 msgstr "Liite"
 


@@ -9710,35 +10180,31 @@ msgstr ""
 msgid "This name is used as the Menu item"
 msgstr "Tämä nimi on käytössä valikkokohtana."
 
 msgid "This name is used as the Menu item"
 msgstr "Tämä nimi on käytössä valikkokohtana."
 

-#: src/prefs_template.c:275
+#: src/prefs_template.c:286

 msgid " Symbols... "
 msgstr " Merkinnät… "
 
 msgid " Symbols... "
 msgstr " Merkinnät… "
 

-#: src/prefs_template.c:304
+#: src/prefs_template.c:315

 msgid "Template configuration"
 msgstr "Mallineasetukset"
 
 msgid "Template configuration"
 msgstr "Mallineasetukset"
 

-#: src/prefs_template.c:515
-msgid "Template format error."
-msgstr "Mallineen muotovirhe."
-
-#: src/prefs_template.c:525
+#: src/prefs_template.c:557

 msgid "Template name is not set."
 msgstr "Otsakkeen nimi on asettamatta."
 
 msgid "Template name is not set."
 msgstr "Otsakkeen nimi on asettamatta."
 

-#: src/prefs_template.c:614
+#: src/prefs_template.c:667

 msgid "Delete template"
 msgstr "Poista malline"
 
 msgid "Delete template"
 msgstr "Poista malline"
 

-#: src/prefs_template.c:615
+#: src/prefs_template.c:668

 msgid "Do you really want to delete this template?"
 msgstr "Poistetaanko tämä malline?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Poistetaanko tämä malline?"
 

-#: src/prefs_template.c:752
+#: src/prefs_template.c:805

 msgid "Current templates"
 msgstr "Nykyiset mallineet"
 
 msgid "Current templates"
 msgstr "Nykyiset mallineet"
 

-#: src/prefs_template.c:777
+#: src/prefs_template.c:830

 msgid "Template"
 msgstr "Malline"
 
 msgid "Template"
 msgstr "Malline"
 


@@ -9840,10 +10306,6 @@ msgstr ""
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d teemaa saatavilla (%d käyttäjän, %d järjstelmäteemaa ja 1 sisäinen)"
 
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d teemaa saatavilla (%d käyttäjän, %d järjstelmäteemaa ja 1 sisäinen)"
 

-#: src/prefs_themes.c:706
-msgid "The Sylpheed-Claws Team"
-msgstr "Sylpheed-Claws-tiimi"
-

 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"


@@ -9854,7 +10316,7 @@ msgid "No info file available for this theme"
 msgstr "Tässä teemassa ei ole info-tiedostoa"
 
 #: src/prefs_themes.c:732
 msgstr "Tässä teemassa ei ole info-tiedostoa"
 
 #: src/prefs_themes.c:732

-msgid "Error: can't get theme status"
+msgid "Error: couldn't get theme status"

 msgstr "Virhe: teeman tilaa ei voi lukea"
 
 #: src/prefs_themes.c:756
 msgstr "Virhe: teeman tilaa ei voi lukea"
 
 #: src/prefs_themes.c:756


@@ -9919,8 +10381,8 @@ msgid "Message view toolbar configuration"
 msgstr "Viestinkatselutyökalupalkin asetukset"
 
 #: src/prefs_toolbar.c:643
 msgstr "Viestinkatselutyökalupalkin asetukset"
 
 #: src/prefs_toolbar.c:643

-msgid "Sylpheed-Claws Action"
-msgstr "Sylpheed-Clawsin toiminto"
+msgid "Claws Mail Action"
+msgstr "Claws Mailin toiminto"

 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"
 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"


@@ -9990,10 +10452,6 @@ msgstr "Rivitys"
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 

-#: src/privacy.c:211 src/privacy.c:215 src/privacy.c:232 src/privacy.c:236
-msgid "No signature found"
-msgstr "Ei allekirjoitusta"
-

 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Ei tietoja saatavilla"
 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Ei tietoja saatavilla"


@@ -10002,70 +10460,65 @@ msgstr "Ei tietoja saatavilla"
 msgid "No recipient keys defined."
 msgstr "Vastaanottaja-avaimia ei ole määritelty"
 
 msgid "No recipient keys defined."
 msgstr "Vastaanottaja-avaimia ei ole määritelty"
 

-#: src/procmime.c:298 src/procmime.c:300
+#: src/procmime.c:340 src/procmime.c:342

 msgid "[Error decoding BASE64]\n"
 msgstr "[Virhe BASE64:n purussa]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Virhe BASE64:n purussa]\n"
 

-#: src/procmsg.c:907
-msgid "Already trying to send\n"
-msgstr "Ollaan jo lähettämässä\n"
-
-#: src/procmsg.c:910
+#: src/procmsg.c:918 src/procmsg.c:921

 msgid "Already trying to send."
 msgstr "Ollaan jo lähettämässä."
 
 msgid "Already trying to send."
 msgstr "Ollaan jo lähettämässä."
 

-#: src/procmsg.c:1498
+#: src/procmsg.c:1515

 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Tiedostoa %s ei pysty avaamaan."
 
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Tiedostoa %s ei pysty avaamaan."
 

-#: src/procmsg.c:1592
+#: src/procmsg.c:1613

 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Viestin salaus ei onnistunut: %s"
 
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Viestin salaus ei onnistunut: %s"
 

-#: src/procmsg.c:1625
+#: src/procmsg.c:1646

 msgid "Queued message header is broken."
 msgstr "Jonottavan viestin otsake on rikki."
 
 msgid "Queued message header is broken."
 msgstr "Jonottavan viestin otsake on rikki."
 

-#: src/procmsg.c:1646
+#: src/procmsg.c:1667

 msgid "An error happened during SMTP session."
 msgstr "Virhe SMTP-istunnossa"
 
 # XXX: Öh?
 msgid "An error happened during SMTP session."
 msgstr "Virhe SMTP-istunnossa"
 
 # XXX: Öh?

-#: src/procmsg.c:1660
+#: src/procmsg.c:1681

 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."

-msgstr ""
-"Mikään tili ei näytä lähettävän, ja virhe tapahtui SMTP-istunnossa."
+msgstr "Mikään tili ei näytä lähettävän, ja virhe tapahtui SMTP-istunnossa."

 
 

-#: src/procmsg.c:1668
+#: src/procmsg.c:1689

 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "

-"generated by Sylpheed-Claws."
+"generated by Claws Mail."

 msgstr ""
 "Lähetystietojen selvitys ei onnistu. Viestiä ei välttämättä ole tehty "
 msgstr ""
 "Lähetystietojen selvitys ei onnistu. Viestiä ei välttämättä ole tehty "

-"Sylpheed-Clawsilla."
+"Claws Maililla."

 
 

-#: src/procmsg.c:1686
-msgid "Could not create temporary file for news sending."
+#: src/procmsg.c:1707
+msgid "Couldn't create temporary file for news sending."

 msgstr ""
 msgstr ""

-"Väliaikaistiedoston luonti keskusteluryhmien lähettämistä varten ei "
+"Väliaikaistiedoston luonti keskusteluryhmiin lähettämistä varten ei "

 "onnistunut."
 
 "onnistunut."
 

-#: src/procmsg.c:1699
+#: src/procmsg.c:1720

 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Väliaikaistiedostoon kirjoittaminen keskusteluryhmien lähettämiseksi ei "
 "onnistunut."
 
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Väliaikaistiedostoon kirjoittaminen keskusteluryhmien lähettämiseksi ei "
 "onnistunut."
 

-#: src/procmsg.c:1713
+#: src/procmsg.c:1734

 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Tapahtui virhe lähetettäessä viestiä vastaanottajalle %s."
 
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Tapahtui virhe lähetettäessä viestiä vastaanottajalle %s."
 

-#: src/procmsg.c:2190
+#: src/procmsg.c:2214

 msgid "Filtering messages...\n"
 msgstr "Suodatetaan viestejä…\n"
 
 msgid "Filtering messages...\n"
 msgstr "Suodatetaan viestejä…\n"
 


@@ -10109,56 +10562,72 @@ msgstr "lainattu viestin sisältö ilman allekirjoitusta"
 msgid "cursor position"
 msgstr "kursorin sijainti"
 
 msgid "cursor position"
 msgstr "kursorin sijainti"
 

-# http://www.ling.helsinki.fi/filt/info/mes2/merkkien-nimet.html
+#: src/quote_fmt.c:58
+msgid "Account property: your name"
+msgstr "Tilin ominaisuus: nimesi"
+

 #: src/quote_fmt.c:59
 #: src/quote_fmt.c:59

+msgid "Account property: your email address"
+msgstr "Tilin ominaisuus: sähköpostiosoitteesi"
+
+#: src/quote_fmt.c:60
+msgid "Account property: account name"
+msgstr "Tilin ominaisuus: tilin nimi"
+
+#: src/quote_fmt.c:61
+msgid "Account property: organization"
+msgstr "Tilin ominaisuus: organisaatio"
+
+# http://www.ling.helsinki.fi/filt/info/mes2/merkkien-nimet.html
+#: src/quote_fmt.c:63

 msgid "literal backslash"
 msgstr "kenoviiva sellaisenaan"
 
 msgid "literal backslash"
 msgstr "kenoviiva sellaisenaan"
 

-#: src/quote_fmt.c:60
+#: src/quote_fmt.c:64

 msgid "literal question mark"
 msgstr "kysymysmerkki sellaisenaan"
 
 msgid "literal question mark"
 msgstr "kysymysmerkki sellaisenaan"
 

-#: src/quote_fmt.c:61
+#: src/quote_fmt.c:65

 msgid "literal exclamation mark"
 msgstr "huutomerkki sellaisenaan"
 
 msgid "literal exclamation mark"
 msgstr "huutomerkki sellaisenaan"
 

-#: src/quote_fmt.c:62
+#: src/quote_fmt.c:66

 msgid "literal pipe"
 msgstr "pystyviiva sellaisenaan"
 
 msgid "literal pipe"
 msgstr "pystyviiva sellaisenaan"
 

-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:67

 msgid "literal opening curly brace"
 msgstr "vasen aaltosulje sellaisenaan"
 
 msgid "literal opening curly brace"
 msgstr "vasen aaltosulje sellaisenaan"
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:68

 msgid "literal closing curly brace"
 msgstr "oikea aaltosulje sellaisenaan"
 
 msgid "literal closing curly brace"
 msgstr "oikea aaltosulje sellaisenaan"
 

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:69

 msgid "tab"
 msgstr "tabulaattori"
 
 msgid "tab"
 msgstr "tabulaattori"
 

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:70

 msgid "linefeed"
 msgstr "rivinvaihto (lf)"
 
 msgid "linefeed"
 msgstr "rivinvaihto (lf)"
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:72

 msgid ""
 "insert expr if x is set\n"
 msgid ""
 "insert expr if x is set\n"

-"(where x is one of the dfNFLIstcnri characters)"
+"(where x is one of the dfNFLIstcnri characters or af, ao)"

 msgstr ""
 "lisää expr jos x on olemassa,\n"
 msgstr ""
 "lisää expr jos x on olemassa,\n"

-"jossa x on jokin kirjaimista dfNFLIstcnri"
+"jossa x on jokin kirjaimista dfNFLIstcnri tai af, ao"

 
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:73

 msgid ""
 "insert expr if x is not set\n"
 msgid ""
 "insert expr if x is not set\n"

-"(where x is one of the dfNFLIstcnri characters)"
+"(where x is one of the dfNFLIstcnri characters or af, ao)"

 msgstr ""
 "lisää expr jos x on olemassa,\n"
 msgstr ""
 "lisää expr jos x on olemassa,\n"

-"jossa x on jokin kirjaimista dfNFLIstcnri"
+"jossa x on jokin kirjaimista dfNFLIstcnri tai af, ao"

 
 

-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:74

 msgid ""
 "insert file:\n"
 "sub_expr is evaluated as a filename to insert"
 msgid ""
 "insert file:\n"
 "sub_expr is evaluated as a filename to insert"


@@ -10166,7 +10635,7 @@ msgstr ""
 "sisällytä tiedosto:\n"
 "ali-ilmaus käsitellään sisällytettävänä tiedostonimenä"
 
 "sisällytä tiedosto:\n"
 "ali-ilmaus käsitellään sisällytettävänä tiedostonimenä"
 

-#: src/quote_fmt.c:71
+#: src/quote_fmt.c:75

 msgid ""
 "insert program output:\n"
 "sub_expr is evaluated as a command-line to get\n"
 msgid ""
 "insert program output:\n"
 "sub_expr is evaluated as a command-line to get\n"


@@ -10176,7 +10645,7 @@ msgstr ""
 "ali-ilmaus käsitellään komentona jonka tuloste\n"
 "sisällytetään"
 
 "ali-ilmaus käsitellään komentona jonka tuloste\n"
 "sisällytetään"
 

-#: src/quote_fmt.c:72
+#: src/quote_fmt.c:76

 msgid ""
 "insert user input:\n"
 "sub_expr is a variable to be replaced by\n"
 msgid ""
 "insert user input:\n"
 "sub_expr is a variable to be replaced by\n"


@@ -10186,15 +10655,15 @@ msgstr ""
 "ali-ilmaus käsitellään muuttujana, joksi sisällytetään\n"
 "käyttäjän syöttämä teksti"
 
 "ali-ilmaus käsitellään muuttujana, joksi sisällytetään\n"
 "käyttäjän syöttämä teksti"
 

-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:78

 msgid "terms definition:"
 msgstr "termien määritykset:"
 
 msgid "terms definition:"
 msgstr "termien määritykset:"
 

-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:79

 msgid "text that can contain any of the symbols above"
 msgstr "teksti, joka voi sisältää ylläolevia merkkejä"
 
 msgid "text that can contain any of the symbols above"
 msgstr "teksti, joka voi sisältää ylläolevia merkkejä"
 

-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:80

 msgid ""
 "text that can contain any of the symbols above\n"
 "but ?x{}, !x{}, |f{}, |p{} and |i{}"
 msgid ""
 "text that can contain any of the symbols above\n"
 "but ?x{}, !x{}, |f{}, |p{} and |i{}"


@@ -10202,20 +10671,20 @@ msgstr ""
 "teksti, joka voi sisältää ylläolevia merkkejä,\n"
 "paitsi merkintöjä ?x{}, !x{}, |f{}, |p{} ja |i{}"
 
 "teksti, joka voi sisältää ylläolevia merkkejä,\n"
 "paitsi merkintöjä ?x{}, !x{}, |f{}, |p{} ja |i{}"
 

-#: src/quote_fmt.c:84
+#: src/quote_fmt.c:88

 msgid "Description of symbols"
 msgstr "Merkintöjen selitykset"
 
 msgid "Description of symbols"
 msgstr "Merkintöjen selitykset"
 

-#: src/quote_fmt.c:85
+#: src/quote_fmt.c:89

 msgid "The following symbols can be used:"
 msgstr "Seuraavia merkintöjä voi käyttää:"
 
 msgid "The following symbols can be used:"
 msgstr "Seuraavia merkintöjä voi käyttää:"
 

-#: src/quote_fmt_parse.y:458
+#: src/quote_fmt_parse.y:464

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Syötä korvaava teksti %s"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Syötä korvaava teksti %s"
 

-#: src/quote_fmt_parse.y:459
+#: src/quote_fmt_parse.y:465

 msgid "Enter variable"
 msgstr "Syötä muuttujaa"
 
 msgid "Enter variable"
 msgstr "Syötä muuttujaa"
 


@@ -10226,7 +10695,7 @@ msgstr "Lähetetään viestiä komennolla: %s\n"
 
 #: src/send_message.c:151
 #, c-format
 
 #: src/send_message.c:151
 #, c-format

-msgid "Can't execute command: %s"
+msgid "Couldn't execute command: %s"

 msgstr "Komentoa %s ei voi käyttää"
 
 #: src/send_message.c:186
 msgstr "Komentoa %s ei voi käyttää"
 
 #: src/send_message.c:186


@@ -10292,15 +10761,15 @@ msgstr "Lopetetaan…"
 msgid "Sending message (%d / %d bytes)"
 msgstr "Lähetetään viestiä (%d/%d tavua)"
 
 msgid "Sending message (%d / %d bytes)"
 msgstr "Lähetetään viestiä (%d/%d tavua)"
 

-#: src/send_message.c:545
+#: src/send_message.c:555

 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 
 msgid "Sending message"
 msgstr "Lähetetään viestiä"
 

-#: src/send_message.c:591 src/send_message.c:611
+#: src/send_message.c:613 src/send_message.c:633

 msgid "Error occurred while sending the message."
 msgstr "Virhe lähetettäessä viestiä."
 
 msgid "Error occurred while sending the message."
 msgstr "Virhe lähetettäessä viestiä."
 

-#: src/send_message.c:594
+#: src/send_message.c:616

 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"


@@ -10338,408 +10807,408 @@ msgstr "%s — Raakamuoto"
 msgid "Saved SSL Certificates"
 msgstr "Tallennetut SSL-varmenteet"
 
 msgid "Saved SSL Certificates"
 msgstr "Tallennetut SSL-varmenteet"
 

-#: src/ssl_manager.c:386
+#: src/ssl_manager.c:428

 msgid "Delete certificate"
 msgstr "Poista varmenne"
 
 msgid "Delete certificate"
 msgstr "Poista varmenne"
 

-#: src/ssl_manager.c:387
+#: src/ssl_manager.c:429

 msgid "Do you really want to delete this certificate?"
 msgstr "Poistetaanko tämä varmenne?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Poistetaanko tämä varmenne?"
 

-#: src/summary_search.c:193
+#: src/summary_search.c:230

 msgid "Search messages"
 msgstr "Etsi viestejä"
 
 msgid "Search messages"
 msgstr "Etsi viestejä"
 

-#: src/summary_search.c:215
+#: src/summary_search.c:252

 msgid "Match any of the following"
 msgstr "Sisältää jonkin seuraavista"
 
 msgid "Match any of the following"
 msgstr "Sisältää jonkin seuraavista"
 

-#: src/summary_search.c:216
+#: src/summary_search.c:253

 msgid "Match all of the following"
 msgstr "Sisältää kaikki seuraavat"
 
 msgid "Match all of the following"
 msgstr "Sisältää kaikki seuraavat"
 

-#: src/summary_search.c:275
+#: src/summary_search.c:352

 msgid "From:"
 msgstr "Lähettäjä:"
 
 msgid "From:"
 msgstr "Lähettäjä:"
 

-#: src/summary_search.c:296
+#: src/summary_search.c:373

 msgid "Body:"
 msgstr "Sisältö:"
 
 msgid "Body:"
 msgstr "Sisältö:"
 

-#: src/summary_search.c:303
+#: src/summary_search.c:380

 msgid "Condition:"
 msgstr "Ehto:"
 
 msgid "Condition:"
 msgstr "Ehto:"
 

-#: src/summary_search.c:333
+#: src/summary_search.c:410

 msgid "Find _all"
 msgstr "_Hae kaikki"
 
 msgid "Find _all"
 msgstr "_Hae kaikki"
 

-#: src/summary_search.c:529
+#: src/summary_search.c:645

 msgid "Beginning of list reached; continue from end?"
 msgstr "Luettelon alku tuli vastaan, jatketaanko lopusta?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "Luettelon alku tuli vastaan, jatketaanko lopusta?"
 

-#: src/summary_search.c:531
+#: src/summary_search.c:647

 msgid "End of list reached; continue from beginning?"
 msgstr "Luettelon loppu tuli vastaan, jatketaanko alusta?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Luettelon loppu tuli vastaan, jatketaanko alusta?"
 

-#: src/summaryview.c:416
+#: src/summaryview.c:417

 msgid "/_Reply"
 msgstr "_Vastaa"
 
 msgid "/_Reply"
 msgstr "_Vastaa"
 

-#: src/summaryview.c:417
+#: src/summaryview.c:418

 msgid "/Repl_y to"
 msgstr "_Vastaa"
 
 msgid "/Repl_y to"
 msgstr "_Vastaa"
 

-#: src/summaryview.c:418
+#: src/summaryview.c:419

 msgid "/Repl_y to/_all"
 msgstr "k_aikille"
 
 msgid "/Repl_y to/_all"
 msgstr "k_aikille"
 

-#: src/summaryview.c:419
+#: src/summaryview.c:420

 msgid "/Repl_y to/_sender"
 msgstr "l_ähettäjälle"
 
 msgid "/Repl_y to/_sender"
 msgstr "l_ähettäjälle"
 

-#: src/summaryview.c:420
+#: src/summaryview.c:421

 msgid "/Repl_y to/mailing _list"
 msgstr "_postituslistalle"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "_postituslistalle"
 

-#: src/summaryview.c:423 src/toolbar.c:234
+#: src/summaryview.c:424 src/toolbar.c:239

 msgid "/_Forward"
 msgstr "_Edelleenlähetä"
 
 msgid "/_Forward"
 msgstr "_Edelleenlähetä"
 

-#: src/summaryview.c:424 src/toolbar.c:235
+#: src/summaryview.c:425 src/toolbar.c:240

 msgid "/For_ward as attachment"
 msgstr "_Edelleenlähetä liitteenä"
 
 msgid "/For_ward as attachment"
 msgstr "_Edelleenlähetä liitteenä"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:426

 msgid "/Redirect"
 msgstr "Uudelleenohjaa"
 
 msgid "/Redirect"
 msgstr "Uudelleenohjaa"
 

-#: src/summaryview.c:427
+#: src/summaryview.c:428

 msgid "/M_ove..."
 msgstr "S_iirrä…"
 
 msgid "/M_ove..."
 msgstr "S_iirrä…"
 

-#: src/summaryview.c:428
+#: src/summaryview.c:429

 msgid "/_Copy..."
 msgstr "_Kopioi…"
 
 msgid "/_Copy..."
 msgstr "_Kopioi…"
 

-#: src/summaryview.c:429
+#: src/summaryview.c:430

 msgid "/Move to _trash"
 msgstr "Siirrä _roskiin"
 
 msgid "/Move to _trash"
 msgstr "Siirrä _roskiin"
 

-#: src/summaryview.c:430
+#: src/summaryview.c:431

 msgid "/_Delete..."
 msgstr "_Poista…"
 
 msgid "/_Delete..."
 msgstr "_Poista…"
 

-#: src/summaryview.c:432
+#: src/summaryview.c:433

 msgid "/_Mark"
 msgstr "_Merkitse"
 
 msgid "/_Mark"
 msgstr "_Merkitse"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:434

 msgid "/_Mark/_Mark"
 msgstr "_Merkitse"
 
 msgid "/_Mark/_Mark"
 msgstr "_Merkitse"
 

-#: src/summaryview.c:434
+#: src/summaryview.c:435

 msgid "/_Mark/_Unmark"
 msgstr "_Poista merkintä"
 
 msgid "/_Mark/_Unmark"
 msgstr "_Poista merkintä"
 

-#: src/summaryview.c:435 src/summaryview.c:441 src/summaryview.c:444
+#: src/summaryview.c:436 src/summaryview.c:442 src/summaryview.c:445

 msgid "/_Mark/---"
 msgstr "---"
 
 msgid "/_Mark/---"
 msgstr "---"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:437

 msgid "/_Mark/Mark as unr_ead"
 msgstr "Merkitse _lukemattomaksi"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "Merkitse _lukemattomaksi"
 

-#: src/summaryview.c:437
+#: src/summaryview.c:438

 msgid "/_Mark/Mark as rea_d"
 msgstr "Merkitse l_uetuksi"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "Merkitse l_uetuksi"
 

-#: src/summaryview.c:438
+#: src/summaryview.c:439

 msgid "/_Mark/Mark all read"
 msgstr "Merkitse kaikki luetuksi"
 
 msgid "/_Mark/Mark all read"
 msgstr "Merkitse kaikki luetuksi"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:440

 msgid "/_Mark/Ignore thread"
 msgstr "Ohita säie"
 
 msgid "/_Mark/Ignore thread"
 msgstr "Ohita säie"
 

-#: src/summaryview.c:440
+#: src/summaryview.c:441

 msgid "/_Mark/Unignore thread"
 msgstr "Poista säikeen ohitus"
 
 msgid "/_Mark/Unignore thread"
 msgstr "Poista säikeen ohitus"
 

-#: src/summaryview.c:442
+#: src/summaryview.c:443

 msgid "/_Mark/Mark as _spam"
 msgstr "Merkitse _roskapostiksi"
 
 msgid "/_Mark/Mark as _spam"
 msgstr "Merkitse _roskapostiksi"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:444

 msgid "/_Mark/Mark as _ham"
 msgstr "Merkitse ei-roskapostiksi"
 
 msgid "/_Mark/Mark as _ham"
 msgstr "Merkitse ei-roskapostiksi"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:446

 msgid "/_Mark/Lock"
 msgstr "Lukitse"
 
 msgid "/_Mark/Lock"
 msgstr "Lukitse"
 

-#: src/summaryview.c:446
+#: src/summaryview.c:447

 msgid "/_Mark/Unlock"
 msgstr "Avaa lukitus"
 
 msgid "/_Mark/Unlock"
 msgstr "Avaa lukitus"
 

-#: src/summaryview.c:447
+#: src/summaryview.c:448

 msgid "/Color la_bel"
 msgid "/Color la_bel"

-msgstr "Värimerkintä"
+msgstr "_Värimerkintä"

 
 

-#: src/summaryview.c:450
+#: src/summaryview.c:451

 msgid "/Add sender to address boo_k"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 
 msgid "/Add sender to address boo_k"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:453

 msgid "/Create f_ilter rule"
 msgstr "Luo suoda_tussääntö"
 
 msgid "/Create f_ilter rule"
 msgstr "Luo suoda_tussääntö"
 

-#: src/summaryview.c:453
+#: src/summaryview.c:454

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "_Automaattisesti"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "_Automaattisesti"
 

-#: src/summaryview.c:455
+#: src/summaryview.c:456

 msgid "/Create f_ilter rule/by _From"
 msgstr "Lähettäj_äkentästä"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "Lähettäj_äkentästä"
 

-#: src/summaryview.c:457
+#: src/summaryview.c:458

 msgid "/Create f_ilter rule/by _To"
 msgstr "Vastaanottaj_akentästä"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "Vastaanottaj_akentästä"
 

-#: src/summaryview.c:459
+#: src/summaryview.c:460

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "Otsi_kosta"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "Otsi_kosta"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:462

 msgid "/Create processing rule"
 msgstr "Luo käsittelysääntö"
 
 msgid "/Create processing rule"
 msgstr "Luo käsittelysääntö"
 

-#: src/summaryview.c:462
+#: src/summaryview.c:463

 msgid "/Create processing rule/_Automatically"
 msgstr "_Automaattisesti"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "_Automaattisesti"
 

-#: src/summaryview.c:464
+#: src/summaryview.c:465

 msgid "/Create processing rule/by _From"
 msgstr "Lähettäj_äkentästä"
 
 msgid "/Create processing rule/by _From"
 msgstr "Lähettäj_äkentästä"
 

-#: src/summaryview.c:466
+#: src/summaryview.c:467

 msgid "/Create processing rule/by _To"
 msgstr "Vastaanottaj_akentästä"
 
 msgid "/Create processing rule/by _To"
 msgstr "Vastaanottaj_akentästä"
 

-#: src/summaryview.c:468
+#: src/summaryview.c:469

 msgid "/Create processing rule/by _Subject"
 msgstr "Otsi_kosta"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "Otsi_kosta"
 

-#: src/summaryview.c:474
+#: src/summaryview.c:475

 msgid "/_View/Message _source"
 msgstr "Viestin _raakamuoto"
 
 msgid "/_View/Message _source"
 msgstr "Viestin _raakamuoto"
 

-#: src/summaryview.c:475
+#: src/summaryview.c:476

 msgid "/_View/All _headers"
 msgstr "Kaikki _otsakeet"
 
 msgid "/_View/All _headers"
 msgstr "Kaikki _otsakeet"
 

-#: src/summaryview.c:478
+#: src/summaryview.c:479

 msgid "/_Print..."
 msgstr "T_ulosta…"
 
 msgid "/_Print..."
 msgstr "T_ulosta…"
 

-#: src/summaryview.c:558
+#: src/summaryview.c:585

 msgid "Toggle quick search bar"
 msgstr "Vaihda pikahakupalkin tilaa"
 
 msgid "Toggle quick search bar"
 msgstr "Vaihda pikahakupalkin tilaa"
 

-#: src/summaryview.c:932
+#: src/summaryview.c:963

 msgid "Process mark"
 msgstr "Käsittelymerkintä"
 
 msgid "Process mark"
 msgstr "Käsittelymerkintä"
 

-#: src/summaryview.c:933
+#: src/summaryview.c:964

 msgid "Some marks are left. Process them?"
 msgstr "Merkintöjä on jäljellä, käsitelläänkö?"
 
 msgid "Some marks are left. Process them?"
 msgstr "Merkintöjä on jäljellä, käsitelläänkö?"
 

-#: src/summaryview.c:990
+#: src/summaryview.c:1021

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Luetaan kansiota (%s)…"
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Luetaan kansiota (%s)…"
 

-#: src/summaryview.c:1463 src/summaryview.c:1515
+#: src/summaryview.c:1509 src/summaryview.c:1561

 msgid "No more unread messages"
 msgstr "Ei lukemattomia viestejä"
 
 msgid "No more unread messages"
 msgstr "Ei lukemattomia viestejä"
 

-#: src/summaryview.c:1464
+#: src/summaryview.c:1510

 msgid "No unread message found. Search from the end?"
 msgstr "Lukemattomia viestejä ei löytynyt, jatketaanko hakua lopusta?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Lukemattomia viestejä ei löytynyt, jatketaanko hakua lopusta?"
 

-#: src/summaryview.c:1476 src/summaryview.c:1528 src/summaryview.c:1575
-#: src/summaryview.c:1627 src/summaryview.c:1706
+#: src/summaryview.c:1522 src/summaryview.c:1574 src/summaryview.c:1621
+#: src/summaryview.c:1673 src/summaryview.c:1752

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Sisäinen virhe: prefs_common.next_unread_msg_dialog sisältää "
 "odotuksenvastaisia arvoja\n"
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Sisäinen virhe: prefs_common.next_unread_msg_dialog sisältää "
 "odotuksenvastaisia arvoja\n"
 

-#: src/summaryview.c:1484
+#: src/summaryview.c:1530

 msgid "No unread messages."
 msgstr "Ei lukemattomia viestejä."
 
 msgid "No unread messages."
 msgstr "Ei lukemattomia viestejä."
 

-#: src/summaryview.c:1516
+#: src/summaryview.c:1562

 msgid "No unread message found. Go to next folder?"
 msgstr "Lukemattomia viestejä ei löytynyt, edetäänkö seuraavaan kansioon?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Lukemattomia viestejä ei löytynyt, edetäänkö seuraavaan kansioon?"
 

-#: src/summaryview.c:1562 src/summaryview.c:1614
+#: src/summaryview.c:1608 src/summaryview.c:1660

 msgid "No more new messages"
 msgstr "Ei uusia viestejä"
 
 msgid "No more new messages"
 msgstr "Ei uusia viestejä"
 

-#: src/summaryview.c:1563
+#: src/summaryview.c:1609

 msgid "No new message found. Search from the end?"
 msgstr "Uusia viestejä ei löytynyt, jatketaanko hakua lopusta?"
 
 msgid "No new message found. Search from the end?"
 msgstr "Uusia viestejä ei löytynyt, jatketaanko hakua lopusta?"
 

-#: src/summaryview.c:1583
+#: src/summaryview.c:1629

 msgid "No new messages."
 msgstr "Ei uusia viestejä."
 
 msgid "No new messages."
 msgstr "Ei uusia viestejä."
 

-#: src/summaryview.c:1615
+#: src/summaryview.c:1661

 msgid "No new message found. Go to next folder?"
 msgstr "Uusia viestejä ei löytynyt, edetäänkö seuraavaan kansioon?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Uusia viestejä ei löytynyt, edetäänkö seuraavaan kansioon?"
 

-#: src/summaryview.c:1652 src/summaryview.c:1693
+#: src/summaryview.c:1698 src/summaryview.c:1739

 msgid "No more marked messages"
 msgstr "Ei enää merkittyjä viestejä"
 
 msgid "No more marked messages"
 msgstr "Ei enää merkittyjä viestejä"
 

-#: src/summaryview.c:1653
+#: src/summaryview.c:1699

 msgid "No marked message found. Search from the end?"
 msgstr "Merkittyjä viestejä ei löytynyt, jatketaanko hakua lopusta?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Merkittyjä viestejä ei löytynyt, jatketaanko hakua lopusta?"
 

-#: src/summaryview.c:1662
+#: src/summaryview.c:1708

 msgid "No marked messages."
 msgstr "Ei merkittyjä viestejä."
 
 msgid "No marked messages."
 msgstr "Ei merkittyjä viestejä."
 

-#: src/summaryview.c:1694
+#: src/summaryview.c:1740

 msgid "No marked message found. Go to next folder?"
 msgstr "Merkittyjä viestejä ei löytynyt, edetäänkö seuraavaan kansioon?"
 
 msgid "No marked message found. Go to next folder?"
 msgstr "Merkittyjä viestejä ei löytynyt, edetäänkö seuraavaan kansioon?"
 

-#: src/summaryview.c:1731 src/summaryview.c:1756
+#: src/summaryview.c:1777 src/summaryview.c:1802

 msgid "No more labeled messages"
 msgstr "Ei enää nimettyjä viestejä"
 
 msgid "No more labeled messages"
 msgstr "Ei enää nimettyjä viestejä"
 

-#: src/summaryview.c:1732
+#: src/summaryview.c:1778

 msgid "No labeled message found. Search from the end?"
 msgstr "Nimettyjä viestejä ei löytynyt, jatketaanko hakua lopusta?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Nimettyjä viestejä ei löytynyt, jatketaanko hakua lopusta?"
 

-#: src/summaryview.c:1741 src/summaryview.c:1766
+#: src/summaryview.c:1787 src/summaryview.c:1812

 msgid "No labeled messages."
 msgstr "Ei nimettyjä viestejä."
 
 msgid "No labeled messages."
 msgstr "Ei nimettyjä viestejä."
 

-#: src/summaryview.c:1757
+#: src/summaryview.c:1803

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nimettyjä viestejä ei löytynyt, jatketaanko hakua alusta?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nimettyjä viestejä ei löytynyt, jatketaanko hakua alusta?"
 

-#: src/summaryview.c:2048
+#: src/summaryview.c:2094

 msgid "Attracting messages by subject..."
 msgstr "Houkutellaan viestejä otsikon mukaan…"
 
 msgid "Attracting messages by subject..."
 msgstr "Houkutellaan viestejä otsikon mukaan…"
 

-#: src/summaryview.c:2206
+#: src/summaryview.c:2252

 #, c-format
 msgid "%d deleted"
 msgstr "%d poistettu"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d poistettu"
 

-#: src/summaryview.c:2210
+#: src/summaryview.c:2256

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d siirretty"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d siirretty"
 

-#: src/summaryview.c:2211 src/summaryview.c:2218
+#: src/summaryview.c:2257 src/summaryview.c:2264

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:2216
+#: src/summaryview.c:2262

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopioitu"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopioitu"
 

-#: src/summaryview.c:2231
+#: src/summaryview.c:2277

 msgid " item selected"
 msgstr " kohde valittu"
 
 msgid " item selected"
 msgstr " kohde valittu"
 

-#: src/summaryview.c:2233
+#: src/summaryview.c:2279

 msgid " items selected"
 msgstr " kohdetta valittu"
 
 msgid " items selected"
 msgstr " kohdetta valittu"
 

-#: src/summaryview.c:2249
+#: src/summaryview.c:2295

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d uutta, %d lukematta, %d yhteensä (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d uutta, %d lukematta, %d yhteensä (%s)"
 

-#: src/summaryview.c:2453
+#: src/summaryview.c:2504

 msgid "Sorting summary..."
 msgstr "Järjestellään yhteenvetoa…"
 
 msgid "Sorting summary..."
 msgstr "Järjestellään yhteenvetoa…"
 

-#: src/summaryview.c:2536
+#: src/summaryview.c:2585

 msgid "Setting summary from message data..."
 msgstr "Laadistaan yhteenvetoja viestidatasta…"
 
 msgid "Setting summary from message data..."
 msgstr "Laadistaan yhteenvetoja viestidatasta…"
 

-#: src/summaryview.c:2707
+#: src/summaryview.c:2763

 msgid "(No Date)"
 msgstr "(Ei päiväystä)"
 
 msgid "(No Date)"
 msgstr "(Ei päiväystä)"
 

-#: src/summaryview.c:2745
+#: src/summaryview.c:2801

 msgid "(No Recipient)"
 msgstr "(Ei vastaanottajia)"
 
 msgid "(No Recipient)"
 msgstr "(Ei vastaanottajia)"
 

-#: src/summaryview.c:3567
+#: src/summaryview.c:3622

 msgid "You're not the author of the article.\n"
 msgstr "Et ole viestin kirjoittaja\n"
 
 msgid "You're not the author of the article.\n"
 msgstr "Et ole viestin kirjoittaja\n"
 

-#: src/summaryview.c:3653
+#: src/summaryview.c:3707

 msgid "Delete message(s)"
 msgstr "Poista viestejä"
 
 msgid "Delete message(s)"
 msgstr "Poista viestejä"
 

-#: src/summaryview.c:3654
+#: src/summaryview.c:3708

 msgid "Do you really want to delete selected message(s)?"
 msgstr "Poistetaanko valittuja viestejä?"
 
 msgid "Do you really want to delete selected message(s)?"
 msgstr "Poistetaanko valittuja viestejä?"
 

-#: src/summaryview.c:3807
+#: src/summaryview.c:3861

 msgid "Destination is same as current folder."
 msgstr "Kohdekansio on sama kuin nykyinen kansio."
 
 msgid "Destination is same as current folder."
 msgstr "Kohdekansio on sama kuin nykyinen kansio."
 

-#: src/summaryview.c:3898
+#: src/summaryview.c:3952

 msgid "Destination to copy is same as current folder."
 msgstr "Kopioinnin kohde on sama kuin nykyinen kansio."
 
 msgid "Destination to copy is same as current folder."
 msgstr "Kopioinnin kohde on sama kuin nykyinen kansio."
 

-#: src/summaryview.c:4018
+#: src/summaryview.c:4072

 msgid "Append or Overwrite"
 msgstr "Lisää perään tai kirjoita päälle"
 
 msgid "Append or Overwrite"
 msgstr "Lisää perään tai kirjoita päälle"
 

-#: src/summaryview.c:4019
+#: src/summaryview.c:4073

 msgid "Append or overwrite existing file?"
 msgstr "Lisätäänkö perään vai kirjoitetaanko olemassolevan tiedoston päälle?"
 
 msgid "Append or overwrite existing file?"
 msgstr "Lisätäänkö perään vai kirjoitetaanko olemassolevan tiedoston päälle?"
 

-#: src/summaryview.c:4020
+#: src/summaryview.c:4074

 msgid "_Append"
 msgstr "_Lisää"
 
 msgid "_Append"
 msgstr "_Lisää"
 

-#: src/summaryview.c:4020
+#: src/summaryview.c:4074

 msgid "_Overwrite"
 msgstr "_Korvaa"
 
 msgid "_Overwrite"
 msgstr "_Korvaa"
 

-#: src/summaryview.c:4367
+#: src/summaryview.c:4431

 msgid "Building threads..."
 msgstr "Rakennetaan säikeitä…"
 
 msgid "Building threads..."
 msgstr "Rakennetaan säikeitä…"
 

-#: src/summaryview.c:4586
+#: src/summaryview.c:4650

 msgid "Skip these rules"
 msgstr "Ohita nämä säännöt"
 
 msgid "Skip these rules"
 msgstr "Ohita nämä säännöt"
 

-#: src/summaryview.c:4589
+#: src/summaryview.c:4653

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Käytä näitä sääntöjä tilistä riippumatta"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Käytä näitä sääntöjä tilistä riippumatta"
 

-#: src/summaryview.c:4592
-msgid "Use current account for these rules"
-msgstr "Käytä nykyistä tiliä näille säännöille"
+#: src/summaryview.c:4656
+msgid "Apply these rules if they apply to the current account"
+msgstr "Käytä näitä sääntöjä vain tälle tilille"

 
 

-#: src/summaryview.c:4621
+#: src/summaryview.c:4685

 msgid "Filtering"
 msgstr "Suodatus"
 
 msgid "Filtering"
 msgstr "Suodatus"
 

-#: src/summaryview.c:4622
+#: src/summaryview.c:4686

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -10747,19 +11216,19 @@ msgstr ""
 "Tiliin kuuluu joitain suodatussääntöjä.\n"
 "Valitse mitä niille tehdään:"
 
 "Tiliin kuuluu joitain suodatussääntöjä.\n"
 "Valitse mitä niille tehdään:"
 

-#: src/summaryview.c:4624
+#: src/summaryview.c:4688

 msgid "+_Filter"
 msgstr "_Suodata"
 
 msgid "+_Filter"
 msgstr "_Suodata"
 

-#: src/summaryview.c:4651
+#: src/summaryview.c:4715

 msgid "Filtering..."
 msgstr "Suodatetaan…"
 
 msgid "Filtering..."
 msgstr "Suodatetaan…"
 

-#: src/summaryview.c:4724
+#: src/summaryview.c:4788

 msgid "Processing configuration"
 msgstr "Asetuksia luetaan"
 
 msgid "Processing configuration"
 msgstr "Asetuksia luetaan"
 

-#: src/summaryview.c:6164
+#: src/summaryview.c:6233

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -10768,37 +11237,37 @@ msgstr ""
 "Säännöllisessä lausekkeessa (regexpissä siis) virhe:\n"
 "%s"
 
 "Säännöllisessä lausekkeessa (regexpissä siis) virhe:\n"
 "%s"
 

-#: src/textview.c:238
+#: src/textview.c:222

 msgid "/Compose _new message"
 msgstr "Kirjoita _uusi viesti"
 
 msgid "/Compose _new message"
 msgstr "Kirjoita _uusi viesti"
 

-#: src/textview.c:239
+#: src/textview.c:223

 msgid "/Add to _address book"
 msgstr "Lisää _osoitekirjaan"
 
 msgid "/Add to _address book"
 msgstr "Lisää _osoitekirjaan"
 

-#: src/textview.c:240
+#: src/textview.c:224

 msgid "/Copy this add_ress"
 msgstr "Kopioi o_soite"
 
 msgid "/Copy this add_ress"
 msgstr "Kopioi o_soite"
 

-#: src/textview.c:245
+#: src/textview.c:229

 msgid "/_Open image"
 msgstr "_Avaa kuva"
 
 msgid "/_Open image"
 msgstr "_Avaa kuva"
 

-#: src/textview.c:246
+#: src/textview.c:230

 msgid "/_Save image..."
 msgstr "_Tallenna kuva…"
 
 msgid "/_Save image..."
 msgstr "_Tallenna kuva…"
 

-#: src/textview.c:674
+#: src/textview.c:639

 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s %s (%d tavua)]"
 
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s %s (%d tavua)]"
 

-#: src/textview.c:677
+#: src/textview.c:642

 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d tavua)]"
 
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d tavua)]"
 

-#: src/textview.c:846
+#: src/textview.c:812

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -10812,80 +11281,80 @@ msgstr ""
 "\n"
 "  Käytä "
 
 "\n"
 "  Käytä "
 

-#: src/textview.c:851
+#: src/textview.c:817

 msgid "'View Log'"
 msgstr "”Katsele lokia”"
 
 msgid "'View Log'"
 msgstr "”Katsele lokia”"
 

-#: src/textview.c:852
+#: src/textview.c:818

 msgid " in the Tools menu for more information."
 msgstr " työkaluvalikossa lisätietoa varten."
 
 msgid " in the Tools menu for more information."
 msgstr " työkaluvalikossa lisätietoa varten."
 

-#: src/textview.c:873
+#: src/textview.c:839

 msgid "  The following can be performed on this part by\n"
 msgstr "Tälle osalle voi suorittaa seuraavaa\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "Tälle osalle voi suorittaa seuraavaa\n"
 

-#: src/textview.c:874
+#: src/textview.c:840

 msgid "  right-clicking the icon or list item:\n"
 msgstr ""
 "napsauttamalla kuvaketta tai luettelon kohtaa oikealla hiirenpainikkeella:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr ""
 "napsauttamalla kuvaketta tai luettelon kohtaa oikealla hiirenpainikkeella:\n"
 

-#: src/textview.c:876
+#: src/textview.c:842

 msgid "     - To save, select "
 msgstr "\t— Tallentaaksesi valitse "
 
 msgid "     - To save, select "
 msgstr "\t— Tallentaaksesi valitse "
 

-#: src/textview.c:877
+#: src/textview.c:843

 msgid "'Save as...'"
 msgstr "”Tallenna nimellä…”"
 
 msgid "'Save as...'"
 msgstr "”Tallenna nimellä…”"
 

-#: src/textview.c:878
+#: src/textview.c:844

 msgid " (Shortcut key: 'y')\n"
 msgstr " (pikanäppäin: ’y’)\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (pikanäppäin: ’y’)\n"
 

-#: src/textview.c:879
+#: src/textview.c:845

 msgid "     - To display as text, select "
 msgstr "    — Näytä tekstinä valitsemalla "
 
 msgid "     - To display as text, select "
 msgstr "    — Näytä tekstinä valitsemalla "
 

-#: src/textview.c:880
+#: src/textview.c:846

 msgid "'Display as text'"
 msgstr "”Näytä tekstinä”"
 
 msgid "'Display as text'"
 msgstr "”Näytä tekstinä”"
 

-#: src/textview.c:881
+#: src/textview.c:847

 msgid " (Shortcut key: 't')\n"
 msgstr " (pikanäppäin: ’t’)\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (pikanäppäin: ’t’)\n"
 

-#: src/textview.c:882
+#: src/textview.c:848

 msgid "     - To open with an external program, select "
 msgstr "    — Avaa ulkoisella sovelluksella valitsemalla "
 
 msgid "     - To open with an external program, select "
 msgstr "    — Avaa ulkoisella sovelluksella valitsemalla "
 

-#: src/textview.c:883
+#: src/textview.c:849

 msgid "'Open'"
 msgstr "”Avaa”"
 
 msgid "'Open'"
 msgstr "”Avaa”"
 

-#: src/textview.c:884
+#: src/textview.c:850

 msgid " (Shortcut key: 'l')\n"
 msgstr " (pikanäppäin: ’l’)\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (pikanäppäin: ’l’)\n"
 

-#: src/textview.c:885
+#: src/textview.c:851

 msgid "       (alternately double-click, or click the middle "
 msgstr "    (vaihtoehtoisesti kaksoisnapsauta tai paina hiiren "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "    (vaihtoehtoisesti kaksoisnapsauta tai paina hiiren "
 

-#: src/textview.c:886
+#: src/textview.c:852

 msgid "mouse button)\n"
 msgstr "keskipainiketta)\n"
 
 msgid "mouse button)\n"
 msgstr "keskipainiketta)\n"
 

-#: src/textview.c:887
+#: src/textview.c:853

 msgid "     - Or use "
 msgstr "\t— tai käytä "
 
 msgid "     - Or use "
 msgstr "\t— tai käytä "
 

-#: src/textview.c:888
+#: src/textview.c:854

 msgid "'Open with...'"
 msgstr "”Avaa ohjelmalla…”"
 
 msgid "'Open with...'"
 msgstr "”Avaa ohjelmalla…”"
 

-#: src/textview.c:889
+#: src/textview.c:855

 msgid " (Shortcut key: 'o')\n"
 msgstr " (pikanäppäin: ’o’)\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (pikanäppäin: ’o’)\n"
 

-#: src/textview.c:981
+#: src/textview.c:944

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -10893,7 +11362,7 @@ msgid ""
 "Exit code %d\n"
 msgstr ""
 "Komento jolla näytetään liite tekstinä epäonnistui:\n"
 "Exit code %d\n"
 msgstr ""
 "Komento jolla näytetään liite tekstinä epäonnistui:\n"

-"      %s\n"
+"\t%s\n"

 "Poistumisarvo %d\n"
 
 #: src/textview.c:2492
 "Poistumisarvo %d\n"
 
 #: src/textview.c:2492


@@ -10922,226 +11391,234 @@ msgstr "Khalasteluyritysvaroitus"
 msgid "_Open URL"
 msgstr "_Avaa"
 
 msgid "_Open URL"
 msgstr "_Avaa"
 

-#: src/toolbar.c:162 src/toolbar.c:1490
+#: src/toolbar.c:166 src/toolbar.c:1535

 msgid "Receive Mail on all Accounts"
 msgstr "Hae viestit kaikille tileille"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Hae viestit kaikille tileille"
 

-#: src/toolbar.c:163 src/toolbar.c:1504
+#: src/toolbar.c:167 src/toolbar.c:1549

 msgid "Receive Mail on current Account"
 msgstr "Hae viestit tälle tilille"
 
 msgid "Receive Mail on current Account"
 msgstr "Hae viestit tälle tilille"
 

-#: src/toolbar.c:164 src/toolbar.c:1510
+#: src/toolbar.c:168 src/toolbar.c:1555

 msgid "Send Queued Messages"
 msgstr "Lähetä jonottavat viestit"
 
 msgid "Send Queued Messages"
 msgstr "Lähetä jonottavat viestit"
 

-#: src/toolbar.c:165 src/toolbar.c:1523
+#: src/toolbar.c:169 src/toolbar.c:1568

 msgid "Compose Email"
 msgstr "Kirjoita sähköpostia"
 
 msgid "Compose Email"
 msgstr "Kirjoita sähköpostia"
 

-#: src/toolbar.c:166 src/toolbar.c:1527
+#: src/toolbar.c:170 src/toolbar.c:1572

 msgid "Compose News"
 msgstr "Kirjoita keskusteluryhmäviesti"
 
 msgid "Compose News"
 msgstr "Kirjoita keskusteluryhmäviesti"
 

-#: src/toolbar.c:167 src/toolbar.c:1558 src/toolbar.c:1568
+#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624

 msgid "Reply to Message"
 msgstr "Vastaa viestiin"
 
 msgid "Reply to Message"
 msgstr "Vastaa viestiin"
 

-#: src/toolbar.c:168 src/toolbar.c:1575 src/toolbar.c:1585
+#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641

 msgid "Reply to Sender"
 msgstr "Vastaa lähettäjälle"
 
 msgid "Reply to Sender"
 msgstr "Vastaa lähettäjälle"
 

-#: src/toolbar.c:169 src/toolbar.c:1592 src/toolbar.c:1602
+#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658

 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 

-#: src/toolbar.c:170 src/toolbar.c:1609 src/toolbar.c:1619
+#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675

 msgid "Reply to Mailing-list"
 msgstr "Vastaa postituslistalle"
 
 msgid "Reply to Mailing-list"
 msgstr "Vastaa postituslistalle"
 

-#: src/toolbar.c:171 src/toolbar.c:1626 src/toolbar.c:1636
+#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692

 msgid "Forward Message"
 msgstr "Edelleenlähetä viesti"
 
 msgid "Forward Message"
 msgstr "Edelleenlähetä viesti"
 

-#: src/toolbar.c:172 src/toolbar.c:1643
+#: src/toolbar.c:176 src/toolbar.c:1699

 msgid "Trash Message"
 msgstr "Siirrä viesti roskiin"
 
 msgid "Trash Message"
 msgstr "Siirrä viesti roskiin"
 

-#: src/toolbar.c:173 src/toolbar.c:1649
+#: src/toolbar.c:177 src/toolbar.c:1705

 msgid "Delete Message"
 msgstr "Poista viesti"
 
 msgid "Delete Message"
 msgstr "Poista viesti"
 

-#: src/toolbar.c:175 src/toolbar.c:1661
+#: src/toolbar.c:179 src/toolbar.c:1717

 msgid "Go to Previous Unread Message"
 msgstr "Mene edelliseen lukemattomaan viestiin"
 
 msgid "Go to Previous Unread Message"
 msgstr "Mene edelliseen lukemattomaan viestiin"
 

-#: src/toolbar.c:176 src/toolbar.c:1668
+#: src/toolbar.c:180 src/toolbar.c:1724

 msgid "Go to Next Unread Message"
 msgstr "Mene seuraavaan lukemattomaan viestiin"
 
 msgid "Go to Next Unread Message"
 msgstr "Mene seuraavaan lukemattomaan viestiin"
 

-#: src/toolbar.c:179
+#: src/toolbar.c:183

 msgid "Learn Spam or Ham"
 msgstr "Tunnista roskapostia vai ei"
 
 msgid "Learn Spam or Ham"
 msgstr "Tunnista roskapostia vai ei"
 

-#: src/toolbar.c:181 src/toolbar.c:1677
+#: src/toolbar.c:185 src/toolbar.c:1733

 msgid "Send Message"
 msgstr "Lähetä viesti"
 
 msgid "Send Message"
 msgstr "Lähetä viesti"
 

-#: src/toolbar.c:182 src/toolbar.c:1683
+#: src/toolbar.c:186 src/toolbar.c:1739

 msgid "Put into queue folder and send later"
 msgstr "Laita viesti jonoon ja lähetä myöhemmin"
 
 msgid "Put into queue folder and send later"
 msgstr "Laita viesti jonoon ja lähetä myöhemmin"
 

-#: src/toolbar.c:183 src/toolbar.c:1689
+#: src/toolbar.c:187 src/toolbar.c:1745

 msgid "Save to draft folder"
 msgstr "Tallenna luonnoksiin"
 
 msgid "Save to draft folder"
 msgstr "Tallenna luonnoksiin"
 

-#: src/toolbar.c:184 src/toolbar.c:1695
+#: src/toolbar.c:188 src/toolbar.c:1751

 msgid "Insert file"
 msgstr "Lisää tiedosto"
 
 msgid "Insert file"
 msgstr "Lisää tiedosto"
 

-#: src/toolbar.c:185 src/toolbar.c:1701
+#: src/toolbar.c:189 src/toolbar.c:1757

 msgid "Attach file"
 msgstr "Liitä tiedosto"
 
 msgid "Attach file"
 msgstr "Liitä tiedosto"
 

-#: src/toolbar.c:186 src/toolbar.c:1707
+#: src/toolbar.c:190 src/toolbar.c:1763

 msgid "Insert signature"
 msgstr "Lisää allekirjoitus"
 
 msgid "Insert signature"
 msgstr "Lisää allekirjoitus"
 

-#: src/toolbar.c:187 src/toolbar.c:1713
+#: src/toolbar.c:191 src/toolbar.c:1769

 msgid "Edit with external editor"
 msgstr "Muokkaa ulkoisella muokkaimella"
 
 msgid "Edit with external editor"
 msgstr "Muokkaa ulkoisella muokkaimella"
 

-#: src/toolbar.c:188 src/toolbar.c:1719
+#: src/toolbar.c:192 src/toolbar.c:1775

 msgid "Wrap long lines of current paragraph"
 msgstr "Rivitä pitkät rivit tässä kappaleessa"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Rivitä pitkät rivit tässä kappaleessa"
 

-#: src/toolbar.c:189 src/toolbar.c:1725
+#: src/toolbar.c:193 src/toolbar.c:1781

 msgid "Wrap all long lines"
 msgstr "Rivitä kaikki pitkät rivit"
 
 msgid "Wrap all long lines"
 msgstr "Rivitä kaikki pitkät rivit"
 

-#: src/toolbar.c:192 src/toolbar.c:1738
+#: src/toolbar.c:196 src/toolbar.c:1794

 msgid "Check spelling"
 msgstr "Tarkista oikeinkirjoitus"
 
 msgid "Check spelling"
 msgstr "Tarkista oikeinkirjoitus"
 

-#: src/toolbar.c:194
-msgid "Sylpheed-Claws Actions Feature"
-msgstr "Sylpheedin toiminto-ominaisuus"
+#: src/toolbar.c:198
+msgid "Claws Mail Actions Feature"
+msgstr "Claws Mailin toiminto-ominaisuus"
+
+#: src/toolbar.c:199 src/toolbar.c:1817
+msgid "Cancel receiving"
+msgstr "Peruuta haku"

 
 

-#: src/toolbar.c:214
+#: src/toolbar.c:219

 msgid "/Reply with _quote"
 msgstr "Vastaa _lainauksin"
 
 msgid "/Reply with _quote"
 msgstr "Vastaa _lainauksin"
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/_Reply without quote"
 msgstr "_Vastaa lainauksitta"
 
 msgid "/_Reply without quote"
 msgstr "_Vastaa lainauksitta"
 

-#: src/toolbar.c:219
+#: src/toolbar.c:224

 msgid "/Reply to all with _quote"
 msgstr "Vastaa kaikille _lainauksin"
 
 msgid "/Reply to all with _quote"
 msgstr "Vastaa kaikille _lainauksin"
 

-#: src/toolbar.c:220
+#: src/toolbar.c:225

 msgid "/_Reply to all without quote"
 msgstr "_Vastaa kaikille lainauksitta"
 
 msgid "/_Reply to all without quote"
 msgstr "_Vastaa kaikille lainauksitta"
 

-#: src/toolbar.c:224
+#: src/toolbar.c:229

 msgid "/Reply to list with _quote"
 msgstr "Vastaa postituslistalle _lainauksin"
 
 msgid "/Reply to list with _quote"
 msgstr "Vastaa postituslistalle _lainauksin"
 

-#: src/toolbar.c:225
+#: src/toolbar.c:230

 msgid "/_Reply to list without quote"
 msgstr "_Vastaa postituslistalle lainauksitta"
 
 msgid "/_Reply to list without quote"
 msgstr "_Vastaa postituslistalle lainauksitta"
 

-#: src/toolbar.c:229
+#: src/toolbar.c:234

 msgid "/Reply to sender with _quote"
 msgstr "Vastaa lähettäjälle _lainauksin"
 
 msgid "/Reply to sender with _quote"
 msgstr "Vastaa lähettäjälle _lainauksin"
 

-#: src/toolbar.c:230
+#: src/toolbar.c:235

 msgid "/_Reply to sender without quote"
 msgstr "_Vastaa lähettäjälle lainauksitta"
 
 msgid "/_Reply to sender without quote"
 msgstr "_Vastaa lähettäjälle lainauksitta"
 

-#: src/toolbar.c:236
+#: src/toolbar.c:241

 msgid "/Redirec_t"
 msgstr "_Uudelleenohjaa"
 
 msgid "/Redirec_t"
 msgstr "_Uudelleenohjaa"
 

-#: src/toolbar.c:389
+#: src/toolbar.c:245
+msgid "/Learn as _Spam"
+msgstr "Tunnista _roskapostiksi"
+
+#: src/toolbar.c:246
+msgid "/Learn as _Ham"
+msgstr "Tunnista _ei-roskapostiksi"
+
+#: src/toolbar.c:399

 msgid "Get Mail"
 msgstr "Hae kaikki"
 
 msgid "Get Mail"
 msgstr "Hae kaikki"
 

-#: src/toolbar.c:395 src/toolbar.c:486
+#: src/toolbar.c:403
+msgid "Toolbar|Compose"
+msgstr "Kirjoita"
+
+#: src/toolbar.c:405 src/toolbar.c:496

 msgid "Reply"
 msgstr "Vastaa"
 
 msgid "Reply"
 msgstr "Vastaa"
 

-#: src/toolbar.c:396 src/toolbar.c:487
+#: src/toolbar.c:406 src/toolbar.c:497

 msgid "All"
 msgstr "Kaikille"
 
 msgid "All"
 msgstr "Kaikille"
 

-#: src/toolbar.c:397 src/toolbar.c:488
+#: src/toolbar.c:407 src/toolbar.c:498

 msgid "Sender"
 msgstr "Lähettäjälle"
 
 msgid "Sender"
 msgstr "Lähettäjälle"
 

-#: src/toolbar.c:402 src/toolbar.c:493
+#: src/toolbar.c:412 src/toolbar.c:503

 msgid "Spam"
 msgstr "Roskaposti"
 
 msgid "Spam"
 msgstr "Roskaposti"
 

-#: src/toolbar.c:405 src/toolbar.c:495
+#: src/toolbar.c:415 src/toolbar.c:505

 msgid "Next"
 msgstr "Seuraava"
 
 msgid "Next"
 msgstr "Seuraava"
 

-#: src/toolbar.c:443
+#: src/toolbar.c:453

 msgid "Send later"
 msgstr "Lähetä myöhemmin"
 
 msgid "Send later"
 msgstr "Lähetä myöhemmin"
 

-#: src/toolbar.c:444
+#: src/toolbar.c:454

 msgid "Draft"
 msgstr "Luonnos"
 
 msgid "Draft"
 msgstr "Luonnos"
 

-#: src/toolbar.c:446
-msgid "Insert"
-msgstr "Lisää"
-
-#: src/toolbar.c:447
-msgid "Attach"
-msgstr "Liitä"
-
-#: src/toolbar.c:1497
+#: src/toolbar.c:1542

 msgid "Receive Mail on selected Account"
 msgstr "Hae viestit kaikille tileille"
 
 msgid "Receive Mail on selected Account"
 msgstr "Hae viestit kaikille tileille"
 

-#: src/toolbar.c:1534
+#: src/toolbar.c:1579

 msgid "Compose with selected Account"
 msgstr "Kirjoita viesti valitulla tilillä"
 
 msgid "Compose with selected Account"
 msgstr "Kirjoita viesti valitulla tilillä"
 

-#: src/toolbar.c:1540
+#: src/toolbar.c:1585

 msgid "Ham"
 msgstr "Ei-roskaposti"
 
 msgid "Ham"
 msgstr "Ei-roskaposti"
 

-#: src/toolbar.c:1548
+#: src/toolbar.c:1593

 msgid "Learn Spam"
 msgstr "Tunnista roskapostiksi"
 
 msgid "Learn Spam"
 msgstr "Tunnista roskapostiksi"
 

-#: src/toolbar.c:1552
+#: src/toolbar.c:1597

 msgid "Learn Ham"
 msgstr "Tunnista ei-roskapostiksi"
 
 msgid "Learn Ham"
 msgstr "Tunnista ei-roskapostiksi"
 

-#: src/wizard.c:459
-msgid "Welcome to Sylpheed-Claws "
-msgstr "Terve tuloa Sylpheed-Clawsiin."
+#: src/toolbar.c:1607
+msgid "Learn as..."
+msgstr "Tunnista…"

 
 

-#: src/wizard.c:469
-msgid "Sylpheed-Claws Team"
-msgstr "Sylpheed-Claws-tiimi"
+#: src/wizard.c:461
+msgid "Welcome Mail Subject|Welcome to Claws Mail"
+msgstr "Claws Mail"

 
 

-#: src/wizard.c:475
+#: src/wizard.c:484

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"

-"Welcome to Sylpheed-Claws\n"
-"-------------------------\n"
+"Welcome to Claws Mail\n"
+"---------------------\n"

 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"
 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"

-"Sylpheed-Claws has lots of extra features accessible via plugins,\n"
+"Claws Mail has lots of extra features accessible via plugins,\n"

 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"
 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"


@@ -11152,7 +11629,7 @@ msgid ""
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"

-"You can find further information in the Sylpheed-Claws manual,\n"
+"You can find further information in the Claws Mail manual,\n"

 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"
 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"


@@ -11166,7 +11643,7 @@ msgid ""
 "\n"
 "LICENSE\n"
 "-------\n"
 "\n"
 "LICENSE\n"
 "-------\n"

-"Sylpheed-Claws is free software, released under the terms\n"
+"Claws Mail is free software, released under the terms\n"

 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"


@@ -11174,12 +11651,12 @@ msgid ""
 "\n"
 "DONATIONS\n"
 "---------\n"
 "\n"
 "DONATIONS\n"
 "---------\n"

-"If you wish to donate to the Sylpheed-Claws project you can do\n"
+"If you wish to donate to the Claws Mail project you can do\n"

 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"
 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"

-"Tervetuloa Sylpheed-Clawsiin\n"
+"Tervetuloa Claws Mailiin\n"

 "----------------------------\n"
 "\n"
 "Nyt kun tili on valmis, viestejä voi hakea\n"
 "----------------------------\n"
 "\n"
 "Nyt kun tili on valmis, viestejä voi hakea\n"


@@ -11191,7 +11668,7 @@ msgstr ""
 "ja yleisiä asetuksia valikosta\n"
 "Asetukset→Asetukset\n"
 "\n"
 "ja yleisiä asetuksia valikosta\n"
 "Asetukset→Asetukset\n"
 "\n"

-"Lisätietoja on Sylpheed-Clawsin ohjeissa,\n"
+"Lisätietoja on Claws Mailin ohjeissa,\n"

 "jotka löytää valikosta Ohje→Opas\n"
 "tai allaolevasta verkko-osoitteesta.\n"
 "\n"
 "jotka löytää valikosta Ohje→Opas\n"
 "tai allaolevasta verkko-osoitteesta.\n"
 "\n"


@@ -11205,7 +11682,7 @@ msgstr ""
 "\n"
 "LISENSSI\n"
 "--------\n"
 "\n"
 "LISENSSI\n"
 "--------\n"

-"Sylpheed-Claws is free software, released under the terms\n"
+"Claws Mail is free software, released under the terms\n"

 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"


@@ -11213,58 +11690,72 @@ msgstr ""
 "\n"
 "AVUSTUS\n"
 "-------\n"
 "\n"
 "AVUSTUS\n"
 "-------\n"

-"Sylpheed-Claws-projektia voi auttaa osoitteessa <%s>.\n"
+"Claws Mail -projektia voi auttaa osoitteessa <%s>.\n"

 "\n"
 
 "\n"
 

-#: src/wizard.c:551
+#: src/wizard.c:564

 msgid "Please enter the mailbox name."
 msgstr "Anna postilaatikon nimi."
 
 msgid "Please enter the mailbox name."
 msgstr "Anna postilaatikon nimi."
 

-#: src/wizard.c:579
+#: src/wizard.c:592

 msgid "Please enter your name and email address."
 msgstr "Anna nimi ja sähköpostiosoite"
 
 msgid "Please enter your name and email address."
 msgstr "Anna nimi ja sähköpostiosoite"
 

-#: src/wizard.c:590
+#: src/wizard.c:603

 msgid "Please enter your receiving server and username."
 msgstr "Anna vastaanottopalvelin ja käyttäjätunnus"
 
 msgid "Please enter your receiving server and username."
 msgstr "Anna vastaanottopalvelin ja käyttäjätunnus"
 

-#: src/wizard.c:600
+#: src/wizard.c:613

 msgid "Please enter your username."
 msgstr "Anna käyttäjätunnus"
 
 msgid "Please enter your username."
 msgstr "Anna käyttäjätunnus"
 

-#: src/wizard.c:610
+#: src/wizard.c:623

 msgid "Please enter your SMTP server."
 msgstr "Anna SMTP-palvelin"
 
 msgid "Please enter your SMTP server."
 msgstr "Anna SMTP-palvelin"
 

-#: src/wizard.c:621
+#: src/wizard.c:634

 msgid "Please enter your SMTP username."
 msgstr "Anna SMTP-käyttäjätunnus"
 
 msgid "Please enter your SMTP username."
 msgstr "Anna SMTP-käyttäjätunnus"
 

-#: src/wizard.c:829
+#: src/wizard.c:881

 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Nimesi:</span>"
 
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Nimesi:</span>"
 

-#: src/wizard.c:834
+#: src/wizard.c:886

 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Sähköpostiosoitteesi:</span>"
 
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Sähköpostiosoitteesi:</span>"
 

-#: src/wizard.c:838
+#: src/wizard.c:890

 msgid "Your organization:"
 msgstr "Organisaatio: "
 
 msgid "Your organization:"
 msgstr "Organisaatio: "
 

-#: src/wizard.c:858
+#: src/wizard.c:913
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr ""
+"Voit myös antaa täyden hakemistonimen, kuten: /home/flammie/Documents/Mail/"
+
+#: src/wizard.c:917

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Sähköpostilaatikko:</span>"
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Sähköpostilaatikko:</span>"
 

-#: src/wizard.c:888
+#: src/wizard.c:954
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr ""
+"Porttinumeron voi lisätä loppuun: mail.example.com:25"
+
+#: src/wizard.c:958

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">SMTP-palvelin:</span>"
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">SMTP-palvelin:</span>"
 

-#: src/wizard.c:891
+#: src/wizard.c:961

 msgid "Use authentication"
 msgstr "Käytä todennusta"
 
 msgid "Use authentication"
 msgstr "Käytä todennusta"
 

-#: src/wizard.c:905
+#: src/wizard.c:975

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11272,7 +11763,7 @@ msgstr ""
 "SMTP-käyttäjätunnus:\n"
 "<span size=\"small\">(jätä tyhjäksi käyttääksesi vastaanottotunnusta)</span>"
 
 "SMTP-käyttäjätunnus:\n"
 "<span size=\"small\">(jätä tyhjäksi käyttääksesi vastaanottotunnusta)</span>"
 

-#: src/wizard.c:918
+#: src/wizard.c:988

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11280,101 +11771,244 @@ msgstr ""
 "SMTP-salasana:\n"
 "<span size=\"small\">(jätä tyhjäksi käyttääksesi vastaanottosalasanaa</span>"
 
 "SMTP-salasana:\n"
 "<span size=\"small\">(jätä tyhjäksi käyttääksesi vastaanottosalasanaa</span>"
 

-#: src/wizard.c:945 src/wizard.c:957 src/wizard.c:1041
+#: src/wizard.c:1000
+msgid "Use SSL to connect to SMTP server"
+msgstr "Käytä SSL:ää SMTP-yhteyden ottamiseen"
+
+#: src/wizard.c:1007 src/wizard.c:1230
+msgid "Use SSL via STARTTLS"
+msgstr "Käytää SSL:ää STARTTLS:llä"
+
+#: src/wizard.c:1037 src/wizard.c:1056 src/wizard.c:1165

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Palvelin-osoite:</span>"
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Palvelin-osoite:</span>"
 

-#: src/wizard.c:962
+#: src/wizard.c:1076

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Paikallinen postilaatikko:</span>"
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Paikallinen postilaatikko:</span>"
 

-#: src/wizard.c:1002
+#: src/wizard.c:1127

 msgid "IMAP"
 msgstr "IMAP"
 
 msgid "IMAP"
 msgstr "IMAP"
 

-#: src/wizard.c:1033
+#: src/wizard.c:1152

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Palvelintyyppi:</span>"
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Palvelintyyppi:</span>"
 

-#: src/wizard.c:1052
+#: src/wizard.c:1161
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr ""
+"Portin numeron voi lisätä loppuun: mail.example.com:110"
+
+#: src/wizard.c:1176

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Käyttäjänimi:</span>"
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Käyttäjänimi:</span>"
 

-#: src/wizard.c:1068
+#: src/wizard.c:1192

 msgid "Password:"
 msgstr "Salasana:"
 
 msgid "Password:"
 msgstr "Salasana:"
 

-#: src/wizard.c:1080
+#: src/wizard.c:1204

 msgid "IMAP server directory:"
 msgstr "IMAP-palvelimen hakemisto:"
 
 msgid "IMAP server directory:"
 msgstr "IMAP-palvelimen hakemisto:"
 

-#: src/wizard.c:1104
-msgid "Use SSL to connect to SMTP server"
-msgstr "Käytä SSL:ää SMTP-yhteyden ottamiseen"
-
-#: src/wizard.c:1111
+#: src/wizard.c:1223

 msgid "Use SSL to connect to receiving server"
 msgstr "Käytä SSL:ää vastaanottoyhteyden ottamiseen"
 
 msgid "Use SSL to connect to receiving server"
 msgstr "Käytä SSL:ää vastaanottoyhteyden ottamiseen"
 

-#: src/wizard.c:1227
-msgid "Sylpheed-Claws Setup Wizard"
-msgstr "Sylpheed-Claws-asetusvelho"
+#: src/wizard.c:1347
+msgid "Claws Mail Setup Wizard"
+msgstr "Claws Mail -asetusluotsi"

 
 

-#: src/wizard.c:1259
-msgid "Welcome to Sylpheed-Claws"
-msgstr "Terve tuloa Sylpheed-Clawsiin."
+#: src/wizard.c:1379
+msgid "Welcome to Claws Mail"
+msgstr "Claws Mail."

 
 

-#: src/wizard.c:1267
+#: src/wizard.c:1387

 msgid ""
 msgid ""

-"Welcome to the Sylpheed-Claws setup wizard.\n"
+"Welcome to the Claws Mail setup wizard.\n"

 "\n"
 "We will begin by defining some basic information about you and your most "
 "\n"
 "We will begin by defining some basic information about you and your most "

-"common mail options so that you can start to use Sylpheed-Claws in less than "
+"common mail options so that you can start to use Claws Mail in less than "

 "five minutes."
 msgstr ""
 "five minutes."
 msgstr ""

-"Terve tuloa Sylpheed-Clawsin asetusvelhoon.\n"
+"Claws Mailin asetusvelho.\n"

 "\n"
 "Aloita määrittelemällä joitain perustietojaitsestäsi ja "
 "sähköpostiyhteydestäsi.Tämän hoidettuasi pääset käyttämäänSylpheed-Clawsia."
 
 "\n"
 "Aloita määrittelemällä joitain perustietojaitsestäsi ja "
 "sähköpostiyhteydestäsi.Tämän hoidettuasi pääset käyttämäänSylpheed-Clawsia."
 

-#: src/wizard.c:1280
+#: src/wizard.c:1400

 msgid "About You"
 msgstr "Tietoja käyttäjästä"
 
 msgid "About You"
 msgstr "Tietoja käyttäjästä"
 

-#: src/wizard.c:1282 src/wizard.c:1291 src/wizard.c:1300 src/wizard.c:1310
-#: src/wizard.c:1320
+#: src/wizard.c:1402 src/wizard.c:1411 src/wizard.c:1420 src/wizard.c:1430

 msgid "Bold fields must be completed"
 msgstr "Hakemistoa ei voitu avata."
 
 msgid "Bold fields must be completed"
 msgstr "Hakemistoa ei voitu avata."
 

-#: src/wizard.c:1289
+#: src/wizard.c:1409

 msgid "Receiving mail"
 msgstr "Viestien vastaanotto"
 
 msgid "Receiving mail"
 msgstr "Viestien vastaanotto"
 

-#: src/wizard.c:1298
+#: src/wizard.c:1418

 msgid "Sending mail"
 msgstr "Viestien lähettäminen"
 
 msgid "Sending mail"
 msgstr "Viestien lähettäminen"
 

-#: src/wizard.c:1308
+#: src/wizard.c:1428

 msgid "Saving mail on disk"
 msgstr "Viestien tallentaminen levylle"
 
 msgid "Saving mail on disk"
 msgstr "Viestien tallentaminen levylle"
 

-#: src/wizard.c:1318
-msgid "Security"
-msgstr "Tietoturva"
-
-#: src/wizard.c:1328
+#: src/wizard.c:1438

 msgid "Configuration finished"
 msgstr "Asetukset tehty"
 
 msgid "Configuration finished"
 msgstr "Asetukset tehty"
 

-#: src/wizard.c:1336
+#: src/wizard.c:1446

 msgid ""
 msgid ""

-"Sylpheed-Claws is now ready.\n"
+"Claws Mail is now ready.\n"

 "\n"
 "Click Save to start."
 msgstr ""
 "\n"
 "Click Save to start."
 msgstr ""

-"Sylpheed-Claws on valmis\n"
+"Claws Mail on valmis\n"

 "\n"
 "\n"

-"Tallenna-painike aloittaa."
+"Tallenna-painikkeella aloitetaan."
+
+#~ msgid "/---"
+#~ msgstr "---"
+
+#~ msgid "%.2fMB"
+#~ msgstr "%.2f Mt"
+
+#~ msgid "Message Bcc format error."
+#~ msgstr "Viestin piilokopioiden muodon virhe."
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "The Sylpheed-Claws Team\n"
+#~ msgstr "Sylpheed-Claws-tiimi\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Icons\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Kuvake\n"
+
+#~ msgid "1.0.5 or previous"
+#~ msgstr "1.0.5 tai vanhemman"
+
+#~ msgid "1.9.15 or previous"
+#~ msgstr "1.9.15 tai vanhemman"
+
+#~ msgid ""
+#~ "Your version of Sylpheed-Claws is newer than the version the ClamAV "
+#~ "plugin was built with"
+#~ msgstr ""
+#~ "Sylpheed-Claws on uudempi kuin mille ClamAV-liitännäinen on käännetty"
+
+#~ msgid "Your version of Sylpheed-Claws is too old for the ClamAV plugin"
+#~ msgstr "Sylpheed-Claws on liian vanha ClamAV-liitännäiselle"
+
+#~ msgid ""
+#~ "Your sylpheed-claws version is newer than the version the plugin was "
+#~ "built with"
+#~ msgstr "Sylpheed-Claws on uudempi kuin mille liitännäinen on käännetty"
+
+#~ msgid "Your sylpheed-claws version is too old"
+#~ msgstr "Sylpheed-Claws on liian vanha"
+
+#~ msgid ""
+#~ "Your version of Sylpheed-Claws is newer than the version the PGP/Core "
+#~ "plugin was built with"
+#~ msgstr ""
+#~ "Sylpheed-Claws on uudempi kuin jota varten PGP-Core-liitännäinen on "
+#~ "käännetty"
+
+#~ msgid "Your version of Sylpheed-Claws is too old for the PGP/Core plugin"
+#~ msgstr "Sylpheed-Claws on liian vanha PGP-Core-liitännäiselle"
+
+#~ msgid ""
+#~ "Your version of Sylpheed-Claws is newer than the version the PGP/inline "
+#~ "plugin was built with"
+#~ msgstr ""
+#~ "Sylpheed-Claws on uudempi kuin jota varten PGP-inline-liitännäinen on "
+#~ "käännetty"
+
+#~ msgid "Your version of Sylpheed-Claws is too old for the PGP/inline plugin"
+#~ msgstr "Sylpheed-Claws on liian vanha PGP-inline-liitännäiselle"
+
+#~ msgid ""
+#~ "Your version of Sylpheed-Claws is newer than the version the PGP/MIME "
+#~ "plugin was built with"
+#~ msgstr "Sylpheed-Claws on uudempi kuin jota varten PGP-MIME on käännetty"
+
+#~ msgid "Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"
+#~ msgstr "Sylpheed-Claws on liian vanha PGP-MIME-liitännäiselle"
+
+#~ msgid ""
+#~ "Your version of Sylpheed-Claws is newer than the version the SpamAssassin "
+#~ "plugin was built with"
+#~ msgstr ""
+#~ "Sylpheed-Claws on uudempi kuin jota varten SpamAssassin-liitännäinen on "
+#~ "käännetty"
+
+#~ msgid ""
+#~ "Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"
+#~ msgstr "Sylpheed-Claws on liian vanha SpamAssassinille"
+
+#~ msgid ""
+#~ "Your version of Sylpheed-Claws is newer than the version the Trayicon "
+#~ "plugin was built with"
+#~ msgstr ""
+#~ "Sylpheed-Claws on uudempi kuin jota varten Trayicon-liitännäinen on "
+#~ "käännetty"
+
+#~ msgid "Your version of Sylpheed-Claws is too old for the Trayicon plugin"
+#~ msgstr "Sylpheed-Claws on liian vanha Trayicon-liitännäiselle"
+
+#~ msgid "Unsupported (%s)"
+#~ msgstr "Ei tuettu (%s)"
+
+#~ msgid "Ask whether to insert or attach"
+#~ msgstr "Kysy, liitetäänkö vai sisällytetäänkö"
+
+#~ msgid "Always insert"
+#~ msgstr "Sisällytä aina"
+
+#~ msgid "Always attach"
+#~ msgstr "Liitä aina"
+
+#~ msgid "Pick color for 'color %d' "
+#~ msgstr "Valitse väri 'color %d' "
+
+#~ msgid "every"
+#~ msgstr "joka"
+
+#~ msgid "Set displayed columns"
+#~ msgstr "Valitse näytettävät tiedot"
+
+#~ msgid " Folder list... "
+#~ msgstr " kansioluettelossa…"
+
+#~ msgid "Messages will be marked until execution if this is turned off"
+#~ msgstr ""
+#~ "Viestit merkitään suorittamista odottaessaan, jos tämä on pois päältä"
+
+#~ msgid "Already trying to send\n"
+#~ msgstr "Ollaan jo lähettämässä\n"
+
+#~ msgid "Use current account for these rules"
+#~ msgstr "Käytä nykyistä tiliä näille säännöille"
+
+#~ msgid "Sylpheed-Claws Team"
+#~ msgstr "Sylpheed-Claws-tiimi"
+
+#~ msgid "Welcome to Sylpheed-Claws"
+#~ msgstr "Terve tuloa Sylpheed-Clawsiin."
+
+#~ msgid "Security"
+#~ msgstr "Tietoturva"

 
 #~ msgid ""
 #~ "New messages will be checked in this order. Check the boxes\n"
 
 #~ msgid ""
 #~ "New messages will be checked in this order. Check the boxes\n"


@@ -11655,9 +12289,6 @@ msgstr ""
 #~ msgid "Import"
 #~ msgstr "Tuo"
 
 #~ msgid "Import"
 #~ msgstr "Tuo"
 

-#~ msgid "Importing file:"
-#~ msgstr "Tuotava tiedosto:"
-

 #~ msgid "Draft them"
 #~ msgstr "Tallenna"
 
 #~ msgid "Draft them"
 #~ msgstr "Tallenna"
 


@@ -12024,9 +12655,6 @@ msgstr ""
 #~ msgid "can't close folder\n"
 #~ msgstr "kansion sulkeminen ei onnistu\n"
 
 #~ msgid "can't close folder\n"
 #~ msgstr "kansion sulkeminen ei onnistu\n"
 

-#~ msgid "root folder %s does not exist\n"
-#~ msgstr "juurikansio %s puuttuu\n"
-

 #~ msgid "error occurred while getting LIST.\n"
 #~ msgstr "tapahtui virhe haettaessa LISTiä.\n"
 
 #~ msgid "error occurred while getting LIST.\n"
 #~ msgstr "tapahtui virhe haettaessa LISTiä.\n"
 


@@ -12138,9 +12766,6 @@ msgstr ""
 #~ msgid "Abcdef"
 #~ msgstr "Abcdef"
 
 #~ msgid "Abcdef"
 #~ msgstr "Abcdef"
 

-#~ msgid "Apply"
-#~ msgstr "Toteuta"
-

 #~ msgid "/_View/_Code set/---"
 #~ msgstr "---"
 
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "---"
 

diff --git a/po/it.po b/po/it.po
index 41b7301a940c8ec48beb9fa834f43b0f3ce81ae0..3a9292fa55b19c0df2d649b562ebafc68bf5ab8b 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -1,14 +1,14 @@
-# Italian translation of Sylpheed-Claws
-# Copyright (C) 2002-2004 Alessandro Maestri, 2004-2006 Andrea Spadaccini
+# Italian translation of Claws Mail
+# Copyright (C) 2002-2004 Alessandro Maestri, 2004-2007 Andrea Spadaccini

 # Alessandro Maestri <a.maestri@tiscalinet.it>, 2002 - 2004
 # Alessandro Maestri <a.maestri@tiscalinet.it>, 2002 - 2004

-# Andrea Spadaccini <a.spadaccini@catania.linux.it>, 2004 - 2006
+# Andrea Spadaccini <a.spadaccini@catania.linux.it>, 2004 - 2007

 #
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claws\n"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claws\n"

-"Report-Msgid-Bugs-To: paul@sylpheed.org\n"
-"POT-Creation-Date: 2006-10-30 07:42+0000\n"
-"PO-Revision-Date: 2006-11-05 10:32+0100\n"
+"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
+"POT-Creation-Date: 2007-01-08 07:07+0000\n"
+"PO-Revision-Date: 2007-01-06 18:07+0100\n"

 "Last-Translator: Andrea Spadaccini <a.spadaccini@catania.linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Andrea Spadaccini <a.spadaccini@catania.linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"


@@ -67,17 +67,25 @@ msgstr "(Senza titolo)"
 msgid "Delete account"
 msgstr "Elimina account"
 
 msgid "Delete account"
 msgstr "Elimina account"
 

-#: src/account.c:1458
+#: src/account.c:1461
+msgid "Accounts List Default Column Name|D"
+msgstr "D"
+
+#: src/account.c:1467

 msgid "Default account"
 msgstr "Account predefinito"
 
 msgid "Default account"
 msgstr "Account predefinito"
 

-#: src/account.c:1472
+#: src/account.c:1475
+msgid "Accounts List Get Column Name|G"
+msgstr "G"
+
+#: src/account.c:1481

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ricevi' preleva la mail dagli account selezionati"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Ricevi' preleva la mail dagli account selezionati"
 

-#: src/account.c:1479 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5677 src/compose.c:5968 src/editaddress.c:953
-#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:287
+#: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132
+#: src/compose.c:5824 src/compose.c:6115 src/editaddress.c:1041
+#: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364


@@ -85,11 +93,11 @@ msgstr "'Ricevi' preleva la mail dagli account selezionati"
 msgid "Name"
 msgstr "Nome"
 
 msgid "Name"
 msgstr "Nome"
 

-#: src/account.c:1486 src/prefs_account.c:1169 src/prefs_account.c:2696
+#: src/account.c:1495 src/prefs_account.c:1176 src/prefs_account.c:2712

 msgid "Protocol"
 msgstr "Protocollo"
 
 msgid "Protocol"
 msgstr "Protocollo"
 

-#: src/account.c:1493 src/ssl_manager.c:102
+#: src/account.c:1502 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Server"
 
 msgid "Server"
 msgstr "Server"
 


@@ -153,7 +161,7 @@ msgstr "--- Terminato: %s\n"
 msgid "Action's input/output"
 msgstr "Input/output dell'azione"
 
 msgid "Action's input/output"
 msgstr "Input/output dell'azione"
 

-#: src/action.c:1527
+#: src/action.c:1529

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -164,11 +172,11 @@ msgstr ""
 "('%%h' verrà sostituito con il testo inserito)\n"
 "  %s"
 
 "('%%h' verrà sostituito con il testo inserito)\n"
 "  %s"
 

-#: src/action.c:1532
+#: src/action.c:1534

 msgid "Action's hidden user argument"
 msgstr "Parametro nascosto dell'azione"
 
 msgid "Action's hidden user argument"
 msgstr "Parametro nascosto dell'azione"
 

-#: src/action.c:1536
+#: src/action.c:1538

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -179,7 +187,7 @@ msgstr ""
 "('%%u' verrà sostituito con il testo inserito)\n"
 "  %s"
 
 "('%%u' verrà sostituito con il testo inserito)\n"
 "  %s"
 

-#: src/action.c:1541
+#: src/action.c:1543

 msgid "Action's user argument"
 msgstr "Parametro utente per l'azione"
 
 msgid "Action's user argument"
 msgstr "Parametro utente per l'azione"
 


@@ -188,12 +196,12 @@ msgid "Add to address book"
 msgstr "Aggiungi alla rubrica"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
 msgstr "Aggiungi alla rubrica"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377

-#: src/toolbar.c:449
+#: src/toolbar.c:459

 msgid "Address"
 msgstr "Indirizzo"
 
 msgid "Address"
 msgstr "Indirizzo"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:761
-#: src/editaddress.c:825 src/editgroup.c:289
+#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:849
+#: src/editaddress.c:913 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Note"
 
 msgid "Remarks"
 msgstr "Note"
 


@@ -201,328 +209,318 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Seleziona la cartella della Rubrica"
 
 msgid "Select Address Book Folder"
 msgstr "Seleziona la cartella della Rubrica"
 

-#: src/addressbook.c:133 src/editaddress.c:759 src/editaddress.c:807
+#: src/addressbook.c:133 src/editaddress.c:847 src/editaddress.c:895

 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "Indirizzo email"
 
 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "Indirizzo email"
 

-#: src/addressbook.c:416
+#: src/addressbook.c:419

 msgid "/_Book"
 msgstr "/_Rubrica"
 
 msgid "/_Book"
 msgstr "/_Rubrica"
 

-#: src/addressbook.c:417
+#: src/addressbook.c:420

 msgid "/_Book/New _Book"
 msgstr "/_Rubrica/Nuovo _quaderno"
 
 msgid "/_Book/New _Book"
 msgstr "/_Rubrica/Nuovo _quaderno"
 

-#: src/addressbook.c:418
+#: src/addressbook.c:421

 msgid "/_Book/New _Folder"
 msgstr "/_Rubrica/Nuova _cartella"
 
 msgid "/_Book/New _Folder"
 msgstr "/_Rubrica/Nuova _cartella"
 

-#: src/addressbook.c:419
+#: src/addressbook.c:422

 msgid "/_Book/New _vCard"
 msgstr "/_Rubrica/Nuova _vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/_Rubrica/Nuova _vCard"
 

-#: src/addressbook.c:421
+#: src/addressbook.c:424

 msgid "/_Book/New _JPilot"
 msgstr "/_Rubrica/Nuovo _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/_Rubrica/Nuovo _JPilot"
 

-#: src/addressbook.c:424
+#: src/addressbook.c:427

 msgid "/_Book/New LDAP _Server"
 msgstr "/_Rubrica/Nuovo _Server LDAP"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/_Rubrica/Nuovo _Server LDAP"
 

-#: src/addressbook.c:426 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:432

 msgid "/_Book/---"
 msgstr "/_Rubrica/---"
 
 msgid "/_Book/---"
 msgstr "/_Rubrica/---"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:430

 msgid "/_Book/_Edit book"
 msgstr "/_Rubrica/_Modifica quaderno"
 
 msgid "/_Book/_Edit book"
 msgstr "/_Rubrica/_Modifica quaderno"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:431

 msgid "/_Book/_Delete book"
 msgstr "/_Rubrica/_Elimina quaderno"
 
 msgid "/_Book/_Delete book"
 msgstr "/_Rubrica/_Elimina quaderno"
 

-#: src/addressbook.c:430
+#: src/addressbook.c:433

 msgid "/_Book/_Save"
 msgstr "/_Rubrica/_Salva"
 
 msgid "/_Book/_Save"
 msgstr "/_Rubrica/_Salva"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:434

 msgid "/_Book/_Close"
 msgstr "/_Rubrica/_Chiudi"
 
 msgid "/_Book/_Close"
 msgstr "/_Rubrica/_Chiudi"
 

-#: src/addressbook.c:432
+#: src/addressbook.c:435

 msgid "/_Address"
 msgstr "/_Indirizzo"
 
 msgid "/_Address"
 msgstr "/_Indirizzo"
 

-#: src/addressbook.c:433
+#: src/addressbook.c:436

 msgid "/_Address/_Select all"
 msgstr "/_Indirizzo/Seleziona t_utti"
 
 msgid "/_Address/_Select all"
 msgstr "/_Indirizzo/Seleziona t_utti"
 

-#: src/addressbook.c:434 src/addressbook.c:438 src/addressbook.c:441
-#: src/addressbook.c:444
+#: src/addressbook.c:437 src/addressbook.c:441 src/addressbook.c:444
+#: src/addressbook.c:447

 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 

-#: src/addressbook.c:435
+#: src/addressbook.c:438

 msgid "/_Address/C_ut"
 msgstr "/_Indirizzo/_Taglia"
 
 msgid "/_Address/C_ut"
 msgstr "/_Indirizzo/_Taglia"
 

-#: src/addressbook.c:436
+#: src/addressbook.c:439

 msgid "/_Address/_Copy"
 msgstr "/_Indirizzo/_Copia"
 
 msgid "/_Address/_Copy"
 msgstr "/_Indirizzo/_Copia"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:440

 msgid "/_Address/_Paste"
 msgstr "/_Indirizzo/_Incolla"
 
 msgid "/_Address/_Paste"
 msgstr "/_Indirizzo/_Incolla"
 

-#: src/addressbook.c:439
+#: src/addressbook.c:442

 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:443

 msgid "/_Address/_Delete"
 msgstr "/_Indirizzo/_Elimina"
 
 msgid "/_Address/_Delete"
 msgstr "/_Indirizzo/_Elimina"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:445

 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:446

 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:448

 msgid "/_Address/_Mail To"
 msgstr "/_Indirizzo/_Scrivi a"
 
 msgid "/_Address/_Mail To"
 msgstr "/_Indirizzo/_Scrivi a"
 

-#: src/addressbook.c:446 src/compose.c:767 src/mainwindow.c:799
+#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:800

 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/St_rumenti"
 
 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/St_rumenti"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:450

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/St_rumenti/Importa file _LDIF..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/St_rumenti/Importa file _LDIF..."
 

-#: src/addressbook.c:448
+#: src/addressbook.c:451

 msgid "/_Tools/Import M_utt file..."
 msgstr "/St_rumenti/Importa file _MUTT..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/St_rumenti/Importa file _MUTT..."
 

-#: src/addressbook.c:449
+#: src/addressbook.c:452

 msgid "/_Tools/Import _Pine file..."
 msgstr "/St_rumenti/Importa file di _Pine..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/St_rumenti/Importa file di _Pine..."
 

-#: src/addressbook.c:450 src/mainwindow.c:808 src/mainwindow.c:831
-#: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
-#: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
+#: src/addressbook.c:453 src/mainwindow.c:809 src/mainwindow.c:832
+#: src/mainwindow.c:834 src/mainwindow.c:843 src/mainwindow.c:846
+#: src/mainwindow.c:850 src/messageview.c:306 src/messageview.c:327

 msgid "/_Tools/---"
 msgstr "/St_rumenti/---"
 
 msgid "/_Tools/---"
 msgstr "/St_rumenti/---"
 

-#: src/addressbook.c:451
+#: src/addressbook.c:454

 msgid "/_Tools/Export _HTML..."
 msgstr "/St_rumenti/Esporta _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/St_rumenti/Esporta _HTML..."
 

-#: src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Tools/Export LDI_F..."
 msgstr "/St_rumenti/Esporta LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/St_rumenti/Esporta LDI_F..."
 

-#: src/addressbook.c:453 src/compose.c:772 src/mainwindow.c:874
+#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:875

 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/_Aiuto"
 
 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/_Aiuto"
 

-#: src/addressbook.c:454 src/compose.c:773 src/mainwindow.c:880
+#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:881

 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/_Aiuto/_Informazioni su..."
 
 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/_Aiuto/_Informazioni su..."
 

-#: src/addressbook.c:459 src/addressbook.c:475 src/compose.c:540
-#: src/mainwindow.c:518 src/messageview.c:164
+#: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545
+#: src/mainwindow.c:519 src/messageview.c:164

 msgid "/_Edit"
 msgstr "/_Modifica"
 
 msgid "/_Edit"
 msgstr "/_Modifica"
 

-#: src/addressbook.c:460 src/addressbook.c:476
+#: src/addressbook.c:463 src/addressbook.c:479

 msgid "/_Delete"
 msgstr "/_Elimina"
 
 msgid "/_Delete"
 msgstr "/_Elimina"
 

-#: src/addressbook.c:461 src/addressbook.c:465 src/addressbook.c:474
-#: src/addressbook.c:477 src/addressbook.c:480 src/addressbook.c:484
-#: src/compose.c:519 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
-#: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:54
-#: src/news_gtk.c:57 src/news_gtk.c:59 src/plugins/trayicon/trayicon.c:102
-#: src/plugins/trayicon/trayicon.c:105 src/plugins/trayicon/trayicon.c:107
-#: src/summaryview.c:423 src/summaryview.c:427 src/summaryview.c:432
-#: src/summaryview.c:450 src/summaryview.c:471 src/summaryview.c:477
-msgid "/---"
-msgstr "/---"
-
-#: src/addressbook.c:462
+#: src/addressbook.c:465

 msgid "/New _Book"
 msgstr "/Nuovo _quaderno"
 
 msgid "/New _Book"
 msgstr "/Nuovo _quaderno"
 

-#: src/addressbook.c:463
+#: src/addressbook.c:466

 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 

-#: src/addressbook.c:464 src/addressbook.c:479
+#: src/addressbook.c:467 src/addressbook.c:482

 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 

-#: src/addressbook.c:466 src/addressbook.c:481
+#: src/addressbook.c:469 src/addressbook.c:484

 msgid "/C_ut"
 msgstr "/_Taglia"
 
 msgid "/C_ut"
 msgstr "/_Taglia"
 

-#: src/addressbook.c:467 src/addressbook.c:482
+#: src/addressbook.c:470 src/addressbook.c:485

 msgid "/_Copy"
 msgstr "/_Copia"
 
 msgid "/_Copy"
 msgstr "/_Copia"
 

-#: src/addressbook.c:468 src/addressbook.c:483
+#: src/addressbook.c:471 src/addressbook.c:486

 msgid "/_Paste"
 msgstr "/_Incolla"
 
 msgid "/_Paste"
 msgstr "/_Incolla"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:476

 msgid "/_Select all"
 msgstr "/_Seleziona tutto"
 
 msgid "/_Select all"
 msgstr "/_Seleziona tutto"
 

-#: src/addressbook.c:478
+#: src/addressbook.c:481

 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 

-#: src/addressbook.c:486
+#: src/addressbook.c:489

 msgid "/_Mail To"
 msgstr "/_Scrivi a"
 
 msgid "/_Mail To"
 msgstr "/_Scrivi a"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:491

 msgid "/_Browse Entry"
 msgstr "/Sf_oglia l'elemento"
 
 msgid "/_Browse Entry"
 msgstr "/Sf_oglia l'elemento"
 

-#: src/addressbook.c:501 src/crash.c:450 src/crash.c:469 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:132 src/prefs_themes.c:683
+#: src/addressbook.c:504 src/crash.c:453 src/crash.c:472 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_themes.c:683

 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Sconosciuto"
 
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Sconosciuto"
 

-#: src/addressbook.c:508 src/addressbook.c:527 src/importldif.c:126
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:126

 msgid "Success"
 msgstr "Completato"
 
 msgid "Success"
 msgstr "Completato"
 

-#: src/addressbook.c:509 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127

 msgid "Bad arguments"
 msgstr "Argomenti errati"
 
 msgid "Bad arguments"
 msgstr "Argomenti errati"
 

-#: src/addressbook.c:510 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128

 msgid "File not specified"
 msgstr "File non specificato"
 
 msgid "File not specified"
 msgstr "File non specificato"
 

-#: src/addressbook.c:511 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129

 msgid "Error opening file"
 msgstr "Errore durante l'apertura del file"
 
 msgid "Error opening file"
 msgstr "Errore durante l'apertura del file"
 

-#: src/addressbook.c:512 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130

 msgid "Error reading file"
 msgstr "Errore durante la lettura del file"
 
 msgid "Error reading file"
 msgstr "Errore durante la lettura del file"
 

-#: src/addressbook.c:513 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131

 msgid "End of file encountered"
 msgstr "Raggiunta la fine del file"
 
 msgid "End of file encountered"
 msgstr "Raggiunta la fine del file"
 

-#: src/addressbook.c:514 src/importldif.c:132
+#: src/addressbook.c:517 src/importldif.c:132

 msgid "Error allocating memory"
 msgstr "Errore durante l'allocazione della memoria"
 
 msgid "Error allocating memory"
 msgstr "Errore durante l'allocazione della memoria"
 

-#: src/addressbook.c:515 src/importldif.c:133
+#: src/addressbook.c:518 src/importldif.c:133

 msgid "Bad file format"
 msgstr "Formato del file errato"
 
 msgid "Bad file format"
 msgstr "Formato del file errato"
 

-#: src/addressbook.c:516 src/importldif.c:134
+#: src/addressbook.c:519 src/importldif.c:134

 msgid "Error writing to file"
 msgstr "Errore durante la scrittura del file"
 
 msgid "Error writing to file"
 msgstr "Errore durante la scrittura del file"
 

-#: src/addressbook.c:517 src/importldif.c:135
+#: src/addressbook.c:520 src/importldif.c:135

 msgid "Error opening directory"
 msgstr "Errore durante l'apertura della directory"
 
 msgid "Error opening directory"
 msgstr "Errore durante l'apertura della directory"
 

-#: src/addressbook.c:518 src/importldif.c:136
+#: src/addressbook.c:521 src/importldif.c:136

 msgid "No path specified"
 msgstr "Percorso non specificato"
 
 msgid "No path specified"
 msgstr "Percorso non specificato"
 

-#: src/addressbook.c:528
+#: src/addressbook.c:531

 msgid "Error connecting to LDAP server"
 msgstr "Errore durante la connessione col server LDAP"
 
 msgid "Error connecting to LDAP server"
 msgstr "Errore durante la connessione col server LDAP"
 

-#: src/addressbook.c:529
+#: src/addressbook.c:532

 msgid "Error initializing LDAP"
 msgstr "Errore durante l'inizializzazione LDAP"
 
 msgid "Error initializing LDAP"
 msgstr "Errore durante l'inizializzazione LDAP"
 

-#: src/addressbook.c:530
+#: src/addressbook.c:533

 msgid "Error binding to LDAP server"
 msgstr "Errore durante il binding col server LDAP"
 
 msgid "Error binding to LDAP server"
 msgstr "Errore durante il binding col server LDAP"
 

-#: src/addressbook.c:531
+#: src/addressbook.c:534

 msgid "Error searching LDAP database"
 msgstr "Errore durante la ricerca nel database LDAP"
 
 msgid "Error searching LDAP database"
 msgstr "Errore durante la ricerca nel database LDAP"
 

-#: src/addressbook.c:532
+#: src/addressbook.c:535

 msgid "Timeout performing LDAP operation"
 msgstr "Timeout durante un'operazione LDAP"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Timeout durante un'operazione LDAP"
 

-#: src/addressbook.c:533
+#: src/addressbook.c:536

 msgid "Error in LDAP search criteria"
 msgstr "Errore nel criterio di ricerca LDAP"
 
 msgid "Error in LDAP search criteria"
 msgstr "Errore nel criterio di ricerca LDAP"
 

-#: src/addressbook.c:534
+#: src/addressbook.c:537

 msgid "No LDAP entries found for search criteria"
 msgstr "Nessun record LDAP trovato per la ricerca specificata"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "Nessun record LDAP trovato per la ricerca specificata"
 

-#: src/addressbook.c:535
+#: src/addressbook.c:538

 msgid "LDAP search terminated on request"
 msgstr "Ricerca LDAP terminata su richiesta"
 
 msgid "LDAP search terminated on request"
 msgstr "Ricerca LDAP terminata su richiesta"
 

-#: src/addressbook.c:536
+#: src/addressbook.c:539

 msgid "Error starting TLS connection"
 msgstr "Errore durante la connessione TLS"
 
 msgid "Error starting TLS connection"
 msgstr "Errore durante la connessione TLS"
 

-#: src/addressbook.c:853
+#: src/addressbook.c:897

 msgid "Sources"
 msgstr "Sorgenti"
 
 msgid "Sources"
 msgstr "Sorgenti"
 

-#: src/addressbook.c:857 src/prefs_other.c:101 src/toolbar.c:190
-#: src/toolbar.c:1727
+#: src/addressbook.c:901 src/prefs_other.c:101 src/toolbar.c:194
+#: src/toolbar.c:1787

 msgid "Address book"
 msgstr "Rubrica"
 
 msgid "Address book"
 msgstr "Rubrica"
 

-#: src/addressbook.c:980
+#: src/addressbook.c:1033

 msgid "Lookup name:"
 msgstr "Cerca nome:"
 
 msgid "Lookup name:"
 msgstr "Cerca nome:"
 

-#: src/addressbook.c:1040 src/compose.c:2031 src/compose.c:4301
-#: src/compose.c:5523 src/compose.c:6286 src/summary_search.c:291
+#: src/addressbook.c:1106 src/compose.c:2129 src/compose.c:4446
+#: src/compose.c:5670 src/compose.c:6435 src/compose.c:9456
+#: src/summary_search.c:359

 msgid "To:"
 msgstr "A:"
 
 msgid "To:"
 msgstr "A:"
 

-#: src/addressbook.c:1044 src/compose.c:2015 src/compose.c:4044
-#: src/compose.c:4300
+#: src/addressbook.c:1110 src/compose.c:2113 src/compose.c:4182
+#: src/compose.c:4445 src/compose.c:9465

 msgid "Cc:"
 msgstr "Cc:"
 
 msgid "Cc:"
 msgstr "Cc:"
 

-#: src/addressbook.c:1048 src/compose.c:2018 src/compose.c:4075
+#: src/addressbook.c:1114 src/compose.c:2116 src/compose.c:4213

 msgid "Bcc:"
 msgstr "Bcc:"
 
 msgid "Bcc:"
 msgstr "Bcc:"
 

-#: src/addressbook.c:1283 src/addressbook.c:1329
+#: src/addressbook.c:1363 src/addressbook.c:1409

 msgid "Delete address(es)"
 msgstr "Elimina indirizzo/i"
 
 msgid "Delete address(es)"
 msgstr "Elimina indirizzo/i"
 

-#: src/addressbook.c:1284
+#: src/addressbook.c:1364

 msgid "This address data is readonly and cannot be deleted."
 msgstr "Questo indirizzo è in sola lettura e non può essere cancellato."
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Questo indirizzo è in sola lettura e non può essere cancellato."
 

-#: src/addressbook.c:1323
+#: src/addressbook.c:1403

 msgid "Delete group"
 msgstr "Elimina gruppo"
 
 msgid "Delete group"
 msgstr "Elimina gruppo"
 

-#: src/addressbook.c:1324
+#: src/addressbook.c:1404

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -530,29 +528,29 @@ msgstr ""
 "Cancellare il(i) gruppo(i)?\n"
 "Gli indirizzi contenuti non verranno persi."
 
 "Cancellare il(i) gruppo(i)?\n"
 "Gli indirizzi contenuti non verranno persi."
 

-#: src/addressbook.c:1330
+#: src/addressbook.c:1410

 msgid "Really delete the address(es)?"
 msgstr "Si vogliono veramente eliminare gli indirizzi?"
 
 msgid "Really delete the address(es)?"
 msgstr "Si vogliono veramente eliminare gli indirizzi?"
 

-#: src/addressbook.c:1932
+#: src/addressbook.c:2014

 msgid "Cannot paste. Target address book is readonly."
 msgstr "Impossibile incollare. La rubrica di destinazione è in sola lettura."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Impossibile incollare. La rubrica di destinazione è in sola lettura."
 

-#: src/addressbook.c:1943
+#: src/addressbook.c:2025

 msgid "Cannot paste into an address group."
 msgstr "Impossibile incollare in un gruppo di indirizzi."
 
 msgid "Cannot paste into an address group."
 msgstr "Impossibile incollare in un gruppo di indirizzi."
 

-#: src/addressbook.c:2619
+#: src/addressbook.c:2708

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Cancellare i risultati della query e gli indirizzi in '%s' ?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Cancellare i risultati della query e gli indirizzi in '%s' ?"
 

-#: src/addressbook.c:2622 src/addressbook.c:2648 src/addressbook.c:2655
+#: src/addressbook.c:2711 src/addressbook.c:2737 src/addressbook.c:2744

 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Elimina"
 
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Elimina"
 

-#: src/addressbook.c:2631
+#: src/addressbook.c:2720

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -561,19 +559,19 @@ msgstr ""
 "Cancellare '%s'? Se si cancella solo la cartella, gli indirizzi verranno "
 "spostati nella cartella superiore."
 
 "Cancellare '%s'? Se si cancella solo la cartella, gli indirizzi verranno "
 "spostati nella cartella superiore."
 

-#: src/addressbook.c:2634 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2723 src/imap_gtk.c:286 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Eliminazione cartella"
 
 msgid "Delete folder"
 msgstr "Eliminazione cartella"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "+Delete _folder only"
 msgstr "Cancella _solo la cartella"
 
 msgid "+Delete _folder only"
 msgstr "Cancella _solo la cartella"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "Delete folder and _addresses"
 msgstr "Cancella cartella ed _indirizzi"
 
 msgid "Delete folder and _addresses"
 msgstr "Cancella cartella ed _indirizzi"
 

-#: src/addressbook.c:2646
+#: src/addressbook.c:2735

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -582,7 +580,7 @@ msgstr ""
 "Cancellare '%s'?\n"
 "Gli indirizzi contenuti in essa non verranno persi."
 
 "Cancellare '%s'?\n"
 "Gli indirizzi contenuti in essa non verranno persi."
 

-#: src/addressbook.c:2653
+#: src/addressbook.c:2742

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -591,19 +589,19 @@ msgstr ""
 "Cancellare '%s'?\n"
 "Gli indirizzi contenuti in essa verranno persi."
 
 "Cancellare '%s'?\n"
 "Gli indirizzi contenuti in essa verranno persi."
 

-#: src/addressbook.c:3465
+#: src/addressbook.c:3595

 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare l'indice."
 
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare l'indice."
 

-#: src/addressbook.c:3469
+#: src/addressbook.c:3599

 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 

-#: src/addressbook.c:3479
+#: src/addressbook.c:3609

 msgid "Old address book converted successfully."
 msgstr "Vecchia rubrica convertita con successo."
 
 msgid "Old address book converted successfully."
 msgstr "Vecchia rubrica convertita con successo."
 

-#: src/addressbook.c:3484
+#: src/addressbook.c:3614

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -611,7 +609,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare l'indice dei nuovi indirizzi"
 
 "Vecchia rubrica convertita,\n"
 "impossibile salvare l'indice dei nuovi indirizzi"
 

-#: src/addressbook.c:3497
+#: src/addressbook.c:3627

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -619,7 +617,7 @@ msgstr ""
 "Non è stato possibile convertire la rubrica,\n"
 "ma sono stati creati i file della nuova rubrica vuoti."
 
 "Non è stato possibile convertire la rubrica,\n"
 "ma sono stati creati i file della nuova rubrica vuoti."
 

-#: src/addressbook.c:3503
+#: src/addressbook.c:3633

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -627,7 +625,7 @@ msgstr ""
 "Impossibile convertire la rubrica:\n"
 "non è stato possibile creare i file della nuova rubrica."
 
 "Impossibile convertire la rubrica:\n"
 "non è stato possibile creare i file della nuova rubrica."
 

-#: src/addressbook.c:3508
+#: src/addressbook.c:3638

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -635,70 +633,70 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ed è impossibile creare i file della nuova rubrica."
 
 "Impossibile convertire la rubrica,\n"
 "ed è impossibile creare i file della nuova rubrica."
 

-#: src/addressbook.c:3515 src/addressbook.c:3521
+#: src/addressbook.c:3645 src/addressbook.c:3651

 msgid "Addressbook conversion error"
 msgstr "Errore nella conversione della rubrica"
 
 msgid "Addressbook conversion error"
 msgstr "Errore nella conversione della rubrica"
 

-#: src/addressbook.c:3559
+#: src/addressbook.c:3689

 msgid "Addressbook Error"
 msgstr "Errore nella rubrica"
 
 msgid "Addressbook Error"
 msgstr "Errore nella rubrica"
 

-#: src/addressbook.c:3560
+#: src/addressbook.c:3690

 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice degli indirizzi"
 
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice degli indirizzi"
 

-#: src/addressbook.c:3887
+#: src/addressbook.c:4017

 msgid "Busy searching..."
 msgstr "Ricerca in corso"
 
 msgid "Busy searching..."
 msgstr "Ricerca in corso"
 

-#: src/addressbook.c:3958
+#: src/addressbook.c:4088

 #, c-format
 msgid "Search '%s'"
 msgstr "Cerca '%s'"
 
 #, c-format
 msgid "Search '%s'"
 msgstr "Cerca '%s'"
 

-#: src/addressbook.c:4183
+#: src/addressbook.c:4313

 msgid "Interface"
 msgstr "Interfaccia"
 
 msgid "Interface"
 msgstr "Interfaccia"
 

-#: src/addressbook.c:4199 src/exphtmldlg.c:378 src/expldifdlg.c:394
+#: src/addressbook.c:4329 src/exphtmldlg.c:375 src/expldifdlg.c:394

 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Rubrica"
 
 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Rubrica"
 

-#: src/addressbook.c:4215
+#: src/addressbook.c:4345

 msgid "Person"
 msgstr "Persona"
 
 msgid "Person"
 msgstr "Persona"
 

-#: src/addressbook.c:4231
+#: src/addressbook.c:4361

 msgid "EMail Address"
 msgstr "Indirizzo email"
 
 msgid "EMail Address"
 msgstr "Indirizzo email"
 

-#: src/addressbook.c:4247
+#: src/addressbook.c:4377

 msgid "Group"
 msgstr "Gruppo"
 
 msgid "Group"
 msgstr "Gruppo"
 

-#: src/addressbook.c:4263 src/exporthtml.c:922 src/folderview.c:468
-#: src/prefs_account.c:2409 src/prefs_folder_column.c:79
+#: src/addressbook.c:4393 src/exporthtml.c:922 src/folderview.c:470
+#: src/prefs_account.c:2417 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Cartella"
 
 msgid "Folder"
 msgstr "Cartella"
 

-#: src/addressbook.c:4279
+#: src/addressbook.c:4409

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4295 src/addressbook.c:4311
+#: src/addressbook.c:4425 src/addressbook.c:4441

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4327
+#: src/addressbook.c:4457

 msgid "LDAP servers"
 msgstr "Server LDAP"
 
 msgid "LDAP servers"
 msgstr "Server LDAP"
 

-#: src/addressbook.c:4343
+#: src/addressbook.c:4473

 msgid "LDAP Query"
 msgstr "Richiesta LDAP"
 
 msgid "LDAP Query"
 msgstr "Richiesta LDAP"
 

-#: src/addressbook.c:4659 src/matcher.c:303 src/matcher.c:756
+#: src/addressbook.c:4789 src/matcher.c:303 src/matcher.c:756

 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106


@@ -739,7 +737,7 @@ msgstr ""
 msgid "Folder :"
 msgstr "Cartella :"
 
 msgid "Folder :"
 msgstr "Cartella :"
 

-#: src/addrgather.c:365 src/exphtmldlg.c:546 src/expldifdlg.c:626
+#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Rubrica :"
 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Rubrica :"


@@ -764,9 +762,9 @@ msgstr "Nome Intestazione"
 msgid "Address Count"
 msgstr "Numero Indirizzo"
 
 msgid "Address Count"
 msgstr "Numero Indirizzo"
 

-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4650
-#: src/compose.c:9176 src/messageview.c:578 src/messageview.c:591
-#: src/plugins/pgpcore/sgpgme.c:570
+#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4797
+#: src/compose.c:9377 src/messageview.c:580 src/messageview.c:593
+#: src/plugins/pgpcore/sgpgme.c:575

 msgid "Warning"
 msgstr "Attenzione"
 
 msgid "Warning"
 msgstr "Attenzione"
 


@@ -774,7 +772,7 @@ msgstr "Attenzione"
 msgid "Header Fields"
 msgstr "Campi Intestazione"
 
 msgid "Header Fields"
 msgstr "Campi Intestazione"
 

-#: src/addrgather.c:539 src/exphtmldlg.c:666 src/expldifdlg.c:738
+#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Finito"
 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Finito"


@@ -803,12 +801,12 @@ msgstr "Indirizzi comuni"
 msgid "Personal address"
 msgstr "Indirizzi personali"
 
 msgid "Personal address"
 msgstr "Indirizzi personali"
 

-#: src/alertpanel.c:141 src/compose.c:7396
+#: src/alertpanel.c:141 src/compose.c:7585

 msgid "Notice"
 msgstr "Avviso"
 
 msgid "Notice"
 msgstr "Avviso"
 

-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4590 src/inc.c:616
-#: src/plugins/pgpcore/sgpgme.c:144 src/plugins/pgpcore/sgpgme.c:235
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4737 src/inc.c:616
+#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239

 msgid "Error"
 msgstr "Errore"
 
 msgid "Error"
 msgstr "Errore"
 


@@ -845,76 +843,106 @@ msgstr "Valore dell'attributo"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
 

-#: src/common/nntp.c:181 src/common/nntp.c:244
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:840
+msgid "SSL handshake failed\n"
+msgstr "Handshake SSL fallito\n"
+
+#: src/common/nntp.c:182 src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr "errore di protocollo: %s\n"
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "errore di protocollo: %s\n"
 

-#: src/common/nntp.c:204 src/common/nntp.c:250
+#: src/common/nntp.c:205 src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr "errore di protocollo\n"
 
 msgid "protocol error\n"
 msgstr "errore di protocollo\n"
 

-#: src/common/nntp.c:300
+#: src/common/nntp.c:301

 msgid "Error occurred while posting\n"
 msgstr "Errore inviando\n"
 
 msgid "Error occurred while posting\n"
 msgstr "Errore inviando\n"
 

-#: src/common/nntp.c:380
+#: src/common/nntp.c:381

 msgid "Error occurred while sending command\n"
 msgstr "Errore durante l'invio del comando\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "Errore durante l'invio del comando\n"
 

-#: src/common/plugin.c:52
+#: src/common/plugin.c:53

 msgid "Nothing"
 msgstr "Nulla"
 
 msgid "Nothing"
 msgstr "Nulla"
 

-#: src/common/plugin.c:53
+#: src/common/plugin.c:54

 msgid "a viewer"
 msgstr "un visualizzatore"
 
 msgid "a viewer"
 msgstr "un visualizzatore"
 

-#: src/common/plugin.c:54
+#: src/common/plugin.c:55

 msgid "folders"
 msgstr "cartelle"
 
 msgid "folders"
 msgstr "cartelle"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "filtering"
 msgstr "filtraggio"
 
 msgid "filtering"
 msgstr "filtraggio"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a privacy interface"
 msgstr "un sistema per la privacy"
 
 msgid "a privacy interface"
 msgstr "un sistema per la privacy"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "a notifier"
 msgstr "un notificatore"
 
 msgid "a notifier"
 msgstr "un notificatore"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "an utility"
 msgstr "un'utility"
 
 msgid "an utility"
 msgstr "un'utility"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "things"
 msgstr "cose"
 
 msgid "things"
 msgstr "cose"
 

-#: src/common/plugin.c:257
+#: src/common/plugin.c:258

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Questo plugin fornisce %s (%s), che è già fornito dal plugin %s."
 
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Questo plugin fornisce %s (%s), che è già fornito dal plugin %s."
 

-#: src/common/plugin.c:292
+#: src/common/plugin.c:293

 msgid "Plugin already loaded"
 msgstr "Plugin già caricato"
 
 msgid "Plugin already loaded"
 msgstr "Plugin già caricato"
 

-#: src/common/plugin.c:302
+#: src/common/plugin.c:303

 msgid "Failed to allocate memory for Plugin"
 msgstr "Errore durante l'allocazione di memoria per il plugin"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Errore durante l'allocazione di memoria per il plugin"
 

-#: src/common/plugin.c:329
+#: src/common/plugin.c:330

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Questo modulo non è rilasciato con licenza compatibile GPL."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Questo modulo non è rilasciato con licenza compatibile GPL."
 

-#: src/common/plugin.c:336
-msgid "This module is for Sylpheed-Claws GTK1."
-msgstr "Questo modulo è per Sylpheed-Claws GTK1."
+#: src/common/plugin.c:337
+msgid "This module is for Claws Mail GTK1."
+msgstr "Questo modulo è per Claws Mail GTK1."
+
+#: src/common/plugin.c:550
+#, c-format
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr ""
+"QUesta versione di Claws Mail è più nuova della versione con cui il plugin '%"
+"s' è stato compilato"
+
+#: src/common/plugin.c:553
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr ""
+"QUesta versione di Claws Mail è più nuova della versione con cui il plugin è "
+"stato compilato"
+
+#: src/common/plugin.c:562
+#, c-format
+msgid "Your version of Claws Mail is too old for the '%s' plugin."
+msgstr "Questa versione di Claws Mail è troppo vecchia per il plugin '%s'"
+
+#: src/common/plugin.c:564
+msgid "Your version of Claws Mail is too old for the plugin."
+msgstr "Questa versione di Claws Mail è troppo vecchia per il plugin"

 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"


@@ -955,16 +983,16 @@ msgstr "Errore creando il contesto ssl\n"
 msgid "SSL connect failed (%s)\n"
 msgstr "Connessione SSL fallita (%s)\n"
 
 msgid "SSL connect failed (%s)\n"
 msgstr "Connessione SSL fallita (%s)\n"
 

-#: src/common/ssl_certificate.c:189 src/common/ssl_certificate.c:200
-#: src/common/ssl_certificate.c:206 src/common/ssl_certificate.c:213
-#: src/common/ssl_certificate.c:224 src/common/ssl_certificate.c:230
+#: src/common/ssl_certificate.c:208 src/common/ssl_certificate.c:219
+#: src/common/ssl_certificate.c:225 src/common/ssl_certificate.c:232
+#: src/common/ssl_certificate.c:243 src/common/ssl_certificate.c:249

 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<non nel certificato>"
 
 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<non nel certificato>"
 

-#: src/common/ssl_certificate.c:239
+#: src/common/ssl_certificate.c:258

 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"


@@ -977,7 +1005,7 @@ msgstr ""
 "  Fingerprint: %s\n"
 "  Stato della firma: %s"
 
 "  Fingerprint: %s\n"
 "  Stato della firma: %s"
 

-#: src/common/ssl_certificate.c:348
+#: src/common/ssl_certificate.c:385

 msgid "Couldn't load X509 default paths"
 msgstr "Impossibile caricare il path di default dell'X509"
 
 msgid "Couldn't load X509 default paths"
 msgstr "Impossibile caricare il path di default dell'X509"
 


@@ -1005,479 +1033,688 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
 msgid "%.2fGB"
 msgstr "%.2fGB"
 

-#: src/compose.c:517
+#: src/common/utils.c:4799
+msgid "Complete day name for use by strftime|Sunday"
+msgstr "Domenica"
+
+#: src/common/utils.c:4800
+msgid "Complete day name for use by strftime|Monday"
+msgstr "Lunedì"
+
+#: src/common/utils.c:4801
+msgid "Complete day name for use by strftime|Tuesday"
+msgstr "Martedì"
+
+#: src/common/utils.c:4802
+msgid "Complete day name for use by strftime|Wednesday"
+msgstr "Mercoledì"
+
+#: src/common/utils.c:4803
+msgid "Complete day name for use by strftime|Thursday"
+msgstr "Giovedì"
+
+#: src/common/utils.c:4804
+msgid "Complete day name for use by strftime|Friday"
+msgstr "Venerdì"
+
+#: src/common/utils.c:4805
+msgid "Complete day name for use by strftime|Saturday"
+msgstr "Sabato"
+
+#: src/common/utils.c:4807
+msgid "Complete month name for use by strftime|January"
+msgstr "Gennaio"
+
+#: src/common/utils.c:4808
+msgid "Complete month name for use by strftime|February"
+msgstr "Febbraio"
+
+#: src/common/utils.c:4809
+msgid "Complete month name for use by strftime|March"
+msgstr "Marzo"
+
+#: src/common/utils.c:4810
+msgid "Complete month name for use by strftime|April"
+msgstr "Aprile"
+
+#: src/common/utils.c:4811
+msgid "Complete month name for use by strftime|May"
+msgstr "Maggio"
+
+#: src/common/utils.c:4812
+msgid "Complete month name for use by strftime|June"
+msgstr "Giugno"
+
+#: src/common/utils.c:4813
+msgid "Complete month name for use by strftime|July"
+msgstr "Luglio"
+
+#: src/common/utils.c:4814
+msgid "Complete month name for use by strftime|August"
+msgstr "Agosto"
+
+#: src/common/utils.c:4815
+msgid "Complete month name for use by strftime|September"
+msgstr "Settembre"
+
+#: src/common/utils.c:4816
+msgid "Complete month name for use by strftime|October"
+msgstr "Ottobre"
+
+#: src/common/utils.c:4817
+msgid "Complete month name for use by strftime|November"
+msgstr "Novembre"
+
+#: src/common/utils.c:4818
+msgid "Complete month name for use by strftime|December"
+msgstr "Dicembre"
+
+#: src/common/utils.c:4820
+msgid "Abbr. day name for use by strftime|Sun"
+msgstr "Dom"
+
+#: src/common/utils.c:4821
+msgid "Abbr. day name for use by strftime|Mon"
+msgstr "Lun"
+
+#: src/common/utils.c:4822
+msgid "Abbr. day name for use by strftime|Tue"
+msgstr "Mar"
+
+#: src/common/utils.c:4823
+msgid "Abbr. day name for use by strftime|Wed"
+msgstr "Mer"
+
+#: src/common/utils.c:4824
+msgid "Abbr. day name for use by strftime|Thu"
+msgstr "Gio"
+
+#: src/common/utils.c:4825
+msgid "Abbr. day name for use by strftime|Fri"
+msgstr "Ven"
+
+#: src/common/utils.c:4826
+msgid "Abbr. day name for use by strftime|Sat"
+msgstr "Sab"
+
+#: src/common/utils.c:4828
+msgid "Abbr. month name for use by strftime|Jan"
+msgstr "Gen"
+
+#: src/common/utils.c:4829
+msgid "Abbr. month name for use by strftime|Feb"
+msgstr "Feb"
+
+#: src/common/utils.c:4830
+msgid "Abbr. month name for use by strftime|Mar"
+msgstr "Mar"
+
+#: src/common/utils.c:4831
+msgid "Abbr. month name for use by strftime|Apr"
+msgstr "Apr"
+
+#: src/common/utils.c:4832
+msgid "Abbr. month name for use by strftime|May"
+msgstr "Mag"
+
+#: src/common/utils.c:4833
+msgid "Abbr. month name for use by strftime|Jun"
+msgstr "Giu"
+
+#: src/common/utils.c:4834
+msgid "Abbr. month name for use by strftime|Jul"
+msgstr "Lug"
+
+#: src/common/utils.c:4835
+msgid "Abbr. month name for use by strftime|Aug"
+msgstr "Ago"
+
+#: src/common/utils.c:4836
+msgid "Abbr. month name for use by strftime|Sep"
+msgstr "Set"
+
+#: src/common/utils.c:4837
+msgid "Abbr. month name for use by strftime|Oct"
+msgstr "Ott"
+
+#: src/common/utils.c:4838
+msgid "Abbr. month name for use by strftime|Nov"
+msgstr "Nov"
+
+#: src/common/utils.c:4839
+msgid "Abbr. month name for use by strftime|Dec"
+msgstr "Dic"
+
+#: src/common/utils.c:4841
+msgid "For use by strftime (morning)|AM"
+msgstr "AM"
+
+#: src/common/utils.c:4842
+msgid "For use by strftime (afternoon)|PM"
+msgstr "PM"
+
+#: src/common/utils.c:4843
+msgid "For use by strftime (morning, lowercase)|am"
+msgstr "am"
+
+#: src/common/utils.c:4844
+msgid "For use by strftime (afternoon, lowercase)|pm"
+msgstr "pm"
+
+#: src/common/utils.c:4846
+msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
+msgstr "%a %e %b %Y %H:%M:%S"
+
+#: src/common/utils.c:4847
+msgid "For use by strftime (default date format)|%m/%d/%y"
+msgstr "%d/%m/%y"
+
+#: src/common/utils.c:4848
+msgid "For use by strftime (default time format)|%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#: src/common/utils.c:4850
+msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#: src/compose.c:522

 msgid "/_Add..."
 msgstr "/_Aggiungi..."
 
 msgid "/_Add..."
 msgstr "/_Aggiungi..."
 

-#: src/compose.c:518
+#: src/compose.c:523

 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 

-#: src/compose.c:520 src/folderview.c:292
+#: src/compose.c:525 src/folderview.c:294

 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 

-#: src/compose.c:525 src/mainwindow.c:740 src/messageview.c:285
+#: src/compose.c:530 src/mainwindow.c:741 src/messageview.c:285

 msgid "/_Message"
 msgstr "/M_essaggio"
 
 msgid "/_Message"
 msgstr "/M_essaggio"
 

-#: src/compose.c:526
+#: src/compose.c:531

 msgid "/_Message/_Send"
 msgstr "/M_essaggio/In_via"
 
 msgid "/_Message/_Send"
 msgstr "/M_essaggio/In_via"
 

-#: src/compose.c:528
+#: src/compose.c:533

 msgid "/_Message/Send _later"
 msgstr "/M_essaggio/Invia più _tardi"
 
 msgid "/_Message/Send _later"
 msgstr "/M_essaggio/Invia più _tardi"
 

-#: src/compose.c:530 src/compose.c:534 src/compose.c:537 src/mainwindow.c:750
-#: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
-#: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
+#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:751
+#: src/mainwindow.c:761 src/mainwindow.c:774 src/mainwindow.c:780
+#: src/mainwindow.c:797 src/messageview.c:288 src/messageview.c:296

 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 
 msgid "/_Message/---"
 msgstr "/M_essaggio/---"
 

-#: src/compose.c:531
+#: src/compose.c:536

 msgid "/_Message/_Attach file"
 msgstr "/M_essaggio/A_llega file"
 
 msgid "/_Message/_Attach file"
 msgstr "/M_essaggio/A_llega file"
 

-#: src/compose.c:532
+#: src/compose.c:537

 msgid "/_Message/_Insert file"
 msgstr "/M_essaggio/_Inserisci file"
 
 msgid "/_Message/_Insert file"
 msgstr "/M_essaggio/_Inserisci file"
 

-#: src/compose.c:533
+#: src/compose.c:538

 msgid "/_Message/Insert si_gnature"
 msgstr "/M_essaggio/Inserisci _firma"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/M_essaggio/Inserisci _firma"
 

-#: src/compose.c:535
+#: src/compose.c:540

 msgid "/_Message/_Save"
 msgstr "/M_essaggio/_Salva"
 
 msgid "/_Message/_Save"
 msgstr "/M_essaggio/_Salva"
 

-#: src/compose.c:538
+#: src/compose.c:543

 msgid "/_Message/_Close"
 msgstr "/M_essaggio/_Chiudi"
 
 msgid "/_Message/_Close"
 msgstr "/M_essaggio/_Chiudi"
 

-#: src/compose.c:541
+#: src/compose.c:546

 msgid "/_Edit/_Undo"
 msgstr "/_Modifica/_Annulla"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Modifica/_Annulla"
 

-#: src/compose.c:542
+#: src/compose.c:547

 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Modifica/_Ripeti"
 

-#: src/compose.c:543 src/compose.c:631 src/compose.c:634 src/compose.c:640
-#: src/mainwindow.c:522 src/messageview.c:167
+#: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645
+#: src/mainwindow.c:523 src/messageview.c:167

 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 
 msgid "/_Edit/---"
 msgstr "/_Modifica/---"
 

-#: src/compose.c:544
+#: src/compose.c:549

 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Modifica/_Taglia"
 

-#: src/compose.c:545 src/mainwindow.c:519 src/messageview.c:165
+#: src/compose.c:550 src/mainwindow.c:520 src/messageview.c:165

 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 

-#: src/compose.c:546
+#: src/compose.c:551

 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 

-#: src/compose.c:547
+#: src/compose.c:552

 msgid "/_Edit/Special paste"
 msgstr "/_Modifica/Incolla speciale"
 
 msgid "/_Edit/Special paste"
 msgstr "/_Modifica/Incolla speciale"
 

-#: src/compose.c:548
+#: src/compose.c:553

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Modifica/Incolla speciale/_quotato"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Modifica/Incolla speciale/_quotato"
 

-#: src/compose.c:550
+#: src/compose.c:555

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Modifica/Incolla Speciale/_formattato"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Modifica/Incolla Speciale/_formattato"
 

-#: src/compose.c:552
+#: src/compose.c:557

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Modifica/Incolla speciale/_non formattato"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Modifica/Incolla speciale/_non formattato"
 

-#: src/compose.c:554 src/mainwindow.c:520 src/messageview.c:166
+#: src/compose.c:559 src/mainwindow.c:521 src/messageview.c:166

 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Modifica/_Seleziona tutto"
 

-#: src/compose.c:555
+#: src/compose.c:560

 msgid "/_Edit/A_dvanced"
 msgstr "/_Modifica/_Avanzate"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Modifica/_Avanzate"
 

-#: src/compose.c:556
+#: src/compose.c:561

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Modifica/_Avanzate/Muovi un carattere indietro"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Modifica/_Avanzate/Muovi un carattere indietro"
 

-#: src/compose.c:561
+#: src/compose.c:566

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Modifica/_Avanzate/Muovi un carattere avanti"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Modifica/_Avanzate/Muovi un carattere avanti"
 

-#: src/compose.c:566
+#: src/compose.c:571

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Modifica/_Avanzate/Muovi una parola indietro"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Modifica/_Avanzate/Muovi una parola indietro"
 

-#: src/compose.c:571
+#: src/compose.c:576

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Modifica/_Avanzate/Muovi una parola avanti"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Modifica/_Avanzate/Muovi una parola avanti"
 

-#: src/compose.c:576
+#: src/compose.c:581

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Modifica/_Avanzate/Muovi all'inizio della linea"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Modifica/_Avanzate/Muovi all'inizio della linea"
 

-#: src/compose.c:581
+#: src/compose.c:586

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Modifica/_Avanzate/Muovi alla fine della linea"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Modifica/_Avanzate/Muovi alla fine della linea"
 

-#: src/compose.c:586
+#: src/compose.c:591

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Modifica/_Avanzate/Muovi alla linea precedente"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Modifica/_Avanzate/Muovi alla linea precedente"
 

-#: src/compose.c:591
+#: src/compose.c:596

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Modifica/_Avanzate/Muovi alla linea successiva"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Modifica/_Avanzate/Muovi alla linea successiva"
 

-#: src/compose.c:596
+#: src/compose.c:601

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Modifica/_Avanzate/Cancella un carattere indietro"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Modifica/_Avanzate/Cancella un carattere indietro"
 

-#: src/compose.c:601
+#: src/compose.c:606

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Modifica/_Avanzate/Cancella un carattere avanti"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Modifica/_Avanzate/Cancella un carattere avanti"
 

-#: src/compose.c:606
+#: src/compose.c:611

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Modifica/_Avanzate/Cancella una parola indietro"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Modifica/_Avanzate/Cancella una parola indietro"
 

-#: src/compose.c:611
+#: src/compose.c:616

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Modifica/_Avanzate/Cancella una parola avanti"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Modifica/_Avanzate/Cancella una parola avanti"
 

-#: src/compose.c:616
+#: src/compose.c:621

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Modifica/_Avanzate/Cancella la linea"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Modifica/_Avanzate/Cancella la linea"
 

-#: src/compose.c:621
+#: src/compose.c:626

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Modifica/_Avanzate/Cancella la linea interamente"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Modifica/_Avanzate/Cancella la linea interamente"
 

-#: src/compose.c:626
+#: src/compose.c:631

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Modifica/_Avanzate/Cancella fino alla fine della linea"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Modifica/_Avanzate/Cancella fino alla fine della linea"
 

-#: src/compose.c:632
+#: src/compose.c:637

 msgid "/_Edit/_Find"
 msgstr "/_Modifica/_Trova"
 
 msgid "/_Edit/_Find"
 msgstr "/_Modifica/_Trova"
 

-#: src/compose.c:635
+#: src/compose.c:640

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Modifica/A capo il _paragrafo corrente"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Modifica/A capo il _paragrafo corrente"
 

-#: src/compose.c:637
+#: src/compose.c:642

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Modifica/A capo tutte le righe _lunghe"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Modifica/A capo tutte le righe _lunghe"
 

-#: src/compose.c:639
+#: src/compose.c:644

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A capo a_utomatico"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A capo a_utomatico"
 

-#: src/compose.c:641
+#: src/compose.c:646

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Modifica/Modifica con l'_editor esterno"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Modifica/Modifica con l'_editor esterno"
 

-#: src/compose.c:644
+#: src/compose.c:649

 msgid "/_Spelling"
 msgstr "/_Ortografia"
 
 msgid "/_Spelling"
 msgstr "/_Ortografia"
 

-#: src/compose.c:645
+#: src/compose.c:650

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Ortografia/Verifica tutto o verifica la selezione"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Ortografia/Verifica tutto o verifica la selezione"
 

-#: src/compose.c:647
+#: src/compose.c:652

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Ortografia/_Evidenzia tutti gli errori"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Ortografia/_Evidenzia tutti gli errori"
 

-#: src/compose.c:649
+#: src/compose.c:654

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Ortografia/Vai all'errore precedente"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Ortografia/Vai all'errore precedente"
 

-#: src/compose.c:651
+#: src/compose.c:656

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Ortografia/Vai all'errore seguente"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Ortografia/Vai all'errore seguente"
 

-#: src/compose.c:653
+#: src/compose.c:658

 msgid "/_Spelling/---"
 msgstr "/_Ortografia/---"
 
 msgid "/_Spelling/---"
 msgstr "/_Ortografia/---"
 

-#: src/compose.c:654
+#: src/compose.c:659

 msgid "/_Spelling/Options"
 msgstr "/_Ortografia/Opzioni"
 
 msgid "/_Spelling/Options"
 msgstr "/_Ortografia/Opzioni"
 

-#: src/compose.c:657
+#: src/compose.c:662

 msgid "/_Options"
 msgstr "/_Opzioni"
 
 msgid "/_Options"
 msgstr "/_Opzioni"
 

-#: src/compose.c:658
+#: src/compose.c:663

 msgid "/_Options/Reply _mode"
 msgstr "/_Opzioni/_Modalità di risposta"
 
 msgid "/_Options/Reply _mode"
 msgstr "/_Opzioni/_Modalità di risposta"
 

-#: src/compose.c:659
+#: src/compose.c:664

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opzioni/_Modalità di risposta/_Normale"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opzioni/_Modalità di risposta/_Normale"
 

-#: src/compose.c:660
+#: src/compose.c:665

 msgid "/_Options/Reply _mode/_All"
 msgstr "/M_essaggio/_Modalità di risposta/_Rispondi a/_tutti"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/M_essaggio/_Modalità di risposta/_Rispondi a/_tutti"
 

-#: src/compose.c:661
+#: src/compose.c:666

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/M_essaggio/_Modalità di risposta/_Rispondi a/_mittente"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/M_essaggio/_Modalità di risposta/_Rispondi a/_mittente"
 

-#: src/compose.c:662
+#: src/compose.c:667

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opzioni/_Modalità di risposta/Rispondi alla _mailing-list"
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opzioni/_Modalità di risposta/Rispondi alla _mailing-list"
 

-#: src/compose.c:663 src/compose.c:668 src/compose.c:675 src/compose.c:677
-#: src/compose.c:679
+#: src/compose.c:668 src/compose.c:673 src/compose.c:680 src/compose.c:682
+#: src/compose.c:684

 msgid "/_Options/---"
 msgstr "/_Opzioni/---"
 
 msgid "/_Options/---"
 msgstr "/_Opzioni/---"
 

-#: src/compose.c:664
+#: src/compose.c:669

 msgid "/_Options/Privacy _System"
 msgstr "/_Opzioni/_Sistema di privacy"
 
 msgid "/_Options/Privacy _System"
 msgstr "/_Opzioni/_Sistema di privacy"
 

-#: src/compose.c:665
+#: src/compose.c:670

 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opzioni/_Sistema di privacy/Disattiva"
 
 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opzioni/_Sistema di privacy/Disattiva"
 

-#: src/compose.c:666
+#: src/compose.c:671

 msgid "/_Options/Si_gn"
 msgstr "/_Opzioni/_Firma"
 
 msgid "/_Options/Si_gn"
 msgstr "/_Opzioni/_Firma"
 

-#: src/compose.c:667
+#: src/compose.c:672

 msgid "/_Options/_Encrypt"
 msgstr "/_Opzioni/_Cifra"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Opzioni/_Cifra"
 

-#: src/compose.c:669
+#: src/compose.c:674

 msgid "/_Options/_Priority"
 msgstr "/_Opzioni/_Priorità"
 
 msgid "/_Options/_Priority"
 msgstr "/_Opzioni/_Priorità"
 

-#: src/compose.c:670
+#: src/compose.c:675

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opzioni/Priorità/_Massima"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opzioni/Priorità/_Massima"
 

-#: src/compose.c:671
+#: src/compose.c:676

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opzioni/Priorità/_Alta"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opzioni/Priorità/_Alta"
 

-#: src/compose.c:672
+#: src/compose.c:677

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opzioni/Priorità/_Normale"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opzioni/Priorità/_Normale"
 

-#: src/compose.c:673
+#: src/compose.c:678

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opzioni/Priorità/_Bassa"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opzioni/Priorità/_Bassa"
 

-#: src/compose.c:674
+#: src/compose.c:679

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opzioni/Priorità/_Minima"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opzioni/Priorità/_Minima"
 

-#: src/compose.c:676
+#: src/compose.c:681

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opzioni/Richiesta di rice_vuta di ritorno"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opzioni/Richiesta di rice_vuta di ritorno"
 

-#: src/compose.c:678
+#: src/compose.c:683

 msgid "/_Options/Remo_ve references"
 msgstr "/_Opzioni/R_imuovi riferimenti"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/_Opzioni/R_imuovi riferimenti"
 

-#: src/compose.c:685
+#: src/compose.c:690

 msgid "/_Options/Character _encoding"
 msgstr "/_Opzioni/_Codifica"
 
 msgid "/_Options/Character _encoding"
 msgstr "/_Opzioni/_Codifica"
 

-#: src/compose.c:686
+#: src/compose.c:691

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opzioni/_Codifica/_Automatica"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opzioni/_Codifica/_Automatica"
 

-#: src/compose.c:688 src/compose.c:694 src/compose.c:702 src/compose.c:706
-#: src/compose.c:712 src/compose.c:716 src/compose.c:722 src/compose.c:728
-#: src/compose.c:732 src/compose.c:742 src/compose.c:746 src/compose.c:756
-#: src/compose.c:760
+#: src/compose.c:693 src/compose.c:699 src/compose.c:707 src/compose.c:711
+#: src/compose.c:717 src/compose.c:721 src/compose.c:727 src/compose.c:733
+#: src/compose.c:737 src/compose.c:747 src/compose.c:751 src/compose.c:761
+#: src/compose.c:765

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opzioni/_Codifica/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opzioni/_Codifica/---"
 

-#: src/compose.c:690
+#: src/compose.c:695

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opzioni/_Codifica/ASCII a 7 bit (US-ASC_II)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opzioni/_Codifica/ASCII a 7 bit (US-ASC_II)"
 

-#: src/compose.c:692
+#: src/compose.c:697

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opzioni/_Codifica/Unicode (_UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opzioni/_Codifica/Unicode (_UTF-8)"
 

-#: src/compose.c:696
+#: src/compose.c:701

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opzioni/_Codifica/Europa Occidentale (ISO-8859-_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opzioni/_Codifica/Europa Occidentale (ISO-8859-_1)"
 

-#: src/compose.c:698
+#: src/compose.c:703

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opzioni/_Codifica/Europa Occidentale (ISO-8859-15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opzioni/_Codifica/Europa Occidentale (ISO-8859-15)"
 

-#: src/compose.c:700
+#: src/compose.c:705

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visualizza/_Codifica/Europa Occidentale (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visualizza/_Codifica/Europa Occidentale (Windows-1252)"
 

-#: src/compose.c:704
+#: src/compose.c:709

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opzioni/_Codifica/Europa Centrale (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opzioni/_Codifica/Europa Centrale (ISO-8859-_2)"
 

-#: src/compose.c:708
+#: src/compose.c:713

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opzioni/_Codifica/_Baltico (ISO-8859-13)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opzioni/_Codifica/_Baltico (ISO-8859-13)"
 

-#: src/compose.c:710
+#: src/compose.c:715

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opzioni/_Codifica/Baltico (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opzioni/_Codifica/Baltico (ISO-8859-_4)"
 

-#: src/compose.c:714
+#: src/compose.c:719

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opzioni/_Codifica/Greco (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opzioni/_Codifica/Greco (ISO-8859-_7)"
 

-#: src/compose.c:718
+#: src/compose.c:723

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opzioni/_Codifica/Ebreo (ISO-8859-_8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opzioni/_Codifica/Ebreo (ISO-8859-_8)"
 

-#: src/compose.c:720
+#: src/compose.c:725

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opzioni/_Codifica/Ebreo (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opzioni/_Codifica/Ebreo (Windows-1255)"
 

-#: src/compose.c:724
+#: src/compose.c:729

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opzioni/_Codifica/Arabico (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opzioni/_Codifica/Arabico (ISO-8859-_6)"
 

-#: src/compose.c:726
+#: src/compose.c:731

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opzioni/_Codifica/Arabico (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opzioni/_Codifica/Arabico (Windows-1256)"
 

-#: src/compose.c:730
+#: src/compose.c:735

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opzioni/_Codifica/Turco (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opzioni/_Codifica/Turco (ISO-8859-_9)"
 

-#: src/compose.c:734
+#: src/compose.c:739

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opzioni/_Codifica/Cirillico (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opzioni/_Codifica/Cirillico (ISO-8859-_5)"
 

-#: src/compose.c:736
+#: src/compose.c:741

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opzioni/_Codifica/Cirillico (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opzioni/_Codifica/Cirillico (KOI8-_R)"
 

-#: src/compose.c:738
+#: src/compose.c:743

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opzioni/_Codifica/Cirillico (KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opzioni/_Codifica/Cirillico (KOI8-U)"
 

-#: src/compose.c:740
+#: src/compose.c:745

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opzioni/_Codifica/Cirillico (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opzioni/_Codifica/Cirillico (Windows-1251)"
 

-#: src/compose.c:744
+#: src/compose.c:749

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opzioni/_Codifica/Giapponese (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opzioni/_Codifica/Giapponese (ISO-2022-_JP)"
 

-#: src/compose.c:748
+#: src/compose.c:753

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opzioni/_Codifica/Cinese semplificato (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opzioni/_Codifica/Cinese semplificato (_GB2312)"
 

-#: src/compose.c:750
+#: src/compose.c:755

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opzioni/_Codifica/Cinese semplificato (GBK)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opzioni/_Codifica/Cinese semplificato (GBK)"
 

-#: src/compose.c:752
+#: src/compose.c:757

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opzioni/_Codifica/Cinese tradizionale (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opzioni/_Codifica/Cinese tradizionale (_Big5)"
 

-#: src/compose.c:754
+#: src/compose.c:759

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opzioni/_Codifica/Cinese tradizionale (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opzioni/_Codifica/Cinese tradizionale (EUC-_TW)"
 

-#: src/compose.c:758
+#: src/compose.c:763

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opzioni/_Codifica/Coreano (EUC-_KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opzioni/_Codifica/Coreano (EUC-_KR)"
 

-#: src/compose.c:762
+#: src/compose.c:767

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opzioni/_Codifica/Thai (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opzioni/_Codifica/Thai (TIS-620)"
 

-#: src/compose.c:764
+#: src/compose.c:769

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opzioni/_Codifica/Thai (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opzioni/_Codifica/Thai (Windows-874)"
 

-#: src/compose.c:768
+#: src/compose.c:773

 msgid "/_Tools/Show _ruler"
 msgstr "/St_rumenti/Mostra r_ighello"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/St_rumenti/Mostra r_ighello"
 

-#: src/compose.c:769 src/messageview.c:303
+#: src/compose.c:774 src/messageview.c:303

 msgid "/_Tools/_Address book"
 msgstr "/St_rumenti/_Rubrica"
 
 msgid "/_Tools/_Address book"
 msgstr "/St_rumenti/_Rubrica"
 

-#: src/compose.c:770
+#: src/compose.c:775

 msgid "/_Tools/_Template"
 msgstr "/St_rumenti/_Modelli"
 
 msgid "/_Tools/_Template"
 msgstr "/St_rumenti/_Modelli"
 

-#: src/compose.c:771 src/mainwindow.c:832 src/messageview.c:328
+#: src/compose.c:776 src/mainwindow.c:833 src/messageview.c:328

 msgid "/_Tools/Actio_ns"
 msgstr "/_St_rumenti/A_zioni"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_St_rumenti/A_zioni"
 

-#: src/compose.c:1598
+#: src/compose.c:1039 src/prefs_compose_writing.c:384
+msgid "New message subject format error."
+msgstr "Errore nel formato dell'oggetto del nuovo messaggio."
+
+#: src/compose.c:1068 src/prefs_compose_writing.c:388
+msgid "New message body format error."
+msgstr "Errore nel formato del corpo del nuovo messaggio."
+
+#: src/compose.c:1438 src/prefs_quote.c:281
+msgid "Message reply format error."
+msgstr "Errore nel formato del messaggio di risposta."
+
+#: src/compose.c:1555 src/prefs_quote.c:286
+msgid "Message forward format error."
+msgstr "Errore nel formato del messaggio di inoltro."
+
+#: src/compose.c:1675

 msgid "Fw: multiple emails"
 msgstr "I: email multiple"
 
 msgid "Fw: multiple emails"
 msgstr "I: email multiple"
 

-#: src/compose.c:2021
+#: src/compose.c:2050
+msgid "Message redirect format error."
+msgstr "Errore nel formato della redirezione."
+
+#: src/compose.c:2119

 msgid "Reply-To:"
 msgstr "Rispondi a:"
 
 msgid "Reply-To:"
 msgstr "Rispondi a:"
 

-#: src/compose.c:2024 src/compose.c:5520 src/compose.c:6288
+#: src/compose.c:2122 src/compose.c:5667 src/compose.c:6437 src/compose.c:9475

 msgid "Newsgroups:"
 msgstr "Newsgroup:"
 
 msgid "Newsgroups:"
 msgstr "Newsgroup:"
 

-#: src/compose.c:2027
+#: src/compose.c:2125

 msgid "Followup-To:"
 msgstr "Seguito a:"
 
 msgid "Followup-To:"
 msgstr "Seguito a:"
 

-#: src/compose.c:2424
+#: src/compose.c:2304
+#, c-format
+msgid "The file '%s' has been attached."
+msgstr "Il file '%s' è stato allegato."
+
+#: src/compose.c:2308
+msgid "Couldn't attach a file (charset conversion failed)."
+msgstr "Impossibile allegare un file (errore di conversione charset)."
+
+#: src/compose.c:2539

 msgid "Quote mark format error."
 msgstr "Errore nel formato del simbolo di citazione."
 
 msgid "Quote mark format error."
 msgstr "Errore nel formato del simbolo di citazione."
 

-#: src/compose.c:2440
-msgid "Message reply/forward format error."
-msgstr "Errore nel formato del messaggio di risposta/inoltro."
-
-#: src/compose.c:2997
+#: src/compose.c:3133

 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Il file %s è vuoto."
 

-#: src/compose.c:3001
+#: src/compose.c:3137

 #, c-format
 msgid "Can't read %s."
 msgstr "impossibile leggere %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "impossibile leggere %s."
 

-#: src/compose.c:3028
+#: src/compose.c:3164

 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 

-#: src/compose.c:3846
+#: src/compose.c:3983

 msgid " [Edited]"
 msgstr " [Modificato]"
 
 msgid " [Edited]"
 msgstr " [Modificato]"
 

-#: src/compose.c:3852
+#: src/compose.c:3989

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composizione messaggio%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Composizione messaggio%s"
 

-#: src/compose.c:3855
+#: src/compose.c:3992

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[nessun oggetto] - Composizione messaggio%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[nessun oggetto] - Composizione messaggio%s"
 

-#: src/compose.c:3880 src/messageview.c:613
+#: src/compose.c:4017 src/messageview.c:615

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1485,32 +1722,32 @@ msgstr ""
 "Non è stato specificato un account per spedire posta.\n"
 "E` necessario scegliere un account di posta per poterla spedire."
 
 "Non è stato specificato un account per spedire posta.\n"
 "E` necessario scegliere un account di posta per poterla spedire."
 

-#: src/compose.c:4057 src/compose.c:4088 src/compose.c:4119 src/toolbar.c:391
-#: src/toolbar.c:442
+#: src/compose.c:4195 src/compose.c:4226 src/compose.c:4258 src/toolbar.c:401
+#: src/toolbar.c:452

 msgid "Send"
 msgstr "Invio"
 
 msgid "Send"
 msgstr "Invio"
 

-#: src/compose.c:4058
+#: src/compose.c:4196

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "L'unico destinatario è l'indirizzo CC predefinito. Inviare comunque?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "L'unico destinatario è l'indirizzo CC predefinito. Inviare comunque?"
 

-#: src/compose.c:4059 src/compose.c:4090 src/compose.c:4121 src/compose.c:4590
+#: src/compose.c:4197 src/compose.c:4228 src/compose.c:4260 src/compose.c:4737

 msgid "+_Send"
 msgstr "+_Invio"
 
 msgid "+_Send"
 msgstr "+_Invio"
 

-#: src/compose.c:4089
+#: src/compose.c:4227

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "L'unico destinatario è l'indirizzo BCC predefinito. Inviare comunque?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "L'unico destinatario è l'indirizzo BCC predefinito. Inviare comunque?"
 

-#: src/compose.c:4106
+#: src/compose.c:4244

 msgid "Recipient is not specified."
 msgstr "Nessun destinatario specificato."
 
 msgid "Recipient is not specified."
 msgstr "Nessun destinatario specificato."
 

-#: src/compose.c:4120
+#: src/compose.c:4259

 msgid "Subject is empty. Send it anyway?"
 msgstr "Il campo Oggetto è vuoto. Spedire ugualmente?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Il campo Oggetto è vuoto. Spedire ugualmente?"
 

-#: src/compose.c:4163 src/compose.c:7749
+#: src/compose.c:4306 src/compose.c:7938

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1520,7 +1757,7 @@ msgstr ""
 "\n"
 "Errore nella conversione del set di caratteri."
 
 "\n"
 "Errore nella conversione del set di caratteri."
 

-#: src/compose.c:4166 src/compose.c:7752
+#: src/compose.c:4309 src/compose.c:7941

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1530,7 +1767,7 @@ msgstr ""
 "\n"
 "Impossibile trovare la chiave del destinatario."
 
 "\n"
 "Impossibile trovare la chiave del destinatario."
 

-#: src/compose.c:4170 src/compose.c:7746
+#: src/compose.c:4313 src/compose.c:7935

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1541,7 +1778,7 @@ msgstr ""
 "\n"
 "Errore nella firma: %s"
 
 "\n"
 "Errore nella firma: %s"
 

-#: src/compose.c:4173
+#: src/compose.c:4316

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1552,11 +1789,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4175
+#: src/compose.c:4318

 msgid "Could not queue message for sending."
 msgstr "Impossibile accodare il messaggio per l'invio."
 
 msgid "Could not queue message for sending."
 msgstr "Impossibile accodare il messaggio per l'invio."
 

-#: src/compose.c:4190 src/compose.c:4249
+#: src/compose.c:4333 src/compose.c:4394

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1565,7 +1802,7 @@ msgstr ""
 "Utilizzare \"Spedisci i messaggi in coda\" dalla finestra principale per "
 "riprovare"
 
 "Utilizzare \"Spedisci i messaggi in coda\" dalla finestra principale per "
 "riprovare"
 

-#: src/compose.c:4243
+#: src/compose.c:4388

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -1574,7 +1811,7 @@ msgstr ""
 "%s\n"
 "Utilizzare 'Invia messaggi in coda' dalla finestra principale per riprovare."
 
 "%s\n"
 "Utilizzare 'Invia messaggi in coda' dalla finestra principale per riprovare."
 

-#: src/compose.c:4587
+#: src/compose.c:4734

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1585,7 +1822,7 @@ msgstr ""
 "nel charset specificato (%s).\n"
 "Spedirlo ugualmente utilizzando %s?"
 
 "nel charset specificato (%s).\n"
 "Spedirlo ugualmente utilizzando %s?"
 

-#: src/compose.c:4646
+#: src/compose.c:4793

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1598,60 +1835,60 @@ msgstr ""
 "\n"
 "Mandarlo comunque?"
 
 "\n"
 "Mandarlo comunque?"
 

-#: src/compose.c:4834
+#: src/compose.c:4981

 msgid "No account for sending mails available!"
 msgstr "Nessun account per la spedizione di mail disponibile!"
 
 msgid "No account for sending mails available!"
 msgstr "Nessun account per la spedizione di mail disponibile!"
 

-#: src/compose.c:4844
+#: src/compose.c:4991

 msgid "No account for posting news available!"
 msgstr "Nessun account per la spedizione di messaggi disponibile!"
 
 msgid "No account for posting news available!"
 msgstr "Nessun account per la spedizione di messaggi disponibile!"
 

-#: src/compose.c:5537
+#: src/compose.c:5684

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Utilizzare <tab> per completare automaticamente utilizzando la rubrica"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Utilizzare <tab> per completare automaticamente utilizzando la rubrica"
 

-#: src/compose.c:5665
+#: src/compose.c:5812

 msgid "Mime type"
 msgstr "Tipo MIME"
 
 msgid "Mime type"
 msgstr "Tipo MIME"
 

-#: src/compose.c:5671 src/compose.c:5967 src/mimeview.c:212
+#: src/compose.c:5818 src/compose.c:6114 src/mimeview.c:212

 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Dimensione"
 
 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Dimensione"
 

-#: src/compose.c:5732
+#: src/compose.c:5879

 msgid "Save Message to "
 msgstr "Salva il messaggio in"
 
 msgid "Save Message to "
 msgstr "Salva il messaggio in"
 

-#: src/compose.c:5754 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:5901 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Sfoglia"
 
 msgid "_Browse"
 msgstr "_Sfoglia"
 

-#: src/compose.c:5966 src/compose.c:7156
+#: src/compose.c:6113 src/compose.c:7345

 msgid "MIME type"
 msgstr "Tipo MIME"
 
 msgid "MIME type"
 msgstr "Tipo MIME"
 

-#: src/compose.c:6038
+#: src/compose.c:6185

 msgid "Hea_der"
 msgstr "Intes_tazione"
 
 msgid "Hea_der"
 msgstr "Intes_tazione"
 

-#: src/compose.c:6042
+#: src/compose.c:6189

 msgid "_Attachments"
 msgstr "_Allegati"
 
 msgid "_Attachments"
 msgstr "_Allegati"
 

-#: src/compose.c:6046
+#: src/compose.c:6193

 msgid "Othe_rs"
 msgstr "A_ltro"
 
 msgid "Othe_rs"
 msgstr "A_ltro"
 

-#: src/compose.c:6061 src/summary_search.c:298
+#: src/compose.c:6208 src/summary_search.c:366

 msgid "Subject:"
 msgstr "Oggetto:"
 
 msgid "Subject:"
 msgstr "Oggetto:"
 

-#: src/compose.c:6250
+#: src/compose.c:6399

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1660,20 +1897,20 @@ msgstr ""
 "Impossibile caricare il controllo ortografico.\n"
 "%s"
 
 "Impossibile caricare il controllo ortografico.\n"
 "%s"
 

-#: src/compose.c:6362
+#: src/compose.c:6511

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Da: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Da: <i>%s</i>"
 

-#: src/compose.c:6393
+#: src/compose.c:6542

 msgid "Account to use for this email"
 msgstr "Account da utilizzare per questo messaggio"
 
 msgid "Account to use for this email"
 msgstr "Account da utilizzare per questo messaggio"
 

-#: src/compose.c:6395
+#: src/compose.c:6544

 msgid "Sender address to be used"
 msgstr "Indirizzo mittente da utilizzare"
 
 msgid "Sender address to be used"
 msgstr "Indirizzo mittente da utilizzare"
 

-#: src/compose.c:6549
+#: src/compose.c:6705

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "


@@ -1682,47 +1919,51 @@ msgstr ""
 "Impossibile caricare il sistema di privacy '%s'. Non sarà possibile firmare "
 "o cifrare questo messaggio."
 
 "Impossibile caricare il sistema di privacy '%s'. Non sarà possibile firmare "
 "o cifrare questo messaggio."
 

-#: src/compose.c:6788
-msgid "Message To format error."
-msgstr "Errore nel formato del destinatario."
+#: src/compose.c:6867 src/prefs_template.c:549
+msgid "Template body format error."
+msgstr "Errore nel formato del corpo del modello."
+
+#: src/compose.c:6975 src/prefs_template.c:587
+msgid "Template To format error."
+msgstr "Errore nel formato del destinatario del modello."

 
 

-#: src/compose.c:6801
-msgid "Message Cc format error."
-msgstr "Errore nel formato dell'indirizzo CC."
+#: src/compose.c:6988 src/prefs_template.c:592
+msgid "Template Cc format error."
+msgstr "Errore nel formato del campo CC del modello."

 
 

-#: src/compose.c:6814
-msgid "Message Bcc format error."
-msgstr "Errore nel formato dell'indirizzo BCC."
+#: src/compose.c:7001 src/prefs_template.c:597
+msgid "Template Bcc format error."
+msgstr "Errore nel formato del campo BCC del modello."

 
 

-#: src/compose.c:6828
-msgid "Message subject format error."
-msgstr "Errore nel formato dell'oggetto."
+#: src/compose.c:7015 src/prefs_template.c:602
+msgid "Template subject format error."
+msgstr "Errore nel formato dell'oggetto del modello."

 
 

-#: src/compose.c:7050
+#: src/compose.c:7239

 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 

-#: src/compose.c:7065
+#: src/compose.c:7254

 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 

-#: src/compose.c:7138
+#: src/compose.c:7327

 msgid "Properties"
 msgstr "Proprietà"
 
 msgid "Properties"
 msgstr "Proprietà"
 

-#: src/compose.c:7189
+#: src/compose.c:7378

 msgid "Encoding"
 msgstr "Codifica"
 
 msgid "Encoding"
 msgstr "Codifica"
 

-#: src/compose.c:7209
+#: src/compose.c:7398

 msgid "Path"
 msgstr "Percorso"
 
 msgid "Path"
 msgstr "Percorso"
 

-#: src/compose.c:7210 src/prefs_toolbar.c:1060
+#: src/compose.c:7399 src/prefs_toolbar.c:1060

 msgid "File name"
 msgstr "Nome file"
 
 msgid "File name"
 msgstr "Nome file"
 

-#: src/compose.c:7393
+#: src/compose.c:7582

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1733,19 +1974,21 @@ msgstr ""
 "Forzare la conclusione del processo?\n"
 "group id del processo: %d"
 
 "Forzare la conclusione del processo?\n"
 "group id del processo: %d"
 

-#: src/compose.c:7435
+#: src/compose.c:7624

 msgid "Compose: input from monitoring process\n"
 msgstr "Composizione: input da processo esterno di monitoraggio\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Composizione: input da processo esterno di monitoraggio\n"
 

-#: src/compose.c:7716 src/messageview.c:718
-msgid "Sylpheed-Claws needs network access in order to send this email."
-msgstr "È necessaria una connessione di rete per poter spedire il messaggio."
+#: src/compose.c:7905 src/messageview.c:720
+msgid "Claws Mail needs network access in order to send this email."
+msgstr ""
+"Claws Mail richiede una connessione di rete per poter spedire questo "
+"messaggio."

 
 

-#: src/compose.c:7741
+#: src/compose.c:7930

 msgid "Could not queue message."
 msgstr "Impossibile accodare il messaggio."
 
 msgid "Could not queue message."
 msgstr "Impossibile accodare il messaggio."
 

-#: src/compose.c:7743
+#: src/compose.c:7932

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1756,20 +1999,20 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:7863
+#: src/compose.c:8052

 msgid "Could not save draft."
 msgstr "Impossibile salvare la bozza"
 
 msgid "Could not save draft."
 msgstr "Impossibile salvare la bozza"
 

-#: src/compose.c:7938 src/compose.c:7961
+#: src/compose.c:8127 src/compose.c:8150

 msgid "Select file"
 msgstr "Selezionare il file"
 
 msgid "Select file"
 msgstr "Selezionare il file"
 

-#: src/compose.c:7974
+#: src/compose.c:8163

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Impossibile leggere il file '%s'."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Impossibile leggere il file '%s'."
 

-#: src/compose.c:7976
+#: src/compose.c:8165

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1778,44 +2021,44 @@ msgstr ""
 "Il file '%s' contiene caratteri non validi\n"
 "per la codifica corrente, l'inserzione potrebbe non essere corretta."
 
 "Il file '%s' contiene caratteri non validi\n"
 "per la codifica corrente, l'inserzione potrebbe non essere corretta."
 

-#: src/compose.c:8024
+#: src/compose.c:8213

 msgid "Discard message"
 msgstr "Scartare messaggio"
 
 msgid "Discard message"
 msgstr "Scartare messaggio"
 

-#: src/compose.c:8025
+#: src/compose.c:8214

 msgid "This message has been modified. Discard it?"
 msgstr "Questo messaggio è stato modificato. Scartarlo?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Questo messaggio è stato modificato. Scartarlo?"
 

-#: src/compose.c:8026
+#: src/compose.c:8215

 msgid "_Discard"
 msgstr "_Scarta"
 
 msgid "_Discard"
 msgstr "_Scarta"
 

-#: src/compose.c:8026
+#: src/compose.c:8215

 msgid "_Save to Drafts"
 msgstr "nelle _Bozze"
 
 msgid "_Save to Drafts"
 msgstr "nelle _Bozze"
 

-#: src/compose.c:8070
+#: src/compose.c:8259

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Applicare il modello '%s'?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Applicare il modello '%s'?"
 

-#: src/compose.c:8072
+#: src/compose.c:8261

 msgid "Apply template"
 msgstr "Applica il modello"
 
 msgid "Apply template"
 msgstr "Applica il modello"
 

-#: src/compose.c:8073
+#: src/compose.c:8262

 msgid "_Replace"
 msgstr "_Rimpiazza"
 
 msgid "_Replace"
 msgstr "_Rimpiazza"
 

-#: src/compose.c:8073
+#: src/compose.c:8262

 msgid "_Insert"
 msgstr "_Inserisci"
 
 msgid "_Insert"
 msgstr "_Inserisci"
 

-#: src/compose.c:8761
+#: src/compose.c:8950

 msgid "Insert or attach?"
 msgstr "Inserire o allegare?"
 
 msgid "Insert or attach?"
 msgstr "Inserire o allegare?"
 

-#: src/compose.c:8762
+#: src/compose.c:8951

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"


@@ -1823,15 +2066,19 @@ msgstr ""
 "Inserire il contenuto del (dei) file nel corpo del messaggio, o allegarlo al "
 "messaggio?"
 
 "Inserire il contenuto del (dei) file nel corpo del messaggio, o allegarlo al "
 "messaggio?"
 

-#: src/compose.c:8764
+#: src/compose.c:8953

 msgid "+_Insert"
 msgstr "+_Inserisci"
 
 msgid "+_Insert"
 msgstr "+_Inserisci"
 

-#: src/compose.c:8764
+#: src/compose.c:8953

 msgid "_Attach"
 msgstr "_Allega"
 
 msgid "_Attach"
 msgstr "_Allega"
 

-#: src/compose.c:9170
+#: src/compose.c:9152
+msgid "Quote format error."
+msgstr "Errore nel formato del simbolo di citazione."
+
+#: src/compose.c:9371

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -1842,12 +2089,12 @@ msgstr ""
 
 #: src/crash.c:142
 #, c-format
 
 #: src/crash.c:142
 #, c-format

-msgid "Sylpheed-Claws process (%ld) received signal %ld"
-msgstr "Il processo Sylpheed-Claws (%ld) ha ricevuto il segnale %ld"
+msgid "Claws Mail process (%ld) received signal %ld"
+msgstr "Il processo Claws Mail (%ld) ha ricevuto il segnale %ld"

 
 #: src/crash.c:188
 
 #: src/crash.c:188

-msgid "Sylpheed-Claws has crashed"
-msgstr "Sylpheed-Claws è crashato"
+msgid "Claws Mail has crashed"
+msgstr "Claws Mail è crashato"

 
 #: src/crash.c:204
 #, c-format
 
 #: src/crash.c:204
 #, c-format


@@ -1878,61 +2125,69 @@ msgstr "Crea bug report"
 msgid "Save crash information"
 msgstr "Salva informazioni sul crash"
 
 msgid "Save crash information"
 msgstr "Salva informazioni sul crash"
 

-#: src/editaddress.c:153
+#: src/editaddress.c:183

 msgid "Add New Person"
 msgstr "Aggiungi una nuova persona"
 
 msgid "Add New Person"
 msgstr "Aggiungi una nuova persona"
 

-#: src/editaddress.c:154
+#: src/editaddress.c:184

 msgid "Edit Person Details"
 msgstr "Modifica i dettagli di una persona"
 
 msgid "Edit Person Details"
 msgstr "Modifica i dettagli di una persona"
 

-#: src/editaddress.c:316
+#: src/editaddress.c:355

 msgid "An Email address must be supplied."
 msgstr "Dev'essere specificato un indirizzo email."
 
 msgid "An Email address must be supplied."
 msgstr "Dev'essere specificato un indirizzo email."
 

-#: src/editaddress.c:490
+#: src/editaddress.c:529

 msgid "A Name and Value must be supplied."
 msgstr "Devono essere specificati un Nome ed un Valore"
 
 msgid "A Name and Value must be supplied."
 msgstr "Devono essere specificati un Nome ed un Valore"
 

-#: src/editaddress.c:560
+#: src/editaddress.c:618
+msgid "Discard"
+msgstr "Scarta"
+
+#: src/editaddress.c:619
+msgid "Apply"
+msgstr "Applica"
+
+#: src/editaddress.c:649 src/editaddress.c:698

 msgid "Edit Person Data"
 msgstr "Modifica i dati di una persona"
 
 msgid "Edit Person Data"
 msgstr "Modifica i dati di una persona"
 

-#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:799
+#: src/editaddress.c:759 src/expldifdlg.c:508 src/exporthtml.c:799

 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Nome visualizzato"
 

-#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:827
+#: src/editaddress.c:765 src/editaddress.c:769 src/ldif.c:827

 msgid "Last Name"
 msgstr "Cognome"
 
 msgid "Last Name"
 msgstr "Cognome"
 

-#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:823
+#: src/editaddress.c:766 src/editaddress.c:768 src/ldif.c:823

 msgid "First Name"
 msgstr "Nome"
 
 msgid "First Name"
 msgstr "Nome"
 

-#: src/editaddress.c:683
+#: src/editaddress.c:771

 msgid "Nickname"
 msgstr "Nickname"
 
 msgid "Nickname"
 msgstr "Nickname"
 

-#: src/editaddress.c:760 src/editaddress.c:816
+#: src/editaddress.c:848 src/editaddress.c:904

 msgid "Alias"
 msgstr "Alias"
 
 msgid "Alias"
 msgstr "Alias"
 

-#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:222
+#: src/editaddress.c:1042 src/editaddress.c:1099 src/prefs_customheader.c:222

 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Valore"
 
 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Valore"
 

-#: src/editaddress.c:1070
+#: src/editaddress.c:1161

 msgid "_User Data"
 msgstr "_Dati utente"
 
 msgid "_User Data"
 msgstr "_Dati utente"
 

-#: src/editaddress.c:1071
+#: src/editaddress.c:1162

 msgid "_Email Addresses"
 msgstr "Indirizzi _E-Mail"
 
 msgid "_Email Addresses"
 msgstr "Indirizzi _E-Mail"
 

-#: src/editaddress.c:1072
+#: src/editaddress.c:1163

 msgid "O_ther Attributes"
 msgstr "_Altri attributi"
 
 msgid "O_ther Attributes"
 msgstr "_Altri attributi"
 


@@ -1957,7 +2212,7 @@ msgid " Check File "
 msgstr " Verifica File "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr " Verifica File "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1909
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1917

 msgid "File"
 msgstr "File"
 
 msgid "File"
 msgstr "File"
 


@@ -2005,11 +2260,11 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 

-#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:134 src/mh_gtk.c:127
+#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:139 src/mh_gtk.c:130

 msgid "New folder"
 msgstr "Nuova cartella"
 
 msgid "New folder"
 msgstr "Nuova cartella"
 

-#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:128
+#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 


@@ -2091,12 +2346,12 @@ 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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "

-"computer as Sylpheed-Claws."
+"computer as Claws Mail."

 msgstr ""
 "Questo è l'hostname del server. Per esempio,\"ldap.miodominio.it\" potrebbe "
 "essere appropriato per l'organizzazione \"miodominio.it\". Può essere usato "
 "anche un IP. È possibile inserire \"localhost\" se il server LDAP funziona "
 msgstr ""
 "Questo è l'hostname del server. Per esempio,\"ldap.miodominio.it\" potrebbe "
 "essere appropriato per l'organizzazione \"miodominio.it\". Può essere usato "
 "anche un IP. È possibile inserire \"localhost\" se il server LDAP funziona "

-"sullo stesso computer di Sylpheed-Claws."
+"sullo stesso computer di Claws Mail."

 
 #: src/editldap.c:470
 msgid "TLS"
 
 #: src/editldap.c:470
 msgid "TLS"


@@ -2142,13 +2397,13 @@ msgstr "Premere questo tasto per testare la connessione al server."
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""

-"Questo parametro specifica il nome della directory da cercare sul server.Ad "
+"Questo parametro specifica il nome della directory da cercare sul server. Ad "

 "esempio:\n"
 "esempio:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=nomedominio,dc=it\n"
 "  o=Nome organizzazione,c=Stato\n"
 
 "  ou=people,dc=nomedominio,dc=it\n"
 "  o=Nome organizzazione,c=Stato\n"
 


@@ -2251,12 +2506,12 @@ msgstr "Bind DN"
 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 "
 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 "

-"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "

 "performing a search."
 msgstr ""
 "Il nome utente dell'account LDAP da usare per connettersi al server. Questo "
 "è normalmente utilizzato solo per i server protetti. Generalmente questo "
 "performing a search."
 msgstr ""
 "Il nome utente dell'account LDAP da usare per connettersi al server. Questo "
 "è normalmente utilizzato solo per i server protetti. Generalmente questo "

-"nome è formattato come \"cn=utente,dc=sylpheed,dc=com\". Normalmente viene "
+"nome è formattato come \"cn=utente,dc=claws-mail,dc=org\". Normalmente viene "

 "lasciato vuoto quando si fa una ricerca."
 
 #: src/editldap.c:741
 "lasciato vuoto quando si fa una ricerca."
 
 #: src/editldap.c:741


@@ -2292,7 +2547,7 @@ msgstr "Generale"
 msgid "Search"
 msgstr "Cerca"
 
 msgid "Search"
 msgstr "Cerca"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:488
+#: src/editldap.c:810 src/gtk/quicksearch.c:490

 msgid "Extended"
 msgstr "Esteso"
 
 msgid "Extended"
 msgstr "Esteso"
 


@@ -2316,19 +2571,19 @@ msgstr "Modifica il record vCard"
 msgid "Add New vCard Entry"
 msgstr "Aggiungi nuovo recordo vCard"
 
 msgid "Add New vCard Entry"
 msgstr "Aggiungi nuovo recordo vCard"
 

-#: src/exphtmldlg.c:113
+#: src/exphtmldlg.c:110

 msgid "Please specify output directory and file to create."
 msgstr "Specifica la directory di output e il file da creare."
 
 msgid "Please specify output directory and file to create."
 msgstr "Specifica la directory di output e il file da creare."
 

-#: src/exphtmldlg.c:116
+#: src/exphtmldlg.c:113

 msgid "Select stylesheet and formatting."
 msgstr "Seleziona il foglio stile e la formattazione."
 
 msgid "Select stylesheet and formatting."
 msgstr "Seleziona il foglio stile e la formattazione."
 

-#: src/exphtmldlg.c:119 src/expldifdlg.c:117
+#: src/exphtmldlg.c:116 src/expldifdlg.c:117

 msgid "File exported successfully."
 msgstr "File esportato con successo."
 
 msgid "File exported successfully."
 msgstr "File esportato con successo."
 

-#: src/exphtmldlg.c:184
+#: src/exphtmldlg.c:181

 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"


@@ -2337,11 +2592,11 @@ msgstr ""
 "La directory dell'output HTML '%s'\n"
 "non esiste. Creare la nuova directory?"
 
 "La directory dell'output HTML '%s'\n"
 "non esiste. Creare la nuova directory?"
 

-#: src/exphtmldlg.c:187 src/expldifdlg.c:193
+#: src/exphtmldlg.c:184 src/expldifdlg.c:193

 msgid "Create Directory"
 msgstr "Crea Directory"
 
 msgid "Create Directory"
 msgstr "Crea Directory"
 

-#: src/exphtmldlg.c:196
+#: src/exphtmldlg.c:193

 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"


@@ -2350,102 +2605,102 @@ msgstr ""
 "Impossibile creare la directory di output per il file HTML:\n"
 "%s"
 
 "Impossibile creare la directory di output per il file HTML:\n"
 "%s"
 

-#: src/exphtmldlg.c:198 src/expldifdlg.c:204
+#: src/exphtmldlg.c:195 src/expldifdlg.c:204

 msgid "Failed to Create Directory"
 msgstr "Creazione diretory fallita"
 
 msgid "Failed to Create Directory"
 msgstr "Creazione diretory fallita"
 

-#: src/exphtmldlg.c:240
+#: src/exphtmldlg.c:237

 msgid "Error creating HTML file"
 msgstr "Errore durante la creazione del file HTML"
 
 msgid "Error creating HTML file"
 msgstr "Errore durante la creazione del file HTML"
 

-#: src/exphtmldlg.c:326
+#: src/exphtmldlg.c:323

 msgid "Select HTML output file"
 msgstr "Selezionare il file HTML di output"
 
 msgid "Select HTML output file"
 msgstr "Selezionare il file HTML di output"
 

-#: src/exphtmldlg.c:390
+#: src/exphtmldlg.c:387

 msgid "HTML Output File"
 msgstr "File di output HTML"
 
 msgid "HTML Output File"
 msgstr "File di output HTML"
 

-#: src/exphtmldlg.c:399 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "_Sfoglia"
 
 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "_Sfoglia"
 

-#: src/exphtmldlg.c:452
+#: src/exphtmldlg.c:449

 msgid "Stylesheet"
 msgstr "Foglio stile"
 
 msgid "Stylesheet"
 msgstr "Foglio stile"
 

-#: src/exphtmldlg.c:460 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
-#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:1003 src/prefs_account.c:663
-#: src/summaryview.c:4983
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1678
+#: src/gtk/gtkaspell.c:2411 src/mainwindow.c:1004 src/prefs_account.c:667
+#: src/summaryview.c:4991

 msgid "None"
 msgstr "Nessuno"
 
 msgid "None"
 msgstr "Nessuno"
 

-#: src/exphtmldlg.c:461 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:458 src/prefs_summaries.c:350 src/prefs_summaries.c:691

 msgid "Default"
 msgstr "Predefinito"
 
 msgid "Default"
 msgstr "Predefinito"
 

-#: src/exphtmldlg.c:462 src/plugins/pgpcore/sgpgme.c:140
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:144

 msgid "Full"
 msgstr "Completo"
 
 msgid "Full"
 msgstr "Completo"
 

-#: src/exphtmldlg.c:463
+#: src/exphtmldlg.c:460

 msgid "Custom"
 msgstr "Personalizzato"
 
 msgid "Custom"
 msgstr "Personalizzato"
 

-#: src/exphtmldlg.c:464
+#: src/exphtmldlg.c:461

 msgid "Custom-2"
 msgstr "Personalizzato-2"
 
 msgid "Custom-2"
 msgstr "Personalizzato-2"
 

-#: src/exphtmldlg.c:465
+#: src/exphtmldlg.c:462

 msgid "Custom-3"
 msgstr "Personalizzato-3"
 
 msgid "Custom-3"
 msgstr "Personalizzato-3"
 

-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:463

 msgid "Custom-4"
 msgstr "Personalizzato-4"
 
 msgid "Custom-4"
 msgstr "Personalizzato-4"
 

-#: src/exphtmldlg.c:473
+#: src/exphtmldlg.c:470

 msgid "Full Name Format"
 msgstr "Nome completo del formato"
 
 msgid "Full Name Format"
 msgstr "Nome completo del formato"
 

-#: src/exphtmldlg.c:481
+#: src/exphtmldlg.c:478

 msgid "First Name, Last Name"
 msgstr "Nome, Cognome"
 
 msgid "First Name, Last Name"
 msgstr "Nome, Cognome"
 

-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:479

 msgid "Last Name, First Name"
 msgstr "Cognome, Nome"
 
 msgid "Last Name, First Name"
 msgstr "Cognome, Nome"
 

-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:486

 msgid "Color Banding"
 msgstr "Fasce di colore"
 
 msgid "Color Banding"
 msgstr "Fasce di colore"
 

-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:492

 msgid "Format Email Links"
 msgstr "Formato collegamento email"
 
 msgid "Format Email Links"
 msgstr "Formato collegamento email"
 

-#: src/exphtmldlg.c:501
+#: src/exphtmldlg.c:498

 msgid "Format User Attributes"
 msgstr "Formato attributi utente"
 
 msgid "Format User Attributes"
 msgstr "Formato attributi utente"
 

-#: src/exphtmldlg.c:556 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919

 msgid "File Name :"
 msgstr "Nome file :"
 
 msgid "File Name :"
 msgstr "Nome file :"
 

-#: src/exphtmldlg.c:566
+#: src/exphtmldlg.c:563

 msgid "Open with Web Browser"
 msgstr "Apri con Web Browser"
 
 msgid "Open with Web Browser"
 msgstr "Apri con Web Browser"
 

-#: src/exphtmldlg.c:598
+#: src/exphtmldlg.c:595

 msgid "Export Address Book to HTML File"
 msgstr "Esportazione della rubrica in HTML"
 
 msgid "Export Address Book to HTML File"
 msgstr "Esportazione della rubrica in HTML"
 

-#: src/exphtmldlg.c:664 src/expldifdlg.c:736 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027

 msgid "File Info"
 msgstr "Informazioni file"
 
 msgid "File Info"
 msgstr "Informazioni file"
 

-#: src/exphtmldlg.c:665
+#: src/exphtmldlg.c:662

 msgid "Format"
 msgstr "Formato"
 
 msgid "Format"
 msgstr "Formato"
 


@@ -2507,13 +2762,13 @@ msgstr "Suffisso"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Il suffisso viene usato per creare un \"Nome Distinto\" (o DN) per un "
 "elemento LDAP. Tra gli esempi:\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Il suffisso viene usato per creare un \"Nome Distinto\" (o DN) per un "
 "elemento LDAP. Tra gli esempi:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=nomedominio,dc=com\n"
 "  o=Nome Organizzazione,c=Stato\n"
 
 "  ou=people,dc=nomedominio,dc=com\n"
 "  o=Nome Organizzazione,c=Stato\n"
 


@@ -2529,30 +2784,30 @@ msgstr "ID Univoco"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Lo User ID univoco viene utilizzato per creare un DN che è formattato come:\n"
 msgstr ""
 "Lo User ID univoco viene utilizzato per creare un DN che è formattato come:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Il Nome Visualizzato nella rubrica è usato per creare un DN che è formattato "
 "come:\n"
 msgstr ""
 "Il Nome Visualizzato nella rubrica è usato per creare un DN che è formattato "
 "come:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Il primo indirizzo e-mail che appartiene ad una persona è utilizzato per "
 "creare un DN formattato come:\n"
 msgstr ""
 "Il primo indirizzo e-mail che appartiene ad una persona è utilizzato per "
 "creare un DN formattato come:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:543
 msgid ""
 
 #: src/expldifdlg.c:543
 msgid ""


@@ -2600,11 +2855,11 @@ msgstr ""
 msgid "Export Address Book to LDIF File"
 msgstr "Esporta la rubrica in formato LDIF"
 
 msgid "Export Address Book to LDIF File"
 msgstr "Esporta la rubrica in formato LDIF"
 

-#: src/expldifdlg.c:737
+#: src/expldifdlg.c:736

 msgid "Distguished Name"
 msgstr "Nome Distinto"
 
 msgid "Distguished Name"
 msgstr "Nome Distinto"
 

-#: src/export.c:120 src/summaryview.c:6355
+#: src/export.c:120 src/summaryview.c:6370

 msgid "Export to mbox file"
 msgstr "Esporta verso file mbox"
 
 msgid "Export to mbox file"
 msgstr "Esporta verso file mbox"
 


@@ -2645,8 +2900,8 @@ msgid "Attributes"
 msgstr "Attributi"
 
 #: src/exporthtml.c:1010
 msgstr "Attributi"
 
 #: src/exporthtml.c:1010

-msgid "Sylpheed-Claws Address Book"
-msgstr "Rubrica di Sylpheed-Claws"
+msgid "Claws Mail Address Book"
+msgstr "Rubrica di Claws Mail"

 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."
 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."


@@ -2664,48 +2919,53 @@ msgstr "Nome troppo lungo."
 msgid "Not specified."
 msgstr "Non specificato."
 
 msgid "Not specified."
 msgstr "Non specificato."
 

-#: src/folder.c:1277 src/foldersel.c:371 src/prefs_folder_item.c:236
+#: src/folder.c:1283 src/foldersel.c:371 src/prefs_folder_item.c:239

 msgid "Inbox"
 msgstr "In entrata"
 
 msgid "Inbox"
 msgstr "In entrata"
 

-#: src/folder.c:1281 src/foldersel.c:375
+#: src/folder.c:1287 src/foldersel.c:375

 msgid "Sent"
 msgstr "Inviati"
 
 msgid "Sent"
 msgstr "Inviati"
 

-#: src/folder.c:1285 src/foldersel.c:379 src/prefs_folder_item.c:239
+#: src/folder.c:1291 src/foldersel.c:379 src/prefs_folder_item.c:242

 msgid "Queue"
 msgstr "Coda"
 
 msgid "Queue"
 msgstr "Coda"
 

-#: src/folder.c:1289 src/foldersel.c:383 src/prefs_folder_item.c:240
-#: src/toolbar.c:366 src/toolbar.c:400 src/toolbar.c:491
+#: src/folder.c:1295 src/foldersel.c:383 src/prefs_folder_item.c:243
+#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501

 msgid "Trash"
 msgstr "Cestino"
 
 msgid "Trash"
 msgstr "Cestino"
 

-#: src/folder.c:1293 src/foldersel.c:387 src/prefs_folder_item.c:238
+#: src/folder.c:1299 src/foldersel.c:387 src/prefs_folder_item.c:241

 msgid "Drafts"
 msgstr "Bozze"
 
 msgid "Drafts"
 msgstr "Bozze"
 

-#: src/folder.c:1572
+#: src/folder.c:1578

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Elaborazione in corso (%s)\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Elaborazione in corso (%s)\n"
 

-#: src/folder.c:2508
+#: src/folder.c:2514

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Prelievo di tutti i messaggi in %s in corso.\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Prelievo di tutti i messaggi in %s in corso.\n"
 

-#: src/folder.c:2797
+#: src/folder.c:2803
+#, c-format
+msgid "Copying %s to %s...\n"
+msgstr "Copia di %s in %s in corso.\n"
+
+#: src/folder.c:2803

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Spostamento di %s in %s in corso.\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Spostamento di %s in %s in corso.\n"
 

-#: src/folder.c:3073
+#: src/folder.c:3090

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aggiornamento cache per %s..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Aggiornamento cache per %s..."
 

-#: src/folder.c:3784
+#: src/folder.c:3801

 msgid "Processing messages..."
 msgstr "Elaborazione messaggi in corso."
 
 msgid "Processing messages..."
 msgstr "Elaborazione messaggi in corso."
 


@@ -2713,163 +2973,168 @@ msgstr "Elaborazione messaggi in corso."
 msgid "Select folder"
 msgstr "Selezionare la cartella"
 
 msgid "Select folder"
 msgstr "Selezionare la cartella"
 

-#: src/foldersel.c:558 src/imap_gtk.c:138 src/mh_gtk.c:129
+#: src/foldersel.c:558 src/imap_gtk.c:143 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr "Nuova Cartella"
 
 msgid "NewFolder"
 msgstr "Nuova Cartella"
 

-#: src/foldersel.c:566 src/imap_gtk.c:146 src/imap_gtk.c:152 src/mh_gtk.c:135
-#: src/mh_gtk.c:238
+#: src/foldersel.c:566 src/imap_gtk.c:151 src/imap_gtk.c:157 src/mh_gtk.c:138
+#: src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' non può essere incluso nel nome della cartella."
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' non può essere incluso nel nome della cartella."
 

-#: src/foldersel.c:576 src/imap_gtk.c:162 src/imap_gtk.c:216 src/mh_gtk.c:145
-#: src/mh_gtk.c:245
+#: src/foldersel.c:576 src/imap_gtk.c:167 src/imap_gtk.c:221 src/mh_gtk.c:148
+#: src/mh_gtk.c:248

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La cartella '%s' esiste già."
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "La cartella '%s' esiste già."
 

-#: src/foldersel.c:583 src/imap_gtk.c:168 src/mh_gtk.c:151
+#: src/foldersel.c:583 src/imap_gtk.c:173 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Impossibile creare la cartella '%s'."
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Impossibile creare la cartella '%s'."
 

-#: src/folderview.c:290
+#: src/folderview.c:291

 msgid "/Mark all re_ad"
 msgstr "/Contrassegna tu_tti come letti"
 
 msgid "/Mark all re_ad"
 msgstr "/Contrassegna tu_tti come letti"
 

-#: src/folderview.c:291
+#: src/folderview.c:293

 msgid "/_Search folder..."
 msgstr "/_Cerca cartella..."
 
 msgid "/_Search folder..."
 msgstr "/_Cerca cartella..."
 

-#: src/folderview.c:293
+#: src/folderview.c:295

 msgid "/Process_ing..."
 msgstr "/_Elaborazione..."
 
 msgid "/Process_ing..."
 msgstr "/_Elaborazione..."
 

-#: src/folderview.c:298
+#: src/folderview.c:300

 msgid "/Empty _trash..."
 msgstr "/Svuota _cestino"
 
 msgid "/Empty _trash..."
 msgstr "/Svuota _cestino"
 

-#: src/folderview.c:303
+#: src/folderview.c:305

 msgid "/Send _queue..."
 msgstr "/Coda d'_invio..."
 
 msgid "/Send _queue..."
 msgstr "/Coda d'_invio..."
 

-#: src/folderview.c:422 src/folderview.c:469 src/prefs_folder_column.c:80
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:80

 msgid "New"
 msgstr "Nuovi"
 
 msgid "New"
 msgstr "Nuovi"
 

-#: src/folderview.c:423 src/folderview.c:470 src/prefs_folder_column.c:81
+#: src/folderview.c:425 src/folderview.c:472 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr "Non letti"
 
 msgid "Unread"
 msgstr "Non letti"
 

-#: src/folderview.c:424 src/prefs_folder_column.c:82
+#: src/folderview.c:426 src/prefs_folder_column.c:82

 msgid "Total"
 msgstr "Totale"
 
 #. TRANSLATORS: This in Number sign in American style
 msgid "Total"
 msgstr "Totale"
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:472 src/summaryview.c:491
+#: src/folderview.c:474 src/summaryview.c:491

 msgid "#"
 msgstr "N."
 
 msgid "#"
 msgstr "N."
 

-#: src/folderview.c:717
+#: src/folderview.c:719

 msgid "Setting folder info..."
 msgstr "Impostazione informazioni della cartella..."
 
 msgid "Setting folder info..."
 msgstr "Impostazione informazioni della cartella..."
 

-#: src/folderview.c:771 src/summaryview.c:3455
+#: src/folderview.c:773 src/summaryview.c:3453

 msgid "Mark all as read"
 msgstr "Contrassegna tutti come letti"
 
 msgid "Mark all as read"
 msgstr "Contrassegna tutti come letti"
 

-#: src/folderview.c:772 src/summaryview.c:3456
+#: src/folderview.c:774 src/summaryview.c:3454

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Contrassegnare realmente tutti i messaggi in questa cartella come letti?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Contrassegnare realmente tutti i messaggi in questa cartella come letti?"
 

-#: src/folderview.c:1058 src/imap.c:3192 src/mainwindow.c:3918 src/setup.c:90
+#: src/folderview.c:1060 src/imap.c:3190 src/mainwindow.c:3934 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi cartella %s%c%s..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi cartella %s%c%s..."
 

-#: src/folderview.c:1062 src/imap.c:3197 src/mainwindow.c:3923 src/setup.c:95
+#: src/folderview.c:1064 src/imap.c:3195 src/mainwindow.c:3939 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi cartella %s..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi cartella %s..."
 

-#: src/folderview.c:1089
+#: src/folderview.c:1091

 msgid "Rebuild folder tree"
 msgstr "Ricostruisci albero delle cartelle"
 
 msgid "Rebuild folder tree"
 msgstr "Ricostruisci albero delle cartelle"
 

-#: src/folderview.c:1090
+#: src/folderview.c:1092

 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Ricostruendo l'albero delle cartelle verranno cancellate le cache locali. "
 "Continuare?"
 
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Ricostruendo l'albero delle cartelle verranno cancellate le cache locali. "
 "Continuare?"
 

-#: src/folderview.c:1100
+#: src/folderview.c:1102

 msgid "Rebuilding folder tree..."
 msgstr "Analisi dell'albero delle cartelle..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Analisi dell'albero delle cartelle..."
 

-#: src/folderview.c:1102
+#: src/folderview.c:1104

 msgid "Scanning folder tree..."
 msgstr "Analisi dell'albero delle cartelle..."
 
 msgid "Scanning folder tree..."
 msgstr "Analisi dell'albero delle cartelle..."
 

-#: src/folderview.c:1220
+#: src/folderview.c:1175
+#, c-format
+msgid "Couldn't scan folder %s\n"
+msgstr "Impossibile analizzare la cartella %s\n"
+
+#: src/folderview.c:1228

 msgid "Checking for new messages in all folders..."
 msgstr "Controllo nuovi messaggi in tutte le cartelle..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo nuovi messaggi in tutte le cartelle..."
 

-#: src/folderview.c:2081
+#: src/folderview.c:2090

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Chiusura cartella %s..."
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Chiusura cartella %s..."
 

-#: src/folderview.c:2120
+#: src/folderview.c:2129

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Apertura cartella %s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Apertura cartella %s..."
 

-#: src/folderview.c:2133
+#: src/folderview.c:2142

 msgid "Folder could not be opened."
 msgstr "La cartella non può essere aperta."
 
 msgid "Folder could not be opened."
 msgstr "La cartella non può essere aperta."
 

-#: src/folderview.c:2294 src/mainwindow.c:2078
+#: src/folderview.c:2303 src/mainwindow.c:2080

 msgid "Empty trash"
 msgstr "Svuota cestino"
 
 msgid "Empty trash"
 msgstr "Svuota cestino"
 

-#: src/folderview.c:2295
+#: src/folderview.c:2304

 msgid "Delete all messages in trash?"
 msgstr "Cancellare tutti i messaggi nel cestino?"
 
 msgid "Delete all messages in trash?"
 msgstr "Cancellare tutti i messaggi nel cestino?"
 

-#: src/folderview.c:2296 src/mainwindow.c:2080
+#: src/folderview.c:2305 src/mainwindow.c:2082

 msgid "+_Empty trash"
 msgstr "+_Svuota cestino"
 
 msgid "+_Empty trash"
 msgstr "+_Svuota cestino"
 

-#: src/folderview.c:2340 src/inc.c:1465 src/toolbar.c:2122
+#: src/folderview.c:2349 src/inc.c:1465 src/toolbar.c:2196

 msgid "Offline warning"
 msgstr "Allarme offline"
 
 msgid "Offline warning"
 msgstr "Allarme offline"
 

-#: src/folderview.c:2341 src/toolbar.c:2123
+#: src/folderview.c:2350 src/toolbar.c:2197

 msgid "You're working offline. Override?"
 msgstr "Attualmente in modalità offline. Cambiare modalità?"
 
 msgid "You're working offline. Override?"
 msgstr "Attualmente in modalità offline. Cambiare modalità?"
 

-#: src/folderview.c:2352 src/toolbar.c:2142
+#: src/folderview.c:2361 src/toolbar.c:2216

 msgid "Send queued messages"
 msgstr "Invia i messaggi in coda"
 
 msgid "Send queued messages"
 msgstr "Invia i messaggi in coda"
 

-#: src/folderview.c:2353 src/toolbar.c:2143
+#: src/folderview.c:2362 src/toolbar.c:2217

 msgid "Send all queued messages?"
 msgstr "Inviare i messaggi in coda?"
 
 msgid "Send all queued messages?"
 msgstr "Inviare i messaggi in coda?"
 

-#: src/folderview.c:2354 src/messageview.c:579 src/messageview.c:596
-#: src/prefs_account.c:1032 src/toolbar.c:2144
+#: src/folderview.c:2363 src/messageview.c:581 src/messageview.c:598
+#: src/prefs_account.c:1039 src/toolbar.c:2218

 msgid "_Send"
 msgstr "_Invio"
 
 msgid "_Send"
 msgstr "_Invio"
 

-#: src/folderview.c:2362 src/toolbar.c:2162
+#: src/folderview.c:2371 src/toolbar.c:2236

 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 "Si sono verificati alcuni errori durante la spedizione dei messaggi in coda."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 "Si sono verificati alcuni errori durante la spedizione dei messaggi in coda."
 

-#: src/folderview.c:2365 src/main.c:1478 src/toolbar.c:2165
+#: src/folderview.c:2374 src/main.c:1549 src/toolbar.c:2239

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -2879,43 +3144,65 @@ msgstr ""
 "coda:\n"
 "%s"
 
 "coda:\n"
 "%s"
 

-#: src/folderview.c:2432
+#: src/folderview.c:2441
+#, c-format
+msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgstr "Copiare la cartella '%s' in '%s'?"
+
+#: src/folderview.c:2442

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Far diventare la cartella '%s' una sotto-cartella di '%s'?"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Far diventare la cartella '%s' una sotto-cartella di '%s'?"
 

-#: src/folderview.c:2435
+#: src/folderview.c:2444
+msgid "Copy folder"
+msgstr "Copia cartella"
+
+#: src/folderview.c:2444

 msgid "Move folder"
 msgstr "Sposta cartella"
 
 msgid "Move folder"
 msgstr "Sposta cartella"
 

-#: src/folderview.c:2446
+#: src/folderview.c:2455
+#, c-format
+msgid "Copying %s to %s..."
+msgstr "Copia di %s in %s in corso."
+
+#: src/folderview.c:2455

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Spostamento di %s in %s in corso."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Spostamento di %s in %s in corso."
 

-#: src/folderview.c:2475
+#: src/folderview.c:2486

 msgid "Source and destination are the same."
 msgstr "Sorgente e destinazione sono le stesse."
 
 msgid "Source and destination are the same."
 msgstr "Sorgente e destinazione sono le stesse."
 

-#: src/folderview.c:2478
+#: src/folderview.c:2489
+msgid "Can't copy a folder to one of its children."
+msgstr "Impossibile copiare una cartella in una sua sottocartella."
+
+#: src/folderview.c:2490

 msgid "Can't move a folder to one of its children."
 msgstr "Impossibile muovere una cartella in una sua sottocartella."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Impossibile muovere una cartella in una sua sottocartella."
 

-#: src/folderview.c:2481
+#: src/folderview.c:2493

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Impossibile spostare cartelle tra differenti mailbox."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Impossibile spostare cartelle tra differenti mailbox."
 

-#: src/folderview.c:2484
+#: src/folderview.c:2496
+msgid "Copy failed!"
+msgstr "Copia fallita!"
+
+#: src/folderview.c:2496

 msgid "Move failed!"
 msgstr "Spostamento fallito!"
 
 msgid "Move failed!"
 msgstr "Spostamento fallito!"
 

-#: src/folderview.c:2520
+#: src/folderview.c:2532

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configurazione delle regole elaborazione per la cartella %s"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configurazione delle regole elaborazione per la cartella %s"
 

-#: src/gedit-print.c:147 src/messageview.c:1502 src/summaryview.c:4124
-#: src/toolbar.c:178
+#: src/gedit-print.c:147 src/messageview.c:1525 src/summaryview.c:4124
+#: src/toolbar.c:182

 msgid "Print"
 msgstr "Stampa"
 
 msgid "Print"
 msgstr "Stampa"
 


@@ -2994,19 +3281,48 @@ msgstr "Fatto."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroup ricevuti (%s letti)"
 
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroup ricevuti (%s letti)"
 

-#: src/gtk/about.c:78 src/textview.c:216
+#: src/gtk/about.c:79 src/textview.c:216

 msgid "/_Open with Web browser"
 msgstr "/_Apri con Web Browser"
 
 msgid "/_Open with Web browser"
 msgstr "/_Apri con Web Browser"
 

-#: src/gtk/about.c:79 src/textview.c:217
+#: src/gtk/about.c:80 src/textview.c:217

 msgid "/Copy this _link"
 msgstr "/_Copia collegamento"
 
 msgid "/Copy this _link"
 msgstr "/_Copia collegamento"
 

-#: src/gtk/about.c:119
-msgid "About Sylpheed-Claws"
-msgstr "Informazioni su Sylpheed-Claws."
+#: src/gtk/about.c:138
+msgid ""
+"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
+"\n"
+"For further information visit the Claws Mail website:\n"
+msgstr ""
+"Claws Mail è un client e-mail leggero, veloce e flessibile.\n"
+"\n"
+"Per maggiori informazioni, visitare il sito di Claws Mail:\n"
+
+#: src/gtk/about.c:144
+msgid ""
+"\n"
+"\n"
+"Claws Mail is free software released under the GPL license. If you wish to "
+"donate to the Claws Mail project you can do so at:\n"
+msgstr ""
+"\n"
+"\n"
+"Claws Mail è software libero, rilasciato sotto licenza GPL. Se siete "
+"interessati ad elargire donazioni al progetto Claws Mail, potete farlo "
+"all'indirizzo:\n"
+
+#: src/gtk/about.c:159
+msgid ""
+"\n"
+"\n"
+"System Information\n"
+msgstr ""
+"\n"
+"\n"
+"Informazioni di sistema\n"

 
 

-#: src/gtk/about.c:161
+#: src/gtk/about.c:165

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3017,7 +3333,7 @@ msgstr ""
 "Locale: %s (charset: %s)\n"
 "Sistema operativo: %s %s (%s)"
 
 "Locale: %s (charset: %s)\n"
 "Sistema operativo: %s %s (%s)"
 

-#: src/gtk/about.c:170
+#: src/gtk/about.c:174

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3028,122 +3344,91 @@ msgstr ""
 "Locale: %s (charset: %s)\n"
 "Sistema operativo: %s"
 
 "Locale: %s (charset: %s)\n"
 "Sistema operativo: %s"
 

-#: src/gtk/about.c:179
+#: src/gtk/about.c:183

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 "Locale: %s (charset: %s)\n"
 "Operating System: unknown"
 msgstr ""

-"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
-"Locale: %s (charset: %s)\n"
-"Sistema operativo: sconosciuto"
-
-#: src/gtk/about.c:194
-#, c-format
-msgid ""
-"Compiled-in features:\n"
-"%s"
-msgstr ""
-"Opzioni pre-compilate:\n"
-"%s"

 
 

-#: src/gtk/about.c:240
-msgid ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Sylpheed-Claws team"
-msgstr ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"ed il team di Sylpheed-Claws"
+#: src/gtk/about.c:240 src/prefs_themes.c:706 src/wizard.c:467
+msgid "The Claws Mail Team"
+msgstr "Il Team di Claws Mail"

 
 

-#: src/gtk/about.c:283
-msgid ""
-"Sylpheed-Claws is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Sylpheed-Claws website:\n"
-msgstr ""
-"Sylpheed-Claws è un client e-mail leggero, veloce e flessibile.\n"
-"\n"
-"Per maggiori informazioni, visitare il sito di Sylpheed-Claws:\n"
+#: src/gtk/about.c:259
+msgid "Previous team members"
+msgstr "Precedenti membri del gruppo"

 
 

-#: src/gtk/about.c:289
-msgid ""
-"\n"
-"\n"
-"Sylpheed-Claws is free software released under the GPL license. If you wish "
-"to donate to the Sylpheed-Claws project you can do so at:\n"
-msgstr ""
-"\n"
-"\n"
-"Sylpheed-Claws è software libero, rilasciato sotto licenza GPL. Se siete "
-"interessati ad elargire donazioni al progetto Sylpheed-Claws, potete farlo "
-"all'indirizzo:\n"
+#: src/gtk/about.c:278
+msgid "The translation team"
+msgstr "Gruppo dei traduttori"

 
 

-#: src/gtk/about.c:296
-msgid "\n"
-msgstr "\n"
+#: src/gtk/about.c:297
+msgid "Documentation team"
+msgstr "Gruppo documentazione"

 
 

-#: src/gtk/about.c:307
-msgid "_Info"
-msgstr "_Info"
+#: src/gtk/about.c:316
+msgid "Logo"
+msgstr "Logo"

 
 #: src/gtk/about.c:335
 
 #: src/gtk/about.c:335

-msgid "The Sylpheed-Claws Team\n"
-msgstr "Il Team di Sylpheed-Claws\n"
+msgid "Icons"
+msgstr "Icone"

 
 

-#: src/gtk/about.c:352
-msgid ""
-"\n"
-"Previous team members\n"
-msgstr ""
-"\n"
-"Precedenti membri del gruppo\n"
+#: src/gtk/about.c:354
+msgid "Contributors"
+msgstr "Contributori"

 
 

-#: src/gtk/about.c:369
-msgid ""
-"\n"
-"The translation team\n"
-msgstr ""
-"\n"
-"Gruppo dei traduttori\n"
+#: src/gtk/about.c:402
+msgid "Compiled-in Features\n"
+msgstr "Opzioni pre-compilate\n"

 
 

-#: src/gtk/about.c:386
+#: src/gtk/about.c:418

 msgid ""
 msgid ""

-"\n"
-"Documentation team\n"
+"IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"

 msgstr ""
 msgstr ""

-"\n"
-"Gruppo documentazione\n"
+"aggiunge il supporto per gli indirizzi IPv6, il nuovo protocollo di "
+"indirizzamento di Internet\n"

 
 

-#: src/gtk/about.c:403
-msgid ""
-"\n"
-"Logo\n"
+#: src/gtk/about.c:429
+msgid "iconv|allows converting to and from different character sets\n"

 msgstr ""
 msgstr ""

-"\n"
-"Logo\n"
+"permette la conversione tra differenti insiemi di caratteri (charset)\n"

 
 

-#: src/gtk/about.c:420
-msgid ""
-"\n"
-"Icons\n"
-msgstr ""
-"\n"
-"Icone\n"
+#: src/gtk/about.c:439
+msgid "compface|adds support for the X-Face header\n"
+msgstr "aggiunge il supporto per l'intestazione X-Face\n"

 
 

-#: src/gtk/about.c:437
-msgid ""
-"\n"
-"Contributors\n"
-msgstr ""
-"\n"
-"Contributori\n"
+#: src/gtk/about.c:449
+msgid "OpenSSL|adds support for encrypted connections to servers\n"
+msgstr "aggiunge il supporto per la connessione crittata ai server\n"

 
 

-#: src/gtk/about.c:456
-msgid "_Authors"
-msgstr "_Autori"
+#: src/gtk/about.c:459
+msgid "LDAP|adds support for LDAP shared addressbooks\n"
+msgstr "aggiunge il supporto per le rubriche condivise LDAP\n"
+
+#: src/gtk/about.c:469
+msgid "JPilot|adds support for PalmOS addressbooks\n"
+msgstr "aggiunge il supporto per le rubriche PalmOS\n"
+
+#: src/gtk/about.c:479
+msgid "GNU/aspell|adds support for spell checking\n"
+msgstr "aggiunge il supporto per il controllo ortografico\n"

 
 

-#: src/gtk/about.c:476
+#: src/gtk/about.c:489
+msgid "libetpan|adds support for IMAP servers\n"
+msgstr "aggiunge il supporto per i server IMAP\n"
+
+#: src/gtk/about.c:499
+msgid "libgnomeprint|adds support for a complete print dialog\n"
+msgstr "aggiunge il supporto per una finestra di stampa completa\n"
+
+#: src/gtk/about.c:509
+msgid "libSM|adds support for session handling\n"
+msgstr "aggiunge il supporto per la gestione delle sessioni\n"
+
+#: src/gtk/about.c:541

 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 "
 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 "


@@ -3156,7 +3441,7 @@ msgstr ""
 "Software Foundation, o (a vostra scelta) una versione successiva.\n"
 "\n"
 
 "Software Foundation, o (a vostra scelta) una versione successiva.\n"
 "\n"
 

-#: src/gtk/about.c:482
+#: src/gtk/about.c:547

 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 "
 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 "


@@ -3169,7 +3454,7 @@ msgstr ""
 "Vedi la licenza GNU General Public License per ulteriori dettagli.\n"
 "\n"
 
 "Vedi la licenza GNU General Public License per ulteriori dettagli.\n"
 "\n"
 

-#: src/gtk/about.c:488
+#: src/gtk/about.c:553

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "


@@ -3182,7 +3467,7 @@ msgstr ""
 "1307, USA.\n"
 "\n"
 
 "1307, USA.\n"
 "\n"
 

-#: src/gtk/about.c:502
+#: src/gtk/about.c:571

 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("


@@ -3190,39 +3475,69 @@ msgstr ""
 "Questo prodotto include software sviluppato dal Progetto OpenSSL per "
 "l'utilizzo nel Toolkit OpenSSL ("
 
 "Questo prodotto include software sviluppato dal Progetto OpenSSL per "
 "l'utilizzo nel Toolkit OpenSSL ("
 

-#: src/gtk/about.c:506
+#: src/gtk/about.c:575

 msgid ").\n"
 msgstr ").\n"
 
 msgid ").\n"
 msgstr ").\n"
 

-#: src/gtk/about.c:518
+#: src/gtk/about.c:668
+msgid "About Claws Mail"
+msgstr "Informazioni su Claws Mail."
+
+#: src/gtk/about.c:719
+msgid ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"
+msgstr ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"ed il team di Claws Mail"
+
+#: src/gtk/about.c:733
+msgid "_Info"
+msgstr "_Info"
+
+#: src/gtk/about.c:739
+msgid "_Authors"
+msgstr "_Autori"
+
+#: src/gtk/about.c:745
+msgid "_Features"
+msgstr "_Caratteristiche"
+
+#: src/gtk/about.c:751

 msgid "_License"
 msgstr "_Licenza"
 
 msgid "_License"
 msgstr "_Licenza"
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:303
+#: src/gtk/about.c:759
+msgid "_Release Notes"
+msgstr "_Note di rilascio"
+
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:313

 msgid "Orange"
 msgstr "Arancione"
 
 msgid "Orange"
 msgstr "Arancione"
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:307
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:317

 msgid "Red"
 msgstr "Rosso"
 
 msgid "Red"
 msgstr "Rosso"
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:311
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:321

 msgid "Pink"
 msgstr "Rosa"
 
 msgid "Pink"
 msgstr "Rosa"
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:315
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:325

 msgid "Sky blue"
 msgstr "Azzurro"
 
 msgid "Sky blue"
 msgstr "Azzurro"
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:319
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:329

 msgid "Blue"
 msgstr "Blu"
 
 msgid "Blue"
 msgstr "Blu"
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:323
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:333

 msgid "Green"
 msgstr "Verde"
 
 msgid "Green"
 msgstr "Verde"
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:327
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:337

 msgid "Brown"
 msgstr "Marrone"
 
 msgid "Brown"
 msgstr "Marrone"
 


@@ -3351,36 +3666,36 @@ msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr ""
 "Font da utilizzare per intestazione e pié di pagina (es: \"Monospace 10\")"
 
 msgstr ""
 "Font da utilizzare per intestazione e pié di pagina (es: \"Monospace 10\")"
 

-#: src/gtk/gtkaspell.c:606
+#: src/gtk/gtkaspell.c:632

 msgid "No dictionary selected."
 msgstr "Nessun dizionario selezionato."
 
 msgid "No dictionary selected."
 msgstr "Nessun dizionario selezionato."
 

-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
+#: src/gtk/gtkaspell.c:868 src/gtk/gtkaspell.c:1869 src/gtk/gtkaspell.c:2164

 msgid "Normal Mode"
 msgstr "Modo normale"
 
 msgid "Normal Mode"
 msgstr "Modo normale"
 

-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
+#: src/gtk/gtkaspell.c:870 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2176

 msgid "Bad Spellers Mode"
 msgstr "Modalità 'Bad spellers'"
 
 msgid "Bad Spellers Mode"
 msgstr "Modalità 'Bad spellers'"
 

-#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:909

 msgid "Unknown suggestion mode."
 msgstr "Modo suggerimento sconosciuto."
 
 msgid "Unknown suggestion mode."
 msgstr "Modo suggerimento sconosciuto."
 

-#: src/gtk/gtkaspell.c:1154
+#: src/gtk/gtkaspell.c:1200

 msgid "No misspelled word found."
 msgstr "Non è stato trovato alcun errore."
 
 msgid "No misspelled word found."
 msgstr "Non è stato trovato alcun errore."
 

-#: src/gtk/gtkaspell.c:1502
+#: src/gtk/gtkaspell.c:1548

 msgid "Replace unknown word"
 msgstr "Sostituisci la parola sconosciuta"
 
 msgid "Replace unknown word"
 msgstr "Sostituisci la parola sconosciuta"
 

-#: src/gtk/gtkaspell.c:1517
+#: src/gtk/gtkaspell.c:1563

 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sostituisci \"%s\" con: </span>"
 
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sostituisci \"%s\" con: </span>"
 

-#: src/gtk/gtkaspell.c:1562
+#: src/gtk/gtkaspell.c:1608

 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"


@@ -3388,59 +3703,63 @@ msgstr ""
 "Tenere premuto il tasto Control mentre si preme Invio\n"
 "attiverà la modalità \"impara dall'errore\".\n"
 
 "Tenere premuto il tasto Control mentre si preme Invio\n"
 "attiverà la modalità \"impara dall'errore\".\n"
 

-#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
+#: src/gtk/gtkaspell.c:1863 src/gtk/gtkaspell.c:2152

 msgid "Fast Mode"
 msgstr "Modalità veloce"
 
 msgid "Fast Mode"
 msgstr "Modalità veloce"
 

-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1970

 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "\"%s\" sconosciuto in %s"
 
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "\"%s\" sconosciuto in %s"
 

-#: src/gtk/gtkaspell.c:1930
+#: src/gtk/gtkaspell.c:1984

 msgid "Accept in this session"
 msgstr "Accetta in questa sessione"
 
 msgid "Accept in this session"
 msgstr "Accetta in questa sessione"
 

-#: src/gtk/gtkaspell.c:1940
+#: src/gtk/gtkaspell.c:1994

 msgid "Add to personal dictionary"
 msgstr "Aggiungi al dizionario personale"
 
 msgid "Add to personal dictionary"
 msgstr "Aggiungi al dizionario personale"
 

-#: src/gtk/gtkaspell.c:1950
+#: src/gtk/gtkaspell.c:2004

 msgid "Replace with..."
 msgstr "Sostituisci con..."
 
 msgid "Replace with..."
 msgstr "Sostituisci con..."
 

-#: src/gtk/gtkaspell.c:1963
+#: src/gtk/gtkaspell.c:2017

 #, c-format
 msgid "Check with %s"
 msgstr "Verifica con %s"
 
 #, c-format
 msgid "Check with %s"
 msgstr "Verifica con %s"
 

-#: src/gtk/gtkaspell.c:1985
+#: src/gtk/gtkaspell.c:2039

 msgid "(no suggestions)"
 msgstr "(nessun suggerimento)"
 
 msgid "(no suggestions)"
 msgstr "(nessun suggerimento)"
 

-#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
+#: src/gtk/gtkaspell.c:2050 src/gtk/gtkaspell.c:2229

 msgid "More..."
 msgstr "Ancora..."
 
 msgid "More..."
 msgstr "Ancora..."
 

-#: src/gtk/gtkaspell.c:2060
+#: src/gtk/gtkaspell.c:2114

 #, c-format
 msgid "Dictionary: %s"
 msgstr "Dizionario: %s"
 
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Dizionario: %s"
 

-#: src/gtk/gtkaspell.c:2073
+#: src/gtk/gtkaspell.c:2127

 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Usa alternativa (%s)"
 
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Usa alternativa (%s)"
 

-#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2138
+msgid "Use both dictionaries"
+msgstr "Utilizza entrambi i dizionari"
+
+#: src/gtk/gtkaspell.c:2192 src/prefs_spelling.c:218

 msgid "Check while typing"
 msgstr "Verifica durante la scrittura"
 
 msgid "Check while typing"
 msgstr "Verifica durante la scrittura"
 

-#: src/gtk/gtkaspell.c:2137
+#: src/gtk/gtkaspell.c:2208

 msgid "Change dictionary"
 msgstr "Cambia dizionario"
 
 msgid "Change dictionary"
 msgstr "Cambia dizionario"
 

-#: src/gtk/gtkaspell.c:2270
+#: src/gtk/gtkaspell.c:2340

 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"


@@ -3449,6 +3768,15 @@ msgstr ""
 "Il controllo ortografico non può cambiare dizionario.\n"
 "%s"
 
 "Il controllo ortografico non può cambiare dizionario.\n"
 "%s"
 

+#: src/gtk/gtkaspell.c:2386
+#, c-format
+msgid ""
+"The spell checker could not change the alternate dictionary.\n"
+"%s"
+msgstr ""
+"Il controllo ortografico non può cambiare il dizionario alternativo.\n"
+"%s"
+

 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Nuovo messaggio"
 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Nuovo messaggio"


@@ -3554,7 +3882,7 @@ msgstr "Ricordalo"
 msgid "Protocol log"
 msgstr "Log dei protocolli"
 
 msgid "Protocol log"
 msgstr "Log dei protocolli"
 

-#: src/gtk/logwindow.c:373
+#: src/gtk/logwindow.c:384

 msgid "Clear _Log"
 msgstr "Pulisci _Log"
 
 msgid "Clear _Log"
 msgstr "Pulisci _Log"
 


@@ -3598,13 +3926,13 @@ msgstr ""
 msgid "Plugins"
 msgstr "Plugin"
 
 msgid "Plugins"
 msgstr "Plugin"
 

-#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:211

 msgid "Description"
 msgstr "Descrizione"
 
 #: src/gtk/pluginwindow.c:336
 msgid "Description"
 msgstr "Descrizione"
 
 #: src/gtk/pluginwindow.c:336

-msgid "More plugins are available from the Sylpheed-Claws website."
-msgstr "Altri plugin sono disponibili dal sito web di Sylpheed-Claws."
+msgid "More plugins are available from the Claws Mail website."
+msgstr "Altri plugin sono disponibili dal sito web di Claws Mail."

 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."
 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."


@@ -3634,188 +3962,188 @@ msgstr "Plugin caricati"
 msgid "Page Index"
 msgstr "Indice pagina"
 
 msgid "Page Index"
 msgstr "Indice pagina"
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:762
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:769

 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Account"
 
 #: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Account"
 
 #: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136

-#: src/prefs_summary_column.c:80 src/summaryview.c:2375
+#: src/prefs_summary_column.c:80 src/summaryview.c:2376

 msgid "Status"
 msgstr "Stato"
 
 msgid "Status"
 msgstr "Stato"
 

-#: src/gtk/quicksearch.c:329
+#: src/gtk/quicksearch.c:331

 msgid "all messages"
 msgstr "tutti i messaggi"
 
 msgid "all messages"
 msgstr "tutti i messaggi"
 

-#: src/gtk/quicksearch.c:330
+#: src/gtk/quicksearch.c:332

 msgid "messages whose age is greater than #"
 msgstr "messaggi che hanno un età superiore a #"
 
 msgid "messages whose age is greater than #"
 msgstr "messaggi che hanno un età superiore a #"
 

-#: src/gtk/quicksearch.c:331
+#: src/gtk/quicksearch.c:333

 msgid "messages whose age is less than #"
 msgstr "messaggi che hanno un età inferiore a #"
 
 msgid "messages whose age is less than #"
 msgstr "messaggi che hanno un età inferiore a #"
 

-#: src/gtk/quicksearch.c:332
+#: src/gtk/quicksearch.c:334

 msgid "messages which contain S in the message body"
 msgstr "messaggi che contengono S nel corpo del messaggio"
 
 msgid "messages which contain S in the message body"
 msgstr "messaggi che contengono S nel corpo del messaggio"
 

-#: src/gtk/quicksearch.c:333
+#: src/gtk/quicksearch.c:335

 msgid "messages which contain S in the whole message"
 msgstr "messaggi che contengono S nel'intero messaggio"
 
 msgid "messages which contain S in the whole message"
 msgstr "messaggi che contengono S nel'intero messaggio"
 

-#: src/gtk/quicksearch.c:334
+#: src/gtk/quicksearch.c:336

 msgid "messages carbon-copied to S"
 msgstr "messaggi in Cc: a S"
 
 msgid "messages carbon-copied to S"
 msgstr "messaggi in Cc: a S"
 

-#: src/gtk/quicksearch.c:335
+#: src/gtk/quicksearch.c:337

 msgid "message is either to: or cc: to S"
 msgstr "messaggi che hanno S in to: e/o in cc:"
 
 msgid "message is either to: or cc: to S"
 msgstr "messaggi che hanno S in to: e/o in cc:"
 

-#: src/gtk/quicksearch.c:336
+#: src/gtk/quicksearch.c:338

 msgid "deleted messages"
 msgstr "messaggi eliminati"
 
 msgid "deleted messages"
 msgstr "messaggi eliminati"
 

-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:339

 msgid "messages which contain S in the Sender field"
 msgstr "messaggi che contengono S nel campo mittente"
 
 msgid "messages which contain S in the Sender field"
 msgstr "messaggi che contengono S nel campo mittente"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:340

 msgid "true if execute \"S\" succeeds"
 msgstr "vero se l'esecuzione di \"S\" ha successo"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "vero se l'esecuzione di \"S\" ha successo"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:341

 msgid "messages originating from user S"
 msgstr "messaggi spediti dall'utente S"
 
 msgid "messages originating from user S"
 msgstr "messaggi spediti dall'utente S"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:342

 msgid "forwarded messages"
 msgstr "messaggi inoltrati"
 
 msgid "forwarded messages"
 msgstr "messaggi inoltrati"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:343

 msgid "messages which contain header S"
 msgstr "messaggi che hanno S nell'intestazione"
 
 msgid "messages which contain header S"
 msgstr "messaggi che hanno S nell'intestazione"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:344

 msgid "messages which contain S in Message-ID header"
 msgstr "messaggi che contengono S nell'intestazione Message-ID"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "messaggi che contengono S nell'intestazione Message-ID"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:345

 msgid "messages which contain S in inreplyto header"
 msgstr "messaggi che contengono S nell'intestazione Reply-To"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "messaggi che contengono S nell'intestazione Reply-To"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:346

 msgid "messages which are marked with color #"
 msgstr "messaggi che sono contrassegnati con il colore #"
 
 msgid "messages which are marked with color #"
 msgstr "messaggi che sono contrassegnati con il colore #"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:347

 msgid "locked messages"
 msgstr "messaggi bloccati"
 
 msgid "locked messages"
 msgstr "messaggi bloccati"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:348

 msgid "messages which are in newsgroup S"
 msgstr "messaggi che sono nel newsgroup S"
 
 msgid "messages which are in newsgroup S"
 msgstr "messaggi che sono nel newsgroup S"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:349

 msgid "new messages"
 msgstr "nuovi messaggi"
 
 msgid "new messages"
 msgstr "nuovi messaggi"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:350

 msgid "old messages"
 msgstr "messaggi vecchi"
 
 msgid "old messages"
 msgstr "messaggi vecchi"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:351

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "messaggi incompleti (ricevuti parzialmente)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "messaggi incompleti (ricevuti parzialmente)"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:352

 msgid "messages which have been replied to"
 msgstr "messaggi che hanno avuto una risposta"
 
 msgid "messages which have been replied to"
 msgstr "messaggi che hanno avuto una risposta"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:353

 msgid "read messages"
 msgstr "messaggi letti"
 
 msgid "read messages"
 msgstr "messaggi letti"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:354

 msgid "messages which contain S in subject"
 msgstr "messaggi che contengono S nell'oggetto"
 
 msgid "messages which contain S in subject"
 msgstr "messaggi che contengono S nell'oggetto"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:355

 msgid "messages whose score is equal to #"
 msgstr "messaggi che hanno un punteggio uguale a #"
 
 msgid "messages whose score is equal to #"
 msgstr "messaggi che hanno un punteggio uguale a #"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:356

 msgid "messages whose score is greater than #"
 msgstr "messaggi che hanno un punteggio maggiore di #"
 
 msgid "messages whose score is greater than #"
 msgstr "messaggi che hanno un punteggio maggiore di #"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:357

 msgid "messages whose score is lower than #"
 msgstr "messaggi che hanno un punteggio minore di #"
 
 msgid "messages whose score is lower than #"
 msgstr "messaggi che hanno un punteggio minore di #"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:358

 msgid "messages whose size is equal to #"
 msgstr "messaggi che hanno una dimensione uguale a #"
 
 msgid "messages whose size is equal to #"
 msgstr "messaggi che hanno una dimensione uguale a #"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:359

 msgid "messages whose size is greater than #"
 msgstr "messaggi che hanno una dimensione maggiore di #"
 
 msgid "messages whose size is greater than #"
 msgstr "messaggi che hanno una dimensione maggiore di #"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:360

 msgid "messages whose size is smaller than #"
 msgstr "messaggi che hanno una dimensione minore di #"
 
 msgid "messages whose size is smaller than #"
 msgstr "messaggi che hanno una dimensione minore di #"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:361

 msgid "messages which have been sent to S"
 msgstr "messaggi spediti a S"
 
 msgid "messages which have been sent to S"
 msgstr "messaggi spediti a S"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:362

 msgid "marked messages"
 msgstr "messaggi contrassegnati"
 
 msgid "marked messages"
 msgstr "messaggi contrassegnati"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:363

 msgid "unread messages"
 msgstr "messaggi non letti"
 
 msgid "unread messages"
 msgstr "messaggi non letti"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:364

 msgid "messages which contain S in References header"
 msgstr "messaggi che hanno S nel campo intestazione References"
 
 msgid "messages which contain S in References header"
 msgstr "messaggi che hanno S nel campo intestazione References"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:365

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "messaggi che tornano 0 quando passati al comando - %F è il file del messaggio"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 "messaggi che tornano 0 quando passati al comando - %F è il file del messaggio"
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:366

 msgid "messages which contain S in X-Label header"
 msgstr "messaggi che hanno S nel campo intestazione X-Label"
 
 msgid "messages which contain S in X-Label header"
 msgstr "messaggi che hanno S nel campo intestazione X-Label"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:368

 msgid "logical AND operator"
 msgstr "operatore logico AND"
 
 msgid "logical AND operator"
 msgstr "operatore logico AND"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:369

 msgid "logical OR operator"
 msgstr "operatore logico OR"
 
 msgid "logical OR operator"
 msgstr "operatore logico OR"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:370

 msgid "logical NOT operator"
 msgstr "operatore logico NOT"
 
 msgid "logical NOT operator"
 msgstr "operatore logico NOT"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:371

 msgid "case sensitive search"
 msgstr "ricerca per maiuscole/minuscole"
 
 msgid "case sensitive search"
 msgstr "ricerca per maiuscole/minuscole"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:373

 msgid "all filtering expressions are allowed"
 msgstr "tutte le espressioni di filttraggio sono permesse"
 
 msgid "all filtering expressions are allowed"
 msgstr "tutte le espressioni di filttraggio sono permesse"
 

-#: src/gtk/quicksearch.c:379 src/summary_search.c:329
+#: src/gtk/quicksearch.c:381 src/summary_search.c:397

 msgid "Extended Search"
 msgstr "Ricerca estesa"
 
 msgid "Extended Search"
 msgstr "Ricerca estesa"
 

-#: src/gtk/quicksearch.c:380
+#: src/gtk/quicksearch.c:382

 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"
 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"


@@ -3828,51 +4156,51 @@ msgstr ""
 "\n"
 "I seguenti simboli possono essere utilizzati:"
 
 "\n"
 "I seguenti simboli possono essere utilizzati:"
 

-#: src/gtk/quicksearch.c:476 src/prefs_filtering_action.c:1080
-#: src/prefs_matcher.c:158 src/prefs_matcher.c:1866
-#: src/prefs_summary_column.c:82 src/prefs_template.c:190 src/quote_fmt.c:47
-#: src/summaryview.c:486
+#: src/gtk/quicksearch.c:478 src/prefs_compose_writing.c:239
+#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
+#: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
+#: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486

 msgid "Subject"
 msgstr "Oggetto"
 
 msgid "Subject"
 msgstr "Oggetto"
 

-#: src/gtk/quicksearch.c:480 src/prefs_filtering_action.c:1081
+#: src/gtk/quicksearch.c:482 src/prefs_filtering_action.c:1081

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "Da"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "Da"
 

-#: src/gtk/quicksearch.c:484 src/prefs_filtering_action.c:1082
+#: src/gtk/quicksearch.c:486 src/prefs_filtering_action.c:1082

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr "A"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr "A"
 

-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:497

 msgid "Recursive"
 msgstr "Ricorsivo"
 
 msgid "Recursive"
 msgstr "Ricorsivo"
 

-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:507

 msgid "Sticky"
 msgstr "Sticky"
 
 msgid "Sticky"
 msgstr "Sticky"
 

-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:517

 msgid "Type-ahead"
 msgstr "In tempo reale"
 
 msgid "Type-ahead"
 msgstr "In tempo reale"
 

-#: src/gtk/quicksearch.c:546
+#: src/gtk/quicksearch.c:548

 msgid " Clear "
 msgstr " Pulisci "
 
 msgid " Clear "
 msgstr " Pulisci "
 

-#: src/gtk/quicksearch.c:567 src/summary_search.c:282
+#: src/gtk/quicksearch.c:569 src/summary_search.c:350

 msgid "Edit search criteria"
 msgstr "Modifica criterio di ricerca"
 
 msgid "Edit search criteria"
 msgstr "Modifica criterio di ricerca"
 

-#: src/gtk/quicksearch.c:573
+#: src/gtk/quicksearch.c:575

 msgid " Extended Symbols... "
 msgstr " Simboli Estesi... "
 
 msgid " Extended Symbols... "
 msgstr " Simboli Estesi... "
 

-#: src/gtk/quicksearch.c:1020 src/summaryview.c:1073
+#: src/gtk/quicksearch.c:1025 src/summaryview.c:1073

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Ricerca in %s in corso\n"
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Ricerca in %s in corso\n"


@@ -3990,31 +4318,31 @@ msgstr "_Visualizza certificati"
 msgid "Changed SSL Certificate"
 msgstr "Certificato SSL cambiato"
 
 msgid "Changed SSL Certificate"
 msgstr "Certificato SSL cambiato"
 

-#: src/headerview.c:195 src/summaryview.c:2783 src/summaryview.c:2794
+#: src/headerview.c:195 src/summaryview.c:2784 src/summaryview.c:2795

 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 

-#: src/headerview.c:210 src/summaryview.c:2818 src/summaryview.c:2821
+#: src/headerview.c:210 src/summaryview.c:2819 src/summaryview.c:2822

 msgid "(No Subject)"
 msgstr "(Nessun Oggetto)"
 
 msgid "(No Subject)"
 msgstr "(Nessun Oggetto)"
 

-#: src/image_viewer.c:283
+#: src/image_viewer.c:284

 msgid "Filename:"
 msgstr "Nome file:"
 
 msgid "Filename:"
 msgstr "Nome file:"
 

-#: src/image_viewer.c:290
+#: src/image_viewer.c:291

 msgid "Filesize:"
 msgstr "Dimensione file:"
 
 msgid "Filesize:"
 msgstr "Dimensione file:"
 

-#: src/image_viewer.c:311
+#: src/image_viewer.c:312

 msgid "Load Image"
 msgstr "Carica Immagine"
 
 msgid "Load Image"
 msgstr "Carica Immagine"
 

-#: src/image_viewer.c:317
+#: src/image_viewer.c:318

 msgid "Content-Type:"
 msgstr "Content-Type:"
 
 msgid "Content-Type:"
 msgstr "Content-Type:"
 

-#: src/imap.c:625
+#: src/imap.c:632

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -4026,168 +4354,168 @@ msgstr ""
 "I login CRAM-MD5 funzionano solo se libetpan è stata compilata con il "
 "supporto SASL, e se il plugin CRAM-MD5 SASL è installato."
 
 "I login CRAM-MD5 funzionano solo se libetpan è stata compilata con il "
 "supporto SASL, e se il plugin CRAM-MD5 SASL è installato."
 

-#: src/imap.c:632
+#: src/imap.c:639

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Connessione a %s fallita: login rifiutato.%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Connessione a %s fallita: login rifiutato.%s"
 

-#: src/imap.c:636
+#: src/imap.c:643

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Connessione a %s fallita: login rifiutato.%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Connessione a %s fallita: login rifiutato.%s\n"
 

-#: src/imap.c:653
+#: src/imap.c:660

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Connessione a %s fallita"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Connessione a %s fallita"
 

-#: src/imap.c:658 src/imap.c:661
+#: src/imap.c:665 src/imap.c:668

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "La connessione IMAP4 a %s è stata interrotta. Nuova connessione in corso.\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "La connessione IMAP4 a %s è stata interrotta. Nuova connessione in corso.\n"
 

-#: src/imap.c:699 src/imap.c:2215 src/imap.c:2739 src/imap.c:2824
-#: src/imap.c:3158 src/imap.c:3913
-msgid "Sylpheed-Claws needs network access in order to access the IMAP server."
-msgstr "È necessaria una connessione di rete per accedere al server IMAP."
+#: src/imap.c:717 src/imap.c:2239 src/imap.c:2737 src/imap.c:2822
+#: src/imap.c:3156 src/imap.c:3914
+msgid "Claws Mail needs network access in order to access the IMAP server."
+msgstr ""
+"Claws Mail richiede una connessione di rete per accedere al server IMAP."

 
 

-#: src/imap.c:773 src/inc.c:770 src/news.c:295 src/send_message.c:299
+#: src/imap.c:789 src/inc.c:770 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Connessione insicura"
 
 msgid "Insecure connection"
 msgstr "Connessione insicura"
 

-#: src/imap.c:774 src/inc.c:771 src/news.c:296 src/send_message.c:300
+#: src/imap.c:790 src/inc.c:771 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "

-"available in this build of Sylpheed-Claws. \n"
+"available in this build of Claws Mail. \n"

 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Questa connessione è configurata per essere resa sicura utilizzando SSL, ma "
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Questa connessione è configurata per essere resa sicura utilizzando SSL, ma "

-"il supporto SSL non è stato compilato in questa versione di Sylpheed-"
-"Claws. \n"
+"il supporto SSL non è stato compilato in questa versione di Claws Mail. \n"

 "\n"
 "Continuare la connessione, nonostante la comunicazione non sia in alcun modo "
 "resa sicura?"
 
 "\n"
 "Continuare la connessione, nonostante la comunicazione non sia in alcun modo "
 "resa sicura?"
 

-#: src/imap.c:780 src/inc.c:777 src/news.c:302 src/send_message.c:306
+#: src/imap.c:796 src/inc.c:777 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "Con_tinua la connessione"
 
 msgid "Con_tinue connecting"
 msgstr "Con_tinua la connessione"
 

-#: src/imap.c:790
+#: src/imap.c:806

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Connessione al server IMAP4: %s."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Connessione al server IMAP4: %s."
 

-#: src/imap.c:822
+#: src/imap.c:844

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d"
 

-#: src/imap.c:825
+#: src/imap.c:847

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 

-#: src/imap.c:854 src/imap.c:2547
+#: src/imap.c:876 src/imap.c:2545

 msgid "Can't start TLS session.\n"
 msgstr "Impossibile avviare una sessione TLS.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "Impossibile avviare una sessione TLS.\n"
 

-#: src/imap.c:891
+#: src/imap.c:913

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Connessione al server IMAP4 %s in corso.\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Connessione al server IMAP4 %s in corso.\n"
 

-#: src/imap.c:902 src/imap.c:905
+#: src/imap.c:924 src/imap.c:927

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Impossibile effettuare il login al server IMAP %s."
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Impossibile effettuare il login al server IMAP %s."
 

-#: src/imap.c:1079
+#: src/imap.c:1100

 msgid "Adding messages..."
 msgstr "Aggiunta dei messaggi in corso."
 
 msgid "Adding messages..."
 msgstr "Aggiunta dei messaggi in corso."
 

-#: src/imap.c:1229 src/mh.c:500
+#: src/imap.c:1252 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Copia dei messaggi in corso."
 
 msgid "Copying messages..."
 msgstr "Copia dei messaggi in corso."
 

-#: src/imap.c:1404
+#: src/imap.c:1428

 msgid "can't set deleted flags\n"
 msgstr "impossibile impostare i flag eliminati\n"
 
 msgid "can't set deleted flags\n"
 msgstr "impossibile impostare i flag eliminati\n"
 

-#: src/imap.c:1410 src/imap.c:3665
+#: src/imap.c:1434 src/imap.c:3665

 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 

-#: src/imap.c:1854
+#: src/imap.c:1878

 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la mailbox: LIST fallita\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la mailbox: LIST fallita\n"
 

-#: src/imap.c:1870
+#: src/imap.c:1894

 msgid "can't create mailbox\n"
 msgstr "impossibile creare la mailbox\n"
 
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la mailbox\n"
 

-#: src/imap.c:1951
+#: src/imap.c:1975

 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Il nuovo nome della cartella non deve contenere il separatore di path del "
 "namespace"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr ""
 "Il nuovo nome della cartella non deve contenere il separatore di path del "
 "namespace"
 

-#: src/imap.c:1982
+#: src/imap.c:2006

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la mailbox %s in %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la mailbox %s in %s\n"
 

-#: src/imap.c:2046
+#: src/imap.c:2070

 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la mailbox\n"
 
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la mailbox\n"
 

-#: src/imap.c:2327
+#: src/imap.c:2316

 msgid "LIST failed\n"
 msgstr "LIST fallita\n"
 
 msgid "LIST failed\n"
 msgstr "LIST fallita\n"
 

-#: src/imap.c:2435
+#: src/imap.c:2433

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 

-#: src/imap.c:2544
+#: src/imap.c:2542

 msgid "Server requires TLS to log in.\n"
 msgstr "Il server richiede il TLS per il login.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "Il server richiede il TLS per il login.\n"
 

-#: src/imap.c:2553
+#: src/imap.c:2551

 msgid "Can't refresh capabilities.\n"
 msgstr "Impossibile aggiornare le capabilities.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "Impossibile aggiornare le capabilities.\n"
 

-#: src/imap.c:2558
+#: src/imap.c:2556

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Connection to %s failed: server requires TLS, but Sylpheed-Claws has been "
+"Connection to %s failed: server requires TLS, but Claws Mail has been "

 "compiled without OpenSSL support.\n"
 msgstr ""
 "compiled without OpenSSL support.\n"
 msgstr ""

-"La connessione a %s è fallita: il server richiede il TLS, ma Sylpheed-claws "
-"è stato compilato senza supporto OpenSSL.\n"
+"La connessione a %s è fallita: il server richiede il TLS, ma Claws Mail è "
+"stato compilato senza supporto OpenSSL.\n"

 
 

-#: src/imap.c:2566
+#: src/imap.c:2564

 msgid "Server logins are disabled.\n"
 msgstr "I login al server sono disabilitati.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "I login al server sono disabilitati.\n"
 

-#: src/imap.c:2744
+#: src/imap.c:2742

 msgid "Fetching message..."
 msgstr "Prelievo del messaggio in corso."
 
 msgid "Fetching message..."
 msgstr "Prelievo del messaggio in corso."
 

-#: src/imap.c:2911
+#: src/imap.c:2909

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 

-#: src/imap.c:2941
+#: src/imap.c:2939

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
 

-#: src/imap.c:2985
+#: src/imap.c:2983

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv non può convertire UTF-8 in UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv non può convertire UTF-8 in UTF-7\n"
 


@@ -4196,57 +4524,61 @@ msgstr "iconv non pu
 msgid "can't set deleted flags: %d\n"
 msgstr "impossibile impostare i flag eliminati: %d\n"
 
 msgid "can't set deleted flags: %d\n"
 msgstr "impossibile impostare i flag eliminati: %d\n"
 

-#: src/imap.c:4375
+#: src/imap.c:4376

 msgid ""
 msgid ""

-"You have one or more IMAP accounts defined. However this version of Sylpheed-"
-"Claws has been built without IMAP support; your IMAP account(s) are "
+"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 "

 "disabled.\n"
 "\n"
 "disabled.\n"
 "\n"

-"You probably need to install libetpan and recompile Sylpheed-Claws."
+"You probably need to install libetpan and recompile Claws Mail."

 msgstr ""
 msgstr ""

-"Uno o più account IMAP sono presenti, ma questa versione di Sylpheed-Claws è "
+"Uno o più account IMAP sono presenti, ma questa versione di Claws Mail è "

 "stata compilata senza supporto IMAP. Di conseguenza gli account IMAP "
 "verranno disabilitati.\n"
 "\n"
 "stata compilata senza supporto IMAP. Di conseguenza gli account IMAP "
 "verranno disabilitati.\n"
 "\n"

-"Probabilmente è necessario installare libetpan e ricompilare Sylpheed-Claws."
+"Probabilmente è necessario installare libetpan e ricompilare Claws Mail."

 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/Crea _nuova cartella..."
 
 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/Crea _nuova cartella..."
 

-#: src/imap_gtk.c:56 src/mh_gtk.c:51
+#: src/imap_gtk.c:57 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr "/_Rinomina cartella..."
 
 msgid "/_Rename folder..."
 msgstr "/_Rinomina cartella..."
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:58 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr "/_Sposta cartella..."
 
 msgid "/M_ove folder..."
 msgstr "/_Sposta cartella..."
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:59 src/mh_gtk.c:54
+msgid "/Cop_y folder..."
+msgstr "/_Copia cartella..."
+
+#: src/imap_gtk.c:61 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr "/_Elimina cartella..."
 
 msgid "/_Delete folder..."
 msgstr "/_Elimina cartella..."
 

-#: src/imap_gtk.c:60 src/news_gtk.c:55
+#: src/imap_gtk.c:63 src/news_gtk.c:55

 msgid "/Synchronise"
 msgstr "/Sincronizza"
 
 msgid "/Synchronise"
 msgstr "/Sincronizza"
 

-#: src/imap_gtk.c:61 src/news_gtk.c:56
+#: src/imap_gtk.c:64 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr "/_Scarica messaggi"
 
 msgid "/Down_load messages"
 msgstr "/_Scarica messaggi"
 

-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:58
+#: src/imap_gtk.c:66 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr "/_Verifica nuovi messaggi"
 
 msgid "/_Check for new messages"
 msgstr "/_Verifica nuovi messaggi"
 

-#: src/imap_gtk.c:64 src/mh_gtk.c:56
+#: src/imap_gtk.c:67 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr "/_Verifica nuove cartelle"
 
 msgid "/C_heck for new folders"
 msgstr "/_Verifica nuove cartelle"
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:57
+#: src/imap_gtk.c:68 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr "/R_ileggi l'albero della cartella"
 
 msgid "/R_ebuild folder tree"
 msgstr "/R_ileggi l'albero della cartella"
 

-#: src/imap_gtk.c:135
+#: src/imap_gtk.c:140

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"


@@ -4256,21 +4588,21 @@ msgstr ""
 "(se si vuole creare una cartella che contiene delle sottocartelle\n"
 "e nessun messaggio, aggiungere '/' alla fine del nome)"
 
 "(se si vuole creare una cartella che contiene delle sottocartelle\n"
 "e nessun messaggio, aggiungere '/' alla fine del nome)"
 

-#: src/imap_gtk.c:193 src/mh_gtk.c:228
+#: src/imap_gtk.c:198 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Inserire il nuovo nome per '%s':"
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Inserire il nuovo nome per '%s':"
 

-#: src/imap_gtk.c:195 src/mh_gtk.c:230
+#: src/imap_gtk.c:200 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr "Rinomina cartella"
 
 msgid "Rename folder"
 msgstr "Rinomina cartella"
 

-#: src/imap_gtk.c:204 src/imap_gtk.c:209
+#: src/imap_gtk.c:209 src/imap_gtk.c:214

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' non può essere incluso nel nome della cartella."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' non può essere incluso nel nome della cartella."
 

-#: src/imap_gtk.c:226 src/mh_gtk.c:255
+#: src/imap_gtk.c:231 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -4278,7 +4610,7 @@ msgstr ""
 "Impossibile rinominare la cartella.\n"
 "Il nuovo nome non è valido."
 
 "Impossibile rinominare la cartella.\n"
 "Il nuovo nome non è valido."
 

-#: src/imap_gtk.c:280 src/mh_gtk.c:176
+#: src/imap_gtk.c:283 src/mh_gtk.c:179

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -4291,12 +4623,12 @@ msgstr ""
 "\n"
 "Procedere con l'eliminazione?"
 
 "\n"
 "Procedere con l'eliminazione?"
 

-#: src/imap_gtk.c:302 src/mh_gtk.c:198 src/news_gtk.c:238
+#: src/imap_gtk.c:305 src/mh_gtk.c:201 src/news_gtk.c:241

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella '%s'."
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella '%s'."
 

-#: src/imap_gtk.c:362 src/news_gtk.c:299
+#: src/imap_gtk.c:365 src/news_gtk.c:302

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Errore scaricando i messaggi da '%s'."
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Errore scaricando i messaggi da '%s'."


@@ -4488,8 +4820,8 @@ msgid "Import Pine file into Address Book"
 msgstr "Importa file di Pine nella rubrica"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304
 msgstr "Importa file di Pine nella rubrica"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304

-msgid "Sylpheed-Claws needs network access in order to get mails."
-msgstr "È necessaria una connessione di rete per prelevare i messaggi."
+msgid "Claws Mail needs network access in order to get mails."
+msgstr "Claws Mail richiede una connessione di rete per prelevare i messaggi."

 
 #: src/inc.c:384
 msgid "Retrieving new messages"
 
 #: src/inc.c:384
 msgid "Retrieving new messages"


@@ -4526,7 +4858,7 @@ msgstr "Connessione fallita"
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 
 msgid "Auth failed"
 msgstr "Autenticazione fallita"
 

-#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2371
+#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2372

 msgid "Locked"
 msgstr "Lockato"
 
 msgid "Locked"
 msgstr "Lockato"
 


@@ -4718,57 +5050,48 @@ msgstr ""
 #: src/main.c:270
 #, c-format
 msgid ""
 #: src/main.c:270
 #, c-format
 msgid ""

-"Configuration for Sylpheed-Claws %s found.\n"
+"Configuration for %s (or previous) found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"È stata trovata la configurazione di Sylpheed-Claws %s.\n"
+"È stata trovata una configurazione per %s (o precedente).\n"

 "Migrare questa configurazione?"
 
 "Migrare questa configurazione?"
 

-#: src/main.c:273
-msgid "1.0.5 or previous"
-msgstr "1.0.5 o precedente"
-
-#: src/main.c:273
-msgid "1.9.15 or previous"
-msgstr "1.9.15 o precedente"
-
-#: src/main.c:276
+#: src/main.c:274

 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 
 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 

-#: src/main.c:282
+#: src/main.c:280

 msgid "Copying configuration..."
 msgstr "Copia della configurazione in corso."
 
 msgid "Copying configuration..."
 msgstr "Copia della configurazione in corso."
 

-#: src/main.c:287
+#: src/main.c:285

 msgid "Migration failed!"
 msgstr "Migrazione fallita!"
 
 msgid "Migration failed!"
 msgstr "Migrazione fallita!"
 

-#: src/main.c:529
+#: src/main.c:572

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non è supportato da glib.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread non è supportato da glib.\n"
 

-#: src/main.c:535
+#: src/main.c:578

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with a more recent GTK+ library than is "
+"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 "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "

-"recompile Sylpheed-Claws."
+"recompile Claws Mail."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws è stato compilato con una versione della libreria GTK+ più "
+"Claws Mail è stato compilato con una versione della libreria GTK+ più "

 "recente di quella disponibile. Questo causerà dei problemi. Aggiornare GTK+ "
 "recente di quella disponibile. Questo causerà dei problemi. Aggiornare GTK+ "

-"o ricompilare Syslpheed-Claws."
+"o ricompilare Claws Mail."

 
 

-#: src/main.c:544
+#: src/main.c:587

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with an older GTK+ library than is "
-"currently available. This will cause crashes. You need to recompile Sylpheed-"
-"Claws."
+"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 ""
 msgstr ""

-"Sylpheed-Claws è stato compilato con una versione della libreria GTK+ più "
+"Claws Mail è stato compilato con una versione della libreria GTK+ più "

 "vecchia di quella disponibile. Questo causerà dei problemi. Aggiornare GTK+ "
 "vecchia di quella disponibile. Questo causerà dei problemi. Aggiornare GTK+ "

-"o ricompilare Sylpheed-Claws."
+"o ricompilare Claws Mail."

 
 

-#: src/main.c:754
+#: src/main.c:810

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."


@@ -4776,30 +5099,41 @@ msgstr ""
 "Errore durante il caricamento di alcuni plugin. Per maggiori informazioni "
 "controllare la configurazione dei plugin"
 
 "Errore durante il caricamento di alcuni plugin. Per maggiori informazioni "
 "controllare la configurazione dei plugin"
 

-#: src/main.c:765
+#: src/main.c:822
+msgid ""
+"Claws Mail has detected a configured mailbox, but is it incomplete. It is "
+"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
+"mailbox's folder to try to fix it."
+msgstr ""
+"Claws Mail ha rilevato una mailbox configurata, ma incompleta, probabilmente "
+"a causa di un account IMAP non funzionante. Utilizzare \"Ricostruisci "
+"l'albero delle cartelle\" sulla cartella della mailbox per provare a "
+"sistemarla."
+
+#: src/main.c:828

 msgid ""
 msgid ""

-"Sylpheed-Claws has detected a configured mailbox, but could not load it. It "
-"is probably provided by an out-of-date external plugin. Please reinstall the "
+"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 ""
 "plugin and try again."
 msgstr ""

-"Sylpheed-Claws ha trovato una mailbox configurata, ma non è stato possibile "
+"Claws Mail ha trovato una mailbox configurata, ma non è stato possibile "

 "caricarla. Probabilmente è stata creata da un vecchio plugin esterno. "
 "Reinstallare il plugin e provare nuovamente a caricarla."
 
 "caricarla. Probabilmente è stata creata da un vecchio plugin esterno. "
 "Reinstallare il plugin e provare nuovamente a caricarla."
 

-#: src/main.c:1008
+#: src/main.c:1074

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilizzo: %s [OPZIONE]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilizzo: %s [OPZIONE]...\n"
 

-#: src/main.c:1010
+#: src/main.c:1076

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [indirizzo]  apre una finestra di composizione"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [indirizzo]  apre una finestra di composizione"
 

-#: src/main.c:1011
+#: src/main.c:1077

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      sottoscrivi all'URI indicato se possibile"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      sottoscrivi all'URI indicato se possibile"
 

-#: src/main.c:1012
+#: src/main.c:1078

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -4809,23 +5143,23 @@ msgstr ""
 "                         apre una finestra di composizione con uno\n"
 "                         specifico file allegato"
 
 "                         apre una finestra di composizione con uno\n"
 "                         specifico file allegato"
 

-#: src/main.c:1015
+#: src/main.c:1081

 msgid "  --receive              receive new messages"
 msgstr "  --receive              riceve nuovi messaggi"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              riceve nuovi messaggi"
 

-#: src/main.c:1016
+#: src/main.c:1082

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          riceve nuovi messaggi da tutti gli account"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          riceve nuovi messaggi da tutti gli account"
 

-#: src/main.c:1017
+#: src/main.c:1083

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 spedisce tutti i messaggi in coda"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 spedisce tutti i messaggi in coda"
 

-#: src/main.c:1018
+#: src/main.c:1084

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [cartella]... mostra il numero totale di messaggi"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [cartella]... mostra il numero totale di messaggi"
 

-#: src/main.c:1019
+#: src/main.c:1085

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -4833,949 +5167,951 @@ msgstr ""
 "  --status-full [cartella]...\n"
 "                         mostra lo stato di ogni cartella"
 
 "  --status-full [cartella]...\n"
 "                         mostra lo stato di ogni cartella"
 

-#: src/main.c:1021
+#: src/main.c:1087

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"

-"                         folder is a folder id like '#mh/Mailbox/inbox'"
+"                         folder is a folder id like 'folder/sub_folder'"

 msgstr ""
 "  --select cartella[/msg] salta alla cartella/messaggio specificato\n"
 msgstr ""
 "  --select cartella[/msg] salta alla cartella/messaggio specificato\n"

-"                         cartella è un id cartella come '#mh/Mailbox/inbox'"
+"                          cartella è un id cartella come 'cartella/"
+"sotto_cartella'"

 
 

-#: src/main.c:1023
+#: src/main.c:1089

 msgid "  --online               switch to online mode"
 msgstr "  --online               passa alla modalità online"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               passa alla modalità online"
 

-#: src/main.c:1024
+#: src/main.c:1090

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              passa alla modalità offline"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              passa alla modalità offline"
 

-#: src/main.c:1025
-msgid "  --exit                 exit Sylpheed-Claws"
-msgstr "  --exit                 esce da Sylpheed-Claws"
+#: src/main.c:1091
+msgid "  --exit                 exit Claws Mail"
+msgstr "  --exit                 esce da Claws Mail"

 
 

-#: src/main.c:1026
+#: src/main.c:1092

 msgid "  --debug                debug mode"
 msgstr "  --debug                modalità di debug"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                modalità di debug"
 

-#: src/main.c:1027
+#: src/main.c:1093

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 mostra questo aiuto ed esce"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 mostra questo aiuto ed esce"
 

-#: src/main.c:1028
+#: src/main.c:1094

 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informazioni sulla versione ed esce"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informazioni sulla versione ed esce"
 

-#: src/main.c:1029
+#: src/main.c:1095

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           stampa la directory di configurazione"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           stampa la directory di configurazione"
 

-#: src/main.c:1094
+#: src/main.c:1160

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Elaborazione (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Elaborazione (%s)..."
 

-#: src/main.c:1097
+#: src/main.c:1163

 msgid "top level folder"
 msgstr "cartella principale"
 
 msgid "top level folder"
 msgstr "cartella principale"
 

-#: src/main.c:1161
+#: src/main.c:1227

 msgid "Really quit?"
 msgstr "Uscire davvero?"
 
 msgid "Really quit?"
 msgstr "Uscire davvero?"
 

-#: src/main.c:1162
+#: src/main.c:1228

 msgid "Composing message exists."
 msgstr "Attualmente c'è un messaggio in composizione."
 
 msgid "Composing message exists."
 msgstr "Attualmente c'è un messaggio in composizione."
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Save to Draft"
 msgstr "_Salva nelle Bozze"
 
 msgid "_Save to Draft"
 msgstr "_Salva nelle Bozze"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Discard them"
 msgstr "_Scartare"
 
 msgid "_Discard them"
 msgstr "_Scartare"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "Do_n't quit"
 msgstr "No_n uscire"
 
 msgid "Do_n't quit"
 msgstr "No_n uscire"
 

-#: src/main.c:1178
+#: src/main.c:1244

 msgid "Queued messages"
 msgstr "Messaggi in coda"
 
 msgid "Queued messages"
 msgstr "Messaggi in coda"
 

-#: src/main.c:1179
+#: src/main.c:1245

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ci sono messaggi non inviati in coda. Uscire ugualmente?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ci sono messaggi non inviati in coda. Uscire ugualmente?"
 

-#: src/mainwindow.c:496 src/messageview.c:158
+#: src/mainwindow.c:497 src/messageview.c:158

 msgid "/_File"
 msgstr "/_File"
 
 msgid "/_File"
 msgstr "/_File"
 

-#: src/mainwindow.c:497
+#: src/mainwindow.c:498

 msgid "/_File/_Add mailbox"
 msgstr "/_File/_Aggiungi mailbox"
 
 msgid "/_File/_Add mailbox"
 msgstr "/_File/_Aggiungi mailbox"
 

-#: src/mainwindow.c:498
+#: src/mainwindow.c:499

 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_File/_Aggiungi mailbox/MH..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_File/_Aggiungi mailbox/MH..."
 

-#: src/mainwindow.c:499 src/mainwindow.c:501 src/mainwindow.c:506
-#: src/mainwindow.c:508 src/mainwindow.c:511 src/mainwindow.c:514
+#: src/mainwindow.c:500 src/mainwindow.c:502 src/mainwindow.c:507
+#: src/mainwindow.c:509 src/mainwindow.c:512 src/mainwindow.c:515

 #: src/messageview.c:161
 msgid "/_File/---"
 msgstr "/_File/---"
 
 #: src/messageview.c:161
 msgid "/_File/---"
 msgstr "/_File/---"
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:501

 msgid "/_File/Change folder order..."
 msgstr "/_File/Cambia l'ordine delle cartelle..."
 
 msgid "/_File/Change folder order..."
 msgstr "/_File/Cambia l'ordine delle cartelle..."
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:503

 msgid "/_File/_Import mbox file..."
 msgstr "/_File/_Importa da file mbox..."
 
 msgid "/_File/_Import mbox file..."
 msgstr "/_File/_Importa da file mbox..."
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:504

 msgid "/_File/_Export to mbox file..."
 msgstr "/_File/Esp_orta verso file mbox..."
 
 msgid "/_File/_Export to mbox file..."
 msgstr "/_File/Esp_orta verso file mbox..."
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:505

 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr "/_File/Esp_orta la selezione verso file mbox..."
 
 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr "/_File/Esp_orta la selezione verso file mbox..."
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:508

 msgid "/_File/Empty all _Trash folders"
 msgstr "/_File/S_vuota tutte le cartelle del cestino"
 
 msgid "/_File/Empty all _Trash folders"
 msgstr "/_File/S_vuota tutte le cartelle del cestino"
 

-#: src/mainwindow.c:509 src/messageview.c:159
+#: src/mainwindow.c:510 src/messageview.c:159

 msgid "/_File/_Save as..."
 msgstr "/_File/_Salva come..."
 
 msgid "/_File/_Save as..."
 msgstr "/_File/_Salva come..."
 

-#: src/mainwindow.c:510 src/messageview.c:160
+#: src/mainwindow.c:511 src/messageview.c:160

 msgid "/_File/_Print..."
 msgstr "/_File/S_tampa..."
 
 msgid "/_File/_Print..."
 msgstr "/_File/S_tampa..."
 

-#: src/mainwindow.c:512
+#: src/mainwindow.c:513

 msgid "/_File/_Work offline"
 msgstr "/_File/Lavora o_ffline"
 
 msgid "/_File/_Work offline"
 msgstr "/_File/Lavora o_ffline"
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:514

 msgid "/_File/Synchronise folders"
 msgstr "/_File/Sincronizza cartelle"
 
 msgid "/_File/Synchronise folders"
 msgstr "/_File/Sincronizza cartelle"
 

-#: src/mainwindow.c:516
+#: src/mainwindow.c:517

 msgid "/_File/E_xit"
 msgstr "/_File/_Esci"
 
 msgid "/_File/E_xit"
 msgstr "/_File/_Esci"
 

-#: src/mainwindow.c:521
+#: src/mainwindow.c:522

 msgid "/_Edit/Select _thread"
 msgstr "/_Modifica/_Seleziona discussione"
 
 msgid "/_Edit/Select _thread"
 msgstr "/_Modifica/_Seleziona discussione"
 

-#: src/mainwindow.c:523 src/messageview.c:168
+#: src/mainwindow.c:524 src/messageview.c:168

 msgid "/_Edit/_Find in current message..."
 msgstr "/_Modifica/_Trova nel messaggio corrente..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Modifica/_Trova nel messaggio corrente..."
 

-#: src/mainwindow.c:525
+#: src/mainwindow.c:526

 msgid "/_Edit/_Search folder..."
 msgstr "/_Modifica/C_erca nella cartella..."
 
 msgid "/_Edit/_Search folder..."
 msgstr "/_Modifica/C_erca nella cartella..."
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:527

 msgid "/_Edit/_Quick search"
 msgstr "/_Modifica/_Ricerca rapida"
 
 msgid "/_Edit/_Quick search"
 msgstr "/_Modifica/_Ricerca rapida"
 

-#: src/mainwindow.c:527 src/messageview.c:171 src/summaryview.c:472
+#: src/mainwindow.c:528 src/messageview.c:171 src/summaryview.c:472

 msgid "/_View"
 msgstr "/_Visualizza"
 
 msgid "/_View"
 msgstr "/_Visualizza"
 

-#: src/mainwindow.c:528
+#: src/mainwindow.c:529

 msgid "/_View/Show or hi_de"
 msgstr "/_Visualizza/Mostra o _nascondi"
 
 msgid "/_View/Show or hi_de"
 msgstr "/_Visualizza/Mostra o _nascondi"
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:530

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visualizza/Mostra o _nascondi/_Albero delle cartelle"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Visualizza/Mostra o _nascondi/_Albero delle cartelle"
 

-#: src/mainwindow.c:531
+#: src/mainwindow.c:532

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visualizza/Mostra o _nascondi/Vista _messaggio"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Visualizza/Mostra o _nascondi/Vista _messaggio"
 

-#: src/mainwindow.c:533
+#: src/mainwindow.c:534

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra degli strumenti"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra degli strumenti"
 

-#: src/mainwindow.c:535
+#: src/mainwindow.c:536

 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra strumenti/Testo _sotto le icone"
 
 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra strumenti/Testo _sotto le icone"
 

-#: src/mainwindow.c:537
+#: src/mainwindow.c:538

 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr ""
 "/_Visualizza/Mostra o _nascondi/_Barra strumenti/Testo _a lato delle icone"
 
 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr ""
 "/_Visualizza/Mostra o _nascondi/_Barra strumenti/Testo _a lato delle icone"
 

-#: src/mainwindow.c:539
+#: src/mainwindow.c:540

 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra strumenti/Solo _icone"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra strumenti/Solo _icone"
 

-#: src/mainwindow.c:541
+#: src/mainwindow.c:542

 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra strumenti/Solo _testo"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra strumenti/Solo _testo"
 

-#: src/mainwindow.c:543
+#: src/mainwindow.c:544

 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra degli strumenti/_Nascondi"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr "/_Visualizza/Mostra o _nascondi/_Barra degli strumenti/_Nascondi"
 

-#: src/mainwindow.c:545
+#: src/mainwindow.c:546

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di _stato"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Visualizza/Mostra o _nascondi/Barra di _stato"
 

-#: src/mainwindow.c:547
+#: src/mainwindow.c:548

 msgid "/_View/Set displayed _columns"
 msgstr "/_Visualizza/Imposta v_oci visualizzate"
 
 msgid "/_View/Set displayed _columns"
 msgstr "/_Visualizza/Imposta v_oci visualizzate"
 

-#: src/mainwindow.c:548
+#: src/mainwindow.c:549

 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr "/_Visualizza/Imposta v_oci visualizzate/nella lista _Cartelle..."
 
 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr "/_Visualizza/Imposta v_oci visualizzate/nella lista _Cartelle..."
 

-#: src/mainwindow.c:549
+#: src/mainwindow.c:550

 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/_Visualizza/Imposta v_oci visualizzate/nella lista _Messaggi..."
 
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/_Visualizza/Imposta v_oci visualizzate/nella lista _Messaggi..."
 

-#: src/mainwindow.c:551 src/mainwindow.c:554 src/mainwindow.c:582
-#: src/mainwindow.c:612 src/mainwindow.c:729 src/mainwindow.c:737
+#: src/mainwindow.c:552 src/mainwindow.c:555 src/mainwindow.c:583
+#: src/mainwindow.c:613 src/mainwindow.c:730 src/mainwindow.c:738

 #: src/messageview.c:277
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 
 #: src/messageview.c:277
 msgid "/_View/---"
 msgstr "/_Visualizza/---"
 

-#: src/mainwindow.c:552
+#: src/mainwindow.c:553

 msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartelle separato"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/_Visualizza/Albero _cartelle separato"
 

-#: src/mainwindow.c:553
+#: src/mainwindow.c:554

 msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista _messaggio separata"
 
 msgid "/_View/Separate _message view"
 msgstr "/_Visualizza/Vista _messaggio separata"
 

-#: src/mainwindow.c:555
+#: src/mainwindow.c:556

 msgid "/_View/_Sort"
 msgstr "/_Visualizza/_Ordina"
 
 msgid "/_View/_Sort"
 msgstr "/_Visualizza/_Ordina"
 

-#: src/mainwindow.c:556
+#: src/mainwindow.c:557

 msgid "/_View/_Sort/by _number"
 msgstr "/_Visualizza/_Ordina/per _numero"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/_Visualizza/_Ordina/per _numero"
 

-#: src/mainwindow.c:557
+#: src/mainwindow.c:558

 msgid "/_View/_Sort/by S_ize"
 msgstr "/_Visualizza/_Ordina/per dimen_sione"
 
 msgid "/_View/_Sort/by S_ize"
 msgstr "/_Visualizza/_Ordina/per dimen_sione"
 

-#: src/mainwindow.c:558
+#: src/mainwindow.c:559

 msgid "/_View/_Sort/by _Date"
 msgstr "/_Visualizza/_Ordina/per _data"
 
 msgid "/_View/_Sort/by _Date"
 msgstr "/_Visualizza/_Ordina/per _data"
 

-#: src/mainwindow.c:559
+#: src/mainwindow.c:560

 msgid "/_View/_Sort/by _From"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 
 msgid "/_View/_Sort/by _From"
 msgstr "/_Visualizza/_Ordina/per _mittente"
 

-#: src/mainwindow.c:560
+#: src/mainwindow.c:561

 msgid "/_View/_Sort/by _To"
 msgstr "/_Visualizza/_Ordina/per _destinatario"
 
 msgid "/_View/_Sort/by _To"
 msgstr "/_Visualizza/_Ordina/per _destinatario"
 

-#: src/mainwindow.c:561
+#: src/mainwindow.c:562

 msgid "/_View/_Sort/by S_ubject"
 msgstr "/_Visualizza/_Ordina/per _oggetto"
 
 msgid "/_View/_Sort/by S_ubject"
 msgstr "/_Visualizza/_Ordina/per _oggetto"
 

-#: src/mainwindow.c:562
+#: src/mainwindow.c:563

 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visualizza/_Ordina/per _colore etichetta"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Visualizza/_Ordina/per _colore etichetta"
 

-#: src/mainwindow.c:564
+#: src/mainwindow.c:565

 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visualizza/_Ordina/per _contrassegno"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Visualizza/_Ordina/per _contrassegno"
 

-#: src/mainwindow.c:565
+#: src/mainwindow.c:566

 msgid "/_View/_Sort/by _status"
 msgstr "/_Visualizza/_Ordina/per _stato"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/_Visualizza/_Ordina/per _stato"
 

-#: src/mainwindow.c:566
+#: src/mainwindow.c:567

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visualizza/_Ordina/per _allegato"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Visualizza/_Ordina/per _allegato"
 

-#: src/mainwindow.c:568
+#: src/mainwindow.c:569

 msgid "/_View/_Sort/by score"
 msgstr "/_Visualizza/_Ordina/per score"
 
 msgid "/_View/_Sort/by score"
 msgstr "/_Visualizza/_Ordina/per score"
 

-#: src/mainwindow.c:569
+#: src/mainwindow.c:570

 msgid "/_View/_Sort/by locked"
 msgstr "/_Visualizza/_Ordina/per _lock"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/_Visualizza/_Ordina/per _lock"
 

-#: src/mainwindow.c:570
+#: src/mainwindow.c:571

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visualizza/_Ordina/Non _ordinare"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Visualizza/_Ordina/Non _ordinare"
 

-#: src/mainwindow.c:571 src/mainwindow.c:574
+#: src/mainwindow.c:572 src/mainwindow.c:575

 msgid "/_View/_Sort/---"
 msgstr "/_Visualizza/_Ordina/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/_Visualizza/_Ordina/---"
 

-#: src/mainwindow.c:572
+#: src/mainwindow.c:573

 msgid "/_View/_Sort/Ascending"
 msgstr "/Visualizza/_Ordina/Ascendente"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/Visualizza/_Ordina/Ascendente"
 

-#: src/mainwindow.c:573
+#: src/mainwindow.c:574

 msgid "/_View/_Sort/Descending"
 msgstr "/Visualizza/_Ordina/Discendente"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/Visualizza/_Ordina/Discendente"
 

-#: src/mainwindow.c:575
+#: src/mainwindow.c:576

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visualizza/_Ordina/_Raggruppa per oggetto"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Visualizza/_Ordina/_Raggruppa per oggetto"
 

-#: src/mainwindow.c:577
+#: src/mainwindow.c:578

 msgid "/_View/Th_read view"
 msgstr "/_Visualizza/_Visualizza discussione"
 
 msgid "/_View/Th_read view"
 msgstr "/_Visualizza/_Visualizza discussione"
 

-#: src/mainwindow.c:578
+#: src/mainwindow.c:579

 msgid "/_View/E_xpand all threads"
 msgstr "/_Visualizza/Esp_andi tutte le discussioni"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/_Visualizza/Esp_andi tutte le discussioni"
 

-#: src/mainwindow.c:579
+#: src/mainwindow.c:580

 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visualizza/Compatta tutte le discussioni"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Visualizza/Compatta tutte le discussioni"
 

-#: src/mainwindow.c:580
+#: src/mainwindow.c:581

 msgid "/_View/_Hide read messages"
 msgstr "/_Visualizza/_Nascondi messaggi letti"
 
 msgid "/_View/_Hide read messages"
 msgstr "/_Visualizza/_Nascondi messaggi letti"
 

-#: src/mainwindow.c:583
+#: src/mainwindow.c:584

 msgid "/_View/_Go to"
 msgstr "/_Visualizza/V_ai a"
 
 msgid "/_View/_Go to"
 msgstr "/_Visualizza/V_ai a"
 

-#: src/mainwindow.c:584
+#: src/mainwindow.c:585

 msgid "/_View/_Go to/_Previous message"
 msgstr "/_Visualizza/V_ai a/Messaggio _precedente"
 
 msgid "/_View/_Go to/_Previous message"
 msgstr "/_Visualizza/V_ai a/Messaggio _precedente"
 

-#: src/mainwindow.c:585
+#: src/mainwindow.c:586

 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visualizza/V_ai a/Messaggio _successivo"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Visualizza/V_ai a/Messaggio _successivo"
 

-#: src/mainwindow.c:586 src/mainwindow.c:591 src/mainwindow.c:594
-#: src/mainwindow.c:599 src/mainwindow.c:604 src/mainwindow.c:609
+#: src/mainwindow.c:587 src/mainwindow.c:592 src/mainwindow.c:595
+#: src/mainwindow.c:600 src/mainwindow.c:605 src/mainwindow.c:610

 msgid "/_View/_Go to/---"
 msgstr "/_Visualizza/V_ai a/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/_Visualizza/V_ai a/---"
 

-#: src/mainwindow.c:587
+#: src/mainwindow.c:588

 msgid "/_View/_Go to/P_revious unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio p_recedente non letto"
 
 msgid "/_View/_Go to/P_revious unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio p_recedente non letto"
 

-#: src/mainwindow.c:589
+#: src/mainwindow.c:590

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio s_uccessivo non letto"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Visualizza/V_ai a/Messaggio s_uccessivo non letto"
 

-#: src/mainwindow.c:592
+#: src/mainwindow.c:593

 msgid "/_View/_Go to/Previous ne_w message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo _precedente"
 
 msgid "/_View/_Go to/Previous ne_w message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo _precedente"
 

-#: src/mainwindow.c:593
+#: src/mainwindow.c:594

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo _successivo"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Visualizza/V_ai a/Messaggio nuovo _successivo"
 

-#: src/mainwindow.c:595
+#: src/mainwindow.c:596

 msgid "/_View/_Go to/Previous _marked message"
 msgstr "/_Visualizza/V_ai a/Messaggio pr_ecedente marcato"
 
 msgid "/_View/_Go to/Previous _marked message"
 msgstr "/_Visualizza/V_ai a/Messaggio pr_ecedente marcato"
 

-#: src/mainwindow.c:597
+#: src/mainwindow.c:598

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visualizza/V_ai a/Messaggio su_ccessivo marcato"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Visualizza/V_ai a/Messaggio su_ccessivo marcato"
 

-#: src/mainwindow.c:600
+#: src/mainwindow.c:601

 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/_Visualizza/V_ai a/Mesaggio pre_cedente etichettato"
 
 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/_Visualizza/V_ai a/Mesaggio pre_cedente etichettato"
 

-#: src/mainwindow.c:602
+#: src/mainwindow.c:603

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visualizza/V_ai a/Mesaggio success_ivo etichettato"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Visualizza/V_ai a/Mesaggio success_ivo etichettato"
 

-#: src/mainwindow.c:605
+#: src/mainwindow.c:606

 msgid "/_View/_Go to/Last read message"
 msgstr "/_Visualizza/V_ai a/Ultimo messaggio letto"
 
 msgid "/_View/_Go to/Last read message"
 msgstr "/_Visualizza/V_ai a/Ultimo messaggio letto"
 

-#: src/mainwindow.c:607
+#: src/mainwindow.c:608

 msgid "/_View/_Go to/Parent message"
 msgstr "/_Visualizza/V_ai a/Messaggio superiore"
 
 msgid "/_View/_Go to/Parent message"
 msgstr "/_Visualizza/V_ai a/Messaggio superiore"
 

-#: src/mainwindow.c:610
+#: src/mainwindow.c:611

 msgid "/_View/_Go to/Next unread _folder"
 msgstr "/_Visualizza/V_ai a/Prossima _cartella con messaggi non letti"
 
 msgid "/_View/_Go to/Next unread _folder"
 msgstr "/_Visualizza/V_ai a/Prossima _cartella con messaggi non letti"
 

-#: src/mainwindow.c:611
+#: src/mainwindow.c:612

 msgid "/_View/_Go to/_Other folder..."
 msgstr "/_Visualizza/V_ai a/_Altra cartella..."
 
 msgid "/_View/_Go to/_Other folder..."
 msgstr "/_Visualizza/V_ai a/_Altra cartella..."
 

-#: src/mainwindow.c:615 src/mainwindow.c:622 src/messageview.c:174
+#: src/mainwindow.c:616 src/mainwindow.c:623 src/messageview.c:174

 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/_Codifica/---"
 
 msgid "/_View/Character _encoding/---"
 msgstr "/_Visualizza/_Codifica/---"
 

-#: src/mainwindow.c:619 src/messageview.c:178
+#: src/mainwindow.c:620 src/messageview.c:178

 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/_Codifica"
 
 msgid "/_View/Character _encoding"
 msgstr "/_Visualizza/_Codifica"
 

-#: src/mainwindow.c:620 src/messageview.c:179
+#: src/mainwindow.c:621 src/messageview.c:179

 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/_Codifica/_Automatica"
 
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Visualizza/_Codifica/_Automatica"
 

-#: src/mainwindow.c:623 src/messageview.c:182
+#: src/mainwindow.c:624 src/messageview.c:182

 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/_Codifica/ASCII a 7 bit (US-ASC_II)"
 
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Visualizza/_Codifica/ASCII a 7 bit (US-ASC_II)"
 

-#: src/mainwindow.c:625 src/messageview.c:185
+#: src/mainwindow.c:626 src/messageview.c:185

 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/_Codifica/Unicode (_UTF-8)"
 
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Visualizza/_Codifica/Unicode (_UTF-8)"
 

-#: src/mainwindow.c:629 src/messageview.c:188
+#: src/mainwindow.c:630 src/messageview.c:188

 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/_Codifica/Europa Occidentale (ISO-8859-_1)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Visualizza/_Codifica/Europa Occidentale (ISO-8859-_1)"
 

-#: src/mainwindow.c:631 src/messageview.c:190
+#: src/mainwindow.c:632 src/messageview.c:190

 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/_Codifica/Europa Occidentale (ISO-8859-15)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Visualizza/_Codifica/Europa Occidentale (ISO-8859-15)"
 

-#: src/mainwindow.c:633 src/messageview.c:192
+#: src/mainwindow.c:634 src/messageview.c:192

 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visualizza/_Codifica/Europa Occidentale (Windows-1252)"
 
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Visualizza/_Codifica/Europa Occidentale (Windows-1252)"
 

-#: src/mainwindow.c:637 src/messageview.c:195
+#: src/mainwindow.c:638 src/messageview.c:195

 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/_Codifica/Europa Centrale (ISO-8859-_2)"
 
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Visualizza/_Codifica/Europa Centrale (ISO-8859-_2)"
 

-#: src/mainwindow.c:641 src/messageview.c:198
+#: src/mainwindow.c:642 src/messageview.c:198

 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/_Codifica/_Baltico (ISO-8859-13)"
 
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Visualizza/_Codifica/_Baltico (ISO-8859-13)"
 

-#: src/mainwindow.c:643 src/messageview.c:200
+#: src/mainwindow.c:644 src/messageview.c:200

 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/_Codifica/Baltico (ISO-8859-_4)"
 
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Visualizza/_Codifica/Baltico (ISO-8859-_4)"
 

-#: src/mainwindow.c:647 src/messageview.c:203
+#: src/mainwindow.c:648 src/messageview.c:203

 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/_Codifica/Greco (ISO-8859-_7)"
 
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Visualizza/_Codifica/Greco (ISO-8859-_7)"
 

-#: src/mainwindow.c:651 src/messageview.c:206
+#: src/mainwindow.c:652 src/messageview.c:206

 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/_Codifica/Ebreo (ISO-8859-_8)"
 
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Visualizza/_Codifica/Ebreo (ISO-8859-_8)"
 

-#: src/mainwindow.c:653 src/messageview.c:208
+#: src/mainwindow.c:654 src/messageview.c:208

 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/_Codifica/Ebreo (Windows-1255)"
 
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Visualizza/_Codifica/Ebreo (Windows-1255)"
 

-#: src/mainwindow.c:657 src/messageview.c:211
+#: src/mainwindow.c:658 src/messageview.c:211

 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visualizza/_Codifica/Arabico (ISO-8859-_6)"
 
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Visualizza/_Codifica/Arabico (ISO-8859-_6)"
 

-#: src/mainwindow.c:659 src/messageview.c:213
+#: src/mainwindow.c:660 src/messageview.c:213

 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visualizza/_Codifica/Arabico (Windows-1256)"
 
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Visualizza/_Codifica/Arabico (Windows-1256)"
 

-#: src/mainwindow.c:663 src/messageview.c:216
+#: src/mainwindow.c:664 src/messageview.c:216

 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/_Codifica/Turco (ISO-8859-_9)"
 
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Visualizza/_Codifica/Turco (ISO-8859-_9)"
 

-#: src/mainwindow.c:667 src/messageview.c:219
+#: src/mainwindow.c:668 src/messageview.c:219

 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/_Codifica/Cirillico (ISO-8859-_5)"
 
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Visualizza/_Codifica/Cirillico (ISO-8859-_5)"
 

-#: src/mainwindow.c:669 src/messageview.c:221
+#: src/mainwindow.c:670 src/messageview.c:221

 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/_Codifica/Cirillico (KOI8-_R)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Visualizza/_Codifica/Cirillico (KOI8-_R)"
 

-#: src/mainwindow.c:671 src/messageview.c:223
+#: src/mainwindow.c:672 src/messageview.c:223

 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/_Codifica/Cirillico (KOI8-U)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Visualizza/_Codifica/Cirillico (KOI8-U)"
 

-#: src/mainwindow.c:673 src/messageview.c:225
+#: src/mainwindow.c:674 src/messageview.c:225

 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/_Codifica/Cirillico (Windows-1251)"
 
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Visualizza/_Codifica/Cirillico (Windows-1251)"
 

-#: src/mainwindow.c:677 src/messageview.c:228
+#: src/mainwindow.c:678 src/messageview.c:228

 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/_Codifica/Giapponese (ISO-2022-_JP)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Visualizza/_Codifica/Giapponese (ISO-2022-_JP)"
 

-#: src/mainwindow.c:679 src/messageview.c:230
+#: src/mainwindow.c:680 src/messageview.c:230

 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/_Codifica/Giapponese (ISO-2022-JP-2)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/_Visualizza/_Codifica/Giapponese (ISO-2022-JP-2)"
 

-#: src/mainwindow.c:681 src/messageview.c:232
+#: src/mainwindow.c:682 src/messageview.c:232

 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/_Codifica/Giapponese (_EUC-JP)"
 
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/_Visualizza/_Codifica/Giapponese (_EUC-JP)"
 

-#: src/mainwindow.c:683 src/messageview.c:234
+#: src/mainwindow.c:684 src/messageview.c:234

 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/_Codifica/Giapponese (_Shift__JIS)"
 
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/_Visualizza/_Codifica/Giapponese (_Shift__JIS)"
 

-#: src/mainwindow.c:687 src/messageview.c:237
+#: src/mainwindow.c:688 src/messageview.c:237

 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/_Codifica/Cinese semplificato (_GB2312)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Visualizza/_Codifica/Cinese semplificato (_GB2312)"
 

-#: src/mainwindow.c:689 src/messageview.c:239
+#: src/mainwindow.c:690 src/messageview.c:239

 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/_Codifica/Cinese semplificato (_GB2312)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Visualizza/_Codifica/Cinese semplificato (_GB2312)"
 

-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:692 src/messageview.c:241

 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/_Codifica/Cinese tradizionale (_Big5)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Visualizza/_Codifica/Cinese tradizionale (_Big5)"
 

-#: src/mainwindow.c:693 src/messageview.c:243
+#: src/mainwindow.c:694 src/messageview.c:243

 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/_Codifica/Cinese tradizionale (EUC-_TW)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Visualizza/_Codifica/Cinese tradizionale (EUC-_TW)"
 

-#: src/mainwindow.c:695 src/messageview.c:245
+#: src/mainwindow.c:696 src/messageview.c:245

 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/_Codifica/Cinese (ISO-2022-_CN)"
 
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/_Visualizza/_Codifica/Cinese (ISO-2022-_CN)"
 

-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:700 src/messageview.c:248

 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/_Codifica/Coreano (EUC-_KR)"
 
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Visualizza/_Codifica/Coreano (EUC-_KR)"
 

-#: src/mainwindow.c:701 src/messageview.c:250
+#: src/mainwindow.c:702 src/messageview.c:250

 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/_Codifica/Coreano (ISO-2022-KR)"
 
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/_Codifica/Coreano (ISO-2022-KR)"
 

-#: src/mainwindow.c:705 src/messageview.c:253
+#: src/mainwindow.c:706 src/messageview.c:253

 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/_Codifica/Thai (TIS-620)"
 
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Visualizza/_Codifica/Thai (TIS-620)"
 

-#: src/mainwindow.c:707 src/messageview.c:255
+#: src/mainwindow.c:708 src/messageview.c:255

 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/_Codifica/Thai (Windows-874)"
 
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Visualizza/_Codifica/Thai (Windows-874)"
 

-#: src/mainwindow.c:714 src/mainwindow.c:720 src/messageview.c:262
+#: src/mainwindow.c:715 src/mainwindow.c:721 src/messageview.c:262

 #: src/messageview.c:268
 msgid "/_View/Decode/---"
 msgstr "/_Visualizza/Decodifica/---"
 
 #: src/messageview.c:268
 msgid "/_View/Decode/---"
 msgstr "/_Visualizza/Decodifica/---"
 

-#: src/mainwindow.c:717 src/messageview.c:265
+#: src/mainwindow.c:718 src/messageview.c:265

 msgid "/_View/Decode"
 msgstr "/_Visualizza/Decodifica"
 
 msgid "/_View/Decode"
 msgstr "/_Visualizza/Decodifica"
 

-#: src/mainwindow.c:718 src/messageview.c:266
+#: src/mainwindow.c:719 src/messageview.c:266

 msgid "/_View/Decode/_Auto detect"
 msgstr "/_Visualizza/Decodifica/_Automatica"
 
 msgid "/_View/Decode/_Auto detect"
 msgstr "/_Visualizza/Decodifica/_Automatica"
 

-#: src/mainwindow.c:721 src/messageview.c:269
+#: src/mainwindow.c:722 src/messageview.c:269

 msgid "/_View/Decode/_8bit"
 msgstr "/_Visualizza/Decodifica/_8bit"
 
 msgid "/_View/Decode/_8bit"
 msgstr "/_Visualizza/Decodifica/_8bit"
 

-#: src/mainwindow.c:722 src/messageview.c:270
+#: src/mainwindow.c:723 src/messageview.c:270

 msgid "/_View/Decode/_Quoted printable"
 msgstr "/_Visualizza/Decodifica/_Quoted printable"
 
 msgid "/_View/Decode/_Quoted printable"
 msgstr "/_Visualizza/Decodifica/_Quoted printable"
 

-#: src/mainwindow.c:723 src/messageview.c:271
+#: src/mainwindow.c:724 src/messageview.c:271

 msgid "/_View/Decode/_Base64"
 msgstr "/_Visualizza/Decodifica/_Base64"
 
 msgid "/_View/Decode/_Base64"
 msgstr "/_Visualizza/Decodifica/_Base64"
 

-#: src/mainwindow.c:724 src/messageview.c:272
+#: src/mainwindow.c:725 src/messageview.c:272

 msgid "/_View/Decode/_Uuencode"
 msgstr "/_Visualizza/Decodifica/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/_Visualizza/Decodifica/_Uuencode"
 

-#: src/mainwindow.c:730 src/summaryview.c:473
+#: src/mainwindow.c:731 src/summaryview.c:473

 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri in una nuova _finestra"
 
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri in una nuova _finestra"
 

-#: src/mainwindow.c:731 src/messageview.c:278
+#: src/mainwindow.c:732 src/messageview.c:278

 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/So_rgente del messaggio"
 
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/So_rgente del messaggio"
 

-#: src/mainwindow.c:732
+#: src/mainwindow.c:733

 msgid "/_View/All headers"
 msgstr "/_Visualizza/Tutte le intestazioni"
 
 msgid "/_View/All headers"
 msgstr "/_Visualizza/Tutte le intestazioni"
 

-#: src/mainwindow.c:733 src/messageview.c:280
+#: src/mainwindow.c:734 src/messageview.c:280

 msgid "/_View/Quotes"
 msgstr "/_Visualizza/_Citazioni"
 
 msgid "/_View/Quotes"
 msgstr "/_Visualizza/_Citazioni"
 

-#: src/mainwindow.c:734 src/messageview.c:281
+#: src/mainwindow.c:735 src/messageview.c:281

 msgid "/_View/Quotes/_Fold all"
 msgstr "/_Visualizza/_Citazioni/_Raggruppa tutte"
 
 msgid "/_View/Quotes/_Fold all"
 msgstr "/_Visualizza/_Citazioni/_Raggruppa tutte"
 

-#: src/mainwindow.c:735 src/messageview.c:282
+#: src/mainwindow.c:736 src/messageview.c:282

 msgid "/_View/Quotes/Fold from level _2"
 msgstr "/_Visualizza/_Citazioni/Raggruppa da livello _2"
 
 msgid "/_View/Quotes/Fold from level _2"
 msgstr "/_Visualizza/_Citazioni/Raggruppa da livello _2"
 

-#: src/mainwindow.c:736 src/messageview.c:283
+#: src/mainwindow.c:737 src/messageview.c:283

 msgid "/_View/Quotes/Fold from level _3"
 msgstr "/_Visualizza/_Citazioni/Raggruppa da livello _3"
 
 msgid "/_View/Quotes/Fold from level _3"
 msgstr "/_Visualizza/_Citazioni/Raggruppa da livello _3"
 

-#: src/mainwindow.c:738
+#: src/mainwindow.c:739

 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/_Aggiorna sommario"
 
 msgid "/_View/_Update summary"
 msgstr "/_Visualizza/_Aggiorna sommario"
 

-#: src/mainwindow.c:741
+#: src/mainwindow.c:742

 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/R_icevi"
 
 msgid "/_Message/Recei_ve"
 msgstr "/M_essaggio/R_icevi"
 

-#: src/mainwindow.c:742
+#: src/mainwindow.c:743

 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/R_icevi/Ricevi dall'account _corrente"
 
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/M_essaggio/R_icevi/Ricevi dall'account _corrente"
 

-#: src/mainwindow.c:744
+#: src/mainwindow.c:745

 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/R_icevi/Ricevi da _tutti gli account"
 
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/M_essaggio/R_icevi/Ricevi da _tutti gli account"
 

-#: src/mainwindow.c:746
+#: src/mainwindow.c:747

 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/M_essaggio/R_icevi/Cancella la ri_cezione"
 
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/M_essaggio/R_icevi/Cancella la ri_cezione"
 

-#: src/mainwindow.c:748
+#: src/mainwindow.c:749

 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/R_icevi/---"
 
 msgid "/_Message/Recei_ve/---"
 msgstr "/M_essaggio/R_icevi/---"
 

-#: src/mainwindow.c:749
+#: src/mainwindow.c:750

 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia i messa_ggi in coda"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/M_essaggio/Invia i messa_ggi in coda"
 

-#: src/mainwindow.c:751
+#: src/mainwindow.c:752

 msgid "/_Message/Compose a_n email message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/M_essaggio/Componi _nuovo messaggio"
 

-#: src/mainwindow.c:752
+#: src/mainwindow.c:753

 msgid "/_Message/Compose a news message"
 msgstr "/M_essaggio/Componi nuovo ar_ticolo"
 
 msgid "/_Message/Compose a news message"
 msgstr "/M_essaggio/Componi nuovo ar_ticolo"
 

-#: src/mainwindow.c:753 src/messageview.c:289
+#: src/mainwindow.c:754 src/messageview.c:289

 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 
 msgid "/_Message/_Reply"
 msgstr "/M_essaggio/_Rispondi"
 

-#: src/mainwindow.c:754
+#: src/mainwindow.c:755

 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/_Rispondi a"
 
 msgid "/_Message/Repl_y to"
 msgstr "/M_essaggio/_Rispondi a"
 

-#: src/mainwindow.c:755 src/messageview.c:290
+#: src/mainwindow.c:756 src/messageview.c:290

 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/_Rispondi a/_tutti"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/M_essaggio/_Rispondi a/_tutti"
 

-#: src/mainwindow.c:756 src/messageview.c:292
+#: src/mainwindow.c:757 src/messageview.c:292

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/_Rispondi a/_mittente"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/M_essaggio/_Rispondi a/_mittente"
 

-#: src/mainwindow.c:757 src/messageview.c:294
+#: src/mainwindow.c:758 src/messageview.c:294

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/_Rispondi a/mailing _list"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/M_essaggio/_Rispondi a/mailing _list"
 

-#: src/mainwindow.c:759
+#: src/mainwindow.c:760

 msgid "/_Message/Follow-up and reply to"
 msgstr "/M_essaggio/_Inoltra e rispondi a"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/M_essaggio/_Inoltra e rispondi a"
 

-#: src/mainwindow.c:761 src/messageview.c:297
+#: src/mainwindow.c:762 src/messageview.c:297

 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 
 msgid "/_Message/_Forward"
 msgstr "/M_essaggio/_Inoltra"
 

-#: src/mainwindow.c:762 src/messageview.c:298
+#: src/mainwindow.c:763 src/messageview.c:298

 msgid "/_Message/For_ward as attachment"
 msgstr "/_Messaggio/In_oltra come allegato"
 
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Messaggio/In_oltra come allegato"
 

-#: src/mainwindow.c:763
+#: src/mainwindow.c:764

 msgid "/_Message/Redirect"
 msgstr "/M_essaggio/Redirigi"
 
 msgid "/_Message/Redirect"
 msgstr "/M_essaggio/Redirigi"
 

-#: src/mainwindow.c:765
+#: src/mainwindow.c:766

 msgid "/_Message/Mailing-_List"
 msgstr "/M_essaggio/Mailing-_List"
 
 msgid "/_Message/Mailing-_List"
 msgstr "/M_essaggio/Mailing-_List"
 

-#: src/mainwindow.c:766
+#: src/mainwindow.c:767

 msgid "/_Message/Mailing-_List/Post"
 msgstr "/M_essaggio/Mailing-_List/Invia"
 
 msgid "/_Message/Mailing-_List/Post"
 msgstr "/M_essaggio/Mailing-_List/Invia"
 

-#: src/mainwindow.c:767
+#: src/mainwindow.c:768

 msgid "/_Message/Mailing-_List/Help"
 msgstr "/M_essaggio/Mailing-_List/Aiuto"
 
 msgid "/_Message/Mailing-_List/Help"
 msgstr "/M_essaggio/Mailing-_List/Aiuto"
 

-#: src/mainwindow.c:768
+#: src/mainwindow.c:769

 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr "/M_essaggio/Mailing-_List/Iscrizione"
 
 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr "/M_essaggio/Mailing-_List/Iscrizione"
 

-#: src/mainwindow.c:769
+#: src/mainwindow.c:770

 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr "/M_essaggio/Mailing-_List/Annulla iscrizione"
 
 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr "/M_essaggio/Mailing-_List/Annulla iscrizione"
 

-#: src/mainwindow.c:770
+#: src/mainwindow.c:771

 msgid "/_Message/Mailing-_List/View archive"
 msgstr "/M_essaggio/Mailing-_List/Visualizza archivio"
 
 msgid "/_Message/Mailing-_List/View archive"
 msgstr "/M_essaggio/Mailing-_List/Visualizza archivio"
 

-#: src/mainwindow.c:771
+#: src/mainwindow.c:772

 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr "/M_essaggio/Mailing-_List/Contatta amministratore"
 
 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr "/M_essaggio/Mailing-_List/Contatta amministratore"
 

-#: src/mainwindow.c:774
+#: src/mainwindow.c:775

 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/_Sposta..."
 
 msgid "/_Message/M_ove..."
 msgstr "/M_essaggio/_Sposta..."
 

-#: src/mainwindow.c:775
+#: src/mainwindow.c:776

 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 
 msgid "/_Message/_Copy..."
 msgstr "M_essaggio/_Copia..."
 

-#: src/mainwindow.c:776
+#: src/mainwindow.c:777

 msgid "/_Message/Move to _trash"
 msgstr "/M_essaggio/_Sposta nel cestino"
 
 msgid "/_Message/Move to _trash"
 msgstr "/M_essaggio/_Sposta nel cestino"
 

-#: src/mainwindow.c:777
+#: src/mainwindow.c:778

 msgid "/_Message/_Delete..."
 msgstr "/M_essaggio/_Elimina..."
 
 msgid "/_Message/_Delete..."
 msgstr "/M_essaggio/_Elimina..."
 

-#: src/mainwindow.c:778
+#: src/mainwindow.c:779

 msgid "/_Message/Cancel a news message"
 msgstr "/M_essaggio/Elimina un messaggio ne_ws"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/M_essaggio/Elimina un messaggio ne_ws"
 

-#: src/mainwindow.c:780
+#: src/mainwindow.c:781

 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/Contrassegn_a"
 
 msgid "/_Message/_Mark"
 msgstr "/M_essaggio/Contrassegn_a"
 

-#: src/mainwindow.c:781
+#: src/mainwindow.c:782

 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegn_a"
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegn_a"
 

-#: src/mainwindow.c:782
+#: src/mainwindow.c:783

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/Contrassegn_a/To_gli contrassegno"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/M_essaggio/Contrassegn_a/To_gli contrassegno"
 

-#: src/mainwindow.c:783 src/mainwindow.c:789 src/mainwindow.c:792
+#: src/mainwindow.c:784 src/mainwindow.c:790 src/mainwindow.c:793

 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/Contrassegn_a/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/M_essaggio/Contrassegn_a/---"
 

-#: src/mainwindow.c:784
+#: src/mainwindow.c:785

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna co_me non letto"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna co_me non letto"
 

-#: src/mainwindow.c:785
+#: src/mainwindow.c:786

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna come _letto"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna come _letto"
 

-#: src/mainwindow.c:786
+#: src/mainwindow.c:787

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna tutti come lett_i"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna tutti come lett_i"
 

-#: src/mainwindow.c:787
+#: src/mainwindow.c:788

 msgid "/_Message/_Mark/Ignore thread"
 msgstr "/M_essaggio/Contrasseg_na/Ignora discussione"
 
 msgid "/_Message/_Mark/Ignore thread"
 msgstr "/M_essaggio/Contrasseg_na/Ignora discussione"
 

-#: src/mainwindow.c:788
+#: src/mainwindow.c:789

 msgid "/_Message/_Mark/Unignore thread"
 msgstr "/M_essaggio/Contrasseg_na/Segui discussione"
 
 msgid "/_Message/_Mark/Unignore thread"
 msgstr "/M_essaggio/Contrasseg_na/Segui discussione"
 

-#: src/mainwindow.c:790
+#: src/mainwindow.c:791

 msgid "/_Message/_Mark/Mark as _spam"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna come _spam"
 
 msgid "/_Message/_Mark/Mark as _spam"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna come _spam"
 

-#: src/mainwindow.c:791
+#: src/mainwindow.c:792

 msgid "/_Message/_Mark/Mark as _ham"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna come messaggio non-spam"
 
 msgid "/_Message/_Mark/Mark as _ham"
 msgstr "/M_essaggio/Contrassegn_a/Contrassegna come messaggio non-spam"
 

-#: src/mainwindow.c:793
+#: src/mainwindow.c:794

 msgid "/_Message/_Mark/Lock"
 msgstr "/M_essaggio/Constrassegn_a/Blocca"
 
 msgid "/_Message/_Mark/Lock"
 msgstr "/M_essaggio/Constrassegn_a/Blocca"
 

-#: src/mainwindow.c:794
+#: src/mainwindow.c:795

 msgid "/_Message/_Mark/Unlock"
 msgstr "/M_essaggio/Contrassegn_a/Sblocca"
 
 msgid "/_Message/_Mark/Unlock"
 msgstr "/M_essaggio/Contrassegn_a/Sblocca"
 

-#: src/mainwindow.c:795
+#: src/mainwindow.c:796

 msgid "/_Message/Color la_bel"
 msgstr "/_Messaggio/Colore etic_hetta"
 
 msgid "/_Message/Color la_bel"
 msgstr "/_Messaggio/Colore etic_hetta"
 

-#: src/mainwindow.c:797
+#: src/mainwindow.c:798

 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimo_difica"
 
 msgid "/_Message/Re-_edit"
 msgstr "/M_essaggio/Rimo_difica"
 

-#: src/mainwindow.c:800
+#: src/mainwindow.c:801

 msgid "/_Tools/_Address book..."
 msgstr "/St_rumenti/_Rubrica..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/St_rumenti/_Rubrica..."
 

-#: src/mainwindow.c:801 src/messageview.c:304
+#: src/mainwindow.c:802 src/messageview.c:304

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/St_rumenti/Aggiungi mi_ttente alla rubrica"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/St_rumenti/Aggiungi mi_ttente alla rubrica"
 

-#: src/mainwindow.c:803
+#: src/mainwindow.c:804

 msgid "/_Tools/_Harvest addresses"
 msgstr "/St_rumenti/_Raccogli indirizzi"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/St_rumenti/_Raccogli indirizzi"
 

-#: src/mainwindow.c:804
+#: src/mainwindow.c:805

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/St_rumenti/_Raccogli indirizzi/dalla _Cartella..."
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/St_rumenti/_Raccogli indirizzi/dalla _Cartella..."
 

-#: src/mainwindow.c:806
+#: src/mainwindow.c:807

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/St_rumenti/_Raccogli indirizzi/dai _Messaggi..."
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/St_rumenti/_Raccogli indirizzi/dai _Messaggi..."
 

-#: src/mainwindow.c:809
+#: src/mainwindow.c:810

 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/St_rumenti/_Filtra tutti i messaggi nella cartella"
 
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/St_rumenti/_Filtra tutti i messaggi nella cartella"
 

-#: src/mainwindow.c:811
+#: src/mainwindow.c:812

 msgid "/_Tools/Filter _selected messages"
 msgstr "/St_rumenti/_Filtra i messaggi selezionati"
 
 msgid "/_Tools/Filter _selected messages"
 msgstr "/St_rumenti/_Filtra i messaggi selezionati"
 

-#: src/mainwindow.c:813 src/messageview.c:307
+#: src/mainwindow.c:814 src/messageview.c:307

 msgid "/_Tools/_Create filter rule"
 msgstr "/St_rumenti/Crea _filtro"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/St_rumenti/Crea _filtro"
 

-#: src/mainwindow.c:814 src/messageview.c:309
+#: src/mainwindow.c:815 src/messageview.c:309

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/St_rumenti/Crea _filtro/_Automaticamente"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/St_rumenti/Crea _filtro/_Automaticamente"
 

-#: src/mainwindow.c:816 src/messageview.c:311
+#: src/mainwindow.c:817 src/messageview.c:311

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/St_rumenti/Crea _filtro/dal _mittente"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/St_rumenti/Crea _filtro/dal _mittente"
 

-#: src/mainwindow.c:818 src/messageview.c:313
+#: src/mainwindow.c:819 src/messageview.c:313

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/St_rumenti/Crea _filtro/dal _destinatario"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/St_rumenti/Crea _filtro/dal _destinatario"
 

-#: src/mainwindow.c:820 src/messageview.c:315
+#: src/mainwindow.c:821 src/messageview.c:315

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/St_rumenti/Crea _filtro/dall'_oggetto"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/St_rumenti/Crea _filtro/dall'_oggetto"
 

-#: src/mainwindow.c:822
+#: src/mainwindow.c:823

 msgid "/_Tools/C_reate processing rule"
 msgstr "/St_rumenti/Crea re_gola elaborazione"
 
 msgid "/_Tools/C_reate processing rule"
 msgstr "/St_rumenti/Crea re_gola elaborazione"
 

-#: src/mainwindow.c:823
+#: src/mainwindow.c:824

 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr "/St_rumenti/Crea re_gola elaborazione/_Automaticamente"
 
 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr "/St_rumenti/Crea re_gola elaborazione/_Automaticamente"
 

-#: src/mainwindow.c:825
+#: src/mainwindow.c:826

 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr "/St_rumenti/Crea re_gola elaborazione/dal _mittente"
 
 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr "/St_rumenti/Crea re_gola elaborazione/dal _mittente"
 

-#: src/mainwindow.c:827
+#: src/mainwindow.c:828

 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr "/St_rumenti/Crea re_gola elaborazione/dal _destinatario"
 
 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr "/St_rumenti/Crea re_gola elaborazione/dal _destinatario"
 

-#: src/mainwindow.c:829
+#: src/mainwindow.c:830

 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/St_rumenti/Crea re_gola elaborazione/dall'_oggetto"
 
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/St_rumenti/Crea re_gola elaborazione/dall'_oggetto"
 

-#: src/mainwindow.c:834
+#: src/mainwindow.c:835

 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/St_rumenti/_Verifica nuovi messaggi in tutte le cartelle"
 
 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/St_rumenti/_Verifica nuovi messaggi in tutte le cartelle"
 

-#: src/mainwindow.c:836
+#: src/mainwindow.c:837

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Sommario/Elimina messaggi _duplicati"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Sommario/Elimina messaggi _duplicati"
 

-#: src/mainwindow.c:838
+#: src/mainwindow.c:839

 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr "/St_rumenti/Elimina messaggi _duplicati/Nelle cartelle selezionate"
 
 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr "/St_rumenti/Elimina messaggi _duplicati/Nelle cartelle selezionate"
 

-#: src/mainwindow.c:840
+#: src/mainwindow.c:841

 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr "/St_rumenti/Elimina messaggi _duplicati/In tutte le cartelle"
 
 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr "/St_rumenti/Elimina messaggi _duplicati/In tutte le cartelle"
 

-#: src/mainwindow.c:843
+#: src/mainwindow.c:844

 msgid "/_Tools/E_xecute"
 msgstr "/St_rumenti/Ese_gui"
 
 msgid "/_Tools/E_xecute"
 msgstr "/St_rumenti/Ese_gui"
 

-#: src/mainwindow.c:846
+#: src/mainwindow.c:847

 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/St_rumenti/Certi_ficati SSL..."
 
 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/St_rumenti/Certi_ficati SSL..."
 

-#: src/mainwindow.c:850
+#: src/mainwindow.c:851

 msgid "/_Tools/_Log window"
 msgstr "/St_rumenti/Visualizza i _log..."
 
 msgid "/_Tools/_Log window"
 msgstr "/St_rumenti/Visualizza i _log..."
 

-#: src/mainwindow.c:852
+#: src/mainwindow.c:853

 msgid "/_Configuration"
 msgstr "/_Configurazione"
 
 msgid "/_Configuration"
 msgstr "/_Configurazione"
 

-#: src/mainwindow.c:853
+#: src/mainwindow.c:854

 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Cambia _account attivo"
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configurazione/Cambia _account attivo"
 

-#: src/mainwindow.c:855
+#: src/mainwindow.c:856

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per account attivo..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configurazione/_Preferenze per account attivo..."
 

-#: src/mainwindow.c:857
+#: src/mainwindow.c:858

 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configurazione/Crea _nuovo account..."
 

-#: src/mainwindow.c:859
+#: src/mainwindow.c:860

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica gli account... "
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configurazione/_Modifica gli account... "
 

-#: src/mainwindow.c:861
+#: src/mainwindow.c:862

 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 
 msgid "/_Configuration/---"
 msgstr "/_Configurazione/---"
 

-#: src/mainwindow.c:862
+#: src/mainwindow.c:863

 msgid "/_Configuration/P_references..."
 msgstr "/_Configurazione/_Preferenze..."
 
 msgid "/_Configuration/P_references..."
 msgstr "/_Configurazione/_Preferenze..."
 

-#: src/mainwindow.c:864
+#: src/mainwindow.c:865

 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr "/_Configurazione/P_re-elaborazione..."
 
 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr "/_Configurazione/P_re-elaborazione..."
 

-#: src/mainwindow.c:866
+#: src/mainwindow.c:867

 msgid "/_Configuration/Post-pro_cessing..."
 msgstr "/_Configurazione/P_ost-elaborazione..."
 
 msgid "/_Configuration/Post-pro_cessing..."
 msgstr "/_Configurazione/P_ost-elaborazione..."
 

-#: src/mainwindow.c:868
+#: src/mainwindow.c:869

 msgid "/_Configuration/_Filtering..."
 msgstr "/_Configurazione/Gestione _Filtri..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/_Configurazione/Gestione _Filtri..."
 

-#: src/mainwindow.c:870
+#: src/mainwindow.c:871

 msgid "/_Configuration/_Templates..."
 msgstr "/_Configurazione/_Modelli..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/_Configurazione/_Modelli..."
 

-#: src/mainwindow.c:871
+#: src/mainwindow.c:872

 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/A_zioni..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configurazione/A_zioni..."
 

-#: src/mainwindow.c:872
+#: src/mainwindow.c:873

 msgid "/_Configuration/Plu_gins..."
 msgstr "/_Configurazione/_Plugin..."
 
 msgid "/_Configuration/Plu_gins..."
 msgstr "/_Configurazione/_Plugin..."
 

-#: src/mainwindow.c:875
+#: src/mainwindow.c:876

 msgid "/_Help/_Manual"
 msgstr "/_Aiuto/_Manuale"
 
 msgid "/_Help/_Manual"
 msgstr "/_Aiuto/_Manuale"
 

-#: src/mainwindow.c:876
+#: src/mainwindow.c:877

 msgid "/_Help/_Online User-contributed FAQ"
 msgstr "/_Aiuto/FAQ _In linea creata dagli utenti"
 
 msgid "/_Help/_Online User-contributed FAQ"
 msgstr "/_Aiuto/FAQ _In linea creata dagli utenti"
 

-#: src/mainwindow.c:878
+#: src/mainwindow.c:879

 msgid "/_Help/Icon _Legend"
 msgstr "/_Aiuto/Legenda _Icone"
 
 msgid "/_Help/Icon _Legend"
 msgstr "/_Aiuto/Legenda _Icone"
 

-#: src/mainwindow.c:879
+#: src/mainwindow.c:880

 msgid "/_Help/---"
 msgstr "/_Aiuto/---"
 
 msgid "/_Help/---"
 msgstr "/_Aiuto/---"
 

-#: src/mainwindow.c:1227
+#: src/mainwindow.c:1228

 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Alcuni errori si sono verificati. Cliccare qui per visualizzare il log."
 
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 "Alcuni errori si sono verificati. Cliccare qui per visualizzare il log."
 

-#: src/mainwindow.c:1241
+#: src/mainwindow.c:1242

 msgid "You are online. Click the icon to go offline"
 msgstr "Modalità online. Cliccare per lavorare offline"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "Modalità online. Cliccare per lavorare offline"
 

-#: src/mainwindow.c:1244
+#: src/mainwindow.c:1245

 msgid "You are offline. Click the icon to go online"
 msgstr "Modalità offline. Cliccare per lavorare online"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "Modalità offline. Cliccare per lavorare online"
 

-#: src/mainwindow.c:1260
+#: src/mainwindow.c:1261

 msgid "Select account"
 msgstr "Selezione account"
 
 msgid "Select account"
 msgstr "Selezione account"
 

-#: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738
-#: src/mainwindow.c:1774 src/mainwindow.c:1816 src/prefs_folder_item.c:756
+#: src/mainwindow.c:1662 src/mainwindow.c:1703 src/mainwindow.c:1739
+#: src/mainwindow.c:1775 src/mainwindow.c:1818
+#: src/plugins/trayicon/trayicon.c:143 src/prefs_folder_item.c:764

 msgid "Untitled"
 msgstr "Senza titolo"
 
 msgid "Untitled"
 msgstr "Senza titolo"
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1819

 msgid "none"
 msgstr "niente"
 
 msgid "none"
 msgstr "niente"
 

-#: src/mainwindow.c:2079
+#: src/mainwindow.c:2081

 msgid "Delete all messages in trash folders?"
 msgstr "Cancellare tutti i messaggi nei cestini?"
 
 msgid "Delete all messages in trash folders?"
 msgstr "Cancellare tutti i messaggi nei cestini?"
 

-#: src/mainwindow.c:2098
+#: src/mainwindow.c:2100

 msgid "Add mailbox"
 msgstr "Aggiungi mailbox"
 
 msgid "Add mailbox"
 msgstr "Aggiungi mailbox"
 

-#: src/mainwindow.c:2099
+#: src/mainwindow.c:2101

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -5785,16 +6121,16 @@ msgstr ""
 "Se è specificata una mailbox esistente, sarà\n"
 "analizzata automaticamente."
 
 "Se è specificata una mailbox esistente, sarà\n"
 "analizzata automaticamente."
 

-#: src/mainwindow.c:2105
+#: src/mainwindow.c:2107

 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La mailbox '%s' esiste già."
 
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La mailbox '%s' esiste già."
 

-#: src/mainwindow.c:2110 src/setup.c:51
+#: src/mainwindow.c:2112 src/setup.c:51

 msgid "Mailbox"
 msgstr "Mailbox"
 
 msgid "Mailbox"
 msgstr "Mailbox"
 

-#: src/mainwindow.c:2115 src/setup.c:54
+#: src/mainwindow.c:2117 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 "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -5804,90 +6140,80 @@ msgstr ""
 "Può darsi che esistano già alcuni file, oppure che non si abbiano i permessi "
 "di scrittura."
 
 "Può darsi che esistano già alcuni file, oppure che non si abbiano i permessi "
 "di scrittura."
 

-#: src/mainwindow.c:2431
+#: src/mainwindow.c:2437

 msgid "No posting allowed"
 msgstr "L'invio di messaggi non è consentito"
 
 msgid "No posting allowed"
 msgstr "L'invio di messaggi non è consentito"
 

-#: src/mainwindow.c:2696
-msgid "Sylpheed-Claws - Folder View"
-msgstr "Sylpheed-Claws - Vista Cartella"
+#: src/mainwindow.c:2704
+msgid "Claws Mail - Folder View"
+msgstr "Claws Mail - Vista Cartella"

 
 

-#: src/mainwindow.c:2732 src/messageview.c:449 src/messageview.c:855
-msgid "Sylpheed-Claws - Message View"
-msgstr "Sylpheed-Claws - Vista messaggio"
+#: src/mainwindow.c:2740 src/messageview.c:449 src/messageview.c:861
+msgid "Claws Mail - Message View"
+msgstr "Claws Mail - Vista messaggio"

 
 

-#: src/mainwindow.c:3082
+#: src/mainwindow.c:3090

 msgid "Mbox import has failed."
 msgstr "L'importazione mbox non è andata a buon fine"
 
 msgid "Mbox import has failed."
 msgstr "L'importazione mbox non è andata a buon fine"
 

-#: src/mainwindow.c:3091 src/mainwindow.c:3100
+#: src/mainwindow.c:3099 src/mainwindow.c:3108

 msgid "Export to mbox has failed."
 msgstr "L'esportazione verso mbox non è andata a buon fine"
 
 msgid "Export to mbox has failed."
 msgstr "L'esportazione verso mbox non è andata a buon fine"
 

-#: src/mainwindow.c:3123 src/plugins/trayicon/trayicon.c:426
+#: src/mainwindow.c:3131 src/plugins/trayicon/trayicon.c:474

 msgid "Exit"
 msgstr "Esci"
 
 msgid "Exit"
 msgstr "Esci"
 

-#: src/mainwindow.c:3123
-msgid "Exit Sylpheed-Claws?"
-msgstr "Uscire da Sylpheed-Claws?"
+#: src/mainwindow.c:3131
+msgid "Exit Claws Mail?"
+msgstr "Uscire da Claws Mail?"

 
 

-#: src/mainwindow.c:3269
+#: src/mainwindow.c:3282

 msgid "Folder synchronisation"
 msgstr "Sincronizzazione cartelle"
 
 msgid "Folder synchronisation"
 msgstr "Sincronizzazione cartelle"
 

-#: src/mainwindow.c:3270
+#: src/mainwindow.c:3283

 msgid "Do you want to synchronise your folders now?"
 msgstr "Sincronizzare ora le cartelle?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Sincronizzare ora le cartelle?"
 

-#: src/mainwindow.c:3271
+#: src/mainwindow.c:3284

 msgid "+_Synchronise"
 msgstr "+_Sincronizza"
 
 msgid "+_Synchronise"
 msgstr "+_Sincronizza"
 

-#: src/mainwindow.c:3602
+#: src/mainwindow.c:3615

 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione i messaggi duplicati..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione i messaggi duplicati..."
 

-#: src/mainwindow.c:3636
+#: src/mainwindow.c:3652

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Eliminato %d messaggio duplicato in %d cartelle.\n"
 msgstr[1] "Eliminati %d messaggi duplicati in %d cartelle.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Eliminato %d messaggio duplicato in %d cartelle.\n"
 msgstr[1] "Eliminati %d messaggi duplicati in %d cartelle.\n"
 

-#: src/mainwindow.c:3795 src/summaryview.c:4775
+#: src/mainwindow.c:3811 src/summaryview.c:4783

 msgid "Processing rules to apply before folder rules"
 msgstr "Regole elaborazione da applicare prima dei filtri di cartella"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Regole elaborazione da applicare prima dei filtri di cartella"
 

-#: src/mainwindow.c:3804
+#: src/mainwindow.c:3820

 msgid "Processing rules to apply after folder rules"
 msgstr "Regole elaborazione da applicare dopo i filtri di cartella"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Regole elaborazione da applicare dopo i filtri di cartella"
 

-#: src/mainwindow.c:3813 src/summaryview.c:4786
+#: src/mainwindow.c:3829 src/summaryview.c:4794

 msgid "Filtering configuration"
 msgstr "Configurazione filtri"
 
 msgid "Filtering configuration"
 msgstr "Configurazione filtri"
 

-#: src/mainwindow.c:4067
-#, c-format
-msgid "not initialized\n"
-msgstr "non inizializzato\n"
-
-#: src/mainwindow.c:4079 src/mainwindow.c:4090
-#, c-format
-msgid "selecting folder '%s'\n"
-msgstr "selezionando la cartella '%s'\n"
-
-#: src/mainwindow.c:4094
-#, c-format
-msgid "selecting message %d\n"
-msgstr "selezionando il messaggio %d\n"
+#: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
+#: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
+msgid "Filtering Matcher Menu|All"
+msgstr "Tutti"

 
 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(nessuno)"
 
 
 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(nessuno)"
 

-#: src/mbox.c:85
+#: src/mbox.c:98

 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 #, c-format
 msgid ""
 "Could not open mbox file:\n"


@@ -5896,25 +6222,25 @@ msgstr ""
 "Impossibile aprire il file mbox:\n"
 "%s\n"
 
 "Impossibile aprire il file mbox:\n"
 "%s\n"
 

-#: src/mbox.c:121
+#: src/mbox.c:134

 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Importazione da mbox... (%d messaggi importati)"
 
 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Importazione da mbox... (%d messaggi importati)"
 

-#: src/mbox.c:468
+#: src/mbox.c:481

 msgid "Overwrite mbox file"
 msgstr "Sovrascrivi file mbox"
 
 msgid "Overwrite mbox file"
 msgstr "Sovrascrivi file mbox"
 

-#: src/mbox.c:469
+#: src/mbox.c:482

 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Il file esiste già. Sovrascriverlo?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Il file esiste già. Sovrascriverlo?"
 

-#: src/mbox.c:470 src/messageview.c:1143 src/mimeview.c:1422
-#: src/textview.c:2650
+#: src/mbox.c:483 src/messageview.c:1149 src/mimeview.c:1443
+#: src/textview.c:2654

 msgid "Overwrite"
 msgstr "Sovrascrivo"
 
 msgid "Overwrite"
 msgstr "Sovrascrivo"
 

-#: src/mbox.c:479
+#: src/mbox.c:492

 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 #, c-format
 msgid ""
 "Could not create mbox file:\n"


@@ -5923,39 +6249,39 @@ msgstr ""
 "Impossibile creare il file mbox:\n"
 "%s\n"
 
 "Impossibile creare il file mbox:\n"
 "%s\n"
 

-#: src/mbox.c:483
+#: src/mbox.c:500

 msgid "Exporting to mbox..."
 msgstr "Esportazione verso file mbox..."
 
 msgid "Exporting to mbox..."
 msgstr "Esportazione verso file mbox..."
 

-#: src/message_search.c:162
+#: src/message_search.c:169

 msgid "Find in current message"
 msgstr "Ricerca nel messaggio corrente"
 
 msgid "Find in current message"
 msgstr "Ricerca nel messaggio corrente"
 

-#: src/message_search.c:180
+#: src/message_search.c:187

 msgid "Find text:"
 msgstr "Cerca testo:"
 
 msgid "Find text:"
 msgstr "Cerca testo:"
 

-#: src/message_search.c:195 src/prefs_matcher.c:649 src/summary_search.c:324
+#: src/message_search.c:210 src/prefs_matcher.c:649 src/summary_search.c:392

 msgid "Case sensitive"
 msgstr "Maiuscole/minuscole"
 
 msgid "Case sensitive"
 msgstr "Maiuscole/minuscole"
 

-#: src/message_search.c:301 src/summary_search.c:535
+#: src/message_search.c:323 src/summary_search.c:637

 msgid "Search failed"
 msgstr "Nessun risultato trovato"
 
 msgid "Search failed"
 msgstr "Nessun risultato trovato"
 

-#: src/message_search.c:302 src/summary_search.c:536
+#: src/message_search.c:324 src/summary_search.c:638

 msgid "Search string not found."
 msgstr "Stringa cercata non trovata."
 
 msgid "Search string not found."
 msgstr "Stringa cercata non trovata."
 

-#: src/message_search.c:311
+#: src/message_search.c:333

 msgid "Beginning of message reached; continue from end?"
 msgstr "Raggiunto l'inizio del messaggio: continuare dalla fine?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "Raggiunto l'inizio del messaggio: continuare dalla fine?"
 

-#: src/message_search.c:314
+#: src/message_search.c:336

 msgid "End of message reached; continue from beginning?"
 msgstr "Raggiunto la fine del messaggio: continuare dall'inizio?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Raggiunto la fine del messaggio: continuare dall'inizio?"
 

-#: src/message_search.c:317 src/summary_search.c:547
+#: src/message_search.c:339 src/summary_search.c:649

 msgid "Search finished"
 msgstr "Ricerca terminata"
 
 msgid "Search finished"
 msgstr "Ricerca terminata"
 


@@ -5995,11 +6321,11 @@ msgstr "/St_rumenti/Crea re_gola elaborazione/dal _destinatario"
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/St_rumenti/Crea re_gola elaborazione/dall'_oggetto"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/St_rumenti/Crea re_gola elaborazione/dall'_oggetto"
 

-#: src/messageview.c:564
+#: src/messageview.c:566

 msgid "<No Return-Path found>"
 msgstr "<Nessun Return-Path trovato>"
 
 msgid "<No Return-Path found>"
 msgstr "<Nessun Return-Path trovato>"
 

-#: src/messageview.c:572
+#: src/messageview.c:574

 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"


@@ -6014,11 +6340,11 @@ msgstr ""
 "Percorso di ritorno (Return Path): %s\n"
 "Si raccomanda di non spedire la ricevuta di ritorno."
 
 "Percorso di ritorno (Return Path): %s\n"
 "Si raccomanda di non spedire la ricevuta di ritorno."
 

-#: src/messageview.c:579 src/messageview.c:596
+#: src/messageview.c:581 src/messageview.c:598

 msgid "_Don't Send"
 msgstr "_Non Spedire"
 
 msgid "_Don't Send"
 msgstr "_Non Spedire"
 

-#: src/messageview.c:592
+#: src/messageview.c:594

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -6030,39 +6356,39 @@ msgstr ""
 "indirizzato ufficialmente a te.\n"
 "Si consiglia di non inviare la ricevuta di ritorno."
 
 "indirizzato ufficialmente a te.\n"
 "Si consiglia di non inviare la ricevuta di ritorno."
 

-#: src/messageview.c:809 src/procmime.c:873
+#: src/messageview.c:815 src/procmime.c:873

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Impossibile decifrare: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Impossibile decifrare: %s"
 

-#: src/messageview.c:1138 src/mimeview.c:1560 src/summaryview.c:4065
-#: src/summaryview.c:4068 src/textview.c:2638
+#: src/messageview.c:1144 src/mimeview.c:1582 src/summaryview.c:4065
+#: src/summaryview.c:4068 src/textview.c:2642

 msgid "Save as"
 msgstr "Salva come"
 
 msgid "Save as"
 msgstr "Salva come"
 

-#: src/messageview.c:1144
+#: src/messageview.c:1150

 msgid "Overwrite existing file?"
 msgstr "Sovrascrivere il file esistente?"
 
 msgid "Overwrite existing file?"
 msgstr "Sovrascrivere il file esistente?"
 

-#: src/messageview.c:1152 src/summaryview.c:4085 src/summaryview.c:4088
+#: src/messageview.c:1158 src/summaryview.c:4085 src/summaryview.c:4088

 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossibile salvare il file '%s'."
 
 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "Impossibile salvare il file '%s'."
 

-#: src/messageview.c:1233
+#: src/messageview.c:1239

 msgid "You asked for a return receipt in this message."
 msgstr "Per questo messaggio è stata richiesta una ricevuta di ritorno."
 
 msgid "You asked for a return receipt in this message."
 msgstr "Per questo messaggio è stata richiesta una ricevuta di ritorno."
 

-#: src/messageview.c:1237
+#: src/messageview.c:1243

 msgid "This message asks for a return receipt."
 msgstr "Questo messaggio richiede una ricevuta di ritorno"
 
 msgid "This message asks for a return receipt."
 msgstr "Questo messaggio richiede una ricevuta di ritorno"
 

-#: src/messageview.c:1238
+#: src/messageview.c:1244

 msgid "Send receipt"
 msgstr "Spedisci la ricevuta"
 
 msgid "Send receipt"
 msgstr "Spedisci la ricevuta"
 

-#: src/messageview.c:1281
+#: src/messageview.c:1287

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -6070,7 +6396,7 @@ msgstr ""
 "Questo messaggio è stato parzialmente ricevuto,\n"
 "ed è stato cancellato dal server."
 
 "Questo messaggio è stato parzialmente ricevuto,\n"
 "ed è stato cancellato dal server."
 

-#: src/messageview.c:1287
+#: src/messageview.c:1293

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6079,15 +6405,15 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s."
 
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s."
 

-#: src/messageview.c:1291 src/messageview.c:1313
+#: src/messageview.c:1297 src/messageview.c:1319

 msgid "Mark for download"
 msgstr "Contrassegna per il download"
 
 msgid "Mark for download"
 msgstr "Contrassegna per il download"
 

-#: src/messageview.c:1292 src/messageview.c:1304
+#: src/messageview.c:1298 src/messageview.c:1310

 msgid "Mark for deletion"
 msgstr "Contrassegna per l'eliminazione"
 
 msgid "Mark for deletion"
 msgstr "Contrassegna per l'eliminazione"
 

-#: src/messageview.c:1297
+#: src/messageview.c:1303

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6096,12 +6422,12 @@ msgstr ""
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s e verrà scaricato."
 
 "Questo messaggio è stato ricevuto parzialmente;\n"
 "è %s e verrà scaricato."
 

-#: src/messageview.c:1302 src/messageview.c:1315
+#: src/messageview.c:1308 src/messageview.c:1321

 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Togli contrassegno"
 
 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Togli contrassegno"
 

-#: src/messageview.c:1308
+#: src/messageview.c:1314

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6110,11 +6436,11 @@ msgstr ""
 "Questo messaggio è stato parzialmente ricevuto;\n"
 "è %s e verrà cancellato."
 
 "Questo messaggio è stato parzialmente ricevuto;\n"
 "è %s e verrà cancellato."
 

-#: src/messageview.c:1384
+#: src/messageview.c:1390

 msgid "Return Receipt Notification"
 msgstr "Notifica ricevuta di ritorno"
 
 msgid "Return Receipt Notification"
 msgstr "Notifica ricevuta di ritorno"
 

-#: src/messageview.c:1385
+#: src/messageview.c:1391

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -6124,19 +6450,19 @@ msgstr ""
 "Selezionare quale degli account utilizzare per spedire la ricevuta di "
 "ritorno:"
 
 "Selezionare quale degli account utilizzare per spedire la ricevuta di "
 "ritorno:"
 

-#: src/messageview.c:1389
+#: src/messageview.c:1395

 msgid "_Send Notification"
 msgstr "_Spedisci notifica"
 
 msgid "_Send Notification"
 msgstr "_Spedisci notifica"
 

-#: src/messageview.c:1389
+#: src/messageview.c:1395

 msgid "+_Cancel"
 msgstr "+_Annulla"
 
 msgid "+_Cancel"
 msgstr "+_Annulla"
 

-#: src/messageview.c:1456
+#: src/messageview.c:1462

 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossibile stampare: il messaggio non contiene testo."
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Impossibile stampare: il messaggio non contiene testo."
 

-#: src/messageview.c:1503 src/summaryview.c:4125
+#: src/messageview.c:1526 src/summaryview.c:4125

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6145,7 +6471,7 @@ msgstr ""
 "Inserire la riga di comando per la stampa:\n"
 "('%s' verrà sostituito col nome del file)"
 
 "Inserire la riga di comando per la stampa:\n"
 "('%s' verrà sostituito col nome del file)"
 

-#: src/messageview.c:1509 src/summaryview.c:4131
+#: src/messageview.c:1532 src/summaryview.c:4131

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6154,8 +6480,8 @@ msgstr ""
 "Riga di comando per la stampa non valida:\n"
 "'%s'"
 
 "Riga di comando per la stampa non valida:\n"
 "'%s'"
 

-#: src/messageview.c:1775 src/messageview.c:1781 src/summaryview.c:3521
-#: src/summaryview.c:5527
+#: src/messageview.c:1807 src/messageview.c:1813 src/summaryview.c:3521
+#: src/summaryview.c:5542

 msgid "An error happened while learning.\n"
 msgstr "Si è verificato un errore durante l'apprendimento.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "Si è verificato un errore durante l'apprendimento.\n"
 


@@ -6172,11 +6498,11 @@ msgstr "Spostamento dei messaggi in corso"
 msgid "Deleting messages..."
 msgstr "Cancellazione messaggi in corso"
 
 msgid "Deleting messages..."
 msgstr "Cancellazione messaggi in corso"
 

-#: src/mh_gtk.c:59
+#: src/mh_gtk.c:62

 msgid "/Remove _mailbox..."
 msgstr "/Rimuovi la _mailbox..."
 
 msgid "/Remove _mailbox..."
 msgstr "/Rimuovi la _mailbox..."
 

-#: src/mh_gtk.c:323
+#: src/mh_gtk.c:324

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"


@@ -6185,11 +6511,11 @@ msgstr ""
 "Procedere con l'eliminazione dela mailbox '%s'?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
 "Procedere con l'eliminazione dela mailbox '%s'?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 

-#: src/mh_gtk.c:325
+#: src/mh_gtk.c:326

 msgid "Remove mailbox"
 msgstr "Rimuovi la _mailbox"
 
 msgid "Remove mailbox"
 msgstr "Rimuovi la _mailbox"
 

-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:327

 msgid "_Remove"
 msgstr "_Rimuovi"
 
 msgid "_Remove"
 msgstr "_Rimuovi"
 


@@ -6217,60 +6543,60 @@ msgstr "/Salva _tutto..."
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
 msgid "MIME Type"
 msgstr "Tipo MIME"
 

-#: src/mimeview.c:721
+#: src/mimeview.c:742

 msgid "Check signature"
 msgstr "Controlla firma"
 
 msgid "Check signature"
 msgstr "Controlla firma"
 

-#: src/mimeview.c:726 src/mimeview.c:731 src/mimeview.c:736
+#: src/mimeview.c:747 src/mimeview.c:752 src/mimeview.c:757

 msgid "View full information"
 msgstr "Visualizza tutte le informazioni"
 
 msgid "View full information"
 msgstr "Visualizza tutte le informazioni"
 

-#: src/mimeview.c:741 src/mimeview.c:745
+#: src/mimeview.c:762 src/mimeview.c:766

 msgid "Check again"
 msgstr "Controlla nuovamente"
 
 msgid "Check again"
 msgstr "Controlla nuovamente"
 

-#: src/mimeview.c:754
+#: src/mimeview.c:775

 msgid "Click the icon or hit 'C' to check it."
 msgstr "Cliccare l'icona o premere 'C' per controllare"
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Cliccare l'icona o premere 'C' per controllare"
 

-#: src/mimeview.c:759
+#: src/mimeview.c:780

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Tempo scaduto durante il controllo della firma. Cliccare sull'icona o "
 "premere 'C' per riprovare."
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Tempo scaduto durante il controllo della firma. Cliccare sull'icona o "
 "premere 'C' per riprovare."
 

-#: src/mimeview.c:969
+#: src/mimeview.c:990

 msgid "Checking signature..."
 msgstr "Controllo della firma..."
 
 msgid "Checking signature..."
 msgstr "Controllo della firma..."
 

-#: src/mimeview.c:1011
+#: src/mimeview.c:1032

 msgid "Go back to email"
 msgstr "Torna alla mail"
 
 msgid "Go back to email"
 msgstr "Torna alla mail"
 

-#: src/mimeview.c:1349 src/mimeview.c:1430 src/mimeview.c:1606
-#: src/mimeview.c:1639
+#: src/mimeview.c:1370 src/mimeview.c:1451 src/mimeview.c:1628
+#: src/mimeview.c:1661

 msgid "Couldn't save the part of multipart message."
 msgstr "Impossibile salvare parte del messaggio composto."
 
 msgid "Couldn't save the part of multipart message."
 msgstr "Impossibile salvare parte del messaggio composto."
 

-#: src/mimeview.c:1419 src/textview.c:2648
+#: src/mimeview.c:1440 src/textview.c:2652

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sovrascrivere il file esistente '%s'?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sovrascrivere il file esistente '%s'?"
 

-#: src/mimeview.c:1457
+#: src/mimeview.c:1478

 msgid "Select destination folder"
 msgstr "Selezionare la cartella "
 
 msgid "Select destination folder"
 msgstr "Selezionare la cartella "
 

-#: src/mimeview.c:1464
+#: src/mimeview.c:1485

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' non è una directory"
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' non è una directory"
 

-#: src/mimeview.c:1685 src/mimeview.c:1693 src/textview.c:2579
+#: src/mimeview.c:1707 src/mimeview.c:1715 src/textview.c:2583

 msgid "Open with"
 msgstr "Apri con"
 
 msgid "Open with"
 msgstr "Apri con"
 

-#: src/mimeview.c:1686 src/mimeview.c:1694 src/textview.c:2580
+#: src/mimeview.c:1708 src/mimeview.c:1716 src/textview.c:2584

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6285,8 +6611,9 @@ msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "creazione della connessione NNTP a %s:%d ...\n"
 
 #: src/news.c:328
 msgstr "creazione della connessione NNTP a %s:%d ...\n"
 
 #: src/news.c:328

-msgid "Sylpheed-Claws needs network access in order to access the News server."
-msgstr "È necessaria una connessione di rete per accedere al server news."
+msgid "Claws Mail needs network access in order to access the News server."
+msgstr ""
+"Claws Mail richiede una connessione di rete per accedere al server news."

 
 #: src/news.c:345
 #, c-format
 
 #: src/news.c:345
 #, c-format


@@ -6367,46 +6694,33 @@ msgstr "/_Sottoscrivi il newsgroup..."
 msgid "/_Unsubscribe newsgroup"
 msgstr "/_Cancella la sottoscrizione al newsgroup"
 
 msgid "/_Unsubscribe newsgroup"
 msgstr "/_Cancella la sottoscrizione al newsgroup"
 

-#: src/news_gtk.c:223
+#: src/news_gtk.c:226

 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "Cancellare la sottoscrizione al newsgroup '%s'?"
 
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "Cancellare la sottoscrizione al newsgroup '%s'?"
 

-#: src/news_gtk.c:224
+#: src/news_gtk.c:227

 msgid "Unsubscribe newsgroup"
 msgstr "Elimina la sottoscrizione al newsgroup"
 
 msgid "Unsubscribe newsgroup"
 msgstr "Elimina la sottoscrizione al newsgroup"
 

-#: src/news_gtk.c:225
+#: src/news_gtk.c:228

 msgid "_Unsubscribe"
 msgstr "_Cancella la sottoscrizione al newsgroup"
 
 msgid "_Unsubscribe"
 msgstr "_Cancella la sottoscrizione al newsgroup"
 

-#: src/plugins/clamav/clamav_plugin.c:118
+#: src/plugins/clamav/clamav_plugin.c:43
+#: src/plugins/clamav/clamav_plugin_gtk.c:212
+msgid "Clam AntiVirus"
+msgstr "Clam AntiVirus"
+
+#: src/plugins/clamav/clamav_plugin.c:120

 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: controllo del messaggio in corso."
 
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: controllo del messaggio in corso."
 

-#: src/plugins/clamav/clamav_plugin.c:198
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the ClamAV plugin "
-"was built with"
-msgstr ""
-"Questa versione di Sylpheed-Claws è più nuova della versione con cui il "
-"plugin ClamAV è stato compilato"
-
-#: src/plugins/clamav/clamav_plugin.c:203
-msgid "Your version of Sylpheed-Claws is too old for the ClamAV plugin"
-msgstr ""
-"Questa versione di Sylpheed-Claws è troppo vecchia per il plugin ClamAV"
-
-#: src/plugins/clamav/clamav_plugin.c:209
+#: src/plugins/clamav/clamav_plugin.c:205

 msgid "Failed to register mail filtering hook"
 msgstr "La registrazione dei filtri della posta non è andata a buon fine"
 
 msgid "Failed to register mail filtering hook"
 msgstr "La registrazione dei filtri della posta non è andata a buon fine"
 

-#: src/plugins/clamav/clamav_plugin.c:252
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr "Clam AntiVirus"
-
-#: src/plugins/clamav/clamav_plugin.c:257
+#: src/plugins/clamav/clamav_plugin.c:253

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -6424,7 +6738,7 @@ msgstr ""
 "\n"
 "Le opzioni si trovano in /Configurazione/Preferenze/Plugins/Clam AntiVirus"
 
 "\n"
 "Le opzioni si trovano in /Configurazione/Preferenze/Plugins/Clam AntiVirus"
 

-#: src/plugins/clamav/clamav_plugin.c:284
+#: src/plugins/clamav/clamav_plugin.c:280

 msgid "Virus detection"
 msgstr "Rilevamento virus"
 
 msgid "Virus detection"
 msgstr "Rilevamento virus"
 


@@ -6469,34 +6783,22 @@ msgstr ""
 "Premere questo pulsante per selezionare una cartella atta a contenere "
 "messaggi infetti"
 
 "Premere questo pulsante per selezionare una cartella atta a contenere "
 "messaggi infetti"
 

-#: src/plugins/demo/demo.c:45
-msgid ""
-"Your sylpheed-claws version is newer than the version the plugin was built "
-"with"
-msgstr ""
-"Questa versione di Sylpheed-Claws è più nuova della versione con cui il "
-"plugin è stato compilato"
-
-#: src/plugins/demo/demo.c:50
-msgid "Your sylpheed-claws version is too old"
-msgstr "Questa versione di Sylpheed-Claws è troppo vecchia"
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+msgid "Demo"
+msgstr "Demo"

 
 

-#: src/plugins/demo/demo.c:56
+#: src/plugins/demo/demo.c:52

 msgid "Failed to register log text hook"
 msgstr "Impossibile registrare la funzione di log"
 
 msgid "Failed to register log text hook"
 msgstr "Impossibile registrare la funzione di log"
 

-#: src/plugins/demo/demo.c:74 src/plugins/demo/demo.c:103
-msgid "Demo"
-msgstr "Demo"
-
-#: src/plugins/demo/demo.c:79
+#: src/plugins/demo/demo.c:75

 msgid ""
 msgid ""

-"This Plugin is only a demo of how to write plugins for Sylpheed-Claws. It "
+"This Plugin is only a demo of how to write plugins for Claws Mail. It "

 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"

-"It is not really useful"
+"It is not really useful."

 msgstr ""
 msgstr ""

-"Questo Plugin è solo una demo di come scrivere plugin per Sylpheed-Claws. "
+"Questo Plugin è solo una demo di come scrivere plugin per Claws Mail. "

 "Installa un collegamento per un nuovo log e lo scrive allo standard output.\n"
 "\n"
 "Non è realmente utile"
 "Installa un collegamento per un nuovo log e lo scrive allo standard output.\n"
 "\n"
 "Non è realmente utile"


@@ -6525,23 +6827,11 @@ msgstr "Modalit
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Equivalente all'opzione di Dillo '--fullwindow'"
 
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Equivalente all'opzione di Dillo '--fullwindow'"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:169
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Dillo plugin "
-"was built with"
-msgstr ""
-"QUesta versione di Sylpheed-Claws è più nuova della versione con cui il "
-"plugin Dillo è stato compilato"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:174
-msgid "Your version of Sylpheed-Claws is too old for the Dillo plugin"
-msgstr "Questa versione di Sylpheed-Claws è troppo vecchia per il plugin Dillo"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:194
+#: src/plugins/dillo_viewer/dillo_viewer.c:39

 msgid "Dillo HTML Viewer"
 msgstr "Visualizzatore HTML Dillo"
 
 msgid "Dillo HTML Viewer"
 msgstr "Visualizzatore HTML Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:199
+#: src/plugins/dillo_viewer/dillo_viewer.c:195

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -6550,7 +6840,7 @@ msgstr ""
 "Questo plugin visualizza i messaggi HTML utilizzando il browser web Dillo.\n"
 "Le opzioni sono presenti in /Configurazione/Preferenze/Plugins/Browser Dillo"
 
 "Questo plugin visualizza i messaggi HTML utilizzando il browser web Dillo.\n"
 "Le opzioni sono presenti in /Configurazione/Preferenze/Plugins/Browser Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:223
+#: src/plugins/dillo_viewer/dillo_viewer.c:219

 msgid "text/html"
 msgstr "testo/html"
 
 msgid "text/html"
 msgstr "testo/html"
 


@@ -6587,8 +6877,8 @@ msgid ""
 "\n"
 "%.*s\n"
 msgstr ""
 "\n"
 "%.*s\n"
 msgstr ""

-"<span weight=\"bold\" size=\"larger\">Inserire nuovamente la passphrase per la"
-"nuova chiave:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Inserire nuovamente la passphrase per "
+"lanuova chiave:</span>\n"

 "\n"
 "%.*s\n"
 
 "\n"
 "%.*s\n"
 


@@ -6625,7 +6915,7 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 "Impostare questo valore a '0' memorizzerà la passphrase per l'intera sessione"
 
 msgstr ""
 "Impostare questo valore a '0' memorizzerà la passphrase per l'intera sessione"
 

-#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:165

 msgid "minute(s)"
 msgstr "minuto/i"
 
 msgid "minute(s)"
 msgstr "minuto/i"
 


@@ -6728,142 +7018,147 @@ msgstr ""
 msgid "Trust key"
 msgstr "Dai fiducia alla chiave"
 
 msgid "Trust key"
 msgstr "Dai fiducia alla chiave"
 

-#: src/plugins/pgpcore/sgpgme.c:134
+#: src/plugins/pgpcore/sgpgme.c:76 src/privacy.c:211 src/privacy.c:215
+#: src/privacy.c:232 src/privacy.c:236
+msgid "No signature found"
+msgstr "Firma non trovata"
+
+#: src/plugins/pgpcore/sgpgme.c:138

 msgid "Undefined"
 msgstr "Non definito"
 
 msgid "Undefined"
 msgstr "Non definito"
 

-#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:193

 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Mai"
 
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Mai"
 

-#: src/plugins/pgpcore/sgpgme.c:138
+#: src/plugins/pgpcore/sgpgme.c:142

 msgid "Marginal"
 msgstr "Marginale"
 
 msgid "Marginal"
 msgstr "Marginale"
 

-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/sgpgme.c:146

 msgid "Ultimate"
 msgstr "Totale"
 
 msgid "Ultimate"
 msgstr "Totale"
 

-#: src/plugins/pgpcore/sgpgme.c:176
+#: src/plugins/pgpcore/sgpgme.c:180

 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La firma non può essere controllata - %s"
 
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "La firma non può essere controllata - %s"
 

-#: src/plugins/pgpcore/sgpgme.c:180 src/plugins/pgpcore/sgpgme.c:184
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:188
+#: src/plugins/pgpcore/sgpgme.c:235

 msgid "The signature has not been checked."
 msgstr "La firma non è stata controllata"
 
 msgid "The signature has not been checked."
 msgstr "La firma non è stata controllata"
 

-#: src/plugins/pgpcore/sgpgme.c:190 src/plugins/pgpcore/sgpgme.c:192
+#: src/plugins/pgpcore/sgpgme.c:194 src/plugins/pgpcore/sgpgme.c:196

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "PGP Core: Impossibile trovare la chiave - nessun agente gpg in esecuzione."
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 "PGP Core: Impossibile trovare la chiave - nessun agente gpg in esecuzione."
 

-#: src/plugins/pgpcore/sgpgme.c:205
+#: src/plugins/pgpcore/sgpgme.c:209

 #, c-format
 msgid "Good signature from %s."
 msgstr "Firma corretta, da %s."
 
 #, c-format
 msgid "Good signature from %s."
 msgstr "Firma corretta, da %s."
 

-#: src/plugins/pgpcore/sgpgme.c:211
+#: src/plugins/pgpcore/sgpgme.c:215

 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Firma corretta (untrusted), da %s."
 
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Firma corretta (untrusted), da %s."
 

-#: src/plugins/pgpcore/sgpgme.c:216
+#: src/plugins/pgpcore/sgpgme.c:220

 #, c-format
 msgid "Expired signature from %s."
 msgstr "Firma scaduta, da %s."
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Firma scaduta, da %s."
 

-#: src/plugins/pgpcore/sgpgme.c:219
+#: src/plugins/pgpcore/sgpgme.c:223

 #, c-format
 msgid "Expired key from %s."
 msgstr "Firma scaduta, da %s"
 
 #, c-format
 msgid "Expired key from %s."
 msgstr "Firma scaduta, da %s"
 

-#: src/plugins/pgpcore/sgpgme.c:222
+#: src/plugins/pgpcore/sgpgme.c:226

 #, c-format
 msgid "Bad signature from %s."
 msgstr "Firma errata, da %s."
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr "Firma errata, da %s."
 

-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:230

 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Chiave 0x%s non disponibile per verificare questa firma."
 
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Chiave 0x%s non disponibile per verificare questa firma."
 

-#: src/plugins/pgpcore/sgpgme.c:268
+#: src/plugins/pgpcore/sgpgme.c:272

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Firma realizzata utilizzando %s ID chiave %s\n"
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Firma realizzata utilizzando %s ID chiave %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:279

 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Firma valida, da: \"%s\" (Fiducia: %s)\n"
 
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Firma valida, da: \"%s\" (Fiducia: %s)\n"
 

-#: src/plugins/pgpcore/sgpgme.c:280
+#: src/plugins/pgpcore/sgpgme.c:284

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Firma scaduta, da \"%s\"\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Firma scaduta, da \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:285
+#: src/plugins/pgpcore/sgpgme.c:289

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma ERRATA, da \"%s\"\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma ERRATA, da \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:300

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                o \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                o \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:306

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Impronta primaria della chiave: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Impronta primaria della chiave: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:311

 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "ATTENZIONE: L'indirizzo del firmatario \"%s\" non corrisponde all'elemento "
 "DNS\n"
 
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr ""
 "ATTENZIONE: L'indirizzo del firmatario \"%s\" non corrisponde all'elemento "
 "DNS\n"
 

-#: src/plugins/pgpcore/sgpgme.c:313
+#: src/plugins/pgpcore/sgpgme.c:317

 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "L'indirizzo verificato del firmatario è \"%s\"\n"
 
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "L'indirizzo verificato del firmatario è \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:355
+#: src/plugins/pgpcore/sgpgme.c:359

 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Impossibile prelevare dati dal messaggio, %s"
 
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Impossibile prelevare dati dal messaggio, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:375

 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Impossibile inizializzare i dati, %s"
 
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Impossibile inizializzare i dati, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:487
+#: src/plugins/pgpcore/sgpgme.c:492

 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Chiave segreta non trovata (%s)"
 
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Chiave segreta non trovata (%s)"
 

-#: src/plugins/pgpcore/sgpgme.c:495
+#: src/plugins/pgpcore/sgpgme.c:500

 msgid "Secret key specification is ambiguous"
 msgstr "La specifica della chiave segreta è ambigua"
 
 msgid "Secret key specification is ambiguous"
 msgstr "La specifica della chiave segreta è ambigua"
 

-#: src/plugins/pgpcore/sgpgme.c:505
+#: src/plugins/pgpcore/sgpgme.c:510

 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Errore durante l'impostazione della chiave segreta: %s"
 
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Errore durante l'impostazione della chiave segreta: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:541
+#: src/plugins/pgpcore/sgpgme.c:546

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Il protocollo '%s' gpgme è inutilizzabile: il motore '%s' non è "
 "correttamente installato."
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Il protocollo '%s' gpgme è inutilizzabile: il motore '%s' non è "
 "correttamente installato."
 

-#: src/plugins/pgpcore/sgpgme.c:547
+#: src/plugins/pgpcore/sgpgme.c:552

 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "


@@ -6872,12 +7167,12 @@ msgstr ""
 "Il protocollo '%s' gpgme è inutilizzabile: il motore '%s' è installato "
 "nellaversione %s, ma è richiesta la versione %s.\n"
 
 "Il protocollo '%s' gpgme è inutilizzabile: il motore '%s' è installato "
 "nellaversione %s, ma è richiesta la versione %s.\n"
 

-#: src/plugins/pgpcore/sgpgme.c:555
+#: src/plugins/pgpcore/sgpgme.c:560

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Il protocollo '%s' gpgme è inutilizzabile (problema sconosciuto)"
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Il protocollo '%s' gpgme è inutilizzabile (problema sconosciuto)"
 

-#: src/plugins/pgpcore/sgpgme.c:571
+#: src/plugins/pgpcore/sgpgme.c:576

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -6885,7 +7180,7 @@ msgstr ""
 "GnuPG non è installato correttamente, o necessita di un upgrade.\n"
 "Il supporto per OpenPGP è disabilitato."
 
 "GnuPG non è installato correttamente, o necessita di un upgrade.\n"
 "Il supporto per OpenPGP è disabilitato."
 

-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:610

 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"


@@ -6893,26 +7188,26 @@ msgstr ""
 "È necessario salvare le informazioni dell'account con \"OK\" prima di poter "
 "generare un nuovo paio di chiavi.\n"
 
 "È necessario salvare le informazioni dell'account con \"OK\" prima di poter "
 "generare un nuovo paio di chiavi.\n"
 

-#: src/plugins/pgpcore/sgpgme.c:610
+#: src/plugins/pgpcore/sgpgme.c:615

 msgid "No PGP key found"
 msgstr "Nessuna chiave PGP trovata"
 
 msgid "No PGP key found"
 msgstr "Nessuna chiave PGP trovata"
 

-#: src/plugins/pgpcore/sgpgme.c:611
+#: src/plugins/pgpcore/sgpgme.c:616

 msgid ""
 msgid ""

-"Sylpheed-Claws did not find a secret PGP key, which means that you won't be "
-"able to sign emails or receive encrypted emails.\n"
+"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 ""
 "Do you want to create a new key pair now?"
 msgstr ""

-"Sylpheed-Claws non ha trovato una chiave segreta PGP: ciò vuol dire che non "
-"sarà possibile firmare i messaggi o ricevere messaggi crittati.\n"
+"Claws Mail non ha trovato una chiave segreta PGP: ciò vuol dire che non sarà "
+"possibile firmare i messaggi o ricevere messaggi crittati.\n"

 "Creare ora un nuovo paio di chiavi?"
 
 "Creare ora un nuovo paio di chiavi?"
 

-#: src/plugins/pgpcore/sgpgme.c:681 src/plugins/pgpcore/sgpgme.c:697
+#: src/plugins/pgpcore/sgpgme.c:686 src/plugins/pgpcore/sgpgme.c:702

 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Impossibile generare un nuovo paio di chiavi: %s"
 
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Impossibile generare un nuovo paio di chiavi: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:688
+#: src/plugins/pgpcore/sgpgme.c:693

 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."


@@ -6920,11 +7215,11 @@ msgstr ""
 "Generazione del nuovo paio di chiavi in corso. Muovere il mouse per aiutare "
 "nella generazione di entropia..."
 
 "Generazione del nuovo paio di chiavi in corso. Muovere il mouse per aiutare "
 "nella generazione di entropia..."
 

-#: src/plugins/pgpcore/sgpgme.c:703
+#: src/plugins/pgpcore/sgpgme.c:708

 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Impossibile generare il nuovo paio di chiavi: errore sconosciuto"
 
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Impossibile generare il nuovo paio di chiavi: errore sconosciuto"
 

-#: src/plugins/pgpcore/sgpgme.c:707
+#: src/plugins/pgpcore/sgpgme.c:712

 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"


@@ -6937,39 +7232,27 @@ msgstr ""
 "\n"
 "Esportarlo verso un keyserver?"
 
 "\n"
 "Esportarlo verso un keyserver?"
 

-#: src/plugins/pgpcore/sgpgme.c:711
+#: src/plugins/pgpcore/sgpgme.c:716

 msgid "Key generated"
 msgstr "Chiave generata"
 
 msgid "Key generated"
 msgstr "Chiave generata"
 

-#: src/plugins/pgpcore/sgpgme.c:750
+#: src/plugins/pgpcore/sgpgme.c:755

 msgid "Key exported."
 msgstr "Key exported."
 
 msgid "Key exported."
 msgstr "Key exported."
 

-#: src/plugins/pgpcore/sgpgme.c:752
+#: src/plugins/pgpcore/sgpgme.c:757

 msgid "Couldn't export key."
 msgstr "Impossible esportare la chiave."
 
 msgid "Couldn't export key."
 msgstr "Impossible esportare la chiave."
 

-#: src/plugins/pgpcore/sgpgme.c:756
+#: src/plugins/pgpcore/sgpgme.c:761

 msgid "Key export isn't implemented in Windows."
 msgstr "L'esportazione delle chiavi non è implementata in Windows."
 
 msgid "Key export isn't implemented in Windows."
 msgstr "L'esportazione delle chiavi non è implementata in Windows."
 

-#: src/plugins/pgpcore/plugin.c:38
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin "
-"was built with"
-msgstr ""
-"Questa versione di Sylpheed-Claws è più nuova della versione per cui il plugin "
-"PGP/Core è stato compilato"
-
-#: src/plugins/pgpcore/plugin.c:43
-msgid "Your version of Sylpheed-Claws is too old for the PGP/Core plugin"
-msgstr "Questa versione di Sylpheed-Claws è troppo vecchia per il plugin PGP/Core"
-
-#: src/plugins/pgpcore/plugin.c:63
+#: src/plugins/pgpcore/plugin.c:35

 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 

-#: src/plugins/pgpcore/plugin.c:68
+#: src/plugins/pgpcore/plugin.c:64

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -6991,7 +7274,7 @@ msgstr ""
 "\n"
 "GPGME è copyright 2001 di Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME è copyright 2001 di Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpcore/plugin.c:97
+#: src/plugins/pgpcore/plugin.c:93

 msgid "Core operations"
 msgstr "Operazioni fondamentali"
 
 msgid "Core operations"
 msgstr "Operazioni fondamentali"
 


@@ -7001,8 +7284,8 @@ msgstr "Importazione chiavi"
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgid ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgid ""

-"This key is not in your keyring. Do you want Sylpheed-Claws to try and "
-"import it from a keyserver?"
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"

 msgstr ""
 "Questa chiave non è nel keyring. Provare ad importarla da un keyserver?"
 
 msgstr ""
 "Questa chiave non è nel keyring. Provare ad importarla da un keyserver?"
 


@@ -7074,89 +7357,86 @@ msgstr "   L'importazione delle chiavi non 
 msgid "   This key is in your keyring.\n"
 msgstr "   Questa chiave è nel keyring.\n"
 
 msgid "   This key is in your keyring.\n"
 msgstr "   Questa chiave è nel keyring.\n"
 

-#: src/plugins/pgpinline/pgpinline.c:237 src/plugins/pgpinline/pgpinline.c:385
+#: src/plugins/pgpinline/pgpinline.c:241 src/plugins/pgpinline/pgpinline.c:393

 msgid "Couldn't get text data."
 msgstr "Impossibile accedere aì dati testuali"
 
 msgid "Couldn't get text data."
 msgstr "Impossibile accedere aì dati testuali"
 

-#: src/plugins/pgpinline/pgpinline.c:255
+#: src/plugins/pgpinline/pgpinline.c:259

 msgid "Couldn't convert text data to any sane charset."
 msgstr "Impossibile convertire i dati di tipo testo in alcun charset sano."
 
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Impossibile convertire i dati di tipo testo in alcun charset sano."
 

-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:267 src/plugins/pgpinline/pgpinline.c:523
+#: src/plugins/pgpinline/pgpinline.c:644 src/plugins/pgpinline/pgpinline.c:691
+#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
+#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
+#: src/plugins/pgpmime/pgpmime.c:593
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "Impossibile inizializzare il contesto GPG, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:386

 msgid "Couldn't parse mime part."
 msgstr "Impossibile effettuare il parsing della parte MIME."
 
 msgid "Couldn't parse mime part."
 msgstr "Impossibile effettuare il parsing della parte MIME."
 

-#: src/plugins/pgpinline/pgpinline.c:408 src/plugins/pgpmime/pgpmime.c:333
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:343

 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Impossibile aprire il file decifrato %s"
 
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Impossibile aprire il file decifrato %s"
 

-#: src/plugins/pgpinline/pgpinline.c:438
+#: src/plugins/pgpinline/pgpinline.c:446

 msgid "Couldn't scan decrypted file."
 msgstr "Impossibile analizzare il file decifrato."
 
 msgid "Couldn't scan decrypted file."
 msgstr "Impossibile analizzare il file decifrato."
 

-#: src/plugins/pgpinline/pgpinline.c:446
+#: src/plugins/pgpinline/pgpinline.c:454

 msgid "Couldn't scan decrypted file parts."
 msgstr "Impossibile analizzare le parti del file decifrato."
 
 msgid "Couldn't scan decrypted file parts."
 msgstr "Impossibile analizzare le parti del file decifrato."
 

-#: src/plugins/pgpinline/pgpinline.c:500
+#: src/plugins/pgpinline/pgpinline.c:508

 msgid "Couldn't create temporary file."
 msgstr "Impossibile creare il file temporaneo."
 
 msgid "Couldn't create temporary file."
 msgstr "Impossibile creare il file temporaneo."
 

-#: src/plugins/pgpinline/pgpinline.c:534 src/plugins/pgpmime/pgpmime.c:480
+#: src/plugins/pgpinline/pgpinline.c:546 src/plugins/pgpmime/pgpmime.c:494

 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Firma dei dati fallita, %s"
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Firma dei dati fallita, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:552 src/plugins/pgpmime/pgpmime.c:505
+#: src/plugins/pgpinline/pgpinline.c:564 src/plugins/pgpmime/pgpmime.c:519

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Firma dei dati fallita a causa di un firmatario non valido: %s"
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Firma dei dati fallita a causa di un firmatario non valido: %s"
 

-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:514
+#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:528

 msgid "Data signing failed, no results."
 msgstr "Firma dei dati fallita, nessun risultato."
 
 msgid "Data signing failed, no results."
 msgstr "Firma dei dati fallita, nessun risultato."
 

-#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:526
+#: src/plugins/pgpinline/pgpinline.c:583 src/plugins/pgpmime/pgpmime.c:539

 msgid "Data signing failed, no contents."
 msgstr "Firma dei dati fallita, nessun contenuto."
 
 msgid "Data signing failed, no contents."
 msgstr "Firma dei dati fallita, nessun contenuto."
 

-#: src/plugins/pgpinline/pgpinline.c:637 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:653 src/plugins/pgpmime/pgpmime.c:602

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Impossibile aggiungere la chiave GPG %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Impossibile aggiungere la chiave GPG %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpmime/pgpmime.c:612
+#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:630

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Impossibile creare il file temporaneo, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Impossibile creare il file temporaneo, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:683 src/plugins/pgpmime/pgpmime.c:638
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:655

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Crittazione fallita, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Crittazione fallita, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:746
+#: src/plugins/pgpinline/pgpinline.c:767

 msgid "PGP/Inline"
 msgstr "PGP/inline"
 
 msgid "PGP/Inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:36
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/inline "
-"plugin was built with"
-msgstr ""
-"Questa versione di Sylpheed-Claws è più nuova della versione per cui il plugin "
-"PGP/Inline è stato compilato"
-
-#: src/plugins/pgpinline/plugin.c:41
-msgid "Your version of Sylpheed-Claws is too old for the PGP/inline plugin"
-msgstr "Questa versione di Sylpheed-Claws è troppo vecchia per il plugin PGP/inline"
-
-#: src/plugins/pgpinline/plugin.c:57
+#: src/plugins/pgpinline/plugin.c:33

 msgid "PGP/inline"
 msgstr "PGP/inline"
 
 msgid "PGP/inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:62
+#: src/plugins/pgpinline/plugin.c:58

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -7182,23 +7462,11 @@ msgstr ""
 "\n"
 "GPGME è copyright 2001 di Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME è copyright 2001 di Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/plugin.c:35
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin "
-"was built with"
-msgstr ""
-"Questa versione di Sylpheed-Claws è più nuova della versione per cui il plugin "
-"PGP/MIME è stato compilato"
-
-#: src/plugins/pgpmime/plugin.c:40
-msgid "Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"
-msgstr "Questa versione di Sylpheed-Claws è troppo vecchia per il plugin PGP/MIME"
-
-#: src/plugins/pgpmime/plugin.c:56
+#: src/plugins/pgpmime/plugin.c:33

 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:61
+#: src/plugins/pgpmime/plugin.c:58

 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"


@@ -7223,94 +7491,77 @@ msgstr ""
 "\n"
 "GPGME è copyright 2001 di Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME è copyright 2001 di Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/pgpmime.c:192
-msgid "Signature boundary not found."
-msgstr "Limite della firma non trovato."
-
-#: src/plugins/pgpmime/pgpmime.c:310
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "Impossibile inizializzare il contesto GPG, %s"
-
-#: src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpmime/pgpmime.c:201
+msgid "Signature boundary not found."
+msgstr "Limite della firma non trovato."
+
+#: src/plugins/pgpmime/pgpmime.c:362

 msgid "Couldn't parse decrypted file."
 msgstr "Impossibile effettuare il parsing del file decifrato."
 
 msgid "Couldn't parse decrypted file."
 msgstr "Impossibile effettuare il parsing del file decifrato."
 

-#: src/plugins/pgpmime/pgpmime.c:358
+#: src/plugins/pgpmime/pgpmime.c:368

 msgid "Couldn't parse decrypted file parts."
 msgstr "Impossibile effettuare il parsing delle parti del file decifrato."
 
 msgid "Couldn't parse decrypted file parts."
 msgstr "Impossibile effettuare il parsing delle parti del file decifrato."
 

-#: src/plugins/pgpmime/pgpmime.c:404 src/plugins/pgpmime/pgpmime.c:443
+#: src/plugins/pgpmime/pgpmime.c:414 src/plugins/pgpmime/pgpmime.c:453

 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Impossibile creare il file temporaneo: %s"
 
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Impossibile creare il file temporaneo: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:704
+#: src/plugins/pgpmime/pgpmime.c:723

 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 

-#: src/plugins/spamassassin/spamassassin.c:159
+#: src/plugins/spamassassin/spamassassin.c:75
+#: src/plugins/spamassassin/spamassassin_gtk.c:549
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: src/plugins/spamassassin/spamassassin.c:161

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Il plugin spamassassin non si è potuto connettere a spamd.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "Il plugin spamassassin non si è potuto connettere a spamd.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:175
+#: src/plugins/spamassassin/spamassassin.c:177

 msgid "SpamAssassin plugin filtering failed.\n"
 msgid "SpamAssassin plugin filtering failed.\n"

-msgstr "Filtraggio del plugin SpamAssassin fallito.\n"  
+msgstr "Filtraggio del plugin SpamAssassin fallito.\n"

 
 

-#: src/plugins/spamassassin/spamassassin.c:201
+#: src/plugins/spamassassin/spamassassin.c:203

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgid "SpamAssassin plugin is disabled by its preferences.\n"

-msgstr ""
-"Il plugin spamassassin è stato disabilitato dalle sue impostazioni\n"
+msgstr "Il plugin spamassassin è stato disabilitato dalle sue impostazioni\n"

 
 

-#: src/plugins/spamassassin/spamassassin.c:206
+#: src/plugins/spamassassin/spamassassin.c:208

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtraggio in corso."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtraggio in corso."
 

-#: src/plugins/spamassassin/spamassassin.c:275
+#: src/plugins/spamassassin/spamassassin.c:277

 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 "accessible."
 msgstr ""
 "Il plugin SpamAssassin non ha potuto filtrare un messaggio. Probabilmente la "
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 "accessible."
 msgstr ""
 "Il plugin SpamAssassin non ha potuto filtrare un messaggio. Probabilmente la "

-"causa è l'impossibilità di raggiungere il demone spamd. Assicurarsi che spamd "
-"sia in esecuzione ed accessibile."
+"causa è l'impossibilità di raggiungere il demone spamd. Assicurarsi che "
+"spamd sia in esecuzione ed accessibile."

 
 

-#: src/plugins/spamassassin/spamassassin.c:334
+#: src/plugins/spamassassin/spamassassin.c:336

 msgid ""
 msgid ""

-"Sylpheed-Claws needs network access in order to feed this mail(s) to the "
-"remote learner."
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."

 msgstr ""
 msgstr ""

-"È necessaria una connessione di rete per poter mandare il messaggio "
+"Claes Mail richiede una connessione di rete per poter mandare il messaggio "

 "all'analizzatore remoto."
 
 "all'analizzatore remoto."
 

-#: src/plugins/spamassassin/spamassassin.c:469
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the SpamAssassin "
-"plugin was built with"
-msgstr ""
-"Questa versione di Sylpheed-Claws è più nuova della versione per cui il plugin "
-"Sylpheed-Claws è stata compilata"
-
-#: src/plugins/spamassassin/spamassassin.c:474
-msgid "Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"
-msgstr "Questa versione di Sylpheed-Claws è troppo vecchia per il plugin SpamAssassin"
-
-#: src/plugins/spamassassin/spamassassin.c:483
+#: src/plugins/spamassassin/spamassassin.c:479

 msgid "Failed to get username"
 msgstr "Impossibile ottenere il nome utente"
 
 msgid "Failed to get username"
 msgstr "Impossibile ottenere il nome utente"
 

-#: src/plugins/spamassassin/spamassassin.c:495
+#: src/plugins/spamassassin/spamassassin.c:491

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""

-"Il plugin spamassassin è caricato ma è stato disabilitato dalle sue opzioni.\n"
-
-#: src/plugins/spamassassin/spamassassin.c:523
-#: src/plugins/spamassassin/spamassassin_gtk.c:549
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
+"Il plugin spamassassin è caricato ma è stato disabilitato dalle sue "
+"opzioni.\n"

 
 

-#: src/plugins/spamassassin/spamassassin.c:528
+#: src/plugins/spamassassin/spamassassin.c:524

 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "


@@ -7334,11 +7585,11 @@ msgstr ""
 "\n"
 "Le opzioni sono in /Configurazione/Preferenze/Plugins/SpamAssassin"
 
 "\n"
 "Le opzioni sono in /Configurazione/Preferenze/Plugins/SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:555

 msgid "Spam detection"
 msgstr "Rilevamento Spam"
 
 msgid "Spam detection"
 msgstr "Rilevamento Spam"
 

-#: src/plugins/spamassassin/spamassassin.c:560
+#: src/plugins/spamassassin/spamassassin.c:556

 msgid "Spam learning"
 msgstr "Addestramento spam"
 
 msgid "Spam learning"
 msgstr "Addestramento spam"
 


@@ -7411,6 +7662,7 @@ msgstr ""
 "esso verrà terminato."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
 "esso verrà terminato."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194

+#: src/prefs_summaries.c:900

 msgid "seconds"
 msgstr "secondi"
 
 msgid "seconds"
 msgstr "secondi"
 


@@ -7436,68 +7688,64 @@ msgstr ""
 "Premere questo pulsante per selezionare una cartella in cui conservare lo "
 "spam"
 
 "Premere questo pulsante per selezionare una cartella in cui conservare lo "
 "spam"
 

-#: src/plugins/trayicon/trayicon.c:101
+#: src/plugins/trayicon/trayicon.c:59 src/plugins/trayicon/trayicon.c:497
+msgid "Trayicon"
+msgstr "Icona di sistema"
+
+#: src/plugins/trayicon/trayicon.c:106

 msgid "/_Get Mail"
 msgstr "/_Ricevi"
 
 msgid "/_Get Mail"
 msgstr "/_Ricevi"
 

-#: src/plugins/trayicon/trayicon.c:103
+#: src/plugins/trayicon/trayicon.c:108

 msgid "/_Email"
 msgstr "/_Componi"
 
 msgid "/_Email"
 msgstr "/_Componi"
 

-#: src/plugins/trayicon/trayicon.c:104
+#: src/plugins/trayicon/trayicon.c:109
+msgid "/_Email from account"
+msgstr "/_Componi usando l'account"
+
+#: src/plugins/trayicon/trayicon.c:111

 msgid "/Open A_ddressbook"
 msgstr "/R_ubrica"
 
 msgid "/Open A_ddressbook"
 msgstr "/R_ubrica"
 

-#: src/plugins/trayicon/trayicon.c:106
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Work Offline"
 msgstr "/Lavora o_ffline"
 
 msgid "/_Work Offline"
 msgstr "/Lavora o_ffline"
 

-#: src/plugins/trayicon/trayicon.c:108
-msgid "/E_xit Sylpheed-Claws"
-msgstr "/_Esci da Sylpheed-Claws"
+#: src/plugins/trayicon/trayicon.c:115
+msgid "/E_xit Claws Mail"
+msgstr "/_Esci da Claws Mail"

 
 

-#: src/plugins/trayicon/trayicon.c:162
+#: src/plugins/trayicon/trayicon.c:204

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nuovi: %d, Non letti: %d, Totali: %d"
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nuovi: %d, Non letti: %d, Totali: %d"
 

-#: src/plugins/trayicon/trayicon.c:236
+#: src/plugins/trayicon/trayicon.c:278

 msgid "/Work Offline"
 msgstr "/Lavora o_ffline"
 
 msgid "/Work Offline"
 msgstr "/Lavora o_ffline"
 

-#: src/plugins/trayicon/trayicon.c:239
+#: src/plugins/trayicon/trayicon.c:281

 msgid "/Get Mail"
 msgstr "/Ricevi"
 
 msgid "/Get Mail"
 msgstr "/Ricevi"
 

-#: src/plugins/trayicon/trayicon.c:315
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Trayicon plugin "
-"was built with"
-msgstr ""
-"Questa versione di Sylpheed-Claws è più nuova della versione per cui il plugin "
-"Trayicon è stato compilato"
-
-#: src/plugins/trayicon/trayicon.c:320
-msgid "Your version of Sylpheed-Claws is too old for the Trayicon plugin"
-msgstr "Questa versione di Sylpheed-Claws è troppo vecchia per il plugin Trayicon"
-
-#: src/plugins/trayicon/trayicon.c:326
+#: src/plugins/trayicon/trayicon.c:361

 msgid "Failed to register folder item update hook"
 msgid "Failed to register folder item update hook"

-msgstr "Errore durante la registrazione della funzione di aggiornamento dell'elemento della cartella"
+msgstr ""
+"Errore durante la registrazione della funzione di aggiornamento "
+"dell'elemento della cartella"

 
 

-#: src/plugins/trayicon/trayicon.c:332
+#: src/plugins/trayicon/trayicon.c:367

 msgid "Failed to register folder update hook"
 msgid "Failed to register folder update hook"

-msgstr "Errore durante la registrazione della funzione di aggiornamento della cartella"
+msgstr ""
+"Errore durante la registrazione della funzione di aggiornamento della "
+"cartella"

 
 

-#: src/plugins/trayicon/trayicon.c:338
+#: src/plugins/trayicon/trayicon.c:373 src/plugins/trayicon/trayicon.c:379

 msgid "Failed to register offline switch hook"
 msgstr "Errore durante la registrazione della funzione \"modalità offline\""
 
 msgid "Failed to register offline switch hook"
 msgstr "Errore durante la registrazione della funzione \"modalità offline\""
 

-#: src/plugins/trayicon/trayicon.c:367 src/plugins/trayicon/trayicon.c:449
-msgid "Trayicon"
-msgstr "Icona di sistema"
-
-#: src/plugins/trayicon/trayicon.c:372
+#: src/plugins/trayicon/trayicon.c:415

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -7512,7 +7760,7 @@ msgstr ""
 "altrimenti contiene una lettera. Un tooltip mostra il numero di messaggi "
 "nuovi, non letti ed il numero totale di messaggi"
 
 "altrimenti contiene una lettera. Un tooltip mostra il numero di messaggi "
 "nuovi, non letti ed il numero totale di messaggi"
 

-#: src/plugins/trayicon/trayicon.c:426
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 
 msgid "Exit this program?"
 msgstr "Uscire da questo programma?"
 


@@ -7571,12 +7819,12 @@ msgstr "errore durante la sessione POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "comando TOP non supportato\n"
 
 msgid "TOP command unsupported\n"
 msgstr "comando TOP non supportato\n"
 

-#: src/prefs_account.c:233 src/prefs_account.c:1454 src/prefs_account.c:2137
-#: src/wizard.c:1017
+#: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145
+#: src/wizard.c:1122

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:236 src/prefs_account.c:1580 src/prefs_account.c:2154
+#: src/prefs_account.c:236 src/prefs_account.c:1587 src/prefs_account.c:2162

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 


@@ -7584,7 +7832,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:238 src/wizard.c:1027
+#: src/prefs_account.c:238 src/wizard.c:1132

 msgid "Local mbox file"
 msgstr "File mbox locale"
 
 msgid "Local mbox file"
 msgstr "File mbox locale"
 


@@ -7593,166 +7841,166 @@ msgstr "File mbox locale"
 msgid "None (SMTP only)"
 msgstr "Nessuno (solo SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Nessuno (solo SMTP)"
 

-#: src/prefs_account.c:718
+#: src/prefs_account.c:725

 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "Account%d"
 

-#: src/prefs_account.c:991
+#: src/prefs_account.c:998

 msgid "Preferences for new account"
 msgstr "Opzioni per il nuovo account"
 
 msgid "Preferences for new account"
 msgstr "Opzioni per il nuovo account"
 

-#: src/prefs_account.c:993
+#: src/prefs_account.c:1000

 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferenze dell'account"
 
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferenze dell'account"
 

-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1035

 msgid "_Basic"
 msgstr "_Generale"
 
 msgid "_Basic"
 msgstr "_Generale"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1037

 msgid "_Receive"
 msgstr "_Ricezione"
 
 msgid "_Receive"
 msgstr "_Ricezione"
 

-#: src/prefs_account.c:1034
+#: src/prefs_account.c:1041

 msgid "Co_mpose"
 msgstr "Co_mposizione"
 
 msgid "Co_mpose"
 msgstr "Co_mposizione"
 

-#: src/prefs_account.c:1036
+#: src/prefs_account.c:1043

 msgid "_Privacy"
 msgstr "_Privacy"
 
 msgid "_Privacy"
 msgstr "_Privacy"
 

-#: src/prefs_account.c:1039
+#: src/prefs_account.c:1046

 msgid "SS_L"
 msgstr "SS_L"
 
 msgid "SS_L"
 msgstr "SS_L"
 

-#: src/prefs_account.c:1042
+#: src/prefs_account.c:1049

 msgid "A_dvanced"
 msgstr "A_vanzate"
 
 msgid "A_dvanced"
 msgstr "A_vanzate"
 

-#: src/prefs_account.c:1100
+#: src/prefs_account.c:1107

 msgid "Name of account"
 msgstr "Nome dell'account"
 
 msgid "Name of account"
 msgstr "Nome dell'account"
 

-#: src/prefs_account.c:1109
+#: src/prefs_account.c:1116

 msgid "Set as default"
 msgstr "Imposta come predefinito"
 
 msgid "Set as default"
 msgstr "Imposta come predefinito"
 

-#: src/prefs_account.c:1113
+#: src/prefs_account.c:1120

 msgid "Personal information"
 msgstr "Informazioni personali"
 
 msgid "Personal information"
 msgstr "Informazioni personali"
 

-#: src/prefs_account.c:1122
+#: src/prefs_account.c:1129

 msgid "Full name"
 msgstr "Nome completo"
 
 msgid "Full name"
 msgstr "Nome completo"
 

-#: src/prefs_account.c:1128
+#: src/prefs_account.c:1135

 msgid "Mail address"
 msgstr "Indirizzo"
 
 msgid "Mail address"
 msgstr "Indirizzo"
 

-#: src/prefs_account.c:1134
+#: src/prefs_account.c:1141

 msgid "Organization"
 msgstr "Organizzazione"
 
 msgid "Organization"
 msgstr "Organizzazione"
 

-#: src/prefs_account.c:1158
+#: src/prefs_account.c:1165

 msgid "Server information"
 msgstr "Informazioni server"
 
 msgid "Server information"
 msgstr "Informazioni server"
 

-#: src/prefs_account.c:1198 src/wizard.c:1106
+#: src/prefs_account.c:1205 src/wizard.c:1216

 msgid ""
 msgid ""

-"<span weight=\"bold\">Warning: this version of Sylpheed-Claws\n"
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"

 "has been built without IMAP support.</span>"
 msgstr ""
 "has been built without IMAP support.</span>"
 msgstr ""

-"<span weight=\"bold\">Attenzione: questa versione di Sylpheed-Claws\n"
+"<span weight=\"bold\">Attenzione: questa versione di Claws Mail\n"

 "è stata compilata senza supporto IMAP.</span>"
 
 "è stata compilata senza supporto IMAP.</span>"
 

-#: src/prefs_account.c:1227
+#: src/prefs_account.c:1234

 msgid "This server requires authentication"
 msgstr "Questo server richiede l'autenticazione"
 
 msgid "This server requires authentication"
 msgstr "Questo server richiede l'autenticazione"
 

-#: src/prefs_account.c:1234
+#: src/prefs_account.c:1241

 msgid "Authenticate on connect"
 msgstr "Autentica quando connetti"
 
 msgid "Authenticate on connect"
 msgstr "Autentica quando connetti"
 

-#: src/prefs_account.c:1279
+#: src/prefs_account.c:1286

 msgid "News server"
 msgstr "Server delle news"
 
 msgid "News server"
 msgstr "Server delle news"
 

-#: src/prefs_account.c:1285
+#: src/prefs_account.c:1292

 msgid "Server for receiving"
 msgstr "Server per la ricezione"
 
 msgid "Server for receiving"
 msgstr "Server per la ricezione"
 

-#: src/prefs_account.c:1291
+#: src/prefs_account.c:1298

 msgid "Local mailbox"
 msgstr "Mailbox locale"
 
 msgid "Local mailbox"
 msgstr "Mailbox locale"
 

-#: src/prefs_account.c:1298
+#: src/prefs_account.c:1305

 msgid "SMTP server (send)"
 msgstr "Server SMTP (invio)"
 
 msgid "SMTP server (send)"
 msgstr "Server SMTP (invio)"
 

-#: src/prefs_account.c:1306
+#: src/prefs_account.c:1313

 msgid "Use mail command rather than SMTP server"
 msgstr "Usa comando di invio mail invece che un server SMTP"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Usa comando di invio mail invece che un server SMTP"
 

-#: src/prefs_account.c:1315
+#: src/prefs_account.c:1322

 msgid "command to send mails"
 msgstr "Comando per spedire mail"
 
 msgid "command to send mails"
 msgstr "Comando per spedire mail"
 

-#: src/prefs_account.c:1322 src/prefs_account.c:1771
+#: src/prefs_account.c:1329 src/prefs_account.c:1779

 msgid "User ID"
 msgstr "Nome utente"
 
 msgid "User ID"
 msgstr "Nome utente"
 

-#: src/prefs_account.c:1328 src/prefs_account.c:1780
+#: src/prefs_account.c:1335 src/prefs_account.c:1788

 msgid "Password"
 msgstr "Password"
 
 msgid "Password"
 msgstr "Password"
 

-#: src/prefs_account.c:1421
+#: src/prefs_account.c:1428

 msgid "Local"
 msgstr "Locale"
 
 msgid "Local"
 msgstr "Locale"
 

-#: src/prefs_account.c:1432 src/prefs_account.c:1527
+#: src/prefs_account.c:1439 src/prefs_account.c:1534

 msgid "Default inbox"
 msgstr "Cartella `In arrivo' standard"
 
 msgid "Default inbox"
 msgstr "Cartella `In arrivo' standard"
 

-#: src/prefs_account.c:1439 src/prefs_account.c:1447 src/prefs_account.c:1534
-#: src/prefs_account.c:1542
+#: src/prefs_account.c:1446 src/prefs_account.c:1454 src/prefs_account.c:1541
+#: src/prefs_account.c:1549

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "I messaggi non filtrati verrano memorizzati in questa cartella"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "I messaggi non filtrati verrano memorizzati in questa cartella"
 

-#: src/prefs_account.c:1444 src/prefs_account.c:1539 src/prefs_account.c:1941
+#: src/prefs_account.c:1451 src/prefs_account.c:1546 src/prefs_account.c:1949

 msgid "Bro_wse"
 msgstr "Sfo_glia"
 
 msgid "Bro_wse"
 msgstr "Sfo_glia"
 

-#: src/prefs_account.c:1462
+#: src/prefs_account.c:1469

 msgid "Use secure authentication (APOP)"
 msgstr "Utilizza autenticazione sicura (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Utilizza autenticazione sicura (APOP)"
 

-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1472

 msgid "Remove messages on server when received"
 msgstr "Cancella i messaggi dal server dopo la ricezione"
 
 msgid "Remove messages on server when received"
 msgstr "Cancella i messaggi dal server dopo la ricezione"
 

-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1483

 msgid "Remove after"
 msgstr "Elimina dopo"
 
 msgid "Remove after"
 msgstr "Elimina dopo"
 

-#: src/prefs_account.c:1485
+#: src/prefs_account.c:1492

 msgid "0 days: remove immediately"
 msgstr "0 giorni: elimina immeditamente"
 
 msgid "0 days: remove immediately"
 msgstr "0 giorni: elimina immeditamente"
 

-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1496

 msgid "days"
 msgstr "giorni"
 
 msgid "days"
 msgstr "giorni"
 

-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1503

 msgid "Download all messages on server"
 msgstr "Preleva tutti i messaggi sul server"
 
 msgid "Download all messages on server"
 msgstr "Preleva tutti i messaggi sul server"
 

-#: src/prefs_account.c:1502
+#: src/prefs_account.c:1509

 msgid "Receive size limit"
 msgstr "Dimensione massima di ricezione"
 
 msgid "Receive size limit"
 msgstr "Dimensione massima di ricezione"
 

-#: src/prefs_account.c:1505
+#: src/prefs_account.c:1512

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -7760,68 +8008,68 @@ msgstr ""
 "I messaggi che superano questo limite verranno prelevati parzialmenti. "
 "Selezionandoli sarà possibile scaricarli totalmente o cancellarli."
 
 "I messaggi che superano questo limite verranno prelevati parzialmenti. "
 "Selezionandoli sarà possibile scaricarli totalmente o cancellarli."
 

-#: src/prefs_account.c:1515
+#: src/prefs_account.c:1522

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1549 src/prefs_account.c:2171
+#: src/prefs_account.c:1556 src/prefs_account.c:2179

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1561
+#: src/prefs_account.c:1568

 msgid "Maximum number of articles to download"
 msgstr "Numero massimo di messaggi da scaricare"
 
 msgid "Maximum number of articles to download"
 msgstr "Numero massimo di messaggi da scaricare"
 

-#: src/prefs_account.c:1573
+#: src/prefs_account.c:1580

 msgid "unlimited if 0 is specified"
 msgstr "illimitati se è specificato 0"
 
 msgid "unlimited if 0 is specified"
 msgstr "illimitati se è specificato 0"
 

-#: src/prefs_account.c:1591 src/prefs_account.c:1741
+#: src/prefs_account.c:1598 src/prefs_account.c:1749

 msgid "Authentication method"
 msgstr "Metodo di Autenticazione"
 
 msgid "Authentication method"
 msgstr "Metodo di Autenticazione"
 

-#: src/prefs_account.c:1601 src/prefs_account.c:1751 src/prefs_send.c:273
+#: src/prefs_account.c:1608 src/prefs_account.c:1759 src/prefs_send.c:273

 msgid "Automatic"
 msgstr "Automatica"
 
 msgid "Automatic"
 msgstr "Automatica"
 

-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1620

 msgid "IMAP server directory"
 msgstr "Directory del server IMAP"
 
 msgid "IMAP server directory"
 msgstr "Directory del server IMAP"
 

-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1624

 msgid "(usually empty)"
 msgstr "(normalmente vuoto)"
 
 msgid "(usually empty)"
 msgstr "(normalmente vuoto)"
 

-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1634

 msgid "Filter messages on receiving"
 msgstr "Filtra messaggi in ricezione"
 
 msgid "Filter messages on receiving"
 msgstr "Filtra messaggi in ricezione"
 

-#: src/prefs_account.c:1630
+#: src/prefs_account.c:1638

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ricevi tutti' verifica le nuove mail di questo account"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Ricevi tutti' verifica le nuove mail di questo account"
 

-#: src/prefs_account.c:1692 src/prefs_customheader.c:205
+#: src/prefs_account.c:1700 src/prefs_customheader.c:205

 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Intestazione"
 
 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Intestazione"
 

-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1707

 msgid "Generate Message-ID"
 msgstr "Genera identificativo del messaggio (Message-Id)"
 
 msgid "Generate Message-ID"
 msgstr "Genera identificativo del messaggio (Message-Id)"
 

-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1714

 msgid "Add user-defined header"
 msgstr "Aggiungi intestazione definita dall'utente"
 
 msgid "Add user-defined header"
 msgstr "Aggiungi intestazione definita dall'utente"
 

-#: src/prefs_account.c:1718
+#: src/prefs_account.c:1726

 msgid "Authentication"
 msgstr "Autenticazione"
 
 msgid "Authentication"
 msgstr "Autenticazione"
 

-#: src/prefs_account.c:1726
+#: src/prefs_account.c:1734

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticazione SMTP (SMTP AUT)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticazione SMTP (SMTP AUT)"
 

-#: src/prefs_account.c:1802
+#: src/prefs_account.c:1810

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."


@@ -7829,214 +8077,218 @@ msgstr ""
 "Se si lasciano vuoti questi campi, verranno utilizzatigli stessi ID utente e "
 "password usati per la ricezione."
 
 "Se si lasciano vuoti questi campi, verranno utilizzatigli stessi ID utente e "
 "password usati per la ricezione."
 

-#: src/prefs_account.c:1813
+#: src/prefs_account.c:1821

 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentica con POP3 prima dell'invio"
 

-#: src/prefs_account.c:1828
+#: src/prefs_account.c:1836

 msgid "POP authentication timeout: "
 msgstr "Timeout autenticazione POP: "
 
 msgid "POP authentication timeout: "
 msgstr "Timeout autenticazione POP: "
 

-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1845

 msgid "minutes"
 msgstr "minuti"
 
 msgid "minutes"
 msgstr "minuti"
 

-#: src/prefs_account.c:1882 src/prefs_account.c:1933
+#: src/prefs_account.c:1890 src/prefs_account.c:1941

 msgid "Signature"
 msgstr "Firma"
 
 msgid "Signature"
 msgstr "Firma"
 

-#: src/prefs_account.c:1890
+#: src/prefs_account.c:1898

 msgid "Insert signature automatically"
 msgstr "Inserisci automaticamente la firma"
 
 msgid "Insert signature automatically"
 msgstr "Inserisci automaticamente la firma"
 

-#: src/prefs_account.c:1895
+#: src/prefs_account.c:1903

 msgid "Signature separator"
 msgstr "Separatore firma"
 
 msgid "Signature separator"
 msgstr "Separatore firma"
 

-#: src/prefs_account.c:1920
+#: src/prefs_account.c:1928

 msgid "Command output"
 msgstr "Output comando"
 
 msgid "Command output"
 msgstr "Output comando"
 

-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1961

 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 

-#: src/prefs_account.c:1962 src/prefs_filtering_action.c:1083
+#: src/prefs_account.c:1970 src/prefs_filtering_action.c:1083

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 

-#: src/prefs_account.c:1975 src/prefs_template.c:189
+#: src/prefs_account.c:1983 src/prefs_template.c:189

 msgid "Bcc"
 msgstr "Bcc"
 
 msgid "Bcc"
 msgstr "Bcc"
 

-#: src/prefs_account.c:1988
+#: src/prefs_account.c:1996

 msgid "Reply-To"
 msgstr "Rispondi a"
 
 msgid "Reply-To"
 msgstr "Rispondi a"
 

-#: src/prefs_account.c:2040
+#: src/prefs_account.c:2048

 msgid "Default privacy system"
 msgstr "Sistema di privacy di default"
 
 msgid "Default privacy system"
 msgstr "Sistema di privacy di default"
 

-#: src/prefs_account.c:2049
+#: src/prefs_account.c:2057

 msgid "Always sign messages"
 msgstr "Firma sempre i messaggi"
 
 msgid "Always sign messages"
 msgstr "Firma sempre i messaggi"
 

-#: src/prefs_account.c:2051
+#: src/prefs_account.c:2059

 msgid "Always encrypt messages"
 msgstr "Cifra sempre i messaggi"
 
 msgid "Always encrypt messages"
 msgstr "Cifra sempre i messaggi"
 

-#: src/prefs_account.c:2053
+#: src/prefs_account.c:2061

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Crifra automaticamente messaggio in risposta ad un messaggio cifrato"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Crifra automaticamente messaggio in risposta ad un messaggio cifrato"
 

-#: src/prefs_account.c:2056
+#: src/prefs_account.c:2064

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifrare messaggi inviati con la propria chiave in aggiunta a quella del "
 "recipiente."
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 "Cifrare messaggi inviati con la propria chiave in aggiunta a quella del "
 "recipiente."
 

-#: src/prefs_account.c:2058
+#: src/prefs_account.c:2066

 msgid "Save sent encrypted messages as clear text"
 msgstr "Salva i messaggi cifrati spediti come testo in chiaro"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salva i messaggi cifrati spediti come testo in chiaro"
 

-#: src/prefs_account.c:2145 src/prefs_account.c:2162 src/prefs_account.c:2178
+#: src/prefs_account.c:2153 src/prefs_account.c:2170 src/prefs_account.c:2186

 msgid "Don't use SSL"
 msgstr "Non utilizzare SSL"
 
 msgid "Don't use SSL"
 msgstr "Non utilizzare SSL"
 

-#: src/prefs_account.c:2148
+#: src/prefs_account.c:2156

 msgid "Use SSL for POP3 connection"
 msgstr "Utilizza SSL per la connessione POP3"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizza SSL per la connessione POP3"
 

-#: src/prefs_account.c:2151 src/prefs_account.c:2168 src/prefs_account.c:2203
+#: src/prefs_account.c:2159 src/prefs_account.c:2176 src/prefs_account.c:2211

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizza il comando STARTTLS per avviare la sessione SSL"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizza il comando STARTTLS per avviare la sessione SSL"
 

-#: src/prefs_account.c:2165
+#: src/prefs_account.c:2173

 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizza SSL per la connessione IMAP4"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizza SSL per la connessione IMAP4"
 

-#: src/prefs_account.c:2187
+#: src/prefs_account.c:2195

 msgid "Use SSL for NNTP connection"
 msgstr "Utilizza SSL per la connessione NNTP"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Utilizza SSL per la connessione NNTP"
 

-#: src/prefs_account.c:2189
+#: src/prefs_account.c:2197

 msgid "Send (SMTP)"
 msgstr "Spedizione (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Spedizione (SMTP)"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2205

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Non usare SSL (ma, se necessario usa STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Non usare SSL (ma, se necessario usa STARTTLS)"
 

-#: src/prefs_account.c:2200
+#: src/prefs_account.c:2208

 msgid "Use SSL for SMTP connection"
 msgstr "Utilizza SSL per la connessione SMTP"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Utilizza SSL per la connessione SMTP"
 

-#: src/prefs_account.c:2211
+#: src/prefs_account.c:2219

 msgid "Use non-blocking SSL"
 msgstr "Usa SSL non-bloccante"
 
 msgid "Use non-blocking SSL"
 msgstr "Usa SSL non-bloccante"
 

-#: src/prefs_account.c:2223
+#: src/prefs_account.c:2231

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Disabilitare se si hanno problemi di connessione SSL"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Disabilitare se si hanno problemi di connessione SSL"
 

-#: src/prefs_account.c:2349
+#: src/prefs_account.c:2357

 msgid "SMTP port"
 msgstr "Porta SMTP"
 
 msgid "SMTP port"
 msgstr "Porta SMTP"
 

-#: src/prefs_account.c:2355
+#: src/prefs_account.c:2363

 msgid "POP3 port"
 msgstr "Porta POP3"
 
 msgid "POP3 port"
 msgstr "Porta POP3"
 

-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2369

 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 
 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 

-#: src/prefs_account.c:2367
+#: src/prefs_account.c:2375

 msgid "NNTP port"
 msgstr "Porta NNTP"
 
 msgid "NNTP port"
 msgstr "Porta NNTP"
 

-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2380

 msgid "Domain name"
 msgstr "Nome di dominio"
 
 msgid "Domain name"
 msgstr "Nome di dominio"
 

-#: src/prefs_account.c:2382
+#: src/prefs_account.c:2390

 msgid "Use command to communicate with server"
 msgstr "Usa comando per comunicare col server"
 
 msgid "Use command to communicate with server"
 msgstr "Usa comando per comunicare col server"
 

-#: src/prefs_account.c:2390
+#: src/prefs_account.c:2398

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Segna i messaggi in cross-posting come letti e con colore:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Segna i messaggi in cross-posting come letti e con colore:"
 

-#: src/prefs_account.c:2437
+#: src/prefs_account.c:2445

 msgid "Browse"
 msgstr "Sfoglia"
 
 msgid "Browse"
 msgstr "Sfoglia"
 

-#: src/prefs_account.c:2450
+#: src/prefs_account.c:2458

 msgid "Put sent messages in"
 msgstr "Salva i messaggi inviati in"
 
 msgid "Put sent messages in"
 msgstr "Salva i messaggi inviati in"
 

-#: src/prefs_account.c:2452
+#: src/prefs_account.c:2460

 msgid "Put queued messages in"
 msgstr "Salva i messaggi in coda in"
 
 msgid "Put queued messages in"
 msgstr "Salva i messaggi in coda in"
 

-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2462

 msgid "Put draft messages in"
 msgstr "Salva le bozze in"
 
 msgid "Put draft messages in"
 msgstr "Salva le bozze in"
 

-#: src/prefs_account.c:2456
+#: src/prefs_account.c:2464

 msgid "Put deleted messages in"
 msgstr "Salva i messaggi cancellati in"
 
 msgid "Put deleted messages in"
 msgstr "Salva i messaggi cancellati in"
 

-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2507

 msgid "Account name is not entered."
 msgstr "Nome account non specificato."
 
 msgid "Account name is not entered."
 msgstr "Nome account non specificato."
 

-#: src/prefs_account.c:2503
+#: src/prefs_account.c:2511

 msgid "Mail address is not entered."
 msgstr "L'indirizzo di posta non è impostato."
 
 msgid "Mail address is not entered."
 msgstr "L'indirizzo di posta non è impostato."
 

-#: src/prefs_account.c:2510
+#: src/prefs_account.c:2518

 msgid "SMTP server is not entered."
 msgstr "Il server SMTP non è impostato."
 
 msgid "SMTP server is not entered."
 msgstr "Il server SMTP non è impostato."
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2523

 msgid "User ID is not entered."
 msgstr "Il nome utente non è impostato."
 
 msgid "User ID is not entered."
 msgstr "Il nome utente non è impostato."
 

-#: src/prefs_account.c:2520
+#: src/prefs_account.c:2528

 msgid "POP3 server is not entered."
 msgstr "Il server POP3 non è impostato."
 
 msgid "POP3 server is not entered."
 msgstr "Il server POP3 non è impostato."
 

-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2535
+msgid "The default inbox folder doesn't exist."
+msgstr "La cartella inbox di default non esiste."
+
+#: src/prefs_account.c:2541

 msgid "IMAP4 server is not entered."
 msgstr "Il server IMAP4 non è impostato."
 
 msgid "IMAP4 server is not entered."
 msgstr "Il server IMAP4 non è impostato."
 

-#: src/prefs_account.c:2530
+#: src/prefs_account.c:2546

 msgid "NNTP server is not entered."
 msgstr "Il server NNTP non è impostato."
 
 msgid "NNTP server is not entered."
 msgstr "Il server NNTP non è impostato."
 

-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2552

 msgid "local mailbox filename is not entered."
 msgstr "il nome del file della mailbox locale non è specificato."
 
 msgid "local mailbox filename is not entered."
 msgstr "il nome del file della mailbox locale non è specificato."
 

-#: src/prefs_account.c:2542
+#: src/prefs_account.c:2558

 msgid "mail command is not entered."
 msgstr "Il comando di spedizione mail non è specificato."
 
 msgid "mail command is not entered."
 msgstr "Il comando di spedizione mail non è specificato."
 

-#: src/prefs_account.c:2607
+#: src/prefs_account.c:2623

 msgid "Select signature file"
 msgstr "Selezionare il file contenente la firma"
 
 msgid "Select signature file"
 msgstr "Selezionare il file contenente la firma"
 

-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2716

 msgid "Protocol:"
 msgstr "Protocollo:"
 
 msgid "Protocol:"
 msgstr "Protocollo:"
 

-#: src/prefs_account.c:2849
+#: src/prefs_account.c:2869

 #, c-format
 #, c-format

-msgid "Unsupported (%s)"
-msgstr "Non supportato (%s)"
+msgid "%s (plugin not loaded)"
+msgstr "%s (plugin non caricato)"

 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"
 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"


@@ -8051,7 +8303,7 @@ msgid "Command line"
 msgstr "Linea comando"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
 msgstr "Linea comando"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493

-#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:260
+#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:270

 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Rimpiazza"
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Rimpiazza"


@@ -8064,7 +8316,7 @@ msgstr "Info..."
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811

-#: src/prefs_template.c:357
+#: src/prefs_template.c:367

 msgid "(New)"
 msgstr "(Nuovo)"
 
 msgid "(New)"
 msgstr "(Nuovo)"
 


@@ -8113,19 +8365,19 @@ msgstr "Procedere con l'eliminazione di quest'azione?"
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822

-#: src/prefs_template.c:416 src/prefs_template.c:433
+#: src/prefs_template.c:426 src/prefs_template.c:443

 msgid "Entry not saved"
 msgstr "Elemento non memorizzato"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
 msgid "Entry not saved"
 msgstr "Elemento non memorizzato"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254

-#: src/prefs_filtering.c:1276 src/prefs_template.c:417
-#: src/prefs_template.c:434
+#: src/prefs_filtering.c:1276 src/prefs_template.c:427
+#: src/prefs_template.c:444

 msgid "The entry was not saved. Close anyway?"
 msgstr "Elemento non salvato. Chiudere ugualmente?"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
 msgid "The entry was not saved. Close anyway?"
 msgstr "Elemento non salvato. Chiudere ugualmente?"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824

-#: src/prefs_template.c:418 src/prefs_template.c:435
+#: src/prefs_template.c:428 src/prefs_template.c:445

 msgid "+_Continue editing"
 msgstr "_Continua a modificare"
 
 msgid "+_Continue editing"
 msgstr "_Continua a modificare"
 


@@ -8226,11 +8478,15 @@ msgstr ""
 msgid "Current actions"
 msgstr "Azione corrente"
 
 msgid "Current actions"
 msgstr "Azione corrente"
 

-#: src/prefs_common.c:262
+#: src/prefs_common.c:210
+msgid "Hello,\\n"
+msgstr "Ciao,\\n"
+
+#: src/prefs_common.c:272

 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Il giorno %d\\n%f ha scritto:\\n\\n%q"
 
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Il giorno %d\\n%f ha scritto:\\n\\n%q"
 

-#: src/prefs_common.c:268
+#: src/prefs_common.c:278

 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"
 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"


@@ -8238,86 +8494,98 @@ msgstr ""
 "\\n\\nInizio messsaggio inviato:\\n\\n?d{Data: %d\\n}?f{Da: %f\\n}?t{A: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroup: %n\\n}?s{Oggetto: %s\\n}\\n\\n%M"
 
 "\\n\\nInizio messsaggio inviato:\\n\\n?d{Data: %d\\n}?f{Da: %f\\n}?t{A: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroup: %n\\n}?s{Oggetto: %s\\n}\\n\\n%M"
 

-#: src/prefs_common.c:353
+#: src/prefs_common.c:363

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d/%m/%y(%a) %H:%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d/%m/%y(%a) %H:%M"
 

-#: src/prefs_compose_writing.c:106
+#: src/prefs_compose_writing.c:124

 msgid "Automatic account selection"
 msgstr "Selezione automatica account"
 
 msgid "Automatic account selection"
 msgstr "Selezione automatica account"
 

-#: src/prefs_compose_writing.c:114
+#: src/prefs_compose_writing.c:132

 msgid "when replying"
 msgstr "per la risposta"
 
 msgid "when replying"
 msgstr "per la risposta"
 

-#: src/prefs_compose_writing.c:116
+#: src/prefs_compose_writing.c:134

 msgid "when forwarding"
 msgstr "per inoltrare"
 
 msgid "when forwarding"
 msgstr "per inoltrare"
 

-#: src/prefs_compose_writing.c:118
+#: src/prefs_compose_writing.c:136

 msgid "when re-editing"
 msgstr "per modificare nuovamente"
 
 msgid "when re-editing"
 msgstr "per modificare nuovamente"
 

-#: src/prefs_compose_writing.c:120
+#: src/prefs_compose_writing.c:138

 msgid "Forwarding"
 msgstr "Inoltro"
 
 msgid "Forwarding"
 msgstr "Inoltro"
 

-#: src/prefs_compose_writing.c:128 src/prefs_filtering_action.c:160
+#: src/prefs_compose_writing.c:146 src/prefs_filtering_action.c:160

 msgid "Forward as attachment"
 msgstr "Inoltra come allegato"
 
 msgid "Forward as attachment"
 msgstr "Inoltra come allegato"
 

-#: src/prefs_compose_writing.c:131
+#: src/prefs_compose_writing.c:149

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Mantieni il campo 'From' originale quando inoltri"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Mantieni il campo 'From' originale quando inoltri"
 

-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:151

 msgid "Editing"
 msgstr "Scrittura"
 
 msgid "Editing"
 msgstr "Scrittura"
 

-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:159

 msgid "Automatically launch the external editor"
 msgstr "Esegui automaticamente l'editor esterno"
 
 msgid "Automatically launch the external editor"
 msgstr "Esegui automaticamente l'editor esterno"
 

-#: src/prefs_compose_writing.c:148
+#: src/prefs_compose_writing.c:166

 msgid "Autosave message text to Drafts folder every"
 msgstr ""
 "Salva automaticamente il testo del messaggio nella cartella delle bozze ogni"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr ""
 "Salva automaticamente il testo del messaggio nella cartella delle bozze ogni"
 

-#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:176 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "caratteri"
 
 msgid "characters"
 msgstr "caratteri"
 

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:184

 msgid "Undo level"
 msgstr "Livello di undo"
 
 msgid "Undo level"
 msgstr "Livello di undo"
 

-#: src/prefs_compose_writing.c:179
+#: src/prefs_compose_writing.c:197

 msgid "Reply button invokes mailing list reply"
 msgstr "Il bottone 'Rispondi' risponde alla mailing list"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Il bottone 'Rispondi' risponde alla mailing list"
 

-#: src/prefs_compose_writing.c:182
+#: src/prefs_compose_writing.c:200

 msgid "When dropping files into the Compose window"
 msgstr "Al rilascio di un file nella finestra di Composizione"
 
 msgid "When dropping files into the Compose window"
 msgstr "Al rilascio di un file nella finestra di Composizione"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:208

 msgid "Ask"
 msgstr "Chiedi"
 
 msgid "Ask"
 msgstr "Chiedi"
 

-#: src/prefs_compose_writing.c:191 src/toolbar.c:446
+#: src/prefs_compose_writing.c:209 src/toolbar.c:456

 msgid "Insert"
 msgstr "Inserisci"
 
 msgid "Insert"
 msgstr "Inserisci"
 

-#: src/prefs_compose_writing.c:192 src/toolbar.c:447
+#: src/prefs_compose_writing.c:210 src/toolbar.c:457

 msgid "Attach"
 msgstr "Allega"
 
 msgid "Attach"
 msgstr "Allega"
 

-#: src/prefs_compose_writing.c:297 src/prefs_folder_item.c:1118
-#: src/prefs_quote.c:285 src/prefs_spelling.c:401 src/prefs_wrapping.c:144
-#: src/toolbar.c:1511
+#: src/prefs_compose_writing.c:226
+msgid "Use format when composing new messages"
+msgstr "Utilizzare il formato nella composizione di nuovi messaggi"
+
+#: src/prefs_compose_writing.c:228
+msgid "New message format"
+msgstr "Nuovo formato di messaggio"
+
+#: src/prefs_compose_writing.c:282 src/prefs_quote.c:206
+msgid " Description of symbols... "
+msgstr " Descrizione dei simboli... "
+
+#: src/prefs_compose_writing.c:402 src/prefs_folder_item.c:1172
+#: src/prefs_quote.c:311 src/prefs_spelling.c:448 src/prefs_wrapping.c:144
+#: src/toolbar.c:1560

 msgid "Compose"
 msgstr "Composizione"
 
 msgid "Compose"
 msgstr "Composizione"
 

-#: src/prefs_compose_writing.c:298
+#: src/prefs_compose_writing.c:403

 msgid "Writing"
 msgstr "Scrittura"
 
 msgid "Writing"
 msgstr "Scrittura"
 


@@ -8462,7 +8730,7 @@ msgid "Copy"
 msgstr "Copia"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
 msgstr "Copia"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79

-#: src/summaryview.c:2365
+#: src/summaryview.c:2366

 msgid "Mark"
 msgstr "Contrassegna"
 
 msgid "Mark"
 msgstr "Contrassegna"
 


@@ -8482,7 +8750,7 @@ msgstr "Contrassegna come letto"
 msgid "Mark as unread"
 msgstr "Contrassegna come non letto"
 
 msgid "Mark as unread"
 msgstr "Contrassegna come non letto"
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:398 src/toolbar.c:489
+#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499

 msgid "Forward"
 msgstr "Inoltra"
 
 msgid "Forward"
 msgstr "Inoltra"
 


@@ -8491,7 +8759,7 @@ msgid "Redirect"
 msgstr "Redireziona"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
 msgstr "Redireziona"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429

-#: src/toolbar.c:174 src/toolbar.c:1651
+#: src/toolbar.c:178 src/toolbar.c:1711

 msgid "Execute"
 msgstr "Esegui"
 
 msgid "Execute"
 msgstr "Esegui"
 


@@ -8511,7 +8779,7 @@ msgstr "Imposta il punteggio"
 msgid "Hide"
 msgstr "Nascondi"
 
 msgid "Hide"
 msgstr "Nascondi"
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:177
+#: src/prefs_filtering_action.c:167 src/toolbar.c:181

 msgid "Ignore thread"
 msgstr "Ignora discussione"
 
 msgid "Ignore thread"
 msgstr "Ignora discussione"
 


@@ -8629,6 +8897,11 @@ msgstr "Lista attuale delle azioni"
 msgid "Filtering/Processing configuration"
 msgstr "Configurazione filtraggio/elaborazione"
 
 msgid "Filtering/Processing configuration"
 msgstr "Configurazione filtraggio/elaborazione"
 

+#: src/prefs_filtering.c:250 src/prefs_filtering.c:781
+#: src/prefs_filtering.c:872
+msgid "Filtering Account Menu|All"
+msgstr "Filtra tutti"
+

 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Condizione"
 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Condizione"


@@ -8686,7 +8959,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Colonne nascoste"
 
 msgid "Hidden columns"
 msgstr "Colonne nascoste"
 

-#: src/prefs_folder_column.c:280 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:797
+#: src/prefs_summaries.c:943 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Voci visualizzate"
 
 msgid "Displayed columns"
 msgstr "Voci visualizzate"
 


@@ -8695,17 +8969,17 @@ msgstr "Voci visualizzate"
 msgid " Use default "
 msgstr " Usa come default "
 
 msgid " Use default "
 msgstr " Usa come default "
 

-#: src/prefs_folder_item.c:199 src/prefs_folder_item.c:640
+#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:648

 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 ""
 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 ""

-"<i>Queste preferenze non saranno salvate perché questa cartella è di primo livello. "
-"Comunque sarà possibile utilizzarle per applicarle all'intero albero delle "
-"cartelle utilizzando \"Applica alle sottocartelle\".</i>"
+"<i>Queste preferenze non saranno salvate perché questa cartella è di primo "
+"livello. Comunque sarà possibile utilizzarle per applicarle all'intero "
+"albero delle cartelle utilizzando \"Applica alle sottocartelle\".</i>"

 
 

-#: src/prefs_folder_item.c:211 src/prefs_folder_item.c:652
+#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:660

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -8713,82 +8987,86 @@ msgstr ""
 "Applica alle\n"
 "sottocartelle"
 
 "Applica alle\n"
 "sottocartelle"
 

-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:238

 msgid "Normal"
 msgstr "Normale"
 
 msgid "Normal"
 msgstr "Normale"
 

-#: src/prefs_folder_item.c:237
+#: src/prefs_folder_item.c:240

 msgid "Outbox"
 msgstr "In uscita"
 
 msgid "Outbox"
 msgstr "In uscita"
 

-#: src/prefs_folder_item.c:254
+#: src/prefs_folder_item.c:257

 msgid "Folder type"
 msgstr "Tipo cartella"
 
 msgid "Folder type"
 msgstr "Tipo cartella"
 

-#: src/prefs_folder_item.c:266
+#: src/prefs_folder_item.c:269

 msgid "Simplify Subject RegExp"
 msgstr "Espressione regolare per semplificare l'oggetto"
 
 msgid "Simplify Subject RegExp"
 msgstr "Espressione regolare per semplificare l'oggetto"
 

-#: src/prefs_folder_item.c:292
+#: src/prefs_folder_item.c:295

 msgid "Test RegExp"
 msgstr "Prova espressione regolare"
 
 msgid "Test RegExp"
 msgstr "Prova espressione regolare"
 

-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:327

 msgid "Folder chmod"
 msgstr "Permessi cartella"
 
 msgid "Folder chmod"
 msgstr "Permessi cartella"
 

-#: src/prefs_folder_item.c:350
+#: src/prefs_folder_item.c:353

 msgid "Folder color"
 msgstr "Colore cartella"
 
 msgid "Folder color"
 msgstr "Colore cartella"
 

-#: src/prefs_folder_item.c:364 src/prefs_folder_item.c:995
+#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1047

 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Selezione colore per la cartella"
 
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Selezione colore per la cartella"
 

-#: src/prefs_folder_item.c:381
+#: src/prefs_folder_item.c:384

 msgid "Process at startup"
 msgstr "Processa all'avvio"
 
 msgid "Process at startup"
 msgstr "Processa all'avvio"
 

-#: src/prefs_folder_item.c:395
+#: src/prefs_folder_item.c:398

 msgid "Scan for new mail"
 msgstr "Controlla se c'è posta"
 
 msgid "Scan for new mail"
 msgstr "Controlla se c'è posta"
 

-#: src/prefs_folder_item.c:408
+#: src/prefs_folder_item.c:411

 msgid "Synchronise for offline use"
 msgstr "Sincronizza per utilizzo offline"
 
 msgid "Synchronise for offline use"
 msgstr "Sincronizza per utilizzo offline"
 

-#: src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:669

 msgid "Request Return Receipt"
 msgstr "Richiesta di ricevuta di ritorno"
 
 msgid "Request Return Receipt"
 msgstr "Richiesta di ricevuta di ritorno"
 

-#: src/prefs_folder_item.c:676
+#: src/prefs_folder_item.c:684

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Salva una copia dei messaggi in uscita in questa cartella invece che in `In "
 "Uscita'"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Salva una copia dei messaggi in uscita in questa cartella invece che in `In "
 "Uscita'"
 

-#: src/prefs_folder_item.c:689
+#: src/prefs_folder_item.c:697

 msgid "Default To: "
 msgstr "Destinatario predefinito: "
 
 msgid "Default To: "
 msgstr "Destinatario predefinito: "
 

-#: src/prefs_folder_item.c:710
+#: src/prefs_folder_item.c:718

 msgid "Default To for replies: "
 msgstr "Destinatario predefinito per le risposte: "
 
 msgid "Default To for replies: "
 msgstr "Destinatario predefinito per le risposte: "
 

-#: src/prefs_folder_item.c:731
+#: src/prefs_folder_item.c:739

 msgid "Default account: "
 msgstr "Account predefinito: "
 
 msgid "Default account: "
 msgstr "Account predefinito: "
 

-#: src/prefs_folder_item.c:782
+#: src/prefs_folder_item.c:790

 msgid "Default dictionary: "
 msgstr "Dizionario predefinito: "
 
 msgid "Default dictionary: "
 msgstr "Dizionario predefinito: "
 

-#: src/prefs_folder_item.c:1101
+#: src/prefs_folder_item.c:823
+msgid "Default alternate dictionary: "
+msgstr "Dizionario alternativo di default: "
+
+#: src/prefs_folder_item.c:1155

 msgid "General"
 msgstr "Generale"
 
 msgid "General"
 msgstr "Generale"
 

-#: src/prefs_folder_item.c:1146
+#: src/prefs_folder_item.c:1200

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Impostazioni per la cartella %s"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Impostazioni per la cartella %s"


@@ -8809,7 +9087,7 @@ msgstr "Utilizzare un font differente per la stampa"
 msgid "Message Printing"
 msgstr "Stampa del messaggio"
 
 msgid "Message Printing"
 msgstr "Stampa del messaggio"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1078

 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Visualizzazione"
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Visualizzazione"


@@ -9029,8 +9307,8 @@ msgid ""
 msgstr ""
 "Percorso per quaderno/cartella non impostato.\n"
 "\n"
 msgstr ""
 "Percorso per quaderno/cartella non impostato.\n"
 "\n"

-"Per cercare %s nell'intera rubrica, si deve selezionare"
-"'Qualsiasi' dalla casella quaderno/cartella."
+"Per cercare %s nell'intera rubrica, si deve selezionare'Qualsiasi' dalla "
+"casella quaderno/cartella."

 
 #: src/prefs_matcher.c:1823
 msgid ""
 
 #: src/prefs_matcher.c:1823
 msgid ""


@@ -9211,7 +9489,7 @@ msgstr "Selezionare colore per le firme"
 msgid "Signatures"
 msgstr "Firme"
 
 msgid "Signatures"
 msgstr "Firme"
 

-#: src/prefs_msg_colors.c:376
+#: src/prefs_msg_colors.c:376 src/prefs_summaries.c:761

 msgid "Folder list"
 msgstr "Lista cartelle"
 
 msgid "Folder list"
 msgstr "Lista cartelle"
 


@@ -9244,8 +9522,8 @@ msgstr "Colore etichette"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format

-msgid "Pick color for 'color %d'"
-msgstr "Selezione colore per il colore 'color %d'"
+msgid "Tooltip|Pick color for 'color %d'"
+msgstr "Seleziona colore per il colore 'color %d'"

 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated


@@ -9258,7 +9536,7 @@ msgstr "Selezione colore per il colore 'color %d'"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format

-msgid "Pick color for 'color %d' "
+msgid "Dialog title|Pick color for 'color %d'"

 msgstr "Selezione colore per il colore 'color %d'"
 
 #: src/prefs_msg_colors.c:621
 msgstr "Selezione colore per il colore 'color %d'"
 
 #: src/prefs_msg_colors.c:621


@@ -9353,115 +9631,107 @@ msgstr "Timeout I/O del socket"
 msgid "Never send Return Receipts"
 msgstr "Non mandare mai Ricevute di Ritorno"
 
 msgid "Never send Return Receipts"
 msgstr "Non mandare mai Ricevute di Ritorno"
 

-#: src/prefs_quote.c:90
+#: src/prefs_quote.c:92

 msgid "Reply will quote by default"
 msgstr "Rispondi con citazione predefinita"
 
 msgid "Reply will quote by default"
 msgstr "Rispondi con citazione predefinita"
 

-#: src/prefs_quote.c:92
+#: src/prefs_quote.c:94

 msgid "Reply format"
 msgstr "Formato della risposta"
 
 msgid "Reply format"
 msgstr "Formato della risposta"
 

-#: src/prefs_quote.c:107 src/prefs_quote.c:149
+#: src/prefs_quote.c:109 src/prefs_quote.c:161

 msgid "Quotation mark"
 msgstr "Simbolo di citazione"
 
 msgid "Quotation mark"
 msgstr "Simbolo di citazione"
 

-#: src/prefs_quote.c:134
+#: src/prefs_quote.c:146

 msgid "Forward format"
 msgstr "Formato inoltro"
 
 msgid "Forward format"
 msgstr "Formato inoltro"
 

-#: src/prefs_quote.c:184
-msgid " Description of symbols... "
-msgstr " Descrizione dei simboli... "
-
-#: src/prefs_quote.c:193
+#: src/prefs_quote.c:215

 msgid "Quotation characters"
 msgstr "Caratteri per la citazione"
 
 msgid "Quotation characters"
 msgstr "Caratteri per la citazione"
 

-#: src/prefs_quote.c:208
+#: src/prefs_quote.c:230

 msgid "Treat these characters as quotation marks: "
 msgstr "Utilizza questi caratteri come marcatori di citazione: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Utilizza questi caratteri come marcatori di citazione: "
 

-#: src/prefs_quote.c:286
+#: src/prefs_quote.c:312

 msgid "Quoting"
 msgstr "Quoting"
 
 msgid "Quoting"
 msgstr "Quoting"
 

-#: src/prefs_receive.c:122
+#: src/prefs_receive.c:121

 msgid "External incorporation program"
 msgstr "Programmi esterni di incorporazione"
 
 msgid "External incorporation program"
 msgstr "Programmi esterni di incorporazione"
 

-#: src/prefs_receive.c:129
+#: src/prefs_receive.c:128

 msgid "Use external program for receiving mail"
 msgstr "Usa un programma esterno per ricevere la posta"
 
 msgid "Use external program for receiving mail"
 msgstr "Usa un programma esterno per ricevere la posta"
 

-#: src/prefs_receive.c:136
+#: src/prefs_receive.c:135

 msgid "Command"
 msgstr "Comando"
 
 msgid "Command"
 msgstr "Comando"
 

-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:144

 msgid "Automatic checking"
 msgstr "Controlli automatici"
 
 msgid "Automatic checking"
 msgstr "Controlli automatici"
 

-#: src/prefs_receive.c:156
-msgid "Automatically check for new mail"
-msgstr "Controlla automaticamente se ci sono messaggi nuovi"
+#: src/prefs_receive.c:155
+msgid "Automatically check for new mail every"
+msgstr "Controlla automaticamente se ci sono messaggi nuovi ogni"

 
 

-#: src/prefs_receive.c:158
-msgid "every"
-msgstr "ogni"
-
-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:173

 msgid "Check for new mail on startup"
 msgstr "Controlla se ci sono nuovi messaggi all'avvio"
 
 msgid "Check for new mail on startup"
 msgstr "Controlla se ci sono nuovi messaggi all'avvio"
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:176

 msgid "Dialogs"
 msgstr "Finestre di dialogo"
 
 msgid "Dialogs"
 msgstr "Finestre di dialogo"
 

-#: src/prefs_receive.c:188
+#: src/prefs_receive.c:182

 msgid "Show receive dialog"
 msgstr "Mostra la finestra di ricezione"
 
 msgid "Show receive dialog"
 msgstr "Mostra la finestra di ricezione"
 

-#: src/prefs_receive.c:196 src/prefs_send.c:169 src/prefs_summaries.c:958
+#: src/prefs_receive.c:190 src/prefs_send.c:169 src/prefs_summaries.c:855

 msgid "Always"
 msgstr "Sempre"
 
 msgid "Always"
 msgstr "Sempre"
 

-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:191

 msgid "Only on manual receiving"
 msgstr "Solo su ricezione manuale"
 
 msgid "Only on manual receiving"
 msgstr "Solo su ricezione manuale"
 

-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:205

 msgid "Close receive dialog when finished"
 msgstr "Chiudi la finestra di riepilogo ricezione quando finisci"
 
 msgid "Close receive dialog when finished"
 msgstr "Chiudi la finestra di riepilogo ricezione quando finisci"
 

-#: src/prefs_receive.c:214
+#: src/prefs_receive.c:208

 msgid "Don't popup error dialog on receive error"
 msgstr "Nessuna finestra di errore se si verifica un errore di ricezione"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Nessuna finestra di errore se si verifica un errore di ricezione"
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:210

 msgid "After receiving new mail"
 msgstr "Dopo la ricezione di nuova posta"
 
 msgid "After receiving new mail"
 msgstr "Dopo la ricezione di nuova posta"
 

-#: src/prefs_receive.c:222
+#: src/prefs_receive.c:216

 msgid "Go to inbox"
 msgstr "Vai a 'in arrivo'"
 
 msgid "Go to inbox"
 msgstr "Vai a 'in arrivo'"
 

-#: src/prefs_receive.c:224
+#: src/prefs_receive.c:218

 msgid "Update all local folders"
 msgstr "Aggiorna tutte le cartelle locali"
 
 msgid "Update all local folders"
 msgstr "Aggiorna tutte le cartelle locali"
 

-#: src/prefs_receive.c:226
+#: src/prefs_receive.c:220

 msgid "Run command"
 msgstr "Esegui comando"
 
 msgid "Run command"
 msgstr "Esegui comando"
 

-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:229

 msgid "after automatic check"
 msgstr "dopo la verifica automatica"
 
 msgid "after automatic check"
 msgstr "dopo la verifica automatica"
 

-#: src/prefs_receive.c:237
+#: src/prefs_receive.c:231

 msgid "after manual check"
 msgstr "dopo la verifica manuale"
 
 msgid "after manual check"
 msgstr "dopo la verifica manuale"
 

-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:239

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -9470,11 +9740,11 @@ msgstr ""
 "Comando da eseguire:\n"
 "(utilizzare %d come numero di nuove mail)"
 
 "Comando da eseguire:\n"
 "(utilizzare %d come numero di nuove mail)"
 

-#: src/prefs_receive.c:371 src/prefs_send.c:337
+#: src/prefs_receive.c:365 src/prefs_send.c:337

 msgid "Mail Handling"
 msgstr "Gestione della posta"
 
 msgid "Mail Handling"
 msgstr "Gestione della posta"
 

-#: src/prefs_receive.c:372
+#: src/prefs_receive.c:366

 msgid "Receiving"
 msgstr "Ricezione"
 
 msgid "Receiving"
 msgstr "Ricezione"
 


@@ -9635,165 +9905,173 @@ msgstr ""
 msgid "Sending"
 msgstr "Invio in corso"
 
 msgid "Sending"
 msgstr "Invio in corso"
 

-#: src/prefs_spelling.c:105
+#: src/prefs_spelling.c:91

 msgid "Select dictionaries location"
 msgstr "Seleziona la posizione del dizionario"
 
 msgid "Select dictionaries location"
 msgstr "Seleziona la posizione del dizionario"
 

-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:126

 msgid "Pick color for misspelled word"
 msgstr "Selezione colore per la parola sbagliata"
 
 msgid "Pick color for misspelled word"
 msgstr "Selezione colore per la parola sbagliata"
 

-#: src/prefs_spelling.c:186
+#: src/prefs_spelling.c:183

 msgid "Enable spell checker"
 msgstr "Abilita controllo ortografico"
 
 msgid "Enable spell checker"
 msgstr "Abilita controllo ortografico"
 

-#: src/prefs_spelling.c:191
+#: src/prefs_spelling.c:188

 msgid "Enable alternate dictionary"
 msgstr "Abilita dizionario alternativo"
 
 msgid "Enable alternate dictionary"
 msgstr "Abilita dizionario alternativo"
 

-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194

 msgid "Faster switching with last used dictionary"
 msgstr "Scambio velocizzato con l'ultimo dizionario utilizzato"
 
 msgid "Faster switching with last used dictionary"
 msgstr "Scambio velocizzato con l'ultimo dizionario utilizzato"
 

-#: src/prefs_spelling.c:199
+#: src/prefs_spelling.c:196

 msgid "Path to dictionaries"
 msgstr "Percorso dei dizionari"
 
 msgid "Path to dictionaries"
 msgstr "Percorso dei dizionari"
 

-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:211

 msgid "Automatic spelling"
 msgstr "Correzione automatica"
 
 msgid "Automatic spelling"
 msgstr "Correzione automatica"
 

-#: src/prefs_spelling.c:226
+#: src/prefs_spelling.c:223

 msgid "Re-check message when changing dictionary"
 msgstr "Controlla nuovamente messaggio al cambio di dizionario"
 
 msgid "Re-check message when changing dictionary"
 msgstr "Controlla nuovamente messaggio al cambio di dizionario"
 

-#: src/prefs_spelling.c:230
+#: src/prefs_spelling.c:227

 msgid "Dictionary"
 msgstr "Dizionario"
 
 msgid "Dictionary"
 msgstr "Dizionario"
 

-#: src/prefs_spelling.c:243
+#: src/prefs_spelling.c:240

 msgid "Default dictionary"
 msgstr "Dizionario predefinito"
 
 msgid "Default dictionary"
 msgstr "Dizionario predefinito"
 

-#: src/prefs_spelling.c:261
+#: src/prefs_spelling.c:258
+msgid "Default alternate dictionary"
+msgstr "Dizionario alternativo di default"
+
+#: src/prefs_spelling.c:277
+msgid "Check with both dictionaries"
+msgstr "Controlla con entrambi i dizionari"
+
+#: src/prefs_spelling.c:283

 msgid "Default suggestion mode"
 msgstr "Modo suggerimento predefinito"
 
 msgid "Default suggestion mode"
 msgstr "Modo suggerimento predefinito"
 

-#: src/prefs_spelling.c:283
+#: src/prefs_spelling.c:305

 msgid "Misspelled word color"
 msgstr "Colore delle parole sbagliate"
 
 msgid "Misspelled word color"
 msgstr "Colore delle parole sbagliate"
 

-#: src/prefs_spelling.c:297
+#: src/prefs_spelling.c:319

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr ""
 "Selezione colore per parole errate. Utilizzare il nero per sottolineare"
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr ""
 "Selezione colore per parole errate. Utilizzare il nero per sottolineare"
 

-#: src/prefs_spelling.c:402
+#: src/prefs_spelling.c:449

 msgid "Spell Checking"
 msgstr "Controllo ortografico"
 
 msgid "Spell Checking"
 msgstr "Controllo ortografico"
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr "il nome abbreviato del giorno della settimana"
 
 msgid "the full abbreviated weekday name"
 msgstr "il nome abbreviato del giorno della settimana"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr "il nome completo del giorno della settimana"
 
 msgid "the full weekday name"
 msgstr "il nome completo del giorno della settimana"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr "il nome abbreviato del mese"
 
 msgid "the abbreviated month name"
 msgstr "il nome abbreviato del mese"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr "il nome completo del mese"
 
 msgid "the full month name"
 msgstr "il nome completo del mese"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr "data e ora preferite per la località corrente"
 
 msgid "the preferred date and time for the current locale"
 msgstr "data e ora preferite per la località corrente"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr "Numero del secolo (anno/100)"
 
 msgid "the century number (year/100)"
 msgstr "Numero del secolo (anno/100)"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr "giorno del mese come numero"
 
 msgid "the day of the month as a decimal number"
 msgstr "giorno del mese come numero"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "orario come numero decimale usando un orologio con 24 ore"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "orario come numero decimale usando un orologio con 24 ore"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "orario come numero decimale usando un orologio con 12 ore"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "orario come numero decimale usando un orologio con 12 ore"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr "il giorno dell'anno come numero"
 
 msgid "the day of the year as a decimal number"
 msgstr "il giorno dell'anno come numero"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr "il mese come numero"
 
 msgid "the month as a decimal number"
 msgstr "il mese come numero"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr "il minuto come numero"
 
 msgid "the minute as a decimal number"
 msgstr "il minuto come numero"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr "AM o PM"
 
 msgid "either AM or PM"
 msgstr "AM o PM"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr "i secondi come numero"
 
 msgid "the second as a decimal number"
 msgstr "i secondi come numero"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr "il giorno della settimana come numero"
 
 msgid "the day of the week as a decimal number"
 msgstr "il giorno della settimana come numero"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr "la data preferita per la località corrente"
 
 msgid "the preferred date for the current locale"
 msgstr "la data preferita per la località corrente"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr "le ultime due cifre dell'anno"
 
 msgid "the last two digits of a year"
 msgstr "le ultime due cifre dell'anno"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr "l'anno come numero"
 
 msgid "the year as a decimal number"
 msgstr "l'anno come numero"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr "La zona orario o il nome o l'abbreviazione"
 
 msgid "the time zone or name or abbreviation"
 msgstr "La zona orario o il nome o l'abbreviazione"
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
+#: src/prefs_summaries.c:911

 msgid "Date format"
 msgstr "Formato della Data"
 
 msgid "Date format"
 msgstr "Formato della Data"
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr "Specificare"
 
 msgid "Specifier"
 msgstr "Specificare"
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr "Esempio"
 
 msgid "Example"
 msgstr "Esempio"
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Select key bindings"
 msgstr "Configura lo schema dei tasti"
 
 msgid "Select key bindings"
 msgstr "Configura lo schema dei tasti"
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr "Selezionare predefiniti:"
 
 msgid "Select preset:"
 msgstr "Selezionare predefiniti:"
 

-#: src/prefs_summaries.c:352 src/prefs_summaries.c:699
+#: src/prefs_summaries.c:353 src/prefs_summaries.c:700

 msgid "Old Sylpheed"
 msgstr "Vecchia versione di Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Vecchia versione di Sylpheed"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:361

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."


@@ -9801,131 +10079,129 @@ msgstr ""
 "È possibile modificare ogni scorciatoia dei menu premendo\n"
 "la combinazione voluta quando il cursore del mouse è sulla voce."
 
 "È possibile modificare ogni scorciatoia dei menu premendo\n"
 "la combinazione voluta quando il cursore del mouse è sulla voce."
 

-#: src/prefs_summaries.c:767
-msgid "Translate header names"
-msgstr "Traduci nomi intestazioni"
-
-#: src/prefs_summaries.c:769
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"Gli header standard (come 'From:', 'Subject:') verranno visualizzati "
-"tradotti nel vostro linguaggio."
-
-#: src/prefs_summaries.c:773
+#: src/prefs_summaries.c:768

 msgid "Display unread number next to folder name"
 msgstr "Mostra il numero dei messaggi non letti vicino al nome della cartella"
 
 msgid "Display unread number next to folder name"
 msgstr "Mostra il numero dei messaggi non letti vicino al nome della cartella"
 

-#: src/prefs_summaries.c:780
+#: src/prefs_summaries.c:775

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abbrevia i newsgroup più lunghi di"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abbrevia i newsgroup più lunghi di"
 

-#: src/prefs_summaries.c:794
+#: src/prefs_summaries.c:789

 msgid "letters"
 msgstr "lettere"
 
 #: src/prefs_summaries.c:807
 msgid "letters"
 msgstr "lettere"
 
 #: src/prefs_summaries.c:807

-msgid "Display sender using address book"
-msgstr "Mostra il mittente utilizzando la rubrica"
-
-#: src/prefs_summaries.c:810
-msgid "Thread using subject in addition to standard headers"
-msgstr "Incolonna utilizzando l'oggetto in aggiunta alle intestazioni standard"
-
-#: src/prefs_summaries.c:833
-msgid "Date format help"
-msgstr "Aiuto sul formato della data"
-
-#: src/prefs_summaries.c:837
-msgid "Set displayed columns"
-msgstr "Imposta voci visualizzate"
-
-#: src/prefs_summaries.c:845
-msgid " Folder list... "
-msgstr " Lista cartelle... "
-
-#: src/prefs_summaries.c:853
-msgid " Message list... "
-msgstr " Lista messaggi... "
+msgid "Message list"
+msgstr "Lista messaggi"

 
 

-#: src/prefs_summaries.c:874
-msgid "Execute immediately when moving or deleting messages"
-msgstr ""
-"Esegui immediatamente durante lo spostamento o la cancellazione di messaggi"
-
-#: src/prefs_summaries.c:876
-msgid "Messages will be marked until execution if this is turned off"
-msgstr ""
-"I messaggi verranno segnati fino all'esecuzione se quest'opzione è "
-"disattivata"
-
-#: src/prefs_summaries.c:882
-msgid "Confirm before marking all mails in a folder as read"
-msgstr "Conferma proma di segnare tutti i messaggi in una cartella come letti"
-
-#: src/prefs_summaries.c:886
-msgid "Always open message when selected"
-msgstr "Apri sempre i messaggi quando vengono selezionati"
-
-#: src/prefs_summaries.c:890
-msgid "Only mark message as read when opened in a new window"
-msgstr ""
-"Segna il messaggio come letto solo quando viene aperto in una nuova finestra"
-
-#: src/prefs_summaries.c:903
+#: src/prefs_summaries.c:817

 msgid "When entering a folder"
 msgstr "Entrando in una cartella"
 
 msgid "When entering a folder"
 msgstr "Entrando in una cartella"
 

-#: src/prefs_summaries.c:919
+#: src/prefs_summaries.c:825

 msgid "Do nothing"
 msgstr "Non fare nulla"
 
 msgid "Do nothing"
 msgstr "Non fare nulla"
 

-#: src/prefs_summaries.c:920
+#: src/prefs_summaries.c:826

 msgid "Select first unread (or new or marked) message"
 msgstr "Seleziona il primo messaggio non letto (o nuovo o contrassegnato)"
 
 msgid "Select first unread (or new or marked) message"
 msgstr "Seleziona il primo messaggio non letto (o nuovo o contrassegnato)"
 

-#: src/prefs_summaries.c:922
+#: src/prefs_summaries.c:828

 msgid "Select first unread (or marked or new) message"
 msgstr "Seleziona il primo messaggio non letto (o contrassegnato o nuovo)"
 
 msgid "Select first unread (or marked or new) message"
 msgstr "Seleziona il primo messaggio non letto (o contrassegnato o nuovo)"
 

-#: src/prefs_summaries.c:924
+#: src/prefs_summaries.c:830

 msgid "Select first new (or unread or marked) message"
 msgstr "Seleziona il primo messaggio nuovo (o non letto o contrassegnato)"
 
 msgid "Select first new (or unread or marked) message"
 msgstr "Seleziona il primo messaggio nuovo (o non letto o contrassegnato)"
 

-#: src/prefs_summaries.c:926
+#: src/prefs_summaries.c:832

 msgid "Select first new (or marked or unread) message"
 msgstr "Seleziona il primo messaggio nuovo (o contrassegnato o non letto)"
 
 msgid "Select first new (or marked or unread) message"
 msgstr "Seleziona il primo messaggio nuovo (o contrassegnato o non letto)"
 

-#: src/prefs_summaries.c:928
+#: src/prefs_summaries.c:834

 msgid "Select first marked (or new or unread) message"
 msgstr "Seleziona il primo messaggio contrassegnato (o nuovo o non letto)"
 
 msgid "Select first marked (or new or unread) message"
 msgstr "Seleziona il primo messaggio contrassegnato (o nuovo o non letto)"
 

-#: src/prefs_summaries.c:930
+#: src/prefs_summaries.c:836

 msgid "Select first marked (or unread or new) message"
 msgstr "Seleziona il primo messaggio contrassegnato (o non letto o nuovo)"
 
 msgid "Select first marked (or unread or new) message"
 msgstr "Seleziona il primo messaggio contrassegnato (o non letto o nuovo)"
 

-#: src/prefs_summaries.c:942
+#: src/prefs_summaries.c:847

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Mostra la finestra di dialogo \"nessun messaggio non letto (o nuovo)\""
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Mostra la finestra di dialogo \"nessun messaggio non letto (o nuovo)\""
 

-#: src/prefs_summaries.c:959
+#: src/prefs_summaries.c:856

 msgid "Assume 'Yes'"
 msgstr "Assumi 'Sì'"
 
 msgid "Assume 'Yes'"
 msgstr "Assumi 'Sì'"
 

-#: src/prefs_summaries.c:961
+#: src/prefs_summaries.c:858

 msgid "Assume 'No'"
 msgstr "Assumi 'No'"
 
 msgid "Assume 'No'"
 msgstr "Assumi 'No'"
 

-#: src/prefs_summaries.c:970
+#: src/prefs_summaries.c:866
+msgid "Always open message when selected"
+msgstr "Apri sempre i messaggi quando vengono selezionati"
+
+#: src/prefs_summaries.c:869
+msgid "Thread using subject in addition to standard headers"
+msgstr "Incolonna utilizzando l'oggetto in aggiunta alle intestazioni standard"
+
+#: src/prefs_summaries.c:875
+msgid "Execute immediately when moving or deleting messages"
+msgstr ""
+"Esegui immediatamente durante lo spostamento o la cancellazione di messaggi"
+
+#: src/prefs_summaries.c:877
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr ""
+"Rinvia lo spostamento, la copia e la cancellazione dei messaggi finché si "
+"sceglie 'Strumenti/Esegui'"
+
+#: src/prefs_summaries.c:882
+msgid "Only mark message as read when opened in a new window"
+msgstr ""
+"Segna il messaggio come letto solo quando viene aperto in una nuova finestra"
+
+#: src/prefs_summaries.c:889
+msgid "Mark messages as read after"
+msgstr "Marca i messaggi come letti dopo"
+
+#: src/prefs_summaries.c:905
+msgid "Display sender using address book"
+msgstr "Mostra il mittente utilizzando la rubrica"
+
+#: src/prefs_summaries.c:937
+msgid "Date format help"
+msgstr "Aiuto sul formato della data"
+
+#: src/prefs_summaries.c:955
+msgid "Confirm before marking all mails in a folder as read"
+msgstr "Conferma prima di segnare tutti i messaggi in una cartella come letti"
+
+#: src/prefs_summaries.c:958
+msgid "Translate header names"
+msgstr "Traduci nomi intestazioni"
+
+#: src/prefs_summaries.c:960
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"Gli header standard (come 'From:', 'Subject:') verranno visualizzati "
+"tradotti nel vostro linguaggio."
+
+#: src/prefs_summaries.c:967

 msgid " Set key bindings... "
 msgstr " Configura lo schema dei tasti... "
 
 msgid " Set key bindings... "
 msgstr " Configura lo schema dei tasti... "
 

-#: src/prefs_summaries.c:1077
+#: src/prefs_summaries.c:1079

 msgid "Summaries"
 msgstr "Vista Sommario"
 
 msgid "Summaries"
 msgstr "Vista Sommario"
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2359
+#: src/prefs_summary_column.c:81 src/summaryview.c:2360

 msgid "Attachment"
 msgstr "Allegato"
 
 msgid "Attachment"
 msgstr "Allegato"
 


@@ -9949,35 +10225,31 @@ msgstr ""
 msgid "This name is used as the Menu item"
 msgstr "Questo nome è utilizzato come voce di menu"
 
 msgid "This name is used as the Menu item"
 msgstr "Questo nome è utilizzato come voce di menu"
 

-#: src/prefs_template.c:276
+#: src/prefs_template.c:286

 msgid " Symbols... "
 msgstr " Simboli... "
 
 msgid " Symbols... "
 msgstr " Simboli... "
 

-#: src/prefs_template.c:305
+#: src/prefs_template.c:315

 msgid "Template configuration"
 msgstr "Configurazione modello"
 
 msgid "Template configuration"
 msgstr "Configurazione modello"
 

-#: src/prefs_template.c:526
-msgid "Template format error."
-msgstr "Errore nel formato modello."
-
-#: src/prefs_template.c:536
+#: src/prefs_template.c:557

 msgid "Template name is not set."
 msgstr "Il nome del modello non è impostato."
 
 msgid "Template name is not set."
 msgstr "Il nome del modello non è impostato."
 

-#: src/prefs_template.c:625
+#: src/prefs_template.c:667

 msgid "Delete template"
 msgstr "Elimina il modello"
 
 msgid "Delete template"
 msgstr "Elimina il modello"
 

-#: src/prefs_template.c:626
+#: src/prefs_template.c:668

 msgid "Do you really want to delete this template?"
 msgstr "Eliminare questo modello?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Eliminare questo modello?"
 

-#: src/prefs_template.c:763
+#: src/prefs_template.c:805

 msgid "Current templates"
 msgstr "Modelli correnti"
 
 msgid "Current templates"
 msgstr "Modelli correnti"
 

-#: src/prefs_template.c:788
+#: src/prefs_template.c:830

 msgid "Template"
 msgstr "Modello"
 
 msgid "Template"
 msgstr "Modello"
 


@@ -10079,10 +10351,6 @@ msgstr ""
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d temi disponibili (%d utente, %d sistema, 1 interno)"
 
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d temi disponibili (%d utente, %d sistema, 1 interno)"
 

-#: src/prefs_themes.c:706
-msgid "The Sylpheed-Claws Team"
-msgstr "Il Team di Sylpheed-Claws"
-

 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"


@@ -10158,8 +10426,8 @@ msgid "Message view toolbar configuration"
 msgstr "Configurazione toolbar vista messaggio"
 
 #: src/prefs_toolbar.c:643
 msgstr "Configurazione toolbar vista messaggio"
 
 #: src/prefs_toolbar.c:643

-msgid "Sylpheed-Claws Action"
-msgstr "Azione di Sylpheed-Claws"
+msgid "Claws Mail Action"
+msgstr "Azione di Claws Mail"

 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"
 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"


@@ -10229,10 +10497,6 @@ msgstr "A capo nel messaggio"
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 

-#: src/privacy.c:211 src/privacy.c:215 src/privacy.c:232 src/privacy.c:236
-msgid "No signature found"
-msgstr "Firma non trovata"
-

 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Nessuna informazione disponibile"
 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Nessuna informazione disponibile"


@@ -10245,29 +10509,29 @@ msgstr "Nessun tasto destinatario definito."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Errore durante la decodifica BASE64]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Errore durante la decodifica BASE64]\n"
 

-#: src/procmsg.c:908 src/procmsg.c:911
+#: src/procmsg.c:918 src/procmsg.c:921

 msgid "Already trying to send."
 msgstr "Invio già in corso."
 
 msgid "Already trying to send."
 msgstr "Invio già in corso."
 

-#: src/procmsg.c:1499
+#: src/procmsg.c:1517

 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Impossibile aprire il file %s."
 
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Impossibile aprire il file %s."
 

-#: src/procmsg.c:1593
+#: src/procmsg.c:1615

 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Impossibile cifrare il messaggio: %s"
 
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Impossibile cifrare il messaggio: %s"
 

-#: src/procmsg.c:1626
+#: src/procmsg.c:1648

 msgid "Queued message header is broken."
 msgstr "L'intestazione di un messaggio in coda non è valida."
 
 msgid "Queued message header is broken."
 msgstr "L'intestazione di un messaggio in coda non è valida."
 

-#: src/procmsg.c:1647
+#: src/procmsg.c:1669

 msgid "An error happened during SMTP session."
 msgstr "Errore durante la sessione SMTP."
 
 msgid "An error happened during SMTP session."
 msgstr "Errore durante la sessione SMTP."
 

-#: src/procmsg.c:1661
+#: src/procmsg.c:1683

 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."


@@ -10275,29 +10539,29 @@ msgstr ""
 "Nessun account è stato trovato per spedire il messaggio, e c'è stato un "
 "errore durante la sessione SMTP."
 
 "Nessun account è stato trovato per spedire il messaggio, e c'è stato un "
 "errore durante la sessione SMTP."
 

-#: src/procmsg.c:1669
+#: src/procmsg.c:1691

 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "

-"generated by Sylpheed-Claws."
+"generated by Claws Mail."

 msgstr ""
 "Impossibile determinare informazioni di invio. Forse il messaggio non è "
 msgstr ""
 "Impossibile determinare informazioni di invio. Forse il messaggio non è "

-"stato generato da Sylpheed-Claws."
+"stato generato da Claws Mail."

 
 

-#: src/procmsg.c:1687
+#: src/procmsg.c:1709

 msgid "Couldn't create temporary file for news sending."
 msgstr "Impossibile creare il file temporaneo per spedire il messaggio."
 
 msgid "Couldn't create temporary file for news sending."
 msgstr "Impossibile creare il file temporaneo per spedire il messaggio."
 

-#: src/procmsg.c:1700
+#: src/procmsg.c:1722

 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Errore nella scrittura del file temporaneo per la spedizione del messaggio."
 
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Errore nella scrittura del file temporaneo per la spedizione del messaggio."
 

-#: src/procmsg.c:1714
+#: src/procmsg.c:1736

 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Errore durante l'invio del messaggio a %s."
 
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Errore durante l'invio del messaggio a %s."
 

-#: src/procmsg.c:2194
+#: src/procmsg.c:2226

 msgid "Filtering messages...\n"
 msgstr "Filtraggio dei messaggi in corso.\n"
 
 msgid "Filtering messages...\n"
 msgstr "Filtraggio dei messaggi in corso.\n"
 


@@ -10457,12 +10721,12 @@ msgstr "Descrizione dei simboli"
 msgid "The following symbols can be used:"
 msgstr "I simboli seguenti possono essere usati:"
 
 msgid "The following symbols can be used:"
 msgstr "I simboli seguenti possono essere usati:"
 

-#: src/quote_fmt_parse.y:461
+#: src/quote_fmt_parse.y:464

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Inserire il testo per sostituire '%s'"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Inserire il testo per sostituire '%s'"
 

-#: src/quote_fmt_parse.y:462
+#: src/quote_fmt_parse.y:465

 msgid "Enter variable"
 msgstr "Inserisci variabile"
 
 msgid "Enter variable"
 msgstr "Inserisci variabile"
 


@@ -10584,47 +10848,47 @@ msgstr "%s - Sorgente"
 msgid "Saved SSL Certificates"
 msgstr "Certificati SSL salvati"
 
 msgid "Saved SSL Certificates"
 msgstr "Certificati SSL salvati"
 

-#: src/ssl_manager.c:386
+#: src/ssl_manager.c:428

 msgid "Delete certificate"
 msgstr "Cancella certificato"
 
 msgid "Delete certificate"
 msgstr "Cancella certificato"
 

-#: src/ssl_manager.c:387
+#: src/ssl_manager.c:429

 msgid "Do you really want to delete this certificate?"
 msgstr "Eliminare questo certificato?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Eliminare questo certificato?"
 

-#: src/summary_search.c:202
+#: src/summary_search.c:230

 msgid "Search messages"
 msgstr "Cerca messaggi"
 
 msgid "Search messages"
 msgstr "Cerca messaggi"
 

-#: src/summary_search.c:224
+#: src/summary_search.c:252

 msgid "Match any of the following"
 msgstr "Corrispondenza con uno dei seguenti"
 
 msgid "Match any of the following"
 msgstr "Corrispondenza con uno dei seguenti"
 

-#: src/summary_search.c:225
+#: src/summary_search.c:253

 msgid "Match all of the following"
 msgstr "Corrispondenza con tutti i seguenti"
 
 msgid "Match all of the following"
 msgstr "Corrispondenza con tutti i seguenti"
 

-#: src/summary_search.c:284
+#: src/summary_search.c:352

 msgid "From:"
 msgstr "Da:"
 
 msgid "From:"
 msgstr "Da:"
 

-#: src/summary_search.c:305
+#: src/summary_search.c:373

 msgid "Body:"
 msgstr "Corpo:"
 
 msgid "Body:"
 msgstr "Corpo:"
 

-#: src/summary_search.c:312
+#: src/summary_search.c:380

 msgid "Condition:"
 msgstr "Condizione:"
 
 msgid "Condition:"
 msgstr "Condizione:"
 

-#: src/summary_search.c:342
+#: src/summary_search.c:410

 msgid "Find _all"
 msgstr "Trova _tutte le corrispondenze"
 
 msgid "Find _all"
 msgstr "Trova _tutte le corrispondenze"
 

-#: src/summary_search.c:543
+#: src/summary_search.c:645

 msgid "Beginning of list reached; continue from end?"
 msgstr "Raggiunto l'inizio della lista; continuare dalla fine?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "Raggiunto l'inizio della lista; continuare dalla fine?"
 

-#: src/summary_search.c:545
+#: src/summary_search.c:647

 msgid "End of list reached; continue from beginning?"
 msgstr "Raggiunta la fine della lista; continuare dall'inizio?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Raggiunta la fine della lista; continuare dall'inizio?"
 


@@ -10648,11 +10912,11 @@ msgstr "/Ris_pondi a/_mittente"
 msgid "/Repl_y to/mailing _list"
 msgstr "/Ris_pondi a/mailing _list"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Ris_pondi a/mailing _list"
 

-#: src/summaryview.c:424 src/toolbar.c:234
+#: src/summaryview.c:424 src/toolbar.c:239

 msgid "/_Forward"
 msgstr "/_Inoltra"
 
 msgid "/_Forward"
 msgstr "/_Inoltra"
 

-#: src/summaryview.c:425 src/toolbar.c:235
+#: src/summaryview.c:425 src/toolbar.c:240

 msgid "/For_ward as attachment"
 msgstr "/_Inoltra come allegato"
 
 msgid "/For_ward as attachment"
 msgstr "/_Inoltra come allegato"
 


@@ -10917,19 +11181,19 @@ msgstr " voci selezionate"
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totali (%s)"
 
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totali (%s)"
 

-#: src/summaryview.c:2503
+#: src/summaryview.c:2504

 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 

-#: src/summaryview.c:2584
+#: src/summaryview.c:2585

 msgid "Setting summary from message data..."
 msgstr "Creazione del sommario dai messaggi..."
 
 msgid "Setting summary from message data..."
 msgstr "Creazione del sommario dai messaggi..."
 

-#: src/summaryview.c:2762
+#: src/summaryview.c:2763

 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 

-#: src/summaryview.c:2800
+#: src/summaryview.c:2801

 msgid "(No Recipient)"
 msgstr "(Nessun destinatario)"
 
 msgid "(No Recipient)"
 msgstr "(Nessun destinatario)"
 


@@ -10969,27 +11233,27 @@ msgstr "_Aggiungi"
 msgid "_Overwrite"
 msgstr "_Sovrascrivi"
 
 msgid "_Overwrite"
 msgstr "_Sovrascrivi"
 

-#: src/summaryview.c:4423
+#: src/summaryview.c:4431

 msgid "Building threads..."
 msgstr "Costruzione delle discussioni..."
 
 msgid "Building threads..."
 msgstr "Costruzione delle discussioni..."
 

-#: src/summaryview.c:4642
+#: src/summaryview.c:4650

 msgid "Skip these rules"
 msgstr "Salta queste regole"
 
 msgid "Skip these rules"
 msgstr "Salta queste regole"
 

-#: src/summaryview.c:4645
+#: src/summaryview.c:4653

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Applica queste regole al di là dell'account a cui appartengono"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Applica queste regole al di là dell'account a cui appartengono"
 

-#: src/summaryview.c:4648
+#: src/summaryview.c:4656

 msgid "Apply these rules if they apply to the current account"
 msgstr "Applica queste regole se sono relative all'account corrente"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "Applica queste regole se sono relative all'account corrente"
 

-#: src/summaryview.c:4677
+#: src/summaryview.c:4685

 msgid "Filtering"
 msgstr "Filtraggio in corso."
 
 msgid "Filtering"
 msgstr "Filtraggio in corso."
 

-#: src/summaryview.c:4678
+#: src/summaryview.c:4686

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -10997,19 +11261,19 @@ msgstr ""
 "Ci sono alcuni filtri che appartengono ad un account.\n"
 "Scegliere cosa fare con queste regole:"
 
 "Ci sono alcuni filtri che appartengono ad un account.\n"
 "Scegliere cosa fare con queste regole:"
 

-#: src/summaryview.c:4680
+#: src/summaryview.c:4688

 msgid "+_Filter"
 msgstr "+_Filtro"
 
 msgid "+_Filter"
 msgstr "+_Filtro"
 

-#: src/summaryview.c:4707
+#: src/summaryview.c:4715

 msgid "Filtering..."
 msgstr "Filtraggio in corso."
 
 msgid "Filtering..."
 msgstr "Filtraggio in corso."
 

-#: src/summaryview.c:4780
+#: src/summaryview.c:4788

 msgid "Processing configuration"
 msgstr "Configurazione regole elaborazione"
 
 msgid "Processing configuration"
 msgstr "Configurazione regole elaborazione"
 

-#: src/summaryview.c:6220
+#: src/summaryview.c:6235

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -11048,7 +11312,7 @@ msgstr "[%s  %s (%d bytes)]"
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 

-#: src/textview.c:811
+#: src/textview.c:812

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -11062,82 +11326,82 @@ msgstr ""
 "\n"
 "  Utilizzare "
 
 "\n"
 "  Utilizzare "
 

-#: src/textview.c:816
+#: src/textview.c:817

 msgid "'View Log'"
 msgstr "'Mostra log'"
 
 msgid "'View Log'"
 msgstr "'Mostra log'"
 

-#: src/textview.c:817
+#: src/textview.c:818

 msgid " in the Tools menu for more information."
 msgstr " nel menu Strumento per ulteriori informazioni."
 
 # I seguenti 10 messaggi sono stati tradotti in maniera un po'
 # differente, per rendere più omogenea la presentazione..
 # Trovo il messaggio inglese davvero orrendo! :D
 msgid " in the Tools menu for more information."
 msgstr " nel menu Strumento per ulteriori informazioni."
 
 # I seguenti 10 messaggi sono stati tradotti in maniera un po'
 # differente, per rendere più omogenea la presentazione..
 # Trovo il messaggio inglese davvero orrendo! :D

-#: src/textview.c:838
+#: src/textview.c:839

 msgid "  The following can be performed on this part by\n"
 msgstr "  Le seguenti azioni possono essere eseguite su questa parte\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  Le seguenti azioni possono essere eseguite su questa parte\n"
 

-#: src/textview.c:839
+#: src/textview.c:840

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  cliccando con il tasto destro sull'icona o sulla lista:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  cliccando con il tasto destro sull'icona o sulla lista:\n"
 

-#: src/textview.c:841
+#: src/textview.c:842

 msgid "     - To save, select "
 msgstr "     - Per salvare, selezionare "
 
 msgid "     - To save, select "
 msgstr "     - Per salvare, selezionare "
 

-#: src/textview.c:842
+#: src/textview.c:843

 msgid "'Save as...'"
 msgstr "'Salva come...'"
 
 msgid "'Save as...'"
 msgstr "'Salva come...'"
 

-#: src/textview.c:843
+#: src/textview.c:844

 msgid " (Shortcut key: 'y')\n"
 msgstr " (Scorciatoia: 'y')\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (Scorciatoia: 'y')\n"
 

-#: src/textview.c:844
+#: src/textview.c:845

 msgid "     - To display as text, select "
 msgstr "      - Per visualizzare come testo, selezionare "
 
 msgid "     - To display as text, select "
 msgstr "      - Per visualizzare come testo, selezionare "
 

-#: src/textview.c:845
+#: src/textview.c:846

 msgid "'Display as text'"
 msgstr "'Mostra come testo'"
 
 msgid "'Display as text'"
 msgstr "'Mostra come testo'"
 

-#: src/textview.c:846
+#: src/textview.c:847

 msgid " (Shortcut key: 't')\n"
 msgstr "(Scorciatoia: 't')\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr "(Scorciatoia: 't')\n"
 

-#: src/textview.c:847
+#: src/textview.c:848

 msgid "     - To open with an external program, select "
 msgstr "     - Per aprire con un programma esterno, selezionare "
 
 msgid "     - To open with an external program, select "
 msgstr "     - Per aprire con un programma esterno, selezionare "
 

-#: src/textview.c:848
+#: src/textview.c:849

 msgid "'Open'"
 msgstr "'Apri'"
 
 msgid "'Open'"
 msgstr "'Apri'"
 

-#: src/textview.c:849
+#: src/textview.c:850

 msgid " (Shortcut key: 'l')\n"
 msgstr " (Scorciatoia: 'l')\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (Scorciatoia: 'l')\n"
 

-#: src/textview.c:850
+#: src/textview.c:851

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (in alternativa, cliccare due volte o con il tasto centrale "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (in alternativa, cliccare due volte o con il tasto centrale "
 

-#: src/textview.c:851
+#: src/textview.c:852

 msgid "mouse button)\n"
 msgstr "del mouse)\n"
 
 msgid "mouse button)\n"
 msgstr "del mouse)\n"
 

-#: src/textview.c:852
+#: src/textview.c:853

 msgid "     - Or use "
 msgstr "     - O utilizzare "
 
 msgid "     - Or use "
 msgstr "     - O utilizzare "
 

-#: src/textview.c:853
+#: src/textview.c:854

 msgid "'Open with...'"
 msgstr "'Apri con...'"
 
 msgid "'Open with...'"
 msgstr "'Apri con...'"
 

-#: src/textview.c:854
+#: src/textview.c:855

 msgid " (Shortcut key: 'o')\n"
 msgstr " (Scorciatoia: 't')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (Scorciatoia: 't')\n"
 

-#: src/textview.c:943
+#: src/textview.c:944

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -11149,7 +11413,7 @@ msgstr ""
 "\t%s\n"
 "Codice d'uscita %d\n"
 
 "\t%s\n"
 "Codice d'uscita %d\n"
 

-#: src/textview.c:2488
+#: src/textview.c:2492

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -11168,226 +11432,242 @@ msgstr ""
 "\n"
 "Aprirlo comunque?"
 
 "\n"
 "Aprirlo comunque?"
 

-#: src/textview.c:2497
+#: src/textview.c:2501

 msgid "Phishing attempt warning"
 msgstr "Avviso tentativo di phishing"
 
 msgid "Phishing attempt warning"
 msgstr "Avviso tentativo di phishing"
 

-#: src/textview.c:2498
+#: src/textview.c:2502

 msgid "_Open URL"
 msgstr "_Apri URL"
 
 msgid "_Open URL"
 msgstr "_Apri URL"
 

-#: src/toolbar.c:162 src/toolbar.c:1486
+#: src/toolbar.c:166 src/toolbar.c:1535

 msgid "Receive Mail on all Accounts"
 msgstr "Preleva la posta di tutti gli account"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Preleva la posta di tutti gli account"
 

-#: src/toolbar.c:163 src/toolbar.c:1500
+#: src/toolbar.c:167 src/toolbar.c:1549

 msgid "Receive Mail on current Account"
 msgstr "Preleva la posta dell'account attivo"
 
 msgid "Receive Mail on current Account"
 msgstr "Preleva la posta dell'account attivo"
 

-#: src/toolbar.c:164 src/toolbar.c:1506
+#: src/toolbar.c:168 src/toolbar.c:1555

 msgid "Send Queued Messages"
 msgstr "Invia i messaggi in coda"
 
 msgid "Send Queued Messages"
 msgstr "Invia i messaggi in coda"
 

-#: src/toolbar.c:165 src/toolbar.c:1519
+#: src/toolbar.c:169 src/toolbar.c:1568

 msgid "Compose Email"
 msgstr "Componi Email"
 
 msgid "Compose Email"
 msgstr "Componi Email"
 

-#: src/toolbar.c:166 src/toolbar.c:1523
+#: src/toolbar.c:170 src/toolbar.c:1572

 msgid "Compose News"
 msgstr "Componi messaggio news"
 
 msgid "Compose News"
 msgstr "Componi messaggio news"
 

-#: src/toolbar.c:167 src/toolbar.c:1554 src/toolbar.c:1564
+#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624

 msgid "Reply to Message"
 msgstr "Rispondi al messaggio"
 
 msgid "Reply to Message"
 msgstr "Rispondi al messaggio"
 

-#: src/toolbar.c:168 src/toolbar.c:1571 src/toolbar.c:1581
+#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641

 msgid "Reply to Sender"
 msgstr "Rispondi al mittente"
 
 msgid "Reply to Sender"
 msgstr "Rispondi al mittente"
 

-#: src/toolbar.c:169 src/toolbar.c:1588 src/toolbar.c:1598
+#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658

 msgid "Reply to All"
 msgstr "Rispondi a tutti"
 
 msgid "Reply to All"
 msgstr "Rispondi a tutti"
 

-#: src/toolbar.c:170 src/toolbar.c:1605 src/toolbar.c:1615
+#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675

 msgid "Reply to Mailing-list"
 msgstr "Rispondi alla mailing-list"
 
 msgid "Reply to Mailing-list"
 msgstr "Rispondi alla mailing-list"
 

-#: src/toolbar.c:171 src/toolbar.c:1622 src/toolbar.c:1632
+#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692

 msgid "Forward Message"
 msgstr "Inoltra il messaggio"
 
 msgid "Forward Message"
 msgstr "Inoltra il messaggio"
 

-#: src/toolbar.c:172 src/toolbar.c:1639
+#: src/toolbar.c:176 src/toolbar.c:1699

 msgid "Trash Message"
 msgstr "Cestina il messaggio"
 
 msgid "Trash Message"
 msgstr "Cestina il messaggio"
 

-#: src/toolbar.c:173 src/toolbar.c:1645
+#: src/toolbar.c:177 src/toolbar.c:1705

 msgid "Delete Message"
 msgstr "Elimina il messaggio"
 
 msgid "Delete Message"
 msgstr "Elimina il messaggio"
 

-#: src/toolbar.c:175 src/toolbar.c:1657
+#: src/toolbar.c:179 src/toolbar.c:1717

 msgid "Go to Previous Unread Message"
 msgstr "Vai al precedente messaggio non letto"
 
 msgid "Go to Previous Unread Message"
 msgstr "Vai al precedente messaggio non letto"
 

-#: src/toolbar.c:176 src/toolbar.c:1664
+#: src/toolbar.c:180 src/toolbar.c:1724

 msgid "Go to Next Unread Message"
 msgstr "Vai al successivo messaggio non letto"
 
 msgid "Go to Next Unread Message"
 msgstr "Vai al successivo messaggio non letto"
 

-#: src/toolbar.c:179
+#: src/toolbar.c:183

 msgid "Learn Spam or Ham"
 msgstr "Apprendi spam o non-spam"
 
 msgid "Learn Spam or Ham"
 msgstr "Apprendi spam o non-spam"
 

-#: src/toolbar.c:181 src/toolbar.c:1673
+#: src/toolbar.c:185 src/toolbar.c:1733

 msgid "Send Message"
 msgstr "Invia il messaggio"
 
 msgid "Send Message"
 msgstr "Invia il messaggio"
 

-#: src/toolbar.c:182 src/toolbar.c:1679
+#: src/toolbar.c:186 src/toolbar.c:1739

 msgid "Put into queue folder and send later"
 msgstr "Metti in coda e invia più tardi"
 
 msgid "Put into queue folder and send later"
 msgstr "Metti in coda e invia più tardi"
 

-#: src/toolbar.c:183 src/toolbar.c:1685
+#: src/toolbar.c:187 src/toolbar.c:1745

 msgid "Save to draft folder"
 msgstr "Salva nella cartella delle bozze"
 
 msgid "Save to draft folder"
 msgstr "Salva nella cartella delle bozze"
 

-#: src/toolbar.c:184 src/toolbar.c:1691
+#: src/toolbar.c:188 src/toolbar.c:1751

 msgid "Insert file"
 msgstr "Inserisci file"
 
 msgid "Insert file"
 msgstr "Inserisci file"
 

-#: src/toolbar.c:185 src/toolbar.c:1697
+#: src/toolbar.c:189 src/toolbar.c:1757

 msgid "Attach file"
 msgstr "Allega file"
 
 msgid "Attach file"
 msgstr "Allega file"
 

-#: src/toolbar.c:186 src/toolbar.c:1703
+#: src/toolbar.c:190 src/toolbar.c:1763

 msgid "Insert signature"
 msgstr "Inserisci firma"
 
 msgid "Insert signature"
 msgstr "Inserisci firma"
 

-#: src/toolbar.c:187 src/toolbar.c:1709
+#: src/toolbar.c:191 src/toolbar.c:1769

 msgid "Edit with external editor"
 msgstr "Modifica con un editor esterno"
 
 msgid "Edit with external editor"
 msgstr "Modifica con un editor esterno"
 

-#: src/toolbar.c:188 src/toolbar.c:1715
+#: src/toolbar.c:192 src/toolbar.c:1775

 msgid "Wrap long lines of current paragraph"
 msgstr "A capo tutte le linee lunghe del paragrafo"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "A capo tutte le linee lunghe del paragrafo"
 

-#: src/toolbar.c:189 src/toolbar.c:1721
+#: src/toolbar.c:193 src/toolbar.c:1781

 msgid "Wrap all long lines"
 msgstr "A capo tutte le linee lunghe"
 
 msgid "Wrap all long lines"
 msgstr "A capo tutte le linee lunghe"
 

-#: src/toolbar.c:192 src/toolbar.c:1734
+#: src/toolbar.c:196 src/toolbar.c:1794

 msgid "Check spelling"
 msgstr "Controlla l'ortografia"
 
 msgid "Check spelling"
 msgstr "Controlla l'ortografia"
 

-#: src/toolbar.c:194
-msgid "Sylpheed-Claws Actions Feature"
-msgstr "Caratteristica delle azioni di Sylpheed-Claws"
+#: src/toolbar.c:198
+msgid "Claws Mail Actions Feature"
+msgstr "Caratteristica delle azioni di Claws Mail"

 
 

-#: src/toolbar.c:214
+#: src/toolbar.c:199 src/toolbar.c:1817
+msgid "Cancel receiving"
+msgstr "Cancella la ricezione"
+
+#: src/toolbar.c:219

 msgid "/Reply with _quote"
 msgstr "/Rispondi con _citazione"
 
 msgid "/Reply with _quote"
 msgstr "/Rispondi con _citazione"
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/_Reply without quote"
 msgstr "/Rispondi _senza citazione"
 
 msgid "/_Reply without quote"
 msgstr "/Rispondi _senza citazione"
 

-#: src/toolbar.c:219
+#: src/toolbar.c:224

 msgid "/Reply to all with _quote"
 msgstr "/Rispondi a tutti con citazione"
 
 msgid "/Reply to all with _quote"
 msgstr "/Rispondi a tutti con citazione"
 

-#: src/toolbar.c:220
+#: src/toolbar.c:225

 msgid "/_Reply to all without quote"
 msgstr "/Rispondi a tutti senza citazione"
 
 msgid "/_Reply to all without quote"
 msgstr "/Rispondi a tutti senza citazione"
 

-#: src/toolbar.c:224
+#: src/toolbar.c:229

 msgid "/Reply to list with _quote"
 msgstr "/Rispondi alla lista con _citazione"
 
 msgid "/Reply to list with _quote"
 msgstr "/Rispondi alla lista con _citazione"
 

-#: src/toolbar.c:225
+#: src/toolbar.c:230

 msgid "/_Reply to list without quote"
 msgstr "/Rispondi alla lista sen_za citazione"
 
 msgid "/_Reply to list without quote"
 msgstr "/Rispondi alla lista sen_za citazione"
 

-#: src/toolbar.c:229
+#: src/toolbar.c:234

 msgid "/Reply to sender with _quote"
 msgstr "/Rispondi al mittente con citazione"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Rispondi al mittente con citazione"
 

-#: src/toolbar.c:230
+#: src/toolbar.c:235

 msgid "/_Reply to sender without quote"
 msgstr "/Rispondi al mittente senza citazione"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Rispondi al mittente senza citazione"
 

-#: src/toolbar.c:236
+#: src/toolbar.c:241

 msgid "/Redirec_t"
 msgstr "/Re_dirigi"
 
 msgid "/Redirec_t"
 msgstr "/Re_dirigi"
 

-#: src/toolbar.c:389
+#: src/toolbar.c:245
+msgid "/Learn as _Spam"
+msgstr "/Memorizza come _Spam"
+
+#: src/toolbar.c:246
+msgid "/Learn as _Ham"
+msgstr "/Memorizza come _non-spam"
+
+#: src/toolbar.c:399

 msgid "Get Mail"
 msgstr "Ricevi"
 
 msgid "Get Mail"
 msgstr "Ricevi"
 

-#: src/toolbar.c:395 src/toolbar.c:486
+#: src/toolbar.c:403
+msgid "Toolbar|Compose"
+msgstr "Nuovo messaggio"
+
+#: src/toolbar.c:405 src/toolbar.c:496

 msgid "Reply"
 msgstr "Rispondi"
 
 msgid "Reply"
 msgstr "Rispondi"
 

-#: src/toolbar.c:396 src/toolbar.c:487
+#: src/toolbar.c:406 src/toolbar.c:497

 msgid "All"
 msgstr "Tutti"
 
 msgid "All"
 msgstr "Tutti"
 

-#: src/toolbar.c:397 src/toolbar.c:488
+#: src/toolbar.c:407 src/toolbar.c:498

 msgid "Sender"
 msgstr "Mittente"
 
 msgid "Sender"
 msgstr "Mittente"
 

-#: src/toolbar.c:402 src/toolbar.c:493
+#: src/toolbar.c:412 src/toolbar.c:503

 msgid "Spam"
 msgstr "Spam"
 
 msgid "Spam"
 msgstr "Spam"
 

-#: src/toolbar.c:405 src/toolbar.c:495
+#: src/toolbar.c:415 src/toolbar.c:505

 msgid "Next"
 msgstr "Successivo"
 
 msgid "Next"
 msgstr "Successivo"
 

-#: src/toolbar.c:443
+#: src/toolbar.c:453

 msgid "Send later"
 msgstr "Invia più tardi"
 
 msgid "Send later"
 msgstr "Invia più tardi"
 

-#: src/toolbar.c:444
+#: src/toolbar.c:454

 msgid "Draft"
 msgstr "Nelle bozze"
 
 msgid "Draft"
 msgstr "Nelle bozze"
 

-#: src/toolbar.c:1493
+#: src/toolbar.c:1542

 msgid "Receive Mail on selected Account"
 msgstr "Preleva la posta degli account selezionati"
 
 msgid "Receive Mail on selected Account"
 msgstr "Preleva la posta degli account selezionati"
 

-#: src/toolbar.c:1530
+#: src/toolbar.c:1579

 msgid "Compose with selected Account"
 msgstr "Componi con l'account selezionato"
 
 msgid "Compose with selected Account"
 msgstr "Componi con l'account selezionato"
 

-#: src/toolbar.c:1536
+#: src/toolbar.c:1585

 msgid "Ham"
 msgstr "Non-spam"
 
 msgid "Ham"
 msgstr "Non-spam"
 

-#: src/toolbar.c:1544
+#: src/toolbar.c:1593

 msgid "Learn Spam"
 msgstr "Apprendi spam"
 
 msgid "Learn Spam"
 msgstr "Apprendi spam"
 

-#: src/toolbar.c:1548
+#: src/toolbar.c:1597

 msgid "Learn Ham"
 msgstr "Apprendi non-spam"
 
 msgid "Learn Ham"
 msgstr "Apprendi non-spam"
 

-#: src/wizard.c:459
-msgid "Welcome to Sylpheed-Claws "
-msgstr "Benvenuti in Sylpheed-Claws "
+#: src/toolbar.c:1607
+msgid "Learn as..."
+msgstr "Apprendi come..."

 
 

-#: src/wizard.c:469
-msgid "Sylpheed-Claws Team"
-msgstr "Il Team di Sylpheed-Claws"
+#: src/wizard.c:461
+msgid "Welcome Mail Subject|Welcome to Claws Mail"
+msgstr "Benvenuti in Claws Mail"

 
 

-#: src/wizard.c:475
+#: src/wizard.c:484

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"

-"Welcome to Sylpheed-Claws\n"
-"-------------------------\n"
+"Welcome to Claws Mail\n"
+"---------------------\n"

 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"
 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"

-"Sylpheed-Claws has lots of extra features accessible via plugins,\n"
+"Claws Mail has lots of extra features accessible via plugins,\n"

 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"
 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"


@@ -11398,7 +11678,7 @@ msgid ""
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"

-"You can find further information in the Sylpheed-Claws manual,\n"
+"You can find further information in the Claws Mail manual,\n"

 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"
 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"


@@ -11412,7 +11692,7 @@ msgid ""
 "\n"
 "LICENSE\n"
 "-------\n"
 "\n"
 "LICENSE\n"
 "-------\n"

-"Sylpheed-Claws is free software, released under the terms\n"
+"Claws Mail is free software, released under the terms\n"

 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"


@@ -11420,19 +11700,19 @@ msgid ""
 "\n"
 "DONATIONS\n"
 "---------\n"
 "\n"
 "DONATIONS\n"
 "---------\n"

-"If you wish to donate to the Sylpheed-Claws project you can do\n"
+"If you wish to donate to the Claws Mail project you can do\n"

 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"
 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"

-"Benvenuti in Sylpheed-Claws\n"
+"Benvenuti in Claws Mail\n"

 "-------------------------\n"
 "\n"
 "Ora che avete configurato il vostro account, siete in grado\n"
 "di prelevare la vostra posta cliccando sul pulsante 'Ricevi',\n"
 "posizionato nella parte sinistra della barra degli strumenti.\n"
 "\n"
 "-------------------------\n"
 "\n"
 "Ora che avete configurato il vostro account, siete in grado\n"
 "di prelevare la vostra posta cliccando sul pulsante 'Ricevi',\n"
 "posizionato nella parte sinistra della barra degli strumenti.\n"
 "\n"

-"Sylpheed-Claws possiede molte caratteristiche extra, accessibili \n"
+"Claws Mail possiede molte caratteristiche extra, accessibili \n"

 "tramite plugin, come i filtri anti-spam (tramite il plugin Bogofilter\n"
 "o il plugin SpamAssassin), protezione della privacy (via PGP/Mime), un\n"
 "lettore di feed RSS, un calendario e molto altro. È possibile accedervi\n"
 "tramite plugin, come i filtri anti-spam (tramite il plugin Bogofilter\n"
 "o il plugin SpamAssassin), protezione della privacy (via PGP/Mime), un\n"
 "lettore di feed RSS, un calendario e molto altro. È possibile accedervi\n"


@@ -11443,7 +11723,7 @@ msgstr ""
 "e cambiare le opzioni generali utilizzando la voce\n"
 "'/Configurazione/Preferenze'\n"
 "\n"
 "e cambiare le opzioni generali utilizzando la voce\n"
 "'/Configurazione/Preferenze'\n"
 "\n"

-"È possibile trovare ulteriori informazioni nel manuale di Sylpheed-Claws,\n"
+"È possibile trovare ulteriori informazioni nel manuale di Claws Mail,\n"

 "che è accessibile utilizzando la voce di menu '/Aiuto/Manuale',\n"
 "o online all'URL elencato sotto.\n"
 "\n"
 "che è accessibile utilizzando la voce di menu '/Aiuto/Manuale',\n"
 "o online all'URL elencato sotto.\n"
 "\n"


@@ -11457,7 +11737,7 @@ msgstr ""
 "\n"
 "LICENZA\n"
 "-------\n"
 "\n"
 "LICENZA\n"
 "-------\n"

-"Sylpheed-Claws è software libero, rilasciato sotto i termini\n"
+"Claws Mail è software libero, rilasciato sotto i termini\n"

 "della Licenza Pubblica Generale GNU (GNU GPL), versione 2 o\n"
 "successiva, come pubblicata dalla Free Software Foundation, 51\n"
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. La\n"
 "della Licenza Pubblica Generale GNU (GNU GPL), versione 2 o\n"
 "successiva, come pubblicata dalla Free Software Foundation, 51\n"
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. La\n"


@@ -11465,59 +11745,75 @@ msgstr ""
 "\n"
 "DONAZIONI\n"
 "---------\n"
 "\n"
 "DONAZIONI\n"
 "---------\n"

-"Se volete donare qualcosa al progetto Sylpheed-Claws, potete farlo\n"
+"Se volete donare qualcosa al progetto Claws Mail, potete farlo\n"

 "all'indirizzo <%s>.\n"
 "\n"
 
 "all'indirizzo <%s>.\n"
 "\n"
 

-#: src/wizard.c:551
+#: src/wizard.c:564

 msgid "Please enter the mailbox name."
 msgstr "Inserire il nome della mailbox."
 
 msgid "Please enter the mailbox name."
 msgstr "Inserire il nome della mailbox."
 

-#: src/wizard.c:579
+#: src/wizard.c:592

 msgid "Please enter your name and email address."
 msgstr "Inserire il nome e l'indirizzo email."
 
 msgid "Please enter your name and email address."
 msgstr "Inserire il nome e l'indirizzo email."
 

-#: src/wizard.c:590
+#: src/wizard.c:603

 msgid "Please enter your receiving server and username."
 msgstr "Inserire il server di ricezione ed il nome utente"
 
 msgid "Please enter your receiving server and username."
 msgstr "Inserire il server di ricezione ed il nome utente"
 

-#: src/wizard.c:600
+#: src/wizard.c:613

 msgid "Please enter your username."
 msgstr "Inserire il nome utente"
 
 msgid "Please enter your username."
 msgstr "Inserire il nome utente"
 

-#: src/wizard.c:610
+#: src/wizard.c:623

 msgid "Please enter your SMTP server."
 msgstr "Inserire il server SMTP."
 
 msgid "Please enter your SMTP server."
 msgstr "Inserire il server SMTP."
 

-#: src/wizard.c:621
+#: src/wizard.c:634

 msgid "Please enter your SMTP username."
 msgstr "Inserire il nome utente SMTP."
 
 msgid "Please enter your SMTP username."
 msgstr "Inserire il nome utente SMTP."
 

-#: src/wizard.c:832
+#: src/wizard.c:881

 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Nome:</span>"
 
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Nome:</span>"
 

-#: src/wizard.c:837
+#: src/wizard.c:886

 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Indirizzo email:</span>"
 
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Indirizzo email:</span>"
 

-#: src/wizard.c:841
+#: src/wizard.c:890

 msgid "Your organization:"
 msgstr "Organizzazione:"
 
 msgid "Your organization:"
 msgstr "Organizzazione:"
 

-#: src/wizard.c:861
+#: src/wizard.c:913
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr ""
+"È anche possibile specificare un percorso assoluto, come ad esempio\"/home/"
+"pippo/Documenti/Mail\""
+
+#: src/wizard.c:917

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nome mailbox:</span>"
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nome mailbox:</span>"
 

-#: src/wizard.c:891
+#: src/wizard.c:954
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr ""
+"È possibile specificare il numero della porta aggiungendolo alla fine:\"mail."
+"esempio.it:25\""
+
+#: src/wizard.c:958

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Indirizzo server SMTP:</span>"
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Indirizzo server SMTP:</span>"
 

-#: src/wizard.c:894
+#: src/wizard.c:961

 msgid "Use authentication"
 msgstr "Utilizzare autenticazione"
 
 msgid "Use authentication"
 msgstr "Utilizzare autenticazione"
 

-#: src/wizard.c:908
+#: src/wizard.c:975

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11526,7 +11822,7 @@ msgstr ""
 "<span size=\"small\">(lasciare vuoto per utilizzare lo stesso nome utente "
 "utilizzato in ricezione)</span>"
 
 "<span size=\"small\">(lasciare vuoto per utilizzare lo stesso nome utente "
 "utilizzato in ricezione)</span>"
 

-#: src/wizard.c:921
+#: src/wizard.c:988

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11535,99 +11831,115 @@ msgstr ""
 "<span size=\"small\">(lasciare vuoto per utilizzare la stessa password "
 "utilizzata in ricezione)</span>"
 
 "<span size=\"small\">(lasciare vuoto per utilizzare la stessa password "
 "utilizzata in ricezione)</span>"
 

-#: src/wizard.c:949 src/wizard.c:964 src/wizard.c:1055
+#: src/wizard.c:1000
+msgid "Use SSL to connect to SMTP server"
+msgstr "Utilizza SSL per la connessione SMTP"
+
+#: src/wizard.c:1007 src/wizard.c:1230
+msgid "Use SSL via STARTTLS"
+msgstr "Utilizzare SSL tramite STARTTLS"
+
+#: src/wizard.c:1037 src/wizard.c:1056 src/wizard.c:1165

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Indirizzo server:</span>"
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Indirizzo server:</span>"
 

-#: src/wizard.c:980
+#: src/wizard.c:1076

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Mailbox locale:</span>"
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Mailbox locale:</span>"
 

-#: src/wizard.c:1022
+#: src/wizard.c:1127

 msgid "IMAP"
 msgstr "IMAP"
 
 msgid "IMAP"
 msgstr "IMAP"
 

-#: src/wizard.c:1047
+#: src/wizard.c:1152

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Tipo server:</span>"
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Tipo server:</span>"
 

-#: src/wizard.c:1066
+#: src/wizard.c:1161
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr ""
+"È possibile specificare il numero della porta aggiungendolo alla fine:\"mail."
+"esempio.it:110\""
+
+#: src/wizard.c:1176

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Nome utente:</span>"
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Nome utente:</span>"
 

-#: src/wizard.c:1082
+#: src/wizard.c:1192

 msgid "Password:"
 msgstr "Password:"
 
 msgid "Password:"
 msgstr "Password:"
 

-#: src/wizard.c:1094
+#: src/wizard.c:1204

 msgid "IMAP server directory:"
 msgstr "Directory del server IMAP:"
 
 msgid "IMAP server directory:"
 msgstr "Directory del server IMAP:"
 

-#: src/wizard.c:1125
-msgid "Use SSL to connect to SMTP server"
-msgstr "Utilizza SSL per la connessione SMTP"
-
-#: src/wizard.c:1132
+#: src/wizard.c:1223

 msgid "Use SSL to connect to receiving server"
 msgstr "Utilizza SSL per la ricezione"
 
 msgid "Use SSL to connect to receiving server"
 msgstr "Utilizza SSL per la ricezione"
 

-#: src/wizard.c:1248
-msgid "Sylpheed-Claws Setup Wizard"
-msgstr "Wizard di Sylpheed-Claws"
+#: src/wizard.c:1347
+msgid "Claws Mail Setup Wizard"
+msgstr "Wizard di Claws Mail"

 
 

-#: src/wizard.c:1280
-msgid "Welcome to Sylpheed-Claws"
-msgstr "Benvenuti in Sylpheed-Claws"
+#: src/wizard.c:1379
+msgid "Welcome to Claws Mail"
+msgstr "Benvenuti in Claws Mail "

 
 

-#: src/wizard.c:1288
+#: src/wizard.c:1387

 msgid ""
 msgid ""

-"Welcome to the Sylpheed-Claws setup wizard.\n"
+"Welcome to the Claws Mail setup wizard.\n"

 "\n"
 "We will begin by defining some basic information about you and your most "
 "\n"
 "We will begin by defining some basic information about you and your most "

-"common mail options so that you can start to use Sylpheed-Claws in less than "
+"common mail options so that you can start to use Claws Mail in less than "

 "five minutes."
 msgstr ""
 "five minutes."
 msgstr ""

-"Benvenuti nel Wizard di Sylpheed-Claws.\n"
+"Benvenuti nel Wizard di Claws Mail.\n"

 "\n"
 "Inizieremo definendo alcune informazioni di base ed alcune tra le più comuni "
 "opzioni riguardanti gli account e-mail, per poter iniziare ad utilizzare "
 "\n"
 "Inizieremo definendo alcune informazioni di base ed alcune tra le più comuni "
 "opzioni riguardanti gli account e-mail, per poter iniziare ad utilizzare "

-"Sylpheed-Claws in meno di cinque minuti."
+"Claws Mail in meno di cinque minuti."

 
 

-#: src/wizard.c:1301
+#: src/wizard.c:1400

 msgid "About You"
 msgstr "Info personali"
 
 msgid "About You"
 msgstr "Info personali"
 

-#: src/wizard.c:1303 src/wizard.c:1312 src/wizard.c:1321 src/wizard.c:1331
-#: src/wizard.c:1341
+#: src/wizard.c:1402 src/wizard.c:1411 src/wizard.c:1420 src/wizard.c:1430

 msgid "Bold fields must be completed"
 msgstr "I campi in grassetto devono essere compilati"
 
 msgid "Bold fields must be completed"
 msgstr "I campi in grassetto devono essere compilati"
 

-#: src/wizard.c:1310
+#: src/wizard.c:1409

 msgid "Receiving mail"
 msgstr "Ricezione"
 
 msgid "Receiving mail"
 msgstr "Ricezione"
 

-#: src/wizard.c:1319
+#: src/wizard.c:1418

 msgid "Sending mail"
 msgstr "Invio"
 
 msgid "Sending mail"
 msgstr "Invio"
 

-#: src/wizard.c:1329
+#: src/wizard.c:1428

 msgid "Saving mail on disk"
 msgstr "Salvataggio su disco delle mail"
 
 msgid "Saving mail on disk"
 msgstr "Salvataggio su disco delle mail"
 

-#: src/wizard.c:1339
-msgid "Security"
-msgstr "Sicurezza"
-
-#: src/wizard.c:1349
+#: src/wizard.c:1438

 msgid "Configuration finished"
 msgstr "Configurazione terminata"
 
 msgid "Configuration finished"
 msgstr "Configurazione terminata"
 

-#: src/wizard.c:1357
+#: src/wizard.c:1446

 msgid ""
 msgid ""

-"Sylpheed-Claws is now ready.\n"
+"Claws Mail is now ready.\n"

 "\n"
 "Click Save to start."
 msgstr ""
 "\n"
 "Click Save to start."
 msgstr ""

-"Sylpheed-Claws è pronto.\n"
+"Claws Mail è pronto.\n"

 "\n"
 "Cliccare su 'Salva' per partire."
 "\n"
 "Cliccare su 'Salva' per partire."

+
+#~ msgid "not initialized\n"
+#~ msgstr "non inizializzato\n"
+
+#~ msgid "selecting folder '%s'\n"
+#~ msgstr "selezionando la cartella '%s'\n"
+
+#~ msgid "selecting message %d\n"
+#~ msgstr "selezionando il messaggio %d\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 84cfadc8d99036a4cd0bfb27e798d657f0f96c77..bffa8bd2d70d3b21af768aa086b6149861272ce7 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,14 +1,14 @@
 # translation of pt_BR.po to Português do Brasil
 # translation of pt_BR.po to Português do Brasil

-# Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2006.
+# Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2006, 2007.

 # Tradução de Sylpheed-Claws para Português Brasileiro
 # Brazilian Portuguese translation of Sylpheed-Claws
 # Updated 2006-02-11 by : Frederico Goncalves Guimaraes <frederico@teia.bio.br>
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 # Tradução de Sylpheed-Claws para Português Brasileiro
 # Brazilian Portuguese translation of Sylpheed-Claws
 # Updated 2006-02-11 by : Frederico Goncalves Guimaraes <frederico@teia.bio.br>
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"

-"Report-Msgid-Bugs-To: paul@sylpheed.org\n"
-"POT-Creation-Date: 2006-11-02 17:05+0100\n"
-"PO-Revision-Date: 2006-11-02 21:27-0300\n"
+"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
+"POT-Creation-Date: 2006-12-22 10:23+0000\n"
+"PO-Revision-Date: 2007-01-03 21:17-0200\n"

 "Last-Translator: Frederico Goncalves Guimaraes <frederico@teia.bio.br>\n"
 "Language-Team: Português do Brasil\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Frederico Goncalves Guimaraes <frederico@teia.bio.br>\n"
 "Language-Team: Português do Brasil\n"
 "MIME-Version: 1.0\n"


@@ -34,14 +34,8 @@ msgid "Edit accounts"
 msgstr "Editar contas"
 
 #: src/account.c:700
 msgstr "Editar contas"
 
 #: src/account.c:700

-msgid ""
-"Using 'Get Mail' will retrieve messages from your Accounts in the order "
-"given, the checkbox in the 'G' column indicates which accounts will be "
-"included."
-msgstr ""
-"Ao usar a opção 'Receber mensagens' as mensagens serão recuperadas das suas "
-"contas, na ordem fornecida. As contas que possuam uma marca na coluna 'G' "
-"serão verificadas."
+msgid "Using 'Get Mail' will retrieve messages from your Accounts in the order given, the checkbox in the 'G' column indicates which accounts will be included."
+msgstr "Ao usar a opção 'Receber mensagens' as mensagens serão recuperadas das suas contas, na ordem fornecida. As contas que possuam uma marca na coluna 'G' serão verificadas."

 
 #: src/account.c:773
 msgid " _Set as default account "
 
 #: src/account.c:773
 msgid " _Set as default account "


@@ -69,29 +63,52 @@ msgstr "(Sem título)"
 msgid "Delete account"
 msgstr "Excluir conta"
 
 msgid "Delete account"
 msgstr "Excluir conta"
 

-#: src/account.c:1458
+#: src/account.c:1461
+msgid "Accounts List Default Column Name|D"
+msgstr "Accounts List Default Column Name|P"
+
+#: src/account.c:1467

 msgid "Default account"
 msgstr "Conta padrão"
 
 msgid "Default account"
 msgstr "Conta padrão"
 

-#: src/account.c:1472
+#: src/account.c:1475
+msgid "Accounts List Get Column Name|G"
+msgstr "Accounts List Get Column Name|R"
+
+#: src/account.c:1481

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'Receber mensagem' busca os e-mails das contas marcadas"
 

-#: src/account.c:1479 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5684 src/compose.c:5975 src/editaddress.c:953
-#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:287
-#: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
-#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
-#: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364
-#: src/prefs_filtering.c:1481 src/prefs_template.c:185
+#: src/account.c:1488
+#: src/addressadd.c:196
+#: src/addressbook.c:132
+#: src/compose.c:5821
+#: src/compose.c:6112
+#: src/editaddress.c:1041
+#: src/editaddress.c:1090
+#: src/editbook.c:175
+#: src/editgroup.c:287
+#: src/editjpilot.c:270
+#: src/editldap.c:424
+#: src/editvcard.c:183
+#: src/importmutt.c:226
+#: src/importpine.c:226
+#: src/mimeview.c:213
+#: src/plugins/pgpcore/select-keys.c:376
+#: src/prefs_filtering.c:364
+#: src/prefs_filtering.c:1481
+#: src/prefs_template.c:185

 msgid "Name"
 msgstr "Nome"
 
 msgid "Name"
 msgstr "Nome"
 

-#: src/account.c:1486 src/prefs_account.c:1169 src/prefs_account.c:2697
+#: src/account.c:1495
+#: src/prefs_account.c:1176
+#: src/prefs_account.c:2712

 msgid "Protocol"
 msgstr "Protocolo"
 
 msgid "Protocol"
 msgstr "Protocolo"
 

-#: src/account.c:1493 src/ssl_manager.c:102
+#: src/account.c:1502
+#: src/ssl_manager.c:102

 msgid "Server"
 msgstr "Servidor"
 
 msgid "Server"
 msgstr "Servidor"
 


@@ -137,7 +154,8 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1144 src/action.c:1294
+#: src/action.c:1144
+#: src/action.c:1294

 msgid "Completed"
 msgstr "Completado"
 
 msgid "Completed"
 msgstr "Completado"
 


@@ -155,7 +173,7 @@ msgstr "--- Finalizado: %s\n"
 msgid "Action's input/output"
 msgstr "Entrada/saída da ação"
 
 msgid "Action's input/output"
 msgstr "Entrada/saída da ação"
 

-#: src/action.c:1527
+#: src/action.c:1529

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -166,11 +184,11 @@ msgstr ""
 "('%%h' será substituído pelo argumento)\n"
 "  %s"
 
 "('%%h' será substituído pelo argumento)\n"
 "  %s"
 

-#: src/action.c:1532
+#: src/action.c:1534

 msgid "Action's hidden user argument"
 msgstr "Argumento do usuário para a ação escondido"
 
 msgid "Action's hidden user argument"
 msgstr "Argumento do usuário para a ação escondido"
 

-#: src/action.c:1536
+#: src/action.c:1538

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -181,7 +199,7 @@ msgstr ""
 "('%%u' será substituído pelo argumento)\n"
 "  %s"
 
 "('%%u' será substituído pelo argumento)\n"
 "  %s"
 

-#: src/action.c:1541
+#: src/action.c:1543

 msgid "Action's user argument"
 msgstr "Argumento do usuário para ação"
 
 msgid "Action's user argument"
 msgstr "Argumento do usuário para ação"
 


@@ -189,13 +207,17 @@ msgstr "Argumento do usuário para ação"
 msgid "Add to address book"
 msgstr "Adicionar ao Livro de Endereços"
 
 msgid "Add to address book"
 msgstr "Adicionar ao Livro de Endereços"
 

-#: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
-#: src/toolbar.c:449
+#: src/addressadd.c:208
+#: src/plugins/pgpcore/select-keys.c:377
+#: src/toolbar.c:459

 msgid "Address"
 msgstr "Endereço"
 
 msgid "Address"
 msgstr "Endereço"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:761
-#: src/editaddress.c:825 src/editgroup.c:289
+#: src/addressadd.c:218
+#: src/addressbook.c:134
+#: src/editaddress.c:849
+#: src/editaddress.c:913
+#: src/editgroup.c:289

 msgid "Remarks"
 msgstr "Notas"
 
 msgid "Remarks"
 msgstr "Notas"
 


@@ -203,330 +225,375 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione a pasta do Livro de Endereços"
 
 msgid "Select Address Book Folder"
 msgstr "Selecione a pasta do Livro de Endereços"
 

-#: src/addressbook.c:133 src/editaddress.c:759 src/editaddress.c:807
-#: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
-#: src/exporthtml.c:802 src/ldif.c:835
+#: src/addressbook.c:133
+#: src/editaddress.c:847
+#: src/editaddress.c:895
+#: src/editgroup.c:288
+#: src/expldifdlg.c:521
+#: src/exporthtml.c:638
+#: src/exporthtml.c:802
+#: src/ldif.c:835

 msgid "Email Address"
 msgstr "Endereço de e-mail"
 
 msgid "Email Address"
 msgstr "Endereço de e-mail"
 

-#: src/addressbook.c:416
+#: src/addressbook.c:419

 msgid "/_Book"
 msgstr "/_Livro"
 
 msgid "/_Book"
 msgstr "/_Livro"
 

-#: src/addressbook.c:417
+#: src/addressbook.c:420

 msgid "/_Book/New _Book"
 msgstr "/_Livro/Novo _livro"
 
 msgid "/_Book/New _Book"
 msgstr "/_Livro/Novo _livro"
 

-#: src/addressbook.c:418
+#: src/addressbook.c:421

 msgid "/_Book/New _Folder"
 msgstr "/_Livro/Nova _pasta"
 
 msgid "/_Book/New _Folder"
 msgstr "/_Livro/Nova _pasta"
 

-#: src/addressbook.c:419
+#: src/addressbook.c:422

 msgid "/_Book/New _vCard"
 msgstr "/_Livro/Novo _vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/_Livro/Novo _vCard"
 

-#: src/addressbook.c:421
+#: src/addressbook.c:424

 msgid "/_Book/New _JPilot"
 msgstr "/_Livro/Novo _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/_Livro/Novo _JPilot"
 

-#: src/addressbook.c:424
+#: src/addressbook.c:427

 msgid "/_Book/New LDAP _Server"
 msgstr "/_Livro/_Novo servidor LDAP"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/_Livro/_Novo servidor LDAP"
 

-#: src/addressbook.c:426 src/addressbook.c:429
+#: src/addressbook.c:429
+#: src/addressbook.c:432

 msgid "/_Book/---"
 msgstr "/_Livro/---"
 
 msgid "/_Book/---"
 msgstr "/_Livro/---"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:430

 msgid "/_Book/_Edit book"
 msgstr "/_Livro/_Editar livro"
 
 msgid "/_Book/_Edit book"
 msgstr "/_Livro/_Editar livro"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:431

 msgid "/_Book/_Delete book"
 msgstr "/_Livro/E_xcluir livro"
 
 msgid "/_Book/_Delete book"
 msgstr "/_Livro/E_xcluir livro"
 

-#: src/addressbook.c:430
+#: src/addressbook.c:433

 msgid "/_Book/_Save"
 msgstr "/_Livro/_Salvar"
 
 msgid "/_Book/_Save"
 msgstr "/_Livro/_Salvar"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:434

 msgid "/_Book/_Close"
 msgstr "/_Livro/_Fechar"
 
 msgid "/_Book/_Close"
 msgstr "/_Livro/_Fechar"
 

-#: src/addressbook.c:432
+#: src/addressbook.c:435

 msgid "/_Address"
 msgstr "/_Endereço"
 
 msgid "/_Address"
 msgstr "/_Endereço"
 

-#: src/addressbook.c:433
+#: src/addressbook.c:436

 msgid "/_Address/_Select all"
 msgstr "/_Endereço/Selecionar _todos"
 
 msgid "/_Address/_Select all"
 msgstr "/_Endereço/Selecionar _todos"
 

-#: src/addressbook.c:434 src/addressbook.c:438 src/addressbook.c:441
+#: src/addressbook.c:437
+#: src/addressbook.c:441

 #: src/addressbook.c:444
 #: src/addressbook.c:444

+#: src/addressbook.c:447

 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 

-#: src/addressbook.c:435
+#: src/addressbook.c:438

 msgid "/_Address/C_ut"
 msgstr "/_Endereço/_Recortar"
 
 msgid "/_Address/C_ut"
 msgstr "/_Endereço/_Recortar"
 

-#: src/addressbook.c:436
+#: src/addressbook.c:439

 msgid "/_Address/_Copy"
 msgstr "/_Endereço/_Copiar"
 
 msgid "/_Address/_Copy"
 msgstr "/_Endereço/_Copiar"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:440

 msgid "/_Address/_Paste"
 msgstr "/_Endereço/Co_lar"
 
 msgid "/_Address/_Paste"
 msgstr "/_Endereço/Co_lar"
 

-#: src/addressbook.c:439
+#: src/addressbook.c:442

 msgid "/_Address/_Edit"
 msgstr "/_Endereço/E_ditar"
 
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/E_ditar"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:443

 msgid "/_Address/_Delete"
 msgstr "/_Endereço/E_xcluir"
 
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/E_xcluir"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:445

 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _endereço"
 
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Novo _endereço"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:446

 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _grupo"
 
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _grupo"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:448

 msgid "/_Address/_Mail To"
 msgstr "/_Endereço/Enviar _mensagem para"
 
 msgid "/_Address/_Mail To"
 msgstr "/_Endereço/Enviar _mensagem para"
 

-#: src/addressbook.c:446 src/compose.c:767 src/mainwindow.c:799
+#: src/addressbook.c:449
+#: src/compose.c:772
+#: src/mainwindow.c:799

 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:450

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Ferramentas/Importar arquivo _LDIF..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Ferramentas/Importar arquivo _LDIF..."
 

-#: src/addressbook.c:448
+#: src/addressbook.c:451

 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Ferramentas/Importar arquivo do _Mutt..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Ferramentas/Importar arquivo do _Mutt..."
 

-#: src/addressbook.c:449
+#: src/addressbook.c:452

 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Ferramentas/Importar arquivo do _Pine..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Ferramentas/Importar arquivo do _Pine..."
 

-#: src/addressbook.c:450 src/mainwindow.c:808 src/mainwindow.c:831
-#: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
-#: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
+#: src/addressbook.c:453
+#: src/mainwindow.c:808
+#: src/mainwindow.c:831
+#: src/mainwindow.c:833
+#: src/mainwindow.c:842
+#: src/mainwindow.c:845
+#: src/mainwindow.c:849
+#: src/messageview.c:306
+#: src/messageview.c:327

 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
 

-#: src/addressbook.c:451
+#: src/addressbook.c:454

 msgid "/_Tools/Export _HTML..."
 msgstr "/_Ferramentas/Exportar _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/_Ferramentas/Exportar _HTML..."
 

-#: src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Ferramentas/Exportar L_DIF..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Ferramentas/Exportar L_DIF..."
 

-#: src/addressbook.c:453 src/compose.c:772 src/mainwindow.c:874
+#: src/addressbook.c:456
+#: src/compose.c:777
+#: src/mainwindow.c:874

 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/_Ajuda"
 
 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/_Ajuda"
 

-#: src/addressbook.c:454 src/compose.c:773 src/mainwindow.c:880
+#: src/addressbook.c:457
+#: src/compose.c:778
+#: src/mainwindow.c:880

 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
 
 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
 

-#: src/addressbook.c:459 src/addressbook.c:475 src/compose.c:540
-#: src/mainwindow.c:518 src/messageview.c:164
+#: src/addressbook.c:462
+#: src/addressbook.c:478
+#: src/compose.c:545
+#: src/mainwindow.c:518
+#: src/messageview.c:164

 msgid "/_Edit"
 msgstr "/_Editar"
 
 msgid "/_Edit"
 msgstr "/_Editar"
 

-#: src/addressbook.c:460 src/addressbook.c:476
+#: src/addressbook.c:463
+#: src/addressbook.c:479

 msgid "/_Delete"
 msgstr "/E_xcluir"
 
 msgid "/_Delete"
 msgstr "/E_xcluir"
 

-#: src/addressbook.c:461 src/addressbook.c:465 src/addressbook.c:474
-#: src/addressbook.c:477 src/addressbook.c:480 src/addressbook.c:484
-#: src/compose.c:519 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
-#: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:54
-#: src/news_gtk.c:57 src/news_gtk.c:59 src/plugins/trayicon/trayicon.c:102
-#: src/plugins/trayicon/trayicon.c:105 src/plugins/trayicon/trayicon.c:107
-#: src/summaryview.c:423 src/summaryview.c:427 src/summaryview.c:432
-#: src/summaryview.c:450 src/summaryview.c:471 src/summaryview.c:477
-msgid "/---"
-msgstr "/---"
-
-#: src/addressbook.c:462
+#: src/addressbook.c:465

 msgid "/New _Book"
 msgstr "/Novo li_vro"
 
 msgid "/New _Book"
 msgstr "/Novo li_vro"
 

-#: src/addressbook.c:463
+#: src/addressbook.c:466

 msgid "/New _Folder"
 msgstr "/Nova _pasta"
 
 msgid "/New _Folder"
 msgstr "/Nova _pasta"
 

-#: src/addressbook.c:464 src/addressbook.c:479
+#: src/addressbook.c:467
+#: src/addressbook.c:482

 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 

-#: src/addressbook.c:466 src/addressbook.c:481
+#: src/addressbook.c:469
+#: src/addressbook.c:484

 msgid "/C_ut"
 msgstr "/_Recortar"
 
 msgid "/C_ut"
 msgstr "/_Recortar"
 

-#: src/addressbook.c:467 src/addressbook.c:482
+#: src/addressbook.c:470
+#: src/addressbook.c:485

 msgid "/_Copy"
 msgstr "/_Copiar"
 
 msgid "/_Copy"
 msgstr "/_Copiar"
 

-#: src/addressbook.c:468 src/addressbook.c:483
+#: src/addressbook.c:471
+#: src/addressbook.c:486

 msgid "/_Paste"
 msgstr "/Co_lar"
 
 msgid "/_Paste"
 msgstr "/Co_lar"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:476

 msgid "/_Select all"
 msgstr "/Selecionar _todos"
 
 msgid "/_Select all"
 msgstr "/Selecionar _todos"
 

-#: src/addressbook.c:478
+#: src/addressbook.c:481

 msgid "/New _Address"
 msgstr "/Novo e_ndereço"
 
 msgid "/New _Address"
 msgstr "/Novo e_ndereço"
 

-#: src/addressbook.c:486
+#: src/addressbook.c:489

 msgid "/_Mail To"
 msgstr "/Enviar _mensagem para"
 
 msgid "/_Mail To"
 msgstr "/Enviar _mensagem para"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:491

 msgid "/_Browse Entry"
 msgstr "/Percorrer a entra_da"
 
 msgid "/_Browse Entry"
 msgstr "/Percorrer a entra_da"
 

-#: src/addressbook.c:501 src/crash.c:450 src/crash.c:469 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:132 src/prefs_themes.c:683
-#: src/prefs_themes.c:715 src/prefs_themes.c:716
+#: src/addressbook.c:504
+#: src/crash.c:453
+#: src/crash.c:472
+#: src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:136
+#: src/prefs_themes.c:683
+#: src/prefs_themes.c:715
+#: src/prefs_themes.c:716

 msgid "Unknown"
 msgstr "Desconhecido"
 
 msgid "Unknown"
 msgstr "Desconhecido"
 

-#: src/addressbook.c:508 src/addressbook.c:527 src/importldif.c:126
+#: src/addressbook.c:511
+#: src/addressbook.c:530
+#: src/importldif.c:126

 msgid "Success"
 msgstr "Sucesso"
 
 msgid "Success"
 msgstr "Sucesso"
 

-#: src/addressbook.c:509 src/importldif.c:127
+#: src/addressbook.c:512
+#: src/importldif.c:127

 msgid "Bad arguments"
 msgstr "Argumentos incorretos"
 
 msgid "Bad arguments"
 msgstr "Argumentos incorretos"
 

-#: src/addressbook.c:510 src/importldif.c:128
+#: src/addressbook.c:513
+#: src/importldif.c:128

 msgid "File not specified"
 msgstr "Arquivo não especificado"
 
 msgid "File not specified"
 msgstr "Arquivo não especificado"
 

-#: src/addressbook.c:511 src/importldif.c:129
+#: src/addressbook.c:514
+#: src/importldif.c:129

 msgid "Error opening file"
 msgstr "Ocorreu um erro ao abrir o arquivo"
 
 msgid "Error opening file"
 msgstr "Ocorreu um erro ao abrir o arquivo"
 

-#: src/addressbook.c:512 src/importldif.c:130
+#: src/addressbook.c:515
+#: src/importldif.c:130

 msgid "Error reading file"
 msgstr "Ocorreu um erro ao ler o arquivo"
 
 msgid "Error reading file"
 msgstr "Ocorreu um erro ao ler o arquivo"
 

-#: src/addressbook.c:513 src/importldif.c:131
+#: src/addressbook.c:516
+#: src/importldif.c:131

 msgid "End of file encountered"
 msgstr "Foi encontrado o fim do arquivo"
 
 msgid "End of file encountered"
 msgstr "Foi encontrado o fim do arquivo"
 

-#: src/addressbook.c:514 src/importldif.c:132
+#: src/addressbook.c:517
+#: src/importldif.c:132

 msgid "Error allocating memory"
 msgstr "Ocorreu um erro de alocação de memória"
 
 msgid "Error allocating memory"
 msgstr "Ocorreu um erro de alocação de memória"
 

-#: src/addressbook.c:515 src/importldif.c:133
+#: src/addressbook.c:518
+#: src/importldif.c:133

 msgid "Bad file format"
 msgstr "Formato do arquivo incorreto"
 
 msgid "Bad file format"
 msgstr "Formato do arquivo incorreto"
 

-#: src/addressbook.c:516 src/importldif.c:134
+#: src/addressbook.c:519
+#: src/importldif.c:134

 msgid "Error writing to file"
 msgstr "Ocorreu um erro ao escrever no arquivo"
 
 msgid "Error writing to file"
 msgstr "Ocorreu um erro ao escrever no arquivo"
 

-#: src/addressbook.c:517 src/importldif.c:135
+#: src/addressbook.c:520
+#: src/importldif.c:135

 msgid "Error opening directory"
 msgstr "Ocorreu um erro ao abrir o diretório"
 
 msgid "Error opening directory"
 msgstr "Ocorreu um erro ao abrir o diretório"
 

-#: src/addressbook.c:518 src/importldif.c:136
+#: src/addressbook.c:521
+#: src/importldif.c:136

 msgid "No path specified"
 msgstr "Não foi especificado nenhum caminho"
 
 msgid "No path specified"
 msgstr "Não foi especificado nenhum caminho"
 

-#: src/addressbook.c:528
+#: src/addressbook.c:531

 msgid "Error connecting to LDAP server"
 msgstr "Ocorreu um erro ao conectar ao servidor LDAP"
 
 msgid "Error connecting to LDAP server"
 msgstr "Ocorreu um erro ao conectar ao servidor LDAP"
 

-#: src/addressbook.c:529
+#: src/addressbook.c:532

 msgid "Error initializing LDAP"
 msgstr "Ocorreu um erro na inicialização do LDAP"
 
 msgid "Error initializing LDAP"
 msgstr "Ocorreu um erro na inicialização do LDAP"
 

-#: src/addressbook.c:530
+#: src/addressbook.c:533

 msgid "Error binding to LDAP server"
 msgstr "Ocorreu um erro durante a conexão com o servidor LDAP"
 
 msgid "Error binding to LDAP server"
 msgstr "Ocorreu um erro durante a conexão com o servidor LDAP"
 

-#: src/addressbook.c:531
+#: src/addressbook.c:534

 msgid "Error searching LDAP database"
 msgstr "Ocorreu um erro durante a procura no banco de dados LDAP"
 
 msgid "Error searching LDAP database"
 msgstr "Ocorreu um erro durante a procura no banco de dados LDAP"
 

-#: src/addressbook.c:532
+#: src/addressbook.c:535

 msgid "Timeout performing LDAP operation"
 msgstr "Tempo esgotado durante a operação do LDAP"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Tempo esgotado durante a operação do LDAP"
 

-#: src/addressbook.c:533
+#: src/addressbook.c:536

 msgid "Error in LDAP search criteria"
 msgstr "Erro no critério de procura no LDAP"
 
 msgid "Error in LDAP search criteria"
 msgstr "Erro no critério de procura no LDAP"
 

-#: src/addressbook.c:534
+#: src/addressbook.c:537

 msgid "No LDAP entries found for search criteria"
 msgstr "Não foram encontradas entradas LDAP para o critério da procura"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "Não foram encontradas entradas LDAP para o critério da procura"
 

-#: src/addressbook.c:535
+#: src/addressbook.c:538

 msgid "LDAP search terminated on request"
 msgstr "A procura no LDAP foi terminada sob solicitação"
 
 msgid "LDAP search terminated on request"
 msgstr "A procura no LDAP foi terminada sob solicitação"
 

-#: src/addressbook.c:536
+#: src/addressbook.c:539

 msgid "Error starting TLS connection"
 msgstr "Erro ao iniciar a conexão TSL"
 
 msgid "Error starting TLS connection"
 msgstr "Erro ao iniciar a conexão TSL"
 

-#: src/addressbook.c:853
+#: src/addressbook.c:897

 msgid "Sources"
 msgstr "Fontes"
 
 msgid "Sources"
 msgstr "Fontes"
 

-#: src/addressbook.c:857 src/prefs_other.c:101 src/toolbar.c:190
-#: src/toolbar.c:1727
+#: src/addressbook.c:901
+#: src/prefs_other.c:101
+#: src/toolbar.c:194
+#: src/toolbar.c:1787

 msgid "Address book"
 msgstr "Livro de endereços"
 
 msgid "Address book"
 msgstr "Livro de endereços"
 

-#: src/addressbook.c:980
+#: src/addressbook.c:1033

 msgid "Lookup name:"
 msgstr "Nome de referência:"
 
 msgid "Lookup name:"
 msgstr "Nome de referência:"
 

-#: src/addressbook.c:1040 src/compose.c:2031 src/compose.c:4308
-#: src/compose.c:5530 src/compose.c:6293 src/summary_search.c:291
+#: src/addressbook.c:1106
+#: src/compose.c:2129
+#: src/compose.c:4443
+#: src/compose.c:5667
+#: src/compose.c:6432
+#: src/compose.c:9453
+#: src/summary_search.c:359

 msgid "To:"
 msgstr "Para:"
 
 msgid "To:"
 msgstr "Para:"
 

-#: src/addressbook.c:1044 src/compose.c:2015 src/compose.c:4051
-#: src/compose.c:4307
+#: src/addressbook.c:1110
+#: src/compose.c:2113
+#: src/compose.c:4182
+#: src/compose.c:4442
+#: src/compose.c:9462

 msgid "Cc:"
 msgstr "Cc:"
 
 msgid "Cc:"
 msgstr "Cc:"
 

-#: src/addressbook.c:1048 src/compose.c:2018 src/compose.c:4082
+#: src/addressbook.c:1114
+#: src/compose.c:2116
+#: src/compose.c:4213

 msgid "Bcc:"
 msgstr "Cco:"
 
 msgid "Bcc:"
 msgstr "Cco:"
 

-#: src/addressbook.c:1283 src/addressbook.c:1329
+#: src/addressbook.c:1363
+#: src/addressbook.c:1409

 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 
 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 

-#: src/addressbook.c:1284
+#: src/addressbook.c:1364

 msgid "This address data is readonly and cannot be deleted."
 msgid "This address data is readonly and cannot be deleted."

-msgstr ""
-"Os dados deste endereço são \"somente para leitura\" e não podem ser "
-"apagados."
+msgstr "Os dados deste endereço são \"somente para leitura\" e não podem ser apagados."

 
 

-#: src/addressbook.c:1323
+#: src/addressbook.c:1403

 msgid "Delete group"
 msgstr "Excluir grupo"
 
 msgid "Delete group"
 msgstr "Excluir grupo"
 

-#: src/addressbook.c:1324
+#: src/addressbook.c:1404

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -534,52 +601,50 @@ msgstr ""
 "Deseja realmente excluir esse(s) grupo(s)?\n"
 "Os endereços nele(s) contidos não serão perdidos."
 
 "Deseja realmente excluir esse(s) grupo(s)?\n"
 "Os endereços nele(s) contidos não serão perdidos."
 

-#: src/addressbook.c:1330
+#: src/addressbook.c:1410

 msgid "Really delete the address(es)?"
 msgstr "Deseja realmente excluir o(s) endereço(s)?"
 
 msgid "Really delete the address(es)?"
 msgstr "Deseja realmente excluir o(s) endereço(s)?"
 

-#: src/addressbook.c:1932
+#: src/addressbook.c:2014

 msgid "Cannot paste. Target address book is readonly."
 msgid "Cannot paste. Target address book is readonly."

-msgstr ""
-"Não é possível colar. O livro de endereços de destino é \"somente para "
-"leitura\"."
+msgstr "Não é possível colar. O livro de endereços de destino é \"somente para leitura\"."

 
 

-#: src/addressbook.c:1943
+#: src/addressbook.c:2025

 msgid "Cannot paste into an address group."
 msgstr "Não é possível colar em um grupo de endereços."
 
 msgid "Cannot paste into an address group."
 msgstr "Não é possível colar em um grupo de endereços."
 

-#: src/addressbook.c:2619
+#: src/addressbook.c:2708

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Deseja apagar os resultados da consulta e endereços em '%s'?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Deseja apagar os resultados da consulta e endereços em '%s'?"
 

-#: src/addressbook.c:2622 src/addressbook.c:2648 src/addressbook.c:2655
+#: src/addressbook.c:2711
+#: src/addressbook.c:2737
+#: src/addressbook.c:2744

 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Excluir"
 
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Excluir"
 

-#: src/addressbook.c:2631
+#: src/addressbook.c:2720

 #, c-format
 #, c-format

-msgid ""
-"Do you want to delete '%s' ?If you delete the folder only, the addresses it "
-"contains will be moved into the parent folder."
-msgstr ""
-"Deseja excluir '%s'? Se você apagar somente a pasta, os endereços nela "
-"contidos serão movidos para a pasta superior."
+msgid "Do you want to delete '%s' ?If you delete the folder only, the addresses it contains will be moved into the parent folder."
+msgstr "Deseja excluir '%s'? Se você apagar somente a pasta, os endereços nela contidos serão movidos para a pasta superior."

 
 

-#: src/addressbook.c:2634 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2723
+#: src/imap_gtk.c:284
+#: src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Excluir a pasta"
 
 msgid "Delete folder"
 msgstr "Excluir a pasta"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "+Delete _folder only"
 msgstr "+Excluir somente a _pasta"
 
 msgid "+Delete _folder only"
 msgstr "+Excluir somente a _pasta"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "Delete folder and _addresses"
 msgstr "Excluir a pasta e os _endereços"
 
 msgid "Delete folder and _addresses"
 msgstr "Excluir a pasta e os _endereços"
 

-#: src/addressbook.c:2646
+#: src/addressbook.c:2735

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -588,7 +653,7 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos não serão perdidos."
 
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos não serão perdidos."
 

-#: src/addressbook.c:2653
+#: src/addressbook.c:2742

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -597,19 +662,19 @@ msgstr ""
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos serão perdidos."
 
 "Deseja excluir '%s'?\n"
 "Os endereços nela contidos serão perdidos."
 

-#: src/addressbook.c:3465
+#: src/addressbook.c:3595

 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 

-#: src/addressbook.c:3469
+#: src/addressbook.c:3599

 msgid "New user, could not save address book files."
 msgstr "Novo usuário, não foi possível salvar os arquivos do livros de endereços."
 
 msgid "New user, could not save address book files."
 msgstr "Novo usuário, não foi possível salvar os arquivos do livros de endereços."
 

-#: src/addressbook.c:3479
+#: src/addressbook.c:3609

 msgid "Old address book converted successfully."
 msgstr "A versão anterior do Livro de Endereços foi convertida com sucesso."
 
 msgid "Old address book converted successfully."
 msgstr "A versão anterior do Livro de Endereços foi convertida com sucesso."
 

-#: src/addressbook.c:3484
+#: src/addressbook.c:3614

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -617,7 +682,7 @@ msgstr ""
 "O Livro de Endereços antigo foi convertido,\n"
 "não foi possível salvar o novo arquivo de índice dos endereços."
 
 "O Livro de Endereços antigo foi convertido,\n"
 "não foi possível salvar o novo arquivo de índice dos endereços."
 

-#: src/addressbook.c:3497
+#: src/addressbook.c:3627

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -625,7 +690,7 @@ msgstr ""
 "Não foi possível converter o livro de\n"
 "endereços, mas foi criado um novo, em branco."
 
 "Não foi possível converter o livro de\n"
 "endereços, mas foi criado um novo, em branco."
 

-#: src/addressbook.c:3503
+#: src/addressbook.c:3633

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -633,7 +698,7 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços,\n"
 "nem foi possível salvar o novo arquivo de índice dos endereços."
 
 "Não foi possível converter o Livro de Endereços,\n"
 "nem foi possível salvar o novo arquivo de índice dos endereços."
 

-#: src/addressbook.c:3508
+#: src/addressbook.c:3638

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -641,73 +706,88 @@ msgstr ""
 "Não foi possível converter o Livro de Endereços, e não\n"
 "foi possível criar os novos arquivos do Livro de Endereços."
 
 "Não foi possível converter o Livro de Endereços, e não\n"
 "foi possível criar os novos arquivos do Livro de Endereços."
 

-#: src/addressbook.c:3515 src/addressbook.c:3521
+#: src/addressbook.c:3645
+#: src/addressbook.c:3651

 msgid "Addressbook conversion error"
 msgstr "Ocorreu um erro na conversão do Livro de Endereços"
 
 msgid "Addressbook conversion error"
 msgstr "Ocorreu um erro na conversão do Livro de Endereços"
 

-#: src/addressbook.c:3559
+#: src/addressbook.c:3689

 msgid "Addressbook Error"
 msgstr "Erro no Livro de Endereços"
 
 msgid "Addressbook Error"
 msgstr "Erro no Livro de Endereços"
 

-#: src/addressbook.c:3560
+#: src/addressbook.c:3690

 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice dos endereços"
 
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice dos endereços"
 

-#: src/addressbook.c:3887
+#: src/addressbook.c:4017

 msgid "Busy searching..."
 msgstr "Ocupado procurando..."
 
 msgid "Busy searching..."
 msgstr "Ocupado procurando..."
 

-#: src/addressbook.c:3958
+#: src/addressbook.c:4088

 #, c-format
 msgid "Search '%s'"
 msgstr "Procurar '%s'"
 
 #, c-format
 msgid "Search '%s'"
 msgstr "Procurar '%s'"
 

-#: src/addressbook.c:4183
+#: src/addressbook.c:4313

 msgid "Interface"
 msgstr "Interface"
 
 msgid "Interface"
 msgstr "Interface"
 

-#: src/addressbook.c:4199 src/exphtmldlg.c:378 src/expldifdlg.c:394
-#: src/exporthtml.c:1020 src/importldif.c:651
+#: src/addressbook.c:4329
+#: src/exphtmldlg.c:375
+#: src/expldifdlg.c:394
+#: src/exporthtml.c:1020
+#: src/importldif.c:651

 msgid "Address Book"
 msgstr "Livro de Endereços"
 
 msgid "Address Book"
 msgstr "Livro de Endereços"
 

-#: src/addressbook.c:4215
+#: src/addressbook.c:4345

 msgid "Person"
 msgstr "Pessoa"
 
 msgid "Person"
 msgstr "Pessoa"
 

-#: src/addressbook.c:4231
+#: src/addressbook.c:4361

 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 

-#: src/addressbook.c:4247
+#: src/addressbook.c:4377

 msgid "Group"
 msgstr "Grupo"
 
 msgid "Group"
 msgstr "Grupo"
 

-#: src/addressbook.c:4263 src/exporthtml.c:922 src/folderview.c:468
-#: src/prefs_account.c:2410 src/prefs_folder_column.c:79
+#: src/addressbook.c:4393
+#: src/exporthtml.c:922
+#: src/folderview.c:470
+#: src/prefs_account.c:2417
+#: src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Pasta"
 
 msgid "Folder"
 msgstr "Pasta"
 

-#: src/addressbook.c:4279
+#: src/addressbook.c:4409

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4295 src/addressbook.c:4311
+#: src/addressbook.c:4425
+#: src/addressbook.c:4441

 msgid "JPilot"
 msgstr "JPllot"
 
 msgid "JPilot"
 msgstr "JPllot"
 

-#: src/addressbook.c:4327
+#: src/addressbook.c:4457

 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 
 msgid "LDAP servers"
 msgstr "Servidores LDAP"
 

-#: src/addressbook.c:4343
+#: src/addressbook.c:4473

 msgid "LDAP Query"
 msgstr "Consulta LDAP"
 
 msgid "LDAP Query"
 msgstr "Consulta LDAP"
 

-#: src/addressbook.c:4659 src/matcher.c:303 src/matcher.c:756
-#: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
-#: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
-#: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
+#: src/addressbook.c:4789
+#: src/matcher.c:303
+#: src/matcher.c:756
+#: src/matcher.c:889
+#: src/prefs_matcher.c:218
+#: src/prefs_matcher.c:521
+#: src/prefs_matcher.c:1332
+#: src/prefs_matcher.c:1349
+#: src/prefs_matcher.c:1351
+#: src/prefs_matcher.c:2102
+#: src/prefs_matcher.c:2106

 msgid "Any"
 msgstr "Qualquer"
 
 msgid "Any"
 msgstr "Qualquer"
 


@@ -745,7 +825,9 @@ msgstr ""
 msgid "Folder :"
 msgstr "Pasta:"
 
 msgid "Folder :"
 msgstr "Pasta:"
 

-#: src/addrgather.c:365 src/exphtmldlg.c:546 src/expldifdlg.c:626
+#: src/addrgather.c:365
+#: src/exphtmldlg.c:543
+#: src/expldifdlg.c:626

 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Livro de endereços:"
 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Livro de endereços:"


@@ -770,9 +852,13 @@ msgstr "Nome do cabeçalho"
 msgid "Address Count"
 msgstr "Contagem de endereços"
 
 msgid "Address Count"
 msgstr "Contagem de endereços"
 

-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4657
-#: src/compose.c:9183 src/messageview.c:578 src/messageview.c:591
-#: src/plugins/pgpcore/sgpgme.c:570
+#: src/addrgather.c:537
+#: src/alertpanel.c:154
+#: src/compose.c:4794
+#: src/compose.c:9374
+#: src/messageview.c:578
+#: src/messageview.c:591
+#: src/plugins/pgpcore/sgpgme.c:574

 msgid "Warning"
 msgstr "Aviso"
 
 msgid "Warning"
 msgstr "Aviso"
 


@@ -780,7 +866,9 @@ msgstr "Aviso"
 msgid "Header Fields"
 msgstr "Campos do cabeçalho"
 
 msgid "Header Fields"
 msgstr "Campos do cabeçalho"
 

-#: src/addrgather.c:539 src/exphtmldlg.c:666 src/expldifdlg.c:738
+#: src/addrgather.c:539
+#: src/exphtmldlg.c:663
+#: src/expldifdlg.c:737

 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Finalizar"
 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Finalizar"


@@ -809,12 +897,17 @@ msgstr "Endereço comum"
 msgid "Personal address"
 msgstr "Endereço pessoal"
 
 msgid "Personal address"
 msgstr "Endereço pessoal"
 

-#: src/alertpanel.c:141 src/compose.c:7403
+#: src/alertpanel.c:141
+#: src/compose.c:7582

 msgid "Notice"
 msgstr "Nota"
 
 msgid "Notice"
 msgstr "Nota"
 

-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4597 src/inc.c:616
-#: src/plugins/pgpcore/sgpgme.c:144 src/plugins/pgpcore/sgpgme.c:235
+#: src/alertpanel.c:167
+#: src/alertpanel.c:190
+#: src/compose.c:4734
+#: src/inc.c:616
+#: src/plugins/pgpcore/sgpgme.c:148
+#: src/plugins/pgpcore/sgpgme.c:239

 msgid "Error"
 msgstr "Erro"
 
 msgid "Error"
 msgstr "Erro"
 


@@ -851,89 +944,121 @@ msgstr "Atribuir valor"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor NNTP: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor NNTP: %s:%d\n"
 

-#: src/common/nntp.c:181 src/common/nntp.c:244
+#: src/common/nntp.c:80
+#: src/common/session.c:166
+#: src/imap.c:840
+msgid "SSL handshake failed\n"
+msgstr "Não foi possível efetuar o handshake do SSL\n"
+
+#: src/common/nntp.c:182
+#: src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr "erro do protocolo: %s\n"
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "erro do protocolo: %s\n"
 

-#: src/common/nntp.c:204 src/common/nntp.c:250
+#: src/common/nntp.c:205
+#: src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr "erro do protocolo\n"
 
 msgid "protocol error\n"
 msgstr "erro do protocolo\n"
 

-#: src/common/nntp.c:300
+#: src/common/nntp.c:301

 msgid "Error occurred while posting\n"
 msgstr "Ocorreu um erro durante a postagem\n"
 
 msgid "Error occurred while posting\n"
 msgstr "Ocorreu um erro durante a postagem\n"
 

-#: src/common/nntp.c:380
+#: src/common/nntp.c:381

 msgid "Error occurred while sending command\n"
 msgstr "Ocorreu um erro ao enviar o comando\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "Ocorreu um erro ao enviar o comando\n"
 

-#: src/common/plugin.c:52
+#: src/common/plugin.c:53

 msgid "Nothing"
 msgstr "Nenhum"
 
 msgid "Nothing"
 msgstr "Nenhum"
 

-#: src/common/plugin.c:53
+#: src/common/plugin.c:54

 msgid "a viewer"
 msgstr "um visualizador"
 
 msgid "a viewer"
 msgstr "um visualizador"
 

-#: src/common/plugin.c:54
+#: src/common/plugin.c:55

 msgid "folders"
 msgstr "pastas"
 
 msgid "folders"
 msgstr "pastas"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "filtering"
 msgstr "filtragem"
 
 msgid "filtering"
 msgstr "filtragem"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a privacy interface"
 msgstr "uma interface de privacidade"
 
 msgid "a privacy interface"
 msgstr "uma interface de privacidade"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "a notifier"
 msgstr "um notificador"
 
 msgid "a notifier"
 msgstr "um notificador"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "an utility"
 msgstr "um utilitário"
 
 msgid "an utility"
 msgstr "um utilitário"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "things"
 msgstr "coisas"
 
 msgid "things"
 msgstr "coisas"
 

-#: src/common/plugin.c:257
+#: src/common/plugin.c:258

 #, c-format
 msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Esse plugin fornece %s (%s), o qual já é fornecido pelo plugin %s."
 
 #, c-format
 msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Esse plugin fornece %s (%s), o qual já é fornecido pelo plugin %s."
 

-#: src/common/plugin.c:292
+#: src/common/plugin.c:293

 msgid "Plugin already loaded"
 msgstr "O plugin Já foi carregado"
 
 msgid "Plugin already loaded"
 msgstr "O plugin Já foi carregado"
 

-#: src/common/plugin.c:302
+#: src/common/plugin.c:303

 msgid "Failed to allocate memory for Plugin"
 msgstr "Não foi possível alocar memória para o plugin"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Não foi possível alocar memória para o plugin"
 

-#: src/common/plugin.c:329
+#: src/common/plugin.c:330

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Esse módulo não está licenciado sob uma licença compatível com a GPL."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Esse módulo não está licenciado sob uma licença compatível com a GPL."
 

-#: src/common/plugin.c:336
-msgid "This module is for Sylpheed-Claws GTK1."
-msgstr "Esse módulo é para o Sylpheed-Claws GTK1."
+#: src/common/plugin.c:337
+msgid "This module is for Claws Mail GTK1."
+msgstr "Esse módulo é para o Claws Mail GTK1."
+
+#: src/common/plugin.c:547
+#, c-format
+msgid "Your version of Claws Mail is newer than the version the '%s' plugin was built with."
+msgstr ""
+"A sua versão do Claws Mail é mais recente do que a utilizada para construir "
+"o plugin '%s'."
+
+#: src/common/plugin.c:550
+msgid "Your version of Claws Mail is newer than the version the plugin was built with."
+msgstr "A sua versão do Claws Mail é mais recente do que a utilizada para construir o plugin."
+
+#: src/common/plugin.c:559
+#, c-format
+msgid "Your version of Claws Mail is too old for the '%s' plugin."
+msgstr "A sua versão do Claws Mail é muito antiga para o plugin '%s'."
+
+#: src/common/plugin.c:561
+msgid "Your version of Claws Mail is too old for the plugin."
+msgstr "A sua versão do Claws Mail é muito antiga para o plugin."

 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH não está disponível\n"
 
 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH não está disponível\n"
 

-#: src/common/smtp.c:518 src/common/smtp.c:568
+#: src/common/smtp.c:518
+#: src/common/smtp.c:568

 msgid "bad SMTP response\n"
 msgstr "resposta incorreta do SMTP\n"
 
 msgid "bad SMTP response\n"
 msgstr "resposta incorreta do SMTP\n"
 

-#: src/common/smtp.c:539 src/common/smtp.c:557 src/common/smtp.c:676
+#: src/common/smtp.c:539
+#: src/common/smtp.c:557
+#: src/common/smtp.c:676

 msgid "error occurred on SMTP session\n"
 msgstr "ocorreu um erro durante a sessão SMTP\n"
 
 msgid "error occurred on SMTP session\n"
 msgstr "ocorreu um erro durante a sessão SMTP\n"
 

-#: src/common/smtp.c:548 src/pop.c:842
+#: src/common/smtp.c:548
+#: src/pop.c:842

 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 


@@ -942,7 +1067,8 @@ msgstr "ocorreu um erro na autenticação\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "A mensagem é muito grande (o tamanho máximo é %s)\n"
 
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "A mensagem é muito grande (o tamanho máximo é %s)\n"
 

-#: src/common/smtp.c:635 src/pop.c:835
+#: src/common/smtp.c:635
+#: src/pop.c:835

 msgid "couldn't start TLS session\n"
 msgstr "não foi possível iniciar a sessão TLS\n"
 
 msgid "couldn't start TLS session\n"
 msgstr "não foi possível iniciar a sessão TLS\n"
 


@@ -960,16 +1086,22 @@ msgstr "Ocorreu um erro na criação do contexto SSL\n"
 msgid "SSL connect failed (%s)\n"
 msgstr "Não foi possível estabelecer uma conexão SSL (%s)\n"
 
 msgid "SSL connect failed (%s)\n"
 msgstr "Não foi possível estabelecer uma conexão SSL (%s)\n"
 

-#: src/common/ssl_certificate.c:189 src/common/ssl_certificate.c:200
-#: src/common/ssl_certificate.c:206 src/common/ssl_certificate.c:213
-#: src/common/ssl_certificate.c:224 src/common/ssl_certificate.c:230
-#: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
-#: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
+#: src/common/ssl_certificate.c:208
+#: src/common/ssl_certificate.c:219
+#: src/common/ssl_certificate.c:225
+#: src/common/ssl_certificate.c:232
+#: src/common/ssl_certificate.c:243
+#: src/common/ssl_certificate.c:249
+#: src/gtk/sslcertwindow.c:68
+#: src/gtk/sslcertwindow.c:79
+#: src/gtk/sslcertwindow.c:85
+#: src/gtk/sslcertwindow.c:92
+#: src/gtk/sslcertwindow.c:103
+#: src/gtk/sslcertwindow.c:109

 msgid "<not in certificate>"
 msgstr "<não está no certificado>"
 
 msgid "<not in certificate>"
 msgstr "<não está no certificado>"
 

-#: src/common/ssl_certificate.c:239
+#: src/common/ssl_certificate.c:258

 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"


@@ -982,7 +1114,7 @@ msgstr ""
 "  Fingerprint: %s\n"
 "  Situação da Assinatura: %s"
 
 "  Fingerprint: %s\n"
 "  Situação da Assinatura: %s"
 

-#: src/common/ssl_certificate.c:348
+#: src/common/ssl_certificate.c:385

 msgid "Couldn't load X509 default paths"
 msgstr "Não foi possível carregar os caminhos padrão do X509"
 
 msgid "Couldn't load X509 default paths"
 msgstr "Não foi possível carregar os caminhos padrão do X509"
 


@@ -1010,479 +1142,729 @@ msgstr "%d.%02dMb"
 msgid "%.2fGB"
 msgstr "%.2fGb"
 
 msgid "%.2fGB"
 msgstr "%.2fGb"
 

-#: src/compose.c:517
+#: src/common/utils.c:4799
+msgid "Complete day name for use by strftime|Sunday"
+msgstr "Complete day name for use by strftime|Domingo"
+
+#: src/common/utils.c:4800
+msgid "Complete day name for use by strftime|Monday"
+msgstr "Complete day name for use by strftime|Segunda-feira"
+
+#: src/common/utils.c:4801
+msgid "Complete day name for use by strftime|Tuesday"
+msgstr "Complete day name for use by strftime|Terça-feira"
+
+#: src/common/utils.c:4802
+msgid "Complete day name for use by strftime|Wednesday"
+msgstr "Complete day name for use by strftime|Quarta-feira"
+
+#: src/common/utils.c:4803
+msgid "Complete day name for use by strftime|Thursday"
+msgstr "Complete day name for use by strftime|Quinta-feira"
+
+#: src/common/utils.c:4804
+msgid "Complete day name for use by strftime|Friday"
+msgstr "Complete day name for use by strftime|Sexta-feira"
+
+#: src/common/utils.c:4805
+msgid "Complete day name for use by strftime|Saturday"
+msgstr "Complete day name for use by strftime|Sábado"
+
+#: src/common/utils.c:4807
+msgid "Complete month name for use by strftime|January"
+msgstr "Complete month name for use by strftime|Janeiro"
+
+#: src/common/utils.c:4808
+msgid "Complete month name for use by strftime|February"
+msgstr "Complete month name for use by strftime|Fevereiro"
+
+#: src/common/utils.c:4809
+msgid "Complete month name for use by strftime|March"
+msgstr "Complete month name for use by strftime|Março"
+
+#: src/common/utils.c:4810
+msgid "Complete month name for use by strftime|April"
+msgstr "Complete month name for use by strftime|Abril"
+
+#: src/common/utils.c:4811
+msgid "Complete month name for use by strftime|May"
+msgstr "Complete month name for use by strftime|Maio"
+
+#: src/common/utils.c:4812
+msgid "Complete month name for use by strftime|June"
+msgstr "Complete month name for use by strftime|Junho"
+
+#: src/common/utils.c:4813
+msgid "Complete month name for use by strftime|July"
+msgstr "Complete month name for use by strftime|Julho"
+
+#: src/common/utils.c:4814
+msgid "Complete month name for use by strftime|August"
+msgstr "Complete month name for use by strftime|Agosto"
+
+#: src/common/utils.c:4815
+msgid "Complete month name for use by strftime|September"
+msgstr "Complete month name for use by strftime|Setembro"
+
+#: src/common/utils.c:4816
+msgid "Complete month name for use by strftime|October"
+msgstr "Complete month name for use by strftime|Outubro"
+
+#: src/common/utils.c:4817
+msgid "Complete month name for use by strftime|November"
+msgstr "Complete month name for use by strftime|Novembro"
+
+#: src/common/utils.c:4818
+msgid "Complete month name for use by strftime|December"
+msgstr "Complete month name for use by strftime|Dezembro"
+
+#: src/common/utils.c:4820
+msgid "Abbr. day name for use by strftime|Sun"
+msgstr "Abbr. day name for use by strftime|Dom"
+
+#: src/common/utils.c:4821
+msgid "Abbr. day name for use by strftime|Mon"
+msgstr "Abbr. day name for use by strftime|Seg"
+
+#: src/common/utils.c:4822
+msgid "Abbr. day name for use by strftime|Tue"
+msgstr "Abbr. day name for use by strftime|Ter"
+
+#: src/common/utils.c:4823
+msgid "Abbr. day name for use by strftime|Wed"
+msgstr "Abbr. day name for use by strftime|Qua"
+
+#: src/common/utils.c:4824
+msgid "Abbr. day name for use by strftime|Thu"
+msgstr "Abbr. day name for use by strftime|Qui"
+
+#: src/common/utils.c:4825
+msgid "Abbr. day name for use by strftime|Fri"
+msgstr "Abbr. day name for use by strftime|Sex"
+
+#: src/common/utils.c:4826
+msgid "Abbr. day name for use by strftime|Sat"
+msgstr "Abbr. day name for use by strftime|Sáb"
+
+#: src/common/utils.c:4828
+msgid "Abbr. month name for use by strftime|Jan"
+msgstr "Abbr. month name for use by strftime|Jan"
+
+#: src/common/utils.c:4829
+msgid "Abbr. month name for use by strftime|Feb"
+msgstr "Abbr. month name for use by strftime|Fev"
+
+#: src/common/utils.c:4830
+msgid "Abbr. month name for use by strftime|Mar"
+msgstr "Abbr. month name for use by strftime|Mar"
+
+#: src/common/utils.c:4831
+msgid "Abbr. month name for use by strftime|Apr"
+msgstr "Abbr. month name for use by strftime|Abr"
+
+#: src/common/utils.c:4832
+msgid "Abbr. month name for use by strftime|May"
+msgstr "Abbr. month name for use by strftime|Mai"
+
+#: src/common/utils.c:4833
+msgid "Abbr. month name for use by strftime|Jun"
+msgstr "Abbr. month name for use by strftime|Jun"
+
+#: src/common/utils.c:4834
+msgid "Abbr. month name for use by strftime|Jul"
+msgstr "Abbr. month name for use by strftime|Jul"
+
+#: src/common/utils.c:4835
+msgid "Abbr. month name for use by strftime|Aug"
+msgstr "Abbr. month name for use by strftime|Ago"
+
+#: src/common/utils.c:4836
+msgid "Abbr. month name for use by strftime|Sep"
+msgstr "Abbr. month name for use by strftime|Set"
+
+#: src/common/utils.c:4837
+msgid "Abbr. month name for use by strftime|Oct"
+msgstr "Abbr. month name for use by strftime|Out"
+
+#: src/common/utils.c:4838
+msgid "Abbr. month name for use by strftime|Nov"
+msgstr "Abbr. month name for use by strftime|Nov"
+
+#: src/common/utils.c:4839
+msgid "Abbr. month name for use by strftime|Dec"
+msgstr "Abbr. month name for use by strftime|Dez"
+
+#: src/common/utils.c:4841
+msgid "For use by strftime (morning)|AM"
+msgstr "For use by strftime (morning)|AM"
+
+#: src/common/utils.c:4842
+msgid "For use by strftime (afternoon)|PM"
+msgstr "For use by strftime (afternoon)|PM"
+
+#: src/common/utils.c:4843
+msgid "For use by strftime (morning, lowercase)|am"
+msgstr "For use by strftime (morning, lowercase)|am"
+
+#: src/common/utils.c:4844
+msgid "For use by strftime (afternoon, lowercase)|pm"
+msgstr "For use by strftime (afternoon, lowercase)|pm"
+
+#: src/common/utils.c:4846
+msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
+msgstr "For use by strftime (default date+time format)|%a-%d/%m/%y %H:%M:%S"
+
+#: src/common/utils.c:4847
+msgid "For use by strftime (default date format)|%m/%d/%y"
+msgstr "For use by strftime (default date format)|%m/%d/%y"
+
+#: src/common/utils.c:4848
+msgid "For use by strftime (default time format)|%H:%M:%S"
+msgstr "For use by strftime (default time format)|%H:%M:%S"
+
+#: src/common/utils.c:4850
+msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
+msgstr "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
+
+#: src/compose.c:522

 msgid "/_Add..."
 msgstr "/_Adicionar..."
 
 msgid "/_Add..."
 msgstr "/_Adicionar..."
 

-#: src/compose.c:518
+#: src/compose.c:523

 msgid "/_Remove"
 msgstr "/_Remover"
 
 msgid "/_Remove"
 msgstr "/_Remover"
 

-#: src/compose.c:520 src/folderview.c:292
+#: src/compose.c:525
+#: src/folderview.c:294

 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 

-#: src/compose.c:525 src/mainwindow.c:740 src/messageview.c:285
+#: src/compose.c:530
+#: src/mainwindow.c:740
+#: src/messageview.c:285

 msgid "/_Message"
 msgstr "/_Mensagem"
 
 msgid "/_Message"
 msgstr "/_Mensagem"
 

-#: src/compose.c:526
+#: src/compose.c:531

 msgid "/_Message/_Send"
 msgstr "/_Mensagem/_Enviar"
 
 msgid "/_Message/_Send"
 msgstr "/_Mensagem/_Enviar"
 

-#: src/compose.c:528
+#: src/compose.c:533

 msgid "/_Message/Send _later"
 msgstr "/_Mensagem/Enviar _mais tarde"
 
 msgid "/_Message/Send _later"
 msgstr "/_Mensagem/Enviar _mais tarde"
 

-#: src/compose.c:530 src/compose.c:534 src/compose.c:537 src/mainwindow.c:750
-#: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
-#: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
+#: src/compose.c:535
+#: src/compose.c:539
+#: src/compose.c:542
+#: src/mainwindow.c:750
+#: src/mainwindow.c:760
+#: src/mainwindow.c:773
+#: src/mainwindow.c:779
+#: src/mainwindow.c:796
+#: src/messageview.c:288
+#: src/messageview.c:296

 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 

-#: src/compose.c:531
+#: src/compose.c:536

 msgid "/_Message/_Attach file"
 msgstr "/_Mensagem/_Anexar arquivo"
 
 msgid "/_Message/_Attach file"
 msgstr "/_Mensagem/_Anexar arquivo"
 

-#: src/compose.c:532
+#: src/compose.c:537

 msgid "/_Message/_Insert file"
 msgstr "/_Mensagem/_Inserir arquivo"
 
 msgid "/_Message/_Insert file"
 msgstr "/_Mensagem/_Inserir arquivo"
 

-#: src/compose.c:533
+#: src/compose.c:538

 msgid "/_Message/Insert si_gnature"
 msgstr "/_Mensagem/Inserir assina_tura"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/_Mensagem/Inserir assina_tura"
 

-#: src/compose.c:535
+#: src/compose.c:540

 msgid "/_Message/_Save"
 msgstr "/_Mensagem/_Salvar"
 
 msgid "/_Message/_Save"
 msgstr "/_Mensagem/_Salvar"
 

-#: src/compose.c:538
+#: src/compose.c:543

 msgid "/_Message/_Close"
 msgstr "/_Mensagem/_Fechar"
 
 msgid "/_Message/_Close"
 msgstr "/_Mensagem/_Fechar"
 

-#: src/compose.c:541
+#: src/compose.c:546

 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Desfazer"
 

-#: src/compose.c:542
+#: src/compose.c:547

 msgid "/_Edit/_Redo"
 msgstr "/_Editar/Re_fazer"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/Re_fazer"
 

-#: src/compose.c:543 src/compose.c:631 src/compose.c:634 src/compose.c:640
-#: src/mainwindow.c:522 src/messageview.c:167
+#: src/compose.c:548
+#: src/compose.c:636
+#: src/compose.c:639
+#: src/compose.c:645
+#: src/mainwindow.c:522
+#: src/messageview.c:167

 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 

-#: src/compose.c:544
+#: src/compose.c:549

 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Recortar"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Recortar"
 

-#: src/compose.c:545 src/mainwindow.c:519 src/messageview.c:165
+#: src/compose.c:550
+#: src/mainwindow.c:519
+#: src/messageview.c:165

 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 

-#: src/compose.c:546
+#: src/compose.c:551

 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 

-#: src/compose.c:547
+#: src/compose.c:552

 msgid "/_Edit/Special paste"
 msgstr "/_Editar/Colar especial"
 
 msgid "/_Edit/Special paste"
 msgstr "/_Editar/Colar especial"
 

-#: src/compose.c:548
+#: src/compose.c:553

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Editar/Colar especial/como _citação"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Editar/Colar especial/como _citação"
 

-#: src/compose.c:550
+#: src/compose.c:555

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Editar/Colar especial/_ajustado"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Editar/Colar especial/_ajustado"
 

-#: src/compose.c:552
+#: src/compose.c:557

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Editar/Colar especial/_não ajustado"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Editar/Colar especial/_não ajustado"
 

-#: src/compose.c:554 src/mainwindow.c:520 src/messageview.c:166
+#: src/compose.c:559
+#: src/mainwindow.c:520
+#: src/messageview.c:166

 msgid "/_Edit/Select _all"
 msgstr "/_Editar/Selecionar _tudo"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/Selecionar _tudo"
 

-#: src/compose.c:555
+#: src/compose.c:560

 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/_Avançado"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/_Avançado"
 

-#: src/compose.c:556
+#: src/compose.c:561

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/_Avançado/Mover um caractere para trás"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/_Avançado/Mover um caractere para trás"
 

-#: src/compose.c:561
+#: src/compose.c:566

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/_Avançado/Mover um caractere para frente"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/_Avançado/Mover um caractere para frente"
 

-#: src/compose.c:566
+#: src/compose.c:571

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para trás"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para trás"
 

-#: src/compose.c:571
+#: src/compose.c:576

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para frente"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/_Avançado/Mover uma palavra para frente"
 

-#: src/compose.c:576
+#: src/compose.c:581

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/_Avançado/Mover para o início da linha"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/_Avançado/Mover para o início da linha"
 

-#: src/compose.c:581
+#: src/compose.c:586

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/_Avançado/Mover para o final da linha"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/_Avançado/Mover para o final da linha"
 

-#: src/compose.c:586
+#: src/compose.c:591

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/_Avançado/Mover para a linha anterior"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/_Avançado/Mover para a linha anterior"
 

-#: src/compose.c:591
+#: src/compose.c:596

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/_Avançado/Mover para a próxima linha"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/_Avançado/Mover para a próxima linha"
 

-#: src/compose.c:596
+#: src/compose.c:601

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para trás"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para trás"
 

-#: src/compose.c:601
+#: src/compose.c:606

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para frente"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/_Avançado/Apagar um caractere para frente"
 

-#: src/compose.c:606
+#: src/compose.c:611

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para trás"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para trás"
 

-#: src/compose.c:611
+#: src/compose.c:616

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para frente"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/_Avançado/Apagar uma palavra para frente"
 

-#: src/compose.c:616
+#: src/compose.c:621

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/_Avançado/Apagar a linha"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/_Avançado/Apagar a linha"
 

-#: src/compose.c:621
+#: src/compose.c:626

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/_Avançado/Apagar a linha inteira"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/_Avançado/Apagar a linha inteira"
 

-#: src/compose.c:626
+#: src/compose.c:631

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/_Avançado/Apagar até o final da linha"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/_Avançado/Apagar até o final da linha"
 

-#: src/compose.c:632
+#: src/compose.c:637

 msgid "/_Edit/_Find"
 msgstr "/_Editar/Locali_zar"
 
 msgid "/_Edit/_Find"
 msgstr "/_Editar/Locali_zar"
 

-#: src/compose.c:635
+#: src/compose.c:640

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Quebrar parágrafo atual"
 

-#: src/compose.c:637
+#: src/compose.c:642

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar todas as l_inhas longas"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/Quebrar todas as l_inhas longas"
 

-#: src/compose.c:639
+#: src/compose.c:644

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Quebra auto_mática"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Quebra auto_mática"
 

-#: src/compose.c:641
+#: src/compose.c:646

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar com um programa e_xterno"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar com um programa e_xterno"
 

-#: src/compose.c:644
+#: src/compose.c:649

 msgid "/_Spelling"
 msgstr "/Orto_grafia"
 
 msgid "/_Spelling"
 msgstr "/Orto_grafia"
 

-#: src/compose.c:645
+#: src/compose.c:650

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/Orto_grafia/_Verificar tudo ou somente a seleção"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/Orto_grafia/_Verificar tudo ou somente a seleção"
 

-#: src/compose.c:647
+#: src/compose.c:652

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/Orto_grafia/_Destacar todas as palavras erradas"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/Orto_grafia/_Destacar todas as palavras erradas"
 

-#: src/compose.c:649
+#: src/compose.c:654

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/Orto_grafia/Verificar palavras erradas _anteriores"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/Orto_grafia/Verificar palavras erradas _anteriores"
 

-#: src/compose.c:651
+#: src/compose.c:656

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/Orto_grafia/Avançar para a _próxima palavra errada"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/Orto_grafia/Avançar para a _próxima palavra errada"
 

-#: src/compose.c:653
+#: src/compose.c:658

 msgid "/_Spelling/---"
 msgstr "/Orto_grafia/---"
 
 msgid "/_Spelling/---"
 msgstr "/Orto_grafia/---"
 

-#: src/compose.c:654
+#: src/compose.c:659

 msgid "/_Spelling/Options"
 msgstr "/Orto_grafia/Opções"
 
 msgid "/_Spelling/Options"
 msgstr "/Orto_grafia/Opções"
 

-#: src/compose.c:657
+#: src/compose.c:662

 msgid "/_Options"
 msgstr "/_Opções"
 
 msgid "/_Options"
 msgstr "/_Opções"
 

-#: src/compose.c:658
+#: src/compose.c:663

 msgid "/_Options/Reply _mode"
 msgstr "/_Opções/Modo da _resposta"
 
 msgid "/_Options/Reply _mode"
 msgstr "/_Opções/Modo da _resposta"
 

-#: src/compose.c:659
+#: src/compose.c:664

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opções/Modo da _resposta/_Normal"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Opções/Modo da _resposta/_Normal"
 

-#: src/compose.c:660
+#: src/compose.c:665

 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Opções/Modo da _resposta/_Todos"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Opções/Modo da _resposta/_Todos"
 

-#: src/compose.c:661
+#: src/compose.c:666

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Opções/Modo da _resposta/_Remetente"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Opções/Modo da _resposta/_Remetente"
 

-#: src/compose.c:662
+#: src/compose.c:667

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opções/Modo da _resposta/_Lista de discussão"
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Opções/Modo da _resposta/_Lista de discussão"
 

-#: src/compose.c:663 src/compose.c:668 src/compose.c:675 src/compose.c:677
-#: src/compose.c:679
+#: src/compose.c:668
+#: src/compose.c:673
+#: src/compose.c:680
+#: src/compose.c:682
+#: src/compose.c:684

 msgid "/_Options/---"
 msgstr "/_Opções/---"
 
 msgid "/_Options/---"
 msgstr "/_Opções/---"
 

-#: src/compose.c:664
+#: src/compose.c:669

 msgid "/_Options/Privacy _System"
 msgstr "/_Opções/Sistema de _privacidade"
 
 msgid "/_Options/Privacy _System"
 msgstr "/_Opções/Sistema de _privacidade"
 

-#: src/compose.c:665
+#: src/compose.c:670

 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opções/Sistema de _privacidade/Nenhum"
 
 msgid "/_Options/Privacy _System/None"
 msgstr "/_Opções/Sistema de _privacidade/Nenhum"
 

-#: src/compose.c:666
+#: src/compose.c:671

 msgid "/_Options/Si_gn"
 msgstr "/_Opções/_Assinar"
 
 msgid "/_Options/Si_gn"
 msgstr "/_Opções/_Assinar"
 

-#: src/compose.c:667
+#: src/compose.c:672

 msgid "/_Options/_Encrypt"
 msgstr "/_Opções/_Criptografar"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Opções/_Criptografar"
 

-#: src/compose.c:669
+#: src/compose.c:674

 msgid "/_Options/_Priority"
 msgstr "/_Opções/_Prioridade"
 
 msgid "/_Options/_Priority"
 msgstr "/_Opções/_Prioridade"
 

-#: src/compose.c:670
+#: src/compose.c:675

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opções/Prioridade/_Altíssima"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Opções/Prioridade/_Altíssima"
 

-#: src/compose.c:671
+#: src/compose.c:676

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opções/Prioridade/A_lta"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Opções/Prioridade/A_lta"
 

-#: src/compose.c:672
+#: src/compose.c:677

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opções/Prioridade/_Normal"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Opções/Prioridade/_Normal"
 

-#: src/compose.c:673
+#: src/compose.c:678

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opções/Prioridade/Bai_xa"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Opções/Prioridade/Bai_xa"
 

-#: src/compose.c:674
+#: src/compose.c:679

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opções/Prioridade/_Baixíssima"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Opções/Prioridade/_Baixíssima"
 

-#: src/compose.c:676
+#: src/compose.c:681

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opções/_Solicitar confirmação de recebimento"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Opções/_Solicitar confirmação de recebimento"
 

-#: src/compose.c:678
+#: src/compose.c:683

 msgid "/_Options/Remo_ve references"
 msgstr "/_Opções/_Remover referências"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/_Opções/_Remover referências"
 

-#: src/compose.c:685
+#: src/compose.c:690

 msgid "/_Options/Character _encoding"
 msgstr "/_Opções/Codi_ficação dos caracteres"
 
 msgid "/_Options/Character _encoding"
 msgstr "/_Opções/Codi_ficação dos caracteres"
 

-#: src/compose.c:686
+#: src/compose.c:691

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Automática"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Automática"
 

-#: src/compose.c:688 src/compose.c:694 src/compose.c:702 src/compose.c:706
-#: src/compose.c:712 src/compose.c:716 src/compose.c:722 src/compose.c:728
-#: src/compose.c:732 src/compose.c:742 src/compose.c:746 src/compose.c:756
-#: src/compose.c:760
+#: src/compose.c:693
+#: src/compose.c:699
+#: src/compose.c:707
+#: src/compose.c:711
+#: src/compose.c:717
+#: src/compose.c:721
+#: src/compose.c:727
+#: src/compose.c:733
+#: src/compose.c:737
+#: src/compose.c:747
+#: src/compose.c:751
+#: src/compose.c:761
+#: src/compose.c:765

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opções/Codi_ficação dos caracteres/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Opções/Codi_ficação dos caracteres/---"
 

-#: src/compose.c:690
+#: src/compose.c:695

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opções/Codi_ficação dos caracteres/ASC_II de 7 bits (US-ASCII)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Opções/Codi_ficação dos caracteres/ASC_II de 7 bits (US-ASCII)"
 

-#: src/compose.c:692
+#: src/compose.c:697

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opções/Codi_ficação dos caracteres/U_nicode (UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Opções/Codi_ficação dos caracteres/U_nicode (UTF-8)"
 

-#: src/compose.c:696
+#: src/compose.c:701

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (ISO-8859-_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (ISO-8859-_1)"
 

-#: src/compose.c:698
+#: src/compose.c:703

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (ISO-8859-1_5)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (ISO-8859-1_5)"
 

-#: src/compose.c:700
+#: src/compose.c:705

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Ocidental (Windows-1252)"
 

-#: src/compose.c:704
+#: src/compose.c:709

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Central (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Europeu Central (ISO-8859-_2)"
 

-#: src/compose.c:708
+#: src/compose.c:713

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Báltico (ISO-8859-1_3)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Báltico (ISO-8859-1_3)"
 

-#: src/compose.c:710
+#: src/compose.c:715

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Báltico (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Báltico (ISO-8859-_4)"
 

-#: src/compose.c:714
+#: src/compose.c:719

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Grego (ISO-8859-7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Grego (ISO-8859-7)"
 

-#: src/compose.c:718
+#: src/compose.c:723

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opções/Codi_ficação dos caracteres/He_bráico (ISO-8859-8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Opções/Codi_ficação dos caracteres/He_bráico (ISO-8859-8)"
 

-#: src/compose.c:720
+#: src/compose.c:725

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Hebráico (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Hebráico (Windows-1255)"
 

-#: src/compose.c:724
+#: src/compose.c:729

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Árabe (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Árabe (ISO-8859-_6)"
 

-#: src/compose.c:726
+#: src/compose.c:731

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Árabe (_Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Árabe (_Windows-1256)"
 

-#: src/compose.c:730
+#: src/compose.c:735

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Turco (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Turco (ISO-8859-_9)"
 

-#: src/compose.c:734
+#: src/compose.c:739

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Cirílico (ISO-8859-5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Cirílico (ISO-8859-5)"
 

-#: src/compose.c:736
+#: src/compose.c:741

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (KOI8-_R)"
 

-#: src/compose.c:738
+#: src/compose.c:743

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (KOI8-_U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (KOI8-_U)"
 

-#: src/compose.c:740
+#: src/compose.c:745

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (_Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Cirílico (_Windows-1251)"
 

-#: src/compose.c:744
+#: src/compose.c:749

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Japonês (ISO-2022-JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Opções/Codi_ficação dos caracteres/_Japonês (ISO-2022-JP)"
 

-#: src/compose.c:748
+#: src/compose.c:753

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês _simplificado (GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês _simplificado (GB2312)"
 

-#: src/compose.c:750
+#: src/compose.c:755

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês simplificado (GB_K)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês simplificado (GB_K)"
 

-#: src/compose.c:752
+#: src/compose.c:757

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês tra_dicional (Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês tra_dicional (Big5)"
 

-#: src/compose.c:754
+#: src/compose.c:759

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês _tradicional (EUC-TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Chinês _tradicional (EUC-TW)"
 

-#: src/compose.c:758
+#: src/compose.c:763

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opções/Codi_ficação dos caracteres/C_oreano (EUC-KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Opções/Codi_ficação dos caracteres/C_oreano (EUC-KR)"
 

-#: src/compose.c:762
+#: src/compose.c:767

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Thai (TIS-_620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Thai (TIS-_620)"
 

-#: src/compose.c:764
+#: src/compose.c:769

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Thai (Windows-_874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Opções/Codi_ficação dos caracteres/Thai (Windows-_874)"
 

-#: src/compose.c:768
+#: src/compose.c:773

 msgid "/_Tools/Show _ruler"
 msgstr "/_Ferramentas/Exibir _régua"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Ferramentas/Exibir _régua"
 

-#: src/compose.c:769 src/messageview.c:303
+#: src/compose.c:774
+#: src/messageview.c:303

 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Livro de endereços"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Livro de endereços"
 

-#: src/compose.c:770
+#: src/compose.c:775

 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/_Modelo"
 
 msgid "/_Tools/_Template"
 msgstr "/_Ferramentas/_Modelo"
 

-#: src/compose.c:771 src/mainwindow.c:832 src/messageview.c:328
+#: src/compose.c:776
+#: src/mainwindow.c:832
+#: src/messageview.c:328

 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 

-#: src/compose.c:1598
+#: src/compose.c:1039
+#: src/prefs_compose_writing.c:384
+msgid "New message subject format error."
+msgstr "Erro no formato do assunto da mensagem."
+
+#: src/compose.c:1068
+#: src/prefs_compose_writing.c:388
+msgid "New message body format error."
+msgstr "Erro no formato do corpo da mensagem."
+
+#: src/compose.c:1438
+#: src/prefs_quote.c:281
+msgid "Message reply format error."
+msgstr "Erro no formato da mensagem de resposta."
+
+#: src/compose.c:1555
+#: src/prefs_quote.c:286
+msgid "Message forward format error."
+msgstr "Erro no formato da mensagem de encaminhamento."
+
+#: src/compose.c:1675

 msgid "Fw: multiple emails"
 msgstr "Enc: múltiplos e-mails"
 
 msgid "Fw: multiple emails"
 msgstr "Enc: múltiplos e-mails"
 

-#: src/compose.c:2021
+#: src/compose.c:2050
+msgid "Message redirect format error."
+msgstr "Erro no formato da mensagem de redirecionamento."
+
+#: src/compose.c:2119

 msgid "Reply-To:"
 msgstr "Responder para:"
 
 msgid "Reply-To:"
 msgstr "Responder para:"
 

-#: src/compose.c:2024 src/compose.c:5527 src/compose.c:6295
+#: src/compose.c:2122
+#: src/compose.c:5664
+#: src/compose.c:6434
+#: src/compose.c:9472

 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 

-#: src/compose.c:2027
+#: src/compose.c:2125

 msgid "Followup-To:"
 msgstr "Seguir a:"
 
 msgid "Followup-To:"
 msgstr "Seguir a:"
 

-#: src/compose.c:2424
+#: src/compose.c:2304
+#, c-format
+msgid "The file '%s' has been attached."
+msgstr "O arquivo '%s' foi anexado."
+
+#: src/compose.c:2308
+msgid "Couldn't attach a file (charset conversion failed)."
+msgstr "Não foi possível anexar o arquivo (erro na conversão do conjunto de caracteres)."
+
+#: src/compose.c:2539

 msgid "Quote mark format error."
 msgstr "Erro no formato da marca de citação."
 
 msgid "Quote mark format error."
 msgstr "Erro no formato da marca de citação."
 

-#: src/compose.c:2447
-msgid "Message reply/forward format error."
-msgstr "Erro no formato da resposta/encaminhamento."
-
-#: src/compose.c:3004
+#: src/compose.c:3133

 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "O arquivo %s está vazio."
 

-#: src/compose.c:3008
+#: src/compose.c:3137

 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "Não foi possível ler %s."
 

-#: src/compose.c:3035
+#: src/compose.c:3164

 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 

-#: src/compose.c:3853
+#: src/compose.c:3983

 msgid " [Edited]"
 msgstr " [Editada]"
 
 msgid " [Edited]"
 msgstr " [Editada]"
 

-#: src/compose.c:3859
+#: src/compose.c:3989

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compor mensagem%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Compor mensagem%s"
 

-#: src/compose.c:3862
+#: src/compose.c:3992

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sem assunto] - Compor mensagem%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[sem assunto] - Compor mensagem%s"
 

-#: src/compose.c:3887 src/messageview.c:613
+#: src/compose.c:4017
+#: src/messageview.c:613

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1490,32 +1872,39 @@ msgstr ""
 "Não foi especificada uma conta para o envio da\n"
 "mensagem. Por favor, selecione uma conta antes de enviar."
 
 "Não foi especificada uma conta para o envio da\n"
 "mensagem. Por favor, selecione uma conta antes de enviar."
 

-#: src/compose.c:4064 src/compose.c:4095 src/compose.c:4126 src/toolbar.c:391
-#: src/toolbar.c:442
+#: src/compose.c:4195
+#: src/compose.c:4226
+#: src/compose.c:4258
+#: src/toolbar.c:401
+#: src/toolbar.c:452

 msgid "Send"
 msgstr "Enviar"
 
 msgid "Send"
 msgstr "Enviar"
 

-#: src/compose.c:4065
+#: src/compose.c:4196

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cc padrão. Enviar mesmo assim?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cc padrão. Enviar mesmo assim?"
 

-#: src/compose.c:4066 src/compose.c:4097 src/compose.c:4128 src/compose.c:4597
+#: src/compose.c:4197
+#: src/compose.c:4228
+#: src/compose.c:4260
+#: src/compose.c:4734

 msgid "+_Send"
 msgstr "+_Enviar"
 
 msgid "+_Send"
 msgstr "+_Enviar"
 

-#: src/compose.c:4096
+#: src/compose.c:4227

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cco padrão. Enviar mesmo assim?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "O único destinatário é o endereço Cco padrão. Enviar mesmo assim?"
 

-#: src/compose.c:4113
+#: src/compose.c:4244

 msgid "Recipient is not specified."
 msgstr "O destinatário não foi especificado."
 
 msgid "Recipient is not specified."
 msgstr "O destinatário não foi especificado."
 

-#: src/compose.c:4127
+#: src/compose.c:4259

 msgid "Subject is empty. Send it anyway?"
 msgstr "A mensagem está sem assunto. Enviar mesmo assim?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "A mensagem está sem assunto. Enviar mesmo assim?"
 

-#: src/compose.c:4170 src/compose.c:7756
+#: src/compose.c:4305
+#: src/compose.c:7935

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1525,7 +1914,8 @@ msgstr ""
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 
 "\n"
 "Ocorreu um erro na conversão da codificação dos caracteres."
 

-#: src/compose.c:4173 src/compose.c:7759
+#: src/compose.c:4308
+#: src/compose.c:7938

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1535,7 +1925,8 @@ msgstr ""
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 
 "\n"
 "Não foi possível obter a chave de criptografia do destinatário."
 

-#: src/compose.c:4177 src/compose.c:7753
+#: src/compose.c:4312
+#: src/compose.c:7932

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1546,7 +1937,7 @@ msgstr ""
 "\n"
 "Falha na assinatura: %s"
 
 "\n"
 "Falha na assinatura: %s"
 

-#: src/compose.c:4180
+#: src/compose.c:4315

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1557,30 +1948,29 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4182
+#: src/compose.c:4317

 msgid "Could not queue message for sending."
 msgstr "Não foi possível acrescentar a mensagem à Fila de Saída."
 
 msgid "Could not queue message for sending."
 msgstr "Não foi possível acrescentar a mensagem à Fila de Saída."
 

-#: src/compose.c:4197 src/compose.c:4256
+#: src/compose.c:4332
+#: src/compose.c:4391

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "A mensagem está na Fila de Saída, mas não foi possível enviá-la.\n"
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "A mensagem está na Fila de Saída, mas não foi possível enviá-la.\n"

-"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
-"tentar novamente."
+"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para tentar novamente."

 
 

-#: src/compose.c:4250
+#: src/compose.c:4385

 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 "%s\n"

-"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para "
-"tentar novamente."
+"Use \"Enviar mensagens da Fila de Saída\" a partir da janela principal para tentar novamente."

 
 

-#: src/compose.c:4594
+#: src/compose.c:4731

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1591,7 +1981,7 @@ msgstr ""
 "para a codificação %s especificada.\n"
 "Enviá-la como %s?"
 
 "para a codificação %s especificada.\n"
 "Enviá-la como %s?"
 

-#: src/compose.c:4653
+#: src/compose.c:4790

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1604,60 +1994,72 @@ msgstr ""
 "\n"
 "Enviar mesmo assim?"
 
 "\n"
 "Enviar mesmo assim?"
 

-#: src/compose.c:4841
+#: src/compose.c:4978

 msgid "No account for sending mails available!"
 msgstr "Não existem contas para enviar a mensagem!"
 
 msgid "No account for sending mails available!"
 msgstr "Não existem contas para enviar a mensagem!"
 

-#: src/compose.c:4851
+#: src/compose.c:4988

 msgid "No account for posting news available!"
 msgstr "Não existem contas para publicar o artigo!"
 
 msgid "No account for posting news available!"
 msgstr "Não existem contas para publicar o artigo!"
 

-#: src/compose.c:5544
+#: src/compose.c:5681

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Use <tab> para completar automaticamente a partir do Livro de Endereços"
 

-#: src/compose.c:5672
+#: src/compose.c:5809

 msgid "Mime type"
 msgstr "Tipo MIME"
 
 msgid "Mime type"
 msgstr "Tipo MIME"
 

-#: src/compose.c:5678 src/compose.c:5974 src/mimeview.c:212
-#: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
+#: src/compose.c:5815
+#: src/compose.c:6111
+#: src/mimeview.c:212
+#: src/plugins/pgpcore/select-keys.c:374
+#: src/prefs_summary_column.c:86

 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Tamanho"
 
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Tamanho"
 

-#: src/compose.c:5739
+#: src/compose.c:5876

 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 
 msgid "Save Message to "
 msgstr "Salvar mensagem em "
 

-#: src/compose.c:5761 src/editjpilot.c:289 src/editldap.c:526
-#: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
-#: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
-#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
+#: src/compose.c:5898
+#: src/editjpilot.c:289
+#: src/editldap.c:526
+#: src/editvcard.c:202
+#: src/export.c:172
+#: src/import.c:171
+#: src/importmutt.c:242
+#: src/importpine.c:242
+#: src/plugins/clamav/clamav_plugin_gtk.c:146
+#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Explorar"
 
 msgid "_Browse"
 msgstr "_Explorar"
 

-#: src/compose.c:5973 src/compose.c:7163
+#: src/compose.c:6110
+#: src/compose.c:7342

 msgid "MIME type"
 msgstr "Tipo MIME"
 
 msgid "MIME type"
 msgstr "Tipo MIME"
 

-#: src/compose.c:6045
+#: src/compose.c:6182

 msgid "Hea_der"
 msgstr "_Cabeçalho"
 
 msgid "Hea_der"
 msgstr "_Cabeçalho"
 

-#: src/compose.c:6049
+#: src/compose.c:6186

 msgid "_Attachments"
 msgstr "_Anexos"
 
 msgid "_Attachments"
 msgstr "_Anexos"
 

-#: src/compose.c:6053
+#: src/compose.c:6190

 msgid "Othe_rs"
 msgstr "_Outros"
 
 msgid "Othe_rs"
 msgstr "_Outros"
 

-#: src/compose.c:6068 src/summary_search.c:298
+#: src/compose.c:6205
+#: src/summary_search.c:366

 msgid "Subject:"
 msgstr "Assunto:"
 
 msgid "Subject:"
 msgstr "Assunto:"
 

-#: src/compose.c:6257
+#: src/compose.c:6396

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1666,69 +2068,75 @@ msgstr ""
 "Não foi possível iniciar o verificador ortográfico.\n"
 "%s"
 
 "Não foi possível iniciar o verificador ortográfico.\n"
 "%s"
 

-#: src/compose.c:6369
+#: src/compose.c:6508

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "De: <i>%s</i>"
 

-#: src/compose.c:6400
+#: src/compose.c:6539

 msgid "Account to use for this email"
 msgstr "Conta a ser usada por esse e-mail"
 
 msgid "Account to use for this email"
 msgstr "Conta a ser usada por esse e-mail"
 

-#: src/compose.c:6402
+#: src/compose.c:6541

 msgid "Sender address to be used"
 msgstr "Endereço do rementente a ser usado"
 
 msgid "Sender address to be used"
 msgstr "Endereço do rementente a ser usado"
 

-#: src/compose.c:6556
+#: src/compose.c:6702

 #, c-format
 #, c-format

-msgid ""
-"The privacy system '%s' cannot be loaded. You will not be able to sign or "
-"encrypt this message."
-msgstr ""
-"Não foi possível carregar o sistema de privacidade '%s'. Você não poderá "
-"assinar ou criptografar essa mensagem."
+msgid "The privacy system '%s' cannot be loaded. You will not be able to sign or encrypt this message."
+msgstr "Não foi possível carregar o sistema de privacidade '%s'. Você não poderá assinar ou criptografar essa mensagem."

 
 

-#: src/compose.c:6795
-msgid "Message To format error."
-msgstr "Erro no formato do destinatário (Para)."
+#: src/compose.c:6864
+#: src/prefs_template.c:549
+msgid "Template body format error."
+msgstr "Erro no formato do corpo do modelo."

 
 

-#: src/compose.c:6808
-msgid "Message Cc format error."
-msgstr "Erro no formato do destinatário (Cc)."
+#: src/compose.c:6972
+#: src/prefs_template.c:587
+msgid "Template To format error."
+msgstr "Erro no formato do Para do modelo."

 
 

-#: src/compose.c:6821
-msgid "Message Bcc format error."
-msgstr "Erro no formato do destinatário (Cco)."
+#: src/compose.c:6985
+#: src/prefs_template.c:592
+msgid "Template Cc format error."
+msgstr "Erro no formato do Cc do modelo."

 
 

-#: src/compose.c:6835
-msgid "Message subject format error."
-msgstr "Erro no formato do assunto."
+#: src/compose.c:6998
+#: src/prefs_template.c:597
+msgid "Template Bcc format error."
+msgstr "Erro no formato do Cco do modelo."

 
 

-#: src/compose.c:7057
+#: src/compose.c:7012
+#: src/prefs_template.c:602
+msgid "Template subject format error."
+msgstr "Erro no formato do assunto do modelo."
+
+#: src/compose.c:7236

 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 

-#: src/compose.c:7072
+#: src/compose.c:7251

 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 

-#: src/compose.c:7145
+#: src/compose.c:7324

 msgid "Properties"
 msgstr "Propriedades"
 
 msgid "Properties"
 msgstr "Propriedades"
 

-#: src/compose.c:7196
+#: src/compose.c:7375

 msgid "Encoding"
 msgstr "Codificação"
 
 msgid "Encoding"
 msgstr "Codificação"
 

-#: src/compose.c:7216
+#: src/compose.c:7395

 msgid "Path"
 msgstr "Caminho"
 
 msgid "Path"
 msgstr "Caminho"
 

-#: src/compose.c:7217 src/prefs_toolbar.c:1060
+#: src/compose.c:7396
+#: src/prefs_toolbar.c:1060

 msgid "File name"
 msgstr "Nome do arquivo"
 
 msgid "File name"
 msgstr "Nome do arquivo"
 

-#: src/compose.c:7400
+#: src/compose.c:7579

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1739,19 +2147,20 @@ msgstr ""
 "Deseja terminar o processo?\n"
 "Id do grupo do processo: %d"
 
 "Deseja terminar o processo?\n"
 "Id do grupo do processo: %d"
 

-#: src/compose.c:7442
+#: src/compose.c:7621

 msgid "Compose: input from monitoring process\n"
 msgstr "Composição: entrada do processo monitorado\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Composição: entrada do processo monitorado\n"
 

-#: src/compose.c:7723 src/messageview.c:718
-msgid "Sylpheed-Claws needs network access in order to send this email."
-msgstr "O Sylpheed-Claws necessita de acesso á rede para enviar esse e-mail."
+#: src/compose.c:7902
+#: src/messageview.c:718
+msgid "Claws Mail needs network access in order to send this email."
+msgstr "O Claws Mail necessita de acesso à rede para enviar essa mensagem."

 
 

-#: src/compose.c:7748
+#: src/compose.c:7927

 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 
 msgid "Could not queue message."
 msgstr "Não foi possível adicionar a mensagem à Fila de Saída."
 

-#: src/compose.c:7750
+#: src/compose.c:7929

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1762,20 +2171,21 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:7870
+#: src/compose.c:8049

 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 
 msgid "Could not save draft."
 msgstr "Não foi possível salvar o rascunho."
 

-#: src/compose.c:7945 src/compose.c:7968
+#: src/compose.c:8124
+#: src/compose.c:8147

 msgid "Select file"
 msgstr "Selecione o arquivo"
 
 msgid "Select file"
 msgstr "Selecione o arquivo"
 

-#: src/compose.c:7981
+#: src/compose.c:8160

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Não foi possível ler o arquivo '%s'."
 

-#: src/compose.c:7983
+#: src/compose.c:8162

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1784,76 +2194,72 @@ msgstr ""
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 
 "O arquivo '%s' continha caracteres inválidos para a\n"
 "codificação atual, a inserção pode estar incorreta."
 

-#: src/compose.c:8031
+#: src/compose.c:8210

 msgid "Discard message"
 msgstr "Descartar a mensagem"
 
 msgid "Discard message"
 msgstr "Descartar a mensagem"
 

-#: src/compose.c:8032
+#: src/compose.c:8211

 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Essa mensagem foi modificada. Deseja descartá-la ?"
 

-#: src/compose.c:8033
+#: src/compose.c:8212

 msgid "_Discard"
 msgstr "_Descartar"
 
 msgid "_Discard"
 msgstr "_Descartar"
 

-#: src/compose.c:8033
+#: src/compose.c:8212

 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 
 msgid "_Save to Drafts"
 msgstr "Salvar em _Rascunhos"
 

-#: src/compose.c:8077
+#: src/compose.c:8256

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Deseja aplicar o modelo '%s'?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Deseja aplicar o modelo '%s'?"
 

-#: src/compose.c:8079
+#: src/compose.c:8258

 msgid "Apply template"
 msgstr "Aplicar o modelo"
 
 msgid "Apply template"
 msgstr "Aplicar o modelo"
 

-#: src/compose.c:8080
+#: src/compose.c:8259

 msgid "_Replace"
 msgstr "_Substituir"
 
 msgid "_Replace"
 msgstr "_Substituir"
 

-#: src/compose.c:8080
+#: src/compose.c:8259

 msgid "_Insert"
 msgstr "_Inserir"
 
 msgid "_Insert"
 msgstr "_Inserir"
 

-#: src/compose.c:8768
+#: src/compose.c:8947

 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 
 msgid "Insert or attach?"
 msgstr "Inserir ou anexar?"
 

-#: src/compose.c:8769
-msgid ""
-"Do you want to insert the contents of the file(s) into the message body, or "
-"attach it to the email?"
-msgstr ""
-"Você deseja inserir o conteúdo do(s) arquivo(s) no corpo da mensagem ou "
-"anexá-lo ao e-mail?"
+#: src/compose.c:8948
+msgid "Do you want to insert the contents of the file(s) into the message body, or attach it to the email?"
+msgstr "Você deseja inserir o conteúdo do(s) arquivo(s) no corpo da mensagem ou anexá-lo ao e-mail?"

 
 

-#: src/compose.c:8771
+#: src/compose.c:8950

 msgid "+_Insert"
 msgstr "+_Inserir"
 
 msgid "+_Insert"
 msgstr "+_Inserir"
 

-#: src/compose.c:8771
+#: src/compose.c:8950

 msgid "_Attach"
 msgstr "_Anexar"
 
 msgid "_Attach"
 msgstr "_Anexar"
 

-#: src/compose.c:9177
+#: src/compose.c:9149
+msgid "Quote format error."
+msgstr "Erro no formato da citação."
+
+#: src/compose.c:9368

 #, c-format
 #, c-format

-msgid ""
-"You are about to reply to %d messages. Opening the windows could take some "
-"time. Do you want to continue?"
-msgstr ""
-"Você esta prestes a responder %d mensagens. Abrir as janelas de composição "
-"pode demorar algum tempo. Deseja realmente continuar?"
+msgid "You are about to reply to %d messages. Opening the windows could take some time. Do you want to continue?"
+msgstr "Você esta prestes a responder %d mensagens. Abrir as janelas de composição pode demorar algum tempo. Deseja realmente continuar?"

 
 #: src/crash.c:142
 #, c-format
 
 #: src/crash.c:142
 #, c-format

-msgid "Sylpheed-Claws process (%ld) received signal %ld"
-msgstr "O processo (%ld) do Sylpheed-Claws recebeu o sinal %ld"
+msgid "Claws Mail process (%ld) received signal %ld"
+msgstr "O processo (%ld) do Claws Mail recebeu o sinal %ld"

 
 #: src/crash.c:188
 
 #: src/crash.c:188

-msgid "Sylpheed-Claws has crashed"
-msgstr "Ocorreu um problema com o Sylpheed-Claws"
+msgid "Claws Mail has crashed"
+msgstr "Ocorreu um problema com o Claws Mail"

 
 #: src/crash.c:204
 #, c-format
 
 #: src/crash.c:204
 #, c-format


@@ -1884,61 +2290,79 @@ msgstr "Criar relatório de erros"
 msgid "Save crash information"
 msgstr "Salvar as informações do problema"
 
 msgid "Save crash information"
 msgstr "Salvar as informações do problema"
 

-#: src/editaddress.c:153
+#: src/editaddress.c:183

 msgid "Add New Person"
 msgstr "Adicionar uma nova pessoa"
 
 msgid "Add New Person"
 msgstr "Adicionar uma nova pessoa"
 

-#: src/editaddress.c:154
+#: src/editaddress.c:184

 msgid "Edit Person Details"
 msgstr "Editar os detalhes da pessoa"
 
 msgid "Edit Person Details"
 msgstr "Editar os detalhes da pessoa"
 

-#: src/editaddress.c:316
+#: src/editaddress.c:355

 msgid "An Email address must be supplied."
 msgstr "Você deve informar um endereço de e-mail."
 
 msgid "An Email address must be supplied."
 msgstr "Você deve informar um endereço de e-mail."
 

-#: src/editaddress.c:490
+#: src/editaddress.c:529

 msgid "A Name and Value must be supplied."
 msgstr "Você deve informar um nome e um valor."
 
 msgid "A Name and Value must be supplied."
 msgstr "Você deve informar um nome e um valor."
 

-#: src/editaddress.c:560
+#: src/editaddress.c:618
+msgid "Discard"
+msgstr "Descartar"
+
+#: src/editaddress.c:619
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/editaddress.c:649
+#: src/editaddress.c:698

 msgid "Edit Person Data"
 msgstr "Editar os dados da pessoa"
 
 msgid "Edit Person Data"
 msgstr "Editar os dados da pessoa"
 

-#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:799
+#: src/editaddress.c:759
+#: src/expldifdlg.c:508
+#: src/exporthtml.c:799

 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Nome exibido"
 
 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Nome exibido"
 

-#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:827
+#: src/editaddress.c:765
+#: src/editaddress.c:769
+#: src/ldif.c:827

 msgid "Last Name"
 msgstr "Sobrenome"
 
 msgid "Last Name"
 msgstr "Sobrenome"
 

-#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:823
+#: src/editaddress.c:766
+#: src/editaddress.c:768
+#: src/ldif.c:823

 msgid "First Name"
 msgstr "Primeiro Nome"
 
 msgid "First Name"
 msgstr "Primeiro Nome"
 

-#: src/editaddress.c:683
+#: src/editaddress.c:771

 msgid "Nickname"
 msgstr "Apelido"
 
 msgid "Nickname"
 msgstr "Apelido"
 

-#: src/editaddress.c:760 src/editaddress.c:816
+#: src/editaddress.c:848
+#: src/editaddress.c:904

 msgid "Alias"
 msgstr "Pseudônimo"
 
 msgid "Alias"
 msgstr "Pseudônimo"
 

-#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:222
+#: src/editaddress.c:1042
+#: src/editaddress.c:1099
+#: src/prefs_customheader.c:222

 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Valor"
 
 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Valor"
 

-#: src/editaddress.c:1070
+#: src/editaddress.c:1161

 msgid "_User Data"
 msgstr "Dados do _usuário"
 
 msgid "_User Data"
 msgstr "Dados do _usuário"
 

-#: src/editaddress.c:1071
+#: src/editaddress.c:1162

 msgid "_Email Addresses"
 msgstr "Endereços de _e-mail"
 
 msgid "_Email Addresses"
 msgstr "Endereços de _e-mail"
 

-#: src/editaddress.c:1072
+#: src/editaddress.c:1163

 msgid "O_ther Attributes"
 msgstr "Outros _atributos"
 
 msgid "O_ther Attributes"
 msgstr "Outros _atributos"
 


@@ -1950,20 +2374,29 @@ msgstr "O arquivo parece estar ok."
 msgid "File does not appear to be a valid address book format."
 msgstr "O arquivo não parece estar em um formato de Livro de Endereços válido."
 
 msgid "File does not appear to be a valid address book format."
 msgstr "O arquivo não parece estar em um formato de Livro de Endereços válido."
 

-#: src/editbook.c:119 src/editjpilot.c:203 src/editvcard.c:107
+#: src/editbook.c:119
+#: src/editjpilot.c:203
+#: src/editvcard.c:107

 msgid "Could not read file."
 msgstr "Não foi possível ler o arquivo."
 
 msgid "Could not read file."
 msgstr "Não foi possível ler o arquivo."
 

-#: src/editbook.c:153 src/editbook.c:266
+#: src/editbook.c:153
+#: src/editbook.c:266

 msgid "Edit Addressbook"
 msgstr "Editar o Livro de Endereço"
 
 msgid "Edit Addressbook"
 msgstr "Editar o Livro de Endereço"
 

-#: src/editbook.c:182 src/editjpilot.c:277 src/editvcard.c:190
+#: src/editbook.c:182
+#: src/editjpilot.c:277
+#: src/editvcard.c:190

 msgid " Check File "
 msgstr " Verificar o arquivo "
 
 msgid " Check File "
 msgstr " Verificar o arquivo "
 

-#: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1910
+#: src/editbook.c:187
+#: src/editjpilot.c:282
+#: src/editvcard.c:195
+#: src/importmutt.c:235
+#: src/importpine.c:235
+#: src/prefs_account.c:1917

 msgid "File"
 msgstr "Arquivo"
 
 msgid "File"
 msgstr "Arquivo"
 


@@ -1979,7 +2412,8 @@ msgstr "Você deve informar um nome para o grupo."
 msgid "Edit Group Data"
 msgstr "Editar os dados do grupo"
 
 msgid "Edit Group Data"
 msgstr "Editar os dados do grupo"
 

-#: src/editgroup.c:323 src/exporthtml.c:635
+#: src/editgroup.c:323
+#: src/exporthtml.c:635

 msgid "Group Name"
 msgstr "Nome do grupo"
 
 msgid "Group Name"
 msgstr "Nome do grupo"
 


@@ -2011,11 +2445,16 @@ msgstr "Editar a pasta"
 msgid "Input the new name of folder:"
 msgstr "Digite o novo nome da pasta:"
 
 msgid "Input the new name of folder:"
 msgstr "Digite o novo nome da pasta:"
 

-#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:134 src/mh_gtk.c:127
+#: src/editgroup.c:549
+#: src/foldersel.c:556
+#: src/imap_gtk.c:137
+#: src/mh_gtk.c:130

 msgid "New folder"
 msgstr "Nova pasta"
 
 msgid "New folder"
 msgstr "Nova pasta"
 

-#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:128
+#: src/editgroup.c:550
+#: src/foldersel.c:557
+#: src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 


@@ -2027,7 +2466,8 @@ msgstr "O arquivo não parece estar no formato JPilot."
 msgid "Select JPilot File"
 msgstr "Selecione o arquivo JPilot"
 
 msgid "Select JPilot File"
 msgstr "Selecione o arquivo JPilot"
 

-#: src/editjpilot.c:248 src/editjpilot.c:378
+#: src/editjpilot.c:248
+#: src/editjpilot.c:378

 msgid "Edit JPilot Entry"
 msgstr "Editar a entrada JPilot"
 
 msgid "Edit JPilot Entry"
 msgstr "Editar a entrada JPilot"
 


@@ -2043,15 +2483,19 @@ msgstr "Adicionar uma nova entrada JPilot"
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Selecionar a base de procura"
 
 msgid "Edit LDAP - Select Search Base"
 msgstr "Editar LDAP - Selecionar a base de procura"
 

-#: src/editldap_basedn.c:163 src/editldap.c:439
+#: src/editldap_basedn.c:163
+#: src/editldap.c:439

 msgid "Hostname"
 msgstr "Nome do Host"
 
 msgid "Hostname"
 msgstr "Nome do Host"
 

-#: src/editldap_basedn.c:173 src/editldap.c:458 src/ssl_manager.c:110
+#: src/editldap_basedn.c:173
+#: src/editldap.c:458
+#: src/ssl_manager.c:110

 msgid "Port"
 msgstr "Porta"
 
 msgid "Port"
 msgstr "Porta"
 

-#: src/editldap_basedn.c:183 src/editldap.c:508
+#: src/editldap_basedn.c:183
+#: src/editldap.c:508

 msgid "Search Base"
 msgstr "Base de procura"
 
 msgid "Search Base"
 msgstr "Base de procura"
 


@@ -2061,11 +2505,10 @@ msgstr "Base(s) de procura disponíveis"
 
 #: src/editldap_basedn.c:294
 msgid "Could not read Search Base(s) from server - please set manually"
 
 #: src/editldap_basedn.c:294
 msgid "Could not read Search Base(s) from server - please set manually"

-msgstr ""
-"Não foi possível ler a(s) base(s) de procura do servidor - por favor, defina "
-"manualmente"
+msgstr "Não foi possível ler a(s) base(s) de procura do servidor - por favor, defina manualmente"

 
 

-#: src/editldap_basedn.c:298 src/editldap.c:278
+#: src/editldap_basedn.c:298
+#: src/editldap.c:278

 msgid "Could not connect to server"
 msgstr "Não foi possível conectar ao servidor"
 
 msgid "Could not connect to server"
 msgstr "Não foi possível conectar ao servidor"
 


@@ -2085,7 +2528,8 @@ msgstr "Você deve informar ao menos um atributo de procura no LDAP."
 msgid "Connected successfully to server"
 msgstr "A conexão com o servidor foi bem sucedida"
 
 msgid "Connected successfully to server"
 msgstr "A conexão com o servidor foi bem sucedida"
 

-#: src/editldap.c:331 src/editldap.c:1032
+#: src/editldap.c:331
+#: src/editldap.c:1032

 msgid "Edit LDAP Server"
 msgstr "Editar o servidor LDAP"
 
 msgid "Edit LDAP Server"
 msgstr "Editar o servidor LDAP"
 


@@ -2094,16 +2538,8 @@ msgid "A name that you wish to call the server."
 msgstr "O nome pelo qual você deseja chamar o servidor."
 
 #: src/editldap.c:449
 msgstr "O nome pelo qual você deseja chamar o servidor."
 
 #: src/editldap.c:449

-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 "
-"be used. You may specify \"localhost\" if running an LDAP server on the same "
-"computer as Sylpheed-Claws."
-msgstr ""
-"Este é o nome de host do servidor. Por exemplo, \"ldap.meudominio.com\" pode "
-"ser apropriado para a organização \"meudominio.com\". Você também pode usar "
-"um endereço IP. Você deve especificar \"localhost\" se estiver executando um "
-"servidor LDAP no mesmo computador que o Sylpheed-Claws."
+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 be used. You may specify \"localhost\" if running an LDAP server on the same computer as Claws Mail."
+msgstr "Este é o nome de host do servidor. Por exemplo, \"ldap.meudominio.com\" pode ser apropriado para a organização \"meudominio.com\". Você também pode usar um endereço IP. Você deve especificar \"localhost\" se estiver executando um servidor LDAP no mesmo computador que o Claws Mail."

 
 #: src/editldap.c:470
 msgid "TLS"
 
 #: src/editldap.c:470
 msgid "TLS"


@@ -2114,24 +2550,12 @@ msgid "SSL"
 msgstr "SSL"
 
 #: src/editldap.c:475
 msgstr "SSL"
 
 #: src/editldap.c:475

-msgid ""
-"Enable secure connection to the LDAP server via TLS.If connection fails, be "
-"sure to check the correct configuration in ldap.conf (TLS_CACERT or "
-"TLS_CACERTDIR fields)."
-msgstr ""
-"Habilitar conexão segura com o servidor LDAP via TLS. Caso a conexão não se "
-"efetue, certifique-se de verificar a configuração correta em ldap.conf "
-"(campos TLS_CACERT ou TLS_CACERTDIR)."
+msgid "Enable secure connection to the LDAP server via TLS.If connection fails, be sure to check the correct configuration in ldap.conf (TLS_CACERT or TLS_CACERTDIR fields)."
+msgstr "Habilitar conexão segura com o servidor LDAP via TLS. Caso a conexão não se efetue, certifique-se de verificar a configuração correta em ldap.conf (campos TLS_CACERT ou TLS_CACERTDIR)."

 
 #: src/editldap.c:480
 
 #: 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_CACERT or "
-"TLS_CACERTDIR fields)."
-msgstr ""
-"Habilitar conexão segura com o servidor LDAP via SSL. Caso a conexão não se "
-"efetue, certifique-se de verificar a configuração correta em ldap.conf "
-"(campos TLS_CACERT ou TLS_CACERTDIR)."
+msgid "Enable secure connection to the LDAP server via SSL.If connection fails, be sure to check the correct configuration in ldap.conf (TLS_CACERT or TLS_CACERTDIR fields)."
+msgstr "Habilitar conexão segura com o servidor LDAP via SSL. Caso a conexão não se efetue, certifique-se de verificar a configuração correta em ldap.conf (campos TLS_CACERT ou TLS_CACERTDIR)."

 
 #: src/editldap.c:494
 msgid "The port number that the server listens on. Port 389 is the default."
 
 #: src/editldap.c:494
 msgid "The port number that the server listens on. Port 389 is the default."


@@ -2147,125 +2571,67 @@ msgstr "Pressione esse botão para testar a conexão com o servidor."
 
 #: src/editldap.c:518
 msgid ""
 
 #: src/editldap.c:518
 msgid ""

-"This specifies the name of the directory to be searched on the server. "
-"Examples include:\n"
-"  dc=sylpheed,dc=org\n"
+"This specifies the name of the directory to be searched on the server. Examples include:\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""

-"Isso especifica o nome do diretório a ser procurado no servidor. Por "
-"exemplo:\n"
-"  dc=sylpheed,dc=org\n"
+"Isso especifica o nome do diretório a ser procurado no servidor. Por exemplo:\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=pessoas,dc=domínio,dc=com\n"
 "  o=nome da organização,c=país\n"
 
 #: src/editldap.c:531
 "  ou=pessoas,dc=domínio,dc=com\n"
 "  o=nome da organização,c=país\n"
 
 #: src/editldap.c:531

-msgid ""
-"Press this button to lookup the name of available directory names on the "
-"server."
-msgstr ""
-"Pressione esse botão para procurar pelos nomes dos diretórios disponíveis no "
-"servidor."
+msgid "Press this button to lookup the name of available directory names on the server."
+msgstr "Pressione esse botão para procurar pelos nomes dos diretórios disponíveis no servidor."

 
 #: src/editldap.c:589
 msgid "Search Attributes"
 msgstr "Atributos da procura"
 
 #: src/editldap.c:599
 
 #: src/editldap.c:589
 msgid "Search Attributes"
 msgstr "Atributos da procura"
 
 #: src/editldap.c:599

-msgid ""
-"A list of LDAP attribute names that should be searched when attempting to "
-"find a name or address."
-msgstr ""
-"Uma lista dos nomes dos atributos LDAP que devem ser procurados ao se tentar "
-"encontrar um nome ou endereço."
+msgid "A list of LDAP attribute names that should be searched when attempting to find a name or address."
+msgstr "Uma lista dos nomes dos atributos LDAP que devem ser procurados ao se tentar encontrar um nome ou endereço."

 
 #: src/editldap.c:603
 msgid " Defaults "
 msgstr " Padrões"
 
 #: src/editldap.c:608
 
 #: src/editldap.c:603
 msgid " Defaults "
 msgstr " Padrões"
 
 #: src/editldap.c:608

-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 ""
-"Isso restaura os nomes dos atributos para um valor padrão que possibilita "
-"encontrar mais nomes e endereços durante o processo de procura do nome ou "
-"endereço."
+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 "Isso restaura os nomes dos atributos para um valor padrão que possibilita encontrar mais nomes e endereços durante o processo de procura do nome ou endereço."

 
 #: src/editldap.c:615
 msgid "Max Query Age (secs)"
 msgstr "Duração máxima da consulta (seg)"
 
 #: src/editldap.c:631
 
 #: src/editldap.c:615
 msgid "Max Query Age (secs)"
 msgstr "Duração máxima da consulta (seg)"
 
 #: src/editldap.c:631

-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 "
-"in a cache until this period of time has passed and then retired. This will "
-"improve the response time when attempting to search for the same name or "
-"address on subsequent address completion requests. The cache will be "
-"searched in preference to performing a new server search request. The "
-"default value of 600 seconds (10 minutes), should be sufficient for most "
-"servers. A larger value will reduce the search time for subsequent searches. "
-"This is useful for servers that have slow response times at the expense of "
-"more memory to cache results."
-msgstr ""
-"Isso define o período máximo de tempo (em segundos) que um resultado de "
-"procura de endereço tem validade para completar endereços. Resultados da "
-"procura são armazenadas em um cache até que esse período de tempo tenha "
-"passado quando, então são retirados. Isso melhora o tempo de resposta "
-"durante as tentativas de procurar pelo mesmo nome ou endereço em requisições "
-"de complemento de endereço subseqüentes. A procura ocorre preferencialmente "
-"no cache nas novas requisições de procura no servidor. O valor padrão de 600 "
-"segundos (10 minutos) normalmente é suficiente na maioria dos servidores. Um "
-"valor mais alto reduz o tempo gasto em procuras subseqüentes. Esse é um "
-"recurso útil em servidores que possuem tempo de resposta lentos, mas, em "
-"compensação, consome mais memória para armazenar os resultados."
+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 in a cache until this period of time has passed and then retired. This will improve the response time when attempting to search for the same name or address on subsequent address completion requests. The cache will be searched in preference to performing a new server search request. The default value of 600 seconds (10 minutes), should be sufficient for most servers. A larger value will reduce the search time for subsequent searches. This is useful for servers that have slow response times at the expense of more memory to cache results."
+msgstr "Isso define o período máximo de tempo (em segundos) que um resultado de procura de endereço tem validade para completar endereços. Resultados da procura são armazenadas em um cache até que esse período de tempo tenha passado quando, então são retirados. Isso melhora o tempo de resposta durante as tentativas de procurar pelo mesmo nome ou endereço em requisições de complemento de endereço subseqüentes. A procura ocorre preferencialmente no cache nas novas requisições de procura no servidor. O valor padrão de 600 segundos (10 minutos) normalmente é suficiente na maioria dos servidores. Um valor mais alto reduz o tempo gasto em procuras subseqüentes. Esse é um recurso útil em servidores que possuem tempo de resposta lentos, mas, em compensação, consome mais memória para armazenar os resultados."

 
 #: src/editldap.c:649
 msgid "Include server in dynamic search"
 msgstr "Incluir o servidor na procura dinâmica"
 
 #: src/editldap.c:655
 
 #: src/editldap.c:649
 msgid "Include server in dynamic search"
 msgstr "Incluir o servidor na procura dinâmica"
 
 #: src/editldap.c:655

-msgid ""
-"Check this option to include this server for dynamic searches when using "
-"address completion."
-msgstr ""
-"Selecione essa opção para incluir esse servidor nas procuras dinâmicas, "
-"quando estiver usando a complementação do endereço."
+msgid "Check this option to include this server for dynamic searches when using address completion."
+msgstr "Selecione essa opção para incluir esse servidor nas procuras dinâmicas, quando estiver usando a complementação do endereço."

 
 #: src/editldap.c:662
 msgid "Match names 'containing' search term"
 msgstr "Encontrar nomes que 'contenham' o termo da procura"
 
 #: src/editldap.c:668
 
 #: src/editldap.c:662
 msgid "Match names 'containing' search term"
 msgstr "Encontrar nomes que 'contenham' o termo da procura"
 
 #: src/editldap.c:668

-msgid ""
-"Searches for names and addresses can be performed either using \"begins-with"
-"\" or \"contains\" search term. Check this option to perform a \"contains\" "
-"search; this type of search usually takes longer to complete. Note that for "
-"performance reasons, address completion uses \"begins-with\" for all "
-"searches against other address interfaces."
-msgstr ""
-"As procuras por nomes e endereços podem ser realizadas com os critérios "
-"\"começar com \" ou \"contém\". Marque essa opção para efetuar uma procura "
-"do tipo \"contém\"; esse tipo de procura geralmente demora mais tempo. Note "
-"que, por motivos de performance, a complementação de endereço usa \"começar "
-"com\" para todas as procuras, ao contrário das outras interfaces de endereço."
+msgid "Searches for names and addresses can be performed either using \"begins-with\" or \"contains\" search term. Check this option to perform a \"contains\" search; this type of search usually takes longer to complete. Note that for performance reasons, address completion uses \"begins-with\" for all searches against other address interfaces."
+msgstr "As procuras por nomes e endereços podem ser realizadas com os critérios \"começar com \" ou \"contém\". Marque essa opção para efetuar uma procura do tipo \"contém\"; esse tipo de procura geralmente demora mais tempo. Note que, por motivos de performance, a complementação de endereço usa \"começar com\" para todas as procuras, ao contrário das outras interfaces de endereço."

 
 #: src/editldap.c:723
 msgid "Bind DN"
 msgstr "DN associado"
 
 #: src/editldap.c:733
 
 #: src/editldap.c:723
 msgid "Bind DN"
 msgstr "DN associado"
 
 #: src/editldap.c:733

-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 "
-"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
-"performing a search."
-msgstr ""
-"A conta do usuário LDAP a ser utilizado na conexão com o servidor. Isso "
-"normalmente só é utilizado em servidores protegidos. O formato típico desse "
-"nome é: \"cn=usuário,dc=sylpheed,dc=com\". Isso normalmente é deixado em "
-"branco durante as procuras."
+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 as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when performing a search."
+msgstr "A conta do usuário LDAP a ser utilizado na conexão com o servidor. Isso normalmente só é utilizado em servidores protegidos. O formato típico desse nome é: \"cn=usuário,dc=claws-mail,dc=com\". Isso normalmente é deixado em branco durante as procuras."

 
 #: src/editldap.c:741
 msgid "Bind Password"
 
 #: src/editldap.c:741
 msgid "Bind Password"


@@ -2289,9 +2655,7 @@ msgstr "Número máximo de entradas"
 
 #: src/editldap.c:792
 msgid "The maximum number of entries that should be returned in the search result."
 
 #: src/editldap.c:792
 msgid "The maximum number of entries that should be returned in the search result."

-msgstr ""
-"O número máximo de entradas que devem ser apresentadas como resultado da "
-"procura."
+msgstr "O número máximo de entradas que devem ser apresentadas como resultado da procura."

 
 #: src/editldap.c:808
 msgid "Basic"
 
 #: src/editldap.c:808
 msgid "Basic"


@@ -2301,7 +2665,8 @@ msgstr "Básico"
 msgid "Search"
 msgstr "Procurar"
 
 msgid "Search"
 msgstr "Procurar"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:488
+#: src/editldap.c:810
+#: src/gtk/quicksearch.c:490

 msgid "Extended"
 msgstr "Extendido"
 
 msgid "Extended"
 msgstr "Extendido"
 


@@ -2317,7 +2682,8 @@ msgstr "O arquivo não parece estar no formato vCard."
 msgid "Select vCard File"
 msgstr "Selecionar o arquivo vCard"
 
 msgid "Select vCard File"
 msgstr "Selecionar o arquivo vCard"
 

-#: src/editvcard.c:161 src/editvcard.c:266
+#: src/editvcard.c:161
+#: src/editvcard.c:266

 msgid "Edit vCard Entry"
 msgstr "Editar a entrada vCard"
 
 msgid "Edit vCard Entry"
 msgstr "Editar a entrada vCard"
 


@@ -2325,21 +2691,20 @@ msgstr "Editar a entrada vCard"
 msgid "Add New vCard Entry"
 msgstr "Adicionar uma nova entrada vCard"
 
 msgid "Add New vCard Entry"
 msgstr "Adicionar uma nova entrada vCard"
 

-#: src/exphtmldlg.c:113
+#: src/exphtmldlg.c:110

 msgid "Please specify output directory and file to create."
 msgid "Please specify output directory and file to create."

-msgstr ""
-"Por favor, especifique o nome do diretório de saída e do arquivo a ser "
-"criado."
+msgstr "Por favor, especifique o nome do diretório de saída e do arquivo a ser criado."

 
 

-#: src/exphtmldlg.c:116
+#: src/exphtmldlg.c:113

 msgid "Select stylesheet and formatting."
 msgstr "Selecione a folha de estilo e a formatação."
 
 msgid "Select stylesheet and formatting."
 msgstr "Selecione a folha de estilo e a formatação."
 

-#: src/exphtmldlg.c:119 src/expldifdlg.c:117
+#: src/exphtmldlg.c:116
+#: src/expldifdlg.c:117

 msgid "File exported successfully."
 msgstr "O arquivo foi exportado com sucesso."
 
 msgid "File exported successfully."
 msgstr "O arquivo foi exportado com sucesso."
 

-#: src/exphtmldlg.c:184
+#: src/exphtmldlg.c:181

 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"


@@ -2348,11 +2713,12 @@ msgstr ""
 "O diretório de saída HTML '%s'\n"
 "não existe. Deseja criá-lo?"
 
 "O diretório de saída HTML '%s'\n"
 "não existe. Deseja criá-lo?"
 

-#: src/exphtmldlg.c:187 src/expldifdlg.c:193
+#: src/exphtmldlg.c:184
+#: src/expldifdlg.c:193

 msgid "Create Directory"
 msgstr "Criar diretório"
 
 msgid "Create Directory"
 msgstr "Criar diretório"
 

-#: src/exphtmldlg.c:196
+#: src/exphtmldlg.c:193

 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"


@@ -2361,116 +2727,127 @@ msgstr ""
 "Não foi possível criar o diretório de saída para o arquivo HTML:\n"
 "%s"
 
 "Não foi possível criar o diretório de saída para o arquivo HTML:\n"
 "%s"
 

-#: src/exphtmldlg.c:198 src/expldifdlg.c:204
+#: src/exphtmldlg.c:195
+#: src/expldifdlg.c:204

 msgid "Failed to Create Directory"
 msgstr "Não foi possível criar o diretório"
 
 msgid "Failed to Create Directory"
 msgstr "Não foi possível criar o diretório"
 

-#: src/exphtmldlg.c:240
+#: src/exphtmldlg.c:237

 msgid "Error creating HTML file"
 msgstr "Não foi possível criar o arquivo HTML"
 
 msgid "Error creating HTML file"
 msgstr "Não foi possível criar o arquivo HTML"
 

-#: src/exphtmldlg.c:326
+#: src/exphtmldlg.c:323

 msgid "Select HTML output file"
 msgstr "Selecione o arquivo HTML de saída"
 
 msgid "Select HTML output file"
 msgstr "Selecione o arquivo HTML de saída"
 

-#: src/exphtmldlg.c:390
+#: src/exphtmldlg.c:387

 msgid "HTML Output File"
 msgstr "Arquivo HTML de saída"
 
 msgid "HTML Output File"
 msgstr "Arquivo HTML de saída"
 

-#: src/exphtmldlg.c:399 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/exphtmldlg.c:396
+#: src/expldifdlg.c:415
+#: src/export.c:179
+#: src/import.c:178

 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "Explo_rar"
 
 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "Explo_rar"
 

-#: src/exphtmldlg.c:452
+#: src/exphtmldlg.c:449

 msgid "Stylesheet"
 msgstr "Folha de Estilo"
 
 msgid "Stylesheet"
 msgstr "Folha de Estilo"
 

-#: src/exphtmldlg.c:460 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
-#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:1003 src/prefs_account.c:663
-#: src/summaryview.c:4983
+#: src/exphtmldlg.c:457
+#: src/gtk/colorlabel.c:367
+#: src/gtk/gtkaspell.c:1678
+#: src/gtk/gtkaspell.c:2411
+#: src/mainwindow.c:1003
+#: src/prefs_account.c:667
+#: src/summaryview.c:4991

 msgid "None"
 msgstr "Nenhum"
 
 msgid "None"
 msgstr "Nenhum"
 

-#: src/exphtmldlg.c:461 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:458
+#: src/prefs_summaries.c:350
+#: src/prefs_summaries.c:691

 msgid "Default"
 msgstr "Padrão"
 
 msgid "Default"
 msgstr "Padrão"
 

-#: src/exphtmldlg.c:462 src/plugins/pgpcore/sgpgme.c:140
+#: src/exphtmldlg.c:459
+#: src/plugins/pgpcore/sgpgme.c:144

 msgid "Full"
 msgstr "Completo"
 
 msgid "Full"
 msgstr "Completo"
 

-#: src/exphtmldlg.c:463
+#: src/exphtmldlg.c:460

 msgid "Custom"
 msgstr "Personalizado"
 
 msgid "Custom"
 msgstr "Personalizado"
 

-#: src/exphtmldlg.c:464
+#: src/exphtmldlg.c:461

 msgid "Custom-2"
 msgstr "Personalizado 2"
 
 msgid "Custom-2"
 msgstr "Personalizado 2"
 

-#: src/exphtmldlg.c:465
+#: src/exphtmldlg.c:462

 msgid "Custom-3"
 msgstr "Personalizado 3"
 
 msgid "Custom-3"
 msgstr "Personalizado 3"
 

-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:463

 msgid "Custom-4"
 msgstr "Personalizado 4"
 
 msgid "Custom-4"
 msgstr "Personalizado 4"
 

-#: src/exphtmldlg.c:473
+#: src/exphtmldlg.c:470

 msgid "Full Name Format"
 msgstr "Formato do nome completo"
 
 msgid "Full Name Format"
 msgstr "Formato do nome completo"
 

-#: src/exphtmldlg.c:481
+#: src/exphtmldlg.c:478

 msgid "First Name, Last Name"
 msgstr "Primeiro Nome, Sobrenome"
 
 msgid "First Name, Last Name"
 msgstr "Primeiro Nome, Sobrenome"
 

-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:479

 msgid "Last Name, First Name"
 msgstr "Sobrenome, Primeiro Nome"
 
 msgid "Last Name, First Name"
 msgstr "Sobrenome, Primeiro Nome"
 

-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:486

 msgid "Color Banding"
 msgstr "Faixa de cores"
 
 msgid "Color Banding"
 msgstr "Faixa de cores"
 

-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:492

 msgid "Format Email Links"
 msgstr "Formatar os links do e-mail"
 
 msgid "Format Email Links"
 msgstr "Formatar os links do e-mail"
 

-#: src/exphtmldlg.c:501
+#: src/exphtmldlg.c:498

 msgid "Format User Attributes"
 msgstr "Formatar os atributos do usuário"
 
 msgid "Format User Attributes"
 msgstr "Formatar os atributos do usuário"
 

-#: src/exphtmldlg.c:556 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553
+#: src/expldifdlg.c:636
+#: src/importldif.c:919

 msgid "File Name :"
 msgstr "Nome do arquivo:"
 
 msgid "File Name :"
 msgstr "Nome do arquivo:"
 

-#: src/exphtmldlg.c:566
+#: src/exphtmldlg.c:563

 msgid "Open with Web Browser"
 msgstr "Abrir com o navegador Web"
 
 msgid "Open with Web Browser"
 msgstr "Abrir com o navegador Web"
 

-#: src/exphtmldlg.c:598
+#: src/exphtmldlg.c:595

 msgid "Export Address Book to HTML File"
 msgstr "Exportar o Livro de Endereços para um arquivo HTML"
 
 msgid "Export Address Book to HTML File"
 msgstr "Exportar o Livro de Endereços para um arquivo HTML"
 

-#: src/exphtmldlg.c:664 src/expldifdlg.c:736 src/importldif.c:1027
+#: src/exphtmldlg.c:661
+#: src/expldifdlg.c:735
+#: src/importldif.c:1027

 msgid "File Info"
 msgstr "Informações do arquivo"
 
 msgid "File Info"
 msgstr "Informações do arquivo"
 

-#: src/exphtmldlg.c:665
+#: src/exphtmldlg.c:662

 msgid "Format"
 msgstr "Formato"
 
 #: src/expldifdlg.c:111
 msgid "Please specify output directory and LDIF filename to create."
 msgid "Format"
 msgstr "Formato"
 
 #: src/expldifdlg.c:111
 msgid "Please specify output directory and LDIF filename to create."

-msgstr ""
-"Por favor, especifique o diretório de destino e o nome do arquivo LDIF a ser "
-"criado."
+msgstr "Por favor, especifique o diretório de destino e o nome do arquivo LDIF a ser criado."

 
 #: src/expldifdlg.c:114
 msgid "Specify parameters to format distinguished name."
 
 #: src/expldifdlg.c:114
 msgid "Specify parameters to format distinguished name."

-msgstr ""
-"Especifique os parâmetros para formatar o nome distinto ('distinguished "
-"name')."
+msgstr "Especifique os parâmetros para formatar o nome distinto ('distinguished name')."

 
 #: src/expldifdlg.c:190
 #, c-format
 
 #: src/expldifdlg.c:190
 #, c-format


@@ -2495,12 +2872,8 @@ msgid "Suffix was not supplied"
 msgstr "Não foi fornecido o sufixo"
 
 #: src/expldifdlg.c:249
 msgstr "Não foi fornecido o sufixo"
 
 #: src/expldifdlg.c:249

-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 ""
-"É  necessário um sufixo caso os dados sejam usados para um servidor LDAP. "
-"Você tem certeza que deseja prosseguir sem um sufixo?"
+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 "É  necessário um sufixo caso os dados sejam usados para um servidor LDAP. Você tem certeza que deseja prosseguir sem um sufixo?"

 
 #: src/expldifdlg.c:267
 msgid "Error creating LDIF file"
 
 #: src/expldifdlg.c:267
 msgid "Error creating LDIF file"


@@ -2520,15 +2893,13 @@ msgstr "Sufixo"
 
 #: src/expldifdlg.c:479
 msgid ""
 
 #: src/expldifdlg.c:479
 msgid ""

-"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
-"entry. Examples include:\n"
-"  dc=sylpheed,dc=org\n"
+"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP entry. Examples include:\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""

-"O sufixo é usado para criar um \"Nome Distinto\" (\"Distinguished Name\" ou, "
-"simplesmente, DN) para uma entrada LDAP. Como exemplos, temos:\n"
-"  dc=sylpheed,dc=org\n"
+"O sufixo é usado para criar um \"Nome Distinto\" (\"Distinguished Name\" ou, simplesmente, DN) para uma entrada LDAP. Como exemplos, temos:\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=pessoas,dc=nome do domínio,dc=com\n"
 "  o=nome da organização,c=país\n"
 
 "  ou=pessoas,dc=nome do domínio,dc=com\n"
 "  o=nome da organização,c=país\n"
 


@@ -2542,87 +2913,58 @@ msgstr "ID única"
 
 #: src/expldifdlg.c:503
 msgid ""
 
 #: src/expldifdlg.c:503
 msgid ""

-"The address book Unique ID is used to create a DN that is formatted similar "
-"to:\n"
-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"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 ""
 msgstr ""

-"O campo \"ID única\" do Livro de Endereços é usado para criar um DN que tem "
-"um formato similar a:\n"
-"  uid=102376,ou=pessoas,dc=sylpheed,dc=org"
+"O campo ID Única do Livro de Endereços é usado para criar um DN que tem um formato similar a:\n"
+"  uid=102376,ou=pessoas,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:516
 msgid ""
 
 #: src/expldifdlg.c:516
 msgid ""

-"The address book Display Name is used to create a DN that is formatted "
-"similar to:\n"
-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"The address book Display Name is used to create a DN that is formatted similar to:\n"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 msgstr ""

-"O campo \"Nome exibido\" do Livro de Endereços é usado para criar um DN que "
-"tem um formato similar a:\n"
-"  cn=Fulano de Tal,ou=pessoas,dc=sylpheed,dc=org"
+"O campo Nome Exibido do Livro de Endereços é usado para criar um DN que tem um formato similar a:\n"
+"  cn=Fulano de Tal,ou=pessoas,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:529
 msgid ""
 
 #: src/expldifdlg.c:529
 msgid ""

-"The first Email Address belonging to a person is used to create a DN that is "
-"formatted similar to:\n"
-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"The first Email Address belonging to a person is used to create a DN that is formatted similar to:\n"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 msgstr ""

-"O primeiro endereço de e-mail pertencente a uma pessoa  é usado para criar "
-"um DN que tem um formato similar a:\n"
-"  mail=fulano.tal@dominio.com,ou=pessoas,dc=sylpheed,dc=org"
+"O primeiro endereço de e-mail pertencente a uma pessoa  é usado para criar um DN que tem um formato similar a:\n"
+"  mail=fulano.tal@dominio.com,ou=pessoas,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:543
 
 #: src/expldifdlg.c:543

-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 "
-"\"Distinguished Name\" (or DN). The suffix is appended to the \"Relative "
-"Distinguished Name\" (or RDN) to create the DN. Please select one of the "
-"available RDN options that will be used to create the DN."
-msgstr ""
-"O arquivo LDIF contém vários registros que são geralmente carregados em um "
-"servidor LDAP. Cada registro no arquivo LDIF é identificado com "
-"exclusividade por um \"Nome DIstinto\" (Distinguished Name ou DN). O sufixo "
-"é adicionado ao \"Nome Distinto Relativo\" (Relative Distinguished Name ou "
-"RDN) para criar o DN. Por favor, selecione uma das opções de RDN disponíveis "
-"que serão utilizadas para criar o DN."
+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 \"Distinguished Name\" (or DN). The suffix is appended to the \"Relative Distinguished Name\" (or RDN) to create the DN. Please select one of the available RDN options that will be used to create the DN."
+msgstr "O arquivo LDIF contém vários registros que são geralmente carregados em um servidor LDAP. Cada registro no arquivo LDIF é identificado com exclusividade por um \"Nome DIstinto\" (Distinguished Name ou DN). O sufixo é adicionado ao \"Nome Distinto Relativo\" (Relative Distinguished Name ou RDN) para criar o DN. Por favor, selecione uma das opções de RDN disponíveis que serão utilizadas para criar o DN."

 
 #: src/expldifdlg.c:556
 msgid "Use DN attribute if present in data"
 msgstr "Utilize o atributo do DN caso ele esteja presente nos dados"
 
 #: src/expldifdlg.c:563
 
 #: src/expldifdlg.c:556
 msgid "Use DN attribute if present in data"
 msgstr "Utilize o atributo do DN caso ele esteja presente nos dados"
 
 #: src/expldifdlg.c:563

-msgid ""
-"The addressbook may contain entries that were previously imported from an "
-"LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
-"address book data, may be used in the exported LDIF file. The RDN selected "
-"above will be used if the DN user attribute is not found."
-msgstr ""
-"O Livro de Endereços pode conter entradas importadas previamente de um "
-"arquivo LDIF. Caso o atributo de usuário \"Nome Distinto\" (DN) esteja "
-"presente nos dados do Livro de Endereços, ele pode ser usado no arquivo LDIF "
-"exportado. O RDN selecionado acima será usado se o atributo de usuário DN "
-"não for encontrado."
+msgid "The addressbook may contain entries that were previously imported from an LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the address book data, may be used in the exported LDIF file. The RDN selected above will be used if the DN user attribute is not found."
+msgstr "O Livro de Endereços pode conter entradas importadas previamente de um arquivo LDIF. Caso o atributo de usuário \"Nome Distinto\" (DN) esteja presente nos dados do Livro de Endereços, ele pode ser usado no arquivo LDIF exportado. O RDN selecionado acima será usado se o atributo de usuário DN não for encontrado."

 
 #: src/expldifdlg.c:574
 msgid "Exclude record if no Email Address"
 msgstr "Excluir os registros que não possuam endereço de e-mail"
 
 #: src/expldifdlg.c:581
 
 #: src/expldifdlg.c:574
 msgid "Exclude record if no Email Address"
 msgstr "Excluir os registros que não possuam endereço de e-mail"
 
 #: src/expldifdlg.c:581

-msgid ""
-"An addressbook may contain entries without Email Addresses. Check this "
-"option to ignore these records."
-msgstr ""
-"Um Livro de Endereços pode conter entradas sem um endereço de e-mail. Marque "
-"essa opção para ignorar esses registros."
+msgid "An addressbook may contain entries without Email Addresses. Check this option to ignore these records."
+msgstr "Um Livro de Endereços pode conter entradas sem um endereço de e-mail. Marque essa opção para ignorar esses registros."

 
 #: src/expldifdlg.c:669
 msgid "Export Address Book to LDIF File"
 msgstr "Exportar o Livro de Endereços para um arquivo LDIF"
 
 
 #: src/expldifdlg.c:669
 msgid "Export Address Book to LDIF File"
 msgstr "Exportar o Livro de Endereços para um arquivo LDIF"
 

-#: src/expldifdlg.c:737
+#: src/expldifdlg.c:736

 msgid "Distguished Name"
 msgstr "Nome Distinto"
 
 msgid "Distguished Name"
 msgstr "Nome Distinto"
 

-#: src/export.c:120 src/summaryview.c:6355
+#: src/export.c:120
+#: src/summaryview.c:6368

 msgid "Export to mbox file"
 msgstr "Exporta para arquivo mbox"
 
 msgid "Export to mbox file"
 msgstr "Exporta para arquivo mbox"
 


@@ -2634,7 +2976,8 @@ msgstr "Localize a pasta a ser exportada e especifique o arquivo mbox."
 msgid "Source folder:"
 msgstr "Pasta de origem:"
 
 msgid "Source folder:"
 msgstr "Pasta de origem:"
 

-#: src/export.c:156 src/import.c:150
+#: src/export.c:156
+#: src/import.c:150

 msgid "Mbox file:"
 msgstr "Arquivo mbox:"
 
 msgid "Mbox file:"
 msgstr "Arquivo mbox:"
 


@@ -2658,72 +3001,93 @@ msgstr "Selecione arquivo de exportação"
 msgid "Full Name"
 msgstr "Nome completo"
 
 msgid "Full Name"
 msgstr "Nome completo"
 

-#: src/exporthtml.c:809 src/importldif.c:1028
+#: src/exporthtml.c:809
+#: src/importldif.c:1028

 msgid "Attributes"
 msgstr "Atributos"
 
 #: src/exporthtml.c:1010
 msgid "Attributes"
 msgstr "Atributos"
 
 #: src/exporthtml.c:1010

-msgid "Sylpheed-Claws Address Book"
-msgstr "Livro de Endereços do Sylpheed-Claws"
+msgid "Claws Mail Address Book"
+msgstr "Livro de Endereços do Claws Mail"

 
 

-#: src/exporthtml.c:1124 src/exportldif.c:601
+#: src/exporthtml.c:1124
+#: src/exportldif.c:601

 msgid "Name already exists but is not a directory."
 msgstr "O nome já existe, mas não é um diretório."
 
 msgid "Name already exists but is not a directory."
 msgstr "O nome já existe, mas não é um diretório."
 

-#: src/exporthtml.c:1127 src/exportldif.c:604
+#: src/exporthtml.c:1127
+#: src/exportldif.c:604

 msgid "No permissions to create directory."
 msgstr "Sem permissão para criar diretório."
 
 msgid "No permissions to create directory."
 msgstr "Sem permissão para criar diretório."
 

-#: src/exporthtml.c:1130 src/exportldif.c:607
+#: src/exporthtml.c:1130
+#: src/exportldif.c:607

 msgid "Name is too long."
 msgstr "O nome é muito longo."
 
 msgid "Name is too long."
 msgstr "O nome é muito longo."
 

-#: src/exporthtml.c:1133 src/exportldif.c:610
+#: src/exporthtml.c:1133
+#: src/exportldif.c:610

 msgid "Not specified."
 msgstr "Não especificado."
 
 msgid "Not specified."
 msgstr "Não especificado."
 

-#: src/folder.c:1277 src/foldersel.c:371 src/prefs_folder_item.c:236
+#: src/folder.c:1283
+#: src/foldersel.c:371
+#: src/prefs_folder_item.c:239

 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 

-#: src/folder.c:1281 src/foldersel.c:375
+#: src/folder.c:1287
+#: src/foldersel.c:375

 msgid "Sent"
 msgstr "Enviadas"
 
 msgid "Sent"
 msgstr "Enviadas"
 

-#: src/folder.c:1285 src/foldersel.c:379 src/prefs_folder_item.c:239
+#: src/folder.c:1291
+#: src/foldersel.c:379
+#: src/prefs_folder_item.c:242

 msgid "Queue"
 msgstr "Fila de Saída"
 
 msgid "Queue"
 msgstr "Fila de Saída"
 

-#: src/folder.c:1289 src/foldersel.c:383 src/prefs_folder_item.c:240
-#: src/toolbar.c:366 src/toolbar.c:400 src/toolbar.c:491
+#: src/folder.c:1295
+#: src/foldersel.c:383
+#: src/prefs_folder_item.c:243
+#: src/toolbar.c:376
+#: src/toolbar.c:410
+#: src/toolbar.c:501

 msgid "Trash"
 msgstr "Lixeira"
 
 msgid "Trash"
 msgstr "Lixeira"
 

-#: src/folder.c:1293 src/foldersel.c:387 src/prefs_folder_item.c:238
+#: src/folder.c:1299
+#: src/foldersel.c:387
+#: src/prefs_folder_item.c:241

 msgid "Drafts"
 msgstr "Rascunhos"
 
 msgid "Drafts"
 msgstr "Rascunhos"
 

-#: src/folder.c:1572
+#: src/folder.c:1578

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processando (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Processando (%s)...\n"
 

-#: src/folder.c:2508
+#: src/folder.c:2514

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Buscando todas as mensagens de %s ...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Buscando todas as mensagens de %s ...\n"
 

-#: src/folder.c:2797
+#: src/folder.c:2803
+#, c-format
+msgid "Copying %s to %s...\n"
+msgstr "Copiando %s para %s...\n"
+
+#: src/folder.c:2803

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movendo %s para %s...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Movendo %s para %s...\n"
 

-#: src/folder.c:3079
+#: src/folder.c:3090

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Atualizando o cache para %s ..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Atualizando o cache para %s ..."
 

-#: src/folder.c:3790
+#: src/folder.c:3801

 msgid "Processing messages..."
 msgstr "Processando as mensagens..."
 
 msgid "Processing messages..."
 msgstr "Processando as mensagens..."
 


@@ -2731,160 +3095,200 @@ msgstr "Processando as mensagens..."
 msgid "Select folder"
 msgstr "Selecione a pasta"
 
 msgid "Select folder"
 msgstr "Selecione a pasta"
 

-#: src/foldersel.c:558 src/imap_gtk.c:138 src/mh_gtk.c:129
+#: src/foldersel.c:558
+#: src/imap_gtk.c:141
+#: src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr "NovaPasta"
 
 msgid "NewFolder"
 msgstr "NovaPasta"
 

-#: src/foldersel.c:566 src/imap_gtk.c:146 src/imap_gtk.c:152 src/mh_gtk.c:135
-#: src/mh_gtk.c:238
+#: src/foldersel.c:566
+#: src/imap_gtk.c:149
+#: src/imap_gtk.c:155
+#: src/mh_gtk.c:138
+#: src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' não pode ser incluído no nome da pasta."
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' não pode ser incluído no nome da pasta."
 

-#: src/foldersel.c:576 src/imap_gtk.c:162 src/imap_gtk.c:216 src/mh_gtk.c:145
-#: src/mh_gtk.c:245
+#: src/foldersel.c:576
+#: src/imap_gtk.c:165
+#: src/imap_gtk.c:219
+#: src/mh_gtk.c:148
+#: src/mh_gtk.c:248

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "A pasta '%s' já existe."
 

-#: src/foldersel.c:583 src/imap_gtk.c:168 src/mh_gtk.c:151
+#: src/foldersel.c:583
+#: src/imap_gtk.c:171
+#: src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Não foi possível criar a pasta '%s'."
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Não foi possível criar a pasta '%s'."
 

-#: src/folderview.c:290
+#: src/folderview.c:291

 msgid "/Mark all re_ad"
 msgstr "/Marcar _todas como lidas"
 
 msgid "/Mark all re_ad"
 msgstr "/Marcar _todas como lidas"
 

-#: src/folderview.c:291
+#: src/folderview.c:293

 msgid "/_Search folder..."
 msgstr "/P_rocurar na pasta..."
 
 msgid "/_Search folder..."
 msgstr "/P_rocurar na pasta..."
 

-#: src/folderview.c:293
+#: src/folderview.c:295

 msgid "/Process_ing..."
 msgstr "/Proce_ssamento..."
 
 msgid "/Process_ing..."
 msgstr "/Proce_ssamento..."
 

-#: src/folderview.c:298
+#: src/folderview.c:300

 msgid "/Empty _trash..."
 msgstr "/Esvaziar _Lixeira..."
 
 msgid "/Empty _trash..."
 msgstr "/Esvaziar _Lixeira..."
 

-#: src/folderview.c:303
+#: src/folderview.c:305

 msgid "/Send _queue..."
 msgstr "/Enviar mensagens da _fila..."
 
 msgid "/Send _queue..."
 msgstr "/Enviar mensagens da _fila..."
 

-#: src/folderview.c:422 src/folderview.c:469 src/prefs_folder_column.c:80
+#: src/folderview.c:424
+#: src/folderview.c:471
+#: src/prefs_folder_column.c:80

 msgid "New"
 msgstr "Nova"
 
 msgid "New"
 msgstr "Nova"
 

-#: src/folderview.c:423 src/folderview.c:470 src/prefs_folder_column.c:81
+#: src/folderview.c:425
+#: src/folderview.c:472
+#: src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr "Não lida"
 
 msgid "Unread"
 msgstr "Não lida"
 

-#: src/folderview.c:424 src/prefs_folder_column.c:82
+#: src/folderview.c:426
+#: src/prefs_folder_column.c:82

 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style
 msgid "Total"
 msgstr "Total"
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:472 src/summaryview.c:491
+#: src/folderview.c:474
+#: src/summaryview.c:491

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 

-#: src/folderview.c:717
+#: src/folderview.c:719

 msgid "Setting folder info..."
 msgstr "Configurando as informações da pasta..."
 
 msgid "Setting folder info..."
 msgstr "Configurando as informações da pasta..."
 

-#: src/folderview.c:771 src/summaryview.c:3455
+#: src/folderview.c:773
+#: src/summaryview.c:3453

 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 
 msgid "Mark all as read"
 msgstr "Marcar todas como lidas"
 

-#: src/folderview.c:772 src/summaryview.c:3456
+#: src/folderview.c:774
+#: src/summaryview.c:3454

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Deseja realmente marcar todas as mensagens dessa pasta como lidas?"
 

-#: src/folderview.c:1058 src/imap.c:3199 src/mainwindow.c:3918 src/setup.c:90
+#: src/folderview.c:1060
+#: src/imap.c:3190
+#: src/mainwindow.c:3923
+#: src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Vasculhando a pasta %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Vasculhando a pasta %s%c%s ..."
 

-#: src/folderview.c:1062 src/imap.c:3204 src/mainwindow.c:3923 src/setup.c:95
+#: src/folderview.c:1064
+#: src/imap.c:3195
+#: src/mainwindow.c:3928
+#: src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Vasculhando a pasta %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Vasculhando a pasta %s ..."
 

-#: src/folderview.c:1089
+#: src/folderview.c:1091

 msgid "Rebuild folder tree"
 msgstr "Reconstruir a árvore de pastas"
 
 msgid "Rebuild folder tree"
 msgstr "Reconstruir a árvore de pastas"
 

-#: src/folderview.c:1090
+#: src/folderview.c:1092

 msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"

-msgstr ""
-"A reconstrução da árvore de pastas irá remover os caches locais. Deseja "
-"continuar?"
+msgstr "A reconstrução da árvore de pastas irá remover os caches locais. Deseja continuar?"

 
 

-#: src/folderview.c:1100
+#: src/folderview.c:1102

 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a árvore de pastas..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a árvore de pastas..."
 

-#: src/folderview.c:1102
+#: src/folderview.c:1104

 msgid "Scanning folder tree..."
 msgstr "Vasculhando a árvore de pastas..."
 
 msgid "Scanning folder tree..."
 msgstr "Vasculhando a árvore de pastas..."
 

-#: src/folderview.c:1220
+#: src/folderview.c:1175
+#, c-format
+msgid "Couldn't scan folder %s\n"
+msgstr "Não foi possível vasculhar a pasta %s\n"
+
+#: src/folderview.c:1228

 msgid "Checking for new messages in all folders..."
 msgstr "Verificando se há novas mensagens em todas as pastas..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Verificando se há novas mensagens em todas as pastas..."
 

-#: src/folderview.c:2081
+#: src/folderview.c:2090

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Fechando a pasta %s..."
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Fechando a pasta %s..."
 

-#: src/folderview.c:2120
+#: src/folderview.c:2129

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Abrindo a pasta %s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Abrindo a pasta %s..."
 

-#: src/folderview.c:2133
+#: src/folderview.c:2142

 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 
 msgid "Folder could not be opened."
 msgstr "Não foi possível abrir a pasta."
 

-#: src/folderview.c:2294 src/mainwindow.c:2078
+#: src/folderview.c:2303
+#: src/mainwindow.c:2079

 msgid "Empty trash"
 msgstr "Esvaziar Lixeira"
 
 msgid "Empty trash"
 msgstr "Esvaziar Lixeira"
 

-#: src/folderview.c:2295
+#: src/folderview.c:2304

 msgid "Delete all messages in trash?"
 msgstr "Apagar todas as mensagens da Lixeira?"
 
 msgid "Delete all messages in trash?"
 msgstr "Apagar todas as mensagens da Lixeira?"
 

-#: src/folderview.c:2296 src/mainwindow.c:2080
+#: src/folderview.c:2305
+#: src/mainwindow.c:2081

 msgid "+_Empty trash"
 msgstr "+_Esvaziar Lixeira"
 
 msgid "+_Empty trash"
 msgstr "+_Esvaziar Lixeira"
 

-#: src/folderview.c:2340 src/inc.c:1465 src/toolbar.c:2122
+#: src/folderview.c:2349
+#: src/inc.c:1465
+#: src/toolbar.c:2196

 msgid "Offline warning"
 msgstr "Aviso de modo desconectado"
 
 msgid "Offline warning"
 msgstr "Aviso de modo desconectado"
 

-#: src/folderview.c:2341 src/toolbar.c:2123
+#: src/folderview.c:2350
+#: src/toolbar.c:2197

 msgid "You're working offline. Override?"
 msgstr "Você está trabalhando em modo desconectado. Redefinir?"
 
 msgid "You're working offline. Override?"
 msgstr "Você está trabalhando em modo desconectado. Redefinir?"
 

-#: src/folderview.c:2352 src/toolbar.c:2142
+#: src/folderview.c:2361
+#: src/toolbar.c:2216

 msgid "Send queued messages"
 msgstr "Enviar mensagens da Fila de Saída"
 
 msgid "Send queued messages"
 msgstr "Enviar mensagens da Fila de Saída"
 

-#: src/folderview.c:2353 src/toolbar.c:2143
+#: src/folderview.c:2362
+#: src/toolbar.c:2217

 msgid "Send all queued messages?"
 msgstr "Enviar todas as mensagens da Fila de Saída?"
 
 msgid "Send all queued messages?"
 msgstr "Enviar todas as mensagens da Fila de Saída?"
 

-#: src/folderview.c:2354 src/messageview.c:579 src/messageview.c:596
-#: src/prefs_account.c:1032 src/toolbar.c:2144
+#: src/folderview.c:2363
+#: src/messageview.c:579
+#: src/messageview.c:596
+#: src/prefs_account.c:1039
+#: src/toolbar.c:2218

 msgid "_Send"
 msgstr "_Enviar"
 
 msgid "_Send"
 msgstr "_Enviar"
 

-#: src/folderview.c:2362 src/toolbar.c:2162
+#: src/folderview.c:2371
+#: src/toolbar.c:2236

 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocorreram erros durante o envio das mensagens da Fila de Saída."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocorreram erros durante o envio das mensagens da Fila de Saída."
 

-#: src/folderview.c:2365 src/main.c:1478 src/toolbar.c:2165
+#: src/folderview.c:2374
+#: src/main.c:1549
+#: src/toolbar.c:2239

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -2893,43 +3297,67 @@ msgstr ""
 "Ocorreram erros durante o envio de mensagens da Fila de Saída:\n"
 "%s"
 
 "Ocorreram erros durante o envio de mensagens da Fila de Saída:\n"
 "%s"
 

-#: src/folderview.c:2432
+#: src/folderview.c:2441
+#, c-format
+msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgstr "Deseja realmente copiar a pasta '%s' para '%s'?"
+
+#: src/folderview.c:2442

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Deseja realmente tornar a pasta '%s' uma sub-pasta de '%s'?"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Deseja realmente tornar a pasta '%s' uma sub-pasta de '%s'?"
 

-#: src/folderview.c:2435
+#: src/folderview.c:2444
+msgid "Copy folder"
+msgstr "Copiar a pasta"
+
+#: src/folderview.c:2444

 msgid "Move folder"
 msgstr "Mover a pasta"
 
 msgid "Move folder"
 msgstr "Mover a pasta"
 

-#: src/folderview.c:2446
+#: src/folderview.c:2455
+#, c-format
+msgid "Copying %s to %s..."
+msgstr "Copiando %s para %s..."
+
+#: src/folderview.c:2455

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movendo %s para %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Movendo %s para %s..."
 

-#: src/folderview.c:2475
+#: src/folderview.c:2486

 msgid "Source and destination are the same."
 msgstr "A pasta de origem e a de destino são a mesma."
 
 msgid "Source and destination are the same."
 msgstr "A pasta de origem e a de destino são a mesma."
 

-#: src/folderview.c:2478
+#: src/folderview.c:2489
+msgid "Can't copy a folder to one of its children."
+msgstr "Não é possível copiar a pasta para dentro dela mesma."
+
+#: src/folderview.c:2490

 msgid "Can't move a folder to one of its children."
 msgstr "Não é possível mover a pasta para dentro dela mesma."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Não é possível mover a pasta para dentro dela mesma."
 

-#: src/folderview.c:2481
+#: src/folderview.c:2493

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Não é possivel mover pastas entre caixas postais diferentes."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Não é possivel mover pastas entre caixas postais diferentes."
 

-#: src/folderview.c:2484
+#: src/folderview.c:2496
+msgid "Copy failed!"
+msgstr "Não foi possível copiar!"
+
+#: src/folderview.c:2496

 msgid "Move failed!"
 msgstr "Não foi possível mover!"
 
 msgid "Move failed!"
 msgstr "Não foi possível mover!"
 

-#: src/folderview.c:2520
+#: src/folderview.c:2532

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuração de processamento da pasta %s"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Configuração de processamento da pasta %s"
 

-#: src/gedit-print.c:147 src/messageview.c:1502 src/summaryview.c:4124
-#: src/toolbar.c:178
+#: src/gedit-print.c:147
+#: src/messageview.c:1519
+#: src/summaryview.c:4124
+#: src/toolbar.c:182

 msgid "Print"
 msgstr "Imprimir"
 
 msgid "Print"
 msgstr "Imprimir"
 


@@ -2999,7 +3427,8 @@ msgstr "desconhecido"
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista do newsgroup."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista do newsgroup."
 

-#: src/grouplistdialog.c:447 src/summaryview.c:1265
+#: src/grouplistdialog.c:447
+#: src/summaryview.c:1265

 msgid "Done."
 msgstr "Pronto."
 
 msgid "Done."
 msgstr "Pronto."
 


@@ -3008,19 +3437,47 @@ msgstr "Pronto."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroups recebidos (%s lidos)"
 
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroups recebidos (%s lidos)"
 

-#: src/gtk/about.c:78 src/textview.c:216
+#: src/gtk/about.c:79
+#: src/textview.c:216

 msgid "/_Open with Web browser"
 msgstr "/Abrir com o navegador _Web"
 
 msgid "/_Open with Web browser"
 msgstr "/Abrir com o navegador _Web"
 

-#: src/gtk/about.c:79 src/textview.c:217
+#: src/gtk/about.c:80
+#: src/textview.c:217

 msgid "/Copy this _link"
 msgstr "/Copiar esse _link"
 
 msgid "/Copy this _link"
 msgstr "/Copiar esse _link"
 

-#: src/gtk/about.c:119
-msgid "About Sylpheed-Claws"
-msgstr "Sobre o Sylpheed-Claws"
+#: src/gtk/about.c:138
+msgid ""
+"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
+"\n"
+"For further information visit the Claws Mail website:\n"
+msgstr ""
+"O Claws Mail é um cliente de e-mail leve, rápido e altamente configurável.\n"
+"\n"
+"Para maiores informações, visite o site do Claws Mail:\n"

 
 

-#: src/gtk/about.c:161
+#: src/gtk/about.c:144
+msgid ""
+"\n"
+"\n"
+"Claws Mail is free software released under the GPL license. If you wish to donate to the Claws Mail project you can do so at:\n"
+msgstr ""
+"\n"
+"\n"
+"O Claws Mail é um software livre liberado sob a licença GPL. Se você deseja fazer doações para o projeto do Claws Mail, você pode fazê-lo em:\n"
+
+#: src/gtk/about.c:159
+msgid ""
+"\n"
+"\n"
+"System Information\n"
+msgstr ""
+"\n"
+"\n"
+"Informação do sistema\n"
+
+#: src/gtk/about.c:165

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3031,7 +3488,7 @@ msgstr ""
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema operacional: %s %s (%s)"
 
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema operacional: %s %s (%s)"
 

-#: src/gtk/about.c:170
+#: src/gtk/about.c:174

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3042,7 +3499,7 @@ msgstr ""
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema operacional: %s"
 
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema operacional: %s"
 

-#: src/gtk/about.c:179
+#: src/gtk/about.c:183

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3053,192 +3510,178 @@ msgstr ""
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema operacional: desconhecido"
 
 "Locale: %s (conjunto de caracteres: %s)\n"
 "Sistema operacional: desconhecido"
 

-#: src/gtk/about.c:194
-#, c-format
-msgid ""
-"Compiled-in features:\n"
-"%s"
-msgstr ""
-"Características compiladas:\n"
-"%s"
-

 #: src/gtk/about.c:240
 #: src/gtk/about.c:240

-msgid ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Sylpheed-Claws team"
-msgstr ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"e a equipe do Sylpheed-Claws"
+#: src/prefs_themes.c:706
+#: src/wizard.c:467
+msgid "The Claws Mail Team"
+msgstr "A equipe do Claws Mail"

 
 

-#: src/gtk/about.c:283
-msgid ""
-"Sylpheed-Claws is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Sylpheed-Claws website:\n"
-msgstr ""
-"O Sylpheed-Claws é um cliente de e-mail leve, rápido e altamente "
-"configurável.\n"
-"\n"
-"Para maiores informações, visite o site do Sylpheed-Claws:\n"
+#: src/gtk/about.c:259
+msgid "Previous team members"
+msgstr "Membros anteriores da equipe"

 
 

-#: src/gtk/about.c:289
-msgid ""
-"\n"
-"\n"
-"Sylpheed-Claws is free software released under the GPL license. If you wish "
-"to donate to the Sylpheed-Claws project you can do so at:\n"
-msgstr ""
-"\n"
-"\n"
-"O Sylpheed-Claws é um software livre liberado sob a licença GPL. Se você "
-"deseja fazer doações para o projeto do Sylpheed-Claws, você pode fazê-lo "
-"em:\n"
+#: src/gtk/about.c:278
+msgid "The translation team"
+msgstr "A equipe de tradução"

 
 

-#: src/gtk/about.c:296
-msgid "\n"
-msgstr "\n"
+#: src/gtk/about.c:297
+msgid "Documentation team"
+msgstr "A equipe de documentação"

 
 

-#: src/gtk/about.c:307
-msgid "_Info"
-msgstr "_Informação"
+#: src/gtk/about.c:316
+msgid "Logo"
+msgstr "Logo"

 
 #: src/gtk/about.c:335
 
 #: src/gtk/about.c:335

-msgid "The Sylpheed-Claws Team\n"
-msgstr "A equipe do Sylpheed Claws\n"
+msgid "Icons"
+msgstr "Ícones"

 
 

-#: src/gtk/about.c:352
-msgid ""
-"\n"
-"Previous team members\n"
-msgstr ""
-"\n"
-"Membros anteriores da equipe\n"
+#: src/gtk/about.c:354
+msgid "Contributors"
+msgstr "Colaboradores"

 
 

-#: src/gtk/about.c:369
-msgid ""
-"\n"
-"The translation team\n"
-msgstr ""
-"\n"
-"A equipe de tradução\n"
+#: src/gtk/about.c:402
+msgid "Compiled-in Features\n"
+msgstr "Características compiladas\n"
+
+#: src/gtk/about.c:418
+msgid "IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
+msgstr "IPv6|adiciona suporte a endereços IPv6, o novo protocolo de endereçamento da Internet\n"
+
+#: src/gtk/about.c:429
+msgid "iconv|allows converting to and from different character sets\n"
+msgstr "iconv|permite a conversão de e para diferentes conjuntos de caracteres\n"
+
+#: src/gtk/about.c:439
+msgid "compface|adds support for the X-Face header\n"
+msgstr "compface|adiciona suporte ao cabeçalho X-Face\n"
+
+#: src/gtk/about.c:449
+msgid "OpenSSL|adds support for encrypted connections to servers\n"
+msgstr "OpenSSL|adiciona suporte a conexões criptografadas a servidores\n"
+
+#: src/gtk/about.c:459
+msgid "LDAP|adds support for LDAP shared addressbooks\n"
+msgstr "LDAP|adiciona suporte a livros de endereços compartilhados via LDAP\n"
+
+#: src/gtk/about.c:469
+msgid "JPilot|adds support for PalmOS addressbooks\n"
+msgstr "JPilot|adiciona suporte a livros de endereços do PalmOS\n"
+
+#: src/gtk/about.c:479
+msgid "GNU/aspell|adds support for spell checking\n"
+msgstr "GNU/aspell|adiciona suporte à verificação ortográfica\n"
+
+#: src/gtk/about.c:489
+msgid "libetpan|adds support for IMAP servers\n"
+msgstr "libetpan|adiciona suporte a servidores IMAP\n"
+
+#: src/gtk/about.c:499
+msgid "libgnomeprint|adds support for a complete print dialog\n"
+msgstr "libgnomeprint|adiciona suporte a uma janela de configuração da impressão\n"
+
+#: src/gtk/about.c:509
+msgid "libSM|adds support for session handling\n"
+msgstr "libSM|adiciona suporte a gerenciamento de seção\n"

 
 

-#: src/gtk/about.c:386
+#: src/gtk/about.c:541

 msgid ""
 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 Software Foundation; either version 2, or (at your option) any later version.\n"

 "\n"
 "\n"

-"Documentation team\n"

 msgstr ""
 msgstr ""

+"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo de acordo com os termos da GNU General Public License tal como publicada pela Free Software Foundation; tanto a versão 2, ou (opcionalmente) qualquer versão posterior.\n"

 "\n"
 "\n"

-"A equipe de documentação\n"

 
 

-#: src/gtk/about.c:403
+#: src/gtk/about.c:547

 msgid ""
 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 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"

 "\n"
 "\n"

-"Logo\n"

 msgstr ""
 msgstr ""

+"Este programa é distribuido com a esperança de que seja útil, mas SEM NENHUMA GARANTIA; nem mesmo a garantia implícita de COMERCIALIDADE ou ADEQUAÇÃO PARA ALGUM PROPÓSITO PARTICULAR. Veja a GNU General Public License para maiores detalhes.\n"

 "\n"
 "\n"

-"Logo\n"

 
 

-#: src/gtk/about.c:420
+#: src/gtk/about.c:553

 msgid ""
 msgid ""

+"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"

 "\n"
 "\n"

-"Icons\n"

 msgstr ""
 msgstr ""

+"Você deve ter recebido uma cópia da GNU General Public License juntamente com este programa; caso não, escreva para Free Software Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.\n"

 "\n"
 "\n"

-"Ícones\n"

 
 

-#: src/gtk/about.c:437
-msgid ""
-"\n"
-"Contributors\n"
-msgstr ""
-"\n"
-"Colaboradores\n"
+#: src/gtk/about.c:571
+msgid "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit ("
+msgstr "Esse produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenSSL Toolkit ("

 
 

-#: src/gtk/about.c:456
-msgid "_Authors"
-msgstr "_Autores"
+#: src/gtk/about.c:575
+msgid ").\n"
+msgstr ").\n"

 
 

-#: src/gtk/about.c:476
-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 "
-"Software Foundation; either version 2, or (at your option) any later "
-"version.\n"
-"\n"
-msgstr ""
-"Este programa é um software livre; você pode redistribuí-lo e/ou modificá-lo "
-"de acordo com os termos da GNU General Public License tal como publicada "
-"pela Free Software Foundation; tanto a versão 2, ou (opcionalmente) qualquer "
-"versão posterior.\n"
-"\n"
+#: src/gtk/about.c:668
+msgid "About Claws Mail"
+msgstr "Sobre o Claws Mail"

 
 

-#: src/gtk/about.c:482
+#: src/gtk/about.c:719

 msgid ""
 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 "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"

 msgstr ""
 msgstr ""

-"Este programa é distribuido com a esperança de que seja útil, mas SEM "
-"NENHUMA GARANTIA; nem mesmo a garantia implícita de COMERCIALIDADE ou "
-"ADEQUAÇÃO PARA ALGUM PROPÓSITO PARTICULAR. Veja a GNU General Public License "
-"para maiores detalhes.\n"
-"\n"
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"e a equipe do Claws Mail"

 
 

-#: src/gtk/about.c:488
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-"\n"
-msgstr ""
-"Você deve ter recebido uma cópia da GNU General Public License juntamente "
-"com este programa; caso não, escreva para Free Software Foundation, Inc., 51 "
-"Franklin Street, Boston, MA 02110-1301, USA.\n"
-"\n"
+#: src/gtk/about.c:733
+msgid "_Info"
+msgstr "_Informação"

 
 

-#: src/gtk/about.c:502
-msgid ""
-"This product includes software developed by the OpenSSL Project for use in "
-"the OpenSSL Toolkit ("
-msgstr ""
-"Esse produto inclui software desenvolvido pelo Projeto OpenSSL para uso no "
-"OpenSSL Toolkit ("
+#: src/gtk/about.c:739
+msgid "_Authors"
+msgstr "_Autores"

 
 

-#: src/gtk/about.c:506
-msgid ").\n"
-msgstr ").\n"
+#: src/gtk/about.c:745
+msgid "_Features"
+msgstr "_Características"

 
 

-#: src/gtk/about.c:518
+#: src/gtk/about.c:751

 msgid "_License"
 msgstr "_Licença"
 
 msgid "_License"
 msgstr "_Licença"
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:303
+#: src/gtk/about.c:759
+msgid "_Release Notes"
+msgstr "_Notas do lançamento"
+
+#: src/gtk/colorlabel.c:48
+#: src/prefs_common.c:313

 msgid "Orange"
 msgstr "Laranja"
 
 msgid "Orange"
 msgstr "Laranja"
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:307
+#: src/gtk/colorlabel.c:49
+#: src/prefs_common.c:317

 msgid "Red"
 msgstr "Vermelho"
 
 msgid "Red"
 msgstr "Vermelho"
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:311
+#: src/gtk/colorlabel.c:50
+#: src/prefs_common.c:321

 msgid "Pink"
 msgstr "Rosa"
 
 msgid "Pink"
 msgstr "Rosa"
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:315
+#: src/gtk/colorlabel.c:51
+#: src/prefs_common.c:325

 msgid "Sky blue"
 msgstr "Azul Celeste"
 
 msgid "Sky blue"
 msgstr "Azul Celeste"
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:319
+#: src/gtk/colorlabel.c:52
+#: src/prefs_common.c:329

 msgid "Blue"
 msgstr "Azul"
 
 msgid "Blue"
 msgstr "Azul"
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:323
+#: src/gtk/colorlabel.c:53
+#: src/prefs_common.c:333

 msgid "Green"
 msgstr "Verde"
 
 msgid "Green"
 msgstr "Verde"
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:327
+#: src/gtk/colorlabel.c:54
+#: src/prefs_common.c:337

 msgid "Brown"
 msgstr "Marrom"
 
 msgid "Brown"
 msgstr "Marrom"
 


@@ -3310,7 +3753,8 @@ msgstr "Descrição da fonte"
 msgid "Font to use for the document text (e.g. \"Monospace 10\")"
 msgstr "Fonte a ser usada para o texto do documento (ex. \"Monospace 10\")"
 
 msgid "Font to use for the document text (e.g. \"Monospace 10\")"
 msgstr "Fonte a ser usada para o texto do documento (ex. \"Monospace 10\")"
 

-#: src/gtk/gtksourceprintjob.c:328 src/gtk/gtksourceprintjob.c:336
+#: src/gtk/gtksourceprintjob.c:328
+#: src/gtk/gtksourceprintjob.c:336

 msgid "Numbers Font"
 msgstr "Fonte dos números"
 
 msgid "Numbers Font"
 msgstr "Fonte dos números"
 


@@ -3328,9 +3772,7 @@ msgstr "Imprimir numeração das linhas"
 
 #: src/gtk/gtksourceprintjob.c:345
 msgid "Interval of printed line numbers (0 means no numbers)"
 
 #: src/gtk/gtksourceprintjob.c:345
 msgid "Interval of printed line numbers (0 means no numbers)"

-msgstr ""
-"Intervalo dos números na impressão de numeração das linhas (0 significa sem "
-"números)"
+msgstr "Intervalo dos números na impressão de numeração das linhas (0 significa sem números)"

 
 #: src/gtk/gtksourceprintjob.c:352
 msgid "Print Header"
 
 #: src/gtk/gtksourceprintjob.c:352
 msgid "Print Header"


@@ -3364,36 +3806,40 @@ msgstr "Descrição da fonte dos cabeçalho e rodapé"
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Fonte a ser usada para os cabeçalhos e rodapés (ex. \"Monospace 10\")"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Fonte a ser usada para os cabeçalhos e rodapés (ex. \"Monospace 10\")"
 

-#: src/gtk/gtkaspell.c:606
+#: src/gtk/gtkaspell.c:632

 msgid "No dictionary selected."
 msgstr "Nenhum dicionário selecionado."
 
 msgid "No dictionary selected."
 msgstr "Nenhum dicionário selecionado."
 

-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
+#: src/gtk/gtkaspell.c:868
+#: src/gtk/gtkaspell.c:1869
+#: src/gtk/gtkaspell.c:2164

 msgid "Normal Mode"
 msgstr "Modo Normal"
 
 msgid "Normal Mode"
 msgstr "Modo Normal"
 

-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
+#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:1875
+#: src/gtk/gtkaspell.c:2176

 msgid "Bad Spellers Mode"
 msgstr "Modo de verificação ortográfica com problema"
 
 msgid "Bad Spellers Mode"
 msgstr "Modo de verificação ortográfica com problema"
 

-#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:909

 msgid "Unknown suggestion mode."
 msgstr "Modo de sugestões desconhecido."
 
 msgid "Unknown suggestion mode."
 msgstr "Modo de sugestões desconhecido."
 

-#: src/gtk/gtkaspell.c:1154
+#: src/gtk/gtkaspell.c:1200

 msgid "No misspelled word found."
 msgstr "Não foram encontrados erros de ortografia."
 
 msgid "No misspelled word found."
 msgstr "Não foram encontrados erros de ortografia."
 

-#: src/gtk/gtkaspell.c:1502
+#: src/gtk/gtkaspell.c:1548

 msgid "Replace unknown word"
 msgstr "Substituir a palavra desconhecida"
 
 msgid "Replace unknown word"
 msgstr "Substituir a palavra desconhecida"
 

-#: src/gtk/gtkaspell.c:1517
+#: src/gtk/gtkaspell.c:1563

 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Substituir \"%s\" por: </span>"
 
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Substituir \"%s\" por: </span>"
 

-#: src/gtk/gtkaspell.c:1562
+#: src/gtk/gtkaspell.c:1608

 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"


@@ -3401,59 +3847,66 @@ msgstr ""
 "Pressione a tecla Control junto com Enter para\n"
 "o verificador aprender com os erros.\n"
 
 "Pressione a tecla Control junto com Enter para\n"
 "o verificador aprender com os erros.\n"
 

-#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
+#: src/gtk/gtkaspell.c:1863
+#: src/gtk/gtkaspell.c:2152

 msgid "Fast Mode"
 msgstr "Modo Rápido"
 
 msgid "Fast Mode"
 msgstr "Modo Rápido"
 

-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1970

 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "\"%s\" desconhecido em %s"
 
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "\"%s\" desconhecido em %s"
 

-#: src/gtk/gtkaspell.c:1930
+#: src/gtk/gtkaspell.c:1984

 msgid "Accept in this session"
 msgstr "Aceitar nessa sessão"
 
 msgid "Accept in this session"
 msgstr "Aceitar nessa sessão"
 

-#: src/gtk/gtkaspell.c:1940
+#: src/gtk/gtkaspell.c:1994

 msgid "Add to personal dictionary"
 msgstr "Adicionar ao dicionário pessoal"
 
 msgid "Add to personal dictionary"
 msgstr "Adicionar ao dicionário pessoal"
 

-#: src/gtk/gtkaspell.c:1950
+#: src/gtk/gtkaspell.c:2004

 msgid "Replace with..."
 msgstr "Substituir por..."
 
 msgid "Replace with..."
 msgstr "Substituir por..."
 

-#: src/gtk/gtkaspell.c:1963
+#: src/gtk/gtkaspell.c:2017

 #, c-format
 msgid "Check with %s"
 msgstr "Verificar com %s"
 
 #, c-format
 msgid "Check with %s"
 msgstr "Verificar com %s"
 

-#: src/gtk/gtkaspell.c:1985
+#: src/gtk/gtkaspell.c:2039

 msgid "(no suggestions)"
 msgstr "(sem sugestões)"
 
 msgid "(no suggestions)"
 msgstr "(sem sugestões)"
 

-#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
+#: src/gtk/gtkaspell.c:2050
+#: src/gtk/gtkaspell.c:2229

 msgid "More..."
 msgstr "Mais..."
 
 msgid "More..."
 msgstr "Mais..."
 

-#: src/gtk/gtkaspell.c:2060
+#: src/gtk/gtkaspell.c:2114

 #, c-format
 msgid "Dictionary: %s"
 msgstr "Dicionário: %s"
 
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Dicionário: %s"
 

-#: src/gtk/gtkaspell.c:2073
+#: src/gtk/gtkaspell.c:2127

 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Utilizar alternativo (%s)"
 
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Utilizar alternativo (%s)"
 

-#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2138
+msgid "Use both dictionaries"
+msgstr "Usar ambos os dicionários"
+
+#: src/gtk/gtkaspell.c:2192
+#: src/prefs_spelling.c:218

 msgid "Check while typing"
 msgstr "Verificar durante a digitação"
 
 msgid "Check while typing"
 msgstr "Verificar durante a digitação"
 

-#: src/gtk/gtkaspell.c:2137
+#: src/gtk/gtkaspell.c:2208

 msgid "Change dictionary"
 msgstr "Alterar dicionário"
 
 msgid "Change dictionary"
 msgstr "Alterar dicionário"
 

-#: src/gtk/gtkaspell.c:2270
+#: src/gtk/gtkaspell.c:2340

 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"


@@ -3462,6 +3915,15 @@ msgstr ""
 "O verificador ortográfico não conseguiu trocar o dicionário.\n"
 "%s"
 
 "O verificador ortográfico não conseguiu trocar o dicionário.\n"
 "%s"
 

+#: src/gtk/gtkaspell.c:2386
+#, c-format
+msgid ""
+"The spell checker could not change the alternate dictionary.\n"
+"%s"
+msgstr ""
+"O verificador ortográfico não conseguiu trocar o dicionário alternativo.\n"
+"%s"
+

 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Nova mensagem"
 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Nova mensagem"


@@ -3543,12 +4005,8 @@ msgid "Icon Legend"
 msgstr "Texto do ícone"
 
 #: src/gtk/icon_legend.c:140
 msgstr "Texto do ícone"
 
 #: src/gtk/icon_legend.c:140

-msgid ""
-"<span weight=\"bold\">The following icons are used to show the status of "
-"messages and folders:</span>"
-msgstr ""
-"<span weight=\"bold\">Os seguintes ícones são usados para mostrar a situação "
-"das mensagens e pastas:</span>"
+msgid "<span weight=\"bold\">The following icons are used to show the status of messages and folders:</span>"
+msgstr "<span weight=\"bold\">Os seguintes ícones são usados para mostrar a situação das mensagens e pastas:</span>"

 
 #: src/gtk/inputdialog.c:189
 #, c-format
 
 #: src/gtk/inputdialog.c:189
 #, c-format


@@ -3567,11 +4025,12 @@ msgstr "Lembrar disso"
 msgid "Protocol log"
 msgstr "Relatório do protocolo"
 
 msgid "Protocol log"
 msgstr "Relatório do protocolo"
 

-#: src/gtk/logwindow.c:373
+#: src/gtk/logwindow.c:384

 msgid "Clear _Log"
 msgstr "Limpar _relatório"
 
 msgid "Clear _Log"
 msgstr "Limpar _relatório"
 

-#: src/gtk/pluginwindow.c:150 src/gtk/pluginwindow.c:155
+#: src/gtk/pluginwindow.c:150
+#: src/gtk/pluginwindow.c:155

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3604,22 +4063,25 @@ msgstr ""
 "\n"
 "%s\n"
 
 "\n"
 "%s\n"
 

-#: src/gtk/pluginwindow.c:286 src/plugins/clamav/clamav_plugin_gtk.c:211
+#: src/gtk/pluginwindow.c:286
+#: src/plugins/clamav/clamav_plugin_gtk.c:211

 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/pgpcore/prefs_gpg.c:514
 #: src/plugins/spamassassin/spamassassin_gtk.c:548
 msgid "Plugins"
 msgstr "Plugins"
 
 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/pgpcore/prefs_gpg.c:514
 #: src/plugins/spamassassin/spamassassin_gtk.c:548
 msgid "Plugins"
 msgstr "Plugins"
 

-#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:319
+#: src/prefs_summaries.c:211

 msgid "Description"
 msgstr "Descrição"
 
 #: src/gtk/pluginwindow.c:336
 msgid "Description"
 msgstr "Descrição"
 
 #: src/gtk/pluginwindow.c:336

-msgid "More plugins are available from the Sylpheed-Claws website."
-msgstr "Existem mais plugins disponíveis no site do Sylpheed-Claws."
+msgid "More plugins are available from the Claws Mail website."
+msgstr "Existem mais plugins disponíveis no site do Claws Mail."

 
 

-#: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
+#: src/gtk/pluginwindow.c:342
+#: src/prefs_themes.c:866

 msgid "Get more..."
 msgstr "Obter mais..."
 
 msgid "Get more..."
 msgstr "Obter mais..."
 


@@ -3647,252 +4109,269 @@ msgstr "Plugins carregados"
 msgid "Page Index"
 msgstr "Índice da Página"
 
 msgid "Page Index"
 msgstr "Índice da Página"
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:762
-#: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
+#: src/gtk/progressdialog.c:140
+#: src/prefs_account.c:769
+#: src/prefs_filtering_action.c:378
+#: src/prefs_filtering.c:377

 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Conta"
 
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Conta"
 

-#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80 src/summaryview.c:2375
+#: src/gtk/progressdialog.c:148
+#: src/gtk/sslcertwindow.c:136
+#: src/prefs_summary_column.c:80
+#: src/summaryview.c:2376

 msgid "Status"
 msgstr "Situação"
 
 msgid "Status"
 msgstr "Situação"
 

-#: src/gtk/quicksearch.c:329
+#: src/gtk/quicksearch.c:331

 msgid "all messages"
 msgstr "todas as mensagens"
 
 msgid "all messages"
 msgstr "todas as mensagens"
 

-#: src/gtk/quicksearch.c:330
+#: src/gtk/quicksearch.c:332

 msgid "messages whose age is greater than #"
 msgstr "mensagens com mais de # dias"
 
 msgid "messages whose age is greater than #"
 msgstr "mensagens com mais de # dias"
 

-#: src/gtk/quicksearch.c:331
+#: src/gtk/quicksearch.c:333

 msgid "messages whose age is less than #"
 msgstr "mensagens com menos de # dias"
 
 msgid "messages whose age is less than #"
 msgstr "mensagens com menos de # dias"
 

-#: src/gtk/quicksearch.c:332
+#: src/gtk/quicksearch.c:334

 msgid "messages which contain S in the message body"
 msgstr "mensagens que contenham S no corpo"
 
 msgid "messages which contain S in the message body"
 msgstr "mensagens que contenham S no corpo"
 

-#: src/gtk/quicksearch.c:333
+#: src/gtk/quicksearch.c:335

 msgid "messages which contain S in the whole message"
 msgstr "mensagens que contenham S em qualquer parte"
 
 msgid "messages which contain S in the whole message"
 msgstr "mensagens que contenham S em qualquer parte"
 

-#: src/gtk/quicksearch.c:334
+#: src/gtk/quicksearch.c:336

 msgid "messages carbon-copied to S"
 msgstr "mensagens com cópia-carbono para S"
 
 msgid "messages carbon-copied to S"
 msgstr "mensagens com cópia-carbono para S"
 

-#: src/gtk/quicksearch.c:335
+#: src/gtk/quicksearch.c:337

 msgid "message is either to: or cc: to S"
 msgstr "mensagem que seja 'Para:' ou 'Cc:' para S"
 
 msgid "message is either to: or cc: to S"
 msgstr "mensagem que seja 'Para:' ou 'Cc:' para S"
 

-#: src/gtk/quicksearch.c:336
+#: src/gtk/quicksearch.c:338

 msgid "deleted messages"
 msgstr "mensagens apagadas"
 
 msgid "deleted messages"
 msgstr "mensagens apagadas"
 

-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:339

 msgid "messages which contain S in the Sender field"
 msgstr "mensagens que contenham S no campo remetente"
 
 msgid "messages which contain S in the Sender field"
 msgstr "mensagens que contenham S no campo remetente"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:340

 msgid "true if execute \"S\" succeeds"
 msgstr "verdadeiro se a execução \"S\" for bem sucedida"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "verdadeiro se a execução \"S\" for bem sucedida"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:341

 msgid "messages originating from user S"
 msgstr "mensagens originárias do usuário S"
 
 msgid "messages originating from user S"
 msgstr "mensagens originárias do usuário S"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:342

 msgid "forwarded messages"
 msgstr "mensagens encaminhadas"
 
 msgid "forwarded messages"
 msgstr "mensagens encaminhadas"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:343

 msgid "messages which contain header S"
 msgstr "mensagens que contenham o cabeçalho S"
 
 msgid "messages which contain header S"
 msgstr "mensagens que contenham o cabeçalho S"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:344

 msgid "messages which contain S in Message-ID header"
 msgstr "mensagens que contenham S no cabeçalho Message-Id"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "mensagens que contenham S no cabeçalho Message-Id"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:345

 msgid "messages which contain S in inreplyto header"
 msgstr "mensagens que contenham S no cabeçalho 'In-Reply-To'"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "mensagens que contenham S no cabeçalho 'In-Reply-To'"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:346

 msgid "messages which are marked with color #"
 msgstr "mensagens que estão marcadas com a cor #"
 
 msgid "messages which are marked with color #"
 msgstr "mensagens que estão marcadas com a cor #"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:347

 msgid "locked messages"
 msgstr "mensagens travadas"
 
 msgid "locked messages"
 msgstr "mensagens travadas"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:348

 msgid "messages which are in newsgroup S"
 msgstr "mensagens que estão no newsgroup S"
 
 msgid "messages which are in newsgroup S"
 msgstr "mensagens que estão no newsgroup S"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:349

 msgid "new messages"
 msgstr "novas mensagens"
 
 msgid "new messages"
 msgstr "novas mensagens"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:350

 msgid "old messages"
 msgstr "mensagens antigas"
 
 msgid "old messages"
 msgstr "mensagens antigas"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:351

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensagens incompletas (que não foram recebidas integralmente)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "mensagens incompletas (que não foram recebidas integralmente)"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:352

 msgid "messages which have been replied to"
 msgstr "mensagens que foram respondidas"
 
 msgid "messages which have been replied to"
 msgstr "mensagens que foram respondidas"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:353

 msgid "read messages"
 msgstr "mensagens lidas"
 
 msgid "read messages"
 msgstr "mensagens lidas"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:354

 msgid "messages which contain S in subject"
 msgstr "mensagens que contenham S no assunto"
 
 msgid "messages which contain S in subject"
 msgstr "mensagens que contenham S no assunto"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:355

 msgid "messages whose score is equal to #"
 msgstr "mensagens com pontuação igual a #"
 
 msgid "messages whose score is equal to #"
 msgstr "mensagens com pontuação igual a #"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:356

 msgid "messages whose score is greater than #"
 msgstr "mensagens com pontuação maior que #"
 
 msgid "messages whose score is greater than #"
 msgstr "mensagens com pontuação maior que #"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:357

 msgid "messages whose score is lower than #"
 msgstr "mensagens com pontuação menor que #"
 
 msgid "messages whose score is lower than #"
 msgstr "mensagens com pontuação menor que #"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:358

 msgid "messages whose size is equal to #"
 msgstr "mensagens com tamanho igual a #"
 
 msgid "messages whose size is equal to #"
 msgstr "mensagens com tamanho igual a #"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:359

 msgid "messages whose size is greater than #"
 msgstr "mensagens com tamanho maior que #"
 
 msgid "messages whose size is greater than #"
 msgstr "mensagens com tamanho maior que #"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:360

 msgid "messages whose size is smaller than #"
 msgstr "mensagens com tamanho menor que #"
 
 msgid "messages whose size is smaller than #"
 msgstr "mensagens com tamanho menor que #"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:361

 msgid "messages which have been sent to S"
 msgstr "mensagens que foram enviadas para S"
 
 msgid "messages which have been sent to S"
 msgstr "mensagens que foram enviadas para S"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:362

 msgid "marked messages"
 msgstr "mensagens marcadas"
 
 msgid "marked messages"
 msgstr "mensagens marcadas"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:363

 msgid "unread messages"
 msgstr "mensagens não lidas"
 
 msgid "unread messages"
 msgstr "mensagens não lidas"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:364

 msgid "messages which contain S in References header"
 msgstr "mensagens que contém S no cabeçalho 'References'"
 
 msgid "messages which contain S in References header"
 msgstr "mensagens que contém S no cabeçalho 'References'"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:365

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"

-msgstr ""
-"mensagens que retornaram 0 quando foram passadas para o comando - %F é um "
-"arquivo de mensagem"
+msgstr "mensagens que retornaram 0 quando foram passadas para o comando - %F é um arquivo de mensagem"

 
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:366

 msgid "messages which contain S in X-Label header"
 msgstr "mensagens que contém S no cabeçalho 'X-Label'"
 
 msgid "messages which contain S in X-Label header"
 msgstr "mensagens que contém S no cabeçalho 'X-Label'"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:368

 msgid "logical AND operator"
 msgstr "operador lógico 'E'"
 
 msgid "logical AND operator"
 msgstr "operador lógico 'E'"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:369

 msgid "logical OR operator"
 msgstr "operador lógico 'OU'"
 
 msgid "logical OR operator"
 msgstr "operador lógico 'OU'"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:370

 msgid "logical NOT operator"
 msgstr "operador lógico 'NÃO'"
 
 msgid "logical NOT operator"
 msgstr "operador lógico 'NÃO'"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:371

 msgid "case sensitive search"
 msgstr "a procura diferencia maiúsc./minúsc."
 
 msgid "case sensitive search"
 msgstr "a procura diferencia maiúsc./minúsc."
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:373

 msgid "all filtering expressions are allowed"
 msgstr "são permitidas todas as expressões de filtragem"
 
 msgid "all filtering expressions are allowed"
 msgstr "são permitidas todas as expressões de filtragem"
 

-#: src/gtk/quicksearch.c:379 src/summary_search.c:329
+#: src/gtk/quicksearch.c:381
+#: src/summary_search.c:397

 msgid "Extended Search"
 msgstr "Procura Extendida"
 
 msgid "Extended Search"
 msgstr "Procura Extendida"
 

-#: src/gtk/quicksearch.c:380
+#: src/gtk/quicksearch.c:382

 msgid ""
 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"
+"Extended Search allows the user to define criteria that messages must have in order to match and be displayed in the message list.\n"

 "\n"
 "The following symbols can be used:"
 msgstr ""
 "\n"
 "The following symbols can be used:"
 msgstr ""

-"A Procura Extendida permite que o usuário defina os critérios de "
-"correspondência que as mensagens devam ter para serem exibidas na lista de "
-"mensagens.\n"
+"A Procura Extendida permite que o usuário defina os critérios de correspondência que as mensagens devam ter para serem exibidas na lista de mensagens.\n"

 "\n"
 "Os seguintes símbolos podem ser usados:"
 
 "\n"
 "Os seguintes símbolos podem ser usados:"
 

-#: src/gtk/quicksearch.c:476 src/prefs_filtering_action.c:1080
-#: src/prefs_matcher.c:158 src/prefs_matcher.c:1866
-#: src/prefs_summary_column.c:82 src/prefs_template.c:190 src/quote_fmt.c:47
+#: src/gtk/quicksearch.c:478
+#: src/prefs_compose_writing.c:239
+#: src/prefs_filtering_action.c:1080
+#: src/prefs_matcher.c:158
+#: src/prefs_matcher.c:1866
+#: src/prefs_summary_column.c:82
+#: src/prefs_template.c:190
+#: src/quote_fmt.c:47

 #: src/summaryview.c:486
 msgid "Subject"
 msgstr "Assunto"
 
 #: src/summaryview.c:486
 msgid "Subject"
 msgstr "Assunto"
 

-#: src/gtk/quicksearch.c:480 src/prefs_filtering_action.c:1081
-#: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
+#: src/gtk/quicksearch.c:482
+#: src/prefs_filtering_action.c:1081
+#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:1867
+#: src/prefs_summary_column.c:83
+#: src/quote_fmt.c:42
+#: src/summaryview.c:487

 msgid "From"
 msgstr "De"
 
 msgid "From"
 msgstr "De"
 

-#: src/gtk/quicksearch.c:484 src/prefs_filtering_action.c:1082
-#: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
-#: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
+#: src/gtk/quicksearch.c:486
+#: src/prefs_filtering_action.c:1082
+#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:1868
+#: src/prefs_summary_column.c:84
+#: src/prefs_template.c:187
+#: src/quote_fmt.c:48

 #: src/summaryview.c:488
 msgid "To"
 msgstr "Para"
 
 #: src/summaryview.c:488
 msgid "To"
 msgstr "Para"
 

-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:497

 msgid "Recursive"
 msgstr "Recursivo"
 
 msgid "Recursive"
 msgstr "Recursivo"
 

-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:507

 msgid "Sticky"
 msgstr "Manter filtro"
 
 msgid "Sticky"
 msgstr "Manter filtro"
 

-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:517

 msgid "Type-ahead"
 msgstr "Procurar enquanto digita"
 
 msgid "Type-ahead"
 msgstr "Procurar enquanto digita"
 

-#: src/gtk/quicksearch.c:546
+#: src/gtk/quicksearch.c:548

 msgid " Clear "
 msgstr " Limpar "
 
 msgid " Clear "
 msgstr " Limpar "
 

-#: src/gtk/quicksearch.c:567 src/summary_search.c:282
+#: src/gtk/quicksearch.c:569
+#: src/summary_search.c:350

 msgid "Edit search criteria"
 msgstr "Editar os critérios da busca"
 
 msgid "Edit search criteria"
 msgstr "Editar os critérios da busca"
 

-#: src/gtk/quicksearch.c:573
+#: src/gtk/quicksearch.c:575

 msgid " Extended Symbols... "
 msgstr " Símbolos extendidos... "
 
 msgid " Extended Symbols... "
 msgstr " Símbolos extendidos... "
 

-#: src/gtk/quicksearch.c:1020 src/summaryview.c:1073
+#: src/gtk/quicksearch.c:1025
+#: src/summaryview.c:1073

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Procurando em %s... \n"
 
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Procurando em %s... \n"
 

-#: src/gtk/sslcertwindow.c:129 src/gtk/sslcertwindow.c:282
-#: src/gtk/sslcertwindow.c:322 src/gtk/sslcertwindow.c:376
+#: src/gtk/sslcertwindow.c:129
+#: src/gtk/sslcertwindow.c:282
+#: src/gtk/sslcertwindow.c:322
+#: src/gtk/sslcertwindow.c:376

 msgid "correct"
 msgstr "correto"
 
 msgid "correct"
 msgstr "correto"
 


@@ -3904,16 +4383,19 @@ msgstr "Proprietário"
 msgid "Signer"
 msgstr "Assinante"
 
 msgid "Signer"
 msgstr "Assinante"
 

-#: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:142
+#: src/gtk/sslcertwindow.c:163

 #: src/prefs_themes.c:883
 msgid "Name: "
 msgstr "Nome: "
 
 #: src/prefs_themes.c:883
 msgid "Name: "
 msgstr "Nome: "
 

-#: src/gtk/sslcertwindow.c:149 src/gtk/sslcertwindow.c:170
+#: src/gtk/sslcertwindow.c:149
+#: src/gtk/sslcertwindow.c:170

 msgid "Organization: "
 msgstr "Organização: "
 
 msgid "Organization: "
 msgstr "Organização: "
 

-#: src/gtk/sslcertwindow.c:156 src/gtk/sslcertwindow.c:177
+#: src/gtk/sslcertwindow.c:156
+#: src/gtk/sslcertwindow.c:177

 msgid "Location: "
 msgstr "Localização: "
 
 msgid "Location: "
 msgstr "Localização: "
 


@@ -3943,13 +4425,15 @@ msgstr ""
 "O certificado para %s é desconhecido.\n"
 "Deseja aceitá-lo?"
 
 "O certificado para %s é desconhecido.\n"
 "Deseja aceitá-lo?"
 

-#: src/gtk/sslcertwindow.c:284 src/gtk/sslcertwindow.c:324
+#: src/gtk/sslcertwindow.c:284
+#: src/gtk/sslcertwindow.c:324

 #: src/gtk/sslcertwindow.c:378
 #, c-format
 msgid "Signature status: %s"
 msgstr "Situação da assinatura: %s"
 
 #: src/gtk/sslcertwindow.c:378
 #, c-format
 msgid "Signature status: %s"
 msgstr "Situação da assinatura: %s"
 

-#: src/gtk/sslcertwindow.c:291 src/gtk/sslcertwindow.c:331
+#: src/gtk/sslcertwindow.c:291
+#: src/gtk/sslcertwindow.c:331

 msgid "_View certificate"
 msgstr "_Ver certificado"
 
 msgid "_View certificate"
 msgstr "_Ver certificado"
 


@@ -3957,12 +4441,14 @@ msgstr "_Ver certificado"
 msgid "Unknown SSL Certificate"
 msgstr "Certificado SSL desconhecido"
 
 msgid "Unknown SSL Certificate"
 msgstr "Certificado SSL desconhecido"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:337
+#: src/gtk/sslcertwindow.c:297
+#: src/gtk/sslcertwindow.c:337

 #: src/gtk/sslcertwindow.c:390
 msgid "_Cancel connection"
 msgstr "_Cancelar a conexão"
 
 #: src/gtk/sslcertwindow.c:390
 msgid "_Cancel connection"
 msgstr "_Cancelar a conexão"
 

-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:297
+#: src/gtk/sslcertwindow.c:390

 msgid "_Accept and save"
 msgstr "_Aceitar e salvar"
 
 msgid "_Accept and save"
 msgstr "_Aceitar e salvar"
 


@@ -4004,11 +4490,15 @@ msgstr "_Ver certificados"
 msgid "Changed SSL Certificate"
 msgstr "O certificado SSL foi alterado"
 
 msgid "Changed SSL Certificate"
 msgstr "O certificado SSL foi alterado"
 

-#: src/headerview.c:195 src/summaryview.c:2783 src/summaryview.c:2794
+#: src/headerview.c:195
+#: src/summaryview.c:2784
+#: src/summaryview.c:2795

 msgid "(No From)"
 msgstr "(Sem remetente)"
 
 msgid "(No From)"
 msgstr "(Sem remetente)"
 

-#: src/headerview.c:210 src/summaryview.c:2818 src/summaryview.c:2821
+#: src/headerview.c:210
+#: src/summaryview.c:2819
+#: src/summaryview.c:2822

 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 


@@ -4032,13 +4522,11 @@ msgstr "Content-Type:"
 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"

-"CRAM-MD5 logins only work if libetpan has been compiled with SASL support "
-"and the CRAM-MD5 SASL plugin is installed."
+"CRAM-MD5 logins only work if libetpan has been compiled with SASL support and the CRAM-MD5 SASL plugin is installed."

 msgstr ""
 "\n"
 "\n"
 msgstr ""
 "\n"
 "\n"

-"Autenticações CRAM-MD5 funcionam somente se a libetpan estiver compilada com "
-"suporte a SASL e o plugin CRAM-MD5 SASL instalado."
+"Autenticações CRAM-MD5 funcionam somente se a libetpan estiver compilada com suporte a SASL e o plugin CRAM-MD5 SASL instalado."

 
 #: src/imap.c:639
 #, c-format
 
 #: src/imap.c:639
 #, c-format


@@ -4055,209 +4543,229 @@ msgstr "Erro na conexão com %s: login recusado.%s\n"
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 
 msgid "Connecting to %s failed"
 msgstr "Erro na conexão com %s"
 

-#: src/imap.c:665 src/imap.c:668
+#: src/imap.c:665
+#: src/imap.c:668

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s foi interrompida. Reconectando...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s foi interrompida. Reconectando...\n"
 

-#: src/imap.c:706 src/imap.c:2222 src/imap.c:2746 src/imap.c:2831
-#: src/imap.c:3165 src/imap.c:3920
-msgid "Sylpheed-Claws needs network access in order to access the IMAP server."
-msgstr ""
-"O Sylpheed-Claws necessita de acesso à rede para se conectar ao servidor "
-"IMAP."
-
-#: src/imap.c:780 src/inc.c:770 src/news.c:295 src/send_message.c:299
+#: src/imap.c:717
+#: src/imap.c:2239
+#: src/imap.c:2737
+#: src/imap.c:2822
+#: src/imap.c:3156
+#: src/imap.c:3914
+msgid "Claws Mail needs network access in order to access the IMAP server."
+msgstr "O Claws Mail necessita de acesso à rede para conectar-se ao servidor IMAP."
+
+#: src/imap.c:789
+#: src/inc.c:770
+#: src/news.c:295
+#: src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 

-#: src/imap.c:781 src/inc.c:771 src/news.c:296 src/send_message.c:300
+#: src/imap.c:790
+#: src/inc.c:771
+#: src/news.c:296
+#: src/send_message.c:300

 msgid ""
 msgid ""

-"This connection is configured to be secured using SSL, but SSL is not "
-"available in this build of Sylpheed-Claws. \n"
+"This connection is configured to be secured using SSL, but SSL is not available in this build of Claws Mail. \n"

 "\n"
 "\n"

-"Do you want to continue connecting to this server? The communication would "
-"not be secure."
+"Do you want to continue connecting to this server? The communication would not be secure."

 msgstr ""
 msgstr ""

-"Essa conexão está configurada para ser segura usando SSL, mas o SSL não está "
-"disponível nessa compilação do Sylpheed-claws. \n"
+"Essa conexão está configurada para ser segura usando SSL, mas o SSL não está disponível nessa compilação do Claws Mail. \n"

 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 
 "\n"
 "Você quer continuar a conexão ao servidor? A comunicação não será segura."
 

-#: src/imap.c:787 src/inc.c:777 src/news.c:302 src/send_message.c:306
+#: src/imap.c:796
+#: src/inc.c:777
+#: src/news.c:302
+#: src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "Con_tinuar a conexão"
 
 msgid "Con_tinue connecting"
 msgstr "Con_tinuar a conexão"
 

-#: src/imap.c:797
+#: src/imap.c:806

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Conectando com o servidor IMAP4: %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Conectando com o servidor IMAP4: %s..."
 

-#: src/imap.c:829
+#: src/imap.c:844

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d"
 

-#: src/imap.c:832
+#: src/imap.c:847

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível conectar com o servidor IMAP4: %s:%d\n"
 

-#: src/imap.c:861 src/imap.c:2554
+#: src/imap.c:876
+#: src/imap.c:2545

 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 

-#: src/imap.c:898
+#: src/imap.c:913

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Conectando com o servidor IMAP4: %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Conectando com o servidor IMAP4: %s...\n"
 

-#: src/imap.c:909 src/imap.c:912
+#: src/imap.c:924
+#: src/imap.c:927

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Não foi possível conectar-se ao servidor IMAP %s."
 

-#: src/imap.c:1086
+#: src/imap.c:1100

 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 
 msgid "Adding messages..."
 msgstr "Adicionando mensagens..."
 

-#: src/imap.c:1236 src/mh.c:500
+#: src/imap.c:1252
+#: src/mh.c:500

 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 

-#: src/imap.c:1411
+#: src/imap.c:1428

 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 
 msgid "can't set deleted flags\n"
 msgstr "não foi possível definir as marcas de exclusão\n"
 

-#: src/imap.c:1417 src/imap.c:3672
+#: src/imap.c:1434
+#: src/imap.c:3665

 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 
 msgid "can't expunge\n"
 msgstr "não foi possível expurgar\n"
 

-#: src/imap.c:1861
+#: src/imap.c:1878

 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não foi possível criar a caixa postal: falha no comando LIST\n"
 

-#: src/imap.c:1877
+#: src/imap.c:1894

 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 
 msgid "can't create mailbox\n"
 msgstr "não foi possível criar a caixa postal\n"
 

-#: src/imap.c:1958
+#: src/imap.c:1975

 msgid "New folder name must not contain the namespace path separator"
 msgstr "O nome da nova pasta não pode conter o caractere separador de caminho"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr "O nome da nova pasta não pode conter o caractere separador de caminho"
 

-#: src/imap.c:1989
+#: src/imap.c:2006

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não foi possível renomear a caixa postal: %s para %s\n"
 

-#: src/imap.c:2053
+#: src/imap.c:2070

 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 
 msgid "can't delete mailbox\n"
 msgstr "não foi possível excluir a caixa postal\n"
 

-#: src/imap.c:2334
+#: src/imap.c:2316

 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 
 msgid "LIST failed\n"
 msgstr "Erro no comando LIST\n"
 

-#: src/imap.c:2442
+#: src/imap.c:2433

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não foi possível selecionar a pasta: %s\n"
 

-#: src/imap.c:2551
+#: src/imap.c:2542

 msgid "Server requires TLS to log in.\n"
 msgstr "O servidor depende do TLS para efetutar a autenticação.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "O servidor depende do TLS para efetutar a autenticação.\n"
 

-#: src/imap.c:2560
+#: src/imap.c:2551

 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "Não foi possível atualizar as capacidades.\n"
 

-#: src/imap.c:2565
+#: src/imap.c:2556

 #, c-format
 #, c-format

-msgid ""
-"Connection to %s failed: server requires TLS, but Sylpheed-Claws has been "
-"compiled without OpenSSL support.\n"
-msgstr ""
-"Ocorreu uma falha na conexão com %s: o servidor requer TLS, mas o Sylpheed-"
-"Claws foi compilado sem o suporte ao OpenSSL.\n"
+msgid "Connection to %s failed: server requires TLS, but Claws Mail has been compiled without OpenSSL support.\n"
+msgstr "Ocorreu uma falha na conexão com %s: o servidor requer TLS, mas o Claws Mail foi compilado sem o suporte ao OpenSSL.\n"

 
 

-#: src/imap.c:2573
+#: src/imap.c:2564

 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "As autenticações no servidor estão desabilitadas.\n"
 

-#: src/imap.c:2751
+#: src/imap.c:2742

 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 
 msgid "Fetching message..."
 msgstr "Buscando a mensagem..."
 

-#: src/imap.c:2918
+#: src/imap.c:2909

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv não pode converter de UTF-7 para %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv não pode converter de UTF-7 para %s\n"
 

-#: src/imap.c:2948
+#: src/imap.c:2939

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv não pode converter %s para UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv não pode converter %s para UTF-7\n"
 

-#: src/imap.c:2992
+#: src/imap.c:2983

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv não pode converter de UTF-8 para UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv não pode converter de UTF-8 para UTF-7\n"
 

-#: src/imap.c:3657
+#: src/imap.c:3650

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "não foi possível definir marcas de exclusão: %d\n"
 

-#: src/imap.c:4382
+#: src/imap.c:4378

 msgid ""
 msgid ""

-"You have one or more IMAP accounts defined. However this version of Sylpheed-"
-"Claws has been built without IMAP support; your IMAP account(s) are "
-"disabled.\n"
+"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 disabled.\n"

 "\n"
 "\n"

-"You probably need to install libetpan and recompile Sylpheed-Claws."
+"You probably need to install libetpan and recompile Claws Mail."

 msgstr ""
 msgstr ""

-"Você possui uma ou mais contas IMAP definidas. Entretanto, essa versão do "
-"Sylpheed-Claws foi compilada sem suporte ao IMAP; sua(s) conta(s) está(ão) "
-"desabilitada(s).\n"
+"Você possui uma ou mais contas IMAP definidas. Entretanto, essa versão do Claws Mail foi compilada sem suporte ao IMAP; assim, essa(s) conta(s) está(ão) desabilitada(s).\n"

 "\n"
 "\n"

-"Você provavelmente precisa instalar o libetpan e recompilar o Sylpheed-Claws."
+"Você provavelmente precisa instalar o libetpan e recompilar o Claws Mail."

 
 

-#: src/imap_gtk.c:55 src/mh_gtk.c:50
+#: src/imap_gtk.c:55
+#: src/mh_gtk.c:50

 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 

-#: src/imap_gtk.c:56 src/mh_gtk.c:51
+#: src/imap_gtk.c:57
+#: src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:58
+#: src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr "/_Mover pasta..."
 
 msgid "/M_ove folder..."
 msgstr "/_Mover pasta..."
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:59
+#: src/mh_gtk.c:54
+msgid "/Cop_y folder..."
+msgstr "/_Copiar pasta..."
+
+#: src/imap_gtk.c:61
+#: src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr "/E_xcluir pasta..."
 
 msgid "/_Delete folder..."
 msgstr "/E_xcluir pasta..."
 

-#: src/imap_gtk.c:60 src/news_gtk.c:55
+#: src/imap_gtk.c:63
+#: src/news_gtk.c:55

 msgid "/Synchronise"
 msgstr "/_Sincronizar"
 
 msgid "/Synchronise"
 msgstr "/_Sincronizar"
 

-#: src/imap_gtk.c:61 src/news_gtk.c:56
+#: src/imap_gtk.c:64
+#: src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr "/_Obter mensagens"
 
 msgid "/Down_load messages"
 msgstr "/_Obter mensagens"
 

-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:58
+#: src/imap_gtk.c:66
+#: src/mh_gtk.c:58
+#: src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr "/_Verificar se há novas mensagens"
 
 msgid "/_Check for new messages"
 msgstr "/_Verificar se há novas mensagens"
 

-#: src/imap_gtk.c:64 src/mh_gtk.c:56
+#: src/imap_gtk.c:67
+#: src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr "/Verificar por novas _pastas"
 
 msgid "/C_heck for new folders"
 msgstr "/Verificar por novas _pastas"
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:57
+#: src/imap_gtk.c:68
+#: src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgid "/R_ebuild folder tree"

-msgstr "/Re_construir a árvore de pastas"
+msgstr "/Recons_truir a árvore de pastas"

 
 

-#: src/imap_gtk.c:135
+#: src/imap_gtk.c:138

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"


@@ -4267,21 +4775,25 @@ msgstr ""
 "(se deseja criar uma pasta para armazenar subpastas,\n"
 "e não mensagens, adicione '/' ao final do nome)"
 
 "(se deseja criar uma pasta para armazenar subpastas,\n"
 "e não mensagens, adicione '/' ao final do nome)"
 

-#: src/imap_gtk.c:193 src/mh_gtk.c:228
+#: src/imap_gtk.c:196
+#: src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Entre com o novo nome para '%s':"
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Entre com o novo nome para '%s':"
 

-#: src/imap_gtk.c:195 src/mh_gtk.c:230
+#: src/imap_gtk.c:198
+#: src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr "Renomear a pasta"
 
 msgid "Rename folder"
 msgstr "Renomear a pasta"
 

-#: src/imap_gtk.c:204 src/imap_gtk.c:209
+#: src/imap_gtk.c:207
+#: src/imap_gtk.c:212

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser incluído no nome da pasta."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser incluído no nome da pasta."
 

-#: src/imap_gtk.c:226 src/mh_gtk.c:255
+#: src/imap_gtk.c:229
+#: src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -4289,30 +4801,33 @@ msgstr ""
 "Não foi possível renomear a pasta.\n"
 "O nome fornecido não é permitido."
 
 "Não foi possível renomear a pasta.\n"
 "O nome fornecido não é permitido."
 

-#: src/imap_gtk.c:280 src/mh_gtk.c:176
+#: src/imap_gtk.c:281
+#: src/mh_gtk.c:179

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"All folders and messages under '%s' will be permanently deleted. Recovery "
-"will not be possible.\n"
+"All folders and messages under '%s' will be permanently deleted. Recovery will not be possible.\n"

 "\n"
 "Do you really want to delete?"
 msgstr ""
 "\n"
 "Do you really want to delete?"
 msgstr ""

-"Todas as pastas e mensagens dentro de '%s' serão apagadas. Não será possível "
-"recuperá-las.\n"
+"Todas as pastas e mensagens dentro de '%s' serão apagadas. Não será possível recuperá-las.\n"

 "\n"
 "Confirma a exclusão?"
 
 "\n"
 "Confirma a exclusão?"
 

-#: src/imap_gtk.c:302 src/mh_gtk.c:198 src/news_gtk.c:238
+#: src/imap_gtk.c:303
+#: src/mh_gtk.c:201
+#: src/news_gtk.c:238

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível remover a pasta '%s'."
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível remover a pasta '%s'."
 

-#: src/imap_gtk.c:362 src/news_gtk.c:299
+#: src/imap_gtk.c:363
+#: src/news_gtk.c:299

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Ocorreu um erro durante a recepção das mensagens em '%s' ."
 
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Ocorreu um erro durante a recepção das mensagens em '%s' ."
 

-#: src/import.c:120 src/import.c:215
+#: src/import.c:120
+#: src/import.c:215

 msgid "Import mbox file"
 msgstr "Importar arquivo mbox"
 
 msgid "Import mbox file"
 msgstr "Importar arquivo mbox"
 


@@ -4356,11 +4871,15 @@ msgstr "Selecione e renomeie os campos LDIF a importar."
 msgid "File imported."
 msgstr "Arquivo importado."
 
 msgid "File imported."
 msgstr "Arquivo importado."
 

-#: src/importldif.c:451 src/importmutt.c:125 src/importpine.c:125
+#: src/importldif.c:451
+#: src/importmutt.c:125
+#: src/importpine.c:125

 msgid "Please select a file."
 msgstr "Por favor, selecione um arquivo."
 
 msgid "Please select a file."
 msgstr "Por favor, selecione um arquivo."
 

-#: src/importldif.c:457 src/importmutt.c:130 src/importpine.c:130
+#: src/importldif.c:457
+#: src/importmutt.c:130
+#: src/importpine.c:130

 msgid "Address book name must be supplied."
 msgstr "O nome do livro de endereços deve ser fornecido."
 
 msgid "Address book name must be supplied."
 msgstr "O nome do livro de endereços deve ser fornecido."
 


@@ -4377,12 +4896,8 @@ msgid "Select LDIF File"
 msgstr "Selecione o arquivo LDIF"
 
 #: src/importldif.c:662
 msgstr "Selecione o arquivo LDIF"
 
 #: src/importldif.c:662

-msgid ""
-"Specify the name for the address book that will be created from the LDIF "
-"file data."
-msgstr ""
-"Especifique o nome para o livro de endereços que será criado a partir dos "
-"dados do arquivo LDIF."
+msgid "Specify the name for the address book that will be created from the LDIF file data."
+msgstr "Especifique o nome para o livro de endereços que será criado a partir dos dados do arquivo LDIF."

 
 #: src/importldif.c:668
 msgid "File Name"
 
 #: src/importldif.c:668
 msgid "File Name"


@@ -4400,7 +4915,8 @@ msgstr "Selecione o arquivo LDIF a ser importado."
 msgid "R"
 msgstr "R"
 
 msgid "R"
 msgstr "R"
 

-#: src/importldif.c:726 src/summaryview.c:484
+#: src/importldif.c:726
+#: src/summaryview.c:484

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 


@@ -4429,22 +4945,8 @@ msgid "???"
 msgstr "???"
 
 #: src/importldif.c:829
 msgstr "???"
 
 #: src/importldif.c:829

-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 "
-"automatically imported and cannot be renamed. A single click in the Select "
-"(\"S\") column will select the field for import with a tick. A single click "
-"anywhere in the row will select that field for rename in the input area "
-"below the list. A double click anywhere in the row will also select the "
-"field for import."
-msgstr ""
-"Escolha o campo LDIF que será renomeado ou selecionado para importação na "
-"lista acima. Os campos Reservados (que possuem uma marca na coluna \"R\"), "
-"são automaticamente importados e não podem ser renomeados. Um clique na "
-"coluna Selecionado (\"S\") irá selecionar o campo para importação. Um clique "
-"em qualquer lugar da linha irá selecionar aquele campo para ser renomeado, "
-"na área de entrada abaixo da lista. Um duplo clique em qualquer lugar da "
-"linha também irá selecionar o campo para ser importado."
+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 automatically imported and cannot be renamed. A single click in the Select (\"S\") column will select the field for import with a tick. A single click anywhere in the row will select that field for rename in the input area below the list. A double click anywhere in the row will also select the field for import."
+msgstr "Escolha o campo LDIF que será renomeado ou selecionado para importação na lista acima. Os campos Reservados (que possuem uma marca na coluna \"R\"), são automaticamente importados e não podem ser renomeados. Um clique na coluna Selecionado (\"S\") irá selecionar o campo para importação. Um clique em qualquer lugar da linha irá selecionar aquele campo para ser renomeado, na área de entrada abaixo da lista. Um duplo clique em qualquer lugar da linha também irá selecionar o campo para ser importado."

 
 #: src/importldif.c:841
 msgid "Select for Import"
 
 #: src/importldif.c:841
 msgid "Select for Import"


@@ -4482,7 +4984,8 @@ msgstr "Selecione o arquivo do MUTT"
 msgid "Import MUTT file into Address Book"
 msgstr "Incorporar o arquivo do MUTT ao Livro de Endereços"
 
 msgid "Import MUTT file into Address Book"
 msgstr "Incorporar o arquivo do MUTT ao Livro de Endereços"
 

-#: src/importmutt.c:291 src/importpine.c:292
+#: src/importmutt.c:291
+#: src/importpine.c:292

 msgid "Please select a file to import."
 msgstr "Por favor, selecione um arquivo para importar."
 
 msgid "Please select a file to import."
 msgstr "Por favor, selecione um arquivo para importar."
 


@@ -4498,9 +5001,11 @@ msgstr "Selecione o arquivo do Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Incorporar o arquivo do Pine ao Livro de Endereços"
 
 msgid "Import Pine file into Address Book"
 msgstr "Incorporar o arquivo do Pine ao Livro de Endereços"
 

-#: src/inc.c:173 src/inc.c:278 src/inc.c:304
-msgid "Sylpheed-Claws needs network access in order to get mails."
-msgstr "O Sylpheed-Claws necessita de acesso à rede para obter as mensagens."
+#: src/inc.c:173
+#: src/inc.c:278
+#: src/inc.c:304
+msgid "Claws Mail needs network access in order to get mails."
+msgstr "O Claws Mail necessita de acesso à rede para obter as mensagens."

 
 #: src/inc.c:384
 msgid "Retrieving new messages"
 
 #: src/inc.c:384
 msgid "Retrieving new messages"


@@ -4510,7 +5015,8 @@ msgstr "Recebendo novas mensagens"
 msgid "Standby"
 msgstr "Aguardando"
 
 msgid "Standby"
 msgstr "Aguardando"
 

-#: src/inc.c:572 src/inc.c:622
+#: src/inc.c:572
+#: src/inc.c:622

 msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Cancelled"
 msgstr "Cancelado"
 


@@ -4537,11 +5043,14 @@ msgstr "Ocorreu uma falha na conexão"
 msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 
 msgid "Auth failed"
 msgstr "Ocorreu um erro na autenticação"
 

-#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2371
+#: src/inc.c:609
+#: src/prefs_summary_column.c:89
+#: src/summaryview.c:2372

 msgid "Locked"
 msgstr "Travada"
 
 msgid "Locked"
 msgstr "Travada"
 

-#: src/inc.c:619 src/plugins/spamassassin/spamassassin_gtk.c:345
+#: src/inc.c:619
+#: src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "Tempo esgotado"
 
 msgid "Timeout"
 msgstr "Tempo esgotado"
 


@@ -4576,7 +5085,8 @@ msgstr "Não foi possível conectar ao servidor POP3: %s:%d"
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor POP3: %s:%d\n"
 
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível conectar ao servidor POP3: %s:%d\n"
 

-#: src/inc.c:887 src/send_message.c:472
+#: src/inc.c:887
+#: src/send_message.c:472

 msgid "Authenticating..."
 msgstr "Autenticando..."
 
 msgid "Authenticating..."
 msgstr "Autenticando..."
 


@@ -4601,7 +5111,8 @@ msgstr "Obtendo o número de novas mensagens (UIDL)..."
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamanho das mensagens (LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obtendo o tamanho das mensagens (LIST)..."
 

-#: src/inc.c:914 src/send_message.c:490
+#: src/inc.c:914
+#: src/send_message.c:490

 msgid "Quitting"
 msgstr "Saindo"
 
 msgid "Quitting"
 msgstr "Saindo"
 


@@ -4656,7 +5167,9 @@ msgstr "Erro de socket."
 msgid "Socket error on connection to %s:%d."
 msgstr "Erro de socket na conexão com %s:%d."
 
 msgid "Socket error on connection to %s:%d."
 msgstr "Erro de socket na conexão com %s:%d."
 

-#: src/inc.c:1153 src/send_message.c:400 src/send_message.c:637
+#: src/inc.c:1153
+#: src/send_message.c:400
+#: src/send_message.c:637

 msgid "Connection closed by the remote host."
 msgstr "A conexão foi fechada pelo computador remoto."
 
 msgid "Connection closed by the remote host."
 msgstr "A conexão foi fechada pelo computador remoto."
 


@@ -4678,11 +5191,13 @@ msgstr ""
 "A caixa postal está travada:\n"
 "%s"
 
 "A caixa postal está travada:\n"
 "%s"
 

-#: src/inc.c:1171 src/send_message.c:622
+#: src/inc.c:1171
+#: src/send_message.c:622

 msgid "Authentication failed."
 msgstr "Ocorreu uma falha na autenticação."
 
 msgid "Authentication failed."
 msgstr "Ocorreu uma falha na autenticação."
 

-#: src/inc.c:1177 src/send_message.c:625
+#: src/inc.c:1177
+#: src/send_message.c:625

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -4691,7 +5206,8 @@ msgstr ""
 "Ocorreu uma falha na autenticação:\n"
 "%s"
 
 "Ocorreu uma falha na autenticação:\n"
 "%s"
 

-#: src/inc.c:1182 src/send_message.c:641
+#: src/inc.c:1182
+#: src/send_message.c:641

 msgid "Session timed out."
 msgstr "Tempo da sessão esgotado."
 
 msgid "Session timed out."
 msgstr "Tempo da sessão esgotado."
 


@@ -4729,88 +5245,62 @@ msgstr ""
 #: src/main.c:270
 #, c-format
 msgid ""
 #: src/main.c:270
 #, c-format
 msgid ""

-"Configuration for Sylpheed-Claws %s found.\n"
+"Configuration for %s (or previous) found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"Foi encontrada uma configuração para o Sylpheed-Claws %s.\n"
+"Foi encontrada uma configuração para %s.\n"

 "Deseja migrar essa configuração?"
 
 "Deseja migrar essa configuração?"
 

-#: src/main.c:273
-msgid "1.0.5 or previous"
-msgstr "1.0.5 ou anterior"
-
-#: src/main.c:273
-msgid "1.9.15 or previous"
-msgstr "1.9.15 ou anterior"
-
-#: src/main.c:276
+#: src/main.c:274

 msgid "Migration of configuration"
 msgstr "Migração de configuração"
 
 msgid "Migration of configuration"
 msgstr "Migração de configuração"
 

-#: src/main.c:282
+#: src/main.c:280

 msgid "Copying configuration..."
 msgstr "Copiando a configuração..."
 
 msgid "Copying configuration..."
 msgstr "Copiando a configuração..."
 

-#: src/main.c:287
+#: src/main.c:285

 msgid "Migration failed!"
 msgstr "Falha na migração!"
 
 msgid "Migration failed!"
 msgstr "Falha na migração!"
 

-#: src/main.c:529
+#: src/main.c:572

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread não é suportado pela glib.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread não é suportado pela glib.\n"
 

-#: src/main.c:535
-msgid ""
-"Sylpheed-Claws has been compiled with a more recent GTK+ library than is "
-"currently available. This will cause crashes. You need to upgrade GTK+ or "
-"recompile Sylpheed-Claws."
-msgstr ""
-"O Sylpheed-Claws foi compilado com uma biblioteca GTK+ mais recente do que a "
-"disponível atualmente. Isso irá provocar erros. É necessário atualizar a GTK"
-"+ ou recompilar o Sylpheed-Claws."
+#: src/main.c:578
+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 "O Claws Mail foi compilado com uma biblioteca GTK+ mais recente do que a disponível atualmente. Isso irá provocar erros. É necessário atualizar a GTK+ ou recompilar o Claws Mail."

 
 

-#: src/main.c:544
-msgid ""
-"Sylpheed-Claws has been compiled with an older GTK+ library than is "
-"currently available. This will cause crashes. You need to recompile Sylpheed-"
-"Claws."
-msgstr ""
-"O Sylpheed-Claws foi compilado com uma biblioteca GTK+ mais antiga do que a "
-"disponível atualmente. Isso irá provocar erros. É necessário recompilar o "
-"Sylpheed-Claws."
+#: src/main.c:587
+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 "O Claws Mail foi compilado com uma biblioteca GTK+ mais antiga do que a disponível atualmente. Isso irá provocar erros. É necessário recompilar o Claws Mail."

 
 

-#: src/main.c:754
-msgid ""
-"Some plugin(s) failed to load. Check the Plugins configuration for more "
-"information."
-msgstr ""
-"Não foi possível carregar algum(ns) plugin(s). Verifique a configuração dos "
-"plugins para maiores informações."
+#: src/main.c:810
+msgid "Some plugin(s) failed to load. Check the Plugins configuration for more information."
+msgstr "Não foi possível carregar algum(ns) plugin(s). Verifique a configuração dos plugins para maiores informações."

 
 

-#: src/main.c:765
-msgid ""
-"Sylpheed-Claws 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 ""
-"O Sylpheed-Claws detectou uma caixa postal configurada, mas não conseguiu "
-"carregá-la. Ela provavelmente foi fornecida por um plugin externo "
-"desatualizado. Por favor, reinstale o plugin e tente novamente."
+#: src/main.c:822
+msgid "Claws Mail has detected a configured mailbox, but is it incomplete. It is possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the mailbox's folder to try to fix it."
+msgstr "O Claws Mail detectou uma caixa postal configurada, mas ela está incompleta. Isso pode decorrer de uma conta IMAP defeituosa. Use \"Reconstruir a árvore de pastas\" na pasta da caixa postal para tentar consertá-la."
+
+#: src/main.c:828
+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 "O Claws Mail detectou uma caixa postal configurada, mas não conseguiu carregá-la. Ela provavelmente foi fornecida por um plugin externo desatualizado. Por favor, reinstale o plugin e tente novamente."

 
 

-#: src/main.c:1008
+#: src/main.c:1074

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilização: %s [OPÇÕES]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilização: %s [OPÇÕES]...\n"
 

-#: src/main.c:1010
+#: src/main.c:1076

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endereço]   abre a janela de composição de mensagens"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endereço]   abre a janela de composição de mensagens"
 

-#: src/main.c:1011
+#: src/main.c:1077

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      inscrever-se à URI fornecida, caso seja possível"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      inscrever-se à URI fornecida, caso seja possível"
 

-#: src/main.c:1012
+#: src/main.c:1078

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -4820,23 +5310,23 @@ msgstr ""
 "                         abre uma janela de composição com os arquivos\n"
 "                         especificados anexados"
 
 "                         abre uma janela de composição com os arquivos\n"
 "                         especificados anexados"
 

-#: src/main.c:1015
+#: src/main.c:1081

 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensagens"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensagens"
 

-#: src/main.c:1016
+#: src/main.c:1082

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 

-#: src/main.c:1017
+#: src/main.c:1083

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da Fila de Saída"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da Fila de Saída"
 

-#: src/main.c:1018
+#: src/main.c:1084

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...    mostra o número total de mensagens"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...    mostra o número total de mensagens"
 

-#: src/main.c:1019
+#: src/main.c:1085

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -4844,83 +5334,81 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         mostra a situação de cada pasta"
 
 "  --status-full [pasta]...\n"
 "                         mostra a situação de cada pasta"
 

-#: src/main.c:1021
+#: src/main.c:1087

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"

-"                         folder is a folder id like '#mh/Mailbox/inbox'"
+"                         folder is a folder id like 'folder/sub_folder'"

 msgstr ""
 "  --select pasta[/msg]  vai para a pasta/mensagem especificada\n"
 msgstr ""
 "  --select pasta[/msg]  vai para a pasta/mensagem especificada\n"

-"                        pasta é uma id de pasta, como\n"
-"                        '#mh/Caixa de Correio/Caixa de entrada'"
+"                        pasta é uma id de pasta, como 'pasta/sub_pasta'"

 
 

-#: src/main.c:1023
+#: src/main.c:1089

 msgid "  --online               switch to online mode"
 msgstr "  --online               alterna para o modo conectado"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               alterna para o modo conectado"
 

-#: src/main.c:1024
+#: src/main.c:1090

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              alterna para o modo desconectado"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              alterna para o modo desconectado"
 

-#: src/main.c:1025
-msgid "  --exit                 exit Sylpheed-Claws"
-msgstr "  --exit                 sai do Sylpheed-Claws"
+#: src/main.c:1091
+msgid "  --exit                 exit Claws Mail"
+msgstr "  --exit                 sai do Claws Mail"

 
 

-#: src/main.c:1026
+#: src/main.c:1092

 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de debug"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de debug"
 

-#: src/main.c:1027
+#: src/main.c:1093

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 exibe essa tela de ajuda e finaliza"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 exibe essa tela de ajuda e finaliza"
 

-#: src/main.c:1028
+#: src/main.c:1094

 msgid "  --version              output version information and exit"
 msgstr "  --version              exibe a versão do programa e finaliza"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              exibe a versão do programa e finaliza"
 

-#: src/main.c:1029
+#: src/main.c:1095

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           exibe o diretório de configuração"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           exibe o diretório de configuração"
 

-#: src/main.c:1094
+#: src/main.c:1160

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processando (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Processando (%s)..."
 

-#: src/main.c:1097
+#: src/main.c:1163

 msgid "top level folder"
 msgstr "pasta do nível mais acima"
 
 msgid "top level folder"
 msgstr "pasta do nível mais acima"
 

-#: src/main.c:1161
+#: src/main.c:1227

 msgid "Really quit?"
 msgstr "Deseja realmente sair?"
 
 msgid "Really quit?"
 msgstr "Deseja realmente sair?"
 

-#: src/main.c:1162
+#: src/main.c:1228

 msgid "Composing message exists."
 msgstr "Ainda existem mensagens sendo escritas."
 
 msgid "Composing message exists."
 msgstr "Ainda existem mensagens sendo escritas."
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Save to Draft"
 msgstr "_Salvar em Rascunhos"
 
 msgid "_Save to Draft"
 msgstr "_Salvar em Rascunhos"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Discard them"
 msgstr "_Descartá-las"
 
 msgid "_Discard them"
 msgstr "_Descartá-las"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "Do_n't quit"
 msgstr "_Não sair"
 
 msgid "Do_n't quit"
 msgstr "_Não sair"
 

-#: src/main.c:1178
+#: src/main.c:1244

 msgid "Queued messages"
 msgstr "Mensagens na Fila de Saída"
 
 msgid "Queued messages"
 msgstr "Mensagens na Fila de Saída"
 

-#: src/main.c:1179
+#: src/main.c:1245

 msgid "Some unsent messages are queued. Exit now?"
 msgid "Some unsent messages are queued. Exit now?"

-msgstr ""
-"Ainda existem mensagens da Fila de Saída que não foram enviadas. Finalizar "
-"agora?"
+msgstr "Ainda existem mensagens da Fila de Saída que não foram enviadas. Finalizar agora?"

 
 

-#: src/mainwindow.c:496 src/messageview.c:158
+#: src/mainwindow.c:496
+#: src/messageview.c:158

 msgid "/_File"
 msgstr "/_Arquivo"
 
 msgid "/_File"
 msgstr "/_Arquivo"
 


@@ -4932,8 +5420,12 @@ msgstr "/_Arquivo/Adicionar caixa _postal"
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Arquivo/Adicionar caixa _postal/MH..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Arquivo/Adicionar caixa _postal/MH..."
 

-#: src/mainwindow.c:499 src/mainwindow.c:501 src/mainwindow.c:506
-#: src/mainwindow.c:508 src/mainwindow.c:511 src/mainwindow.c:514
+#: src/mainwindow.c:499
+#: src/mainwindow.c:501
+#: src/mainwindow.c:506
+#: src/mainwindow.c:508
+#: src/mainwindow.c:511
+#: src/mainwindow.c:514

 #: src/messageview.c:161
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 #: src/messageview.c:161
 msgid "/_File/---"
 msgstr "/_Arquivo/---"


@@ -4958,11 +5450,13 @@ msgstr "/_Arquivo/Exportar o selecionado para um _arquivo mbox..."
 msgid "/_File/Empty all _Trash folders"
 msgstr "/_Arquivo/Esvaziar todas as _Lixeiras"
 
 msgid "/_File/Empty all _Trash folders"
 msgstr "/_Arquivo/Esvaziar todas as _Lixeiras"
 

-#: src/mainwindow.c:509 src/messageview.c:159
+#: src/mainwindow.c:509
+#: src/messageview.c:159

 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/Salvar _como..."
 
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/Salvar _como..."
 

-#: src/mainwindow.c:510 src/messageview.c:160
+#: src/mainwindow.c:510
+#: src/messageview.c:160

 msgid "/_File/_Print..."
 msgstr "/_Arquivo/_Imprimir..."
 
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/_Imprimir..."
 


@@ -4982,7 +5476,8 @@ msgstr "/_Arquivo/Sai_r"
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Selecionar _agrupamento"
 
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Selecionar _agrupamento"
 

-#: src/mainwindow.c:523 src/messageview.c:168
+#: src/mainwindow.c:523
+#: src/messageview.c:168

 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Localizar na mensagem atual..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Localizar na mensagem atual..."
 


@@ -4994,7 +5489,9 @@ msgstr "/_Editar/_Procurar na pasta..."
 msgid "/_Edit/_Quick search"
 msgstr "/_Editar/Procura _rápida"
 
 msgid "/_Edit/_Quick search"
 msgstr "/_Editar/Procura _rápida"
 

-#: src/mainwindow.c:527 src/messageview.c:171 src/summaryview.c:472
+#: src/mainwindow.c:527
+#: src/messageview.c:171
+#: src/summaryview.c:472

 msgid "/_View"
 msgstr "/E_xibir"
 
 msgid "/_View"
 msgstr "/E_xibir"
 


@@ -5050,8 +5547,12 @@ msgstr "/E_xibir/Definir colu_nas visíveis/na lista de _pastas..."
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/E_xibir/Definir colu_nas visíveis/na lista de _mensagens"
 
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/E_xibir/Definir colu_nas visíveis/na lista de _mensagens"
 

-#: src/mainwindow.c:551 src/mainwindow.c:554 src/mainwindow.c:582
-#: src/mainwindow.c:612 src/mainwindow.c:729 src/mainwindow.c:737
+#: src/mainwindow.c:551
+#: src/mainwindow.c:554
+#: src/mainwindow.c:582
+#: src/mainwindow.c:612
+#: src/mainwindow.c:729
+#: src/mainwindow.c:737

 #: src/messageview.c:277
 msgid "/_View/---"
 msgstr "/E_xibir/---"
 #: src/messageview.c:277
 msgid "/_View/---"
 msgstr "/E_xibir/---"


@@ -5120,7 +5621,8 @@ msgstr "/E_xibir/_Ordenar/pelo tra_vamento"
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/Não _ordenar"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/Não _ordenar"
 

-#: src/mainwindow.c:571 src/mainwindow.c:574
+#: src/mainwindow.c:571
+#: src/mainwindow.c:574

 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 


@@ -5164,8 +5666,12 @@ msgstr "/E_xibir/_Ir para/Mensagem _anterior"
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/_Ir para/_Próxima mensagem"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/_Ir para/_Próxima mensagem"
 

-#: src/mainwindow.c:586 src/mainwindow.c:591 src/mainwindow.c:594
-#: src/mainwindow.c:599 src/mainwindow.c:604 src/mainwindow.c:609
+#: src/mainwindow.c:586
+#: src/mainwindow.c:591
+#: src/mainwindow.c:594
+#: src/mainwindow.c:599
+#: src/mainwindow.c:604
+#: src/mainwindow.c:609

 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/_Ir para/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/_Ir para/---"
 


@@ -5217,176 +5723,221 @@ msgstr "/E_xibir/_Ir para/Próxima pa_sta não lida"
 msgid "/_View/_Go to/_Other folder..."
 msgstr "/E_xibir/_Ir para/_Outra pasta..."
 
 msgid "/_View/_Go to/_Other folder..."
 msgstr "/E_xibir/_Ir para/_Outra pasta..."
 

-#: src/mainwindow.c:615 src/mainwindow.c:622 src/messageview.c:174
+#: src/mainwindow.c:615
+#: src/mainwindow.c:622
+#: src/messageview.c:174

 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação dos caracteres/---"
 
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação dos caracteres/---"
 

-#: src/mainwindow.c:619 src/messageview.c:178
+#: src/mainwindow.c:619
+#: src/messageview.c:178

 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação dos caracteres"
 
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação dos caracteres"
 

-#: src/mainwindow.c:620 src/messageview.c:179
+#: src/mainwindow.c:620
+#: src/messageview.c:179

 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação dos caracteres/_Autodetectar"
 
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação dos caracteres/_Autodetectar"
 

-#: src/mainwindow.c:623 src/messageview.c:182
+#: src/mainwindow.c:623
+#: src/messageview.c:182

 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/E_xibir/_Codificação dos caracteres/ASC_II de 7 bits (US-ASCII)"
 
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/E_xibir/_Codificação dos caracteres/ASC_II de 7 bits (US-ASCII)"
 

-#: src/mainwindow.c:625 src/messageview.c:185
+#: src/mainwindow.c:625
+#: src/messageview.c:185

 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_Codificação dos caracteres/Unicode (UT_F-8)"
 
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_Codificação dos caracteres/Unicode (UT_F-8)"
 

-#: src/mainwindow.c:629 src/messageview.c:188
+#: src/mainwindow.c:629
+#: src/messageview.c:188

 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (ISO-8859-_1)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (ISO-8859-_1)"
 

-#: src/mainwindow.c:631 src/messageview.c:190
+#: src/mainwindow.c:631
+#: src/messageview.c:190

 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (ISO-8859-1_5)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (ISO-8859-1_5)"
 

-#: src/mainwindow.c:633 src/messageview.c:192
+#: src/mainwindow.c:633
+#: src/messageview.c:192

 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (Windows-1252)"
 
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Ocidental (Windows-1252)"
 

-#: src/mainwindow.c:637 src/messageview.c:195
+#: src/mainwindow.c:637
+#: src/messageview.c:195

 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Central (ISO-8859-_2)"
 
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_Codificação dos caracteres/Europeu Central (ISO-8859-_2)"
 

-#: src/mainwindow.c:641 src/messageview.c:198
+#: src/mainwindow.c:641
+#: src/messageview.c:198

 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação dos caracteres/Báltico (ISO-8859-1_3)"
 
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação dos caracteres/Báltico (ISO-8859-1_3)"
 

-#: src/mainwindow.c:643 src/messageview.c:200
+#: src/mainwindow.c:643
+#: src/messageview.c:200

 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação dos caracteres/Báltico (ISO-8859-_4)"
 
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação dos caracteres/Báltico (ISO-8859-_4)"
 

-#: src/mainwindow.c:647 src/messageview.c:203
+#: src/mainwindow.c:647
+#: src/messageview.c:203

 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Grego (ISO-8859-7)"
 
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Grego (ISO-8859-7)"
 

-#: src/mainwindow.c:651 src/messageview.c:206
+#: src/mainwindow.c:651
+#: src/messageview.c:206

 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação dos caracteres/He_bráico (ISO-8859-8)"
 
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação dos caracteres/He_bráico (ISO-8859-8)"
 

-#: src/mainwindow.c:653 src/messageview.c:208
+#: src/mainwindow.c:653
+#: src/messageview.c:208

 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Hebráico (Windows-1255)"
 
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Hebráico (Windows-1255)"
 

-#: src/mainwindow.c:657 src/messageview.c:211
+#: src/mainwindow.c:657
+#: src/messageview.c:211

 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/E_xibir/_Codificação dos caracteres/Árabe (ISO-8859-_6)"
 
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/E_xibir/_Codificação dos caracteres/Árabe (ISO-8859-_6)"
 

-#: src/mainwindow.c:659 src/messageview.c:213
+#: src/mainwindow.c:659
+#: src/messageview.c:213

 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/E_xibir/_Codificação dos caracteres/Árabe (_Windows-1256)"
 
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/E_xibir/_Codificação dos caracteres/Árabe (_Windows-1256)"
 

-#: src/mainwindow.c:663 src/messageview.c:216
+#: src/mainwindow.c:663
+#: src/messageview.c:216

 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação dos caracteres/Turco (ISO-8859-_9)"
 
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação dos caracteres/Turco (ISO-8859-_9)"
 

-#: src/mainwindow.c:667 src/messageview.c:219
+#: src/mainwindow.c:667
+#: src/messageview.c:219

 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Cirílico (ISO-8859-5)"
 
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Cirílico (ISO-8859-5)"
 

-#: src/mainwindow.c:669 src/messageview.c:221
+#: src/mainwindow.c:669
+#: src/messageview.c:221

 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (KOI8-_R)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (KOI8-_R)"
 

-#: src/mainwindow.c:671 src/messageview.c:223
+#: src/mainwindow.c:671
+#: src/messageview.c:223

 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (KOI8-_U)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (KOI8-_U)"
 

-#: src/mainwindow.c:673 src/messageview.c:225
+#: src/mainwindow.c:673
+#: src/messageview.c:225

 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (_Windows-1251)"
 
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação dos caracteres/Cirílico (_Windows-1251)"
 

-#: src/mainwindow.c:677 src/messageview.c:228
+#: src/mainwindow.c:677
+#: src/messageview.c:228

 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Japonês (ISO-2022-JP)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação dos caracteres/_Japonês (ISO-2022-JP)"
 

-#: src/mainwindow.c:679 src/messageview.c:230
+#: src/mainwindow.c:679
+#: src/messageview.c:230

 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (ISO-2022-J_P-2)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (ISO-2022-J_P-2)"
 

-#: src/mainwindow.c:681 src/messageview.c:232
+#: src/mainwindow.c:681
+#: src/messageview.c:232

 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (_EUC-JP)"
 
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (_EUC-JP)"
 

-#: src/mainwindow.c:683 src/messageview.c:234
+#: src/mainwindow.c:683
+#: src/messageview.c:234

 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (_Shift__JIS)"
 
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação dos caracteres/Japonês (_Shift__JIS)"
 

-#: src/mainwindow.c:687 src/messageview.c:237
+#: src/mainwindow.c:687
+#: src/messageview.c:237

 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação dos caracteres/C_hinês simplificado (GB2312)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação dos caracteres/C_hinês simplificado (GB2312)"
 

-#: src/mainwindow.c:689 src/messageview.c:239
+#: src/mainwindow.c:689
+#: src/messageview.c:239

 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação dos caracteres/C_hinês simplificado (GB_K)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação dos caracteres/C_hinês simplificado (GB_K)"
 

-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:691
+#: src/messageview.c:241

 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês tradicional (_Big5)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês tradicional (_Big5)"
 

-#: src/mainwindow.c:693 src/messageview.c:243
+#: src/mainwindow.c:693
+#: src/messageview.c:243

 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês tradicional (EUC-_TW)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês tradicional (EUC-_TW)"
 

-#: src/mainwindow.c:695 src/messageview.c:245
+#: src/mainwindow.c:695
+#: src/messageview.c:245

 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês (ISO-2022-C_N)"
 
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação dos caracteres/Chinês (ISO-2022-C_N)"
 

-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:699
+#: src/messageview.c:248

 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação dos caracteres/Coreano (EUC-_KR)"
 
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação dos caracteres/Coreano (EUC-_KR)"
 

-#: src/mainwindow.c:701 src/messageview.c:250
+#: src/mainwindow.c:701
+#: src/messageview.c:250

 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação dos caracteres/Coreano (ISO-2_022-KR)"
 
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação dos caracteres/Coreano (ISO-2_022-KR)"
 

-#: src/mainwindow.c:705 src/messageview.c:253
+#: src/mainwindow.c:705
+#: src/messageview.c:253

 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação dos caracteres/Thai (TIS-_620)"
 
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação dos caracteres/Thai (TIS-_620)"
 

-#: src/mainwindow.c:707 src/messageview.c:255
+#: src/mainwindow.c:707
+#: src/messageview.c:255

 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação dos caracteres/Thai (Windows-_874)"
 
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação dos caracteres/Thai (Windows-_874)"
 

-#: src/mainwindow.c:714 src/mainwindow.c:720 src/messageview.c:262
+#: src/mainwindow.c:714
+#: src/mainwindow.c:720
+#: src/messageview.c:262

 #: src/messageview.c:268
 msgid "/_View/Decode/---"
 msgstr "/E_xibir/_Decodificação/---"
 
 #: src/messageview.c:268
 msgid "/_View/Decode/---"
 msgstr "/E_xibir/_Decodificação/---"
 

-#: src/mainwindow.c:717 src/messageview.c:265
+#: src/mainwindow.c:717
+#: src/messageview.c:265

 msgid "/_View/Decode"
 msgstr "/E_xibir/_Decodificação"
 
 msgid "/_View/Decode"
 msgstr "/E_xibir/_Decodificação"
 

-#: src/mainwindow.c:718 src/messageview.c:266
+#: src/mainwindow.c:718
+#: src/messageview.c:266

 msgid "/_View/Decode/_Auto detect"
 msgstr "/E_xibir/_Decodificação/_Autodetectar"
 
 msgid "/_View/Decode/_Auto detect"
 msgstr "/E_xibir/_Decodificação/_Autodetectar"
 

-#: src/mainwindow.c:721 src/messageview.c:269
+#: src/mainwindow.c:721
+#: src/messageview.c:269

 msgid "/_View/Decode/_8bit"
 msgstr "/E_xibir/_Decodificação/_8bit"
 
 msgid "/_View/Decode/_8bit"
 msgstr "/E_xibir/_Decodificação/_8bit"
 

-#: src/mainwindow.c:722 src/messageview.c:270
+#: src/mainwindow.c:722
+#: src/messageview.c:270

 msgid "/_View/Decode/_Quoted printable"
 msgstr "/E_xibir/_Decodificar/Imprimível com _citação"
 
 msgid "/_View/Decode/_Quoted printable"
 msgstr "/E_xibir/_Decodificar/Imprimível com _citação"
 

-#: src/mainwindow.c:723 src/messageview.c:271
+#: src/mainwindow.c:723
+#: src/messageview.c:271

 msgid "/_View/Decode/_Base64"
 msgstr "/E_xibir/_Decodificação/_Base64"
 
 msgid "/_View/Decode/_Base64"
 msgstr "/E_xibir/_Decodificação/_Base64"
 

-#: src/mainwindow.c:724 src/messageview.c:272
+#: src/mainwindow.c:724
+#: src/messageview.c:272

 msgid "/_View/Decode/_Uuencode"
 msgstr "/E_xibir/_Decodificação/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/E_xibir/_Decodificação/_Uuencode"
 

-#: src/mainwindow.c:730 src/summaryview.c:473
+#: src/mainwindow.c:730
+#: src/summaryview.c:473

 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma nova _janela"
 
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma nova _janela"
 

-#: src/mainwindow.c:731 src/messageview.c:278
+#: src/mainwindow.c:731
+#: src/messageview.c:278

 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Código-_fonte da mensagem"
 
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Código-_fonte da mensagem"
 


@@ -5394,19 +5945,23 @@ msgstr "/E_xibir/Código-_fonte da mensagem"
 msgid "/_View/All headers"
 msgstr "/E_xibir/Todos os cabeçal_hos"
 
 msgid "/_View/All headers"
 msgstr "/E_xibir/Todos os cabeçal_hos"
 

-#: src/mainwindow.c:733 src/messageview.c:280
+#: src/mainwindow.c:733
+#: src/messageview.c:280

 msgid "/_View/Quotes"
 msgstr "/E_xibir/_Citações"
 
 msgid "/_View/Quotes"
 msgstr "/E_xibir/_Citações"
 

-#: src/mainwindow.c:734 src/messageview.c:281
+#: src/mainwindow.c:734
+#: src/messageview.c:281

 msgid "/_View/Quotes/_Fold all"
 msgstr "/E_xibir/_Citações/Esconder _todas"
 
 msgid "/_View/Quotes/_Fold all"
 msgstr "/E_xibir/_Citações/Esconder _todas"
 

-#: src/mainwindow.c:735 src/messageview.c:282
+#: src/mainwindow.c:735
+#: src/messageview.c:282

 msgid "/_View/Quotes/Fold from level _2"
 msgstr "/E_xibir/_Citações/Esconder a partir do nível _2"
 
 msgid "/_View/Quotes/Fold from level _2"
 msgstr "/E_xibir/_Citações/Esconder a partir do nível _2"
 

-#: src/mainwindow.c:736 src/messageview.c:283
+#: src/mainwindow.c:736
+#: src/messageview.c:283

 msgid "/_View/Quotes/Fold from level _3"
 msgstr "/E_xibir/_Citações/Esconder a partir do nível _3"
 
 msgid "/_View/Quotes/Fold from level _3"
 msgstr "/E_xibir/_Citações/Esconder a partir do nível _3"
 


@@ -5446,7 +6001,8 @@ msgstr "/_Mensagem/Escrever uma mensa_gem de e-mail"
 msgid "/_Message/Compose a news message"
 msgstr "/_Mensagem/Escrever um artigo de _newsgroup"
 
 msgid "/_Message/Compose a news message"
 msgstr "/_Mensagem/Escrever um artigo de _newsgroup"
 

-#: src/mainwindow.c:753 src/messageview.c:289
+#: src/mainwindow.c:753
+#: src/messageview.c:289

 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/Re_sponder"
 
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/Re_sponder"
 


@@ -5454,15 +6010,18 @@ msgstr "/_Mensagem/Re_sponder"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/Responder _para"
 
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/Responder _para"
 

-#: src/mainwindow.c:755 src/messageview.c:290
+#: src/mainwindow.c:755
+#: src/messageview.c:290

 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensagem/Responder _para/_todos"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensagem/Responder _para/_todos"
 

-#: src/mainwindow.c:756 src/messageview.c:292
+#: src/mainwindow.c:756
+#: src/messageview.c:292

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder _para/_remetente"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder _para/_remetente"
 

-#: src/mainwindow.c:757 src/messageview.c:294
+#: src/mainwindow.c:757
+#: src/messageview.c:294

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensagem/Responder _para/_lista de discussão"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensagem/Responder _para/_lista de discussão"
 


@@ -5470,11 +6029,13 @@ msgstr "/_Mensagem/Responder _para/_lista de discussão"
 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Mensagem/_Acompanhar o assunto e responder"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Mensagem/_Acompanhar o assunto e responder"
 

-#: src/mainwindow.c:761 src/messageview.c:297
+#: src/mainwindow.c:761
+#: src/messageview.c:297

 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encamin_har"
 
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encamin_har"
 

-#: src/mainwindow.c:762 src/messageview.c:298
+#: src/mainwindow.c:762
+#: src/messageview.c:298

 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encam_inhar como anexo"
 
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encam_inhar como anexo"
 


@@ -5542,7 +6103,9 @@ msgstr "/_Mensagem/_Marcar/_Marcar"
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensagem/_Marcar/_Desmarcar"
 

-#: src/mainwindow.c:783 src/mainwindow.c:789 src/mainwindow.c:792
+#: src/mainwindow.c:783
+#: src/mainwindow.c:789
+#: src/mainwindow.c:792

 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensagem/_Marcar/---"
 


@@ -5594,7 +6157,8 @@ msgstr "/_Mensagem/Re-edi_tar"
 msgid "/_Tools/_Address book..."
 msgstr "/_Ferramentas/_Livro de endereços..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/_Ferramentas/_Livro de endereços..."
 

-#: src/mainwindow.c:801 src/messageview.c:304
+#: src/mainwindow.c:801
+#: src/messageview.c:304

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar o _remetente ao Livro de Endereços"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Ferramentas/Adicionar o _remetente ao Livro de Endereços"
 


@@ -5618,23 +6182,28 @@ msgstr "/_Ferramentas/Filtrar _todas as mensagens da pasta"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/Filtrar as mensagens _selecionadas"
 
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/Filtrar as mensagens _selecionadas"
 

-#: src/mainwindow.c:813 src/messageview.c:307
+#: src/mainwindow.c:813
+#: src/messageview.c:307

 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/Criar regra de _filtragem"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/Criar regra de _filtragem"
 

-#: src/mainwindow.c:814 src/messageview.c:309
+#: src/mainwindow.c:814
+#: src/messageview.c:309

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/Criar regra de _filtragem/_Automaticamente"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/Criar regra de _filtragem/_Automaticamente"
 

-#: src/mainwindow.c:816 src/messageview.c:311
+#: src/mainwindow.c:816
+#: src/messageview.c:311

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo _remetente (De:)"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo _remetente (De:)"
 

-#: src/mainwindow.c:818 src/messageview.c:313
+#: src/mainwindow.c:818
+#: src/messageview.c:313

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo _destinatário (Para:)"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo _destinatário (Para:)"
 

-#: src/mainwindow.c:820 src/messageview.c:315
+#: src/mainwindow.c:820
+#: src/messageview.c:315

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo a_ssunto"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/Criar regra de _filtragem/Pelo a_ssunto"
 


@@ -5770,24 +6339,29 @@ msgstr "Você está desconectado. Clique no ícone para conectar."
 msgid "Select account"
 msgstr "Selecione a conta"
 
 msgid "Select account"
 msgstr "Selecione a conta"
 

-#: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738
-#: src/mainwindow.c:1774 src/mainwindow.c:1816 src/prefs_folder_item.c:756
+#: src/mainwindow.c:1661
+#: src/mainwindow.c:1702
+#: src/mainwindow.c:1738
+#: src/mainwindow.c:1774
+#: src/mainwindow.c:1817
+#: src/plugins/trayicon/trayicon.c:143
+#: src/prefs_folder_item.c:762

 msgid "Untitled"
 msgstr "Sem título"
 
 msgid "Untitled"
 msgstr "Sem título"
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1818

 msgid "none"
 msgstr "nenhuma"
 
 msgid "none"
 msgstr "nenhuma"
 

-#: src/mainwindow.c:2079
+#: src/mainwindow.c:2080

 msgid "Delete all messages in trash folders?"
 msgstr "Apagar todas as mensagens da Lixeira?"
 
 msgid "Delete all messages in trash folders?"
 msgstr "Apagar todas as mensagens da Lixeira?"
 

-#: src/mainwindow.c:2098
+#: src/mainwindow.c:2099

 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 
 msgid "Add mailbox"
 msgstr "Adicionar caixa de correio"
 

-#: src/mainwindow.c:2099
+#: src/mainwindow.c:2100

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -5797,109 +6371,131 @@ msgstr ""
 "Se for especificada uma já existente, ela será\n"
 "verificada automaticamente."
 
 "Se for especificada uma já existente, ela será\n"
 "verificada automaticamente."
 

-#: src/mainwindow.c:2105
+#: src/mainwindow.c:2106

 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa de correio '%s' já existe."
 
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa de correio '%s' já existe."
 

-#: src/mainwindow.c:2110 src/setup.c:51
+#: src/mainwindow.c:2111
+#: src/setup.c:51

 msgid "Mailbox"
 msgstr "Caixa de correio"
 
 msgid "Mailbox"
 msgstr "Caixa de correio"
 

-#: src/mainwindow.c:2115 src/setup.c:54
+#: src/mainwindow.c:2116
+#: src/setup.c:54

 msgid ""
 "Creation of the mailbox failed.\n"
 msgid ""
 "Creation of the mailbox failed.\n"

-"Maybe some files already exist, or you don't have the permission to write "
-"there."
+"Maybe some files already exist, or you don't have the permission to write there."

 msgstr ""
 "Não foi possível criar a caixa de correio.\n"
 msgstr ""
 "Não foi possível criar a caixa de correio.\n"

-"Talvez já existam arquivos, ou você não possui permissão para escrita nesta "
-"pasta."
+"Talvez já existam arquivos, ou você não possui permissão para escrita nesta pasta."

 
 

-#: src/mainwindow.c:2431
+#: src/mainwindow.c:2432

 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 
 msgid "No posting allowed"
 msgstr "Não é permitido o envio de mensagens"
 

-#: src/mainwindow.c:2696
-msgid "Sylpheed-Claws - Folder View"
-msgstr "Sylpheed-Claws - Visualização de pastas"
+#: src/mainwindow.c:2699
+msgid "Claws Mail - Folder View"
+msgstr "Claws Mail - Visualização de pastas"

 
 

-#: src/mainwindow.c:2732 src/messageview.c:449 src/messageview.c:855
-msgid "Sylpheed-Claws - Message View"
-msgstr "Sylpheed-Claws - Visualização das mensagens"
+#: src/mainwindow.c:2735
+#: src/messageview.c:449
+#: src/messageview.c:855
+msgid "Claws Mail - Message View"
+msgstr "Claws Mail - Visualização das mensagens"

 
 

-#: src/mainwindow.c:3082
+#: src/mainwindow.c:3085

 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 
 msgid "Mbox import has failed."
 msgstr "Não foi possível importar o mbox."
 

-#: src/mainwindow.c:3091 src/mainwindow.c:3100
+#: src/mainwindow.c:3094
+#: src/mainwindow.c:3103

 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 
 msgid "Export to mbox has failed."
 msgstr "Não foi possível exportar para o mbox."
 

-#: src/mainwindow.c:3123 src/plugins/trayicon/trayicon.c:426
+#: src/mainwindow.c:3126
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit"
 msgstr "Sair"
 
 msgid "Exit"
 msgstr "Sair"
 

-#: src/mainwindow.c:3123
-msgid "Exit Sylpheed-Claws?"
-msgstr "Sair do Sylpheed-Claws?"
+#: src/mainwindow.c:3126
+msgid "Exit Claws Mail?"
+msgstr "Sair do Claws Mail?"

 
 

-#: src/mainwindow.c:3269
+#: src/mainwindow.c:3271

 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 
 msgid "Folder synchronisation"
 msgstr "Sincronização das pastas"
 

-#: src/mainwindow.c:3270
+#: src/mainwindow.c:3272

 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Deseja sincronizar suas pastas agora?"
 

-#: src/mainwindow.c:3271
+#: src/mainwindow.c:3273

 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 
 msgid "+_Synchronise"
 msgstr "+_Sincronizar"
 

-#: src/mainwindow.c:3602
+#: src/mainwindow.c:3604

 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 

-#: src/mainwindow.c:3636
+#: src/mainwindow.c:3641

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Foi apagada %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram apagadas %d mensagens duplicadas em %d pastas.\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "Foi apagada %d mensagem duplicada em %d pastas.\n"
 msgstr[1] "Foram apagadas %d mensagens duplicadas em %d pastas.\n"
 

-#: src/mainwindow.c:3795 src/summaryview.c:4775
+#: src/mainwindow.c:3800
+#: src/summaryview.c:4783

 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Regras de processamento a serem aplicadas antes das regras das pastas"
 

-#: src/mainwindow.c:3804
+#: src/mainwindow.c:3809

 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Regras de processamento a serem aplicadas após as regras das pastas"
 

-#: src/mainwindow.c:3813 src/summaryview.c:4786
+#: src/mainwindow.c:3818
+#: src/summaryview.c:4794

 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 
 msgid "Filtering configuration"
 msgstr "Configuração da filtragem"
 

-#: src/mainwindow.c:4067
+#: src/mainwindow.c:4072

 #, c-format
 msgid "not initialized\n"
 msgstr "não inicializado\n"
 
 #, c-format
 msgid "not initialized\n"
 msgstr "não inicializado\n"
 

-#: src/mainwindow.c:4079 src/mainwindow.c:4090
+#: src/mainwindow.c:4084
+#: src/mainwindow.c:4095

 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "selecionando a pasta '%s'\n"
 
 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "selecionando a pasta '%s'\n"
 

-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4099

 #, c-format
 msgid "selecting message %d\n"
 msgstr "selecionando a mensagem %d\n"
 
 #, c-format
 msgid "selecting message %d\n"
 msgstr "selecionando a mensagem %d\n"
 

-#: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
-#: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
+#: src/matcher.c:758
+#: src/matcher.c:891
+#: src/prefs_matcher.c:520
+#: src/prefs_matcher.c:1329
+#: src/prefs_matcher.c:1346
+#: src/prefs_matcher.c:2099
+msgid "Filtering Matcher Menu|All"
+msgstr "Filtering Matcher Menu|Todas"
+
+#: src/matcher.c:1463
+#: src/matcher.c:1464
+#: src/matcher.c:1465
+#: src/matcher.c:1466
+#: src/matcher.c:1467
+#: src/matcher.c:1468
+#: src/matcher.c:1469
+#: src/matcher.c:1470

 msgid "(none)"
 msgstr "(nenhuma)"
 
 msgid "(none)"
 msgstr "(nenhuma)"
 

-#: src/mbox.c:85
+#: src/mbox.c:98

 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 #, c-format
 msgid ""
 "Could not open mbox file:\n"


@@ -5908,25 +6504,27 @@ msgstr ""
 "Não foi possível abrir o arquivo mbox:\n"
 "%s\n"
 
 "Não foi possível abrir o arquivo mbox:\n"
 "%s\n"
 

-#: src/mbox.c:121
+#: src/mbox.c:134

 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Importação da mbox... (%d mensagens importadas)"
 
 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Importação da mbox... (%d mensagens importadas)"
 

-#: src/mbox.c:468
+#: src/mbox.c:481

 msgid "Overwrite mbox file"
 msgstr "Sobrescrever o arquivo mbox"
 
 msgid "Overwrite mbox file"
 msgstr "Sobrescrever o arquivo mbox"
 

-#: src/mbox.c:469
+#: src/mbox.c:482

 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "O arquivo já existe. Deseja sobrescrevê-lo?"
 

-#: src/mbox.c:470 src/messageview.c:1143 src/mimeview.c:1422
-#: src/textview.c:2650
+#: src/mbox.c:483
+#: src/messageview.c:1143
+#: src/mimeview.c:1443
+#: src/textview.c:2654

 msgid "Overwrite"
 msgstr "Sobrescrever"
 
 msgid "Overwrite"
 msgstr "Sobrescrever"
 

-#: src/mbox.c:479
+#: src/mbox.c:492

 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 #, c-format
 msgid ""
 "Could not create mbox file:\n"


@@ -5935,39 +6533,44 @@ msgstr ""
 "Não foi possível criar o arquivo mbox:\n"
 "%s\n"
 
 "Não foi possível criar o arquivo mbox:\n"
 "%s\n"
 

-#: src/mbox.c:483
+#: src/mbox.c:500

 msgid "Exporting to mbox..."
 msgstr "Exportação para a mbox..."
 
 msgid "Exporting to mbox..."
 msgstr "Exportação para a mbox..."
 

-#: src/message_search.c:162
+#: src/message_search.c:169

 msgid "Find in current message"
 msgstr "Localizar na mensagem atual"
 
 msgid "Find in current message"
 msgstr "Localizar na mensagem atual"
 

-#: src/message_search.c:180
+#: src/message_search.c:187

 msgid "Find text:"
 msgstr "Localizar texto:"
 
 msgid "Find text:"
 msgstr "Localizar texto:"
 

-#: src/message_search.c:195 src/prefs_matcher.c:649 src/summary_search.c:324
+#: src/message_search.c:210
+#: src/prefs_matcher.c:649
+#: src/summary_search.c:392

 msgid "Case sensitive"
 msgstr "Diferenciar maiúsc./minúsc."
 
 msgid "Case sensitive"
 msgstr "Diferenciar maiúsc./minúsc."
 

-#: src/message_search.c:301 src/summary_search.c:535
+#: src/message_search.c:323
+#: src/summary_search.c:637

 msgid "Search failed"
 msgstr "Ocorreu um erro na procura"
 
 msgid "Search failed"
 msgstr "Ocorreu um erro na procura"
 

-#: src/message_search.c:302 src/summary_search.c:536
+#: src/message_search.c:324
+#: src/summary_search.c:638

 msgid "Search string not found."
 msgstr "A seqüência procurada não foi localizada."
 
 msgid "Search string not found."
 msgstr "A seqüência procurada não foi localizada."
 

-#: src/message_search.c:311
+#: src/message_search.c:333

 msgid "Beginning of message reached; continue from end?"
 msgstr "Foi atingido o início da mensagem; continuar a partir do final?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "Foi atingido o início da mensagem; continuar a partir do final?"
 

-#: src/message_search.c:314
+#: src/message_search.c:336

 msgid "End of message reached; continue from beginning?"
 msgstr "Foi atingido o fim da mensagem; continuar a partir do início?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Foi atingido o fim da mensagem; continuar a partir do início?"
 

-#: src/message_search.c:317 src/summary_search.c:547
+#: src/message_search.c:339
+#: src/summary_search.c:649

 msgid "Search finished"
 msgstr "Procura concluída"
 
 msgid "Search finished"
 msgstr "Procura concluída"
 


@@ -6026,7 +6629,8 @@ msgstr ""
 "Return-path: %s\n"
 "Não é aconselhável enviar a confirmação."
 
 "Return-path: %s\n"
 "Não é aconselhável enviar a confirmação."
 

-#: src/messageview.c:579 src/messageview.c:596
+#: src/messageview.c:579
+#: src/messageview.c:596

 msgid "_Don't Send"
 msgstr "_Não enviar"
 
 msgid "_Don't Send"
 msgstr "_Não enviar"
 


@@ -6042,13 +6646,17 @@ msgstr ""
 "oficialmente endereçada à você.\n"
 "Não é aconselhável enviar a confirmação de recebimento."
 
 "oficialmente endereçada à você.\n"
 "Não é aconselhável enviar a confirmação de recebimento."
 

-#: src/messageview.c:809 src/procmime.c:873
+#: src/messageview.c:809
+#: src/procmime.c:873

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Não foi possível descriptografar: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Não foi possível descriptografar: %s"
 

-#: src/messageview.c:1138 src/mimeview.c:1560 src/summaryview.c:4065
-#: src/summaryview.c:4068 src/textview.c:2638
+#: src/messageview.c:1138
+#: src/mimeview.c:1582
+#: src/summaryview.c:4065
+#: src/summaryview.c:4068
+#: src/textview.c:2642

 msgid "Save as"
 msgstr "Salvar como"
 
 msgid "Save as"
 msgstr "Salvar como"
 


@@ -6056,7 +6664,9 @@ msgstr "Salvar como"
 msgid "Overwrite existing file?"
 msgstr "Sobrescrever o arquivo existente?"
 
 msgid "Overwrite existing file?"
 msgstr "Sobrescrever o arquivo existente?"
 

-#: src/messageview.c:1152 src/summaryview.c:4085 src/summaryview.c:4088
+#: src/messageview.c:1152
+#: src/summaryview.c:4085
+#: src/summaryview.c:4088

 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."
 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."


@@ -6091,11 +6701,13 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente.;\n"
 "ela é %s."
 
 "Essa mensagem foi recebida parcialmente.;\n"
 "ela é %s."
 

-#: src/messageview.c:1291 src/messageview.c:1313
+#: src/messageview.c:1291
+#: src/messageview.c:1313

 msgid "Mark for download"
 msgstr "Marcar para receber"
 
 msgid "Mark for download"
 msgstr "Marcar para receber"
 

-#: src/messageview.c:1292 src/messageview.c:1304
+#: src/messageview.c:1292
+#: src/messageview.c:1304

 msgid "Mark for deletion"
 msgstr "Marcar para exclusão"
 
 msgid "Mark for deletion"
 msgstr "Marcar para exclusão"
 


@@ -6108,7 +6720,8 @@ msgstr ""
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será baixada."
 
 "Essa mensagem foi recebida parcialmente;\n"
 "ela é %s e será baixada."
 

-#: src/messageview.c:1302 src/messageview.c:1315
+#: src/messageview.c:1302
+#: src/messageview.c:1315

 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Desmarcar"
 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Desmarcar"


@@ -6129,12 +6742,10 @@ msgstr "Confirmação de recebimento"
 #: src/messageview.c:1385
 msgid ""
 "The message was sent to several of your accounts.\n"
 #: src/messageview.c:1385
 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:"
+"Please choose which account do you want to use for sending the receipt notification:"

 msgstr ""
 "A mensagem foi enviada para várias de suas contas de email.\n"
 msgstr ""
 "A mensagem foi enviada para várias de suas contas de email.\n"

-"Por favor, selecione qual a conta que você deseja utilizar para enviar a "
-"confirmação:"
+"Por favor, selecione qual a conta que você deseja utilizar para enviar a confirmação:"

 
 #: src/messageview.c:1389
 msgid "_Send Notification"
 
 #: src/messageview.c:1389
 msgid "_Send Notification"


@@ -6148,7 +6759,8 @@ msgstr "+_Cancelar"
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Não foi possível imprimir: a mensagem não contém texto."
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Não foi possível imprimir: a mensagem não contém texto."
 

-#: src/messageview.c:1503 src/summaryview.c:4125
+#: src/messageview.c:1520
+#: src/summaryview.c:4125

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6157,7 +6769,8 @@ msgstr ""
 "Digite o comando de impressão:\n"
 "('%s' será substituído pelo nome do arquivo)"
 
 "Digite o comando de impressão:\n"
 "('%s' será substituído pelo nome do arquivo)"
 

-#: src/messageview.c:1509 src/summaryview.c:4131
+#: src/messageview.c:1526
+#: src/summaryview.c:4131

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6166,8 +6779,10 @@ msgstr ""
 "O comando de impressão é inválido:\n"
 "'%s'"
 
 "O comando de impressão é inválido:\n"
 "'%s'"
 

-#: src/messageview.c:1775 src/messageview.c:1781 src/summaryview.c:3521
-#: src/summaryview.c:5527
+#: src/messageview.c:1796
+#: src/messageview.c:1802
+#: src/summaryview.c:3521
+#: src/summaryview.c:5540

 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "Ocorreu um erro durante a aprendizagem.\n"
 


@@ -6184,11 +6799,11 @@ msgstr "Movendo as mensagens..."
 msgid "Deleting messages..."
 msgstr "Excluindo mensagens..."
 
 msgid "Deleting messages..."
 msgstr "Excluindo mensagens..."
 

-#: src/mh_gtk.c:59
+#: src/mh_gtk.c:62

 msgid "/Remove _mailbox..."
 msgstr "/Remover _caixa postal..."
 
 msgid "/Remove _mailbox..."
 msgstr "/Remover _caixa postal..."
 

-#: src/mh_gtk.c:323
+#: src/mh_gtk.c:324

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"


@@ -6197,11 +6812,11 @@ msgstr ""
 "Deseja realmente excluir a caixa postal (mailbox) '%s'?\n"
 "(As mensagens NÃO SERÃO apagadas do disco)"
 
 "Deseja realmente excluir a caixa postal (mailbox) '%s'?\n"
 "(As mensagens NÃO SERÃO apagadas do disco)"
 

-#: src/mh_gtk.c:325
+#: src/mh_gtk.c:326

 msgid "Remove mailbox"
 msgstr "Remover a caixa postal"
 
 msgid "Remove mailbox"
 msgstr "Remover a caixa postal"
 

-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:327

 msgid "_Remove"
 msgstr "_Remover"
 
 msgid "_Remove"
 msgstr "_Remover"
 


@@ -6217,7 +6832,8 @@ msgstr "/Abrir _com..."
 msgid "/_Display as text"
 msgstr "/_Exibir como texto"
 
 msgid "/_Display as text"
 msgstr "/_Exibir como texto"
 

-#: src/mimeview.c:171 src/summaryview.c:478
+#: src/mimeview.c:171
+#: src/summaryview.c:478

 msgid "/_Save as..."
 msgstr "/_Salvar como..."
 
 msgid "/_Save as..."
 msgstr "/_Salvar como..."
 


@@ -6229,60 +6845,68 @@ msgstr "/Salvar _todos..."
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
 msgid "MIME Type"
 msgstr "Tipo MIME"
 

-#: src/mimeview.c:721
+#: src/mimeview.c:742

 msgid "Check signature"
 msgstr "Verificar assinatura"
 
 msgid "Check signature"
 msgstr "Verificar assinatura"
 

-#: src/mimeview.c:726 src/mimeview.c:731 src/mimeview.c:736
+#: src/mimeview.c:747
+#: src/mimeview.c:752
+#: src/mimeview.c:757

 msgid "View full information"
 msgstr "Exibir informações completas"
 
 msgid "View full information"
 msgstr "Exibir informações completas"
 

-#: src/mimeview.c:741 src/mimeview.c:745
+#: src/mimeview.c:762
+#: src/mimeview.c:766

 msgid "Check again"
 msgstr "Verificar novamente"
 
 msgid "Check again"
 msgstr "Verificar novamente"
 

-#: src/mimeview.c:754
+#: src/mimeview.c:775

 msgid "Click the icon or hit 'C' to check it."
 msgstr "Clique no ícone ou pressione 'C' para verificá-la."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Clique no ícone ou pressione 'C' para verificá-la."
 

-#: src/mimeview.c:759
+#: src/mimeview.c:780

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."

-msgstr ""
-"Tempo esgotado durate a checagem da assinatura. Clique no ícone ou pressione "
-"'C' para tentar novamente."
+msgstr "Tempo esgotado durate a checagem da assinatura. Clique no ícone ou pressione 'C' para tentar novamente."

 
 

-#: src/mimeview.c:969
+#: src/mimeview.c:990

 msgid "Checking signature..."
 msgstr "Verificando a assinatura..."
 
 msgid "Checking signature..."
 msgstr "Verificando a assinatura..."
 

-#: src/mimeview.c:1011
+#: src/mimeview.c:1032

 msgid "Go back to email"
 msgstr "Voltar à mensagem"
 
 msgid "Go back to email"
 msgstr "Voltar à mensagem"
 

-#: src/mimeview.c:1349 src/mimeview.c:1430 src/mimeview.c:1606
-#: src/mimeview.c:1639
+#: src/mimeview.c:1370
+#: src/mimeview.c:1451
+#: src/mimeview.c:1628
+#: src/mimeview.c:1661

 msgid "Couldn't save the part of multipart message."
 msgstr "Não foi possível salvar uma das partes da mensagem com múltiplas partes."
 
 msgid "Couldn't save the part of multipart message."
 msgstr "Não foi possível salvar uma das partes da mensagem com múltiplas partes."
 

-#: src/mimeview.c:1419 src/textview.c:2648
+#: src/mimeview.c:1440
+#: src/textview.c:2652

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobrescrever o arquivo %s existente?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Sobrescrever o arquivo %s existente?"
 

-#: src/mimeview.c:1457
+#: src/mimeview.c:1478

 msgid "Select destination folder"
 msgstr "Selecione a pasta de destino"
 
 msgid "Select destination folder"
 msgstr "Selecione a pasta de destino"
 

-#: src/mimeview.c:1464
+#: src/mimeview.c:1485

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' não é um diretório."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' não é um diretório."
 

-#: src/mimeview.c:1685 src/mimeview.c:1693 src/textview.c:2579
+#: src/mimeview.c:1707
+#: src/mimeview.c:1715
+#: src/textview.c:2583

 msgid "Open with"
 msgstr "Abrir com"
 
 msgid "Open with"
 msgstr "Abrir com"
 

-#: src/mimeview.c:1686 src/mimeview.c:1694 src/textview.c:2580
+#: src/mimeview.c:1708
+#: src/mimeview.c:1716
+#: src/textview.c:2584

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6297,10 +6921,8 @@ msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "criando conexão NNTP com %s:%d...\n"
 
 #: src/news.c:328
 msgstr "criando conexão NNTP com %s:%d...\n"
 
 #: src/news.c:328

-msgid "Sylpheed-Claws needs network access in order to access the News server."
-msgstr ""
-"O Sylpheed-Claws necessita de acesso à rede para se conectar ao servidor de "
-"News."
+msgid "Claws Mail needs network access in order to access the News server."
+msgstr "O Claws Mail necessita de acesso à rede para se conectar ao servidor de News."

 
 #: src/news.c:345
 #, c-format
 
 #: src/news.c:345
 #, c-format


@@ -6345,24 +6967,33 @@ msgstr "ocorreu um erro ao obter %s.\n"
 msgid "getting xover %d in %s...\n"
 msgstr "obtendo xover %d em %s...\n"
 
 msgid "getting xover %d in %s...\n"
 msgstr "obtendo xover %d em %s...\n"
 

-#: src/news.c:962 src/news.c:1056
+#: src/news.c:962
+#: src/news.c:1056

 msgid "couldn't get xover\n"
 msgstr "não foi possível obter xover\n"
 
 msgid "couldn't get xover\n"
 msgstr "não foi possível obter xover\n"
 

-#: src/news.c:972 src/news.c:1068
+#: src/news.c:972
+#: src/news.c:1068

 msgid "error occurred while getting xover.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 

-#: src/news.c:979 src/news.c:1082
+#: src/news.c:979
+#: src/news.c:1082

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linha xover inválida: %s\n"
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linha xover inválida: %s\n"
 

-#: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133
+#: src/news.c:997
+#: src/news.c:1018
+#: src/news.c:1101
+#: src/news.c:1133

 msgid "couldn't get xhdr\n"
 msgstr "não foi possível obter xhdr\n"
 
 msgid "couldn't get xhdr\n"
 msgstr "não foi possível obter xhdr\n"
 

-#: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146
+#: src/news.c:1007
+#: src/news.c:1028
+#: src/news.c:1114
+#: src/news.c:1146

 msgid "error occurred while getting xhdr.\n"
 msgstr "ocorreu um erro ao obter xhdr.\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocorreu um erro ao obter xhdr.\n"
 


@@ -6392,51 +7023,34 @@ msgstr "Desinscrever do newsgroup"
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 

-#: src/plugins/clamav/clamav_plugin.c:118
+#: src/plugins/clamav/clamav_plugin.c:43
+#: src/plugins/clamav/clamav_plugin_gtk.c:212
+msgid "Clam AntiVirus"
+msgstr "Clam AntiVirus"
+
+#: src/plugins/clamav/clamav_plugin.c:120

 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: verificando a messagem..."
 
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: verificando a messagem..."
 

-#: src/plugins/clamav/clamav_plugin.c:198
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the ClamAV plugin "
-"was built with"
-msgstr ""
-"A sua versão do Sylpheed-Claws é mais recente do que aquela utilizada para "
-"construir o plugin do ClamAV"
-
-#: src/plugins/clamav/clamav_plugin.c:203
-msgid "Your version of Sylpheed-Claws is too old for the ClamAV plugin"
-msgstr "A sua versão do Sylpheed-Claws é muito antiga para o plugin do ClamAV"
-
-#: src/plugins/clamav/clamav_plugin.c:209
+#: src/plugins/clamav/clamav_plugin.c:205

 msgid "Failed to register mail filtering hook"
 msgstr "Não foi possível registrar o gancho de filtragem da mensagem"
 
 msgid "Failed to register mail filtering hook"
 msgstr "Não foi possível registrar o gancho de filtragem da mensagem"
 

-#: src/plugins/clamav/clamav_plugin.c:252
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr "Clam AntiVirus"
-
-#: src/plugins/clamav/clamav_plugin.c:257
+#: src/plugins/clamav/clamav_plugin.c:253

 msgid ""
 msgid ""

-"This plugin uses Clam AntiVirus to scan all messages that are received from "
-"an IMAP, LOCAL or POP account.\n"
+"This plugin uses Clam AntiVirus to scan all messages that are received from an IMAP, LOCAL or POP account.\n"

 "\n"
 "\n"

-"When a message attachment is found to contain a virus it can be deleted or "
-"saved in a specially designated folder.\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"
 msgstr ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
 msgstr ""

-"Esse plugin utiliza o Clam AntiVirus para escanear todas as mensagens "
-"recebidas de uma conta IMAP, LOCAL ou POP.\n"
+"Esse plugin utiliza o Clam AntiVirus para escanear todas as mensagens recebidas de uma conta IMAP, LOCAL ou POP.\n"

 "\n"
 "\n"

-"Quando um anexo contendo um vírus é encontrado, ele pode ser apagado ou "
-"salvo em uma pasta própria.\n"
+"Quando um anexo contendo um vírus é encontrado, ele pode ser apagado ou salvo em uma pasta própria.\n"

 "\n"
 "\n"

-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/Clam "
-"AntiVirus"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/Clam AntiVirus"

 
 

-#: src/plugins/clamav/clamav_plugin.c:284
+#: src/plugins/clamav/clamav_plugin.c:280

 msgid "Virus detection"
 msgstr "Detecção de vírus"
 
 msgid "Virus detection"
 msgstr "Detecção de vírus"
 


@@ -6470,46 +7084,28 @@ msgstr "Salvar mensagens que contenham vírus"
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:142
 msgid "Folder for storing infected mail. Leave empty to use the default trash folder"
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:142
 msgid "Folder for storing infected mail. Leave empty to use the default trash folder"

-msgstr ""
-"Pasta para armazenar as mensgens infectadas. Deixe em branco para utilizar a "
-"pasta padrão da Lixeira"
+msgstr "Pasta para armazenar as mensgens infectadas. Deixe em branco para utilizar a pasta padrão da Lixeira"

 
 #: src/plugins/clamav/clamav_plugin_gtk.c:150
 msgid "Click this button to select a folder for storing infected mail"
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:150
 msgid "Click this button to select a folder for storing infected mail"

-msgstr ""
-"Clique nesse botão para selecionar uma pasta para armazenar as mensagens "
-"infectadas"
-
-#: src/plugins/demo/demo.c:45
-msgid ""
-"Your sylpheed-claws version is newer than the version the plugin was built "
-"with"
-msgstr ""
-"A sua versão do Sylpheed-Claws é mais recente do que aquela utilizada para "
-"construir o plugin"
+msgstr "Clique nesse botão para selecionar uma pasta para armazenar as mensagens infectadas"

 
 

-#: src/plugins/demo/demo.c:50
-msgid "Your sylpheed-claws version is too old"
-msgstr "A sua versão do Sylpheed-Claws é muito antiga"
+#: src/plugins/demo/demo.c:31
+#: src/plugins/demo/demo.c:99
+msgid "Demo"
+msgstr "Demonstração"

 
 

-#: src/plugins/demo/demo.c:56
+#: src/plugins/demo/demo.c:52

 msgid "Failed to register log text hook"
 msgstr "Não foi possível registrar o gancho de relatório"
 
 msgid "Failed to register log text hook"
 msgstr "Não foi possível registrar o gancho de relatório"
 

-#: src/plugins/demo/demo.c:74 src/plugins/demo/demo.c:103
-msgid "Demo"
-msgstr "Demonstração"
-
-#: src/plugins/demo/demo.c:79
+#: src/plugins/demo/demo.c:75

 msgid ""
 msgid ""

-"This Plugin is only a demo of how to write plugins for Sylpheed-Claws. It "
-"installs a hook for new log output and writes it to stdout.\n"
+"This Plugin is only a demo of how to write plugins for Claws Mail. It installs a hook for new log output and writes it to stdout.\n"

 "\n"
 "\n"

-"It is not really useful"
+"It is not really useful."

 msgstr ""
 msgstr ""

-"Esse plugin é somente uma demonstração de como escrever plugins para o "
-"Sylpheed-Claws. Ele instala um gancho para uma saída nova de relatório e a "
-"escreve na stdout.\n"
+"Esse plugin é somente uma demonstração de como escrever plugins para o Claws Mail. Ele instala um gancho para uma saída nova de relatório e a escreve na stdout.\n"

 "\n"
 "Ele definitivamente não é muito útil."
 
 "\n"
 "Ele definitivamente não é muito útil."
 


@@ -6537,23 +7133,11 @@ msgstr "Modo de tela inteira (esconde os controles)"
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Equivalente à opção '--fullwindow' do Dillo"
 
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Equivalente à opção '--fullwindow' do Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:169
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Dillo plugin "
-"was built with"
-msgstr ""
-"A sua versão do Sylpheed-Claws é mais recente do que aquela utilizada para "
-"construir o plugin do Dillo"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:174
-msgid "Your version of Sylpheed-Claws is too old for the Dillo plugin"
-msgstr "A sua versão do Sylpheed-Claws é muito antiga para o plugin do Dillo"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:194
+#: src/plugins/dillo_viewer/dillo_viewer.c:39

 msgid "Dillo HTML Viewer"
 msgstr "Visualizador HTML Dillo"
 
 msgid "Dillo HTML Viewer"
 msgstr "Visualizador HTML Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:199
+#: src/plugins/dillo_viewer/dillo_viewer.c:195

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -6561,14 +7145,14 @@ msgid ""
 msgstr ""
 "Esse plugin renderiza mensagens em HTML usando o navegador web Dillo.\n"
 "\n"
 msgstr ""
 "Esse plugin renderiza mensagens em HTML usando o navegador web Dillo.\n"
 "\n"

-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
-"Navegador Dillo"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/Navegador Dillo"

 
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:223
+#: src/plugins/dillo_viewer/dillo_viewer.c:219

 msgid "text/html"
 msgstr "texto/html"
 
 msgid "text/html"
 msgstr "texto/html"
 

-#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:97
+#: src/plugins/pgpcore/passphrase.c:97
+#: src/plugins/pgpcore/prefs_gpg.c:97

 msgid "Passphrase"
 msgstr "Frase-senha"
 
 msgid "Passphrase"
 msgstr "Frase-senha"
 


@@ -6579,13 +7163,11 @@ msgstr "[sem id do usuário]"
 #: src/plugins/pgpcore/passphrase.c:274
 #, c-format
 msgid ""
 #: src/plugins/pgpcore/passphrase.c:274
 #, c-format
 msgid ""

-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
-"new key:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the new key:</span>\n"

 "\n"
 "%.*s\n"
 msgstr ""
 "\n"
 "%.*s\n"
 msgstr ""

-"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para a "
-"nova chave:</span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para a nova chave:</span>\n"

 "\n"
 "%.*s\n"
 
 "\n"
 "%.*s\n"
 


@@ -6596,26 +7178,22 @@ msgstr "As senhas não conferem.\n"
 #: src/plugins/pgpcore/passphrase.c:280
 #, c-format
 msgid ""
 #: src/plugins/pgpcore/passphrase.c:280
 #, c-format
 msgid ""

-"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
-"new key:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the new key:</span>\n"

 "\n"
 "%.*s\n"
 msgstr ""
 "\n"
 "%.*s\n"
 msgstr ""

-"<span weight=\"bold\" size=\"larger\">Por favor, digite novamente a senha "
-"para a nova chave:</span>\n"
+"<span weight=\"bold\" size=\"larger\">Por favor, digite novamente a senha para a nova chave:</span>\n"

 "\n"
 "%.*s\n"
 
 #: src/plugins/pgpcore/passphrase.c:284
 #, c-format
 msgid ""
 "\n"
 "%.*s\n"
 
 #: src/plugins/pgpcore/passphrase.c:284
 #, c-format
 msgid ""

-"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</span>\n"

 "\n"
 "%.*s\n"
 msgstr ""
 "\n"
 "%.*s\n"
 msgstr ""

-"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para:</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">%sPor favor, digite a senha para:</span>\n"

 "\n"
 "%.*s\n"
 
 "\n"
 "%.*s\n"
 


@@ -6639,7 +7217,8 @@ msgstr "Expira após"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Se for definida como '0', a senha será armazenada durante toda a sessão"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Se for definida como '0', a senha será armazenada durante toda a sessão"
 

-#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:131
+#: src/prefs_receive.c:165

 msgid "minute(s)"
 msgstr "minuto(s)"
 
 msgid "minute(s)"
 msgstr "minuto(s)"
 


@@ -6686,9 +7265,7 @@ msgstr "GPG"
 #: src/plugins/pgpcore/select-keys.c:107
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 #: src/plugins/pgpcore/select-keys.c:107
 #, c-format
 msgid "No exact match for '%s'; please select the key."

-msgstr ""
-"Não foi encontrada nenhuma equivalência para '%s'; por favor, selecione a "
-"chave."
+msgstr "Não foi encontrada nenhuma equivalência para '%s'; por favor, selecione a chave."

 
 #: src/plugins/pgpcore/select-keys.c:110
 #, c-format
 
 #: src/plugins/pgpcore/select-keys.c:110
 #, c-format


@@ -6711,7 +7288,8 @@ msgstr "Val"
 msgid "Select"
 msgstr "Selecionar"
 
 msgid "Select"
 msgstr "Selecionar"
 

-#: src/plugins/pgpcore/select-keys.c:400 src/prefs_other.c:278
+#: src/plugins/pgpcore/select-keys.c:400
+#: src/prefs_other.c:278

 msgid "Other"
 msgstr "Outro"
 
 msgid "Other"
 msgstr "Outro"
 


@@ -6744,153 +7322,158 @@ msgstr ""
 msgid "Trust key"
 msgstr "Chave confiável"
 
 msgid "Trust key"
 msgstr "Chave confiável"
 

-#: src/plugins/pgpcore/sgpgme.c:134
+#: src/plugins/pgpcore/sgpgme.c:76
+#: src/privacy.c:211
+#: src/privacy.c:215
+#: src/privacy.c:232
+#: src/privacy.c:236
+msgid "No signature found"
+msgstr "Não foi encontrada nenhuma assinatura"
+
+#: src/plugins/pgpcore/sgpgme.c:138

 msgid "Undefined"
 msgstr "Indefinido"
 
 msgid "Undefined"
 msgstr "Indefinido"
 

-#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:140
+#: src/prefs_receive.c:193

 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Nunca"
 
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Nunca"
 

-#: src/plugins/pgpcore/sgpgme.c:138
+#: src/plugins/pgpcore/sgpgme.c:142

 msgid "Marginal"
 msgstr "Marginal"
 
 msgid "Marginal"
 msgstr "Marginal"
 

-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/sgpgme.c:146

 msgid "Ultimate"
 msgstr "Máximo"
 
 msgid "Ultimate"
 msgstr "Máximo"
 

-#: src/plugins/pgpcore/sgpgme.c:176
+#: src/plugins/pgpcore/sgpgme.c:180

 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Não foi possível chegar a assinatura - %s"
 
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Não foi possível chegar a assinatura - %s"
 

-#: src/plugins/pgpcore/sgpgme.c:180 src/plugins/pgpcore/sgpgme.c:184
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:184
+#: src/plugins/pgpcore/sgpgme.c:188
+#: src/plugins/pgpcore/sgpgme.c:235

 msgid "The signature has not been checked."
 msgstr "A assinatura não foi checada."
 
 msgid "The signature has not been checked."
 msgstr "A assinatura não foi checada."
 

-#: src/plugins/pgpcore/sgpgme.c:190 src/plugins/pgpcore/sgpgme.c:192
+#: src/plugins/pgpcore/sgpgme.c:194
+#: src/plugins/pgpcore/sgpgme.c:196

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "Núcleo PGP: Não foi possível obter a chave - nenhum gpg-agent em execução."
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "Núcleo PGP: Não foi possível obter a chave - nenhum gpg-agent em execução."
 

-#: src/plugins/pgpcore/sgpgme.c:205
+#: src/plugins/pgpcore/sgpgme.c:209

 #, c-format
 msgid "Good signature from %s."
 msgstr "A assinatura de %s é válida."
 
 #, c-format
 msgid "Good signature from %s."
 msgstr "A assinatura de %s é válida."
 

-#: src/plugins/pgpcore/sgpgme.c:211
+#: src/plugins/pgpcore/sgpgme.c:215

 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Assinatura válida (não confiável) de %s."
 
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Assinatura válida (não confiável) de %s."
 

-#: src/plugins/pgpcore/sgpgme.c:216
+#: src/plugins/pgpcore/sgpgme.c:220

 #, c-format
 msgid "Expired signature from %s."
 msgstr "A assinatura de %s expirou."
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr "A assinatura de %s expirou."
 

-#: src/plugins/pgpcore/sgpgme.c:219
+#: src/plugins/pgpcore/sgpgme.c:223

 #, c-format
 msgid "Expired key from %s."
 msgstr "A chave de %s expirou."
 
 #, c-format
 msgid "Expired key from %s."
 msgstr "A chave de %s expirou."
 

-#: src/plugins/pgpcore/sgpgme.c:222
+#: src/plugins/pgpcore/sgpgme.c:226

 #, c-format
 msgid "Bad signature from %s."
 msgstr "A assinatura de %s é inválida."
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr "A assinatura de %s é inválida."
 

-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:230

 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "A chave 0x%s para verificar essa assinatura não está disponível."
 
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "A chave 0x%s para verificar essa assinatura não está disponível."
 

-#: src/plugins/pgpcore/sgpgme.c:268
+#: src/plugins/pgpcore/sgpgme.c:272

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Assinatura feita usando %s ID da chave %s\n"
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Assinatura feita usando %s ID da chave %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:279

 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "A assinatura de \"%s\" é válida. (Confiança: %s)\n"
 
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "A assinatura de \"%s\" é válida. (Confiança: %s)\n"
 

-#: src/plugins/pgpcore/sgpgme.c:280
+#: src/plugins/pgpcore/sgpgme.c:284

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "A assinatura de \"%s\" expirou\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "A assinatura de \"%s\" expirou\n"
 

-#: src/plugins/pgpcore/sgpgme.c:285
+#: src/plugins/pgpcore/sgpgme.c:289

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "A assinatura de \"%s\" é INVÁLIDA\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "A assinatura de \"%s\" é INVÁLIDA\n"
 

-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:300

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                também conhecido como \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                também conhecido como \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:306

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Fingeprint primário da chave: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Fingeprint primário da chave: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:311

 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVISO: O endereço \"%s\" do signatário não equivale à entrada DNS\n"
 
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "AVISO: O endereço \"%s\" do signatário não equivale à entrada DNS\n"
 

-#: src/plugins/pgpcore/sgpgme.c:313
+#: src/plugins/pgpcore/sgpgme.c:317

 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "O endereço verificado do signatário é \"%s\"\n"
 
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "O endereço verificado do signatário é \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:355
+#: src/plugins/pgpcore/sgpgme.c:359

 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Não foi possível obter nenhum dado da mensagem, %s"
 
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Não foi possível obter nenhum dado da mensagem, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:375

 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Não foi possível inicializar os dados, %s"
 
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Não foi possível inicializar os dados, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:487
+#: src/plugins/pgpcore/sgpgme.c:491

 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Chave secreta não encontrada (%s)"
 
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Chave secreta não encontrada (%s)"
 

-#: src/plugins/pgpcore/sgpgme.c:495
+#: src/plugins/pgpcore/sgpgme.c:499

 msgid "Secret key specification is ambiguous"
 msgstr "A especificação da chave secreta é ambígua"
 
 msgid "Secret key specification is ambiguous"
 msgstr "A especificação da chave secreta é ambígua"
 

-#: src/plugins/pgpcore/sgpgme.c:505
+#: src/plugins/pgpcore/sgpgme.c:509

 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Ocorreu um erro ao configurar a chave secreta: %s"
 
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Ocorreu um erro ao configurar a chave secreta: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:541
+#: src/plugins/pgpcore/sgpgme.c:545

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."

-msgstr ""
-"O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s' não foi instalado "
-"corretamente."
+msgstr "O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s' não foi instalado corretamente."

 
 

-#: src/plugins/pgpcore/sgpgme.c:547
+#: src/plugins/pgpcore/sgpgme.c:551

 #, c-format
 #, c-format

-msgid ""
-"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
-"version %s is required.\n"
-msgstr ""
-"O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s', versão %s está "
-"instalado, mas é necessária a versão %s.\n"
+msgid "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but version %s is required.\n"
+msgstr "O protocolo Gpgme '%s' está inutilizável: o mecanismo '%s', versão %s está instalado, mas é necessária a versão %s.\n"

 
 

-#: src/plugins/pgpcore/sgpgme.c:555
+#: src/plugins/pgpcore/sgpgme.c:559

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "O protocolo Gpgme '%s' está inutilizável (problema desconhecido)"
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "O protocolo Gpgme '%s' está inutilizável (problema desconhecido)"
 

-#: src/plugins/pgpcore/sgpgme.c:571
+#: src/plugins/pgpcore/sgpgme.c:575

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -6898,47 +7481,37 @@ msgstr ""
 "O GnuPG não está instalado adequadamente, ou precisa ser atualizado.\n"
 "O suporte ao OpenPGP estará desativado."
 
 "O GnuPG não está instalado adequadamente, ou precisa ser atualizado.\n"
 "O suporte ao OpenPGP estará desativado."
 

-#: src/plugins/pgpcore/sgpgme.c:605
-msgid ""
-"You have to save the account's information with \"OK\" before being able to "
-"generate a key pair.\n"
-msgstr ""
-"Para conseguir gerar o par de chaves, é necessário, primeiro, salvar as "
-"informações da conta, pressionando o \"Ok\".\n"
+#: src/plugins/pgpcore/sgpgme.c:609
+msgid "You have to save the account's information with \"OK\" before being able to generate a key pair.\n"
+msgstr "Para conseguir gerar o par de chaves, é necessário, primeiro, salvar as informações da conta, pressionando o \"Ok\".\n"

 
 

-#: src/plugins/pgpcore/sgpgme.c:610
+#: src/plugins/pgpcore/sgpgme.c:614

 msgid "No PGP key found"
 msgstr "Não foi encontrada nenhuma chave PGP"
 
 msgid "No PGP key found"
 msgstr "Não foi encontrada nenhuma chave PGP"
 

-#: src/plugins/pgpcore/sgpgme.c:611
+#: src/plugins/pgpcore/sgpgme.c:615

 msgid ""
 msgid ""

-"Sylpheed-Claws did not find a secret PGP key, which means that you won't be "
-"able to sign emails or receive encrypted emails.\n"
+"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 ""
 "Do you want to create a new key pair now?"
 msgstr ""

-"O Sylpheed-Claws não encontrou nenhuma chave PGP secreta, o que significa "
-"que você não poderá assinar suas mensagens ou receber e-mails "
-"criptografados.\n"
+"O Claws Mail não encontrou nenhuma chave PGP secreta, o que significa que você não poderá assinar suas mensagens ou receber e-mails criptografados.\n"

 "Deseja criar um novo par de chaves agora?"
 
 "Deseja criar um novo par de chaves agora?"
 

-#: src/plugins/pgpcore/sgpgme.c:681 src/plugins/pgpcore/sgpgme.c:697
+#: src/plugins/pgpcore/sgpgme.c:685
+#: src/plugins/pgpcore/sgpgme.c:701

 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Não foi possível gerar o novo par de chaves: %s"
 
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Não foi possível gerar o novo par de chaves: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:688
-msgid ""
-"Generating your new key pair... Please move the mouse around to help "
-"generate entropy..."
-msgstr ""
-"Gerando seu novo par de chaves... Por favor, movimente o mouse "
-"aleatoriamente para ajudar a gerar entropia..."
+#: src/plugins/pgpcore/sgpgme.c:692
+msgid "Generating your new key pair... Please move the mouse around to help generate entropy..."
+msgstr "Gerando seu novo par de chaves... Por favor, movimente o mouse aleatoriamente para ajudar a gerar entropia..."

 
 

-#: src/plugins/pgpcore/sgpgme.c:703
+#: src/plugins/pgpcore/sgpgme.c:707

 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Não foi possível gerar o novo par de chaves: erro desconhecido"
 
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Não foi possível gerar o novo par de chaves: erro desconhecido"
 

-#: src/plugins/pgpcore/sgpgme.c:707
+#: src/plugins/pgpcore/sgpgme.c:711

 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"


@@ -6951,61 +7524,45 @@ msgstr ""
 "\n"
 "Deseja exportá-lo para um servidor de chaves?"
 
 "\n"
 "Deseja exportá-lo para um servidor de chaves?"
 

-#: src/plugins/pgpcore/sgpgme.c:711
+#: src/plugins/pgpcore/sgpgme.c:715

 msgid "Key generated"
 msgstr "Chaves geradas"
 
 msgid "Key generated"
 msgstr "Chaves geradas"
 

-#: src/plugins/pgpcore/sgpgme.c:750
+#: src/plugins/pgpcore/sgpgme.c:754

 msgid "Key exported."
 msgstr "Chaves exportadas."
 
 msgid "Key exported."
 msgstr "Chaves exportadas."
 

-#: src/plugins/pgpcore/sgpgme.c:752
+#: src/plugins/pgpcore/sgpgme.c:756

 msgid "Couldn't export key."
 msgstr "Não foi possível exportar as chaves."
 
 msgid "Couldn't export key."
 msgstr "Não foi possível exportar as chaves."
 

-#: src/plugins/pgpcore/sgpgme.c:756
+#: src/plugins/pgpcore/sgpgme.c:760

 msgid "Key export isn't implemented in Windows."
 msgstr "A exportação de chaves não está implementada no Windows."
 
 msgid "Key export isn't implemented in Windows."
 msgstr "A exportação de chaves não está implementada no Windows."
 

-#: src/plugins/pgpcore/plugin.c:38
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin "
-"was built with"
-msgstr ""
-"A sua versão do Sylpheed-Claws é mais recente do que aquela utilizada para "
-"construir o plugin do PGP/Core"
-
-#: src/plugins/pgpcore/plugin.c:43
-msgid "Your version of Sylpheed-Claws is too old for the PGP/Core plugin"
-msgstr "A sua versão do Sylpheed-Claws é muito antiga para o plugin do PGP/Core"
-
-#: src/plugins/pgpcore/plugin.c:63
+#: src/plugins/pgpcore/plugin.c:35

 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 

-#: src/plugins/pgpcore/plugin.c:68
+#: src/plugins/pgpcore/plugin.c:64

 msgid ""
 msgid ""

-"This plugin handles PGP core operations, it is used by other plugins, like "
-"PGP/Mime.\n"
+"This plugin handles PGP core operations, it is used by other plugins, like PGP/Mime.\n"

 "\n"
 "\n"

-"Options can be found in /Configuration/Preferences/Plugins/GPG and /"
-"Configuration/[Account Preferences]/Plugins/GPG\n"
+"Options can be found in /Configuration/Preferences/Plugins/GPG and /Configuration/[Account Preferences]/Plugins/GPG\n"

 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""

-"Esse plugin gerencia as operações básicas do PGP e é usado por outros "
-"plugins, como o PGP/Mime.\n"
+"Esse plugin gerencia as operações básicas do PGP e é usado por outros plugins, como o PGP/Mime.\n"

 "\n"
 "\n"

-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/GPG "
-"e /Configurações/[Preferências da conta]/Plugins/GPG\n"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/GPG e /Configurações/[Preferências da conta]/Plugins/GPG\n"

 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpcore/plugin.c:97
+#: src/plugins/pgpcore/plugin.c:93

 msgid "Core operations"
 msgstr "Operações do núcleo"
 
 msgid "Core operations"
 msgstr "Operações do núcleo"
 


@@ -7014,14 +7571,11 @@ msgid "Key import"
 msgstr "Importação de chaves"
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgstr "Importação de chaves"
 
 #: src/plugins/pgpcore/pgp_viewer.c:119

-msgid ""
-"This key is not in your keyring. Do you want Sylpheed-Claws to try and "
-"import it from a keyserver?"
-msgstr ""
-"Essa chave não está no seu chaveiro. Deseja que o Sylpheed-Claws a verifique "
-"e importe de um servidor de chaves?"
+msgid "This key is not in your keyring. Do you want Claws Mail to try and import it from a keyserver?"
+msgstr "Essa chave não está no seu chaveiro. Deseja que o Claws Mail verifique-a e importe-a de um servidor de chaves?"

 
 

-#: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
+#: src/plugins/pgpcore/pgp_viewer.c:126
+#: src/plugins/pgpcore/pgp_viewer.c:193

 msgid ""
 "\n"
 "  Key ID "
 msgid ""
 "\n"
 "  Key ID "


@@ -7029,7 +7583,8 @@ msgstr ""
 "\n"
 "  ID da chave "
 
 "\n"
 "  ID da chave "
 

-#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:186
+#: src/plugins/pgpcore/pgp_viewer.c:129
+#: src/plugins/pgpcore/pgp_viewer.c:186

 msgid "   This key is not in your keyring.\n"
 msgstr "   Essa chave não está no seu chaveiro.\n"
 
 msgid "   This key is not in your keyring.\n"
 msgstr "   Essa chave não está no seu chaveiro.\n"
 


@@ -7089,274 +7644,220 @@ msgstr "   A importação de chaves não está implementada no Windows.\n"
 msgid "   This key is in your keyring.\n"
 msgstr "   Essa chave está no seu chaveiro.\n"
 
 msgid "   This key is in your keyring.\n"
 msgstr "   Essa chave está no seu chaveiro.\n"
 

-#: src/plugins/pgpinline/pgpinline.c:237 src/plugins/pgpinline/pgpinline.c:385
+#: src/plugins/pgpinline/pgpinline.c:241
+#: src/plugins/pgpinline/pgpinline.c:393

 msgid "Couldn't get text data."
 msgstr "Não foi possível obter os dados do texto."
 
 msgid "Couldn't get text data."
 msgstr "Não foi possível obter os dados do texto."
 

-#: src/plugins/pgpinline/pgpinline.c:255
+#: src/plugins/pgpinline/pgpinline.c:259

 msgid "Couldn't convert text data to any sane charset."
 msgid "Couldn't convert text data to any sane charset."

-msgstr ""
-"Não foi possível converter os dados de texto para nenhum caractere "
-"apropriado."
+msgstr "Não foi possível converter os dados de texto para nenhum caractere apropriado."
+
+#: src/plugins/pgpinline/pgpinline.c:267
+#: src/plugins/pgpinline/pgpinline.c:523
+#: src/plugins/pgpinline/pgpinline.c:644
+#: src/plugins/pgpinline/pgpinline.c:691
+#: src/plugins/pgpmime/pgpmime.c:72
+#: src/plugins/pgpmime/pgpmime.c:181
+#: src/plugins/pgpmime/pgpmime.c:320
+#: src/plugins/pgpmime/pgpmime.c:468
+#: src/plugins/pgpmime/pgpmime.c:593
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "Não foi possível inicializar o contexto GPG, %s"

 
 

-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:386

 msgid "Couldn't parse mime part."
 msgstr "Não foi possível traduzir a parte mime."
 
 msgid "Couldn't parse mime part."
 msgstr "Não foi possível traduzir a parte mime."
 

-#: src/plugins/pgpinline/pgpinline.c:408 src/plugins/pgpmime/pgpmime.c:333
+#: src/plugins/pgpinline/pgpinline.c:416
+#: src/plugins/pgpmime/pgpmime.c:343

 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Não foi possível abrir o arquivo descriptografado %s"
 
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Não foi possível abrir o arquivo descriptografado %s"
 

-#: src/plugins/pgpinline/pgpinline.c:438
+#: src/plugins/pgpinline/pgpinline.c:446

 msgid "Couldn't scan decrypted file."
 msgstr "Não foi possível examinar o arquivo descriptografado."
 
 msgid "Couldn't scan decrypted file."
 msgstr "Não foi possível examinar o arquivo descriptografado."
 

-#: src/plugins/pgpinline/pgpinline.c:446
+#: src/plugins/pgpinline/pgpinline.c:454

 msgid "Couldn't scan decrypted file parts."
 msgstr "Não foi possível examinar as partes do arquivo descriptografado."
 
 msgid "Couldn't scan decrypted file parts."
 msgstr "Não foi possível examinar as partes do arquivo descriptografado."
 

-#: src/plugins/pgpinline/pgpinline.c:500
+#: src/plugins/pgpinline/pgpinline.c:508

 msgid "Couldn't create temporary file."
 msgstr "Não foi possível criar o arquivo temporário."
 
 msgid "Couldn't create temporary file."
 msgstr "Não foi possível criar o arquivo temporário."
 

-#: src/plugins/pgpinline/pgpinline.c:534 src/plugins/pgpmime/pgpmime.c:480
+#: src/plugins/pgpinline/pgpinline.c:546
+#: src/plugins/pgpmime/pgpmime.c:494

 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Erro na assinatura dos dados, %s"
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Erro na assinatura dos dados, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:552 src/plugins/pgpmime/pgpmime.c:505
+#: src/plugins/pgpinline/pgpinline.c:564
+#: src/plugins/pgpmime/pgpmime.c:519

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Erro na assinatura dos dados devido a um assinante ser inválido: %s"
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Erro na assinatura dos dados devido a um assinante ser inválido: %s"
 

-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:514
+#: src/plugins/pgpinline/pgpinline.c:573
+#: src/plugins/pgpmime/pgpmime.c:528

 msgid "Data signing failed, no results."
 msgstr "Erro na assinatura dos dados, sem resultados."
 
 msgid "Data signing failed, no results."
 msgstr "Erro na assinatura dos dados, sem resultados."
 

-#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:526
+#: src/plugins/pgpinline/pgpinline.c:583
+#: src/plugins/pgpmime/pgpmime.c:539

 msgid "Data signing failed, no contents."
 msgstr "Erro na assinatura dos dados, sem conteúdo."
 
 msgid "Data signing failed, no contents."
 msgstr "Erro na assinatura dos dados, sem conteúdo."
 

-#: src/plugins/pgpinline/pgpinline.c:637 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:653
+#: src/plugins/pgpmime/pgpmime.c:602

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Não foi possível adicionar a chave GPG %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Não foi possível adicionar a chave GPG %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpmime/pgpmime.c:612
+#: src/plugins/pgpinline/pgpinline.c:674
+#: src/plugins/pgpmime/pgpmime.c:630

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Não foi possível criar o arquivo temporário, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Não foi possível criar o arquivo temporário, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:683 src/plugins/pgpmime/pgpmime.c:638
+#: src/plugins/pgpinline/pgpinline.c:702
+#: src/plugins/pgpmime/pgpmime.c:655

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falha na criptografia, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Falha na criptografia, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:746
+#: src/plugins/pgpinline/pgpinline.c:767

 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 

-#: src/plugins/pgpinline/plugin.c:36
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/inline "
-"plugin was built with"
-msgstr ""
-"A sua versão do Sylpheed-Claws é mais recente do que aquela utilizada para "
-"construir o plugin do PGP/Inline"
-
-#: src/plugins/pgpinline/plugin.c:41
-msgid "Your version of Sylpheed-Claws is too old for the PGP/inline plugin"
-msgstr "A sua versão do Sylpheed-Claws é muito antiga para o plugin do PGP/Inline"
-
-#: src/plugins/pgpinline/plugin.c:57
+#: src/plugins/pgpinline/plugin.c:33

 msgid "PGP/inline"
 msgstr "PGP/inline"
 
 msgid "PGP/inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:62
+#: src/plugins/pgpinline/plugin.c:58

 msgid ""
 msgid ""

-"This plugin handles the deprecated Inline method of signing and/or "
-"encrypting mails. You can decrypt mails, verify signatures or sign and "
-"encrypt your own mails.\n"
+"This plugin handles the deprecated Inline method of signing and/or encrypting mails. You can decrypt mails, verify signatures or sign and encrypt your own mails.\n"

 "\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"
+"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"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""

-"Esse plugin manipula o ultrapassado método inline de assinatura e/ou "
-"criptografia de mensagens. Você pode descriptografar mensagens, verificar "
-"assinaturas ou assinar e criptografar suas próprias mensagens.\n"
+"Esse plugin manipula o ultrapassado método inline de assinatura e/ou criptografia de mensagens. Você pode descriptografar mensagens, verificar assinaturas ou assinar e criptografar suas próprias mensagens.\n"

 "\n"
 "\n"

-"Ele pode ser selecionado como Sistema de Privacidade Padrão em /"
-"Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
-"em /Opções/Privacidade/Sistema\n"
+"Ele pode ser selecionado como Sistema de Privacidade Padrão em /Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem em /Opções/Privacidade/Sistema\n"

 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/plugin.c:35
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin "
-"was built with"
-msgstr ""
-"A sua versão do Sylpheed-Claws é mais recente do que aquela utilizada para "
-"construir o plugin do PGP/MIME"
-
-#: src/plugins/pgpmime/plugin.c:40
-msgid "Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"
-msgstr "A sua versão do Sylpheed-Claws é muito antiga para o plugin do PGP/MIME"
-
-#: src/plugins/pgpmime/plugin.c:56
+#: src/plugins/pgpmime/plugin.c:33

 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:61
+#: src/plugins/pgpmime/plugin.c:58

 msgid ""
 msgid ""

-"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
-"mails, verify signatures or sign and encrypt your own mails.\n"
+"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt mails, verify signatures or sign and encrypt your own mails.\n"

 "\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"
+"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"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 "\n"
 "The plugin uses the GPGME library as a wrapper for GnuPG.\n"
 "\n"
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""

-"Esse plugin manipula mensagens assinadas e/ou criptografadas com PGP/MIME. "
-"Você pode descriptografar mensagens, verificar assinaturas ou assinar e "
-"criptografar suas próprias mensagens.\n"
+"Esse plugin manipula mensagens assinadas e/ou criptografadas com PGP/MIME. Você pode descriptografar mensagens, verificar assinaturas ou assinar e criptografar suas próprias mensagens.\n"

 "\n"
 "\n"

-"Ele pode ser selecionado como o Sistema de Privacidade Padrão em /"
-"Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem "
-"em /Opções/Privacidade/Sistema\n"
+"Ele pode ser selecionado como o Sistema de Privacidade Padrão em /Configurações/[Preferências da conta]/Privacidade e ao escrever uma mensagem em /Opções/Privacidade/Sistema\n"

 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "O plugin usa a biblioteca GPGME como invólucro para o GnuPG.\n"
 "\n"
 "GPGME possui copyright 2001 por Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/pgpmime.c:192
+#: src/plugins/pgpmime/pgpmime.c:201

 msgid "Signature boundary not found."
 msgstr "Não foi localizado o limite da assinatura."
 
 msgid "Signature boundary not found."
 msgstr "Não foi localizado o limite da assinatura."
 

-#: src/plugins/pgpmime/pgpmime.c:310
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "Não foi possível inicializar o contexto GPG, %s"
-
-#: src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpmime/pgpmime.c:362

 msgid "Couldn't parse decrypted file."
 msgstr "Não foi possível traduzir o arquivo descriptografado."
 
 msgid "Couldn't parse decrypted file."
 msgstr "Não foi possível traduzir o arquivo descriptografado."
 

-#: src/plugins/pgpmime/pgpmime.c:358
+#: src/plugins/pgpmime/pgpmime.c:368

 msgid "Couldn't parse decrypted file parts."
 msgstr "Não foi possível traduzir as partes do arquivo descriptografado."
 
 msgid "Couldn't parse decrypted file parts."
 msgstr "Não foi possível traduzir as partes do arquivo descriptografado."
 

-#: src/plugins/pgpmime/pgpmime.c:404 src/plugins/pgpmime/pgpmime.c:443
+#: src/plugins/pgpmime/pgpmime.c:414
+#: src/plugins/pgpmime/pgpmime.c:453

 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Não foi possível criar o arquivo temporário: %s"
 
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Não foi possível criar o arquivo temporário: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:704
+#: src/plugins/pgpmime/pgpmime.c:723

 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 
 msgid "PGP/Mime"
 msgstr "PGP/MIME"
 

-#: src/plugins/spamassassin/spamassassin.c:159
+#: src/plugins/spamassassin/spamassassin.c:75
+#: src/plugins/spamassassin/spamassassin_gtk.c:549
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: src/plugins/spamassassin/spamassassin.c:161

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "O plugin SpamAssassin não conseguiu conectar-se ao spamd.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "O plugin SpamAssassin não conseguiu conectar-se ao spamd.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:175
+#: src/plugins/spamassassin/spamassassin.c:177

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "O plugin SpamAssassin não conseguiu efetuar a filtragem.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "O plugin SpamAssassin não conseguiu efetuar a filtragem.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:201
+#: src/plugins/spamassassin/spamassassin.c:203

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "O plugin SpamAssassin está desabilitado por suas preferências.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "O plugin SpamAssassin está desabilitado por suas preferências.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:206
+#: src/plugins/spamassassin/spamassassin.c:208

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrando as mensagens..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrando as mensagens..."
 

-#: src/plugins/spamassassin/spamassassin.c:275
-msgid ""
-"The SpamAssassin plugin couldn't filter a message. The probable cause of the "
-"error is an unreachable spamd daemon. Please make sure spamd is running and "
-"accessible."
-msgstr ""
-"O plugin SpamAssassin não conseguiu filtrar uma mensagem. A causa provável "
-"desse erro é um servidor spamd inalcançável. Por favor, certifique-se de que "
-"o spamd está em execução e acessível."
-
-#: src/plugins/spamassassin/spamassassin.c:334
-msgid ""
-"Sylpheed-Claws needs network access in order to feed this mail(s) to the "
-"remote learner."
-msgstr ""
-"O Sylpheed-Claws necessita de acesso à rede para enviar essa(s) mensagem(ns) "
-"ao servidor de aprendizado remoto."
-
-#: src/plugins/spamassassin/spamassassin.c:469
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the SpamAssassin "
-"plugin was built with"
-msgstr ""
-"A sua versão do Sylpheed-Claws é mais recente do que aquela utilizada para "
-"construir o plugin do SpamAssassin"
+#: src/plugins/spamassassin/spamassassin.c:277
+msgid "The SpamAssassin plugin couldn't filter a message. The probable cause of the error is an unreachable spamd daemon. Please make sure spamd is running and accessible."
+msgstr "O plugin SpamAssassin não conseguiu filtrar uma mensagem. A causa provável desse erro é um servidor spamd inalcançável. Por favor, certifique-se de que o spamd está em execução e acessível."

 
 

-#: src/plugins/spamassassin/spamassassin.c:474
-msgid "Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"
-msgstr "A sua versão do Sylpheed-Claws é muito antiga para o plugin do SpamAssassin"
+#: src/plugins/spamassassin/spamassassin.c:336
+msgid "Claws Mail needs network access in order to feed this mail(s) to the remote learner."
+msgstr "O Claws Mail necessita de acesso à rede para enviar essa(s) mensagem(ns) ao servidor de aprendizado remoto."

 
 

-#: src/plugins/spamassassin/spamassassin.c:483
+#: src/plugins/spamassassin/spamassassin.c:479

 msgid "Failed to get username"
 msgstr "Não foi possível obter o nome de usuário"
 
 msgid "Failed to get username"
 msgstr "Não foi possível obter o nome de usuário"
 

-#: src/plugins/spamassassin/spamassassin.c:495
-msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
-msgstr ""
-"O plugin SpamAssassin foi carregado, mas está desabilitado por suas "
-"preferências.\n"
-
-#: src/plugins/spamassassin/spamassassin.c:523
-#: src/plugins/spamassassin/spamassassin_gtk.c:549
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
+#: src/plugins/spamassassin/spamassassin.c:491
+msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
+msgstr "O plugin SpamAssassin foi carregado, mas está desabilitado por suas preferências.\n"

 
 

-#: src/plugins/spamassassin/spamassassin.c:528
+#: src/plugins/spamassassin/spamassassin.c:524

 msgid ""
 msgid ""

-"This plugin can check all messages that are received from an IMAP, LOCAL or "
-"POP account for spam using a SpamAssassin server. You will need a "
-"SpamAssassin Server (spamd) running somewhere.\n"
+"This plugin can check all messages that are received from an IMAP, LOCAL or POP account for spam using a SpamAssassin server. You will need a SpamAssassin Server (spamd) running somewhere.\n"

 "\n"
 "It can also be used for marking messages as Ham or Spam.\n"
 "\n"
 "\n"
 "It can also be used for marking messages as Ham or Spam.\n"
 "\n"

-"When a message is identified as spam it can be deleted or saved in a "
-"specially designated folder.\n"
+"When a message is identified as spam it can be deleted or saved in a specially designated folder.\n"

 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 "\n"
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""

-"Esse plugin procura por spams em todas as mensagens recebidas de uma conta "
-"IMAP, LOCAL ou POP, usando um servidor SpamAssassin. É necessário um "
-"servidor SpamAssassin (spamd) funcionando em algum lugar.\n"
+"Esse plugin procura por spams em todas as mensagens recebidas de uma conta IMAP, LOCAL ou POP, usando um servidor SpamAssassin. É necessário um servidor SpamAssassin (spamd) funcionando em algum lugar.\n"

 "\n"
 "Ele também pode ser usado para marcar as mensagens como spam ou não.\n"
 "\n"
 "\n"
 "Ele também pode ser usado para marcar as mensagens como spam ou não.\n"
 "\n"

-"Quando uma mensagem é identificada como spam, ela pode ser apagada ou salva "
-"em uma pasta especial.\n"
+"Quando uma mensagem é identificada como spam, ela pode ser apagada ou salva em uma pasta especial.\n"

 "\n"
 "\n"

-"As opções podem ser encontradas em /Configurações/Preferências/Plugins/"
-"SpamAssassin"
+"As opções podem ser encontradas em /Configurações/Preferências/Plugins/SpamAssassin"

 
 

-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:555

 msgid "Spam detection"
 msgstr "Detecção de spam"
 
 msgid "Spam detection"
 msgstr "Detecção de spam"
 

-#: src/plugins/spamassassin/spamassassin.c:560
+#: src/plugins/spamassassin/spamassassin.c:556

 msgid "Spam learning"
 msgstr "Aprendizado de spam"
 
 msgid "Spam learning"
 msgstr "Aprendizado de spam"
 


@@ -7421,12 +7922,12 @@ msgid "kB"
 msgstr "Kb"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:354
 msgstr "Kb"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:354

-msgid ""
-"Maximum time allowed for checking. If the check takes longer it will be "
-"aborted."
+msgid "Maximum time allowed for checking. If the check takes longer it will be aborted."

 msgstr "Duração máxima da checagem. Se ela durar mais que isso, será cancelada."
 
 msgstr "Duração máxima da checagem. Se ela durar mais que isso, será cancelada."
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
+#: src/plugins/spamassassin/spamassassin_gtk.c:359
+#: src/prefs_other.c:194
+#: src/prefs_summaries.c:900

 msgid "seconds"
 msgstr "segundos"
 
 msgid "seconds"
 msgstr "segundos"
 


@@ -7439,94 +7940,79 @@ msgid "Save spam in"
 msgstr "Salvar spam em"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:384
 msgstr "Salvar spam em"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:384

-msgid ""
-"Folder for storing identified spam. Leave empty to use the default trash "
-"folder"
-msgstr ""
-"Pasta a ser utilizada para armazenar os spams identificados. Deixe em branco "
-"para utilizar a pasta padrão da Lixeira"
+msgid "Folder for storing identified spam. Leave empty to use the default trash folder"
+msgstr "Pasta a ser utilizada para armazenar os spams identificados. Deixe em branco para utilizar a pasta padrão da Lixeira"

 
 #: src/plugins/spamassassin/spamassassin_gtk.c:391
 msgid "Click this button to select a folder for storing spam"
 msgstr "Clique nesse botão para selecionar uma pasta para armazenar os spams."
 
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:391
 msgid "Click this button to select a folder for storing spam"
 msgstr "Clique nesse botão para selecionar uma pasta para armazenar os spams."
 

-#: src/plugins/trayicon/trayicon.c:101
+#: src/plugins/trayicon/trayicon.c:59
+#: src/plugins/trayicon/trayicon.c:497
+msgid "Trayicon"
+msgstr "Trayicon"
+
+#: src/plugins/trayicon/trayicon.c:106

 msgid "/_Get Mail"
 msgstr "/_Receber mensagens"
 
 msgid "/_Get Mail"
 msgstr "/_Receber mensagens"
 

-#: src/plugins/trayicon/trayicon.c:103
+#: src/plugins/trayicon/trayicon.c:108

 msgid "/_Email"
 msgstr "/_E-mail"
 
 msgid "/_Email"
 msgstr "/_E-mail"
 

-#: src/plugins/trayicon/trayicon.c:104
+#: src/plugins/trayicon/trayicon.c:109
+msgid "/_Email from account"
+msgstr "/E-mail da _conta"
+
+#: src/plugins/trayicon/trayicon.c:111

 msgid "/Open A_ddressbook"
 msgstr "/Abrir _Livro de Endereços"
 
 msgid "/Open A_ddressbook"
 msgstr "/Abrir _Livro de Endereços"
 

-#: src/plugins/trayicon/trayicon.c:106
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Work Offline"
 msgstr "/Trabalhar _desconectado"
 
 msgid "/_Work Offline"
 msgstr "/Trabalhar _desconectado"
 

-#: src/plugins/trayicon/trayicon.c:108
-msgid "/E_xit Sylpheed-Claws"
-msgstr "/_Sair do Sylpheed-Claws"
+#: src/plugins/trayicon/trayicon.c:115
+msgid "/E_xit Claws Mail"
+msgstr "/_Sair do Claws Mail"

 
 

-#: src/plugins/trayicon/trayicon.c:162
+#: src/plugins/trayicon/trayicon.c:204

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "%d nova(s), %d não lida(s), %d no total"
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "%d nova(s), %d não lida(s), %d no total"
 

-#: src/plugins/trayicon/trayicon.c:236
+#: src/plugins/trayicon/trayicon.c:278

 msgid "/Work Offline"
 msgstr "/Trabalhar desconectado"
 
 msgid "/Work Offline"
 msgstr "/Trabalhar desconectado"
 

-#: src/plugins/trayicon/trayicon.c:239
+#: src/plugins/trayicon/trayicon.c:281

 msgid "/Get Mail"
 msgstr "/Receber mensagens"
 
 msgid "/Get Mail"
 msgstr "/Receber mensagens"
 

-#: src/plugins/trayicon/trayicon.c:315
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Trayicon plugin "
-"was built with"
-msgstr ""
-"A sua versão do Sylpheed-Claws é mais recente do que aquela utilizada para "
-"construir o plugin do Trayicon"
-
-#: src/plugins/trayicon/trayicon.c:320
-msgid "Your version of Sylpheed-Claws is too old for the Trayicon plugin"
-msgstr "A sua versão do Sylpheed-Claws é muito antiga para o plugin do Trayicon"
-
-#: src/plugins/trayicon/trayicon.c:326
+#: src/plugins/trayicon/trayicon.c:361

 msgid "Failed to register folder item update hook"
 msgstr "Não foi possível registrar o gancho de atualização de itens da pasta"
 
 msgid "Failed to register folder item update hook"
 msgstr "Não foi possível registrar o gancho de atualização de itens da pasta"
 

-#: src/plugins/trayicon/trayicon.c:332
+#: src/plugins/trayicon/trayicon.c:367

 msgid "Failed to register folder update hook"
 msgstr "Não foi possível registrar o gancho de atualização da pasta"
 
 msgid "Failed to register folder update hook"
 msgstr "Não foi possível registrar o gancho de atualização da pasta"
 

-#: src/plugins/trayicon/trayicon.c:338
+#: src/plugins/trayicon/trayicon.c:373
+#: src/plugins/trayicon/trayicon.c:379

 msgid "Failed to register offline switch hook"
 msgstr "Não foi possível registrar o gancho de desconexão"
 
 msgid "Failed to register offline switch hook"
 msgstr "Não foi possível registrar o gancho de desconexão"
 

-#: src/plugins/trayicon/trayicon.c:367 src/plugins/trayicon/trayicon.c:449
-msgid "Trayicon"
-msgstr "Trayicon"
-
-#: src/plugins/trayicon/trayicon.c:372
+#: src/plugins/trayicon/trayicon.c:415

 msgid ""
 msgid ""

-"This plugin places a mailbox icon in the system tray that indicates if you "
-"have new or unread mail.\n"
+"This plugin places a mailbox icon in the system tray that indicates if you have new or unread mail.\n"

 "\n"
 "\n"

-"The mailbox is empty if you have no unread mail, otherwise it contains a "
-"letter. A tooltip shows new, unread and total number of messages."
+"The mailbox is empty if you have no unread mail, otherwise it contains a letter. A tooltip shows new, unread and total number of messages."

 msgstr ""
 msgstr ""

-"Esse plugin mostra um ícone de caixa postal na barra do sistema, que indica "
-"se você tem mensagens novas ou não lidas.\n"
+"Esse plugin mostra um ícone de caixa postal na barra do sistema, que indica se você tem mensagens novas ou não lidas.\n"

 "\n"
 "\n"

-"A caixa fica vazia quando não existem mensagens não lidas, caso contrário "
-"ela contém uma carta. Ao passar o mouse sobre o ícone aparece uma indicação "
-"do número de mensagens lidas, não lidas e do total."
+"A caixa fica vazia quando não existem mensagens não lidas, caso contrário ela contém uma carta. Ao passar o mouse sobre o ícone aparece uma indicação do número de mensagens lidas, não lidas e do total."

 
 

-#: src/plugins/trayicon/trayicon.c:426
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit this program?"
 msgstr "Sair do programa?"
 
 msgid "Exit this program?"
 msgstr "Sair do programa?"
 


@@ -7546,7 +8032,8 @@ msgstr "Marca de hora do APOP não encontrado na saudação\n"
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na marca de hora durante a saudação\n"
 
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe na marca de hora durante a saudação\n"
 

-#: src/pop.c:183 src/pop.c:210
+#: src/pop.c:183
+#: src/pop.c:210

 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 
 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 


@@ -7585,12 +8072,16 @@ msgstr "ocorreu um erro na sessão POP3\n"
 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\n"
 
 msgid "TOP command unsupported\n"
 msgstr "Comando TOP não suportado\n"
 

-#: src/prefs_account.c:233 src/prefs_account.c:1454 src/prefs_account.c:2138
-#: src/wizard.c:1017
+#: src/prefs_account.c:233
+#: src/prefs_account.c:1461
+#: src/prefs_account.c:2145
+#: src/wizard.c:1122

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:236 src/prefs_account.c:1580 src/prefs_account.c:2155
+#: src/prefs_account.c:236
+#: src/prefs_account.c:1587
+#: src/prefs_account.c:2162

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 


@@ -7598,7 +8089,8 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:238 src/wizard.c:1027
+#: src/prefs_account.c:238
+#: src/wizard.c:1132

 msgid "Local mbox file"
 msgstr "Arquivo mbox local"
 
 msgid "Local mbox file"
 msgstr "Arquivo mbox local"
 


@@ -7606,450 +8098,466 @@ msgstr "Arquivo mbox local"
 msgid "None (SMTP only)"
 msgstr "Nenhum (somente SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Nenhum (somente SMTP)"
 

-#: src/prefs_account.c:718
+#: src/prefs_account.c:725

 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "Conta%d"
 

-#: src/prefs_account.c:991
+#: src/prefs_account.c:998

 msgid "Preferences for new account"
 msgstr "Preferências da nova conta"
 
 msgid "Preferences for new account"
 msgstr "Preferências da nova conta"
 

-#: src/prefs_account.c:993
+#: src/prefs_account.c:1000

 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferências da conta"
 
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Preferências da conta"
 

-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1035

 msgid "_Basic"
 msgstr "_Básico"
 
 msgid "_Basic"
 msgstr "_Básico"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1037

 msgid "_Receive"
 msgstr "_Receber"
 
 msgid "_Receive"
 msgstr "_Receber"
 

-#: src/prefs_account.c:1034
+#: src/prefs_account.c:1041

 msgid "Co_mpose"
 msgstr "Co_mpor"
 
 msgid "Co_mpose"
 msgstr "Co_mpor"
 

-#: src/prefs_account.c:1036
+#: src/prefs_account.c:1043

 msgid "_Privacy"
 msgstr "_Privacidade"
 
 msgid "_Privacy"
 msgstr "_Privacidade"
 

-#: src/prefs_account.c:1039
+#: src/prefs_account.c:1046

 msgid "SS_L"
 msgstr "SS_L"
 
 msgid "SS_L"
 msgstr "SS_L"
 

-#: src/prefs_account.c:1042
+#: src/prefs_account.c:1049

 msgid "A_dvanced"
 msgstr "Avança_da"
 
 msgid "A_dvanced"
 msgstr "Avança_da"
 

-#: src/prefs_account.c:1100
+#: src/prefs_account.c:1107

 msgid "Name of account"
 msgstr "Nome da conta"
 
 msgid "Name of account"
 msgstr "Nome da conta"
 

-#: src/prefs_account.c:1109
+#: src/prefs_account.c:1116

 msgid "Set as default"
 msgstr "Definir como padrão"
 
 msgid "Set as default"
 msgstr "Definir como padrão"
 

-#: src/prefs_account.c:1113
+#: src/prefs_account.c:1120

 msgid "Personal information"
 msgstr "Informações pessoais"
 
 msgid "Personal information"
 msgstr "Informações pessoais"
 

-#: src/prefs_account.c:1122
+#: src/prefs_account.c:1129

 msgid "Full name"
 msgstr "Nome completo"
 
 msgid "Full name"
 msgstr "Nome completo"
 

-#: src/prefs_account.c:1128
+#: src/prefs_account.c:1135

 msgid "Mail address"
 msgstr "Endereço de e-mail"
 
 msgid "Mail address"
 msgstr "Endereço de e-mail"
 

-#: src/prefs_account.c:1134
+#: src/prefs_account.c:1141

 msgid "Organization"
 msgstr "Organização"
 
 msgid "Organization"
 msgstr "Organização"
 

-#: src/prefs_account.c:1158
+#: src/prefs_account.c:1165

 msgid "Server information"
 msgstr "Informações do servidor"
 
 msgid "Server information"
 msgstr "Informações do servidor"
 

-#: src/prefs_account.c:1198 src/wizard.c:1106
+#: src/prefs_account.c:1205
+#: src/wizard.c:1216

 msgid ""
 msgid ""

-"<span weight=\"bold\">Warning: this version of Sylpheed-Claws\n"
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"

 "has been built without IMAP support.</span>"
 msgstr ""
 "has been built without IMAP support.</span>"
 msgstr ""

-"<span weight=\"bold\">Aviso: essa versão do Sylpheed-Claws\n"
+"<span weight=\"bold\">Aviso: essa versão do Claws Mail\n"

 "foi compilada sem suporte ao IMAP.</span>"
 
 "foi compilada sem suporte ao IMAP.</span>"
 

-#: src/prefs_account.c:1227
+#: src/prefs_account.c:1234

 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 
 msgid "This server requires authentication"
 msgstr "Este servidor requer autenticação"
 

-#: src/prefs_account.c:1234
+#: src/prefs_account.c:1241

 msgid "Authenticate on connect"
 msgstr "Autenticar ao conectar"
 
 msgid "Authenticate on connect"
 msgstr "Autenticar ao conectar"
 

-#: src/prefs_account.c:1279
+#: src/prefs_account.c:1286

 msgid "News server"
 msgstr "Servidor de news"
 
 msgid "News server"
 msgstr "Servidor de news"
 

-#: src/prefs_account.c:1285
+#: src/prefs_account.c:1292

 msgid "Server for receiving"
 msgstr "Servidor para recebimento"
 
 msgid "Server for receiving"
 msgstr "Servidor para recebimento"
 

-#: src/prefs_account.c:1291
+#: src/prefs_account.c:1298

 msgid "Local mailbox"
 msgstr "Caixa postal local"
 
 msgid "Local mailbox"
 msgstr "Caixa postal local"
 

-#: src/prefs_account.c:1298
+#: src/prefs_account.c:1305

 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 

-#: src/prefs_account.c:1306
+#: src/prefs_account.c:1313

 msgid "Use mail command rather than SMTP server"
 msgstr "Utilizar comando mail ao invés do servidor SMTP"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Utilizar comando mail ao invés do servidor SMTP"
 

-#: src/prefs_account.c:1315
+#: src/prefs_account.c:1322

 msgid "command to send mails"
 msgstr "comando para enviar mensagens"
 
 msgid "command to send mails"
 msgstr "comando para enviar mensagens"
 

-#: src/prefs_account.c:1322 src/prefs_account.c:1772
+#: src/prefs_account.c:1329
+#: src/prefs_account.c:1779

 msgid "User ID"
 msgstr "ID do usuário"
 
 msgid "User ID"
 msgstr "ID do usuário"
 

-#: src/prefs_account.c:1328 src/prefs_account.c:1781
+#: src/prefs_account.c:1335
+#: src/prefs_account.c:1788

 msgid "Password"
 msgstr "Senha"
 
 msgid "Password"
 msgstr "Senha"
 

-#: src/prefs_account.c:1421
+#: src/prefs_account.c:1428

 msgid "Local"
 msgstr "Local"
 
 msgid "Local"
 msgstr "Local"
 

-#: src/prefs_account.c:1432 src/prefs_account.c:1527
+#: src/prefs_account.c:1439
+#: src/prefs_account.c:1534

 msgid "Default inbox"
 msgstr "Caixa de Entrada padrão"
 
 msgid "Default inbox"
 msgstr "Caixa de Entrada padrão"
 

-#: src/prefs_account.c:1439 src/prefs_account.c:1447 src/prefs_account.c:1534
-#: src/prefs_account.c:1542
+#: src/prefs_account.c:1446
+#: src/prefs_account.c:1454
+#: src/prefs_account.c:1541
+#: src/prefs_account.c:1549

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mensagens não filtradas serão armazenadas nessa pasta"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Mensagens não filtradas serão armazenadas nessa pasta"
 

-#: src/prefs_account.c:1444 src/prefs_account.c:1539 src/prefs_account.c:1942
+#: src/prefs_account.c:1451
+#: src/prefs_account.c:1546
+#: src/prefs_account.c:1949

 msgid "Bro_wse"
 msgstr "E_xplorar"
 
 msgid "Bro_wse"
 msgstr "E_xplorar"
 

-#: src/prefs_account.c:1462
+#: src/prefs_account.c:1469

 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação de segurança (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Usar autenticação de segurança (APOP)"
 

-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1472

 msgid "Remove messages on server when received"
 msgstr "Eliminar as mensagens do servidor após recebê-las"
 
 msgid "Remove messages on server when received"
 msgstr "Eliminar as mensagens do servidor após recebê-las"
 

-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1483

 msgid "Remove after"
 msgstr "Remover após"
 
 msgid "Remove after"
 msgstr "Remover após"
 

-#: src/prefs_account.c:1485
+#: src/prefs_account.c:1492

 msgid "0 days: remove immediately"
 msgstr "0 dia: apaga imediatamente"
 
 msgid "0 days: remove immediately"
 msgstr "0 dia: apaga imediatamente"
 

-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1496

 msgid "days"
 msgstr "dias"
 
 msgid "days"
 msgstr "dias"
 

-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1503

 msgid "Download all messages on server"
 msgstr "Receber todas as mensagens do servidor"
 
 msgid "Download all messages on server"
 msgstr "Receber todas as mensagens do servidor"
 

-#: src/prefs_account.c:1502
+#: src/prefs_account.c:1509

 msgid "Receive size limit"
 msgstr "Tamanho limite do recebimento"
 
 msgid "Receive size limit"
 msgstr "Tamanho limite do recebimento"
 

-#: src/prefs_account.c:1505
-msgid ""
-"Messages over this limit will be partially retrieved. When selecting them "
-"you will be able to download them fully or delete them."
-msgstr ""
-"Mensagens acima desse limite serão recebidas parcialmente. Ao selecioná-las, "
-"você poderá obtê-las por inteiro ou exclui-las."
+#: src/prefs_account.c:1512
+msgid "Messages over this limit will be partially retrieved. When selecting them you will be able to download them fully or delete them."
+msgstr "Mensagens acima desse limite serão recebidas parcialmente. Ao selecioná-las, você poderá obtê-las por inteiro ou exclui-las."

 
 

-#: src/prefs_account.c:1515
+#: src/prefs_account.c:1522

 msgid "KB"
 msgstr "Kb"
 
 msgid "KB"
 msgstr "Kb"
 

-#: src/prefs_account.c:1549 src/prefs_account.c:2172
+#: src/prefs_account.c:1556
+#: src/prefs_account.c:2179

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1561
+#: src/prefs_account.c:1568

 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos a receber"
 
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artigos a receber"
 

-#: src/prefs_account.c:1573
+#: src/prefs_account.c:1580

 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 
 msgid "unlimited if 0 is specified"
 msgstr "ilimitado se for especificado 0"
 

-#: src/prefs_account.c:1591 src/prefs_account.c:1742
+#: src/prefs_account.c:1598
+#: src/prefs_account.c:1749

 msgid "Authentication method"
 msgstr "Método de autenticação"
 
 msgid "Authentication method"
 msgstr "Método de autenticação"
 

-#: src/prefs_account.c:1601 src/prefs_account.c:1752 src/prefs_send.c:273
+#: src/prefs_account.c:1608
+#: src/prefs_account.c:1759
+#: src/prefs_send.c:273

 msgid "Automatic"
 msgstr "Automático"
 
 msgid "Automatic"
 msgstr "Automático"
 

-#: src/prefs_account.c:1613
+#: src/prefs_account.c:1620

 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 
 msgid "IMAP server directory"
 msgstr "Diretório do servidor IMAP"
 

-#: src/prefs_account.c:1617
+#: src/prefs_account.c:1624

 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 
 msgid "(usually empty)"
 msgstr "(geralmente vazio)"
 

-#: src/prefs_account.c:1627
+#: src/prefs_account.c:1634

 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensagens ao receber"
 

-#: src/prefs_account.c:1631
+#: src/prefs_account.c:1638

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'Receber mensagem' procura por novas mensagens dessa conta"
 

-#: src/prefs_account.c:1693 src/prefs_customheader.c:205
+#: src/prefs_account.c:1700
+#: src/prefs_customheader.c:205

 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Cabeçalho"
 
 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Cabeçalho"
 

-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1707

 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 
 msgid "Generate Message-ID"
 msgstr "Gerar Message-ID"
 

-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1714

 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho definido pelo usuário"
 

-#: src/prefs_account.c:1719
+#: src/prefs_account.c:1726

 msgid "Authentication"
 msgstr "Autenticação"
 
 msgid "Authentication"
 msgstr "Autenticação"
 

-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1734

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 

-#: src/prefs_account.c:1803
-msgid ""
-"If you leave these entries empty, the same user ID and password as receiving "
-"will be used."
-msgstr ""
-"Deixe esses campos em branco, para utilizar os mesmos usuário e senha de "
-"recebimento."
+#: src/prefs_account.c:1810
+msgid "If you leave these entries empty, the same user ID and password as receiving will be used."
+msgstr "Deixe esses campos em branco, para utilizar os mesmos usuário e senha de recebimento."

 
 

-#: src/prefs_account.c:1814
+#: src/prefs_account.c:1821

 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar via POP3 antes de enviar"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Autenticar via POP3 antes de enviar"
 

-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1836

 msgid "POP authentication timeout: "
 msgstr "Tempo de espera para autenticação POP: "
 
 msgid "POP authentication timeout: "
 msgstr "Tempo de espera para autenticação POP: "
 

-#: src/prefs_account.c:1838
+#: src/prefs_account.c:1845

 msgid "minutes"
 msgstr "minutos"
 
 msgid "minutes"
 msgstr "minutos"
 

-#: src/prefs_account.c:1883 src/prefs_account.c:1934
+#: src/prefs_account.c:1890
+#: src/prefs_account.c:1941

 msgid "Signature"
 msgstr "Assinatura"
 
 msgid "Signature"
 msgstr "Assinatura"
 

-#: src/prefs_account.c:1891
+#: src/prefs_account.c:1898

 msgid "Insert signature automatically"
 msgstr "Inserir assinatura automaticamente"
 
 msgid "Insert signature automatically"
 msgstr "Inserir assinatura automaticamente"
 

-#: src/prefs_account.c:1896
+#: src/prefs_account.c:1903

 msgid "Signature separator"
 msgstr "Separador de assinatura"
 
 msgid "Signature separator"
 msgstr "Separador de assinatura"
 

-#: src/prefs_account.c:1921
+#: src/prefs_account.c:1928

 msgid "Command output"
 msgstr "Saída do comando"
 
 msgid "Command output"
 msgstr "Saída do comando"
 

-#: src/prefs_account.c:1954
+#: src/prefs_account.c:1961

 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 

-#: src/prefs_account.c:1963 src/prefs_filtering_action.c:1083
-#: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
+#: src/prefs_account.c:1970
+#: src/prefs_filtering_action.c:1083
+#: src/prefs_matcher.c:159
+#: src/prefs_matcher.c:1869
+#: src/prefs_template.c:188

 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 

-#: src/prefs_account.c:1976 src/prefs_template.c:189
+#: src/prefs_account.c:1983
+#: src/prefs_template.c:189

 msgid "Bcc"
 msgstr "Cco"
 
 msgid "Bcc"
 msgstr "Cco"
 

-#: src/prefs_account.c:1989
+#: src/prefs_account.c:1996

 msgid "Reply-To"
 msgstr "Responder para"
 
 msgid "Reply-To"
 msgstr "Responder para"
 

-#: src/prefs_account.c:2041
+#: src/prefs_account.c:2048

 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 
 msgid "Default privacy system"
 msgstr "Sistema de privacidade padrão"
 

-#: src/prefs_account.c:2050
+#: src/prefs_account.c:2057

 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 
 msgid "Always sign messages"
 msgstr "Sempre assinar as mensagens"
 

-#: src/prefs_account.c:2052
+#: src/prefs_account.c:2059

 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 
 msgid "Always encrypt messages"
 msgstr "Sempre criptografar as mensagens"
 

-#: src/prefs_account.c:2054
+#: src/prefs_account.c:2061

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Sempre criptografar as mensagens em resposta a mensagens criptografadas"
 

-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2064

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgid "Encrypt sent messages with your own key in addition to recipient's"

-msgstr ""
-"Criptografar as mensagens enviadas com sua própria chave além da dos "
-"destinatários"
+msgstr "Criptografar as mensagens enviadas com sua própria chave além da dos destinatários"

 
 

-#: src/prefs_account.c:2059
+#: src/prefs_account.c:2066

 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Salvar mensagens criptografadas enviadas como texto simples"
 

-#: src/prefs_account.c:2146 src/prefs_account.c:2163 src/prefs_account.c:2179
+#: src/prefs_account.c:2153
+#: src/prefs_account.c:2170
+#: src/prefs_account.c:2186

 msgid "Don't use SSL"
 msgstr "Não utilizar SSL"
 
 msgid "Don't use SSL"
 msgstr "Não utilizar SSL"
 

-#: src/prefs_account.c:2149
+#: src/prefs_account.c:2156

 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão POP3"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão POP3"
 

-#: src/prefs_account.c:2152 src/prefs_account.c:2169 src/prefs_account.c:2204
+#: src/prefs_account.c:2159
+#: src/prefs_account.c:2176
+#: src/prefs_account.c:2211

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar sessão SSL"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar sessão SSL"
 

-#: src/prefs_account.c:2166
+#: src/prefs_account.c:2173

 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conexão IMAP4"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Utilizar SSL para conexão IMAP4"
 

-#: src/prefs_account.c:2188
+#: src/prefs_account.c:2195

 msgid "Use SSL for NNTP connection"
 msgstr "Utilizar SSL para conexão NNTP"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Utilizar SSL para conexão NNTP"
 

-#: src/prefs_account.c:2190
+#: src/prefs_account.c:2197

 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 

-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2205

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Não use SSL (mas, se necessario, use STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Não use SSL (mas, se necessario, use STARTTLS)"
 

-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2208

 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conexão SMTP"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Utilizar SSL para conexão SMTP"
 

-#: src/prefs_account.c:2212
+#: src/prefs_account.c:2219

 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL não bloqueador"
 
 msgid "Use non-blocking SSL"
 msgstr "Utilizar SSL não bloqueador"
 

-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2231

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desligue essa opção caso você tenha problemas de conexão via SSL"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Desligue essa opção caso você tenha problemas de conexão via SSL"
 

-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2357

 msgid "SMTP port"
 msgstr "Porta SMTP"
 
 msgid "SMTP port"
 msgstr "Porta SMTP"
 

-#: src/prefs_account.c:2356
+#: src/prefs_account.c:2363

 msgid "POP3 port"
 msgstr "Porta POP3"
 
 msgid "POP3 port"
 msgstr "Porta POP3"
 

-#: src/prefs_account.c:2362
+#: src/prefs_account.c:2369

 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 
 msgid "IMAP4 port"
 msgstr "Porta IMAP4"
 

-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2375

 msgid "NNTP port"
 msgstr "Porta NNTP"
 
 msgid "NNTP port"
 msgstr "Porta NNTP"
 

-#: src/prefs_account.c:2373
+#: src/prefs_account.c:2380

 msgid "Domain name"
 msgstr "Nome do domínio"
 
 msgid "Domain name"
 msgstr "Nome do domínio"
 

-#: src/prefs_account.c:2383
+#: src/prefs_account.c:2390

 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 
 msgid "Use command to communicate with server"
 msgstr "Utilizar comando para comunicar com o servidor"
 

-#: src/prefs_account.c:2391
+#: src/prefs_account.c:2398

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar mensagens de cross-posting como lidas e com a cor:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar mensagens de cross-posting como lidas e com a cor:"
 

-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2445

 msgid "Browse"
 msgstr "Explorar"
 
 msgid "Browse"
 msgstr "Explorar"
 

-#: src/prefs_account.c:2451
+#: src/prefs_account.c:2458

 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 
 msgid "Put sent messages in"
 msgstr "Colocar as mensagens enviadas em"
 

-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2460

 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 
 msgid "Put queued messages in"
 msgstr "Colocar as mensagens a serem enviadas em"
 

-#: src/prefs_account.c:2455
+#: src/prefs_account.c:2462

 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 
 msgid "Put draft messages in"
 msgstr "Colocar os rascunhos das mensagens em"
 

-#: src/prefs_account.c:2457
+#: src/prefs_account.c:2464

 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 
 msgid "Put deleted messages in"
 msgstr "Colocar as mensagens excluídas em"
 

-#: src/prefs_account.c:2500
+#: src/prefs_account.c:2507

 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 
 msgid "Account name is not entered."
 msgstr "O nome da conta não foi informado."
 

-#: src/prefs_account.c:2504
+#: src/prefs_account.c:2511

 msgid "Mail address is not entered."
 msgstr "O endereço de e-mail não foi informado."
 
 msgid "Mail address is not entered."
 msgstr "O endereço de e-mail não foi informado."
 

-#: src/prefs_account.c:2511
+#: src/prefs_account.c:2518

 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 
 msgid "SMTP server is not entered."
 msgstr "O servidor SMTP não foi informado."
 

-#: src/prefs_account.c:2516
+#: src/prefs_account.c:2523

 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 
 msgid "User ID is not entered."
 msgstr "A ID do usuário não foi informada."
 

-#: src/prefs_account.c:2521
+#: src/prefs_account.c:2528

 msgid "POP3 server is not entered."
 msgstr "O servidor POP3 não foi informado."
 
 msgid "POP3 server is not entered."
 msgstr "O servidor POP3 não foi informado."
 

-#: src/prefs_account.c:2526
+#: src/prefs_account.c:2535
+msgid "The default inbox folder doesn't exist."
+msgstr "A pasta padrão da Caixa de Entrada não existe."
+
+#: src/prefs_account.c:2541

 msgid "IMAP4 server is not entered."
 msgstr "O servidor IMAP4 não foi informado."
 
 msgid "IMAP4 server is not entered."
 msgstr "O servidor IMAP4 não foi informado."
 

-#: src/prefs_account.c:2531
+#: src/prefs_account.c:2546

 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 
 msgid "NNTP server is not entered."
 msgstr "O servidor NNTP não foi informado."
 

-#: src/prefs_account.c:2537
+#: src/prefs_account.c:2552

 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 
 msgid "local mailbox filename is not entered."
 msgstr "o nome do arquivo da caixa postal local não informado."
 

-#: src/prefs_account.c:2543
+#: src/prefs_account.c:2558

 msgid "mail command is not entered."
 msgstr "o comando de e-mail não foi informado."
 
 msgid "mail command is not entered."
 msgstr "o comando de e-mail não foi informado."
 

-#: src/prefs_account.c:2608
+#: src/prefs_account.c:2623

 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 
 msgid "Select signature file"
 msgstr "Selecione o arquivo de assinatura"
 

-#: src/prefs_account.c:2701
+#: src/prefs_account.c:2716

 msgid "Protocol:"
 msgstr "Protocolo:"
 
 msgid "Protocol:"
 msgstr "Protocolo:"
 

-#: src/prefs_account.c:2853
+#: src/prefs_account.c:2869

 #, c-format
 #, c-format

-msgid "Unsupported (%s)"
-msgstr "Não suportado (%s)"
+msgid "%s (plugin not loaded)"
+msgstr "%s (plugin não carregado)"

 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"
 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"


@@ -8063,21 +8571,29 @@ msgstr "Nome do menu"
 msgid "Command line"
 msgstr "Linha de comando"
 
 msgid "Command line"
 msgstr "Linha de comando"
 

-#: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
-#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:260
+#: src/prefs_actions.c:275
+#: src/prefs_filtering_action.c:493
+#: src/prefs_filtering.c:455
+#: src/prefs_matcher.c:673
+#: src/prefs_template.c:270

 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Substituir"
 
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Substituir"
 

-#: src/prefs_actions.c:291 src/prefs_filtering_action.c:464
+#: src/prefs_actions.c:291
+#: src/prefs_filtering_action.c:464

 #: src/prefs_matcher.c:569
 msgid "Info..."
 msgstr "Informação..."
 
 #: src/prefs_matcher.c:569
 msgid "Info..."
 msgstr "Informação..."
 

-#: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
-#: src/prefs_filtering.c:762 src/prefs_filtering.c:764
-#: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
-#: src/prefs_template.c:357
+#: src/prefs_actions.c:458
+#: src/prefs_filtering_action.c:585
+#: src/prefs_filtering.c:762
+#: src/prefs_filtering.c:764
+#: src/prefs_filtering.c:765
+#: src/prefs_filtering.c:840
+#: src/prefs_matcher.c:811
+#: src/prefs_template.c:367

 msgid "(New)"
 msgstr "(Novo)"
 
 msgid "(New)"
 msgstr "(Novo)"
 


@@ -8124,21 +8640,32 @@ msgstr "Excluir ação"
 msgid "Do you really want to delete this action?"
 msgstr "Deseja realmente deseja excluir essa ação?"
 
 msgid "Do you really want to delete this action?"
 msgstr "Deseja realmente deseja excluir essa ação?"
 

-#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
-#: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
-#: src/prefs_template.c:416 src/prefs_template.c:433
+#: src/prefs_actions.c:749
+#: src/prefs_actions.c:769
+#: src/prefs_filtering.c:1253
+#: src/prefs_filtering.c:1275
+#: src/prefs_matcher.c:1822
+#: src/prefs_template.c:426
+#: src/prefs_template.c:443

 msgid "Entry not saved"
 msgstr "A entrada não foi salva"
 
 msgid "Entry not saved"
 msgstr "A entrada não foi salva"
 

-#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
-#: src/prefs_filtering.c:1276 src/prefs_template.c:417
-#: src/prefs_template.c:434
+#: src/prefs_actions.c:750
+#: src/prefs_actions.c:770
+#: src/prefs_filtering.c:1254
+#: src/prefs_filtering.c:1276
+#: src/prefs_template.c:427
+#: src/prefs_template.c:444

 msgid "The entry was not saved. Close anyway?"
 msgstr "A entrada não foi salva. Fechar assim mesmo?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "A entrada não foi salva. Fechar assim mesmo?"
 

-#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
-#: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
-#: src/prefs_template.c:418 src/prefs_template.c:435
+#: src/prefs_actions.c:751
+#: src/prefs_actions.c:771
+#: src/prefs_filtering.c:1255
+#: src/prefs_filtering.c:1277
+#: src/prefs_matcher.c:1824
+#: src/prefs_template.c:428
+#: src/prefs_template.c:445

 msgid "+_Continue editing"
 msgstr "+Con_tinuar editando"
 
 msgid "+_Continue editing"
 msgstr "+Con_tinuar editando"
 


@@ -8168,9 +8695,7 @@ msgstr "para enviar o texto fornecido pelo usuário para a entrada padrão do co
 
 #: src/prefs_actions.c:813
 msgid "to send user provided hidden text to command's standard input"
 
 #: src/prefs_actions.c:813
 msgid "to send user provided hidden text to command's standard input"

-msgstr ""
-"para enviar o texto escondido fornecido pelo usuário para a entrada padrão "
-"do comando"
+msgstr "para enviar o texto escondido fornecido pelo usuário para a entrada padrão do comando"

 
 #: src/prefs_actions.c:814
 msgid "<span weight=\"bold\">End with:</span>"
 
 #: src/prefs_actions.c:814
 msgid "<span weight=\"bold\">End with:</span>"


@@ -8220,114 +8745,164 @@ msgstr "para a seleção de texto"
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplica as ações de filtragem entre {} nas mensagens selecionadas"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplica as ações de filtragem entre {} nas mensagens selecionadas"
 

-#: src/prefs_actions.c:834 src/prefs_themes.c:982
+#: src/prefs_actions.c:834
+#: src/prefs_themes.c:982

 msgid "Actions"
 msgstr "Ações"
 
 #: src/prefs_actions.c:835
 msgid "Actions"
 msgstr "Ações"
 
 #: src/prefs_actions.c:835

-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 ""
-"O recurso Ações é uma forma do usuário executar comandos externos para "
-"processar um arquivo completo de mensagens ou somente uma de suas partes."
+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 "O recurso Ações é uma forma do usuário executar comandos externos para processar um arquivo completo de mensagens ou somente uma de suas partes."

 
 #: src/prefs_actions.c:921
 msgid "Current actions"
 msgstr "Ações atuais"
 
 
 #: src/prefs_actions.c:921
 msgid "Current actions"
 msgstr "Ações atuais"
 

-#: src/prefs_common.c:262
-msgid "On %d\\n%f wrote:\\n\\n%q"
-msgstr "Em %d\\n%f escreveu:\\n\\n%q"
-
-#: src/prefs_common.c:268
-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"
+#: src/prefs_common.c:210
+msgid "Hello,\\n"
+msgstr "Olá,\\n"
+
+#: src/prefs_common.c:272
+msgid ""
+"On %d\\n"
+"%f wrote:\\n"
+"\\n"
+"%q"
+msgstr ""
+"Em %d\\n"
+"%f escreveu:\\n"
+"\\n"
+"%q"
+
+#: src/prefs_common.c:278
+msgid ""
+"\\n"
+"\\n"
+"Begin 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 ""
 msgstr ""

-"\\n\\nIníciando encaminhamento de mensagem:\\n\\n?d{Data: %d\\n}?f{De: %f"
-"\\n}?t{Para: %t\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Assunto: %s\\n}\\n\\n"
+"\\n"
+"\\n"
+"Iníciando encaminhamento de mensagem:\\n"
+"\\n"
+"?d{Data: %d\\n"
+"}?f{De: %f\\n"
+"}?t{Para: %t\\n"
+"}?c{Cc: %c\\n"
+"}?n{Newsgroups: %n\\n"
+"}?s{Assunto: %s\\n"
+"}\\n"
+"\\n"

 "%M"
 
 "%M"
 

-#: src/prefs_common.c:353
+#: src/prefs_common.c:363

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d/%m/%y(%a) %H:%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%d/%m/%y(%a) %H:%M"
 

-#: src/prefs_compose_writing.c:106
+#: src/prefs_compose_writing.c:124

 msgid "Automatic account selection"
 msgstr "Seleção automática da conta"
 
 msgid "Automatic account selection"
 msgstr "Seleção automática da conta"
 

-#: src/prefs_compose_writing.c:114
+#: src/prefs_compose_writing.c:132

 msgid "when replying"
 msgstr "ao responder"
 
 msgid "when replying"
 msgstr "ao responder"
 

-#: src/prefs_compose_writing.c:116
+#: src/prefs_compose_writing.c:134

 msgid "when forwarding"
 msgstr "ao encaminhar"
 
 msgid "when forwarding"
 msgstr "ao encaminhar"
 

-#: src/prefs_compose_writing.c:118
+#: src/prefs_compose_writing.c:136

 msgid "when re-editing"
 msgstr "ao reeditar"
 
 msgid "when re-editing"
 msgstr "ao reeditar"
 

-#: src/prefs_compose_writing.c:120
+#: src/prefs_compose_writing.c:138

 msgid "Forwarding"
 msgstr "Encaminhamento"
 
 msgid "Forwarding"
 msgstr "Encaminhamento"
 

-#: src/prefs_compose_writing.c:128 src/prefs_filtering_action.c:160
+#: src/prefs_compose_writing.c:146
+#: src/prefs_filtering_action.c:160

 msgid "Forward as attachment"
 msgstr "Encaminhar como anexo"
 
 msgid "Forward as attachment"
 msgstr "Encaminhar como anexo"
 

-#: src/prefs_compose_writing.c:131
+#: src/prefs_compose_writing.c:149

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Manter o cabeçalho 'De' original ao redirecionar"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Manter o cabeçalho 'De' original ao redirecionar"
 

-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:151

 msgid "Editing"
 msgstr "Edição"
 
 msgid "Editing"
 msgstr "Edição"
 

-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:159

 msgid "Automatically launch the external editor"
 msgstr "Iniciar automaticamente o editor externo"
 
 msgid "Automatically launch the external editor"
 msgstr "Iniciar automaticamente o editor externo"
 

-#: src/prefs_compose_writing.c:148
+#: src/prefs_compose_writing.c:166

 msgid "Autosave message text to Drafts folder every"
 msgstr "Salvar o texto da mensagem automaticamente na pasta Rascunho a cada"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Salvar o texto da mensagem automaticamente na pasta Rascunho a cada"
 

-#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:176
+#: src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "caracteres"
 
 msgid "characters"
 msgstr "caracteres"
 

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:184

 msgid "Undo level"
 msgstr "Níveis de desfazer"
 
 msgid "Undo level"
 msgstr "Níveis de desfazer"
 

-#: src/prefs_compose_writing.c:179
+#: src/prefs_compose_writing.c:197

 msgid "Reply button invokes mailing list reply"
 msgstr "O botão Responder deve enviar para a Lista de Discussão"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "O botão Responder deve enviar para a Lista de Discussão"
 

-#: src/prefs_compose_writing.c:182
+#: src/prefs_compose_writing.c:200

 msgid "When dropping files into the Compose window"
 msgstr "Ao arrastar arquivos para a janela de Composição"
 
 msgid "When dropping files into the Compose window"
 msgstr "Ao arrastar arquivos para a janela de Composição"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:208

 msgid "Ask"
 msgstr "Perguntar"
 
 msgid "Ask"
 msgstr "Perguntar"
 

-#: src/prefs_compose_writing.c:191 src/toolbar.c:446
+#: src/prefs_compose_writing.c:209
+#: src/toolbar.c:456

 msgid "Insert"
 msgstr "Inserir"
 
 msgid "Insert"
 msgstr "Inserir"
 

-#: src/prefs_compose_writing.c:192 src/toolbar.c:447
+#: src/prefs_compose_writing.c:210
+#: src/toolbar.c:457

 msgid "Attach"
 msgstr "Anexo"
 
 msgid "Attach"
 msgstr "Anexo"
 

-#: src/prefs_compose_writing.c:297 src/prefs_folder_item.c:1118
-#: src/prefs_quote.c:285 src/prefs_spelling.c:401 src/prefs_wrapping.c:144
-#: src/toolbar.c:1511
+#: src/prefs_compose_writing.c:226
+msgid "Use format when composing new messages"
+msgstr "Usar formatação ao compor novas mensagens"
+
+#: src/prefs_compose_writing.c:228
+msgid "New message format"
+msgstr "Formato da nova mensagem"
+
+#: src/prefs_compose_writing.c:282
+#: src/prefs_quote.c:206
+msgid " Description of symbols... "
+msgstr " Descrição dos símbolos... "
+
+#: src/prefs_compose_writing.c:402
+#: src/prefs_folder_item.c:1170
+#: src/prefs_quote.c:311
+#: src/prefs_spelling.c:448
+#: src/prefs_wrapping.c:144
+#: src/toolbar.c:1560

 msgid "Compose"
 msgstr "Compor"
 
 msgid "Compose"
 msgstr "Compor"
 

-#: src/prefs_compose_writing.c:298
+#: src/prefs_compose_writing.c:403

 msgid "Writing"
 msgstr "Escrita"
 
 msgid "Writing"
 msgstr "Escrita"
 


@@ -8339,8 +8914,10 @@ msgstr "Configuração de cabeçalhos personalizados"
 msgid "From file..."
 msgstr "Do arquivo..."
 
 msgid "From file..."
 msgstr "Do arquivo..."
 

-#: src/prefs_customheader.c:505 src/prefs_display_header.c:565
-#: src/prefs_matcher.c:1312 src/prefs_matcher.c:1322
+#: src/prefs_customheader.c:505
+#: src/prefs_display_header.c:565
+#: src/prefs_matcher.c:1312
+#: src/prefs_matcher.c:1322

 msgid "Header name is not set."
 msgstr "O nome do cabeçalho não foi definido."
 
 msgid "Header name is not set."
 msgstr "O nome do cabeçalho não foi definido."
 


@@ -8382,9 +8959,7 @@ msgstr "A imagem não está no formato correto (XBM)."
 
 #: src/prefs_customheader.c:613
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 
 #: src/prefs_customheader.c:613
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."

-msgstr ""
-"Não foi possível executar o `compface`. Certifique-se que ele esteja no seu "
-"$PATH."
+msgstr "Não foi possível executar o `compface`. Certifique-se que ele esteja no seu $PATH."

 
 #: src/prefs_customheader.c:664
 msgid "This file contains newlines."
 
 #: src/prefs_customheader.c:664
 msgid "This file contains newlines."


@@ -8406,7 +8981,8 @@ msgstr "Cabeçalhos personalizados atuais"
 msgid "Displayed header configuration"
 msgstr "Configuração do cabeçalho exibido"
 
 msgid "Displayed header configuration"
 msgstr "Configuração do cabeçalho exibido"
 

-#: src/prefs_display_header.c:251 src/prefs_matcher.c:491
+#: src/prefs_display_header.c:251
+#: src/prefs_matcher.c:491

 msgid "Header name"
 msgstr "Nome do cabeçalho"
 
 msgid "Header name"
 msgstr "Nome do cabeçalho"
 


@@ -8444,18 +9020,15 @@ msgid "Command for 'Display as text'"
 msgstr "Comando para 'Mostrar como texto'"
 
 #: src/prefs_ext_prog.c:185
 msgstr "Comando para 'Mostrar como texto'"
 
 #: src/prefs_ext_prog.c:185

-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 ""
-"Essa opção habilita a exibição de partes MIME na visualização da mensagem "
-"através de um script, ao usar o item do menu de contexto 'Mostrar como texto'"
+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 "Essa opção habilita a exibição de partes MIME na visualização da mensagem através de um script, ao usar o item do menu de contexto 'Mostrar como texto'"

 
 #: src/prefs_ext_prog.c:196
 msgid "Print command"
 msgstr "Comando de impressão"
 
 
 #: src/prefs_ext_prog.c:196
 msgid "Print command"
 msgstr "Comando de impressão"
 

-#: src/prefs_ext_prog.c:252 src/prefs_image_viewer.c:128
+#: src/prefs_ext_prog.c:252
+#: src/prefs_image_viewer.c:128

 #: src/prefs_message.c:308
 msgid "Message View"
 msgstr "Visualização da mensagem"
 #: src/prefs_message.c:308
 msgid "Message View"
 msgstr "Visualização da mensagem"


@@ -8472,8 +9045,9 @@ msgstr "Mover"
 msgid "Copy"
 msgstr "Copiar"
 
 msgid "Copy"
 msgstr "Copiar"
 

-#: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
-#: src/summaryview.c:2365
+#: src/prefs_filtering_action.c:153
+#: src/prefs_summary_column.c:79
+#: src/summaryview.c:2366

 msgid "Mark"
 msgstr "Marcar"
 
 msgid "Mark"
 msgstr "Marcar"
 


@@ -8493,7 +9067,9 @@ msgstr "Marcar como lida"
 msgid "Mark as unread"
 msgstr "Marcar como não lida"
 
 msgid "Mark as unread"
 msgstr "Marcar como não lida"
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:398 src/toolbar.c:489
+#: src/prefs_filtering_action.c:159
+#: src/toolbar.c:408
+#: src/toolbar.c:499

 msgid "Forward"
 msgstr "Encaminhar"
 
 msgid "Forward"
 msgstr "Encaminhar"
 


@@ -8501,12 +9077,15 @@ msgstr "Encaminhar"
 msgid "Redirect"
 msgstr "Redirecionar"
 
 msgid "Redirect"
 msgstr "Redirecionar"
 

-#: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
-#: src/toolbar.c:174 src/toolbar.c:1651
+#: src/prefs_filtering_action.c:162
+#: src/prefs_filtering_action.c:429
+#: src/toolbar.c:178
+#: src/toolbar.c:1711

 msgid "Execute"
 msgstr "Executar"
 
 msgid "Execute"
 msgstr "Executar"
 

-#: src/prefs_filtering_action.c:163 src/prefs_filtering_action.c:434
+#: src/prefs_filtering_action.c:163
+#: src/prefs_filtering_action.c:434

 msgid "Color"
 msgstr "Colorir"
 
 msgid "Color"
 msgstr "Colorir"
 


@@ -8522,7 +9101,8 @@ msgstr "Configurar a pontuação"
 msgid "Hide"
 msgstr "Esconder"
 
 msgid "Hide"
 msgstr "Esconder"
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:177
+#: src/prefs_filtering_action.c:167
+#: src/toolbar.c:181

 msgid "Ignore thread"
 msgstr "Ignorar agrupamento"
 
 msgid "Ignore thread"
 msgstr "Ignorar agrupamento"
 


@@ -8534,7 +9114,8 @@ msgstr "Parar a filtragem"
 msgid "Filtering action configuration"
 msgstr "Configuração das ações de filtragem"
 
 msgid "Filtering action configuration"
 msgstr "Configuração das ações de filtragem"
 

-#: src/prefs_filtering_action.c:342 src/prefs_filtering.c:413
+#: src/prefs_filtering_action.c:342
+#: src/prefs_filtering.c:413

 msgid "Action"
 msgstr "Ação"
 
 msgid "Action"
 msgstr "Ação"
 


@@ -8546,7 +9127,8 @@ msgstr "Destino"
 msgid "Recipient"
 msgstr "Destinatário"
 
 msgid "Recipient"
 msgstr "Destinatário"
 

-#: src/prefs_filtering_action.c:439 src/prefs_summary_column.c:88
+#: src/prefs_filtering_action.c:439
+#: src/prefs_summary_column.c:88

 #: src/summaryview.c:492
 msgid "Score"
 msgstr "Pontuação"
 #: src/summaryview.c:492
 msgid "Score"
 msgstr "Pontuação"


@@ -8575,44 +9157,57 @@ msgstr "A pontuação não foi definida"
 msgid "No action was defined."
 msgstr "Não foi definida nenhuma ação."
 
 msgid "No action was defined."
 msgstr "Não foi definida nenhuma ação."
 

-#: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1865
+#: src/prefs_filtering_action.c:1079
+#: src/prefs_matcher.c:1865

 #: src/quote_fmt.c:62
 msgid "literal %"
 msgstr "% literal"
 
 #: src/quote_fmt.c:62
 msgid "literal %"
 msgstr "% literal"
 

-#: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1870
-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:489
+#: src/prefs_filtering_action.c:1084
+#: src/prefs_matcher.c:1870
+#: src/prefs_summary_column.c:85
+#: src/quote_fmt.c:41
+#: src/summaryview.c:489

 msgid "Date"
 msgstr "Data"
 
 msgid "Date"
 msgstr "Data"
 

-#: src/prefs_filtering_action.c:1085 src/prefs_matcher.c:1871
+#: src/prefs_filtering_action.c:1085
+#: src/prefs_matcher.c:1871

 #: src/quote_fmt.c:52
 msgid "Message-ID"
 msgstr "ID da Mensagem"
 
 #: src/quote_fmt.c:52
 msgid "Message-ID"
 msgstr "ID da Mensagem"
 

-#: src/prefs_filtering_action.c:1086 src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1872 src/quote_fmt.c:50
+#: src/prefs_filtering_action.c:1086
+#: src/prefs_matcher.c:160
+#: src/prefs_matcher.c:1872
+#: src/quote_fmt.c:50

 msgid "Newsgroups"
 msgstr "Newsgroups"
 
 msgid "Newsgroups"
 msgstr "Newsgroups"
 

-#: src/prefs_filtering_action.c:1087 src/prefs_matcher.c:160
-#: src/prefs_matcher.c:1873 src/quote_fmt.c:51
+#: src/prefs_filtering_action.c:1087
+#: src/prefs_matcher.c:160
+#: src/prefs_matcher.c:1873
+#: src/quote_fmt.c:51

 msgid "References"
 msgstr "Referências"
 
 msgid "References"
 msgstr "Referências"
 

-#: src/prefs_filtering_action.c:1088 src/prefs_matcher.c:1874
+#: src/prefs_filtering_action.c:1088
+#: src/prefs_matcher.c:1874

 msgid "filename (should not be modified)"
 msgstr "Nome do arquivo (não deve ser modificado)"
 
 msgid "filename (should not be modified)"
 msgstr "Nome do arquivo (não deve ser modificado)"
 

-#: src/prefs_filtering_action.c:1089 src/prefs_matcher.c:1875
+#: src/prefs_filtering_action.c:1089
+#: src/prefs_matcher.c:1875

 msgid "new line"
 msgstr "Nova linha"
 
 msgid "new line"
 msgstr "Nova linha"
 

-#: src/prefs_filtering_action.c:1090 src/prefs_matcher.c:1876
+#: src/prefs_filtering_action.c:1090
+#: src/prefs_matcher.c:1876

 msgid "escape character for quotes"
 msgstr "Caractere de escape para as aspas"
 
 msgid "escape character for quotes"
 msgstr "Caractere de escape para as aspas"
 

-#: src/prefs_filtering_action.c:1091 src/prefs_matcher.c:1877
+#: src/prefs_filtering_action.c:1091
+#: src/prefs_matcher.c:1877

 msgid "quote character"
 msgstr "Caractere para aspas"
 
 msgid "quote character"
 msgstr "Caractere para aspas"
 


@@ -8622,13 +9217,11 @@ msgstr "Ação da filtragem: 'Executar'"
 
 #: src/prefs_filtering_action.c:1100
 msgid ""
 
 #: src/prefs_filtering_action.c:1100
 msgid ""

-"'Execute' allows you to send a message or message element to an external "
-"program or script.\n"
+"'Execute' allows you to send a message or message element to an external program or script.\n"

 "\n"
 "The following symbols can be used:"
 msgstr ""
 "\n"
 "The following symbols can be used:"
 msgstr ""

-"'Executar' permite que você envie uma mensagem ou um elemento da mensagem "
-"para um programa ou script externos.\n"
+"'Executar' permite que você envie uma mensagem ou um elemento da mensagem para um programa ou script externos.\n"

 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 
 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 


@@ -8636,23 +9229,33 @@ msgstr ""
 msgid "Current action list"
 msgstr "Lista das ações atuais"
 
 msgid "Current action list"
 msgstr "Lista das ações atuais"
 

-#: src/prefs_filtering.c:188 src/prefs_filtering.c:339
+#: src/prefs_filtering.c:188
+#: src/prefs_filtering.c:339

 msgid "Filtering/Processing configuration"
 msgstr "Configuração da filtragem/processamento"
 
 msgid "Filtering/Processing configuration"
 msgstr "Configuração da filtragem/processamento"
 

+#: src/prefs_filtering.c:250
+#: src/prefs_filtering.c:781
+#: src/prefs_filtering.c:872
+msgid "Filtering Account Menu|All"
+msgstr "Filtering Account Menu|Todas"
+

 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Condição"
 
 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Condição"
 

-#: src/prefs_filtering.c:404 src/prefs_filtering.c:426
+#: src/prefs_filtering.c:404
+#: src/prefs_filtering.c:426

 msgid " Define... "
 msgstr " Definir... "
 
 msgid " Define... "
 msgstr " Definir... "
 

-#: src/prefs_filtering.c:928 src/prefs_filtering.c:1014
+#: src/prefs_filtering.c:928
+#: src/prefs_filtering.c:1014

 msgid "Condition string is not valid."
 msgstr "A especificação da condição não é válida."
 
 msgid "Condition string is not valid."
 msgstr "A especificação da condição não é válida."
 

-#: src/prefs_filtering.c:964 src/prefs_filtering.c:1022
+#: src/prefs_filtering.c:964
+#: src/prefs_filtering.c:1022

 msgid "Action string is not valid."
 msgstr "A especificação da ação não é válida."
 
 msgid "Action string is not valid."
 msgstr "A especificação da ação não é válida."
 


@@ -8692,30 +9295,32 @@ msgstr ""
 "Selecione as colunas a serem exibidas na lista de pastas. Você pode\n"
 "modificar a ordem utilizando os botões acima/abaixo ou arrastando os itens."
 
 "Selecione as colunas a serem exibidas na lista de pastas. Você pode\n"
 "modificar a ordem utilizando os botões acima/abaixo ou arrastando os itens."
 

-#: src/prefs_folder_column.c:251 src/prefs_summary_column.c:265
+#: src/prefs_folder_column.c:251
+#: src/prefs_summary_column.c:265

 msgid "Hidden columns"
 msgstr "Colunas ocultas"
 
 msgid "Hidden columns"
 msgstr "Colunas ocultas"
 

-#: src/prefs_folder_column.c:280 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280
+#: src/prefs_summaries.c:797
+#: src/prefs_summaries.c:943
+#: src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Colunas exibidas"
 
 msgid "Displayed columns"
 msgstr "Colunas exibidas"
 

-#: src/prefs_folder_column.c:316 src/prefs_msg_colors.c:517
-#: src/prefs_summary_column.c:330 src/prefs_toolbar.c:800
+#: src/prefs_folder_column.c:316
+#: src/prefs_msg_colors.c:517
+#: src/prefs_summary_column.c:330
+#: src/prefs_toolbar.c:800

 msgid " Use default "
 msgstr " Utilizar o padrão "
 
 msgid " Use default "
 msgstr " Utilizar o padrão "
 

-#: src/prefs_folder_item.c:199 src/prefs_folder_item.c:640
-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 ""
-"<i>Essas preferências não serão salvas, uma vez que essa é a pasta de "
-"nível mais alto. Entretanto você pode usá-las como definição para toda a "
-"árvore da caixa postal selecionando \"Aplicar às subpastas\".</i>"
+#: src/prefs_folder_item.c:202
+#: src/prefs_folder_item.c:646
+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 "<i>Essas preferências não serão salvas, uma vez que essa é a pasta de nível mais alto. Entretanto você pode usá-las como definição para toda a árvore da caixa postal selecionando \"Aplicar às subpastas\".</i>"

 
 

-#: src/prefs_folder_item.c:211 src/prefs_folder_item.c:652
+#: src/prefs_folder_item.c:214
+#: src/prefs_folder_item.c:658

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -8723,80 +9328,85 @@ msgstr ""
 "Aplicar às\n"
 "subpastas"
 
 "Aplicar às\n"
 "subpastas"
 

-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:238

 msgid "Normal"
 msgstr "Normal"
 
 msgid "Normal"
 msgstr "Normal"
 

-#: src/prefs_folder_item.c:237
+#: src/prefs_folder_item.c:240

 msgid "Outbox"
 msgstr "Enviadas"
 
 msgid "Outbox"
 msgstr "Enviadas"
 

-#: src/prefs_folder_item.c:254
+#: src/prefs_folder_item.c:257

 msgid "Folder type"
 msgstr "Tipo de pasta"
 
 msgid "Folder type"
 msgstr "Tipo de pasta"
 

-#: src/prefs_folder_item.c:266
+#: src/prefs_folder_item.c:269

 msgid "Simplify Subject RegExp"
 msgstr "Expressão regular de simplificação do assunto"
 
 msgid "Simplify Subject RegExp"
 msgstr "Expressão regular de simplificação do assunto"
 

-#: src/prefs_folder_item.c:292
+#: src/prefs_folder_item.c:295

 msgid "Test RegExp"
 msgstr "Testar expressão regular"
 
 msgid "Test RegExp"
 msgstr "Testar expressão regular"
 

-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:327

 msgid "Folder chmod"
 msgstr "Alterar modo (chmod) da pasta"
 
 msgid "Folder chmod"
 msgstr "Alterar modo (chmod) da pasta"
 

-#: src/prefs_folder_item.c:350
+#: src/prefs_folder_item.c:353

 msgid "Folder color"
 msgstr "Cor da Pasta"
 
 msgid "Folder color"
 msgstr "Cor da Pasta"
 

-#: src/prefs_folder_item.c:364 src/prefs_folder_item.c:995
+#: src/prefs_folder_item.c:367
+#: src/prefs_folder_item.c:1045

 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Selecione a cor para a pasta"
 
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Selecione a cor para a pasta"
 

-#: src/prefs_folder_item.c:381
+#: src/prefs_folder_item.c:384

 msgid "Process at startup"
 msgstr "Processar ao iniciar"
 
 msgid "Process at startup"
 msgstr "Processar ao iniciar"
 

-#: src/prefs_folder_item.c:395
+#: src/prefs_folder_item.c:398

 msgid "Scan for new mail"
 msgstr "Procurar por novas mensagens"
 
 msgid "Scan for new mail"
 msgstr "Procurar por novas mensagens"
 

-#: src/prefs_folder_item.c:408
+#: src/prefs_folder_item.c:411

 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso desconectado"
 
 msgid "Synchronise for offline use"
 msgstr "Sincronizar para uso desconectado"
 

-#: src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:667

 msgid "Request Return Receipt"
 msgstr "Solicitar confirmação de recebimento"
 
 msgid "Request Return Receipt"
 msgstr "Solicitar confirmação de recebimento"
 

-#: src/prefs_folder_item.c:676
+#: src/prefs_folder_item.c:682

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Salvar as cópias das mensagens enviadas nessa pasta ao invés da Enviadas"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Salvar as cópias das mensagens enviadas nessa pasta ao invés da Enviadas"
 

-#: src/prefs_folder_item.c:689
+#: src/prefs_folder_item.c:695

 msgid "Default To: "
 msgstr "'Para:' padrão: "
 
 msgid "Default To: "
 msgstr "'Para:' padrão: "
 

-#: src/prefs_folder_item.c:710
+#: src/prefs_folder_item.c:716

 msgid "Default To for replies: "
 msgstr "'Para:' padrão para as respostas: "
 
 msgid "Default To for replies: "
 msgstr "'Para:' padrão para as respostas: "
 

-#: src/prefs_folder_item.c:731
+#: src/prefs_folder_item.c:737

 msgid "Default account: "
 msgstr "Conta padrão: "
 
 msgid "Default account: "
 msgstr "Conta padrão: "
 

-#: src/prefs_folder_item.c:782
+#: src/prefs_folder_item.c:788

 msgid "Default dictionary: "
 msgstr "Dicionário padrão: "
 
 msgid "Default dictionary: "
 msgstr "Dicionário padrão: "
 

-#: src/prefs_folder_item.c:1101
+#: src/prefs_folder_item.c:821
+msgid "Default alternate dictionary: "
+msgstr "Dicionário alternativo padrão: "
+
+#: src/prefs_folder_item.c:1153

 msgid "General"
 msgstr "Geral"
 
 msgid "General"
 msgstr "Geral"
 

-#: src/prefs_folder_item.c:1146
+#: src/prefs_folder_item.c:1198

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propriedades da pasta %s"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Propriedades da pasta %s"


@@ -8817,7 +9427,9 @@ msgstr "Usar uma fonte diferente para imprimir"
 msgid "Message Printing"
 msgstr "Impressão da mensagem"
 
 msgid "Message Printing"
 msgstr "Impressão da mensagem"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:197
+#: src/prefs_msg_colors.c:855
+#: src/prefs_summaries.c:1078

 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Exibir"
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Exibir"


@@ -9032,13 +9644,11 @@ msgstr "o(s) endereço(s) no cabeçalho '%s'"
 msgid ""
 "Book/folder path is not set.\n"
 "\n"
 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 'Any' from the book/folder drop-down list."

 msgstr ""
 "O caminho do livro/pasta não está definido.\n"
 "\n"
 msgstr ""
 "O caminho do livro/pasta não está definido.\n"
 "\n"

-"Se você deseja procurar a correspondência de %s por todo o livro de "
-"endereços, deve selecionar 'Qualquer' da caixa de seleção do livro/pasta."
+"Se você deseja procurar a correspondência de %s por todo o livro de endereços, deve selecionar 'Qualquer' da caixa de seleção do livro/pasta."

 
 #: src/prefs_matcher.c:1823
 msgid ""
 
 #: src/prefs_matcher.c:1823
 msgid ""


@@ -9054,13 +9664,11 @@ msgstr "Correspondência: 'Testar'"
 
 #: src/prefs_matcher.c:1886
 msgid ""
 
 #: src/prefs_matcher.c:1886
 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"
+"'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"

 "\n"
 "The following symbols can be used:"
 msgstr ""
 "\n"
 "The following symbols can be used:"
 msgstr ""

-"'Testar' permite que você teste uma mensagem ou um elemento da mensagem para "
-"um programa ou script externos. O programa irá retornar 0 ou 1.\n"
+"'Testar' permite que você teste uma mensagem ou um elemento da mensagem para um programa ou script externos. O programa irá retornar 0 ou 1.\n"

 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 
 "\n"
 "Os seguinte símbolos podem ser utilizados:"
 


@@ -9104,7 +9712,8 @@ msgstr "Renderizar mensagens somente em HTML com o plugin, se possível"
 msgid "Line space"
 msgstr "Espaçamento entre linhas"
 
 msgid "Line space"
 msgstr "Espaçamento entre linhas"
 

-#: src/prefs_message.c:184 src/prefs_message.c:222
+#: src/prefs_message.c:184
+#: src/prefs_message.c:222

 msgid "pixel(s)"
 msgstr "pixel(s)"
 
 msgid "pixel(s)"
 msgstr "pixel(s)"
 


@@ -9156,7 +9765,8 @@ msgstr "Se existirem mais de 3 níveis de citações, as cores serão reutilizad
 msgid "1st Level"
 msgstr "1º nível"
 
 msgid "1st Level"
 msgstr "1º nível"
 

-#: src/prefs_msg_colors.c:199 src/prefs_msg_colors.c:225
+#: src/prefs_msg_colors.c:199
+#: src/prefs_msg_colors.c:225

 #: src/prefs_msg_colors.c:251
 msgid "Text"
 msgstr "Texto"
 #: src/prefs_msg_colors.c:251
 msgid "Text"
 msgstr "Texto"


@@ -9189,7 +9799,8 @@ msgstr "Habilitar coloração do fundo do texto"
 msgid "Pick color for 1st level text background"
 msgstr "Selecione a cor para o fundo do texto do 1º nível"
 
 msgid "Pick color for 1st level text background"
 msgstr "Selecione a cor para o fundo do texto do 1º nível"
 

-#: src/prefs_msg_colors.c:290 src/prefs_msg_colors.c:311
+#: src/prefs_msg_colors.c:290
+#: src/prefs_msg_colors.c:311

 #: src/prefs_msg_colors.c:332
 msgid "Background"
 msgstr "Fundo"
 #: src/prefs_msg_colors.c:332
 msgid "Background"
 msgstr "Fundo"


@@ -9219,17 +9830,13 @@ msgid "Signatures"
 msgstr "Assinaturas"
 
 #: src/prefs_msg_colors.c:376
 msgstr "Assinaturas"
 
 #: src/prefs_msg_colors.c:376

+#: src/prefs_summaries.c:761

 msgid "Folder list"
 msgstr "Lista de pastas"
 
 #: src/prefs_msg_colors.c:394
 msgid "Folder list"
 msgstr "Lista de pastas"
 
 #: src/prefs_msg_colors.c:394

-msgid ""
-"Pick color for Target folder. Target folder is used when the option 'Execute "
-"immediately when moving or deleting messages' is turned off"
-msgstr ""
-"Selecione a cor para a pasta de destino. A pasta de destino é utilizada "
-"quando a opção 'Executar imediatamente ao mover ou excluir mensagens' está "
-"desativada"
+msgid "Pick color for Target folder. Target folder is used when the option 'Execute immediately when moving or deleting messages' is turned off"
+msgstr "Selecione a cor para a pasta de destino. A pasta de destino é utilizada quando a opção 'Executar imediatamente ao mover ou excluir mensagens' está desativada"

 
 #: src/prefs_msg_colors.c:398
 msgid "Target folder"
 
 #: src/prefs_msg_colors.c:398
 msgid "Target folder"


@@ -9249,14 +9856,16 @@ msgstr "Rótulos coloridos"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated

-#: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
+#: src/prefs_msg_colors.c:448
+#: src/prefs_msg_colors.c:480

 #, c-format
 #, c-format

-msgid "Pick color for 'color %d'"
-msgstr "Selecione a cor para a 'cor %d'"
+msgid "Tooltip|Pick color for 'color %d'"
+msgstr "Tooltip|Selecione a cor para a 'cor %d'"

 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated

-#: src/prefs_msg_colors.c:452 src/prefs_msg_colors.c:484
+#: src/prefs_msg_colors.c:452
+#: src/prefs_msg_colors.c:484

 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Defina o rótulo para a 'cor %d'"
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "Defina o rótulo para a 'cor %d'"


@@ -9265,8 +9874,8 @@ msgstr "Defina o rótulo para a 'cor %d'"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format

-msgid "Pick color for 'color %d' "
-msgstr "Selecionar cor para a 'cor %d' "
+msgid "Dialog title|Pick color for 'color %d'"
+msgstr "Dialog title|Selecionar cor para a 'cor %d'"

 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "
 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "


@@ -9360,115 +9969,110 @@ msgstr "Tempo limite para o socket E/S"
 msgid "Never send Return Receipts"
 msgstr "Nunca enviar confirmação de recebimento"
 
 msgid "Never send Return Receipts"
 msgstr "Nunca enviar confirmação de recebimento"
 

-#: src/prefs_quote.c:90
+#: src/prefs_quote.c:92

 msgid "Reply will quote by default"
 msgstr "Responder com citação por padrão"
 
 msgid "Reply will quote by default"
 msgstr "Responder com citação por padrão"
 

-#: src/prefs_quote.c:92
+#: src/prefs_quote.c:94

 msgid "Reply format"
 msgstr "Formato da resposta"
 
 msgid "Reply format"
 msgstr "Formato da resposta"
 

-#: src/prefs_quote.c:107 src/prefs_quote.c:149
+#: src/prefs_quote.c:109
+#: src/prefs_quote.c:161

 msgid "Quotation mark"
 msgstr "Marca de citação"
 
 msgid "Quotation mark"
 msgstr "Marca de citação"
 

-#: src/prefs_quote.c:134
+#: src/prefs_quote.c:146

 msgid "Forward format"
 msgstr "Formato do encaminhamento"
 
 msgid "Forward format"
 msgstr "Formato do encaminhamento"
 

-#: src/prefs_quote.c:184
-msgid " Description of symbols... "
-msgstr " Descrição dos símbolos... "
-
-#: src/prefs_quote.c:193
+#: src/prefs_quote.c:215

 msgid "Quotation characters"
 msgstr "Caracteres de citação"
 
 msgid "Quotation characters"
 msgstr "Caracteres de citação"
 

-#: src/prefs_quote.c:208
+#: src/prefs_quote.c:230

 msgid "Treat these characters as quotation marks: "
 msgstr "Tratar esses caracteres como marcas de citação: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Tratar esses caracteres como marcas de citação: "
 

-#: src/prefs_quote.c:286
+#: src/prefs_quote.c:312

 msgid "Quoting"
 msgstr "Citação"
 
 msgid "Quoting"
 msgstr "Citação"
 

-#: src/prefs_receive.c:122
+#: src/prefs_receive.c:121

 msgid "External incorporation program"
 msgstr "Programa de incorporação externo"
 
 msgid "External incorporation program"
 msgstr "Programa de incorporação externo"
 

-#: src/prefs_receive.c:129
+#: src/prefs_receive.c:128

 msgid "Use external program for receiving mail"
 msgstr "Usar um programa externo para receber as mensagens"
 
 msgid "Use external program for receiving mail"
 msgstr "Usar um programa externo para receber as mensagens"
 

-#: src/prefs_receive.c:136
+#: src/prefs_receive.c:135

 msgid "Command"
 msgstr "Comando"
 
 msgid "Command"
 msgstr "Comando"
 

-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:144

 msgid "Automatic checking"
 msgstr "Verificação automática"
 
 msgid "Automatic checking"
 msgstr "Verificação automática"
 

-#: src/prefs_receive.c:156
-msgid "Automatically check for new mail"
-msgstr "Verificação automática de novas mensagens"
-
-#: src/prefs_receive.c:158
-msgid "every"
-msgstr "a cada"
+#: src/prefs_receive.c:155
+msgid "Automatically check for new mail every"
+msgstr "Verifique por novas mensagens a cada"

 
 

-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:173

 msgid "Check for new mail on startup"
 msgstr "Verificar a existência de novas mensagens ao iniciar"
 
 msgid "Check for new mail on startup"
 msgstr "Verificar a existência de novas mensagens ao iniciar"
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:176

 msgid "Dialogs"
 msgstr "Janela de mensagens"
 
 msgid "Dialogs"
 msgstr "Janela de mensagens"
 

-#: src/prefs_receive.c:188
+#: src/prefs_receive.c:182

 msgid "Show receive dialog"
 msgstr "Exibir janela de mensagens do recebimento"
 
 msgid "Show receive dialog"
 msgstr "Exibir janela de mensagens do recebimento"
 

-#: src/prefs_receive.c:196 src/prefs_send.c:169 src/prefs_summaries.c:958
+#: src/prefs_receive.c:190
+#: src/prefs_send.c:169
+#: src/prefs_summaries.c:855

 msgid "Always"
 msgstr "Sempre"
 
 msgid "Always"
 msgstr "Sempre"
 

-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:191

 msgid "Only on manual receiving"
 msgstr "Somente na recepção manual"
 
 msgid "Only on manual receiving"
 msgstr "Somente na recepção manual"
 

-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:205

 msgid "Close receive dialog when finished"
 msgstr "Fechar janela de diálogo de recebimento ao finalizar"
 
 msgid "Close receive dialog when finished"
 msgstr "Fechar janela de diálogo de recebimento ao finalizar"
 

-#: src/prefs_receive.c:214
+#: src/prefs_receive.c:208

 msgid "Don't popup error dialog on receive error"
 msgstr "Não exibir a janela aviso de erros ao recebê-los"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Não exibir a janela aviso de erros ao recebê-los"
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:210

 msgid "After receiving new mail"
 msgstr "Após receber novas mensagens"
 
 msgid "After receiving new mail"
 msgstr "Após receber novas mensagens"
 

-#: src/prefs_receive.c:222
+#: src/prefs_receive.c:216

 msgid "Go to inbox"
 msgstr "Ir para a Caixa de Entrada"
 
 msgid "Go to inbox"
 msgstr "Ir para a Caixa de Entrada"
 

-#: src/prefs_receive.c:224
+#: src/prefs_receive.c:218

 msgid "Update all local folders"
 msgstr "Atualizar todas as pastas locais"
 
 msgid "Update all local folders"
 msgstr "Atualizar todas as pastas locais"
 

-#: src/prefs_receive.c:226
+#: src/prefs_receive.c:220

 msgid "Run command"
 msgstr "Executar comando"
 
 msgid "Run command"
 msgstr "Executar comando"
 

-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:229

 msgid "after automatic check"
 msgstr "após verificação automática"
 
 msgid "after automatic check"
 msgstr "após verificação automática"
 

-#: src/prefs_receive.c:237
+#: src/prefs_receive.c:231

 msgid "after manual check"
 msgstr "após verificação manual"
 
 msgid "after manual check"
 msgstr "após verificação manual"
 

-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:239

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -9477,11 +10081,12 @@ msgstr ""
 "Comando a ser executado:\n"
 "(utilize %d para o número de novas mensagens)"
 
 "Comando a ser executado:\n"
 "(utilize %d para o número de novas mensagens)"
 

-#: src/prefs_receive.c:371 src/prefs_send.c:337
+#: src/prefs_receive.c:365
+#: src/prefs_send.c:337

 msgid "Mail Handling"
 msgstr "Manipulação das mensagens"
 
 msgid "Mail Handling"
 msgstr "Manipulação das mensagens"
 

-#: src/prefs_receive.c:372
+#: src/prefs_receive.c:366

 msgid "Receiving"
 msgstr "Recebimento"
 
 msgid "Receiving"
 msgstr "Recebimento"
 


@@ -9502,12 +10107,8 @@ msgid "Outgoing encoding"
 msgstr "Codificação de saída"
 
 #: src/prefs_send.c:187
 msgstr "Codificação de saída"
 
 #: src/prefs_send.c:187

-msgid ""
-"If 'Automatic' is selected, the optimal encoding for the current locale will "
-"be used"
-msgstr ""
-"Se for selecionado 'Automático', será utilizada a melhor codificação para o "
-"locale atual"
+msgid "If 'Automatic' is selected, the optimal encoding for the current locale will be used"
+msgstr "Se for selecionado 'Automático', será utilizada a melhor codificação para o locale atual"

 
 #: src/prefs_send.c:201
 msgid "Automatic (Recommended)"
 
 #: src/prefs_send.c:201
 msgid "Automatic (Recommended)"


@@ -9630,177 +10231,184 @@ msgid "Transfer encoding"
 msgstr "Codificação da transferência"
 
 #: src/prefs_send.c:264
 msgstr "Codificação da transferência"
 
 #: src/prefs_send.c:264

-msgid ""
-"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
-"characters"
-msgstr ""
-"Especifique a codificação de transferência de conteúdo (Content-Transfer-"
-"Encoding) a ser utilizada quando o corpo da mensagem possuir caracteres não-"
-"ASCII"
+msgid "Specify Content-Transfer-Encoding used when message body contains non-ASCII characters"
+msgstr "Especifique a codificação de transferência de conteúdo (Content-Transfer-Encoding) a ser utilizada quando o corpo da mensagem possuir caracteres não-ASCII"

 
 

-#: src/prefs_send.c:338 src/send_message.c:477 src/send_message.c:481
+#: src/prefs_send.c:338
+#: src/send_message.c:477
+#: src/send_message.c:481

 #: src/send_message.c:486
 msgid "Sending"
 msgstr "Envio"
 
 #: src/send_message.c:486
 msgid "Sending"
 msgstr "Envio"
 

-#: src/prefs_spelling.c:105
+#: src/prefs_spelling.c:91

 msgid "Select dictionaries location"
 msgstr "Informe a localização dos dicionários"
 
 msgid "Select dictionaries location"
 msgstr "Informe a localização dos dicionários"
 

-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:126

 msgid "Pick color for misspelled word"
 msgstr "Selecione uma cor para as palavra erradas"
 
 msgid "Pick color for misspelled word"
 msgstr "Selecione uma cor para as palavra erradas"
 

-#: src/prefs_spelling.c:186
+#: src/prefs_spelling.c:183

 msgid "Enable spell checker"
 msgstr "Habilitar o verificador ortográfico"
 
 msgid "Enable spell checker"
 msgstr "Habilitar o verificador ortográfico"
 

-#: src/prefs_spelling.c:191
+#: src/prefs_spelling.c:188

 msgid "Enable alternate dictionary"
 msgstr "Habilitar dicionário alternativo"
 
 msgid "Enable alternate dictionary"
 msgstr "Habilitar dicionário alternativo"
 

-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194

 msgid "Faster switching with last used dictionary"
 msgstr "Troca mais rápida com o último dicionário utilizado"
 
 msgid "Faster switching with last used dictionary"
 msgstr "Troca mais rápida com o último dicionário utilizado"
 

-#: src/prefs_spelling.c:199
+#: src/prefs_spelling.c:196

 msgid "Path to dictionaries"
 msgstr "Caminho do dicionário"
 
 msgid "Path to dictionaries"
 msgstr "Caminho do dicionário"
 

-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:211

 msgid "Automatic spelling"
 msgstr "Verificação automática"
 
 msgid "Automatic spelling"
 msgstr "Verificação automática"
 

-#: src/prefs_spelling.c:226
+#: src/prefs_spelling.c:223

 msgid "Re-check message when changing dictionary"
 msgstr "Verificar novamente as mensagens ao trocar o dicionário"
 
 msgid "Re-check message when changing dictionary"
 msgstr "Verificar novamente as mensagens ao trocar o dicionário"
 

-#: src/prefs_spelling.c:230
+#: src/prefs_spelling.c:227

 msgid "Dictionary"
 msgstr "Dicionário"
 
 msgid "Dictionary"
 msgstr "Dicionário"
 

-#: src/prefs_spelling.c:243
+#: src/prefs_spelling.c:240

 msgid "Default dictionary"
 msgstr "Dicionário padrão"
 
 msgid "Default dictionary"
 msgstr "Dicionário padrão"
 

-#: src/prefs_spelling.c:261
+#: src/prefs_spelling.c:258
+msgid "Default alternate dictionary"
+msgstr "Dicionário alternativo padrão"
+
+#: src/prefs_spelling.c:277
+msgid "Check with both dictionaries"
+msgstr "Checar com ambos os dicionários"
+
+#: src/prefs_spelling.c:283

 msgid "Default suggestion mode"
 msgstr "Modo padrão de sugestões"
 
 msgid "Default suggestion mode"
 msgstr "Modo padrão de sugestões"
 

-#: src/prefs_spelling.c:283
+#: src/prefs_spelling.c:305

 msgid "Misspelled word color"
 msgstr "Cor para os erros de grafia"
 
 msgid "Misspelled word color"
 msgstr "Cor para os erros de grafia"
 

-#: src/prefs_spelling.c:297
+#: src/prefs_spelling.c:319

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Selecione uma cor para as palavra erradas. Escolha preto para sublinhar"
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Selecione uma cor para as palavra erradas. Escolha preto para sublinhar"
 

-#: src/prefs_spelling.c:402
+#: src/prefs_spelling.c:449

 msgid "Spell Checking"
 msgstr "Verificador ortográfico"
 
 msgid "Spell Checking"
 msgstr "Verificador ortográfico"
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr "o nome abreviado do dia da semana"
 
 msgid "the full abbreviated weekday name"
 msgstr "o nome abreviado do dia da semana"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr "o nome abreviado do mês"
 
 msgid "the abbreviated month name"
 msgstr "o nome abreviado do mês"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr "o nome completo do mês"
 
 msgid "the full month name"
 msgstr "o nome completo do mês"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr "a data e as horas preferidas para o locale atual"
 
 msgid "the preferred date and time for the current locale"
 msgstr "a data e as horas preferidas para o locale atual"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês"
 
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "as horas no formato 24 horas"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "as horas no formato 24 horas"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "as horas no formato 12 horas"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "as horas no formato 12 horas"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano"
 
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr "os minutos"
 
 msgid "the minute as a decimal number"
 msgstr "os minutos"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr "usar AM ou PM"
 
 msgid "either AM or PM"
 msgstr "usar AM ou PM"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr "os segundos"
 
 msgid "the second as a decimal number"
 msgstr "os segundos"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr "a data preferida para o locale atual"
 
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para o locale atual"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr "os dois últimos dígitos do ano"
 
 msgid "the last two digits of a year"
 msgstr "os dois últimos dígitos do ano"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr "o ano"
 
 msgid "the year as a decimal number"
 msgstr "o ano"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr "o fuso horário, o nome ou a abreviação"
 
 msgid "the time zone or name or abbreviation"
 msgstr "o fuso horário, o nome ou a abreviação"
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:181
+#: src/prefs_summaries.c:229
+#: src/prefs_summaries.c:911

 msgid "Date format"
 msgstr "Formato da data"
 
 msgid "Date format"
 msgstr "Formato da data"
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr "Código"
 
 msgid "Specifier"
 msgstr "Código"
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr "Exemplo"
 
 msgid "Example"
 msgstr "Exemplo"
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Select key bindings"
 msgstr "Definir associações das teclas"
 
 msgid "Select key bindings"
 msgstr "Definir associações das teclas"
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr "Selecionar pré-configuração:"
 
 msgid "Select preset:"
 msgstr "Selecionar pré-configuração:"
 

-#: src/prefs_summaries.c:352 src/prefs_summaries.c:699
+#: src/prefs_summaries.c:353
+#: src/prefs_summaries.c:700

 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:361

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."


@@ -9808,127 +10416,120 @@ msgstr ""
 "Você também pode modificar os atalhos de menu pressionando\n"
 "a(s) tecla(s) ao colocar o ponteiro do mouse sobre o item."
 
 "Você também pode modificar os atalhos de menu pressionando\n"
 "a(s) tecla(s) ao colocar o ponteiro do mouse sobre o item."
 

-#: src/prefs_summaries.c:767
-msgid "Translate header names"
-msgstr "Traduzir os nomes do cabeçalho"
-
-#: src/prefs_summaries.c:769
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"A exibição dos cabeçalhos padrão (como 'From:', 'Subject:') será traduzida "
-"para o seu idioma."
-
-#: src/prefs_summaries.c:773
+#: src/prefs_summaries.c:768

 msgid "Display unread number next to folder name"
 msgstr "Exibir número de mensagens não lidas ao lado do nome da pasta"
 
 msgid "Display unread number next to folder name"
 msgstr "Exibir número de mensagens não lidas ao lado do nome da pasta"
 

-#: src/prefs_summaries.c:780
+#: src/prefs_summaries.c:775

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nomes de newsgroup maiores que"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nomes de newsgroup maiores que"
 

-#: src/prefs_summaries.c:794
+#: src/prefs_summaries.c:789

 msgid "letters"
 msgstr "letras"
 
 #: src/prefs_summaries.c:807
 msgid "letters"
 msgstr "letras"
 
 #: src/prefs_summaries.c:807

-msgid "Display sender using address book"
-msgstr "Nomear o remetente utilizando o Livro de Endereços"
-
-#: src/prefs_summaries.c:810
-msgid "Thread using subject in addition to standard headers"
-msgstr "Agrupar utilizando o assunto além dos cabeçalhos padrão"
-
-#: src/prefs_summaries.c:833
-msgid "Date format help"
-msgstr "Ajuda do formato da data"
-
-#: src/prefs_summaries.c:837
-msgid "Set displayed columns"
-msgstr "Definir colunas visíveis"
-
-#: src/prefs_summaries.c:845
-msgid " Folder list... "
-msgstr " Lista de pastas... "
-
-#: src/prefs_summaries.c:853
-msgid " Message list... "
-msgstr " Lista de mensagens... "
-
-#: src/prefs_summaries.c:874
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Executar imediatamente ao mover ou apagar mensagens"
+msgid "Message list"
+msgstr "Lista de mensagens"

 
 

-#: src/prefs_summaries.c:876
-msgid "Messages will be marked until execution if this is turned off"
-msgstr "Se essa opção estiver desativada as mensagens serão marcadas até a execução"
-
-#: src/prefs_summaries.c:882
-msgid "Confirm before marking all mails in a folder as read"
-msgstr "Confirmar antes de marcar todas as mensagens da pasta como lidas"
-
-#: src/prefs_summaries.c:886
-msgid "Always open message when selected"
-msgstr "Sempre abrir a mensagem ao selecioná-la"
-
-#: src/prefs_summaries.c:890
-msgid "Only mark message as read when opened in a new window"
-msgstr "Marcar a mensagem como lida somente ao abri-la em uma nova janela"
-
-#: src/prefs_summaries.c:903
+#: src/prefs_summaries.c:817

 msgid "When entering a folder"
 msgstr "Ao entrar na pasta"
 
 msgid "When entering a folder"
 msgstr "Ao entrar na pasta"
 

-#: src/prefs_summaries.c:919
+#: src/prefs_summaries.c:825

 msgid "Do nothing"
 msgstr "Não fazer nada"
 
 msgid "Do nothing"
 msgstr "Não fazer nada"
 

-#: src/prefs_summaries.c:920
+#: src/prefs_summaries.c:826

 msgid "Select first unread (or new or marked) message"
 msgstr "Selecionar a primeira mensagem não lida (ou nova ou marcada)"
 
 msgid "Select first unread (or new or marked) message"
 msgstr "Selecionar a primeira mensagem não lida (ou nova ou marcada)"
 

-#: src/prefs_summaries.c:922
+#: src/prefs_summaries.c:828

 msgid "Select first unread (or marked or new) message"
 msgstr "Selecionar a primeira mensagem não lida (ou marcada ou nova)"
 
 msgid "Select first unread (or marked or new) message"
 msgstr "Selecionar a primeira mensagem não lida (ou marcada ou nova)"
 

-#: src/prefs_summaries.c:924
+#: src/prefs_summaries.c:830

 msgid "Select first new (or unread or marked) message"
 msgstr "Selecionar a primeira mensagem nova (ou não lida ou marcada)"
 
 msgid "Select first new (or unread or marked) message"
 msgstr "Selecionar a primeira mensagem nova (ou não lida ou marcada)"
 

-#: src/prefs_summaries.c:926
+#: src/prefs_summaries.c:832

 msgid "Select first new (or marked or unread) message"
 msgstr "Selecionar a primeira mensagem nova (ou marcada ou não lida)"
 
 msgid "Select first new (or marked or unread) message"
 msgstr "Selecionar a primeira mensagem nova (ou marcada ou não lida)"
 

-#: src/prefs_summaries.c:928
+#: src/prefs_summaries.c:834

 msgid "Select first marked (or new or unread) message"
 msgstr "Selecionar a primeira mensagem marcada (ou nova ou não lida)"
 
 msgid "Select first marked (or new or unread) message"
 msgstr "Selecionar a primeira mensagem marcada (ou nova ou não lida)"
 

-#: src/prefs_summaries.c:930
+#: src/prefs_summaries.c:836

 msgid "Select first marked (or unread or new) message"
 msgstr "Selecionar a primeira mensagem marcada (ou não lida ou nova)"
 
 msgid "Select first marked (or unread or new) message"
 msgstr "Selecionar a primeira mensagem marcada (ou não lida ou nova)"
 

-#: src/prefs_summaries.c:942
+#: src/prefs_summaries.c:847

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Exibir o aviso \"nenhuma mensagem não lida (ou nova)\""
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Exibir o aviso \"nenhuma mensagem não lida (ou nova)\""
 

-#: src/prefs_summaries.c:959
+#: src/prefs_summaries.c:856

 msgid "Assume 'Yes'"
 msgstr "Assumir 'Sim'"
 
 msgid "Assume 'Yes'"
 msgstr "Assumir 'Sim'"
 

-#: src/prefs_summaries.c:961
+#: src/prefs_summaries.c:858

 msgid "Assume 'No'"
 msgstr "Assumir 'Não'"
 
 msgid "Assume 'No'"
 msgstr "Assumir 'Não'"
 

-#: src/prefs_summaries.c:970
+#: src/prefs_summaries.c:866
+msgid "Always open message when selected"
+msgstr "Sempre abrir a mensagem ao selecioná-la"
+
+#: src/prefs_summaries.c:869
+msgid "Thread using subject in addition to standard headers"
+msgstr "Agrupar utilizando o assunto além dos cabeçalhos padrão"
+
+#: src/prefs_summaries.c:875
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Executar imediatamente ao mover ou apagar mensagens"
+
+#: src/prefs_summaries.c:877
+msgid "Defers moving, copying and deleting of messages until you choose 'Tools/Execute'"
+msgstr "Adiar a movimentação, cópia ou exclusão as mensagens até que se selecione 'Ferramentas/Executar'"
+
+#: src/prefs_summaries.c:882
+msgid "Only mark message as read when opened in a new window"
+msgstr "Marcar a mensagem como lida somente ao abri-la em uma nova janela"
+
+#: src/prefs_summaries.c:889
+msgid "Mark messages as read after"
+msgstr "Marcar mensagens como lidas após"
+
+#: src/prefs_summaries.c:905
+msgid "Display sender using address book"
+msgstr "Nomear o remetente utilizando o Livro de Endereços"
+
+#: src/prefs_summaries.c:937
+msgid "Date format help"
+msgstr "Ajuda do formato da data"
+
+#: src/prefs_summaries.c:955
+msgid "Confirm before marking all mails in a folder as read"
+msgstr "Confirmar antes de marcar todas as mensagens da pasta como lidas"
+
+#: src/prefs_summaries.c:958
+msgid "Translate header names"
+msgstr "Traduzir os nomes do cabeçalho"
+
+#: src/prefs_summaries.c:960
+msgid "The display of standard headers (such as 'From:', 'Subject:') will be translated into your language."
+msgstr "A exibição dos cabeçalhos padrão (como 'From:', 'Subject:') será traduzida para o seu idioma."
+
+#: src/prefs_summaries.c:967

 msgid " Set key bindings... "
 msgstr " Definir associações das teclas... "
 
 msgid " Set key bindings... "
 msgstr " Definir associações das teclas... "
 

-#: src/prefs_summaries.c:1077
+#: src/prefs_summaries.c:1079

 msgid "Summaries"
 msgstr "Sumários"
 
 msgid "Summaries"
 msgstr "Sumários"
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2359
+#: src/prefs_summary_column.c:81
+#: src/summaryview.c:2360

 msgid "Attachment"
 msgstr "Anexos"
 
 msgid "Attachment"
 msgstr "Anexos"
 


@@ -9952,39 +10553,36 @@ msgstr ""
 msgid "This name is used as the Menu item"
 msgstr "Esse nome é usado como um item do menu"
 
 msgid "This name is used as the Menu item"
 msgstr "Esse nome é usado como um item do menu"
 

-#: src/prefs_template.c:276
+#: src/prefs_template.c:286

 msgid " Symbols... "
 msgstr " Símbolos... "
 
 msgid " Symbols... "
 msgstr " Símbolos... "
 

-#: src/prefs_template.c:305
+#: src/prefs_template.c:315

 msgid "Template configuration"
 msgstr "Configuração dos modelos"
 
 msgid "Template configuration"
 msgstr "Configuração dos modelos"
 

-#: src/prefs_template.c:526
-msgid "Template format error."
-msgstr "Erro no formato do modelo."
-
-#: src/prefs_template.c:536
+#: src/prefs_template.c:557

 msgid "Template name is not set."
 msgstr "O nome do modelo não foi definido."
 
 msgid "Template name is not set."
 msgstr "O nome do modelo não foi definido."
 

-#: src/prefs_template.c:625
+#: src/prefs_template.c:667

 msgid "Delete template"
 msgstr "Excluir modelo"
 
 msgid "Delete template"
 msgstr "Excluir modelo"
 

-#: src/prefs_template.c:626
+#: src/prefs_template.c:668

 msgid "Do you really want to delete this template?"
 msgstr "Deseja realmente excluir esse modelo?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Deseja realmente excluir esse modelo?"
 

-#: src/prefs_template.c:763
+#: src/prefs_template.c:805

 msgid "Current templates"
 msgstr "Modelos atuais"
 
 msgid "Current templates"
 msgstr "Modelos atuais"
 

-#: src/prefs_template.c:788
+#: src/prefs_template.c:830

 msgid "Template"
 msgstr "Modelo"
 
 msgid "Template"
 msgstr "Modelo"
 

-#: src/prefs_themes.c:339 src/prefs_themes.c:705
+#: src/prefs_themes.c:339
+#: src/prefs_themes.c:705

 msgid "Default internal theme"
 msgstr "Tema interno padrão"
 
 msgid "Default internal theme"
 msgstr "Tema interno padrão"
 


@@ -10082,10 +10680,6 @@ msgstr ""
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d temas disponíveis (%d do usuário, %d do sistema, 1 interno)"
 
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d temas disponíveis (%d do usuário, %d do sistema, 1 interno)"
 

-#: src/prefs_themes.c:706
-msgid "The Sylpheed-Claws Team"
-msgstr "A equipe do Sylpheed-Claws"
-

 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"


@@ -10161,8 +10755,8 @@ msgid "Message view toolbar configuration"
 msgstr "Configuração da barra de ferramentas da janela de mensagem"
 
 #: src/prefs_toolbar.c:643
 msgstr "Configuração da barra de ferramentas da janela de mensagem"
 
 #: src/prefs_toolbar.c:643

-msgid "Sylpheed-Claws Action"
-msgstr "Ação do Sylpheed-Claws"
+msgid "Claws Mail Action"
+msgstr "Ação do Claws Mail"

 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"
 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"


@@ -10180,7 +10774,9 @@ msgstr "Evento executado ao clicar"
 msgid "Displayed toolbar items"
 msgstr "Itens exibidos na barra de ferramentas"
 
 msgid "Displayed toolbar items"
 msgstr "Itens exibidos na barra de ferramentas"
 

-#: src/prefs_toolbar.c:874 src/prefs_toolbar.c:888 src/prefs_toolbar.c:902
+#: src/prefs_toolbar.c:874
+#: src/prefs_toolbar.c:888
+#: src/prefs_toolbar.c:902

 msgid "Customize Toolbars"
 msgstr "Personalizar a barra de ferramentas"
 
 msgid "Customize Toolbars"
 msgstr "Personalizar a barra de ferramentas"
 


@@ -10232,11 +10828,8 @@ msgstr "Quebra de linhas"
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 

-#: src/privacy.c:211 src/privacy.c:215 src/privacy.c:232 src/privacy.c:236
-msgid "No signature found"
-msgstr "Não foi encontrada nenhuma assinatura"
-
-#: src/privacy.c:217 src/privacy.c:238
+#: src/privacy.c:217
+#: src/privacy.c:238

 msgid "No information available"
 msgstr "Não existe informação disponível"
 
 msgid "No information available"
 msgstr "Não existe informação disponível"
 


@@ -10244,62 +10837,56 @@ msgstr "Não existe informação disponível"
 msgid "No recipient keys defined."
 msgstr "Não foi definida nenhuma chave de destinatário."
 
 msgid "No recipient keys defined."
 msgstr "Não foi definida nenhuma chave de destinatário."
 

-#: src/procmime.c:340 src/procmime.c:342
+#: src/procmime.c:340
+#: src/procmime.c:342

 msgid "[Error decoding BASE64]\n"
 msgstr "[Erro ao decodificar BASE64]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Erro ao decodificar BASE64]\n"
 

-#: src/procmsg.c:908 src/procmsg.c:911
+#: src/procmsg.c:918
+#: src/procmsg.c:921

 msgid "Already trying to send."
 msgstr "Ainda tentando envia."
 
 msgid "Already trying to send."
 msgstr "Ainda tentando envia."
 

-#: src/procmsg.c:1499
+#: src/procmsg.c:1515

 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Não foi possível abrir o arquivo %s."
 

-#: src/procmsg.c:1593
+#: src/procmsg.c:1613

 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Não foi possível criptografar a mensagem: %s"
 
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Não foi possível criptografar a mensagem: %s"
 

-#: src/procmsg.c:1626
+#: src/procmsg.c:1646

 msgid "Queued message header is broken."
 msgstr "O cabeçalho da mensagem na Fila de Saída está com problema."
 
 msgid "Queued message header is broken."
 msgstr "O cabeçalho da mensagem na Fila de Saída está com problema."
 

-#: src/procmsg.c:1647
+#: src/procmsg.c:1667

 msgid "An error happened during SMTP session."
 msgstr "Ocorreu um erro durante a seção SMTP."
 
 msgid "An error happened during SMTP session."
 msgstr "Ocorreu um erro durante a seção SMTP."
 

-#: src/procmsg.c:1661
-msgid ""
-"No specific account has been found to send, and an error happened during "
-"SMTP session."
-msgstr ""
-"Não foi encontrada nenhuma conta específica para o envio e ocorreu um erro "
-"durante a seção SMTP."
+#: src/procmsg.c:1681
+msgid "No specific account has been found to send, and an error happened during SMTP session."
+msgstr "Não foi encontrada nenhuma conta específica para o envio e ocorreu um erro durante a seção SMTP."

 
 

-#: src/procmsg.c:1669
-msgid ""
-"Couldn't determine sending informations. Maybe the email hasn't been "
-"generated by Sylpheed-Claws."
-msgstr ""
-"Não foi possível determinar as informações de envio. Talvez essa mensagem "
-"não tenha sido gerada pelo Sylpheed-Claws."
+#: src/procmsg.c:1689
+msgid "Couldn't determine sending informations. Maybe the email hasn't been generated by Claws Mail."
+msgstr "Não foi possível determinar as informações de envio. Talvez essa mensagem não tenha sido gerada pelo Claws Mail."

 
 

-#: src/procmsg.c:1687
+#: src/procmsg.c:1707

 msgid "Couldn't create temporary file for news sending."
 msgstr "Não foi possível criar o arquivo temporário para envio do artigo."
 
 msgid "Couldn't create temporary file for news sending."
 msgstr "Não foi possível criar o arquivo temporário para envio do artigo."
 

-#: src/procmsg.c:1700
+#: src/procmsg.c:1720

 msgid "Error when writing temporary file for news sending."
 msgstr "Erro ao gravar no arquivo temporário para envio do artigo."
 
 msgid "Error when writing temporary file for news sending."
 msgstr "Erro ao gravar no arquivo temporário para envio do artigo."
 

-#: src/procmsg.c:1714
+#: src/procmsg.c:1734

 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocorreu um erro durante o envio da mensagem para %s."
 
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Ocorreu um erro durante o envio da mensagem para %s."
 

-#: src/procmsg.c:2194
+#: src/procmsg.c:2214

 msgid "Filtering messages...\n"
 msgstr "Filtrando as mensagens...\n"
 
 msgid "Filtering messages...\n"
 msgstr "Filtrando as mensagens...\n"
 


@@ -10460,12 +11047,12 @@ msgstr "Descrição dos símbolos"
 msgid "The following symbols can be used:"
 msgstr "Podem ser utilizados os seguintes símbolos:"
 
 msgid "The following symbols can be used:"
 msgstr "Podem ser utilizados os seguintes símbolos:"
 

-#: src/quote_fmt_parse.y:461
+#: src/quote_fmt_parse.y:464

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Digite o texto para substituir '%s'"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Digite o texto para substituir '%s'"
 

-#: src/quote_fmt_parse.y:462
+#: src/quote_fmt_parse.y:465

 msgid "Enter variable"
 msgstr "Digite a variável"
 
 msgid "Enter variable"
 msgstr "Digite a variável"
 


@@ -10509,11 +11096,14 @@ msgstr "A mensagem foi enviada com sucesso."
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 

-#: src/send_message.c:463 src/send_message.c:468 src/send_message.c:473
+#: src/send_message.c:463
+#: src/send_message.c:468
+#: src/send_message.c:473

 msgid "Authenticating"
 msgstr "Autenticando"
 
 msgid "Authenticating"
 msgstr "Autenticando"
 

-#: src/send_message.c:464 src/send_message.c:469
+#: src/send_message.c:464
+#: src/send_message.c:469

 msgid "Sending message..."
 msgstr "Enviando a mensagem..."
 
 msgid "Sending message..."
 msgstr "Enviando a mensagem..."
 


@@ -10546,7 +11136,8 @@ msgstr "Enviando a mensagem (%d / %d bytes)"
 msgid "Sending message"
 msgstr "Enviando a mensagem"
 
 msgid "Sending message"
 msgstr "Enviando a mensagem"
 

-#: src/send_message.c:613 src/send_message.c:633
+#: src/send_message.c:613
+#: src/send_message.c:633

 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro durante o envio da mensagem."
 
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro durante o envio da mensagem."
 


@@ -10588,47 +11179,47 @@ msgstr "%s - Código-fonte"
 msgid "Saved SSL Certificates"
 msgstr "Certificados SSL salvos"
 
 msgid "Saved SSL Certificates"
 msgstr "Certificados SSL salvos"
 

-#: src/ssl_manager.c:386
+#: src/ssl_manager.c:428

 msgid "Delete certificate"
 msgstr "Excluir certificado"
 
 msgid "Delete certificate"
 msgstr "Excluir certificado"
 

-#: src/ssl_manager.c:387
+#: src/ssl_manager.c:429

 msgid "Do you really want to delete this certificate?"
 msgstr "Deseja realmente excluir esse certificado?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Deseja realmente excluir esse certificado?"
 

-#: src/summary_search.c:202
+#: src/summary_search.c:230

 msgid "Search messages"
 msgstr "Procurar mensagens"
 
 msgid "Search messages"
 msgstr "Procurar mensagens"
 

-#: src/summary_search.c:224
+#: src/summary_search.c:252

 msgid "Match any of the following"
 msgstr "Correspondente a qualquer um dos seguintes"
 
 msgid "Match any of the following"
 msgstr "Correspondente a qualquer um dos seguintes"
 

-#: src/summary_search.c:225
+#: src/summary_search.c:253

 msgid "Match all of the following"
 msgstr "Corresponder a todos os seguintes"
 
 msgid "Match all of the following"
 msgstr "Corresponder a todos os seguintes"
 

-#: src/summary_search.c:284
+#: src/summary_search.c:352

 msgid "From:"
 msgstr "De:"
 
 msgid "From:"
 msgstr "De:"
 

-#: src/summary_search.c:305
+#: src/summary_search.c:373

 msgid "Body:"
 msgstr "Corpo:"
 
 msgid "Body:"
 msgstr "Corpo:"
 

-#: src/summary_search.c:312
+#: src/summary_search.c:380

 msgid "Condition:"
 msgstr "Condição:"
 
 msgid "Condition:"
 msgstr "Condição:"
 

-#: src/summary_search.c:342
+#: src/summary_search.c:410

 msgid "Find _all"
 msgstr "Localizar _todas"
 
 msgid "Find _all"
 msgstr "Localizar _todas"
 

-#: src/summary_search.c:543
+#: src/summary_search.c:645

 msgid "Beginning of list reached; continue from end?"
 msgstr "O início da lista foi atingido; continuar a partir do final?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "O início da lista foi atingido; continuar a partir do final?"
 

-#: src/summary_search.c:545
+#: src/summary_search.c:647

 msgid "End of list reached; continue from beginning?"
 msgstr "O final da lista foi atingido; continuar a partir do início?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "O final da lista foi atingido; continuar a partir do início?"
 


@@ -10652,11 +11243,13 @@ msgstr "/Responder _para/o _remetente"
 msgid "/Repl_y to/mailing _list"
 msgstr "/Responder _para/_lista de discussão"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Responder _para/_lista de discussão"
 

-#: src/summaryview.c:424 src/toolbar.c:234
+#: src/summaryview.c:424
+#: src/toolbar.c:239

 msgid "/_Forward"
 msgstr "/_Encaminhar"
 
 msgid "/_Forward"
 msgstr "/_Encaminhar"
 

-#: src/summaryview.c:425 src/toolbar.c:235
+#: src/summaryview.c:425
+#: src/toolbar.c:240

 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como _anexo"
 
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como _anexo"
 


@@ -10692,7 +11285,9 @@ msgstr "/_Marcar/_Marcar"
 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 
 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 

-#: src/summaryview.c:436 src/summaryview.c:442 src/summaryview.c:445
+#: src/summaryview.c:436
+#: src/summaryview.c:442
+#: src/summaryview.c:445

 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 


@@ -10809,7 +11404,8 @@ msgstr "Foram deixadas algumas marcas. Processá-las?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 

-#: src/summaryview.c:1509 src/summaryview.c:1561
+#: src/summaryview.c:1509
+#: src/summaryview.c:1561

 msgid "No more unread messages"
 msgstr "Não há mais mensagens não-lidas"
 
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não-lidas"
 


@@ -10817,8 +11413,11 @@ msgstr "Não há mais mensagens não-lidas"
 msgid "No unread message found. Search from the end?"
 msgstr "Não foram encontradas mensagens não lidas. Procurar a partir do fim?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Não foram encontradas mensagens não lidas. Procurar a partir do fim?"
 

-#: src/summaryview.c:1522 src/summaryview.c:1574 src/summaryview.c:1621
-#: src/summaryview.c:1673 src/summaryview.c:1752
+#: src/summaryview.c:1522
+#: src/summaryview.c:1574
+#: src/summaryview.c:1621
+#: src/summaryview.c:1673
+#: src/summaryview.c:1752

 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Erro interno: valor não esperado para prefs_common.next_unread_msg_dialog\n"
 
 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Erro interno: valor não esperado para prefs_common.next_unread_msg_dialog\n"
 


@@ -10830,7 +11429,8 @@ msgstr "Não há mensagens não lidas."
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 

-#: src/summaryview.c:1608 src/summaryview.c:1660
+#: src/summaryview.c:1608
+#: src/summaryview.c:1660

 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 


@@ -10846,7 +11446,8 @@ msgstr "Não há mensagens novas."
 msgid "No new message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens novas. Ir para a próxima pasta?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens novas. Ir para a próxima pasta?"
 

-#: src/summaryview.c:1698 src/summaryview.c:1739
+#: src/summaryview.c:1698
+#: src/summaryview.c:1739

 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 


@@ -10862,7 +11463,8 @@ msgstr "Não há mensagens marcadas."
 msgid "No marked message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens marcadas. Ir para a próxima pasta?"
 
 msgid "No marked message found. Go to next folder?"
 msgstr "Não foram encontradas mensagens marcadas. Ir para a próxima pasta?"
 

-#: src/summaryview.c:1777 src/summaryview.c:1802
+#: src/summaryview.c:1777
+#: src/summaryview.c:1802

 msgid "No more labeled messages"
 msgstr "Não há mais mensagens rotuladas"
 
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens rotuladas"
 


@@ -10870,7 +11472,8 @@ msgstr "Não há mais mensagens rotuladas"
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens rotuladas. Procurar desde o fim?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens rotuladas. Procurar desde o fim?"
 

-#: src/summaryview.c:1787 src/summaryview.c:1812
+#: src/summaryview.c:1787
+#: src/summaryview.c:1812

 msgid "No labeled messages."
 msgstr "Não há mensagens rotuladas."
 
 msgid "No labeled messages."
 msgstr "Não há mensagens rotuladas."
 


@@ -10892,7 +11495,8 @@ msgstr "%d excluída"
 msgid "%s%d moved"
 msgstr "%s%d movida"
 
 msgid "%s%d moved"
 msgstr "%s%d movida"
 

-#: src/summaryview.c:2257 src/summaryview.c:2264
+#: src/summaryview.c:2257
+#: src/summaryview.c:2264

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 


@@ -10914,19 +11518,19 @@ msgstr " itens selecionados"
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nova(s), %d não lida(s), %d no total (%s)"
 
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nova(s), %d não lida(s), %d no total (%s)"
 

-#: src/summaryview.c:2503
+#: src/summaryview.c:2504

 msgid "Sorting summary..."
 msgstr "Ordenando o sumário..."
 
 msgid "Sorting summary..."
 msgstr "Ordenando o sumário..."
 

-#: src/summaryview.c:2584
+#: src/summaryview.c:2585

 msgid "Setting summary from message data..."
 msgstr "Estruturando o sumário a partir dos dados das mensagens..."
 
 msgid "Setting summary from message data..."
 msgstr "Estruturando o sumário a partir dos dados das mensagens..."
 

-#: src/summaryview.c:2762
+#: src/summaryview.c:2763

 msgid "(No Date)"
 msgstr "(Sem data)"
 
 msgid "(No Date)"
 msgstr "(Sem data)"
 

-#: src/summaryview.c:2800
+#: src/summaryview.c:2801

 msgid "(No Recipient)"
 msgstr "(Sem destinatário)"
 
 msgid "(No Recipient)"
 msgstr "(Sem destinatário)"
 


@@ -10966,27 +11570,27 @@ msgstr "_Acrescentar"
 msgid "_Overwrite"
 msgstr "_Sobrescrever"
 
 msgid "_Overwrite"
 msgstr "_Sobrescrever"
 

-#: src/summaryview.c:4423
+#: src/summaryview.c:4431

 msgid "Building threads..."
 msgstr "Construindo agrupamentos..."
 
 msgid "Building threads..."
 msgstr "Construindo agrupamentos..."
 

-#: src/summaryview.c:4642
+#: src/summaryview.c:4650

 msgid "Skip these rules"
 msgstr "Ignorar essas regras"
 
 msgid "Skip these rules"
 msgstr "Ignorar essas regras"
 

-#: src/summaryview.c:4645
+#: src/summaryview.c:4653

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplicar essas regras independente da conta à qual elas pertençam"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Aplicar essas regras independente da conta à qual elas pertençam"
 

-#: src/summaryview.c:4648
+#: src/summaryview.c:4656

 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar essas regras caso elas refiram-se à conta atual"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "Aplicar essas regras caso elas refiram-se à conta atual"
 

-#: src/summaryview.c:4677
+#: src/summaryview.c:4685

 msgid "Filtering"
 msgstr "Filtragem"
 
 msgid "Filtering"
 msgstr "Filtragem"
 

-#: src/summaryview.c:4678
+#: src/summaryview.c:4686

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -10994,19 +11598,19 @@ msgstr ""
 "Essas são algumas regras de filtragem que pertencem a uma conta.\n"
 "Por favor, escolha o que fazer com essas regras:"
 
 "Essas são algumas regras de filtragem que pertencem a uma conta.\n"
 "Por favor, escolha o que fazer com essas regras:"
 

-#: src/summaryview.c:4680
+#: src/summaryview.c:4688

 msgid "+_Filter"
 msgstr "+_Filtrar"
 
 msgid "+_Filter"
 msgstr "+_Filtrar"
 

-#: src/summaryview.c:4707
+#: src/summaryview.c:4715

 msgid "Filtering..."
 msgstr "Filtrando..."
 
 msgid "Filtering..."
 msgstr "Filtrando..."
 

-#: src/summaryview.c:4780
+#: src/summaryview.c:4788

 msgid "Processing configuration"
 msgstr "Configuração do processamento"
 
 msgid "Processing configuration"
 msgstr "Configuração do processamento"
 

-#: src/summaryview.c:6220
+#: src/summaryview.c:6233

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -11045,7 +11649,7 @@ msgstr "[%s  %s (%d bytes)]"
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 

-#: src/textview.c:811
+#: src/textview.c:812

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -11059,79 +11663,79 @@ msgstr ""
 "\n"
 "  Use "
 
 "\n"
 "  Use "
 

-#: src/textview.c:816
+#: src/textview.c:817

 msgid "'View Log'"
 msgstr "'Ver relatório'"
 
 msgid "'View Log'"
 msgstr "'Ver relatório'"
 

-#: src/textview.c:817
+#: src/textview.c:818

 msgid " in the Tools menu for more information."
 msgstr " no menu Ferramentas para mais informações."
 
 msgid " in the Tools menu for more information."
 msgstr " no menu Ferramentas para mais informações."
 

-#: src/textview.c:838
+#: src/textview.c:839

 msgid "  The following can be performed on this part by\n"
 msgstr "  Pode-se efetuar o seguinte nessa parte através de\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  Pode-se efetuar o seguinte nessa parte através de\n"
 

-#: src/textview.c:839
+#: src/textview.c:840

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  um clique com o botão direito no ícone ou no item da lista:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  um clique com o botão direito no ícone ou no item da lista:\n"
 

-#: src/textview.c:841
+#: src/textview.c:842

 msgid "     - To save, select "
 msgstr "     - Para salvar, selecione  "
 
 msgid "     - To save, select "
 msgstr "     - Para salvar, selecione  "
 

-#: src/textview.c:842
+#: src/textview.c:843

 msgid "'Save as...'"
 msgstr "'Salvar como...'"
 
 msgid "'Save as...'"
 msgstr "'Salvar como...'"
 

-#: src/textview.c:843
+#: src/textview.c:844

 msgid " (Shortcut key: 'y')\n"
 msgstr " (Tecla de atalho: 'y')\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (Tecla de atalho: 'y')\n"
 

-#: src/textview.c:844
+#: src/textview.c:845

 msgid "     - To display as text, select "
 msgstr "     - Para exibir como texto, selecione "
 
 msgid "     - To display as text, select "
 msgstr "     - Para exibir como texto, selecione "
 

-#: src/textview.c:845
+#: src/textview.c:846

 msgid "'Display as text'"
 msgstr "'Mostrar como texto'"
 
 msgid "'Display as text'"
 msgstr "'Mostrar como texto'"
 

-#: src/textview.c:846
+#: src/textview.c:847

 msgid " (Shortcut key: 't')\n"
 msgstr " (Tecla de atalho: 't')\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (Tecla de atalho: 't')\n"
 

-#: src/textview.c:847
+#: src/textview.c:848

 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir com um programa externo, selecione "
 
 msgid "     - To open with an external program, select "
 msgstr "     - Para abrir com um programa externo, selecione "
 

-#: src/textview.c:848
+#: src/textview.c:849

 msgid "'Open'"
 msgstr "'Abrir'"
 
 msgid "'Open'"
 msgstr "'Abrir'"
 

-#: src/textview.c:849
+#: src/textview.c:850

 msgid " (Shortcut key: 'l')\n"
 msgstr " (Tecla de atalho: 'l'),\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (Tecla de atalho: 'l'),\n"
 

-#: src/textview.c:850
+#: src/textview.c:851

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente, dê um duplo clique ou clique com o "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alternativamente, dê um duplo clique ou clique com o "
 

-#: src/textview.c:851
+#: src/textview.c:852

 msgid "mouse button)\n"
 msgstr "botão do meio do mouse)\n"
 
 msgid "mouse button)\n"
 msgstr "botão do meio do mouse)\n"
 

-#: src/textview.c:852
+#: src/textview.c:853

 msgid "     - Or use "
 msgstr "     - Ou use "
 
 msgid "     - Or use "
 msgstr "     - Ou use "
 

-#: src/textview.c:853
+#: src/textview.c:854

 msgid "'Open with...'"
 msgstr "'Abrir com...'"
 
 msgid "'Open with...'"
 msgstr "'Abrir com...'"
 

-#: src/textview.c:854
+#: src/textview.c:855

 msgid " (Shortcut key: 'o')\n"
 msgstr " (Tecla de atalho: 'o')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (Tecla de atalho: 'o')\n"
 

-#: src/textview.c:943
+#: src/textview.c:944

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -11142,7 +11746,7 @@ msgstr ""
 "    %s\n"
 "Código de saída %d\n"
 
 "    %s\n"
 "Código de saída %d\n"
 

-#: src/textview.c:2488
+#: src/textview.c:2492

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -11161,226 +11765,277 @@ msgstr ""
 "\n"
 "Deseja abrir mesmo assim?"
 
 "\n"
 "Deseja abrir mesmo assim?"
 

-#: src/textview.c:2497
+#: src/textview.c:2501

 msgid "Phishing attempt warning"
 msgstr "Aviso de tentativa de fraude por phishing"
 
 msgid "Phishing attempt warning"
 msgstr "Aviso de tentativa de fraude por phishing"
 

-#: src/textview.c:2498
+#: src/textview.c:2502

 msgid "_Open URL"
 msgstr "_Abrir URL"
 
 msgid "_Open URL"
 msgstr "_Abrir URL"
 

-#: src/toolbar.c:162 src/toolbar.c:1486
+#: src/toolbar.c:166
+#: src/toolbar.c:1535

 msgid "Receive Mail on all Accounts"
 msgstr "Receber mensagens de todas as contas"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Receber mensagens de todas as contas"
 

-#: src/toolbar.c:163 src/toolbar.c:1500
+#: src/toolbar.c:167
+#: src/toolbar.c:1549

 msgid "Receive Mail on current Account"
 msgstr "Receber mensagens da conta atual"
 
 msgid "Receive Mail on current Account"
 msgstr "Receber mensagens da conta atual"
 

-#: src/toolbar.c:164 src/toolbar.c:1506
+#: src/toolbar.c:168
+#: src/toolbar.c:1555

 msgid "Send Queued Messages"
 msgstr "Enviar mensagens da Fila de Saída"
 
 msgid "Send Queued Messages"
 msgstr "Enviar mensagens da Fila de Saída"
 

-#: src/toolbar.c:165 src/toolbar.c:1519
+#: src/toolbar.c:169
+#: src/toolbar.c:1568

 msgid "Compose Email"
 msgstr "Escrever e-mail"
 
 msgid "Compose Email"
 msgstr "Escrever e-mail"
 

-#: src/toolbar.c:166 src/toolbar.c:1523
+#: src/toolbar.c:170
+#: src/toolbar.c:1572

 msgid "Compose News"
 msgstr "Escrever artigo"
 
 msgid "Compose News"
 msgstr "Escrever artigo"
 

-#: src/toolbar.c:167 src/toolbar.c:1554 src/toolbar.c:1564
+#: src/toolbar.c:171
+#: src/toolbar.c:1614
+#: src/toolbar.c:1624

 msgid "Reply to Message"
 msgstr "Responder à mensagem"
 
 msgid "Reply to Message"
 msgstr "Responder à mensagem"
 

-#: src/toolbar.c:168 src/toolbar.c:1571 src/toolbar.c:1581
+#: src/toolbar.c:172
+#: src/toolbar.c:1631
+#: src/toolbar.c:1641

 msgid "Reply to Sender"
 msgstr "Responder ao remetente"
 
 msgid "Reply to Sender"
 msgstr "Responder ao remetente"
 

-#: src/toolbar.c:169 src/toolbar.c:1588 src/toolbar.c:1598
+#: src/toolbar.c:173
+#: src/toolbar.c:1648
+#: src/toolbar.c:1658

 msgid "Reply to All"
 msgstr "Responder a todos"
 
 msgid "Reply to All"
 msgstr "Responder a todos"
 

-#: src/toolbar.c:170 src/toolbar.c:1605 src/toolbar.c:1615
+#: src/toolbar.c:174
+#: src/toolbar.c:1665
+#: src/toolbar.c:1675

 msgid "Reply to Mailing-list"
 msgstr "Responder à lista de discussão"
 
 msgid "Reply to Mailing-list"
 msgstr "Responder à lista de discussão"
 

-#: src/toolbar.c:171 src/toolbar.c:1622 src/toolbar.c:1632
+#: src/toolbar.c:175
+#: src/toolbar.c:1682
+#: src/toolbar.c:1692

 msgid "Forward Message"
 msgstr "Encaminhar a mensagem"
 
 msgid "Forward Message"
 msgstr "Encaminhar a mensagem"
 

-#: src/toolbar.c:172 src/toolbar.c:1639
+#: src/toolbar.c:176
+#: src/toolbar.c:1699

 msgid "Trash Message"
 msgstr "Enviar a mensagem para a Lixeira"
 
 msgid "Trash Message"
 msgstr "Enviar a mensagem para a Lixeira"
 

-#: src/toolbar.c:173 src/toolbar.c:1645
+#: src/toolbar.c:177
+#: src/toolbar.c:1705

 msgid "Delete Message"
 msgstr "Excluir a mensagem"
 
 msgid "Delete Message"
 msgstr "Excluir a mensagem"
 

-#: src/toolbar.c:175 src/toolbar.c:1657
+#: src/toolbar.c:179
+#: src/toolbar.c:1717

 msgid "Go to Previous Unread Message"
 msgstr "Ir para a mensagem não lida anterior"
 
 msgid "Go to Previous Unread Message"
 msgstr "Ir para a mensagem não lida anterior"
 

-#: src/toolbar.c:176 src/toolbar.c:1664
+#: src/toolbar.c:180
+#: src/toolbar.c:1724

 msgid "Go to Next Unread Message"
 msgstr "Ir para a próxima mensagem não lida"
 
 msgid "Go to Next Unread Message"
 msgstr "Ir para a próxima mensagem não lida"
 

-#: src/toolbar.c:179
+#: src/toolbar.c:183

 msgid "Learn Spam or Ham"
 msgstr "Aprender Spam ou Ham (não spam)"
 
 msgid "Learn Spam or Ham"
 msgstr "Aprender Spam ou Ham (não spam)"
 

-#: src/toolbar.c:181 src/toolbar.c:1673
+#: src/toolbar.c:185
+#: src/toolbar.c:1733

 msgid "Send Message"
 msgstr "Enviar a mensagem"
 
 msgid "Send Message"
 msgstr "Enviar a mensagem"
 

-#: src/toolbar.c:182 src/toolbar.c:1679
+#: src/toolbar.c:186
+#: src/toolbar.c:1739

 msgid "Put into queue folder and send later"
 msgstr "Armazenar na Fila de Saída e enviar mais tarde"
 
 msgid "Put into queue folder and send later"
 msgstr "Armazenar na Fila de Saída e enviar mais tarde"
 

-#: src/toolbar.c:183 src/toolbar.c:1685
+#: src/toolbar.c:187
+#: src/toolbar.c:1745

 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 
 msgid "Save to draft folder"
 msgstr "Salvar na pasta Rascunho"
 

-#: src/toolbar.c:184 src/toolbar.c:1691
+#: src/toolbar.c:188
+#: src/toolbar.c:1751

 msgid "Insert file"
 msgstr "Inserir arquivo"
 
 msgid "Insert file"
 msgstr "Inserir arquivo"
 

-#: src/toolbar.c:185 src/toolbar.c:1697
+#: src/toolbar.c:189
+#: src/toolbar.c:1757

 msgid "Attach file"
 msgstr "Anexar arquivo"
 
 msgid "Attach file"
 msgstr "Anexar arquivo"
 

-#: src/toolbar.c:186 src/toolbar.c:1703
+#: src/toolbar.c:190
+#: src/toolbar.c:1763

 msgid "Insert signature"
 msgstr "Inserir assinatura"
 
 msgid "Insert signature"
 msgstr "Inserir assinatura"
 

-#: src/toolbar.c:187 src/toolbar.c:1709
+#: src/toolbar.c:191
+#: src/toolbar.c:1769

 msgid "Edit with external editor"
 msgstr "Editar com um programa externo"
 
 msgid "Edit with external editor"
 msgstr "Editar com um programa externo"
 

-#: src/toolbar.c:188 src/toolbar.c:1715
+#: src/toolbar.c:192
+#: src/toolbar.c:1775

 msgid "Wrap long lines of current paragraph"
 msgstr "Quebrar as linhas longas do parágrafo atual"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Quebrar as linhas longas do parágrafo atual"
 

-#: src/toolbar.c:189 src/toolbar.c:1721
+#: src/toolbar.c:193
+#: src/toolbar.c:1781

 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas longas"
 
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas longas"
 

-#: src/toolbar.c:192 src/toolbar.c:1734
+#: src/toolbar.c:196
+#: src/toolbar.c:1794

 msgid "Check spelling"
 msgstr "Verificar ortografia"
 
 msgid "Check spelling"
 msgstr "Verificar ortografia"
 

-#: src/toolbar.c:194
-msgid "Sylpheed-Claws Actions Feature"
-msgstr "Recurso de Ações do Sylpheed-Claws"
+#: src/toolbar.c:198
+msgid "Claws Mail Actions Feature"
+msgstr "Ações do Claws Mail"

 
 

-#: src/toolbar.c:214
+#: src/toolbar.c:199
+#: src/toolbar.c:1817
+msgid "Cancel receiving"
+msgstr "Cancelar a recepção"
+
+#: src/toolbar.c:219

 msgid "/Reply with _quote"
 msgstr "/Responder _com citação"
 
 msgid "/Reply with _quote"
 msgstr "/Responder _com citação"
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/_Reply without quote"
 msgstr "/Responder _sem citação"
 
 msgid "/_Reply without quote"
 msgstr "/Responder _sem citação"
 

-#: src/toolbar.c:219
+#: src/toolbar.c:224

 msgid "/Reply to all with _quote"
 msgstr "/Responder a _todos com citação"
 
 msgid "/Reply to all with _quote"
 msgstr "/Responder a _todos com citação"
 

-#: src/toolbar.c:220
+#: src/toolbar.c:225

 msgid "/_Reply to all without quote"
 msgstr "/Responder a t_odos sem citação"
 
 msgid "/_Reply to all without quote"
 msgstr "/Responder a t_odos sem citação"
 

-#: src/toolbar.c:224
+#: src/toolbar.c:229

 msgid "/Reply to list with _quote"
 msgstr "/Responder à _lista com citação"
 
 msgid "/Reply to list with _quote"
 msgstr "/Responder à _lista com citação"
 

-#: src/toolbar.c:225
+#: src/toolbar.c:230

 msgid "/_Reply to list without quote"
 msgstr "/Responder à l_ista sem citação"
 
 msgid "/_Reply to list without quote"
 msgstr "/Responder à l_ista sem citação"
 

-#: src/toolbar.c:229
+#: src/toolbar.c:234

 msgid "/Reply to sender with _quote"
 msgstr "/Responder ao _remetente com citação"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Responder ao _remetente com citação"
 

-#: src/toolbar.c:230
+#: src/toolbar.c:235

 msgid "/_Reply to sender without quote"
 msgstr "/Responder ao r_emetente sem citação"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Responder ao r_emetente sem citação"
 

-#: src/toolbar.c:236
+#: src/toolbar.c:241

 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 

-#: src/toolbar.c:389
+#: src/toolbar.c:245
+msgid "/Learn as _Spam"
+msgstr "/Aprender como _spam"
+
+#: src/toolbar.c:246
+msgid "/Learn as _Ham"
+msgstr "/Aprender como _ham (não spam)"
+
+#: src/toolbar.c:399

 msgid "Get Mail"
 msgstr "Receber mensagens"
 
 msgid "Get Mail"
 msgstr "Receber mensagens"
 

-#: src/toolbar.c:395 src/toolbar.c:486
+#: src/toolbar.c:403
+msgid "Toolbar|Compose"
+msgstr "Toolbar|Compor"
+
+#: src/toolbar.c:405
+#: src/toolbar.c:496

 msgid "Reply"
 msgstr "Responder"
 
 msgid "Reply"
 msgstr "Responder"
 

-#: src/toolbar.c:396 src/toolbar.c:487
+#: src/toolbar.c:406
+#: src/toolbar.c:497

 msgid "All"
 msgstr "Todos"
 
 msgid "All"
 msgstr "Todos"
 

-#: src/toolbar.c:397 src/toolbar.c:488
+#: src/toolbar.c:407
+#: src/toolbar.c:498

 msgid "Sender"
 msgstr "Remetente"
 
 msgid "Sender"
 msgstr "Remetente"
 

-#: src/toolbar.c:402 src/toolbar.c:493
+#: src/toolbar.c:412
+#: src/toolbar.c:503

 msgid "Spam"
 msgstr "Spam"
 
 msgid "Spam"
 msgstr "Spam"
 

-#: src/toolbar.c:405 src/toolbar.c:495
+#: src/toolbar.c:415
+#: src/toolbar.c:505

 msgid "Next"
 msgstr "Próxima"
 
 msgid "Next"
 msgstr "Próxima"
 

-#: src/toolbar.c:443
+#: src/toolbar.c:453

 msgid "Send later"
 msgstr "Enviar mais tarde"
 
 msgid "Send later"
 msgstr "Enviar mais tarde"
 

-#: src/toolbar.c:444
+#: src/toolbar.c:454

 msgid "Draft"
 msgstr "Rascunho"
 
 msgid "Draft"
 msgstr "Rascunho"
 

-#: src/toolbar.c:1493
+#: src/toolbar.c:1542

 msgid "Receive Mail on selected Account"
 msgstr "Receber as mensagens da conta selecionada"
 
 msgid "Receive Mail on selected Account"
 msgstr "Receber as mensagens da conta selecionada"
 

-#: src/toolbar.c:1530
+#: src/toolbar.c:1579

 msgid "Compose with selected Account"
 msgstr "Compor com a conta selecionada"
 
 msgid "Compose with selected Account"
 msgstr "Compor com a conta selecionada"
 

-#: src/toolbar.c:1536
+#: src/toolbar.c:1585

 msgid "Ham"
 msgstr "Ham (não spam)"
 
 msgid "Ham"
 msgstr "Ham (não spam)"
 

-#: src/toolbar.c:1544
+#: src/toolbar.c:1593

 msgid "Learn Spam"
 msgstr "Aprender spam"
 
 msgid "Learn Spam"
 msgstr "Aprender spam"
 

-#: src/toolbar.c:1548
+#: src/toolbar.c:1597

 msgid "Learn Ham"
 msgstr "Aprender ham (não spam)"
 
 msgid "Learn Ham"
 msgstr "Aprender ham (não spam)"
 

-#: src/wizard.c:459
-msgid "Welcome to Sylpheed-Claws "
-msgstr "Boas-vindas ao Sylpheed-Claws "
+#: src/toolbar.c:1607
+msgid "Learn as..."
+msgstr "Aprender como..."

 
 

-#: src/wizard.c:469
-msgid "Sylpheed-Claws Team"
-msgstr "A equipe do Sylpheed-Claws"
+#: src/wizard.c:461
+msgid "Welcome Mail Subject|Welcome to Claws Mail"
+msgstr "Welcome Mail Subject|Bem-vindo(a) ao Claws Mail"

 
 

-#: src/wizard.c:475
+#: src/wizard.c:484

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"

-"Welcome to Sylpheed-Claws\n"
-"-------------------------\n"
+"Welcome to Claws Mail\n"
+"---------------------\n"

 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"
 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"

-"Sylpheed-Claws has lots of extra features accessible via plugins,\n"
+"Claws Mail has lots of extra features accessible via plugins,\n"

 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"
 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"


@@ -11391,7 +12046,7 @@ msgid ""
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"

-"You can find further information in the Sylpheed-Claws manual,\n"
+"You can find further information in the Claws Mail manual,\n"

 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"
 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"


@@ -11405,7 +12060,7 @@ msgid ""
 "\n"
 "LICENSE\n"
 "-------\n"
 "\n"
 "LICENSE\n"
 "-------\n"

-"Sylpheed-Claws is free software, released under the terms\n"
+"Claws Mail is free software, released under the terms\n"

 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"


@@ -11413,24 +12068,30 @@ msgid ""
 "\n"
 "DONATIONS\n"
 "---------\n"
 "\n"
 "DONATIONS\n"
 "---------\n"

-"If you wish to donate to the Sylpheed-Claws project you can do\n"
+"If you wish to donate to the Claws Mail project you can do\n"

 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"
 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"

-"Bem-vindo ao Sylpheed-Claws\n"
+"Bem-vindo(a) ao Claws Mail\n"

 "-------------------------\n"
 "\n"
 "-------------------------\n"
 "\n"

-"Agora que você configurou sua conta é possível pegar suas\n"
+"Agora que você configurou sua conta é possível obter suas\n"

 "mensagens clicando no botão 'Receber mensagens', à esquerda\n"
 "na barra de ferramentas.\n"
 "\n"
 "mensagens clicando no botão 'Receber mensagens', à esquerda\n"
 "na barra de ferramentas.\n"
 "\n"

+"O Claws Mail possui vários recursos extra acessíveis através de\n"
+"plugins, como filtros e aprendizagem contra spam (através dos\n"
+"plugins do Bogofilter ou SpamAssassin), proteção à privacidade\n"
+"(através do PGP/Mime), um agregador RSS, uma agenda de\n"
+"compromissos e muito mais. Você pode carregá-los a partir do\n"
+"menu '/Configuração/Plugins'.\n"

 "Você pode mudar as configurações da sua conta selecionando\n"
 "o menu '/Configuração/Preferências da conta atual'.\n"
 "E pode mudar as preferências gerais em '/Configuração/Preferências'.\n"
 "\n"
 "Você pode mudar as configurações da sua conta selecionando\n"
 "o menu '/Configuração/Preferências da conta atual'.\n"
 "E pode mudar as preferências gerais em '/Configuração/Preferências'.\n"
 "\n"

-"Você pode encontrar mais informações no manual do Sylpheed-Claws,\n"
-"acessível através do menu '/Ajuda/Manual' ou online no site indicado\n"
+"Você pode encontrar mais informações no manual do Claws Mail,\n"
+"acessível através do menu '/Ajuda/Manual' ou online, no sítio indicado\n"

 "abaixo.\n"
 "\n"
 "URL's úteis\n"
 "abaixo.\n"
 "\n"
 "URL's úteis\n"


@@ -11443,7 +12104,7 @@ msgstr ""
 "\n"
 "LICENÇA\n"
 "-------\n"
 "\n"
 "LICENÇA\n"
 "-------\n"

-"O Sylpheed-Claws é um software livre liberado sob a licença\n"
+"O Claws Mail é um software livre liberado sob a licença\n"

 "GNU General Public License, versão 2 ou posterior, conforme\n"
 "publicado pela Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. A licença pode ser\n"
 "GNU General Public License, versão 2 ou posterior, conforme\n"
 "publicado pela Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. A licença pode ser\n"


@@ -11451,61 +12112,67 @@ msgstr ""
 "\n"
 "DOAÇÕES\n"
 "---------\n"
 "\n"
 "DOAÇÕES\n"
 "---------\n"

-"Se você deseja fazer doações para o projeto do Sylpheed-Claws,\n"
-"você pode fazê-lo em <%s>.\n"
+"Se você deseja fazer doações para o projeto do Claws Mail,\n"
+"pode fazê-lo em <%s>.\n"

 "\n"
 
 "\n"
 

-#: src/wizard.c:551
+#: src/wizard.c:564

 msgid "Please enter the mailbox name."
 msgstr "Por favor, digite o nome da caixa postal."
 
 msgid "Please enter the mailbox name."
 msgstr "Por favor, digite o nome da caixa postal."
 

-#: src/wizard.c:579
+#: src/wizard.c:592

 msgid "Please enter your name and email address."
 msgstr "Por favor, digite o seu nome e endereço de e-mail."
 
 msgid "Please enter your name and email address."
 msgstr "Por favor, digite o seu nome e endereço de e-mail."
 

-#: src/wizard.c:590
+#: src/wizard.c:603

 msgid "Please enter your receiving server and username."
 msgid "Please enter your receiving server and username."

-msgstr ""
-"Por favor, digite o endereço e o nome de usuário do seu servidor de "
-"recebimento."
+msgstr "Por favor, digite o endereço e o nome de usuário do seu servidor de recebimento."

 
 

-#: src/wizard.c:600
+#: src/wizard.c:613

 msgid "Please enter your username."
 msgstr "Por favor, digite o seu nome de usuário."
 
 msgid "Please enter your username."
 msgstr "Por favor, digite o seu nome de usuário."
 

-#: src/wizard.c:610
+#: src/wizard.c:623

 msgid "Please enter your SMTP server."
 msgstr "Por favor, digite o endereço do seu servidor SMTP."
 
 msgid "Please enter your SMTP server."
 msgstr "Por favor, digite o endereço do seu servidor SMTP."
 

-#: src/wizard.c:621
+#: src/wizard.c:634

 msgid "Please enter your SMTP username."
 msgstr "Por favor, digite o nome de usuário para o SMTP."
 
 msgid "Please enter your SMTP username."
 msgstr "Por favor, digite o nome de usuário para o SMTP."
 

-#: src/wizard.c:832
+#: src/wizard.c:881

 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Seu nome:</span>"
 
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Seu nome:</span>"
 

-#: src/wizard.c:837
+#: src/wizard.c:886

 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Seu endereço de e-mail:</span>"
 
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Seu endereço de e-mail:</span>"
 

-#: src/wizard.c:841
+#: src/wizard.c:890

 msgid "Your organization:"
 msgstr "Sua organização:"
 
 msgid "Your organization:"
 msgstr "Sua organização:"
 

-#: src/wizard.c:861
+#: src/wizard.c:913
+msgid "You can also specify an absolute path, for example: \"/home/john/Documents/Mail\""
+msgstr "Você também pode especificar um caminho absoluto, por exemplo \"/home/fulano/Documentos/Mail\""
+
+#: src/wizard.c:917

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nome da caixa postal:</span>"
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Nome da caixa postal:</span>"
 

-#: src/wizard.c:891
+#: src/wizard.c:954
+msgid "You can specify the port number by appending it at the end: \"mail.example.com:25\""
+msgstr "Você pode especificar o número da porta adicionando-o ao final: \"mail.exemplo.com:25\""
+
+#: src/wizard.c:958

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Endereço do servidor SMTP:</span>"
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Endereço do servidor SMTP:</span>"
 

-#: src/wizard.c:894
+#: src/wizard.c:961

 msgid "Use authentication"
 msgstr "Efetuar autenticação"
 
 msgid "Use authentication"
 msgstr "Efetuar autenticação"
 

-#: src/wizard.c:908
+#: src/wizard.c:975

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11513,7 +12180,7 @@ msgstr ""
 "Nome de usuário do SMTP:\n"
 "<span size=\"small\">(em branco para utilizar o mesmo da recepção)</span>"
 
 "Nome de usuário do SMTP:\n"
 "<span size=\"small\">(em branco para utilizar o mesmo da recepção)</span>"
 

-#: src/wizard.c:921
+#: src/wizard.c:988

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11521,100 +12188,105 @@ msgstr ""
 "Senha do SMTP:\n"
 "<span size=\"small\">(em branco para utilizar o mesmo da recepção)</span>"
 
 "Senha do SMTP:\n"
 "<span size=\"small\">(em branco para utilizar o mesmo da recepção)</span>"
 

-#: src/wizard.c:949 src/wizard.c:964 src/wizard.c:1055
+#: src/wizard.c:1000
+msgid "Use SSL to connect to SMTP server"
+msgstr "Usar SSL para conectar-se ao servidor SMTP"
+
+#: src/wizard.c:1007
+#: src/wizard.c:1230
+msgid "Use SSL via STARTTLS"
+msgstr "Usar SSL via STARTTLS"
+
+#: src/wizard.c:1037
+#: src/wizard.c:1056
+#: src/wizard.c:1165

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Endereço do servidor:</span>"
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Endereço do servidor:</span>"
 

-#: src/wizard.c:980
+#: src/wizard.c:1076

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Caixa postal local:</span>"
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Caixa postal local:</span>"
 

-#: src/wizard.c:1022
+#: src/wizard.c:1127

 msgid "IMAP"
 msgstr "IMAP"
 
 msgid "IMAP"
 msgstr "IMAP"
 

-#: src/wizard.c:1047
+#: src/wizard.c:1152

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Tipo do servidor:</span>"
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Tipo do servidor:</span>"
 

-#: src/wizard.c:1066
+#: src/wizard.c:1161
+msgid "You can specify the port number by appending it at the end: \"mail.example.com:110\""
+msgstr "Você pode especificar o número da porta adicionando-o ao final: \"mail.exemplo.com:110\""
+
+#: src/wizard.c:1176

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Nome de usuário:</span>"
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Nome de usuário:</span>"
 

-#: src/wizard.c:1082
+#: src/wizard.c:1192

 msgid "Password:"
 msgstr "Senha:"
 
 msgid "Password:"
 msgstr "Senha:"
 

-#: src/wizard.c:1094
+#: src/wizard.c:1204

 msgid "IMAP server directory:"
 msgstr "Diretório do servidor IMAP:"
 
 msgid "IMAP server directory:"
 msgstr "Diretório do servidor IMAP:"
 

-#: src/wizard.c:1125
-msgid "Use SSL to connect to SMTP server"
-msgstr "Usar SSL para conectar-se ao servidor SMTP"
-
-#: src/wizard.c:1132
+#: src/wizard.c:1223

 msgid "Use SSL to connect to receiving server"
 msgstr "Usar SSL para conectar-se ao servidor de recebimento"
 
 msgid "Use SSL to connect to receiving server"
 msgstr "Usar SSL para conectar-se ao servidor de recebimento"
 

-#: src/wizard.c:1248
-msgid "Sylpheed-Claws Setup Wizard"
-msgstr "Assistente de configuração do Sylpheed-Claws"
+#: src/wizard.c:1347
+msgid "Claws Mail Setup Wizard"
+msgstr "Assistente de configuração do Claws Mail"

 
 

-#: src/wizard.c:1280
-msgid "Welcome to Sylpheed-Claws"
-msgstr "Bem-vindo ao Sylpheed-Claws"
+#: src/wizard.c:1379
+msgid "Welcome to Claws Mail"
+msgstr "Bem-vindo(a) ao Claws Mail"

 
 

-#: src/wizard.c:1288
+#: src/wizard.c:1387

 msgid ""
 msgid ""

-"Welcome to the Sylpheed-Claws setup wizard.\n"
+"Welcome to the Claws Mail setup wizard.\n"

 "\n"
 "\n"

-"We will begin by defining some basic information about you and your most "
-"common mail options so that you can start to use Sylpheed-Claws in less than "
-"five minutes."
+"We will begin by defining some basic information about you and your most common mail options so that you can start to use Claws Mail in less than five minutes."

 msgstr ""
 msgstr ""

-"Bem-vindo ao assistente de configuração do Sylpheed-Claws.\n"
+"Bem-vindo(a) ao assistente de configuração do Claws Mail.\n"

 "\n"
 "\n"

-"Nós iremos começar definindo algumas informações básicas sobre você e suas "
-"opções mais comuns de e-mail. Assim, você poderá iniciar a utilização do "
-"Sylpheed-Claws em menos de cinco minutos."
+"Nós iremos começar definindo algumas informações básicas sobre você e suas opções mais comuns de e-mail. Assim, você poderá iniciar a utilização do Claws Mail em menos de cinco minutos."

 
 

-#: src/wizard.c:1301
+#: src/wizard.c:1400

 msgid "About You"
 msgstr "Sobre você"
 
 msgid "About You"
 msgstr "Sobre você"
 

-#: src/wizard.c:1303 src/wizard.c:1312 src/wizard.c:1321 src/wizard.c:1331
-#: src/wizard.c:1341
+#: src/wizard.c:1402
+#: src/wizard.c:1411
+#: src/wizard.c:1420
+#: src/wizard.c:1430

 msgid "Bold fields must be completed"
 msgstr "Os campos em negrito DEVEM ser preenchidos"
 
 msgid "Bold fields must be completed"
 msgstr "Os campos em negrito DEVEM ser preenchidos"
 

-#: src/wizard.c:1310
+#: src/wizard.c:1409

 msgid "Receiving mail"
 msgstr "Recebimento de mensagens"
 
 msgid "Receiving mail"
 msgstr "Recebimento de mensagens"
 

-#: src/wizard.c:1319
+#: src/wizard.c:1418

 msgid "Sending mail"
 msgstr "Envio de mensagem"
 
 msgid "Sending mail"
 msgstr "Envio de mensagem"
 

-#: src/wizard.c:1329
+#: src/wizard.c:1428

 msgid "Saving mail on disk"
 msgstr "Salvamento da mensagem no disco"
 
 msgid "Saving mail on disk"
 msgstr "Salvamento da mensagem no disco"
 

-#: src/wizard.c:1339
-msgid "Security"
-msgstr "Segurança"
-
-#: src/wizard.c:1349
+#: src/wizard.c:1438

 msgid "Configuration finished"
 msgstr "Configuração encerrada"
 
 msgid "Configuration finished"
 msgstr "Configuração encerrada"
 

-#: src/wizard.c:1357
+#: src/wizard.c:1446

 msgid ""
 msgid ""

-"Sylpheed-Claws is now ready.\n"
+"Claws Mail is now ready.\n"

 "\n"
 "Click Save to start."
 msgstr ""
 "\n"
 "Click Save to start."
 msgstr ""

-"O Sylpheed-Claws está pronto.\n"
+"O Claws Mail está pronto.\n"

 "\n"
 "Clique em Salvar para iniciar."
 
 "\n"
 "Clique em Salvar para iniciar."
 

diff --git a/po/sk.po b/po/sk.po
index ed7ebaae7c7fc03fdbc4de6a8d5c43c05c3000b1..944908273784876b36a357f5113312770d7dd699 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,14 +1,14 @@
-# translation of sylpheed-claws-sk.po to Slovak
-# Copyright (C) 2003, 2004, 2005, 2006 Andrej Kacian (applies only for msgstr fields)
+# translation of Claws-Mail 2.6.0 to Slovak language
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 Andrej Kacian (applies only for msgstr fields)

 # This file is distributed under the same license as the sylpheed-claws package.
 #
 # This file is distributed under the same license as the sylpheed-claws package.
 #

-# Andrej Kacian <andrej@kacian.sk>, 2003, 2004, 2005, 2006.
+# Andrej Kacian <andrej@kacian.sk>, 2003, 2004, 2005, 2006, 2007.

 msgid ""
 msgstr ""
 msgid ""
 msgstr ""

-"Project-Id-Version: sylpheed-claws-sk\n"
-"Report-Msgid-Bugs-To: paul@sylpheed.org\n"
-"POT-Creation-Date: 2006-10-30 07:42+0000\n"
-"PO-Revision-Date: 2006-11-05 23:02+0100\n"
+"Project-Id-Version: claws-mail 2.7.0\n"
+"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
+"POT-Creation-Date: 2007-01-01 10:27+0000\n"
+"PO-Revision-Date: 2007-01-07 22:42+0100\n"

 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"


@@ -69,17 +69,25 @@ msgstr "(Bez názvu)"
 msgid "Delete account"
 msgstr "Zmazať konto"
 
 msgid "Delete account"
 msgstr "Zmazať konto"
 

-#: src/account.c:1458
+#: src/account.c:1461
+msgid "Accounts List Default Column Name|D"
+msgstr "D"
+
+#: src/account.c:1467

 msgid "Default account"
 msgstr "Východzie konto"
 
 msgid "Default account"
 msgstr "Východzie konto"
 

-#: src/account.c:1472
+#: src/account.c:1475
+msgid "Accounts List Get Column Name|G"
+msgstr "G"
+
+#: src/account.c:1481

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Tlačítko 'Prijať poštu' prijme poštu z označených kônt"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "Tlačítko 'Prijať poštu' prijme poštu z označených kônt"
 

-#: src/account.c:1479 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5677 src/compose.c:5968 src/editaddress.c:953
-#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:287
+#: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132
+#: src/compose.c:5821 src/compose.c:6112 src/editaddress.c:1041
+#: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364


@@ -87,11 +95,11 @@ msgstr "Tlačítko 'Prijať poštu' prijme poštu z označených kônt"
 msgid "Name"
 msgstr "Meno"
 
 msgid "Name"
 msgstr "Meno"
 

-#: src/account.c:1486 src/prefs_account.c:1169 src/prefs_account.c:2696
+#: src/account.c:1495 src/prefs_account.c:1176 src/prefs_account.c:2712

 msgid "Protocol"
 msgstr "Protokol"
 
 msgid "Protocol"
 msgstr "Protokol"
 

-#: src/account.c:1493 src/ssl_manager.c:102
+#: src/account.c:1502 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Server"
 
 msgid "Server"
 msgstr "Server"
 


@@ -155,7 +163,7 @@ msgstr "--- Ukončené: %s\n"
 msgid "Action's input/output"
 msgstr "Vstup/výstup akcie"
 
 msgid "Action's input/output"
 msgstr "Vstup/výstup akcie"
 

-#: src/action.c:1527
+#: src/action.c:1529

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -166,11 +174,11 @@ msgstr ""
 "('%%h' bude nahradené parametrom)\n"
 "  %s"
 
 "('%%h' bude nahradené parametrom)\n"
 "  %s"
 

-#: src/action.c:1532
+#: src/action.c:1534

 msgid "Action's hidden user argument"
 msgstr "Skrytý používateľom zadaný parameter"
 
 msgid "Action's hidden user argument"
 msgstr "Skrytý používateľom zadaný parameter"
 

-#: src/action.c:1536
+#: src/action.c:1538

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -181,7 +189,7 @@ msgstr ""
 "('%%u' bude nahradené parametrom)\n"
 "  %s"
 
 "('%%u' bude nahradené parametrom)\n"
 "  %s"
 

-#: src/action.c:1541
+#: src/action.c:1543

 msgid "Action's user argument"
 msgstr "Používateľom zadaný parameter"
 
 msgid "Action's user argument"
 msgstr "Používateľom zadaný parameter"
 


@@ -190,12 +198,12 @@ msgid "Add to address book"
 msgstr "Pridať do adresára"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
 msgstr "Pridať do adresára"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377

-#: src/toolbar.c:449
+#: src/toolbar.c:459

 msgid "Address"
 msgstr "Adresár"
 
 msgid "Address"
 msgstr "Adresár"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:761
-#: src/editaddress.c:825 src/editgroup.c:289
+#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:849
+#: src/editaddress.c:913 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Poznámky"
 
 msgid "Remarks"
 msgstr "Poznámky"
 


@@ -203,328 +211,318 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 

-#: src/addressbook.c:133 src/editaddress.c:759 src/editaddress.c:807
+#: src/addressbook.c:133 src/editaddress.c:847 src/editaddress.c:895

 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "E-mailová adresa"
 
 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "E-mailová adresa"
 

-#: src/addressbook.c:416
+#: src/addressbook.c:419

 msgid "/_Book"
 msgstr "/_Adresár"
 
 msgid "/_Book"
 msgstr "/_Adresár"
 

-#: src/addressbook.c:417
+#: src/addressbook.c:420

 msgid "/_Book/New _Book"
 msgstr "/_Adresár/Nový _Adresár"
 
 msgid "/_Book/New _Book"
 msgstr "/_Adresár/Nový _Adresár"
 

-#: src/addressbook.c:418
+#: src/addressbook.c:421

 msgid "/_Book/New _Folder"
 msgstr "/_Adresár/Nový _Priečinok"
 
 msgid "/_Book/New _Folder"
 msgstr "/_Adresár/Nový _Priečinok"
 

-#: src/addressbook.c:419
+#: src/addressbook.c:422

 msgid "/_Book/New _vCard"
 msgstr "/_Adresár/Nový _vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/_Adresár/Nový _vCard"
 

-#: src/addressbook.c:421
+#: src/addressbook.c:424

 msgid "/_Book/New _JPilot"
 msgstr "/_Adresár/Nový _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/_Adresár/Nový _JPilot"
 

-#: src/addressbook.c:424
+#: src/addressbook.c:427

 msgid "/_Book/New LDAP _Server"
 msgstr "/_Adresár/Nový LDAP _Server"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/_Adresár/Nový LDAP _Server"
 

-#: src/addressbook.c:426 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:432

 msgid "/_Book/---"
 msgstr "/_Adresár/---"
 
 msgid "/_Book/---"
 msgstr "/_Adresár/---"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:430

 msgid "/_Book/_Edit book"
 msgstr "/_Adresár/_Upraviť adresár"
 
 msgid "/_Book/_Edit book"
 msgstr "/_Adresár/_Upraviť adresár"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:431

 msgid "/_Book/_Delete book"
 msgstr "/_Adresár/Z_mazať adresár"
 
 msgid "/_Book/_Delete book"
 msgstr "/_Adresár/Z_mazať adresár"
 

-#: src/addressbook.c:430
+#: src/addressbook.c:433

 msgid "/_Book/_Save"
 msgstr "/_Adresár/U_ložiť"
 
 msgid "/_Book/_Save"
 msgstr "/_Adresár/U_ložiť"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:434

 msgid "/_Book/_Close"
 msgstr "/_Adresár/_Zavrieť"
 
 msgid "/_Book/_Close"
 msgstr "/_Adresár/_Zavrieť"
 

-#: src/addressbook.c:432
+#: src/addressbook.c:435

 msgid "/_Address"
 msgstr "/_Adresa"
 
 msgid "/_Address"
 msgstr "/_Adresa"
 

-#: src/addressbook.c:433
+#: src/addressbook.c:436

 msgid "/_Address/_Select all"
 msgstr "/_Adresa/_Zvoliť všetky"
 
 msgid "/_Address/_Select all"
 msgstr "/_Adresa/_Zvoliť všetky"
 

-#: src/addressbook.c:434 src/addressbook.c:438 src/addressbook.c:441
-#: src/addressbook.c:444
+#: src/addressbook.c:437 src/addressbook.c:441 src/addressbook.c:444
+#: src/addressbook.c:447

 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 

-#: src/addressbook.c:435
+#: src/addressbook.c:438

 msgid "/_Address/C_ut"
 msgstr "/_Adresa/_Vystrihnúť"
 
 msgid "/_Address/C_ut"
 msgstr "/_Adresa/_Vystrihnúť"
 

-#: src/addressbook.c:436
+#: src/addressbook.c:439

 msgid "/_Address/_Copy"
 msgstr "/_Adresa/_Kopírovať"
 
 msgid "/_Address/_Copy"
 msgstr "/_Adresa/_Kopírovať"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:440

 msgid "/_Address/_Paste"
 msgstr "/_Adresa/_Prilepiť"
 
 msgid "/_Address/_Paste"
 msgstr "/_Adresa/_Prilepiť"
 

-#: src/addressbook.c:439
+#: src/addressbook.c:442

 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:443

 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:445

 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:446

 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:448

 msgid "/_Address/_Mail To"
 msgstr "/_Adresa/Poslať _mail"
 
 msgid "/_Address/_Mail To"
 msgstr "/_Adresa/Poslať _mail"
 

-#: src/addressbook.c:446 src/compose.c:767 src/mainwindow.c:799
+#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:799

 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/_Nástroje"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:450

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Nástroje/Importovať súbor _LDIF..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Nástroje/Importovať súbor _LDIF..."
 

-#: src/addressbook.c:448
+#: src/addressbook.c:451

 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Nástroje/Importovať súbor z _Mutt-u..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Nástroje/Importovať súbor z _Mutt-u..."
 

-#: src/addressbook.c:449
+#: src/addressbook.c:452

 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Nástroje/Importovať súbor z _Pine..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Nástroje/Importovať súbor z _Pine..."
 

-#: src/addressbook.c:450 src/mainwindow.c:808 src/mainwindow.c:831
+#: src/addressbook.c:453 src/mainwindow.c:808 src/mainwindow.c:831

 #: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
 #: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
 #: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
 #: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 

-#: src/addressbook.c:451
+#: src/addressbook.c:454

 msgid "/_Tools/Export _HTML..."
 msgstr "/_Nástroje/Exportovať _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/_Nástroje/Exportovať _HTML..."
 

-#: src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Nástroje/Exportovať súbor L_DIF..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Nástroje/Exportovať súbor L_DIF..."
 

-#: src/addressbook.c:453 src/compose.c:772 src/mainwindow.c:874
+#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:874

 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/_Pomocník"
 
 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/_Pomocník"
 

-#: src/addressbook.c:454 src/compose.c:773 src/mainwindow.c:880
+#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:880

 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/_Pomocník/_O programe"
 
 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/_Pomocník/_O programe"
 

-#: src/addressbook.c:459 src/addressbook.c:475 src/compose.c:540
+#: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545

 #: src/mainwindow.c:518 src/messageview.c:164
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
 #: src/mainwindow.c:518 src/messageview.c:164
 msgid "/_Edit"
 msgstr "/_Upraviť"
 

-#: src/addressbook.c:460 src/addressbook.c:476
+#: src/addressbook.c:463 src/addressbook.c:479

 msgid "/_Delete"
 msgstr "/Z_mazať"
 
 msgid "/_Delete"
 msgstr "/Z_mazať"
 

-#: src/addressbook.c:461 src/addressbook.c:465 src/addressbook.c:474
-#: src/addressbook.c:477 src/addressbook.c:480 src/addressbook.c:484
-#: src/compose.c:519 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
-#: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:54
-#: src/news_gtk.c:57 src/news_gtk.c:59 src/plugins/trayicon/trayicon.c:102
-#: src/plugins/trayicon/trayicon.c:105 src/plugins/trayicon/trayicon.c:107
-#: src/summaryview.c:423 src/summaryview.c:427 src/summaryview.c:432
-#: src/summaryview.c:450 src/summaryview.c:471 src/summaryview.c:477
-msgid "/---"
-msgstr "/---"
-
-#: src/addressbook.c:462
+#: src/addressbook.c:465

 msgid "/New _Book"
 msgstr "/Nový _Adresár"
 
 msgid "/New _Book"
 msgstr "/Nový _Adresár"
 

-#: src/addressbook.c:463
+#: src/addressbook.c:466

 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 

-#: src/addressbook.c:464 src/addressbook.c:479
+#: src/addressbook.c:467 src/addressbook.c:482

 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 

-#: src/addressbook.c:466 src/addressbook.c:481
+#: src/addressbook.c:469 src/addressbook.c:484

 msgid "/C_ut"
 msgstr "/_Vystrihnúť"
 
 msgid "/C_ut"
 msgstr "/_Vystrihnúť"
 

-#: src/addressbook.c:467 src/addressbook.c:482
+#: src/addressbook.c:470 src/addressbook.c:485

 msgid "/_Copy"
 msgstr "/_Kopírovať"
 
 msgid "/_Copy"
 msgstr "/_Kopírovať"
 

-#: src/addressbook.c:468 src/addressbook.c:483
+#: src/addressbook.c:471 src/addressbook.c:486

 msgid "/_Paste"
 msgstr "/V_ložiť"
 
 msgid "/_Paste"
 msgstr "/V_ložiť"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:476

 msgid "/_Select all"
 msgstr "/Vy_brať všetko"
 
 msgid "/_Select all"
 msgstr "/Vy_brať všetko"
 

-#: src/addressbook.c:478
+#: src/addressbook.c:481

 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 

-#: src/addressbook.c:486
+#: src/addressbook.c:489

 msgid "/_Mail To"
 msgstr "/Poslať _mail"
 
 msgid "/_Mail To"
 msgstr "/Poslať _mail"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:491

 msgid "/_Browse Entry"
 msgstr "/P_rehliadať položky"
 
 msgid "/_Browse Entry"
 msgstr "/P_rehliadať položky"
 

-#: src/addressbook.c:501 src/crash.c:450 src/crash.c:469 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:132 src/prefs_themes.c:683
+#: src/addressbook.c:504 src/crash.c:453 src/crash.c:472 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_themes.c:683

 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Neznáma"
 
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Neznáma"
 

-#: src/addressbook.c:508 src/addressbook.c:527 src/importldif.c:126
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:126

 msgid "Success"
 msgstr "Úspech"
 
 msgid "Success"
 msgstr "Úspech"
 

-#: src/addressbook.c:509 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127

 msgid "Bad arguments"
 msgstr "Neplatné parametre"
 
 msgid "Bad arguments"
 msgstr "Neplatné parametre"
 

-#: src/addressbook.c:510 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128

 msgid "File not specified"
 msgstr "Nie je určený súbor"
 
 msgid "File not specified"
 msgstr "Nie je určený súbor"
 

-#: src/addressbook.c:511 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129

 msgid "Error opening file"
 msgstr "Chyba pri otváraní súboru"
 
 msgid "Error opening file"
 msgstr "Chyba pri otváraní súboru"
 

-#: src/addressbook.c:512 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130

 msgid "Error reading file"
 msgstr "Chyba pri čítaní súboru"
 
 msgid "Error reading file"
 msgstr "Chyba pri čítaní súboru"
 

-#: src/addressbook.c:513 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131

 msgid "End of file encountered"
 msgstr "Bol nájdený koniec súboru"
 
 msgid "End of file encountered"
 msgstr "Bol nájdený koniec súboru"
 

-#: src/addressbook.c:514 src/importldif.c:132
+#: src/addressbook.c:517 src/importldif.c:132

 msgid "Error allocating memory"
 msgstr "Chyba pri alokácii pamäte"
 
 msgid "Error allocating memory"
 msgstr "Chyba pri alokácii pamäte"
 

-#: src/addressbook.c:515 src/importldif.c:133
+#: src/addressbook.c:518 src/importldif.c:133

 msgid "Bad file format"
 msgstr "Neplatný formát súboru"
 
 msgid "Bad file format"
 msgstr "Neplatný formát súboru"
 

-#: src/addressbook.c:516 src/importldif.c:134
+#: src/addressbook.c:519 src/importldif.c:134

 msgid "Error writing to file"
 msgstr "Chyba pri zápise do súboru"
 
 msgid "Error writing to file"
 msgstr "Chyba pri zápise do súboru"
 

-#: src/addressbook.c:517 src/importldif.c:135
+#: src/addressbook.c:520 src/importldif.c:135

 msgid "Error opening directory"
 msgstr "Chyba pri otváraní priečinku"
 
 msgid "Error opening directory"
 msgstr "Chyba pri otváraní priečinku"
 

-#: src/addressbook.c:518 src/importldif.c:136
+#: src/addressbook.c:521 src/importldif.c:136

 msgid "No path specified"
 msgstr "Nebola zadaná cesta"
 
 msgid "No path specified"
 msgstr "Nebola zadaná cesta"
 

-#: src/addressbook.c:528
+#: src/addressbook.c:531

 msgid "Error connecting to LDAP server"
 msgstr "Chyba pri pripájaní sa k serveru LDAP"
 
 msgid "Error connecting to LDAP server"
 msgstr "Chyba pri pripájaní sa k serveru LDAP"
 

-#: src/addressbook.c:529
+#: src/addressbook.c:532

 msgid "Error initializing LDAP"
 msgstr "Chyba pri inicializácii LDAP"
 
 msgid "Error initializing LDAP"
 msgstr "Chyba pri inicializácii LDAP"
 

-#: src/addressbook.c:530
+#: src/addressbook.c:533

 msgid "Error binding to LDAP server"
 msgstr "Chyba pri pripájaní LDAP serveru"
 
 msgid "Error binding to LDAP server"
 msgstr "Chyba pri pripájaní LDAP serveru"
 

-#: src/addressbook.c:531
+#: src/addressbook.c:534

 msgid "Error searching LDAP database"
 msgstr "Chyba pri čítaní LDAP databázy"
 
 msgid "Error searching LDAP database"
 msgstr "Chyba pri čítaní LDAP databázy"
 

-#: src/addressbook.c:532
+#: src/addressbook.c:535

 msgid "Timeout performing LDAP operation"
 msgstr "Pri LDAP operácii vypršal časový limit"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Pri LDAP operácii vypršal časový limit"
 

-#: src/addressbook.c:533
+#: src/addressbook.c:536

 msgid "Error in LDAP search criteria"
 msgstr "Chybné vyhľadávacie kritériá LDAP"
 
 msgid "Error in LDAP search criteria"
 msgstr "Chybné vyhľadávacie kritériá LDAP"
 

-#: src/addressbook.c:534
+#: src/addressbook.c:537

 msgid "No LDAP entries found for search criteria"
 msgstr "Neboli nájdené žiadne položky LDAP vyhovujúce kritériám"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "Neboli nájdené žiadne položky LDAP vyhovujúce kritériám"
 

-#: src/addressbook.c:535
+#: src/addressbook.c:538

 msgid "LDAP search terminated on request"
 msgstr "LDAP vyhľadávanie bolo ukončené na požiadavku používateľa"
 
 msgid "LDAP search terminated on request"
 msgstr "LDAP vyhľadávanie bolo ukončené na požiadavku používateľa"
 

-#: src/addressbook.c:536
+#: src/addressbook.c:539

 msgid "Error starting TLS connection"
 msgstr "Pri vytváraní TLS pripojenia sa vyskytla chyba"
 
 msgid "Error starting TLS connection"
 msgstr "Pri vytváraní TLS pripojenia sa vyskytla chyba"
 

-#: src/addressbook.c:853
+#: src/addressbook.c:897

 msgid "Sources"
 msgstr "Zdroje"
 
 msgid "Sources"
 msgstr "Zdroje"
 

-#: src/addressbook.c:857 src/prefs_other.c:101 src/toolbar.c:190
-#: src/toolbar.c:1727
+#: src/addressbook.c:901 src/prefs_other.c:101 src/toolbar.c:194
+#: src/toolbar.c:1787

 msgid "Address book"
 msgstr "Otvoriť adresár"
 
 msgid "Address book"
 msgstr "Otvoriť adresár"
 

-#: src/addressbook.c:980
+#: src/addressbook.c:1033

 msgid "Lookup name:"
 msgstr "Vyhľadať meno:"
 
 msgid "Lookup name:"
 msgstr "Vyhľadať meno:"
 

-#: src/addressbook.c:1040 src/compose.c:2031 src/compose.c:4301
-#: src/compose.c:5523 src/compose.c:6286 src/summary_search.c:291
+#: src/addressbook.c:1106 src/compose.c:2129 src/compose.c:4443
+#: src/compose.c:5667 src/compose.c:6432 src/compose.c:9453
+#: src/summary_search.c:359

 msgid "To:"
 msgstr "Komu:"
 
 msgid "To:"
 msgstr "Komu:"
 

-#: src/addressbook.c:1044 src/compose.c:2015 src/compose.c:4044
-#: src/compose.c:4300
+#: src/addressbook.c:1110 src/compose.c:2113 src/compose.c:4182
+#: src/compose.c:4442 src/compose.c:9462

 msgid "Cc:"
 msgstr "Kópia:"
 
 msgid "Cc:"
 msgstr "Kópia:"
 

-#: src/addressbook.c:1048 src/compose.c:2018 src/compose.c:4075
+#: src/addressbook.c:1114 src/compose.c:2116 src/compose.c:4213

 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 

-#: src/addressbook.c:1283 src/addressbook.c:1329
+#: src/addressbook.c:1363 src/addressbook.c:1409

 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 

-#: src/addressbook.c:1284
+#: src/addressbook.c:1364

 msgid "This address data is readonly and cannot be deleted."
 msgstr "Tieto adresné údaje sú len pre čítanie a nedajú sa odstrániť."
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Tieto adresné údaje sú len pre čítanie a nedajú sa odstrániť."
 

-#: src/addressbook.c:1323
+#: src/addressbook.c:1403

 msgid "Delete group"
 msgstr "Odstrániť skupinu"
 
 msgid "Delete group"
 msgstr "Odstrániť skupinu"
 

-#: src/addressbook.c:1324
+#: src/addressbook.c:1404

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -532,29 +530,29 @@ msgstr ""
 "Naozaj chcete odstrániť skupinu?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 
 "Naozaj chcete odstrániť skupinu?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 

-#: src/addressbook.c:1330
+#: src/addressbook.c:1410

 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 

-#: src/addressbook.c:1932
+#: src/addressbook.c:2014

 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nemôžem vkladať. Cieľový adresár je len pre čítanie."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Nemôžem vkladať. Cieľový adresár je len pre čítanie."
 

-#: src/addressbook.c:1943
+#: src/addressbook.c:2025

 msgid "Cannot paste into an address group."
 msgstr "Nemôžem vkladať do skupiny adries."
 
 msgid "Cannot paste into an address group."
 msgstr "Nemôžem vkladať do skupiny adries."
 

-#: src/addressbook.c:2619
+#: src/addressbook.c:2708

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Chcete zmazať výsledky požiadavky a adresy v '%s' ?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Chcete zmazať výsledky požiadavky a adresy v '%s' ?"
 

-#: src/addressbook.c:2622 src/addressbook.c:2648 src/addressbook.c:2655
+#: src/addressbook.c:2711 src/addressbook.c:2737 src/addressbook.c:2744

 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Zmazať"
 
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Zmazať"
 

-#: src/addressbook.c:2631
+#: src/addressbook.c:2720

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -563,19 +561,19 @@ msgstr ""
 "Naozaj chcete odstrániť '%s' ? Ak zmažete len priečinok, adresy z neho sa "
 "presunú do nadradeného priečinku."
 
 "Naozaj chcete odstrániť '%s' ? Ak zmažete len priečinok, adresy z neho sa "
 "presunú do nadradeného priečinku."
 

-#: src/addressbook.c:2634 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2723 src/imap_gtk.c:284 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "+Delete _folder only"
 msgstr "+Odstrániť _len priečinok"
 
 msgid "+Delete _folder only"
 msgstr "+Odstrániť _len priečinok"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "Delete folder and _addresses"
 msgstr "Odstrániť priečinok aj _adresy"
 
 msgid "Delete folder and _addresses"
 msgstr "Odstrániť priečinok aj _adresy"
 

-#: src/addressbook.c:2646
+#: src/addressbook.c:2735

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -584,7 +582,7 @@ msgstr ""
 "Chcete odstrániť '%s'?\n"
 "Adresy, ktoré obsahuje, nebudú stratené."
 
 "Chcete odstrániť '%s'?\n"
 "Adresy, ktoré obsahuje, nebudú stratené."
 

-#: src/addressbook.c:2653
+#: src/addressbook.c:2742

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -593,19 +591,19 @@ msgstr ""
 "Chcete odstrániť '%s'?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 
 "Chcete odstrániť '%s'?\n"
 "Adresy, ktoré obsahuje, budú stratené."
 

-#: src/addressbook.c:3465
+#: src/addressbook.c:3595

 msgid "New user, could not save index file."
 msgstr "Nový uživateľ, nepodarilo sa uložiť indexový súbor."
 
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ, nepodarilo sa uložiť indexový súbor."
 

-#: src/addressbook.c:3469
+#: src/addressbook.c:3599

 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ, nepodarilo sa uložiť súbory adresára."
 
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ, nepodarilo sa uložiť súbory adresára."
 

-#: src/addressbook.c:3479
+#: src/addressbook.c:3609

 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 

-#: src/addressbook.c:3484
+#: src/addressbook.c:3614

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -613,7 +611,7 @@ msgstr ""
 "Konverzia starého adresára je dokončená,\n"
 "nedá sa uložiť indexový súbor nového adresára."
 
 "Konverzia starého adresára je dokončená,\n"
 "nedá sa uložiť indexový súbor nového adresára."
 

-#: src/addressbook.c:3497
+#: src/addressbook.c:3627

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -621,7 +619,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 

-#: src/addressbook.c:3503
+#: src/addressbook.c:3633

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -629,7 +627,7 @@ msgstr ""
 "Nepodarilo sa skonvertovať starý adresár,\n"
 "nedá sa ani vytvoriť indexový súbor nového adresára."
 
 "Nepodarilo sa skonvertovať starý adresár,\n"
 "nedá sa ani vytvoriť indexový súbor nového adresára."
 

-#: src/addressbook.c:3508
+#: src/addressbook.c:3638

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -637,70 +635,70 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 

-#: src/addressbook.c:3515 src/addressbook.c:3521
+#: src/addressbook.c:3645 src/addressbook.c:3651

 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 
 msgid "Addressbook conversion error"
 msgstr "Chyba pri konverzii adresára"
 

-#: src/addressbook.c:3559
+#: src/addressbook.c:3689

 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 
 msgid "Addressbook Error"
 msgstr "Chyba v adresári"
 

-#: src/addressbook.c:3560
+#: src/addressbook.c:3690

 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 

-#: src/addressbook.c:3887
+#: src/addressbook.c:4017

 msgid "Busy searching..."
 msgstr "Prehľadávam..."
 
 msgid "Busy searching..."
 msgstr "Prehľadávam..."
 

-#: src/addressbook.c:3958
+#: src/addressbook.c:4088

 #, c-format
 msgid "Search '%s'"
 msgstr "Vyhľadať  '%s'"
 
 #, c-format
 msgid "Search '%s'"
 msgstr "Vyhľadať  '%s'"
 

-#: src/addressbook.c:4183
+#: src/addressbook.c:4313

 msgid "Interface"
 msgstr "Ovládanie"
 
 msgid "Interface"
 msgstr "Ovládanie"
 

-#: src/addressbook.c:4199 src/exphtmldlg.c:378 src/expldifdlg.c:394
+#: src/addressbook.c:4329 src/exphtmldlg.c:375 src/expldifdlg.c:394

 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Adresár"
 
 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Adresár"
 

-#: src/addressbook.c:4215
+#: src/addressbook.c:4345

 msgid "Person"
 msgstr "Osoba"
 
 msgid "Person"
 msgstr "Osoba"
 

-#: src/addressbook.c:4231
+#: src/addressbook.c:4361

 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 

-#: src/addressbook.c:4247
+#: src/addressbook.c:4377

 msgid "Group"
 msgstr "Skupina"
 
 msgid "Group"
 msgstr "Skupina"
 

-#: src/addressbook.c:4263 src/exporthtml.c:922 src/folderview.c:468
-#: src/prefs_account.c:2409 src/prefs_folder_column.c:79
+#: src/addressbook.c:4393 src/exporthtml.c:922 src/folderview.c:470
+#: src/prefs_account.c:2417 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Priečinky"
 
 msgid "Folder"
 msgstr "Priečinky"
 

-#: src/addressbook.c:4279
+#: src/addressbook.c:4409

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4295 src/addressbook.c:4311
+#: src/addressbook.c:4425 src/addressbook.c:4441

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4327
+#: src/addressbook.c:4457

 msgid "LDAP servers"
 msgstr "LDAP servery"
 
 msgid "LDAP servers"
 msgstr "LDAP servery"
 

-#: src/addressbook.c:4343
+#: src/addressbook.c:4473

 msgid "LDAP Query"
 msgstr "LDAP požiadavka"
 
 msgid "LDAP Query"
 msgstr "LDAP požiadavka"
 

-#: src/addressbook.c:4659 src/matcher.c:303 src/matcher.c:756
+#: src/addressbook.c:4789 src/matcher.c:303 src/matcher.c:756

 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106


@@ -740,7 +738,7 @@ msgstr ""
 msgid "Folder :"
 msgstr "Priečinok:"
 
 msgid "Folder :"
 msgstr "Priečinok:"
 

-#: src/addrgather.c:365 src/exphtmldlg.c:546 src/expldifdlg.c:626
+#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Adresár :"
 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Adresár :"


@@ -765,9 +763,9 @@ msgstr "Názov hlavičky"
 msgid "Address Count"
 msgstr "Počet adries"
 
 msgid "Address Count"
 msgstr "Počet adries"
 

-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4650
-#: src/compose.c:9176 src/messageview.c:578 src/messageview.c:591
-#: src/plugins/pgpcore/sgpgme.c:570
+#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4794
+#: src/compose.c:9374 src/messageview.c:578 src/messageview.c:591
+#: src/plugins/pgpcore/sgpgme.c:574

 msgid "Warning"
 msgstr "Varovanie"
 
 msgid "Warning"
 msgstr "Varovanie"
 


@@ -775,7 +773,7 @@ msgstr "Varovanie"
 msgid "Header Fields"
 msgstr "Hlavičky"
 
 msgid "Header Fields"
 msgstr "Hlavičky"
 

-#: src/addrgather.c:539 src/exphtmldlg.c:666 src/expldifdlg.c:738
+#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Dokončiť"
 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Dokončiť"


@@ -804,12 +802,12 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
 msgid "Personal address"
 msgstr "Súkromná adresa"
 

-#: src/alertpanel.c:141 src/compose.c:7396
+#: src/alertpanel.c:141 src/compose.c:7582

 msgid "Notice"
 msgstr "Upozornenie"
 
 msgid "Notice"
 msgstr "Upozornenie"
 

-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4590 src/inc.c:616
-#: src/plugins/pgpcore/sgpgme.c:144 src/plugins/pgpcore/sgpgme.c:235
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4734 src/inc.c:616
+#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239

 msgid "Error"
 msgstr "Chyba"
 
 msgid "Error"
 msgstr "Chyba"
 


@@ -846,75 +844,105 @@ msgstr "Hodnota atribútu"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
 

-#: src/common/nntp.c:181 src/common/nntp.c:244
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:840
+msgid "SSL handshake failed\n"
+msgstr "SSL spojenie zlyhalo\n"
+
+#: src/common/nntp.c:182 src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr "chyba protokolu: %s\n"
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "chyba protokolu: %s\n"
 

-#: src/common/nntp.c:204 src/common/nntp.c:250
+#: src/common/nntp.c:205 src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 
 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 

-#: src/common/nntp.c:300
+#: src/common/nntp.c:301

 msgid "Error occurred while posting\n"
 msgstr "Pri odosielaní sa vyskytla chyba\n"
 
 msgid "Error occurred while posting\n"
 msgstr "Pri odosielaní sa vyskytla chyba\n"
 

-#: src/common/nntp.c:380
+#: src/common/nntp.c:381

 msgid "Error occurred while sending command\n"
 msgstr "Pri odosielaní správy nastala chyba\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "Pri odosielaní správy nastala chyba\n"
 

-#: src/common/plugin.c:52
+#: src/common/plugin.c:53

 msgid "Nothing"
 msgstr "Nič"
 
 msgid "Nothing"
 msgstr "Nič"
 

-#: src/common/plugin.c:53
+#: src/common/plugin.c:54

 msgid "a viewer"
 msgstr "prezerača"
 
 msgid "a viewer"
 msgstr "prezerača"
 

-#: src/common/plugin.c:54
+#: src/common/plugin.c:55

 msgid "folders"
 msgstr "priečinkov"
 
 msgid "folders"
 msgstr "priečinkov"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "filtering"
 msgstr "filtrovania"
 
 msgid "filtering"
 msgstr "filtrovania"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a privacy interface"
 msgstr "rozhrania zabezpečenia súkromia"
 
 msgid "a privacy interface"
 msgstr "rozhrania zabezpečenia súkromia"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "a notifier"
 msgstr "oznamovača"
 
 msgid "a notifier"
 msgstr "oznamovača"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "an utility"
 msgstr "utility"
 
 msgid "an utility"
 msgstr "utility"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "things"
 msgstr "inú"
 
 msgid "things"
 msgstr "inú"
 

-#: src/common/plugin.c:257
+#: src/common/plugin.c:258

 #, c-format
 msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Tento plugin prináša funkciu %s (%s), ktorá je už poskytovaná pluginom %s."
 
 #, c-format
 msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Tento plugin prináša funkciu %s (%s), ktorá je už poskytovaná pluginom %s."
 

-#: src/common/plugin.c:292
+#: src/common/plugin.c:293

 msgid "Plugin already loaded"
 msgstr "Plugin je už načítaný"
 
 msgid "Plugin already loaded"
 msgstr "Plugin je už načítaný"
 

-#: src/common/plugin.c:302
+#: src/common/plugin.c:303

 msgid "Failed to allocate memory for Plugin"
 msgstr "NEpodarilo sa alokovať pamäť pre plugin"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "NEpodarilo sa alokovať pamäť pre plugin"
 

-#: src/common/plugin.c:329
+#: src/common/plugin.c:330

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Tento modul nie je licencovaný pod licenciou kompatibilnou s GPL."
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Tento modul nie je licencovaný pod licenciou kompatibilnou s GPL."
 

-#: src/common/plugin.c:336
-msgid "This module is for Sylpheed-Claws GTK1."
-msgstr "Tento modul je pre Sylpheed-Claws pre GTK1."
+#: src/common/plugin.c:337
+msgid "This module is for Claws Mail GTK1."
+msgstr "Tento modul je pre Claws Mail pre GTK1."
+
+#: src/common/plugin.c:547
+#, c-format
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr ""
+"Vaša verzia Claws Mail je novšia ako verzia, pre ktorú bol plugin "
+"'%s' skompilovaný."
+
+#: src/common/plugin.c:550
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr ""
+"Vaša verzia Claws Mail je novšia ako verzia, pre ktorú bol tento plugin "
+"skompilovaný."
+
+#: src/common/plugin.c:559
+#, c-format
+msgid "Your version of Claws Mail is too old for the '%s' plugin."
+msgstr "Vaša verzia Claws Mail je príliš zastaralá pre plugin '%s'."
+
+#: src/common/plugin.c:561
+msgid "Your version of Claws Mail is too old for the plugin."
+msgstr "Vaša verzia Claws Mail je príliš zastaralá pre tento plugin."

 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"


@@ -955,16 +983,16 @@ msgstr "Pri vytváraní SSL kontextu sa vyskytla chyba\n"
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL spojenie zlyhalo (%s)\n"
 
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL spojenie zlyhalo (%s)\n"
 

-#: src/common/ssl_certificate.c:189 src/common/ssl_certificate.c:200
-#: src/common/ssl_certificate.c:206 src/common/ssl_certificate.c:213
-#: src/common/ssl_certificate.c:224 src/common/ssl_certificate.c:230
+#: src/common/ssl_certificate.c:208 src/common/ssl_certificate.c:219
+#: src/common/ssl_certificate.c:225 src/common/ssl_certificate.c:232
+#: src/common/ssl_certificate.c:243 src/common/ssl_certificate.c:249

 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<nie je v certifikáte>"
 
 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<nie je v certifikáte>"
 

-#: src/common/ssl_certificate.c:239
+#: src/common/ssl_certificate.c:258

 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"


@@ -977,7 +1005,7 @@ msgstr ""
 "  Odtlačok prsta: %s\n"
 "  Stav podpisu: %s"
 
 "  Odtlačok prsta: %s\n"
 "  Stav podpisu: %s"
 

-#: src/common/ssl_certificate.c:348
+#: src/common/ssl_certificate.c:385

 msgid "Couldn't load X509 default paths"
 msgstr "Nepodarilo sa načítať východzie cesty X509"
 
 msgid "Couldn't load X509 default paths"
 msgstr "Nepodarilo sa načítať východzie cesty X509"
 


@@ -1005,495 +1033,704 @@ msgstr "%d.%02dMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
 msgid "%.2fGB"
 msgstr "%.2fGB"
 

-#: src/compose.c:517
+#: src/common/utils.c:4799
+msgid "Complete day name for use by strftime|Sunday"
+msgstr "Nedeľa"
+
+#: src/common/utils.c:4800
+msgid "Complete day name for use by strftime|Monday"
+msgstr "Pondelok"
+
+#: src/common/utils.c:4801
+msgid "Complete day name for use by strftime|Tuesday"
+msgstr "Utorok"
+
+#: src/common/utils.c:4802
+msgid "Complete day name for use by strftime|Wednesday"
+msgstr "Streda"
+
+#: src/common/utils.c:4803
+msgid "Complete day name for use by strftime|Thursday"
+msgstr "Štvrtok"
+
+#: src/common/utils.c:4804
+msgid "Complete day name for use by strftime|Friday"
+msgstr "Piatok"
+
+#: src/common/utils.c:4805
+msgid "Complete day name for use by strftime|Saturday"
+msgstr "Sobota"
+
+#: src/common/utils.c:4807
+msgid "Complete month name for use by strftime|January"
+msgstr "Január"
+
+#: src/common/utils.c:4808
+msgid "Complete month name for use by strftime|February"
+msgstr "Február"
+
+#: src/common/utils.c:4809
+msgid "Complete month name for use by strftime|March"
+msgstr "Marec"
+
+#: src/common/utils.c:4810
+msgid "Complete month name for use by strftime|April"
+msgstr "Apríl"
+
+#: src/common/utils.c:4811
+msgid "Complete month name for use by strftime|May"
+msgstr "Máj"
+
+#: src/common/utils.c:4812
+msgid "Complete month name for use by strftime|June"
+msgstr "Jún"
+
+#: src/common/utils.c:4813
+msgid "Complete month name for use by strftime|July"
+msgstr "Júl"
+
+#: src/common/utils.c:4814
+msgid "Complete month name for use by strftime|August"
+msgstr "August"
+
+#: src/common/utils.c:4815
+msgid "Complete month name for use by strftime|September"
+msgstr "September"
+
+#: src/common/utils.c:4816
+msgid "Complete month name for use by strftime|October"
+msgstr "Október"
+
+#: src/common/utils.c:4817
+msgid "Complete month name for use by strftime|November"
+msgstr "November"
+
+#: src/common/utils.c:4818
+msgid "Complete month name for use by strftime|December"
+msgstr "December"
+
+#: src/common/utils.c:4820
+msgid "Abbr. day name for use by strftime|Sun"
+msgstr "Ne"
+
+#: src/common/utils.c:4821
+msgid "Abbr. day name for use by strftime|Mon"
+msgstr "Po"
+
+#: src/common/utils.c:4822
+msgid "Abbr. day name for use by strftime|Tue"
+msgstr "Ut"
+
+#: src/common/utils.c:4823
+msgid "Abbr. day name for use by strftime|Wed"
+msgstr "St"
+
+#: src/common/utils.c:4824
+msgid "Abbr. day name for use by strftime|Thu"
+msgstr "Št"
+
+#: src/common/utils.c:4825
+msgid "Abbr. day name for use by strftime|Fri"
+msgstr "Pi"
+
+#: src/common/utils.c:4826
+msgid "Abbr. day name for use by strftime|Sat"
+msgstr "So"
+
+#: src/common/utils.c:4828
+msgid "Abbr. month name for use by strftime|Jan"
+msgstr "Jan"
+
+#: src/common/utils.c:4829
+msgid "Abbr. month name for use by strftime|Feb"
+msgstr "Feb"
+
+#: src/common/utils.c:4830
+msgid "Abbr. month name for use by strftime|Mar"
+msgstr "Mar"
+
+#: src/common/utils.c:4831
+msgid "Abbr. month name for use by strftime|Apr"
+msgstr "Apr"
+
+#: src/common/utils.c:4832
+msgid "Abbr. month name for use by strftime|May"
+msgstr "Máj"
+
+#: src/common/utils.c:4833
+msgid "Abbr. month name for use by strftime|Jun"
+msgstr "Jún"
+
+#: src/common/utils.c:4834
+msgid "Abbr. month name for use by strftime|Jul"
+msgstr "Júl"
+
+#: src/common/utils.c:4835
+msgid "Abbr. month name for use by strftime|Aug"
+msgstr "Aug"
+
+#: src/common/utils.c:4836
+msgid "Abbr. month name for use by strftime|Sep"
+msgstr "Sep"
+
+#: src/common/utils.c:4837
+msgid "Abbr. month name for use by strftime|Oct"
+msgstr "Okt"
+
+#: src/common/utils.c:4838
+msgid "Abbr. month name for use by strftime|Nov"
+msgstr "Nov"
+
+#: src/common/utils.c:4839
+msgid "Abbr. month name for use by strftime|Dec"
+msgstr "Dec"
+
+#: src/common/utils.c:4841
+msgid "For use by strftime (morning)|AM"
+msgstr "AM"
+
+#: src/common/utils.c:4842
+msgid "For use by strftime (afternoon)|PM"
+msgstr "PM"
+
+#: src/common/utils.c:4843
+msgid "For use by strftime (morning, lowercase)|am"
+msgstr "am"
+
+#: src/common/utils.c:4844
+msgid "For use by strftime (afternoon, lowercase)|pm"
+msgstr "pm"
+
+#: src/common/utils.c:4846
+msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
+msgstr "%a %b %e %H:%M:%S %Y"
+
+#: src/common/utils.c:4847
+msgid "For use by strftime (default date format)|%m/%d/%y"
+msgstr "%d. %m. %y"
+
+#: src/common/utils.c:4848
+msgid "For use by strftime (default time format)|%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#: src/common/utils.c:4850
+msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#: src/compose.c:522

 msgid "/_Add..."
 msgstr "/_Pridať..."
 
 msgid "/_Add..."
 msgstr "/_Pridať..."
 

-#: src/compose.c:518
+#: src/compose.c:523

 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 

-#: src/compose.c:520 src/folderview.c:292
+#: src/compose.c:525 src/folderview.c:294

 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 

-#: src/compose.c:525 src/mainwindow.c:740 src/messageview.c:285
+#: src/compose.c:530 src/mainwindow.c:740 src/messageview.c:285

 msgid "/_Message"
 msgstr "/Sp_ráva"
 
 msgid "/_Message"
 msgstr "/Sp_ráva"
 

-#: src/compose.c:526
+#: src/compose.c:531

 msgid "/_Message/_Send"
 msgstr "/Sp_ráva/_Odoslať"
 
 msgid "/_Message/_Send"
 msgstr "/Sp_ráva/_Odoslať"
 

-#: src/compose.c:528
+#: src/compose.c:533

 msgid "/_Message/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 
 msgid "/_Message/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 

-#: src/compose.c:530 src/compose.c:534 src/compose.c:537 src/mainwindow.c:750
+#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:750

 #: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
 #: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
 #: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
 #: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 

-#: src/compose.c:531
+#: src/compose.c:536

 msgid "/_Message/_Attach file"
 msgstr "/Sp_ráva/P_ripojiť súbor"
 
 msgid "/_Message/_Attach file"
 msgstr "/Sp_ráva/P_ripojiť súbor"
 

-#: src/compose.c:532
+#: src/compose.c:537

 msgid "/_Message/_Insert file"
 msgstr "/Sp_ráva/_Vložiť súbor"
 
 msgid "/_Message/_Insert file"
 msgstr "/Sp_ráva/_Vložiť súbor"
 

-#: src/compose.c:533
+#: src/compose.c:538

 msgid "/_Message/Insert si_gnature"
 msgstr "/Sp_ráva/V_ložiť podpis"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/Sp_ráva/V_ložiť podpis"
 

-#: src/compose.c:535
+#: src/compose.c:540

 msgid "/_Message/_Save"
 msgstr "/Sp_ráva/_Uložiť"
 
 msgid "/_Message/_Save"
 msgstr "/Sp_ráva/_Uložiť"
 

-#: src/compose.c:538
+#: src/compose.c:543

 msgid "/_Message/_Close"
 msgstr "/Sp_ráva/_Zavrieť"
 
 msgid "/_Message/_Close"
 msgstr "/Sp_ráva/_Zavrieť"
 

-#: src/compose.c:541
+#: src/compose.c:546

 msgid "/_Edit/_Undo"
 msgstr "/_Upraviť/_Späť"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Upraviť/_Späť"
 

-#: src/compose.c:542
+#: src/compose.c:547

 msgid "/_Edit/_Redo"
 msgstr "/_Upraviť/Z_novu urobiť"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Upraviť/Z_novu urobiť"
 

-#: src/compose.c:543 src/compose.c:631 src/compose.c:634 src/compose.c:640
+#: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645

 #: src/mainwindow.c:522 src/messageview.c:167
 msgid "/_Edit/---"
 msgstr "/_Upraviť/---"
 
 #: src/mainwindow.c:522 src/messageview.c:167
 msgid "/_Edit/---"
 msgstr "/_Upraviť/---"
 

-#: src/compose.c:544
+#: src/compose.c:549

 msgid "/_Edit/Cu_t"
 msgstr "/_Upraviť/_Vystrihnúť"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Upraviť/_Vystrihnúť"
 

-#: src/compose.c:545 src/mainwindow.c:519 src/messageview.c:165
+#: src/compose.c:550 src/mainwindow.c:519 src/messageview.c:165

 msgid "/_Edit/_Copy"
 msgstr "/_Upraviť/_Kopírovať"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Upraviť/_Kopírovať"
 

-#: src/compose.c:546
+#: src/compose.c:551

 msgid "/_Edit/_Paste"
 msgstr "/_Upraviť/_Prilepiť"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Upraviť/_Prilepiť"
 

-#: src/compose.c:547
+#: src/compose.c:552

 msgid "/_Edit/Special paste"
 msgstr "/_Upraviť/Prilepiť špeciálne"
 
 msgid "/_Edit/Special paste"
 msgstr "/_Upraviť/Prilepiť špeciálne"
 

-#: src/compose.c:548
+#: src/compose.c:553

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Upraviť/Prilepiť špeciálne/ako _citáciu"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Upraviť/Prilepiť špeciálne/ako _citáciu"
 

-#: src/compose.c:550
+#: src/compose.c:555

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Upraviť/Prilepiť špeciálne/_zalomené"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Upraviť/Prilepiť špeciálne/_zalomené"
 

-#: src/compose.c:552
+#: src/compose.c:557

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Upraviť/Prilepiť špeciálne/_nezalomené"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Upraviť/Prilepiť špeciálne/_nezalomené"
 

-#: src/compose.c:554 src/mainwindow.c:520 src/messageview.c:166
+#: src/compose.c:559 src/mainwindow.c:520 src/messageview.c:166

 msgid "/_Edit/Select _all"
 msgstr "/_Upraviť/Vy_brať všetko"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Upraviť/Vy_brať všetko"
 

-#: src/compose.c:555
+#: src/compose.c:560

 msgid "/_Edit/A_dvanced"
 msgstr "/_Upraviť/R_ozšírené"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Upraviť/R_ozšírené"
 

-#: src/compose.c:556
+#: src/compose.c:561

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Upraviť/R_ozšírené/Presunúť o znak dozadu"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Upraviť/R_ozšírené/Presunúť o znak dozadu"
 

-#: src/compose.c:561
+#: src/compose.c:566

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Upraviť/R_ozšírené/Presunúť o znak dopredu"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Upraviť/R_ozšírené/Presunúť o znak dopredu"
 

-#: src/compose.c:566
+#: src/compose.c:571

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Upraviť/R_ozšírené/Presunúť o slovo dozadu"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Upraviť/R_ozšírené/Presunúť o slovo dozadu"
 

-#: src/compose.c:571
+#: src/compose.c:576

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Upraviť/R_ozšírené/Presunúť o slovo dopredu"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Upraviť/R_ozšírené/Presunúť o slovo dopredu"
 

-#: src/compose.c:576
+#: src/compose.c:581

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Upraviť/R_ozšírené/Presunúť na začiatok riadku"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Upraviť/R_ozšírené/Presunúť na začiatok riadku"
 

-#: src/compose.c:581
+#: src/compose.c:586

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Upraviť/R_ozšírené/Presunúť na koniec riadku"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Upraviť/R_ozšírené/Presunúť na koniec riadku"
 

-#: src/compose.c:586
+#: src/compose.c:591

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Upraviť/R_ozšírené/Presunúť na predchodzí riadok"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Upraviť/R_ozšírené/Presunúť na predchodzí riadok"
 

-#: src/compose.c:591
+#: src/compose.c:596

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Upraviť/R_ozšírené/Presunúť na ďalší riadok"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Upraviť/R_ozšírené/Presunúť na ďalší riadok"
 

-#: src/compose.c:596
+#: src/compose.c:601

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Upraviť/R_ozšírené/Zmazať znak naľavo od kurzora"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Upraviť/R_ozšírené/Zmazať znak naľavo od kurzora"
 

-#: src/compose.c:601
+#: src/compose.c:606

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Upraviť/R_ozšírené/Zmazať znak napravo od kurzora"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Upraviť/R_ozšírené/Zmazať znak napravo od kurzora"
 

-#: src/compose.c:606
+#: src/compose.c:611

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Upraviť/R_ozšírené/Zmazať slovo naľavo od kurzora"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Upraviť/R_ozšírené/Zmazať slovo naľavo od kurzora"
 

-#: src/compose.c:611
+#: src/compose.c:616

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Upraviť/R_ozšírené/Zmazať slovo napravo od kurzora"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Upraviť/R_ozšírené/Zmazať slovo napravo od kurzora"
 

-#: src/compose.c:616
+#: src/compose.c:621

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Upraviť/R_ozšírené/Zmazať riadok"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Upraviť/R_ozšírené/Zmazať riadok"
 

-#: src/compose.c:621
+#: src/compose.c:626

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Upraviť/R_ozšírené/Zmazať riadok"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Upraviť/R_ozšírené/Zmazať riadok"
 

-#: src/compose.c:626
+#: src/compose.c:631

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Upraviť/R_ozšírené/Zmazať text do konca riadku"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Upraviť/R_ozšírené/Zmazať text do konca riadku"
 

-#: src/compose.c:632
+#: src/compose.c:637

 msgid "/_Edit/_Find"
 msgstr "/_Upraviť/_Nájsť"
 
 msgid "/_Edit/_Find"
 msgstr "/_Upraviť/_Nájsť"
 

-#: src/compose.c:635
+#: src/compose.c:640

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Upraviť/_Zalomiť aktuálny odstavec"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Upraviť/_Zalomiť aktuálny odstavec"
 

-#: src/compose.c:637
+#: src/compose.c:642

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Upraviť/Zalomiť všetky _dlhé riadky"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Upraviť/Zalomiť všetky _dlhé riadky"
 

-#: src/compose.c:639
+#: src/compose.c:644

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Upraviť/Aut_omaticky zalamovať"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Upraviť/Aut_omaticky zalamovať"
 

-#: src/compose.c:641
+#: src/compose.c:646

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Upraviť/Upraviť e_xterným editorom"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Upraviť/Upraviť e_xterným editorom"
 

-#: src/compose.c:644
+#: src/compose.c:649

 msgid "/_Spelling"
 msgstr "/P_ravopis"
 
 msgid "/_Spelling"
 msgstr "/P_ravopis"
 

-#: src/compose.c:645
+#: src/compose.c:650

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/P_ravopis/_Skontrolovať všetko alebo výber"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/P_ravopis/_Skontrolovať všetko alebo výber"
 

-#: src/compose.c:647
+#: src/compose.c:652

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/P_ravopis/_Zvýrazniť všetky nesprávne slová"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/P_ravopis/_Zvýrazniť všetky nesprávne slová"
 

-#: src/compose.c:649
+#: src/compose.c:654

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/P_ravopis/_Spätne skontrolovať nesprávne slovo"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/P_ravopis/_Spätne skontrolovať nesprávne slovo"
 

-#: src/compose.c:651
+#: src/compose.c:656

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/P_ravopis/_Dopredu na ďalšie nesprávne slovo"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/P_ravopis/_Dopredu na ďalšie nesprávne slovo"
 

-#: src/compose.c:653
+#: src/compose.c:658

 msgid "/_Spelling/---"
 msgstr "/P_ravopis/---"
 
 msgid "/_Spelling/---"
 msgstr "/P_ravopis/---"
 

-#: src/compose.c:654
+#: src/compose.c:659

 msgid "/_Spelling/Options"
 msgstr "/P_ravopis/Možnosti"
 
 msgid "/_Spelling/Options"
 msgstr "/P_ravopis/Možnosti"
 

-#: src/compose.c:657
+#: src/compose.c:662

 msgid "/_Options"
 msgstr "/_Možnosti"
 
 # msgstr "/_Možnosti/Vyžia_dať potvrdenie o príjme"
 msgid "/_Options"
 msgstr "/_Možnosti"
 
 # msgstr "/_Možnosti/Vyžia_dať potvrdenie o príjme"

-#: src/compose.c:658
+#: src/compose.c:663

 msgid "/_Options/Reply _mode"
 msgstr "/_Možnosti/_Spôsob odpovede"
 
 # msgstr "/_Možnosti/Priorita/_Vysoká"
 msgid "/_Options/Reply _mode"
 msgstr "/_Možnosti/_Spôsob odpovede"
 
 # msgstr "/_Možnosti/Priorita/_Vysoká"

-#: src/compose.c:659
+#: src/compose.c:664

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Možnosti/_Spôsob odpovede/_Normálna"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/_Možnosti/_Spôsob odpovede/_Normálna"
 

-#: src/compose.c:660
+#: src/compose.c:665

 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Možnosti/_Spôsob odpovede/_Všetkým"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/_Možnosti/_Spôsob odpovede/_Všetkým"
 

-#: src/compose.c:661
+#: src/compose.c:666

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Možnosti/_Spôsob odpovede/_Odosielateľovi"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/_Možnosti/_Spôsob odpovede/_Odosielateľovi"
 

-#: src/compose.c:662
+#: src/compose.c:667

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Možnosti/_Spôsob odpovede/Do _mailing-listu"
 
 # msgstr "/_Možnosti/_Zašifrovať"
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/_Možnosti/_Spôsob odpovede/Do _mailing-listu"
 
 # msgstr "/_Možnosti/_Zašifrovať"

-#: src/compose.c:663 src/compose.c:668 src/compose.c:675 src/compose.c:677
-#: src/compose.c:679
+#: src/compose.c:668 src/compose.c:673 src/compose.c:680 src/compose.c:682
+#: src/compose.c:684

 msgid "/_Options/---"
 msgstr "/_Možnosti/---"
 
 msgid "/_Options/---"
 msgstr "/_Možnosti/---"
 

-#: src/compose.c:664
+#: src/compose.c:669

 msgid "/_Options/Privacy _System"
 msgstr "/_Možnosti/_Systém súkromia"
 
 msgid "/_Options/Privacy _System"
 msgstr "/_Možnosti/_Systém súkromia"
 

-#: src/compose.c:665
+#: src/compose.c:670

 msgid "/_Options/Privacy _System/None"
 msgstr "/_Možnosti/_Systém súkromia/Žiadny"
 
 # msgstr "/_Možnosti/Systém súkromia/Žiadny"
 msgid "/_Options/Privacy _System/None"
 msgstr "/_Možnosti/_Systém súkromia/Žiadny"
 
 # msgstr "/_Možnosti/Systém súkromia/Žiadny"

-#: src/compose.c:666
+#: src/compose.c:671

 msgid "/_Options/Si_gn"
 msgstr "/_Možnosti/_Podpísať"
 
 # msgstr "/_Možnosti/Po_dpísať"
 msgid "/_Options/Si_gn"
 msgstr "/_Možnosti/_Podpísať"
 
 # msgstr "/_Možnosti/Po_dpísať"

-#: src/compose.c:667
+#: src/compose.c:672

 msgid "/_Options/_Encrypt"
 msgstr "/_Možnosti/_Zašifrovať"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Možnosti/_Zašifrovať"
 

-#: src/compose.c:669
+#: src/compose.c:674

 msgid "/_Options/_Priority"
 msgstr "/_Možnosti/Pri_orita"
 
 # msgstr "/_Možnosti/Pri_orita"
 msgid "/_Options/_Priority"
 msgstr "/_Možnosti/Pri_orita"
 
 # msgstr "/_Možnosti/Pri_orita"

-#: src/compose.c:670
+#: src/compose.c:675

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Možnosti/Priorita/Na_jvyššia"
 
 # msgstr "/_Možnosti/Priorita/Na_jvyššia"
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Možnosti/Priorita/Na_jvyššia"
 
 # msgstr "/_Možnosti/Priorita/Na_jvyššia"

-#: src/compose.c:671
+#: src/compose.c:676

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Možnosti/Priorita/_Vysoká"
 
 # msgstr "/_Možnosti/Priorita/_Vysoká"
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Možnosti/Priorita/_Vysoká"
 
 # msgstr "/_Možnosti/Priorita/_Vysoká"

-#: src/compose.c:672
+#: src/compose.c:677

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Možnosti/Priorita/_Normálna"
 
 # msgstr "/_Možnosti/Priorita/_Normálna"
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Možnosti/Priorita/_Normálna"
 
 # msgstr "/_Možnosti/Priorita/_Normálna"

-#: src/compose.c:673
+#: src/compose.c:678

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Možnosti/Priorita/Ní_zka"
 
 # msgstr "/_Možnosti/Priorita/Ní_zka"
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Možnosti/Priorita/Ní_zka"
 
 # msgstr "/_Možnosti/Priorita/Ní_zka"

-#: src/compose.c:674
+#: src/compose.c:679

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Možnosti/Priorita/N_ajnižšia"
 
 # msgstr "/_Možnosti/Priorita/N_ajnižšia"
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Možnosti/Priorita/N_ajnižšia"
 
 # msgstr "/_Možnosti/Priorita/N_ajnižšia"

-#: src/compose.c:676
+#: src/compose.c:681

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Možnosti/_Vyžiadať potvrdenie o príjme"
 
 # msgstr "/_Možnosti/Vyžia_dať potvrdenie o príjme"
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Možnosti/_Vyžiadať potvrdenie o príjme"
 
 # msgstr "/_Možnosti/Vyžia_dať potvrdenie o príjme"

-#: src/compose.c:678
+#: src/compose.c:683

 msgid "/_Options/Remo_ve references"
 msgstr "/_Možnosti/_Odstrániť odkazy"
 
 # msgstr "/_Možnosti/Odstrániť od_kazy"
 msgid "/_Options/Remo_ve references"
 msgstr "/_Možnosti/_Odstrániť odkazy"
 
 # msgstr "/_Možnosti/Odstrániť od_kazy"

-#: src/compose.c:685
+#: src/compose.c:690

 msgid "/_Options/Character _encoding"
 msgstr "/_Možnosti/_Kódovanie"
 
 # msgstr "/_Možnosti/_Kódovanie/"
 msgid "/_Options/Character _encoding"
 msgstr "/_Možnosti/_Kódovanie"
 
 # msgstr "/_Možnosti/_Kódovanie/"

-#: src/compose.c:686
+#: src/compose.c:691

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Možnosti/_Kódovanie/_Automaticky"
 
 # msgstr "/_Možnosti/_Kódovanie/_Automaticky"
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Možnosti/_Kódovanie/_Automaticky"
 
 # msgstr "/_Možnosti/_Kódovanie/_Automaticky"

-#: src/compose.c:688 src/compose.c:694 src/compose.c:702 src/compose.c:706
-#: src/compose.c:712 src/compose.c:716 src/compose.c:722 src/compose.c:728
-#: src/compose.c:732 src/compose.c:742 src/compose.c:746 src/compose.c:756
-#: src/compose.c:760
+#: src/compose.c:693 src/compose.c:699 src/compose.c:707 src/compose.c:711
+#: src/compose.c:717 src/compose.c:721 src/compose.c:727 src/compose.c:733
+#: src/compose.c:737 src/compose.c:747 src/compose.c:751 src/compose.c:761
+#: src/compose.c:765

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Možnosti/_Kódovanie/---"
 
 # msgstr "/_Možnosti/_Kódovanie/---"
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Možnosti/_Kódovanie/---"
 
 # msgstr "/_Možnosti/_Kódovanie/---"

-#: src/compose.c:690
+#: src/compose.c:695

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Možnosti/_Kódovanie/7bit ascii (US-ASC_II)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Možnosti/_Kódovanie/7bit ascii (US-ASC_II)"
 

-#: src/compose.c:692
+#: src/compose.c:697

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Možnosti/_Kódovanie/Unicode (_UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Možnosti/_Kódovanie/Unicode (_UTF-8)"
 

-#: src/compose.c:696
+#: src/compose.c:701

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Možnosti/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Možnosti/_Kódovanie/Západná Európa (ISO-8859-_1)"
 

-#: src/compose.c:698
+#: src/compose.c:703

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Možnosti/_Kódovanie/Západná Európa (ISO-8859-15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Možnosti/_Kódovanie/Západná Európa (ISO-8859-15)"
 

-#: src/compose.c:700
+#: src/compose.c:705

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Možnosti/_Kódovanie/Západná Európa (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Možnosti/_Kódovanie/Západná Európa (Windows-1252)"
 

-#: src/compose.c:704
+#: src/compose.c:709

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Možnosti/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Možnosti/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 

-#: src/compose.c:708
+#: src/compose.c:713

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Možnosti/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Možnosti/_Kódovanie/_Pobaltie (ISO-8859-13)"
 

-#: src/compose.c:710
+#: src/compose.c:715

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Možnosti/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Možnosti/_Kódovanie/Pobaltie (ISO-8859-_4)"
 

-#: src/compose.c:714
+#: src/compose.c:719

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Možnosti/_Kódovanie/Grécko (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Možnosti/_Kódovanie/Grécko (ISO-8859-_7)"
 

-#: src/compose.c:718
+#: src/compose.c:723

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Možnosti/_Kódovanie/Hebrejčina (ISO-8859-_8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Možnosti/_Kódovanie/Hebrejčina (ISO-8859-_8)"
 

-#: src/compose.c:720
+#: src/compose.c:725

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Možnosti/_Kódovanie/Hebrejčina (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Možnosti/_Kódovanie/Hebrejčina (Windows-1255)"
 

-#: src/compose.c:724
+#: src/compose.c:729

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Možnosti/_Kódovanie/Arabské (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Možnosti/_Kódovanie/Arabské (ISO-8859-_6)"
 

-#: src/compose.c:726
+#: src/compose.c:731

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Možnosti/_Kódovanie/Arabské (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Možnosti/_Kódovanie/Arabské (Windows-1256)"
 

-#: src/compose.c:730
+#: src/compose.c:735

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Možnosti/_Kódovanie/Turecko (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Možnosti/_Kódovanie/Turecko (ISO-8859-_9)"
 

-#: src/compose.c:734
+#: src/compose.c:739

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Možnosti/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Možnosti/_Kódovanie/Cyrilika (ISO-8859-_5)"
 

-#: src/compose.c:736
+#: src/compose.c:741

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Možnosti/_Kódovanie/Cyrilika (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Možnosti/_Kódovanie/Cyrilika (KOI8-_R)"
 

-#: src/compose.c:738
+#: src/compose.c:743

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Možnosti/_Kódovanie/Cyrilika (KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Možnosti/_Kódovanie/Cyrilika (KOI8-U)"
 

-#: src/compose.c:740
+#: src/compose.c:745

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Možnosti/_Kódovanie/Cyrilika (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Možnosti/_Kódovanie/Cyrilika (Windows-1251)"
 

-#: src/compose.c:744
+#: src/compose.c:749

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Možnosti/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Možnosti/_Kódovanie/Japonsko (ISO-2022-_JP)"
 

-#: src/compose.c:748
+#: src/compose.c:753

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Možnosti/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Možnosti/_Kódovanie/Zjednodušená čínština (_GB2312)"
 

-#: src/compose.c:750
+#: src/compose.c:755

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Možnosti/_Kódovanie/Zjednodušená čínština (_GBK)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Možnosti/_Kódovanie/Zjednodušená čínština (_GBK)"
 

-#: src/compose.c:752
+#: src/compose.c:757

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Možnosti/_Kódovanie/Tradičná čínština (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Možnosti/_Kódovanie/Tradičná čínština (_Big5)"
 

-#: src/compose.c:754
+#: src/compose.c:759

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Možnosti/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Možnosti/_Kódovanie/Tradičná čínština (EUC-_TW)"
 

-#: src/compose.c:758
+#: src/compose.c:763

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Možnosti/_Kódovanie/Kórea (EUC-_KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Možnosti/_Kódovanie/Kórea (EUC-_KR)"
 

-#: src/compose.c:762
+#: src/compose.c:767

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Možnosti/_Kódovanie/Thajsko (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Možnosti/_Kódovanie/Thajsko (TIS-620)"
 

-#: src/compose.c:764
+#: src/compose.c:769

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Možnosti/_Kódovanie/Thajsko (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Možnosti/_Kódovanie/Thajsko (Windows-874)"
 

-#: src/compose.c:768
+#: src/compose.c:773

 msgid "/_Tools/Show _ruler"
 msgstr "/_Nástroje/Zobraziť _mierku"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Nástroje/Zobraziť _mierku"
 

-#: src/compose.c:769 src/messageview.c:303
+#: src/compose.c:774 src/messageview.c:303

 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 

-#: src/compose.c:770
+#: src/compose.c:775

 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 

-#: src/compose.c:771 src/mainwindow.c:832 src/messageview.c:328
+#: src/compose.c:776 src/mainwindow.c:832 src/messageview.c:328

 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 

-#: src/compose.c:1598
+#: src/compose.c:1039 src/prefs_compose_writing.c:384
+msgid "New message subject format error."
+msgstr "Chyba v tvare predmetu novej správy."
+
+#: src/compose.c:1068 src/prefs_compose_writing.c:388
+msgid "New message body format error."
+msgstr "Chyba v tvare tela novej správy."
+
+#: src/compose.c:1438 src/prefs_quote.c:281
+msgid "Message reply format error."
+msgstr "Chyba v tvare odpovede."
+
+#: src/compose.c:1555 src/prefs_quote.c:286
+msgid "Message forward format error."
+msgstr "Chyba v tvare preposielanej správy."
+
+#: src/compose.c:1675

 msgid "Fw: multiple emails"
 msgstr "Fw: viacero správ"
 
 msgid "Fw: multiple emails"
 msgstr "Fw: viacero správ"
 

-#: src/compose.c:2021
+#: src/compose.c:2050
+msgid "Message redirect format error."
+msgstr "Chyba v tvare presmerúvanej správy."
+
+#: src/compose.c:2119

 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 

-#: src/compose.c:2024 src/compose.c:5520 src/compose.c:6288
+#: src/compose.c:2122 src/compose.c:5664 src/compose.c:6434 src/compose.c:9472

 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 

-#: src/compose.c:2027
+#: src/compose.c:2125

 msgid "Followup-To:"
 msgstr "Followup-To:"
 
 msgid "Followup-To:"
 msgstr "Followup-To:"
 

-#: src/compose.c:2424
+#: src/compose.c:2304
+#, c-format
+msgid "The file '%s' has been attached."
+msgstr "Súbor '%s' bol priložený k správe."
+
+#: src/compose.c:2308
+msgid "Couldn't attach a file (charset conversion failed)."
+msgstr "Nepodarilo sa priložiť súbor (chyba v konverzii kódovania znakov)."
+
+#: src/compose.c:2539

 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 

-#: src/compose.c:2440
-msgid "Message reply/forward format error."
-msgstr "Chyba formátu odpovede/preposielania."
-
-#: src/compose.c:2997
+#: src/compose.c:3133

 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 

-#: src/compose.c:3001
+#: src/compose.c:3137

 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 

-#: src/compose.c:3028
+#: src/compose.c:3164

 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 

-#: src/compose.c:3846
+#: src/compose.c:3983

 msgid " [Edited]"
 msgstr "[Upravené]"
 
 msgid " [Edited]"
 msgstr "[Upravené]"
 

-#: src/compose.c:3852
+#: src/compose.c:3989

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 

-#: src/compose.c:3855
+#: src/compose.c:3992

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[bez názvu] - Písanie správy%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[bez názvu] - Písanie správy%s"
 

-#: src/compose.c:3880 src/messageview.c:613
+#: src/compose.c:4017 src/messageview.c:613

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1501,32 +1738,32 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 

-#: src/compose.c:4057 src/compose.c:4088 src/compose.c:4119 src/toolbar.c:391
-#: src/toolbar.c:442
+#: src/compose.c:4195 src/compose.c:4226 src/compose.c:4258 src/toolbar.c:401
+#: src/toolbar.c:452

 msgid "Send"
 msgstr "Odoslať"
 
 msgid "Send"
 msgstr "Odoslať"
 

-#: src/compose.c:4058
+#: src/compose.c:4196

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Jediný príjemca je prednastavená adresa CC. Odoslať napriek tomu?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Jediný príjemca je prednastavená adresa CC. Odoslať napriek tomu?"
 

-#: src/compose.c:4059 src/compose.c:4090 src/compose.c:4121 src/compose.c:4590
+#: src/compose.c:4197 src/compose.c:4228 src/compose.c:4260 src/compose.c:4734

 msgid "+_Send"
 msgstr "+_Odoslať"
 
 msgid "+_Send"
 msgstr "+_Odoslať"
 

-#: src/compose.c:4089
+#: src/compose.c:4227

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Jediný príjemca je prednastavená adresa BCC. Odoslať napriek tomu?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Jediný príjemca je prednastavená adresa BCC. Odoslať napriek tomu?"
 

-#: src/compose.c:4106
+#: src/compose.c:4244

 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 

-#: src/compose.c:4120
+#: src/compose.c:4259

 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 

-#: src/compose.c:4163 src/compose.c:7749
+#: src/compose.c:4305 src/compose.c:7935

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1536,7 +1773,7 @@ msgstr ""
 "\n"
 "Nepodarila sa konverzia kódovania znakov."
 
 "\n"
 "Nepodarila sa konverzia kódovania znakov."
 

-#: src/compose.c:4166 src/compose.c:7752
+#: src/compose.c:4308 src/compose.c:7938

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1546,7 +1783,7 @@ msgstr ""
 "\n"
 "Nie je dostupný šifrovací kľúč príjemcu."
 
 "\n"
 "Nie je dostupný šifrovací kľúč príjemcu."
 

-#: src/compose.c:4170 src/compose.c:7746
+#: src/compose.c:4312 src/compose.c:7932

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1557,7 +1794,7 @@ msgstr ""
 "\n"
 "Podpísanie zlyhalo: %s"
 
 "\n"
 "Podpísanie zlyhalo: %s"
 

-#: src/compose.c:4173
+#: src/compose.c:4315

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1568,11 +1805,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4175
+#: src/compose.c:4317

 msgid "Could not queue message for sending."
 msgstr "Nie je možné zaradiť správu do fronty na odoslanie."
 
 msgid "Could not queue message for sending."
 msgstr "Nie je možné zaradiť správu do fronty na odoslanie."
 

-#: src/compose.c:4190 src/compose.c:4249
+#: src/compose.c:4332 src/compose.c:4391

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1580,7 +1817,7 @@ msgstr ""
 "Správa bola zaradená do fronty, ale nebolo možné odoslať ju.\n"
 "Použite \"Odoslať správy vo fronte\" z hlavného okna pre opätovný pokus."
 
 "Správa bola zaradená do fronty, ale nebolo možné odoslať ju.\n"
 "Použite \"Odoslať správy vo fronte\" z hlavného okna pre opätovný pokus."
 

-#: src/compose.c:4243
+#: src/compose.c:4385

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -1589,7 +1826,7 @@ msgstr ""
 "%s\n"
 "Použite \"Odoslať správy vo fronte\" z hlavného okna pre opätovný pokus."
 
 "%s\n"
 "Použite \"Odoslať správy vo fronte\" z hlavného okna pre opätovný pokus."
 

-#: src/compose.c:4587
+#: src/compose.c:4731

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1600,7 +1837,7 @@ msgstr ""
 "kódovania na %s.\n"
 "Odoslať správu v kódovaní %s?"
 
 "kódovania na %s.\n"
 "Odoslať správu v kódovaní %s?"
 

-#: src/compose.c:4646
+#: src/compose.c:4790

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1613,60 +1850,60 @@ msgstr ""
 "\n"
 "Odoslať aj napriek tomu?"
 
 "\n"
 "Odoslať aj napriek tomu?"
 

-#: src/compose.c:4834
+#: src/compose.c:4978

 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadne konto pre odosielanie správ!"
 
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadne konto pre odosielanie správ!"
 

-#: src/compose.c:4844
+#: src/compose.c:4988

 msgid "No account for posting news available!"
 msgstr "Nie je dostupné žiadne konto pre odosielanie news článkov!"
 
 msgid "No account for posting news available!"
 msgstr "Nie je dostupné žiadne konto pre odosielanie news článkov!"
 

-#: src/compose.c:5537
+#: src/compose.c:5681

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Použite tabulátor pre dopĺňanie adries z adresára"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "Použite tabulátor pre dopĺňanie adries z adresára"
 

-#: src/compose.c:5665
+#: src/compose.c:5809

 msgid "Mime type"
 msgstr "Mime typ"
 
 msgid "Mime type"
 msgstr "Mime typ"
 

-#: src/compose.c:5671 src/compose.c:5967 src/mimeview.c:212
+#: src/compose.c:5815 src/compose.c:6111 src/mimeview.c:212

 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Veľkosť"
 
 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "Veľkosť"
 

-#: src/compose.c:5732
+#: src/compose.c:5876

 msgid "Save Message to "
 msgstr "Uložiť správu do "
 
 msgid "Save Message to "
 msgstr "Uložiť správu do "
 

-#: src/compose.c:5754 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:5898 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Prehliadať"
 
 msgid "_Browse"
 msgstr "_Prehliadať"
 

-#: src/compose.c:5966 src/compose.c:7156
+#: src/compose.c:6110 src/compose.c:7342

 msgid "MIME type"
 msgstr "MIME typ"
 
 msgid "MIME type"
 msgstr "MIME typ"
 

-#: src/compose.c:6038
+#: src/compose.c:6182

 msgid "Hea_der"
 msgstr "H_lavička"
 
 msgid "Hea_der"
 msgstr "H_lavička"
 

-#: src/compose.c:6042
+#: src/compose.c:6186

 msgid "_Attachments"
 msgstr "_Prílohy"
 
 msgid "_Attachments"
 msgstr "_Prílohy"
 

-#: src/compose.c:6046
+#: src/compose.c:6190

 msgid "Othe_rs"
 msgstr "_Ostatné"
 
 msgid "Othe_rs"
 msgstr "_Ostatné"
 

-#: src/compose.c:6061 src/summary_search.c:298
+#: src/compose.c:6205 src/summary_search.c:366

 msgid "Subject:"
 msgstr "Predmet:"
 
 msgid "Subject:"
 msgstr "Predmet:"
 

-#: src/compose.c:6250
+#: src/compose.c:6396

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1675,20 +1912,20 @@ msgstr ""
 "Pravopisná kontrola sa nedá spustiť.\n"
 "%s"
 
 "Pravopisná kontrola sa nedá spustiť.\n"
 "%s"
 

-#: src/compose.c:6362
+#: src/compose.c:6508

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Od: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Od: <i>%s</i>"
 

-#: src/compose.c:6393
+#: src/compose.c:6539

 msgid "Account to use for this email"
 msgstr "Z ktorého konta odoslať túto správu"
 
 msgid "Account to use for this email"
 msgstr "Z ktorého konta odoslať túto správu"
 

-#: src/compose.c:6395
+#: src/compose.c:6541

 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 
 msgid "Sender address to be used"
 msgstr "Adresa odosielateľa"
 

-#: src/compose.c:6549
+#: src/compose.c:6702

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "


@@ -1697,47 +1934,51 @@ msgstr ""
 "Systém súkromia '%s' sa nedá načítať. Nebude možné podpísať, ani zašifrovať "
 "túto správu."
 
 "Systém súkromia '%s' sa nedá načítať. Nebude možné podpísať, ani zašifrovať "
 "túto správu."
 

-#: src/compose.c:6788
-msgid "Message To format error."
-msgstr "Chyba v hlavičke príjemcu."
+#: src/compose.c:6864 src/prefs_template.c:549
+msgid "Template body format error."
+msgstr "Chyba v tvare tela šablóny."

 
 

-#: src/compose.c:6801
-msgid "Message Cc format error."
-msgstr "Chyba v hlavičke kópie."
+#: src/compose.c:6972 src/prefs_template.c:587
+msgid "Template To format error."
+msgstr "Chyba v tvare hlavičky príjemcu v šablóne."

 
 

-#: src/compose.c:6814
-msgid "Message Bcc format error."
-msgstr "Chyba v hlavičke skrytej kópie."
+#: src/compose.c:6985 src/prefs_template.c:592
+msgid "Template Cc format error."
+msgstr "Chyba v tvare hlavičky kópie v šablóne."

 
 

-#: src/compose.c:6828
-msgid "Message subject format error."
-msgstr "Chyba v hlavičke predmetu."
+#: src/compose.c:6998 src/prefs_template.c:597
+msgid "Template Bcc format error."
+msgstr "Chyba v tvare hlavičky slepej kópie v šablóne."

 
 

-#: src/compose.c:7050
+#: src/compose.c:7012 src/prefs_template.c:602
+msgid "Template subject format error."
+msgstr "Chyba v tvare hlavičky predmetu v šablóne."
+
+#: src/compose.c:7236

 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 

-#: src/compose.c:7065
+#: src/compose.c:7251

 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 

-#: src/compose.c:7138
+#: src/compose.c:7324

 msgid "Properties"
 msgstr "Vlastnosti"
 
 msgid "Properties"
 msgstr "Vlastnosti"
 

-#: src/compose.c:7189
+#: src/compose.c:7375

 msgid "Encoding"
 msgstr "Kódová stránka"
 
 msgid "Encoding"
 msgstr "Kódová stránka"
 

-#: src/compose.c:7209
+#: src/compose.c:7395

 msgid "Path"
 msgstr "Cesta"
 
 msgid "Path"
 msgstr "Cesta"
 

-#: src/compose.c:7210 src/prefs_toolbar.c:1060
+#: src/compose.c:7396 src/prefs_toolbar.c:1060

 msgid "File name"
 msgstr "Názov súboru"
 
 msgid "File name"
 msgstr "Názov súboru"
 

-#: src/compose.c:7393
+#: src/compose.c:7579

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1748,19 +1989,19 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 

-#: src/compose.c:7435
+#: src/compose.c:7621

 msgid "Compose: input from monitoring process\n"
 msgstr "Písanie správy: vstup z monitorovacieho procesu\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Písanie správy: vstup z monitorovacieho procesu\n"
 

-#: src/compose.c:7716 src/messageview.c:718
-msgid "Sylpheed-Claws needs network access in order to send this email."
-msgstr "Sylpheed-Claws potrebuje pre odoslanie tejto správy pripojenie k sieti."
+#: src/compose.c:7902 src/messageview.c:718
+msgid "Claws Mail needs network access in order to send this email."
+msgstr "Claws Mail potrebuje pre odoslanie tejto správy pripojenie k sieti."

 
 

-#: src/compose.c:7741
+#: src/compose.c:7927

 msgid "Could not queue message."
 msgstr "Nie je možné zaradiť správu do fronty na odoslanie."
 
 msgid "Could not queue message."
 msgstr "Nie je možné zaradiť správu do fronty na odoslanie."
 

-#: src/compose.c:7743
+#: src/compose.c:7929

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1771,20 +2012,20 @@ msgstr ""
 "\n"
 "%s"
 
 "\n"
 "%s"
 

-#: src/compose.c:7863
+#: src/compose.c:8049

 msgid "Could not save draft."
 msgstr "Koncept sa nedá uložiť."
 
 msgid "Could not save draft."
 msgstr "Koncept sa nedá uložiť."
 

-#: src/compose.c:7938 src/compose.c:7961
+#: src/compose.c:8124 src/compose.c:8147

 msgid "Select file"
 msgstr "Zvoľte súbor"
 
 msgid "Select file"
 msgstr "Zvoľte súbor"
 

-#: src/compose.c:7974
+#: src/compose.c:8160

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor `%s' sa nedá čítať."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor `%s' sa nedá čítať."
 

-#: src/compose.c:7976
+#: src/compose.c:8162

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1793,44 +2034,44 @@ msgstr ""
 "Súbor `%s' obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
 "Súbor `%s' obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 

-#: src/compose.c:8024
+#: src/compose.c:8210

 msgid "Discard message"
 msgstr "Zrušiť správu"
 
 msgid "Discard message"
 msgstr "Zrušiť správu"
 

-#: src/compose.c:8025
+#: src/compose.c:8211

 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Táto správa bola zmenená. Zahodiť zmeny?"
 

-#: src/compose.c:8026
+#: src/compose.c:8212

 msgid "_Discard"
 msgstr "_Zahodiť"
 
 msgid "_Discard"
 msgstr "_Zahodiť"
 

-#: src/compose.c:8026
+#: src/compose.c:8212

 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 
 msgid "_Save to Drafts"
 msgstr "Uložiť medzi _koncepty"
 

-#: src/compose.c:8070
+#: src/compose.c:8256

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Chcete použiť šablónu '%s' ?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Chcete použiť šablónu '%s' ?"
 

-#: src/compose.c:8072
+#: src/compose.c:8258

 msgid "Apply template"
 msgstr "Použiť šablónu"
 
 msgid "Apply template"
 msgstr "Použiť šablónu"
 

-#: src/compose.c:8073
+#: src/compose.c:8259

 msgid "_Replace"
 msgstr "_Nahradiť"
 
 msgid "_Replace"
 msgstr "_Nahradiť"
 

-#: src/compose.c:8073
+#: src/compose.c:8259

 msgid "_Insert"
 msgstr "_Vložiť"
 
 msgid "_Insert"
 msgstr "_Vložiť"
 

-#: src/compose.c:8761
+#: src/compose.c:8947

 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 
 msgid "Insert or attach?"
 msgstr "Vložiť, alebo pripojiť ako prílohu?"
 

-#: src/compose.c:8762
+#: src/compose.c:8948

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"


@@ -1838,15 +2079,19 @@ msgstr ""
 "Chcete vložiť obsah súboru do tela správy, alebo ho chcete pripojiť k správe "
 "ako prílohu?"
 
 "Chcete vložiť obsah súboru do tela správy, alebo ho chcete pripojiť k správe "
 "ako prílohu?"
 

-#: src/compose.c:8764
+#: src/compose.c:8950

 msgid "+_Insert"
 msgstr "+_Vložiť"
 
 msgid "+_Insert"
 msgstr "+_Vložiť"
 

-#: src/compose.c:8764
+#: src/compose.c:8950

 msgid "_Attach"
 msgstr "_Pripojiť"
 
 msgid "_Attach"
 msgstr "_Pripojiť"
 

-#: src/compose.c:9170
+#: src/compose.c:9149
+msgid "Quote format error."
+msgstr "Chyba v tvare citácie."
+
+#: src/compose.c:9368

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -1857,12 +2102,12 @@ msgstr ""
 
 #: src/crash.c:142
 #, c-format
 
 #: src/crash.c:142
 #, c-format

-msgid "Sylpheed-Claws process (%ld) received signal %ld"
-msgstr "Proces Sylpheed-Claws (%ld) prijal signál %ld"
+msgid "Claws Mail process (%ld) received signal %ld"
+msgstr "Proces Claws Mail (%ld) prijal signál %ld"

 
 #: src/crash.c:188
 
 #: src/crash.c:188

-msgid "Sylpheed-Claws has crashed"
-msgstr "Sylpheed-Claws havaroval"
+msgid "Claws Mail has crashed"
+msgstr "Claws Mail havaroval"

 
 #: src/crash.c:204
 #, c-format
 
 #: src/crash.c:204
 #, c-format


@@ -1893,61 +2138,69 @@ msgstr "Vytvoriť správu o chybe"
 msgid "Save crash information"
 msgstr "Uložiť informácie o havárii"
 
 msgid "Save crash information"
 msgstr "Uložiť informácie o havárii"
 

-#: src/editaddress.c:153
+#: src/editaddress.c:183

 msgid "Add New Person"
 msgstr "Pridať kontakt"
 
 msgid "Add New Person"
 msgstr "Pridať kontakt"
 

-#: src/editaddress.c:154
+#: src/editaddress.c:184

 msgid "Edit Person Details"
 msgstr "Upraviť údaje o kontakte"
 
 msgid "Edit Person Details"
 msgstr "Upraviť údaje o kontakte"
 

-#: src/editaddress.c:316
+#: src/editaddress.c:355

 msgid "An Email address must be supplied."
 msgstr "Musíte zadať e-mailovú adresu."
 
 msgid "An Email address must be supplied."
 msgstr "Musíte zadať e-mailovú adresu."
 

-#: src/editaddress.c:490
+#: src/editaddress.c:529

 msgid "A Name and Value must be supplied."
 msgstr "Musíte zadať názov a hodnotu."
 
 msgid "A Name and Value must be supplied."
 msgstr "Musíte zadať názov a hodnotu."
 

-#: src/editaddress.c:560
+#: src/editaddress.c:618
+msgid "Discard"
+msgstr "Zahodiť"
+
+#: src/editaddress.c:619
+msgid "Apply"
+msgstr "Použiť"
+
+#: src/editaddress.c:649 src/editaddress.c:698

 msgid "Edit Person Data"
 msgstr "Upraviť údaje o kontakte"
 
 msgid "Edit Person Data"
 msgstr "Upraviť údaje o kontakte"
 

-#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:799
+#: src/editaddress.c:759 src/expldifdlg.c:508 src/exporthtml.c:799

 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Zobraziť meno"
 

-#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:827
+#: src/editaddress.c:765 src/editaddress.c:769 src/ldif.c:827

 msgid "Last Name"
 msgstr "Priezvisko"
 
 msgid "Last Name"
 msgstr "Priezvisko"
 

-#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:823
+#: src/editaddress.c:766 src/editaddress.c:768 src/ldif.c:823

 msgid "First Name"
 msgstr "Krstné meno"
 
 msgid "First Name"
 msgstr "Krstné meno"
 

-#: src/editaddress.c:683
+#: src/editaddress.c:771

 msgid "Nickname"
 msgstr "Prezývka"
 
 msgid "Nickname"
 msgstr "Prezývka"
 

-#: src/editaddress.c:760 src/editaddress.c:816
+#: src/editaddress.c:848 src/editaddress.c:904

 msgid "Alias"
 msgstr "Alias"
 
 msgid "Alias"
 msgstr "Alias"
 

-#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:222
+#: src/editaddress.c:1042 src/editaddress.c:1099 src/prefs_customheader.c:222

 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Hodnota"
 
 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Hodnota"
 

-#: src/editaddress.c:1070
+#: src/editaddress.c:1161

 msgid "_User Data"
 msgstr "Údaje o _používateľovi"
 
 msgid "_User Data"
 msgstr "Údaje o _používateľovi"
 

-#: src/editaddress.c:1071
+#: src/editaddress.c:1162

 msgid "_Email Addresses"
 msgstr "_E-mailové adresy"
 
 msgid "_Email Addresses"
 msgstr "_E-mailové adresy"
 

-#: src/editaddress.c:1072
+#: src/editaddress.c:1163

 msgid "O_ther Attributes"
 msgstr "Ďalšie _atribúty"
 
 msgid "O_ther Attributes"
 msgstr "Ďalšie _atribúty"
 


@@ -1972,7 +2225,7 @@ msgid " Check File "
 msgstr "Testovať súbor"
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr "Testovať súbor"
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1909
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1917

 msgid "File"
 msgstr "Súbor"
 
 msgid "File"
 msgstr "Súbor"
 


@@ -2022,11 +2275,11 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 

-#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:134 src/mh_gtk.c:127
+#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:137 src/mh_gtk.c:130

 msgid "New folder"
 msgstr "Nový priečinok"
 
 msgid "New folder"
 msgstr "Nový priečinok"
 

-#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:128
+#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 


@@ -2107,12 +2360,12 @@ 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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "

-"computer as Sylpheed-Claws."
+"computer as Claws Mail."

 msgstr ""
 "Toto je názov serveru. Napríklad, \"ldap.mojadomena.sk\" môže byť vhodné pre "
 "organizáciu \"mojadomena.sk\". Môžete tu použiť aj IP adresu. Môžete zadať "
 msgstr ""
 "Toto je názov serveru. Napríklad, \"ldap.mojadomena.sk\" môže byť vhodné pre "
 "organizáciu \"mojadomena.sk\". Môžete tu použiť aj IP adresu. Môžete zadať "

-"\"localhost\", ak požadovaný LDAP server beží na rovnakom počítači ako "
-"Sylpheed-Claws."
+"\"localhost\", ak požadovaný LDAP server beží na rovnakom počítači ako Claws "
+"Mail."

 
 #: src/editldap.c:470
 msgid "TLS"
 
 #: src/editldap.c:470
 msgid "TLS"


@@ -2160,12 +2413,12 @@ msgstr "Stlačte toto tlačítko pre skúšku pripojenia k serveru."
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Tu zadávate názov priečinku, ktorý sa na serveri má prehľadať. Napríklad:\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Tu zadávate názov priečinku, ktorý sa na serveri má prehľadať. Napríklad:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 


@@ -2261,12 +2514,12 @@ msgstr "Priradiť DN"
 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 "
 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 "

-"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "

 "performing a search."
 msgstr ""
 "Názov účtu LDAP, ktorý bude použitý pre spojenie so serverom. Toto je "
 "väčšinou potrebné len pre chránené servery. Meno je väčšinou v tvare "
 "performing a search."
 msgstr ""
 "Názov účtu LDAP, ktorý bude použitý pre spojenie so serverom. Toto je "
 "väčšinou potrebné len pre chránené servery. Meno je väčšinou v tvare "

-"\"cn=meno,dc=sylpheed,dc=com\". Pri vyhľadávaní sa toto pole väčšinou "
+"\"cn=meno,dc=claws-mail,dc=org\". Pri vyhľadávaní sa toto pole väčšinou "

 "necháva prázdne."
 
 #: src/editldap.c:741
 "necháva prázdne."
 
 #: src/editldap.c:741


@@ -2301,7 +2554,7 @@ msgstr "Základné"
 msgid "Search"
 msgstr "Hľadať"
 
 msgid "Search"
 msgstr "Hľadať"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:488
+#: src/editldap.c:810 src/gtk/quicksearch.c:490

 msgid "Extended"
 msgstr "Rozšírené"
 
 msgid "Extended"
 msgstr "Rozšírené"
 


@@ -2325,19 +2578,19 @@ msgstr "Upraviť vCard záznam"
 msgid "Add New vCard Entry"
 msgstr "Pridať nový vCard záznam"
 
 msgid "Add New vCard Entry"
 msgstr "Pridať nový vCard záznam"
 

-#: src/exphtmldlg.c:113
+#: src/exphtmldlg.c:110

 msgid "Please specify output directory and file to create."
 msgstr "Prosím zadajte názov výstupného priečinku a súboru."
 
 msgid "Please specify output directory and file to create."
 msgstr "Prosím zadajte názov výstupného priečinku a súboru."
 

-#: src/exphtmldlg.c:116
+#: src/exphtmldlg.c:113

 msgid "Select stylesheet and formatting."
 msgstr "Vyberte stylesheet a formátovanie."
 
 msgid "Select stylesheet and formatting."
 msgstr "Vyberte stylesheet a formátovanie."
 

-#: src/exphtmldlg.c:119 src/expldifdlg.c:117
+#: src/exphtmldlg.c:116 src/expldifdlg.c:117

 msgid "File exported successfully."
 msgstr "Súbor bol úspešne exportovaný."
 
 msgid "File exported successfully."
 msgstr "Súbor bol úspešne exportovaný."
 

-#: src/exphtmldlg.c:184
+#: src/exphtmldlg.c:181

 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"


@@ -2346,11 +2599,11 @@ msgstr ""
 "Priečinok '%s' pre výstup HTML\n"
 "neexistuje. Vytvoriť ho?"
 
 "Priečinok '%s' pre výstup HTML\n"
 "neexistuje. Vytvoriť ho?"
 

-#: src/exphtmldlg.c:187 src/expldifdlg.c:193
+#: src/exphtmldlg.c:184 src/expldifdlg.c:193

 msgid "Create Directory"
 msgstr "Vytvoriť priečinok"
 
 msgid "Create Directory"
 msgstr "Vytvoriť priečinok"
 

-#: src/exphtmldlg.c:196
+#: src/exphtmldlg.c:193

 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"


@@ -2359,102 +2612,102 @@ msgstr ""
 "Nepodarilo sa vytvoriť priečinok pre HTML výstup:\n"
 "%s"
 
 "Nepodarilo sa vytvoriť priečinok pre HTML výstup:\n"
 "%s"
 

-#: src/exphtmldlg.c:198 src/expldifdlg.c:204
+#: src/exphtmldlg.c:195 src/expldifdlg.c:204

 msgid "Failed to Create Directory"
 msgstr "Nepodarilo sa vytvoriť priečinok"
 
 msgid "Failed to Create Directory"
 msgstr "Nepodarilo sa vytvoriť priečinok"
 

-#: src/exphtmldlg.c:240
+#: src/exphtmldlg.c:237

 msgid "Error creating HTML file"
 msgstr "Chyba pri vytváraní HTML súboru"
 
 msgid "Error creating HTML file"
 msgstr "Chyba pri vytváraní HTML súboru"
 

-#: src/exphtmldlg.c:326
+#: src/exphtmldlg.c:323

 msgid "Select HTML output file"
 msgstr "Zvoľte výstupný súbor HTML"
 
 msgid "Select HTML output file"
 msgstr "Zvoľte výstupný súbor HTML"
 

-#: src/exphtmldlg.c:390
+#: src/exphtmldlg.c:387

 msgid "HTML Output File"
 msgstr "Výstupný súbor HTML"
 
 msgid "HTML Output File"
 msgstr "Výstupný súbor HTML"
 

-#: src/exphtmldlg.c:399 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "P_rehliadať"
 
 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "P_rehliadať"
 

-#: src/exphtmldlg.c:452
+#: src/exphtmldlg.c:449

 msgid "Stylesheet"
 msgstr "Stylesheet"
 
 msgid "Stylesheet"
 msgstr "Stylesheet"
 

-#: src/exphtmldlg.c:460 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
-#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:1003 src/prefs_account.c:663
-#: src/summaryview.c:4983
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1678
+#: src/gtk/gtkaspell.c:2411 src/mainwindow.c:1003 src/prefs_account.c:667
+#: src/summaryview.c:4991

 msgid "None"
 msgstr "Žiadna"
 
 msgid "None"
 msgstr "Žiadna"
 

-#: src/exphtmldlg.c:461 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:458 src/prefs_summaries.c:350 src/prefs_summaries.c:691

 msgid "Default"
 msgstr "Štandardné"
 
 msgid "Default"
 msgstr "Štandardné"
 

-#: src/exphtmldlg.c:462 src/plugins/pgpcore/sgpgme.c:140
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:144

 msgid "Full"
 msgstr "Plné"
 
 msgid "Full"
 msgstr "Plné"
 

-#: src/exphtmldlg.c:463
+#: src/exphtmldlg.c:460

 msgid "Custom"
 msgstr "Vlastné"
 
 msgid "Custom"
 msgstr "Vlastné"
 

-#: src/exphtmldlg.c:464
+#: src/exphtmldlg.c:461

 msgid "Custom-2"
 msgstr "Vlastné-2"
 
 msgid "Custom-2"
 msgstr "Vlastné-2"
 

-#: src/exphtmldlg.c:465
+#: src/exphtmldlg.c:462

 msgid "Custom-3"
 msgstr "Vlastné-3"
 
 msgid "Custom-3"
 msgstr "Vlastné-3"
 

-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:463

 msgid "Custom-4"
 msgstr "Vlastné-4"
 
 msgid "Custom-4"
 msgstr "Vlastné-4"
 

-#: src/exphtmldlg.c:473
+#: src/exphtmldlg.c:470

 msgid "Full Name Format"
 msgstr "Formát celého mena"
 
 msgid "Full Name Format"
 msgstr "Formát celého mena"
 

-#: src/exphtmldlg.c:481
+#: src/exphtmldlg.c:478

 msgid "First Name, Last Name"
 msgstr "Krstné meno, priezvisko"
 
 msgid "First Name, Last Name"
 msgstr "Krstné meno, priezvisko"
 

-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:479

 msgid "Last Name, First Name"
 msgstr "Priezvisko, krstné meno"
 
 msgid "Last Name, First Name"
 msgstr "Priezvisko, krstné meno"
 

-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:486

 msgid "Color Banding"
 msgstr "Farebné značenie"
 
 msgid "Color Banding"
 msgstr "Farebné značenie"
 

-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:492

 msgid "Format Email Links"
 msgstr "Formátovať e-mailové linky"
 
 msgid "Format Email Links"
 msgstr "Formátovať e-mailové linky"
 

-#: src/exphtmldlg.c:501
+#: src/exphtmldlg.c:498

 msgid "Format User Attributes"
 msgstr "Formátovať používateľské atribúty"
 
 msgid "Format User Attributes"
 msgstr "Formátovať používateľské atribúty"
 

-#: src/exphtmldlg.c:556 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919

 msgid "File Name :"
 msgstr "Názov súboru :"
 
 msgid "File Name :"
 msgstr "Názov súboru :"
 

-#: src/exphtmldlg.c:566
+#: src/exphtmldlg.c:563

 msgid "Open with Web Browser"
 msgstr "Otvoriť vo webovom prehliadači"
 
 msgid "Open with Web Browser"
 msgstr "Otvoriť vo webovom prehliadači"
 

-#: src/exphtmldlg.c:598
+#: src/exphtmldlg.c:595

 msgid "Export Address Book to HTML File"
 msgstr "Exportovať adresár do HTML"
 
 msgid "Export Address Book to HTML File"
 msgstr "Exportovať adresár do HTML"
 

-#: src/exphtmldlg.c:664 src/expldifdlg.c:736 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027

 msgid "File Info"
 msgstr "Údaje o súbore"
 
 msgid "File Info"
 msgstr "Údaje o súbore"
 

-#: src/exphtmldlg.c:665
+#: src/exphtmldlg.c:662

 msgid "Format"
 msgstr "Formát"
 
 msgid "Format"
 msgstr "Formát"
 


@@ -2516,13 +2769,13 @@ msgstr "Prípona"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Prípona je použitá pre vytvorenie \"Distinguished Name\" (alebo DN) pre "
 "položku LDAP. Napríklad:\n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "Prípona je použitá pre vytvorenie \"Distinguished Name\" (alebo DN) pre "
 "položku LDAP. Napríklad:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 


@@ -2538,31 +2791,31 @@ msgstr "Jedinečné ID"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Jedinečné ID tohoto adresáru sa použije na vytvorenie DN formátovaného "
 "približne takto:\n"
 msgstr ""
 "Jedinečné ID tohoto adresáru sa použije na vytvorenie DN formátovaného "
 "približne takto:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Zobrazované meno tohoto adresáru sa použije na vytvorenie DN formátovaného "
 "takto:\n"
 msgstr ""
 "Zobrazované meno tohoto adresáru sa použije na vytvorenie DN formátovaného "
 "takto:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "Prvá e-mailová adresa každého kontaktu sa použije na vytvorenie DN "
 "formátovaného takto:\n"
 msgstr ""
 "Prvá e-mailová adresa každého kontaktu sa použije na vytvorenie DN "
 "formátovaného takto:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:543
 msgid ""
 
 #: src/expldifdlg.c:543
 msgid ""


@@ -2609,11 +2862,11 @@ msgstr ""
 msgid "Export Address Book to LDIF File"
 msgstr "Exportovať adresár do súboru LDIF"
 
 msgid "Export Address Book to LDIF File"
 msgstr "Exportovať adresár do súboru LDIF"
 

-#: src/expldifdlg.c:737
+#: src/expldifdlg.c:736

 msgid "Distguished Name"
 msgstr "Distguished Name"
 
 msgid "Distguished Name"
 msgstr "Distguished Name"
 

-#: src/export.c:120 src/summaryview.c:6355
+#: src/export.c:120 src/summaryview.c:6368

 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 
 msgid "Export to mbox file"
 msgstr "Exportovať do súboru mbox"
 


@@ -2654,8 +2907,8 @@ msgid "Attributes"
 msgstr "Atribúty"
 
 #: src/exporthtml.c:1010
 msgstr "Atribúty"
 
 #: src/exporthtml.c:1010

-msgid "Sylpheed-Claws Address Book"
-msgstr "Adresár Sylpheed-Claws"
+msgid "Claws Mail Address Book"
+msgstr "Adresár Claws Mail"

 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."
 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."


@@ -2673,48 +2926,53 @@ msgstr "Názov je príliš dlhý."
 msgid "Not specified."
 msgstr "Nie je určený."
 
 msgid "Not specified."
 msgstr "Nie je určený."
 

-#: src/folder.c:1277 src/foldersel.c:371 src/prefs_folder_item.c:236
+#: src/folder.c:1283 src/foldersel.c:371 src/prefs_folder_item.c:239

 msgid "Inbox"
 msgstr "Prijaté"
 
 msgid "Inbox"
 msgstr "Prijaté"
 

-#: src/folder.c:1281 src/foldersel.c:375
+#: src/folder.c:1287 src/foldersel.c:375

 msgid "Sent"
 msgstr "Odoslané"
 
 msgid "Sent"
 msgstr "Odoslané"
 

-#: src/folder.c:1285 src/foldersel.c:379 src/prefs_folder_item.c:239
+#: src/folder.c:1291 src/foldersel.c:379 src/prefs_folder_item.c:242

 msgid "Queue"
 msgstr "Na odoslanie"
 
 msgid "Queue"
 msgstr "Na odoslanie"
 

-#: src/folder.c:1289 src/foldersel.c:383 src/prefs_folder_item.c:240
-#: src/toolbar.c:366 src/toolbar.c:400 src/toolbar.c:491
+#: src/folder.c:1295 src/foldersel.c:383 src/prefs_folder_item.c:243
+#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501

 msgid "Trash"
 msgstr "Odpadkový kôš"
 
 msgid "Trash"
 msgstr "Odpadkový kôš"
 

-#: src/folder.c:1293 src/foldersel.c:387 src/prefs_folder_item.c:238
+#: src/folder.c:1299 src/foldersel.c:387 src/prefs_folder_item.c:241

 msgid "Drafts"
 msgstr "Koncepty"
 
 msgid "Drafts"
 msgstr "Koncepty"
 

-#: src/folder.c:1572
+#: src/folder.c:1578

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Spracúvam (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Spracúvam (%s)...\n"
 

-#: src/folder.c:2508
+#: src/folder.c:2514

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Vyberám všetky správy z %s ...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Vyberám všetky správy z %s ...\n"
 

-#: src/folder.c:2797
+#: src/folder.c:2803
+#, c-format
+msgid "Copying %s to %s...\n"
+msgstr "Kopírujem %s do %s...\n"
+
+#: src/folder.c:2803

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Presúvam %s do %s...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Presúvam %s do %s...\n"
 

-#: src/folder.c:3073
+#: src/folder.c:3090

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Prehľadávam priečinok %s..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Prehľadávam priečinok %s..."
 

-#: src/folder.c:3784
+#: src/folder.c:3801

 msgid "Processing messages..."
 msgstr "Spracúvam správy..."
 
 msgid "Processing messages..."
 msgstr "Spracúvam správy..."
 


@@ -2722,160 +2980,165 @@ msgstr "Spracúvam správy..."
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 

-#: src/foldersel.c:558 src/imap_gtk.c:138 src/mh_gtk.c:129
+#: src/foldersel.c:558 src/imap_gtk.c:141 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 

-#: src/foldersel.c:566 src/imap_gtk.c:146 src/imap_gtk.c:152 src/mh_gtk.c:135
-#: src/mh_gtk.c:238
+#: src/foldersel.c:566 src/imap_gtk.c:149 src/imap_gtk.c:155 src/mh_gtk.c:138
+#: src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať '%c'."
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať '%c'."
 

-#: src/foldersel.c:576 src/imap_gtk.c:162 src/imap_gtk.c:216 src/mh_gtk.c:145
-#: src/mh_gtk.c:245
+#: src/foldersel.c:576 src/imap_gtk.c:165 src/imap_gtk.c:219 src/mh_gtk.c:148
+#: src/mh_gtk.c:248

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Priečinok '%s' už existuje."
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Priečinok '%s' už existuje."
 

-#: src/foldersel.c:583 src/imap_gtk.c:168 src/mh_gtk.c:151
+#: src/foldersel.c:583 src/imap_gtk.c:171 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nedá sa vytvoriť priečinok '%s'."
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Nedá sa vytvoriť priečinok '%s'."
 

-#: src/folderview.c:290
+#: src/folderview.c:291

 msgid "/Mark all re_ad"
 msgstr "/Označiť _všetky ako prečítané"
 
 msgid "/Mark all re_ad"
 msgstr "/Označiť _všetky ako prečítané"
 

-#: src/folderview.c:291
+#: src/folderview.c:293

 msgid "/_Search folder..."
 msgstr "/_Prehľadať priečinok..."
 
 msgid "/_Search folder..."
 msgstr "/_Prehľadať priečinok..."
 

-#: src/folderview.c:293
+#: src/folderview.c:295

 msgid "/Process_ing..."
 msgstr "/_Spracovanie..."
 
 msgid "/Process_ing..."
 msgstr "/_Spracovanie..."
 

-#: src/folderview.c:298
+#: src/folderview.c:300

 msgid "/Empty _trash..."
 msgstr "/V_yprázdniť kôš..."
 
 msgid "/Empty _trash..."
 msgstr "/V_yprázdniť kôš..."
 

-#: src/folderview.c:303
+#: src/folderview.c:305

 msgid "/Send _queue..."
 msgstr "/Odoslať _frontu..."
 
 msgid "/Send _queue..."
 msgstr "/Odoslať _frontu..."
 

-#: src/folderview.c:422 src/folderview.c:469 src/prefs_folder_column.c:80
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:80

 msgid "New"
 msgstr "Nový"
 
 msgid "New"
 msgstr "Nový"
 

-#: src/folderview.c:423 src/folderview.c:470 src/prefs_folder_column.c:81
+#: src/folderview.c:425 src/folderview.c:472 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr "Neprečítané"
 
 msgid "Unread"
 msgstr "Neprečítané"
 

-#: src/folderview.c:424 src/prefs_folder_column.c:82
+#: src/folderview.c:426 src/prefs_folder_column.c:82

 msgid "Total"
 msgstr "Celkom"
 
 #. TRANSLATORS: This in Number sign in American style
 msgid "Total"
 msgstr "Celkom"
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:472 src/summaryview.c:491
+#: src/folderview.c:474 src/summaryview.c:491

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 

-#: src/folderview.c:717
+#: src/folderview.c:719

 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 

-#: src/folderview.c:771 src/summaryview.c:3455
+#: src/folderview.c:773 src/summaryview.c:3453

 msgid "Mark all as read"
 msgstr "Označiť všetky ako prečítané"
 
 msgid "Mark all as read"
 msgstr "Označiť všetky ako prečítané"
 

-#: src/folderview.c:772 src/summaryview.c:3456
+#: src/folderview.c:774 src/summaryview.c:3454

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Naozaj chcete označiť všetky správy v tomto priečinku ako prečítané ?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "Naozaj chcete označiť všetky správy v tomto priečinku ako prečítané ?"
 

-#: src/folderview.c:1058 src/imap.c:3192 src/mainwindow.c:3918 src/setup.c:90
+#: src/folderview.c:1060 src/imap.c:3190 src/mainwindow.c:3923 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 

-#: src/folderview.c:1062 src/imap.c:3197 src/mainwindow.c:3923 src/setup.c:95
+#: src/folderview.c:1064 src/imap.c:3195 src/mainwindow.c:3928 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 

-#: src/folderview.c:1089
+#: src/folderview.c:1091

 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 

-#: src/folderview.c:1090
+#: src/folderview.c:1092

 msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovenie stromu priečinkov spôsobí vymazanie lokálnych cache. Chcete "
 "pokračovať?"
 
 msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 "Obnovenie stromu priečinkov spôsobí vymazanie lokálnych cache. Chcete "
 "pokračovať?"
 

-#: src/folderview.c:1100
+#: src/folderview.c:1102

 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 

-#: src/folderview.c:1102
+#: src/folderview.c:1104

 msgid "Scanning folder tree..."
 msgstr "Prehľadávam strom priečinkov..."
 
 msgid "Scanning folder tree..."
 msgstr "Prehľadávam strom priečinkov..."
 

-#: src/folderview.c:1220
+#: src/folderview.c:1175
+#, c-format
+msgid "Couldn't scan folder %s\n"
+msgstr "Nepodarilo sa prečítať obsah priečinka %s\n"
+
+#: src/folderview.c:1228

 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 

-#: src/folderview.c:2081
+#: src/folderview.c:2090

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Zatváram priečinok %s..."
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "Zatváram priečinok %s..."
 

-#: src/folderview.c:2120
+#: src/folderview.c:2129

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Otváram priečinok %s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Otváram priečinok %s..."
 

-#: src/folderview.c:2133
+#: src/folderview.c:2142

 msgid "Folder could not be opened."
 msgstr "Priečinok sa nedá otvoriť."
 
 msgid "Folder could not be opened."
 msgstr "Priečinok sa nedá otvoriť."
 

-#: src/folderview.c:2294 src/mainwindow.c:2078
+#: src/folderview.c:2303 src/mainwindow.c:2079

 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 

-#: src/folderview.c:2295
+#: src/folderview.c:2304

 msgid "Delete all messages in trash?"
 msgstr "Vymazať všetky správy z koša?"
 
 msgid "Delete all messages in trash?"
 msgstr "Vymazať všetky správy z koša?"
 

-#: src/folderview.c:2296 src/mainwindow.c:2080
+#: src/folderview.c:2305 src/mainwindow.c:2081

 msgid "+_Empty trash"
 msgstr "+_Vyprázdniť kôš"
 
 msgid "+_Empty trash"
 msgstr "+_Vyprázdniť kôš"
 

-#: src/folderview.c:2340 src/inc.c:1465 src/toolbar.c:2122
+#: src/folderview.c:2349 src/inc.c:1465 src/toolbar.c:2196

 msgid "Offline warning"
 msgstr "Offline varovanie"
 
 msgid "Offline warning"
 msgstr "Offline varovanie"
 

-#: src/folderview.c:2341 src/toolbar.c:2123
+#: src/folderview.c:2350 src/toolbar.c:2197

 msgid "You're working offline. Override?"
 msgstr "Pracujete offline. Pripojiť sa?"
 
 msgid "You're working offline. Override?"
 msgstr "Pracujete offline. Pripojiť sa?"
 

-#: src/folderview.c:2352 src/toolbar.c:2142
+#: src/folderview.c:2361 src/toolbar.c:2216

 msgid "Send queued messages"
 msgstr "Odoslať správy vo fronte"
 
 msgid "Send queued messages"
 msgstr "Odoslať správy vo fronte"
 

-#: src/folderview.c:2353 src/toolbar.c:2143
+#: src/folderview.c:2362 src/toolbar.c:2217

 msgid "Send all queued messages?"
 msgstr "Odoslať všetky správy vo fronte?"
 
 msgid "Send all queued messages?"
 msgstr "Odoslať všetky správy vo fronte?"
 

-#: src/folderview.c:2354 src/messageview.c:579 src/messageview.c:596
-#: src/prefs_account.c:1032 src/toolbar.c:2144
+#: src/folderview.c:2363 src/messageview.c:579 src/messageview.c:596
+#: src/prefs_account.c:1039 src/toolbar.c:2218

 msgid "_Send"
 msgstr "_Odoslať"
 
 msgid "_Send"
 msgstr "_Odoslať"
 

-#: src/folderview.c:2362 src/toolbar.c:2162
+#: src/folderview.c:2371 src/toolbar.c:2236

 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 

-#: src/folderview.c:2365 src/main.c:1478 src/toolbar.c:2165
+#: src/folderview.c:2374 src/main.c:1549 src/toolbar.c:2239

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -2884,43 +3147,65 @@ msgstr ""
 "Pri odosielaní správ vo fronte nastali chyby:\n"
 "%s"
 
 "Pri odosielaní správ vo fronte nastali chyby:\n"
 "%s"
 

-#: src/folderview.c:2432
+#: src/folderview.c:2441
+#, c-format
+msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgstr "Naozaj chcete skopírovať priečinok '%s' do priečinku '%s' ?"
+
+#: src/folderview.c:2442

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Naozaj chcete presunúť priečinok '%s' do priečinku '%s' ?"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Naozaj chcete presunúť priečinok '%s' do priečinku '%s' ?"
 

-#: src/folderview.c:2435
+#: src/folderview.c:2444
+msgid "Copy folder"
+msgstr "Skopírovať priečinok"
+
+#: src/folderview.c:2444

 msgid "Move folder"
 msgid "Move folder"

-msgstr "Presunúťpriečinok"
+msgstr "Presunúť priečinok"
+
+#: src/folderview.c:2455
+#, c-format
+msgid "Copying %s to %s..."
+msgstr "Kopírujem %s do %s..."

 
 

-#: src/folderview.c:2446
+#: src/folderview.c:2455

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Presúvam %s do %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Presúvam %s do %s..."
 

-#: src/folderview.c:2475
+#: src/folderview.c:2486

 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 
 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 

-#: src/folderview.c:2478
+#: src/folderview.c:2489
+msgid "Can't copy a folder to one of its children."
+msgstr "Nie je možné skopírovať priečinok do jeho podpriečinku."
+
+#: src/folderview.c:2490

 msgid "Can't move a folder to one of its children."
 msgstr "Nie je možné presunúť priečinok do jeho podpriečinku."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Nie je možné presunúť priečinok do jeho podpriečinku."
 

-#: src/folderview.c:2481
+#: src/folderview.c:2493

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Priečinky nie je možné presúvať medzi jednotlivými schránkami."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Priečinky nie je možné presúvať medzi jednotlivými schránkami."
 

-#: src/folderview.c:2484
+#: src/folderview.c:2496
+msgid "Copy failed!"
+msgstr "Kopírovanie sa nepodarilo!"
+
+#: src/folderview.c:2496

 msgid "Move failed!"
 msgstr "Presun sa nepodaril!"
 
 msgid "Move failed!"
 msgstr "Presun sa nepodaril!"
 

-#: src/folderview.c:2520
+#: src/folderview.c:2532

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracúvania pre priečinok %s"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Nastavenie spracúvania pre priečinok %s"
 

-#: src/gedit-print.c:147 src/messageview.c:1502 src/summaryview.c:4124
-#: src/toolbar.c:178
+#: src/gedit-print.c:147 src/messageview.c:1519 src/summaryview.c:4124
+#: src/toolbar.c:182

 msgid "Print"
 msgstr "Tlačiť"
 
 msgid "Print"
 msgstr "Tlačiť"
 


@@ -2999,19 +3284,47 @@ msgstr "Hotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
 
 msgid "%d newsgroups received (%s read)"
 msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
 

-#: src/gtk/about.c:78 src/textview.c:216
+#: src/gtk/about.c:79 src/textview.c:216

 msgid "/_Open with Web browser"
 msgstr "/Otvoriť vo _webovom prehliadači"
 
 msgid "/_Open with Web browser"
 msgstr "/Otvoriť vo _webovom prehliadači"
 

-#: src/gtk/about.c:79 src/textview.c:217
+#: src/gtk/about.c:80 src/textview.c:217

 msgid "/Copy this _link"
 msgstr "/_Kopírovať toto prepojenie"
 
 msgid "/Copy this _link"
 msgstr "/_Kopírovať toto prepojenie"
 

-#: src/gtk/about.c:119
-msgid "About Sylpheed-Claws"
-msgstr "O programe Sylpheed-Claws"
+#: src/gtk/about.c:138
+msgid ""
+"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
+"\n"
+"For further information visit the Claws Mail website:\n"
+msgstr ""
+"Claws Mail je ľahký, rýchly a vysoko konfigurovateľný e-mailový klient.\n"
+"\n"
+"Pre ďalšie informácie navštívte webstránku Claws Mail:\n"
+
+#: src/gtk/about.c:144
+msgid ""
+"\n"
+"\n"
+"Claws Mail is free software released under the GPL license. If you wish to "
+"donate to the Claws Mail project you can do so at:\n"
+msgstr ""
+"\n"
+"\n"
+"Claws Mail je voľne šíriteľný softvér vydaný pod licenciou GPL. Ak si "
+"prajete prispieť na projekt Claws Mail, môžete tak učiniť na adrese:\n"
+
+#: src/gtk/about.c:159
+msgid ""
+"\n"
+"\n"
+"System Information\n"
+msgstr ""
+"\n"
+"\n"
+"Informácie o systéme\n"

 
 

-#: src/gtk/about.c:161
+#: src/gtk/about.c:165

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3022,7 +3335,7 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: %s %s (%s)"
 
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: %s %s (%s)"
 

-#: src/gtk/about.c:170
+#: src/gtk/about.c:174

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3033,7 +3346,7 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: %s"
 
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: %s"
 

-#: src/gtk/about.c:179
+#: src/gtk/about.c:183

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -3044,110 +3357,79 @@ msgstr ""
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: neznámy"
 
 "Jazyk: %s (kódovanie: %s)\n"
 "Operačný systém: neznámy"
 

-#: src/gtk/about.c:194
-#, c-format
-msgid ""
-"Compiled-in features:\n"
-"%s"
-msgstr ""
-"Zakompilované vlastnosti:\n"
-"%s"
+#: src/gtk/about.c:240 src/prefs_themes.c:706 src/wizard.c:467
+msgid "The Claws Mail Team"
+msgstr "Team Claws Mail"

 
 

-#: src/gtk/about.c:240
-msgid ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Sylpheed-Claws team"
-msgstr ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"a Sylpheed-Claws team"
-
-#: src/gtk/about.c:283
-msgid ""
-"Sylpheed-Claws is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Sylpheed-Claws website:\n"
-msgstr ""
-"Sylpheed-Claws je ľahký, rýchly a vysoko konfigurovateľný e-mailový klient.\n"
-"\n"
-"Pre ďalšie informácie navštívte webstránku Sylpheed-Claws:\n"
+#: src/gtk/about.c:259
+msgid "Previous team members"
+msgstr "Bývalí členovia teamu"

 
 

-#: src/gtk/about.c:289
-msgid ""
-"\n"
-"\n"
-"Sylpheed-Claws is free software released under the GPL license. If you wish "
-"to donate to the Sylpheed-Claws project you can do so at:\n"
-msgstr ""
-"\n"
-"\n"
-"Sylpheed-Claws je voľne šíriteľný softvér vydaný pod licenciou GPL. Ak si "
-"prajete prispieť na projekt Sylpheed-Claws, môžete tak učiniť na adrese:\n"
+#: src/gtk/about.c:278
+msgid "The translation team"
+msgstr "Prekladateľský team"

 
 

-#: src/gtk/about.c:296
-msgid "\n"
-msgstr "\n"
+#: src/gtk/about.c:297
+msgid "Documentation team"
+msgstr "Dokumentačný team"

 
 

-#: src/gtk/about.c:307
-msgid "_Info"
-msgstr "_Info"
+#: src/gtk/about.c:316
+msgid "Logo"
+msgstr "Logo"

 
 #: src/gtk/about.c:335
 
 #: src/gtk/about.c:335

-msgid "The Sylpheed-Claws Team\n"
-msgstr "Team Sylpheed-Claws\n"
+msgid "Icons"
+msgstr "Ikony"

 
 

-#: src/gtk/about.c:352
-msgid ""
-"\n"
-"Previous team members\n"
-msgstr ""
-"\n"
-"Bývalí členovia teamu\n"
+#: src/gtk/about.c:354
+msgid "Contributors"
+msgstr "Prispievatelia"

 
 

-#: src/gtk/about.c:369
-msgid ""
-"\n"
-"The translation team\n"
-msgstr ""
-"\n"
-"Prekladateľský team\n"
+#: src/gtk/about.c:402
+msgid "Compiled-in Features\n"
+msgstr "Zakompilované vlastnosti\n"

 
 

-#: src/gtk/about.c:386
-msgid ""
-"\n"
-"Documentation team\n"
-msgstr ""
-"\n"
-"Dokumentačný team\n"
+#: src/gtk/about.c:418
+msgid "IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
+msgstr "podpora pre IPv6 adresáciu\n"

 
 

-#: src/gtk/about.c:403
-msgid ""
-"\n"
-"Logo\n"
-msgstr ""
-"\n"
-"Logo\n"
+#: src/gtk/about.c:429
+msgid "iconv|allows converting to and from different character sets\n"
+msgstr "umožňuje konverziu znakov medzi rôznymi kódovaniami\n"

 
 

-#: src/gtk/about.c:420
-msgid ""
-"\n"
-"Icons\n"
-msgstr ""
-"\n"
-"Ikony\n"
+#: src/gtk/about.c:439
+msgid "compface|adds support for the X-Face header\n"
+msgstr "podpora hlavičky X-Face\n"

 
 

-#: src/gtk/about.c:437
-msgid ""
-"\n"
-"Contributors\n"
-msgstr ""
-"\n"
-"Prispievatelia\n"
+#: src/gtk/about.c:449
+msgid "OpenSSL|adds support for encrypted connections to servers\n"
+msgstr "podpora šifrovaného spojenia so serverom\n"

 
 

-#: src/gtk/about.c:456
-msgid "_Authors"
-msgstr "_Autori"
+#: src/gtk/about.c:459
+msgid "LDAP|adds support for LDAP shared addressbooks\n"
+msgstr "podpora zdieľaného adresára LDAP\n"
+
+#: src/gtk/about.c:469
+msgid "JPilot|adds support for PalmOS addressbooks\n"
+msgstr "podpora adresárov PalmOS\n"
+
+#: src/gtk/about.c:479
+msgid "GNU/aspell|adds support for spell checking\n"
+msgstr "kontrola pravopisu\n"

 
 

-#: src/gtk/about.c:476
+#: src/gtk/about.c:489
+msgid "libetpan|adds support for IMAP servers\n"
+msgstr "podpora protokolu IMAP\n"
+
+#: src/gtk/about.c:499
+msgid "libgnomeprint|adds support for a complete print dialog\n"
+msgstr "podpora celého dialógu pre tlač\n"
+
+#: src/gtk/about.c:509
+msgid "libSM|adds support for session handling\n"
+msgstr "podpora správy sedení\n"
+
+#: src/gtk/about.c:541

 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 "
 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 "


@@ -3161,7 +3443,7 @@ msgstr ""
 "v akejkoľvek ďalšej verzii.\n"
 "\n"
 
 "v akejkoľvek ďalšej verzii.\n"
 "\n"
 

-#: src/gtk/about.c:482
+#: src/gtk/about.c:547

 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 "
 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 "


@@ -3173,7 +3455,7 @@ msgstr ""
 "ZÁRUKY. Viac detailov nájdete v GNU General Public License.\n"
 "\n"
 
 "ZÁRUKY. Viac detailov nájdete v GNU General Public License.\n"
 "\n"
 

-#: src/gtk/about.c:488
+#: src/gtk/about.c:553

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "


@@ -3185,7 +3467,7 @@ msgstr ""
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 "\n"
 
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 "\n"
 

-#: src/gtk/about.c:502
+#: src/gtk/about.c:571

 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("


@@ -3193,39 +3475,69 @@ msgstr ""
 "Tento produkt obsahuje softvér vyvinutý projektom OpenSSL pre použitie v "
 "OpenSSL Toolkit ("
 
 "Tento produkt obsahuje softvér vyvinutý projektom OpenSSL pre použitie v "
 "OpenSSL Toolkit ("
 

-#: src/gtk/about.c:506
+#: src/gtk/about.c:575

 msgid ").\n"
 msgstr ").\n"
 
 msgid ").\n"
 msgstr ").\n"
 

-#: src/gtk/about.c:518
+#: src/gtk/about.c:668
+msgid "About Claws Mail"
+msgstr "O programe Claws Mail"
+
+#: src/gtk/about.c:719
+msgid ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"
+msgstr ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"a Claws Mail team"
+
+#: src/gtk/about.c:733
+msgid "_Info"
+msgstr "_Info"
+
+#: src/gtk/about.c:739
+msgid "_Authors"
+msgstr "_Autori"
+
+#: src/gtk/about.c:745
+msgid "_Features"
+msgstr "_Vlastnosti"
+
+#: src/gtk/about.c:751

 msgid "_License"
 msgstr "_Licencia"
 
 msgid "_License"
 msgstr "_Licencia"
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:303
+#: src/gtk/about.c:759
+msgid "_Release Notes"
+msgstr "_Poznámky k verzii"
+
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:313

 msgid "Orange"
 msgstr "Oranžová"
 
 msgid "Orange"
 msgstr "Oranžová"
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:307
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:317

 msgid "Red"
 msgstr "Červená"
 
 msgid "Red"
 msgstr "Červená"
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:311
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:321

 msgid "Pink"
 msgstr "Ružová"
 
 msgid "Pink"
 msgstr "Ružová"
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:315
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:325

 msgid "Sky blue"
 msgstr "Bledomodrá"
 
 msgid "Sky blue"
 msgstr "Bledomodrá"
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:319
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:329

 msgid "Blue"
 msgstr "Modrá"
 
 msgid "Blue"
 msgstr "Modrá"
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:323
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:333

 msgid "Green"
 msgstr "Zelená"
 
 msgid "Green"
 msgstr "Zelená"
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:327
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:337

 msgid "Brown"
 msgstr "Hnedá"
 
 msgid "Brown"
 msgstr "Hnedá"
 


@@ -3351,36 +3663,36 @@ msgstr "Popis písma pre hlavičku a pätičku"
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Písmo, ktoré sa má použiť pre hlavičku a pätičku (napr. \"Monospace 10\")"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Písmo, ktoré sa má použiť pre hlavičku a pätičku (napr. \"Monospace 10\")"
 

-#: src/gtk/gtkaspell.c:606
+#: src/gtk/gtkaspell.c:632

 msgid "No dictionary selected."
 msgstr "Nie je zvolený žiadny slovník."
 
 msgid "No dictionary selected."
 msgstr "Nie je zvolený žiadny slovník."
 

-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
+#: src/gtk/gtkaspell.c:868 src/gtk/gtkaspell.c:1869 src/gtk/gtkaspell.c:2164

 msgid "Normal Mode"
 msgstr "Normálny režim"
 
 msgid "Normal Mode"
 msgstr "Normálny režim"
 

-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
+#: src/gtk/gtkaspell.c:870 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2176

 msgid "Bad Spellers Mode"
 msgstr "Režim zlého pravopisu"
 
 msgid "Bad Spellers Mode"
 msgstr "Režim zlého pravopisu"
 

-#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:909

 msgid "Unknown suggestion mode."
 msgstr "Režim návrhov neznámych slov."
 
 msgid "Unknown suggestion mode."
 msgstr "Režim návrhov neznámych slov."
 

-#: src/gtk/gtkaspell.c:1154
+#: src/gtk/gtkaspell.c:1200

 msgid "No misspelled word found."
 msgstr "Neboli nájdené žiadne pravopisné chyby."
 
 msgid "No misspelled word found."
 msgstr "Neboli nájdené žiadne pravopisné chyby."
 

-#: src/gtk/gtkaspell.c:1502
+#: src/gtk/gtkaspell.c:1548

 msgid "Replace unknown word"
 msgstr "Nahradiť neznáme slovo"
 
 msgid "Replace unknown word"
 msgstr "Nahradiť neznáme slovo"
 

-#: src/gtk/gtkaspell.c:1517
+#: src/gtk/gtkaspell.c:1563

 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Nahradiť \"%s\" čím: </span>"
 
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Nahradiť \"%s\" čím: </span>"
 

-#: src/gtk/gtkaspell.c:1562
+#: src/gtk/gtkaspell.c:1608

 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"


@@ -3388,59 +3700,63 @@ msgstr ""
 "Ak pri stlačení Enter podržíte klávesu Control,\n"
 "program sa z chyby poučí.\n"
 
 "Ak pri stlačení Enter podržíte klávesu Control,\n"
 "program sa z chyby poučí.\n"
 

-#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
+#: src/gtk/gtkaspell.c:1863 src/gtk/gtkaspell.c:2152

 msgid "Fast Mode"
 msgstr "Rýchly režim"
 
 msgid "Fast Mode"
 msgstr "Rýchly režim"
 

-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1970

 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "\"%s\" neznáme v %s"
 
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "\"%s\" neznáme v %s"
 

-#: src/gtk/gtkaspell.c:1930
+#: src/gtk/gtkaspell.c:1984

 msgid "Accept in this session"
 msgstr "Prijať v tomto sedení"
 
 msgid "Accept in this session"
 msgstr "Prijať v tomto sedení"
 

-#: src/gtk/gtkaspell.c:1940
+#: src/gtk/gtkaspell.c:1994

 msgid "Add to personal dictionary"
 msgstr "Pridať do osobného slovníka"
 
 msgid "Add to personal dictionary"
 msgstr "Pridať do osobného slovníka"
 

-#: src/gtk/gtkaspell.c:1950
+#: src/gtk/gtkaspell.c:2004

 msgid "Replace with..."
 msgstr "Nahradiť čím..."
 
 msgid "Replace with..."
 msgstr "Nahradiť čím..."
 

-#: src/gtk/gtkaspell.c:1963
+#: src/gtk/gtkaspell.c:2017

 #, c-format
 msgid "Check with %s"
 msgstr "Overiť pomocou %s"
 
 #, c-format
 msgid "Check with %s"
 msgstr "Overiť pomocou %s"
 

-#: src/gtk/gtkaspell.c:1985
+#: src/gtk/gtkaspell.c:2039

 msgid "(no suggestions)"
 msgstr "(žiadne návrhy)"
 
 msgid "(no suggestions)"
 msgstr "(žiadne návrhy)"
 

-#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
+#: src/gtk/gtkaspell.c:2050 src/gtk/gtkaspell.c:2229

 msgid "More..."
 msgstr "Ďalšie..."
 
 msgid "More..."
 msgstr "Ďalšie..."
 

-#: src/gtk/gtkaspell.c:2060
+#: src/gtk/gtkaspell.c:2114

 #, c-format
 msgid "Dictionary: %s"
 msgstr "Slovník: %s"
 
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Slovník: %s"
 

-#: src/gtk/gtkaspell.c:2073
+#: src/gtk/gtkaspell.c:2127

 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Použiť alternatívny (%s)"
 
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Použiť alternatívny (%s)"
 

-#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2138
+msgid "Use both dictionaries"
+msgstr "Použiť oba slovníky"
+
+#: src/gtk/gtkaspell.c:2192 src/prefs_spelling.c:218

 msgid "Check while typing"
 msgstr "Overovať pri písaní"
 
 msgid "Check while typing"
 msgstr "Overovať pri písaní"
 

-#: src/gtk/gtkaspell.c:2137
+#: src/gtk/gtkaspell.c:2208

 msgid "Change dictionary"
 msgstr "Zmeniť slovník"
 
 msgid "Change dictionary"
 msgstr "Zmeniť slovník"
 

-#: src/gtk/gtkaspell.c:2270
+#: src/gtk/gtkaspell.c:2340

 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"


@@ -3449,6 +3765,15 @@ msgstr ""
 "Kontrola pravopisu nemohla zmeniť slovník.\n"
 "%s"
 
 "Kontrola pravopisu nemohla zmeniť slovník.\n"
 "%s"
 

+#: src/gtk/gtkaspell.c:2386
+#, c-format
+msgid ""
+"The spell checker could not change the alternate dictionary.\n"
+"%s"
+msgstr ""
+"Kontrola pravopisu nemohla zmeniť alternatívny slovník.\n"
+"%s"
+

 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Nová správa"
 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Nová správa"


@@ -3554,7 +3879,7 @@ msgstr "Zapamätať si"
 msgid "Protocol log"
 msgstr "Záznam protokolu"
 
 msgid "Protocol log"
 msgstr "Záznam protokolu"
 

-#: src/gtk/logwindow.c:373
+#: src/gtk/logwindow.c:384

 msgid "Clear _Log"
 msgstr "Vyčistiť okno _záznamu"
 
 msgid "Clear _Log"
 msgstr "Vyčistiť okno _záznamu"
 


@@ -3598,13 +3923,13 @@ msgstr ""
 msgid "Plugins"
 msgstr "Pluginy"
 
 msgid "Plugins"
 msgstr "Pluginy"
 

-#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:211

 msgid "Description"
 msgstr "Popis"
 
 #: src/gtk/pluginwindow.c:336
 msgid "Description"
 msgstr "Popis"
 
 #: src/gtk/pluginwindow.c:336

-msgid "More plugins are available from the Sylpheed-Claws website."
-msgstr "Ďalšie pluginy sa dajú zísať na webstránke Sylpheed-Claws."
+msgid "More plugins are available from the Claws Mail website."
+msgstr "Ďalšie pluginy sa dajú zísať na webstránke Claws Mail."

 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."
 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."


@@ -3634,187 +3959,187 @@ msgstr "Načítané pluginy"
 msgid "Page Index"
 msgstr "Obsah Stránky"
 
 msgid "Page Index"
 msgstr "Obsah Stránky"
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:762
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:769

 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Konto"
 
 #: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Konto"
 
 #: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136

-#: src/prefs_summary_column.c:80 src/summaryview.c:2375
+#: src/prefs_summary_column.c:80 src/summaryview.c:2376

 msgid "Status"
 msgstr "Stav"
 
 msgid "Status"
 msgstr "Stav"
 

-#: src/gtk/quicksearch.c:329
+#: src/gtk/quicksearch.c:331

 msgid "all messages"
 msgstr "všetky správy"
 
 msgid "all messages"
 msgstr "všetky správy"
 

-#: src/gtk/quicksearch.c:330
+#: src/gtk/quicksearch.c:332

 msgid "messages whose age is greater than #"
 msgstr "správy, ktoré sú staršie ako #"
 
 msgid "messages whose age is greater than #"
 msgstr "správy, ktoré sú staršie ako #"
 

-#: src/gtk/quicksearch.c:331
+#: src/gtk/quicksearch.c:333

 msgid "messages whose age is less than #"
 msgstr "správy, ktoré sú novšie ako #"
 
 msgid "messages whose age is less than #"
 msgstr "správy, ktoré sú novšie ako #"
 

-#: src/gtk/quicksearch.c:332
+#: src/gtk/quicksearch.c:334

 msgid "messages which contain S in the message body"
 msgstr "správy, ktorých telo obsahuje S"
 
 msgid "messages which contain S in the message body"
 msgstr "správy, ktorých telo obsahuje S"
 

-#: src/gtk/quicksearch.c:333
+#: src/gtk/quicksearch.c:335

 msgid "messages which contain S in the whole message"
 msgstr "správy, ktoré obsahujú S kdekoľvek"
 
 msgid "messages which contain S in the whole message"
 msgstr "správy, ktoré obsahujú S kdekoľvek"
 

-#: src/gtk/quicksearch.c:334
+#: src/gtk/quicksearch.c:336

 msgid "messages carbon-copied to S"
 msgstr "správy s kópiou v S"
 
 msgid "messages carbon-copied to S"
 msgstr "správy s kópiou v S"
 

-#: src/gtk/quicksearch.c:335
+#: src/gtk/quicksearch.c:337

 msgid "message is either to: or cc: to S"
 msgstr "správa je buď to: alebo cc: S"
 
 msgid "message is either to: or cc: to S"
 msgstr "správa je buď to: alebo cc: S"
 

-#: src/gtk/quicksearch.c:336
+#: src/gtk/quicksearch.c:338

 msgid "deleted messages"
 msgstr "vymazané správy"
 
 msgid "deleted messages"
 msgstr "vymazané správy"
 

-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:339

 msgid "messages which contain S in the Sender field"
 msgstr "správy, ktoré obsahujú S v hlavičke Sender"
 
 msgid "messages which contain S in the Sender field"
 msgstr "správy, ktoré obsahujú S v hlavičke Sender"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:340

 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, ak je \"S\" vykonané úspešne"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, ak je \"S\" vykonané úspešne"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:341

 msgid "messages originating from user S"
 msgstr "správy pochádzajúce od používateľa S"
 
 msgid "messages originating from user S"
 msgstr "správy pochádzajúce od používateľa S"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:342

 msgid "forwarded messages"
 msgstr "preposlané správy"
 
 msgid "forwarded messages"
 msgstr "preposlané správy"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:343

 msgid "messages which contain header S"
 msgstr "správy, ktoré obsahujú hlavičku S"
 
 msgid "messages which contain header S"
 msgstr "správy, ktoré obsahujú hlavičku S"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:344

 msgid "messages which contain S in Message-ID header"
 msgstr "správy, ktoré obsahujú S v hlavičke Message-ID"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "správy, ktoré obsahujú S v hlavičke Message-ID"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:345

 msgid "messages which contain S in inreplyto header"
 msgstr "správy, ktoré obsahujú S v hlavičke inreplyto"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "správy, ktoré obsahujú S v hlavičke inreplyto"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:346

 msgid "messages which are marked with color #"
 msgstr "správy, ktoré sú označené farbou #"
 
 msgid "messages which are marked with color #"
 msgstr "správy, ktoré sú označené farbou #"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:347

 msgid "locked messages"
 msgstr "zamknuté správy"
 
 msgid "locked messages"
 msgstr "zamknuté správy"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:348

 msgid "messages which are in newsgroup S"
 msgstr "správy, ktoré sú v diskusnej skupine S"
 
 msgid "messages which are in newsgroup S"
 msgstr "správy, ktoré sú v diskusnej skupine S"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:349

 msgid "new messages"
 msgstr "nové správy"
 
 msgid "new messages"
 msgstr "nové správy"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:350

 msgid "old messages"
 msgstr "staré správy"
 
 msgid "old messages"
 msgstr "staré správy"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:351

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "neúplné správy (nestiahnuté úplne)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "neúplné správy (nestiahnuté úplne)"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:352

 msgid "messages which have been replied to"
 msgstr "správy, ktoré boli zodpovedané"
 
 msgid "messages which have been replied to"
 msgstr "správy, ktoré boli zodpovedané"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:353

 msgid "read messages"
 msgstr "prečítané správy"
 
 msgid "read messages"
 msgstr "prečítané správy"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:354

 msgid "messages which contain S in subject"
 msgstr "správy, ktoré obsahujú S v názve"
 
 msgid "messages which contain S in subject"
 msgstr "správy, ktoré obsahujú S v názve"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:355

 msgid "messages whose score is equal to #"
 msgstr "správy, ktorých ohodnotenie je rovné #"
 
 msgid "messages whose score is equal to #"
 msgstr "správy, ktorých ohodnotenie je rovné #"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:356

 msgid "messages whose score is greater than #"
 msgstr "správy, ktorých ohodnotenie je väčšie ako #"
 
 msgid "messages whose score is greater than #"
 msgstr "správy, ktorých ohodnotenie je väčšie ako #"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:357

 msgid "messages whose score is lower than #"
 msgstr "správy, ktorých ohodnotenie je menšie ako #"
 
 msgid "messages whose score is lower than #"
 msgstr "správy, ktorých ohodnotenie je menšie ako #"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:358

 msgid "messages whose size is equal to #"
 msgstr "správy, ktorých veľkosť je rovná #"
 
 msgid "messages whose size is equal to #"
 msgstr "správy, ktorých veľkosť je rovná #"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:359

 msgid "messages whose size is greater than #"
 msgstr "správy, ktorých veľkosť je väčšia ako #"
 
 msgid "messages whose size is greater than #"
 msgstr "správy, ktorých veľkosť je väčšia ako #"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:360

 msgid "messages whose size is smaller than #"
 msgstr "správy, ktorých veľkosť je menšia ako #"
 
 msgid "messages whose size is smaller than #"
 msgstr "správy, ktorých veľkosť je menšia ako #"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:361

 msgid "messages which have been sent to S"
 msgstr "správy, odoslané S"
 
 msgid "messages which have been sent to S"
 msgstr "správy, odoslané S"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:362

 msgid "marked messages"
 msgstr "označené správy"
 
 msgid "marked messages"
 msgstr "označené správy"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:363

 msgid "unread messages"
 msgstr "neprečítané správy"
 
 msgid "unread messages"
 msgstr "neprečítané správy"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:364

 msgid "messages which contain S in References header"
 msgstr "správy, ktoré obsahujú S v hlavičke References"
 
 msgid "messages which contain S in References header"
 msgstr "správy, ktoré obsahujú S v hlavičke References"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:365

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "správy vracajúce 0 po odovzdaní príkazu - %F je názov súboru správy"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "správy vracajúce 0 po odovzdaní príkazu - %F je názov súboru správy"
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:366

 msgid "messages which contain S in X-Label header"
 msgstr "správy, ktoré obsahujú S v hlavičke X-Label"
 
 msgid "messages which contain S in X-Label header"
 msgstr "správy, ktoré obsahujú S v hlavičke X-Label"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:368

 msgid "logical AND operator"
 msgstr "logický operátor AND"
 
 msgid "logical AND operator"
 msgstr "logický operátor AND"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:369

 msgid "logical OR operator"
 msgstr "logický operátor OR"
 
 msgid "logical OR operator"
 msgstr "logický operátor OR"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:370

 msgid "logical NOT operator"
 msgstr "logický operátor NOT"
 
 msgid "logical NOT operator"
 msgstr "logický operátor NOT"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:371

 msgid "case sensitive search"
 msgstr "záleží na veľkosti písmen"
 
 msgid "case sensitive search"
 msgstr "záleží na veľkosti písmen"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:373

 msgid "all filtering expressions are allowed"
 msgstr "všetky filtrovacie výrazy sú povolené"
 
 msgid "all filtering expressions are allowed"
 msgstr "všetky filtrovacie výrazy sú povolené"
 

-#: src/gtk/quicksearch.c:379 src/summary_search.c:329
+#: src/gtk/quicksearch.c:381 src/summary_search.c:397

 msgid "Extended Search"
 msgstr "Rozšírené vyhľadávanie"
 
 msgid "Extended Search"
 msgstr "Rozšírené vyhľadávanie"
 

-#: src/gtk/quicksearch.c:380
+#: src/gtk/quicksearch.c:382

 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"
 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"


@@ -3826,51 +4151,51 @@ msgstr ""
 "\n"
 "Môžu byť použité tieto symboly:"
 
 "\n"
 "Môžu byť použité tieto symboly:"
 

-#: src/gtk/quicksearch.c:476 src/prefs_filtering_action.c:1080
-#: src/prefs_matcher.c:158 src/prefs_matcher.c:1866
-#: src/prefs_summary_column.c:82 src/prefs_template.c:190 src/quote_fmt.c:47
-#: src/summaryview.c:486
+#: src/gtk/quicksearch.c:478 src/prefs_compose_writing.c:239
+#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
+#: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
+#: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486

 msgid "Subject"
 msgstr "Predmet"
 
 msgid "Subject"
 msgstr "Predmet"
 

-#: src/gtk/quicksearch.c:480 src/prefs_filtering_action.c:1081
+#: src/gtk/quicksearch.c:482 src/prefs_filtering_action.c:1081

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "Od"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "Od"
 

-#: src/gtk/quicksearch.c:484 src/prefs_filtering_action.c:1082
+#: src/gtk/quicksearch.c:486 src/prefs_filtering_action.c:1082

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr "Komu"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr "Komu"
 

-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:497

 msgid "Recursive"
 msgstr "Rekurzívne"
 
 msgid "Recursive"
 msgstr "Rekurzívne"
 

-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:507

 msgid "Sticky"
 msgstr "Trvalé"
 
 msgid "Sticky"
 msgstr "Trvalé"
 

-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:517

 msgid "Type-ahead"
 msgstr "Dynamické"
 
 msgid "Type-ahead"
 msgstr "Dynamické"
 

-#: src/gtk/quicksearch.c:546
+#: src/gtk/quicksearch.c:548

 msgid " Clear "
 msgstr " Vyčistiť "
 
 msgid " Clear "
 msgstr " Vyčistiť "
 

-#: src/gtk/quicksearch.c:567 src/summary_search.c:282
+#: src/gtk/quicksearch.c:569 src/summary_search.c:350

 msgid "Edit search criteria"
 msgstr "Upraviť vyhľadávacie kritériá"
 
 msgid "Edit search criteria"
 msgstr "Upraviť vyhľadávacie kritériá"
 

-#: src/gtk/quicksearch.c:573
+#: src/gtk/quicksearch.c:575

 msgid " Extended Symbols... "
 msgstr " Rozšírené symboly... "
 
 msgid " Extended Symbols... "
 msgstr " Rozšírené symboly... "
 

-#: src/gtk/quicksearch.c:1020 src/summaryview.c:1073
+#: src/gtk/quicksearch.c:1025 src/summaryview.c:1073

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Hľadám v %s... \n"
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Hľadám v %s... \n"


@@ -3988,11 +4313,11 @@ msgstr "_Zobraziť certifikáty"
 msgid "Changed SSL Certificate"
 msgstr "Zmena SSL certifikátu"
 
 msgid "Changed SSL Certificate"
 msgstr "Zmena SSL certifikátu"
 

-#: src/headerview.c:195 src/summaryview.c:2783 src/summaryview.c:2794
+#: src/headerview.c:195 src/summaryview.c:2784 src/summaryview.c:2795

 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 

-#: src/headerview.c:210 src/summaryview.c:2818 src/summaryview.c:2821
+#: src/headerview.c:210 src/summaryview.c:2819 src/summaryview.c:2822

 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 


@@ -4012,7 +4337,7 @@ msgstr "Načítať obrázok"
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
 msgid "Content-Type:"
 msgstr "Content-Type:"
 

-#: src/imap.c:625
+#: src/imap.c:632

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -4024,164 +4349,164 @@ msgstr ""
 "CRAM-MD5 prihlásenie funguje len ak bola knižnica libetpan skompilovaná s "
 "podporou SASL, a je nainštalovaný CRAM-MD5 SASL plugin."
 
 "CRAM-MD5 prihlásenie funguje len ak bola knižnica libetpan skompilovaná s "
 "podporou SASL, a je nainštalovaný CRAM-MD5 SASL plugin."
 

-#: src/imap.c:632
+#: src/imap.c:639

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Spojenie k %s zlyhalo: neúspešné prihlásenie.%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Spojenie k %s zlyhalo: neúspešné prihlásenie.%s"
 

-#: src/imap.c:636
+#: src/imap.c:643

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Spojenie k %s zlyhalo: neúspešné prihlásenie.%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Spojenie k %s zlyhalo: neúspešné prihlásenie.%s\n"
 

-#: src/imap.c:653
+#: src/imap.c:660

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Spojenie k %s zlyhalo"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Spojenie k %s zlyhalo"
 

-#: src/imap.c:658 src/imap.c:661
+#: src/imap.c:665 src/imap.c:668

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s sa prerušilo. Znovu pripájam...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s sa prerušilo. Znovu pripájam...\n"
 

-#: src/imap.c:699 src/imap.c:2215 src/imap.c:2739 src/imap.c:2824
-#: src/imap.c:3158 src/imap.c:3913
-msgid "Sylpheed-Claws needs network access in order to access the IMAP server."
-msgstr "Pre prístup k IMAP serveru potrebuje Sylpheed-Claws pripojenie k sieti."
+#: src/imap.c:717 src/imap.c:2239 src/imap.c:2737 src/imap.c:2822
+#: src/imap.c:3156 src/imap.c:3914
+msgid "Claws Mail needs network access in order to access the IMAP server."
+msgstr "Pre prístup k IMAP serveru potrebuje Claws Mail pripojenie k sieti."

 
 

-#: src/imap.c:773 src/inc.c:770 src/news.c:295 src/send_message.c:299
+#: src/imap.c:789 src/inc.c:770 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 

-#: src/imap.c:774 src/inc.c:771 src/news.c:296 src/send_message.c:300
+#: src/imap.c:790 src/inc.c:771 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "

-"available in this build of Sylpheed-Claws. \n"
+"available in this build of Claws Mail. \n"

 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Toto spojenie je nastavené tak, aby používalo pre zabezpečenie SSL, ale SSL "
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Toto spojenie je nastavené tak, aby používalo pre zabezpečenie SSL, ale SSL "

-"nie je v tejto kópii Sylpheed-Claws dostupné. \n"
+"nie je v tejto kópii Claws Mail dostupné. \n"

 "\n"
 "Chcete pokračovať v pripájaní sa na tento server? Komunikácia nebude "
 "zabezpečená."
 
 "\n"
 "Chcete pokračovať v pripájaní sa na tento server? Komunikácia nebude "
 "zabezpečená."
 

-#: src/imap.c:780 src/inc.c:777 src/news.c:302 src/send_message.c:306
+#: src/imap.c:796 src/inc.c:777 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "Po_kračovať v pripájaní"
 
 msgid "Con_tinue connecting"
 msgstr "Po_kračovať v pripájaní"
 

-#: src/imap.c:790
+#: src/imap.c:806

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Pripájam sa k serveru IMAP4: %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Pripájam sa k serveru IMAP4: %s..."
 

-#: src/imap.c:822
+#: src/imap.c:844

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d"
 

-#: src/imap.c:825
+#: src/imap.c:847

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
 

-#: src/imap.c:854 src/imap.c:2547
+#: src/imap.c:876 src/imap.c:2545

 msgid "Can't start TLS session.\n"
 msgstr "Nedá sa vytvoriť TLS spojenie.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "Nedá sa vytvoriť TLS spojenie.\n"
 

-#: src/imap.c:891
+#: src/imap.c:913

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Pripájam sa k serveru IMAP4: %s ...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Pripájam sa k serveru IMAP4: %s ...\n"
 

-#: src/imap.c:902 src/imap.c:905
+#: src/imap.c:924 src/imap.c:927

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s."
 

-#: src/imap.c:1079
+#: src/imap.c:1100

 msgid "Adding messages..."
 msgstr "Pridávam správy..."
 
 msgid "Adding messages..."
 msgstr "Pridávam správy..."
 

-#: src/imap.c:1229 src/mh.c:500
+#: src/imap.c:1252 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Kopírujem správy..."
 
 msgid "Copying messages..."
 msgstr "Kopírujem správy..."
 

-#: src/imap.c:1404
+#: src/imap.c:1428

 msgid "can't set deleted flags\n"
 msgstr "nedá sa nastaviť príznak zmazania\n"
 
 msgid "can't set deleted flags\n"
 msgstr "nedá sa nastaviť príznak zmazania\n"
 

-#: src/imap.c:1410 src/imap.c:3665
+#: src/imap.c:1434 src/imap.c:3665

 msgid "can't expunge\n"
 msgstr "nedá sa odstrániť\n"
 
 msgid "can't expunge\n"
 msgstr "nedá sa odstrániť\n"
 

-#: src/imap.c:1854
+#: src/imap.c:1878

 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 

-#: src/imap.c:1870
+#: src/imap.c:1894

 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 
 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 

-#: src/imap.c:1951
+#: src/imap.c:1975

 msgid "New folder name must not contain the namespace path separator"
 msgstr "Názov nového priečinku nesmie obsahovať oddeľovač názvov priečinkov"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Názov nového priečinku nesmie obsahovať oddeľovač názvov priečinkov"
 

-#: src/imap.c:1982
+#: src/imap.c:2006

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 

-#: src/imap.c:2046
+#: src/imap.c:2070

 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 
 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 

-#: src/imap.c:2327
+#: src/imap.c:2316

 msgid "LIST failed\n"
 msgstr "príkaz LIST zlyhal\n"
 
 msgid "LIST failed\n"
 msgstr "príkaz LIST zlyhal\n"
 

-#: src/imap.c:2435
+#: src/imap.c:2433

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 

-#: src/imap.c:2544
+#: src/imap.c:2542

 msgid "Server requires TLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje TLS.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "Server na prihlásenie vyžaduje TLS.\n"
 

-#: src/imap.c:2553
+#: src/imap.c:2551

 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo sa znovu načítať možnosti serveru.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "Nepodarilo sa znovu načítať možnosti serveru.\n"
 

-#: src/imap.c:2558
+#: src/imap.c:2556

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Connection to %s failed: server requires TLS, but Sylpheed-Claws has been "
+"Connection to %s failed: server requires TLS, but Claws Mail has been "

 "compiled without OpenSSL support.\n"
 msgstr ""
 "compiled without OpenSSL support.\n"
 msgstr ""

-"Pripojenie k %s sa nepodarilo: server vyžaduje TLS, ale Sylpheed-Claws bol\n"
+"Pripojenie k %s sa nepodarilo: server vyžaduje TLS, ale Claws Mail bol\n"

 "skompilovaný bez podpory OpensSSL.\n"
 
 "skompilovaný bez podpory OpensSSL.\n"
 

-#: src/imap.c:2566
+#: src/imap.c:2564

 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "Tento server neumožňuje prihlásenie.\n"
 

-#: src/imap.c:2744
+#: src/imap.c:2742

 msgid "Fetching message..."
 msgstr "Sťahujem správu..."
 
 msgid "Fetching message..."
 msgstr "Sťahujem správu..."
 

-#: src/imap.c:2911
+#: src/imap.c:2909

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 

-#: src/imap.c:2941
+#: src/imap.c:2939

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
 

-#: src/imap.c:2985
+#: src/imap.c:2983

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv nemôže skonvertovať UTF-8 na UTF-7 \n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv nemôže skonvertovať UTF-8 na UTF-7 \n"
 


@@ -4190,58 +4515,62 @@ msgstr "iconv nemôže skonvertovať UTF-8 na UTF-7 \n"
 msgid "can't set deleted flags: %d\n"
 msgstr "nedá sa nastaviť príznak zmazania: %d\n"
 
 msgid "can't set deleted flags: %d\n"
 msgstr "nedá sa nastaviť príznak zmazania: %d\n"
 

-#: src/imap.c:4375
+#: src/imap.c:4378

 msgid ""
 msgid ""

-"You have one or more IMAP accounts defined. However this version of Sylpheed-"
-"Claws has been built without IMAP support; your IMAP account(s) are "
+"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 "

 "disabled.\n"
 "\n"
 "disabled.\n"
 "\n"

-"You probably need to install libetpan and recompile Sylpheed-Claws."
+"You probably need to install libetpan and recompile Claws Mail."

 msgstr ""
 "Máte zadefinované jedno alebo viac IMAP kônt. Keďže táto verzia Sylpheed-"
 "Claws ale nemá aktivovanú podporu IMAP protokolu, tieto kontá sú "
 "deaktivované.\n"
 "\n"
 "Pravdepodobne potrebujete nainštalovať knižnicu 'libetpan', a prekompilovať "
 msgstr ""
 "Máte zadefinované jedno alebo viac IMAP kônt. Keďže táto verzia Sylpheed-"
 "Claws ale nemá aktivovanú podporu IMAP protokolu, tieto kontá sú "
 "deaktivované.\n"
 "\n"
 "Pravdepodobne potrebujete nainštalovať knižnicu 'libetpan', a prekompilovať "

-"Sylpheed-Claws."
+"Claws Mail."

 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/Vytvoriť _nový priečinok..."
 
 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/Vytvoriť _nový priečinok..."
 

-#: src/imap_gtk.c:56 src/mh_gtk.c:51
+#: src/imap_gtk.c:57 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr "/_Premenovať priečinok..."
 
 msgid "/_Rename folder..."
 msgstr "/_Premenovať priečinok..."
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:58 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr "/_Presunúť priečinok..."
 
 msgid "/M_ove folder..."
 msgstr "/_Presunúť priečinok..."
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:59 src/mh_gtk.c:54
+msgid "/Cop_y folder..."
+msgstr "/_Kopírovať priečinok..."
+
+#: src/imap_gtk.c:61 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr "/_Zmazať priečinok..."
 
 msgid "/_Delete folder..."
 msgstr "/_Zmazať priečinok..."
 

-#: src/imap_gtk.c:60 src/news_gtk.c:55
+#: src/imap_gtk.c:63 src/news_gtk.c:55

 msgid "/Synchronise"
 msgstr "/Synchronizovať"
 
 msgid "/Synchronise"
 msgstr "/Synchronizovať"
 

-#: src/imap_gtk.c:61 src/news_gtk.c:56
+#: src/imap_gtk.c:64 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr "/S_tiahnuť správy"
 
 msgid "/Down_load messages"
 msgstr "/S_tiahnuť správy"
 

-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:58
+#: src/imap_gtk.c:66 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
 msgid "/_Check for new messages"
 msgstr "/P_rijať nové správy"
 

-#: src/imap_gtk.c:64 src/mh_gtk.c:56
+#: src/imap_gtk.c:67 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr "/S_kontrolovať nové priečinky"
 
 msgid "/C_heck for new folders"
 msgstr "/S_kontrolovať nové priečinky"
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:57
+#: src/imap_gtk.c:68 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr "/O_bnoviť strom priečinkov"
 
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnoviť strom priečinkov"
 

-#: src/imap_gtk.c:135
+#: src/imap_gtk.c:138

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"


@@ -4251,21 +4580,21 @@ msgstr ""
 "(ak chcete vytvoriť priečinok s ďalšími podpriečinkami\n"
 "miesto správ, pridajte na koniec názvu '/')"
 
 "(ak chcete vytvoriť priečinok s ďalšími podpriečinkami\n"
 "miesto správ, pridajte na koniec názvu '/')"
 

-#: src/imap_gtk.c:193 src/mh_gtk.c:228
+#: src/imap_gtk.c:196 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadajte nový názov pre '%s':"
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Zadajte nový názov pre '%s':"
 

-#: src/imap_gtk.c:195 src/mh_gtk.c:230
+#: src/imap_gtk.c:198 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 

-#: src/imap_gtk.c:204 src/imap_gtk.c:209
+#: src/imap_gtk.c:207 src/imap_gtk.c:212

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nesmie obsahovať '%c'."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nesmie obsahovať '%c'."
 

-#: src/imap_gtk.c:226 src/mh_gtk.c:255
+#: src/imap_gtk.c:229 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -4273,7 +4602,7 @@ msgstr ""
 "Nepodarilo sa premenovať priečinok.\n"
 "Nový názov je neprípustný."
 
 "Nepodarilo sa premenovať priečinok.\n"
 "Nový názov je neprípustný."
 

-#: src/imap_gtk.c:280 src/mh_gtk.c:176
+#: src/imap_gtk.c:281 src/mh_gtk.c:179

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -4286,12 +4615,12 @@ msgstr ""
 "\n"
 "Naozaj pokračovať?"
 
 "\n"
 "Naozaj pokračovať?"
 

-#: src/imap_gtk.c:302 src/mh_gtk.c:198 src/news_gtk.c:238
+#: src/imap_gtk.c:303 src/mh_gtk.c:201 src/news_gtk.c:238

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 

-#: src/imap_gtk.c:362 src/news_gtk.c:299
+#: src/imap_gtk.c:363 src/news_gtk.c:299

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Pri sťahovaní správ v '%s' nastala chyba."
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Pri sťahovaní správ v '%s' nastala chyba."


@@ -4480,8 +4809,8 @@ msgid "Import Pine file into Address Book"
 msgstr "Importovať súbor Pine do adresára"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304
 msgstr "Importovať súbor Pine do adresára"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304

-msgid "Sylpheed-Claws needs network access in order to get mails."
-msgstr "Pre príjem pošty potrebuje Sylpheed-Claws pripojenie k sieti."
+msgid "Claws Mail needs network access in order to get mails."
+msgstr "Pre príjem pošty potrebuje Claws Mail pripojenie k sieti."

 
 #: src/inc.c:384
 msgid "Retrieving new messages"
 
 #: src/inc.c:384
 msgid "Retrieving new messages"


@@ -4519,7 +4848,7 @@ msgstr "Spojenie zlyhalo"
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 

-#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2371
+#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2372

 msgid "Locked"
 msgstr "Správa je zamknutá"
 
 msgid "Locked"
 msgstr "Správa je zamknutá"
 


@@ -4713,58 +5042,49 @@ msgstr ""
 #: src/main.c:270
 #, c-format
 msgid ""
 #: src/main.c:270
 #, c-format
 msgid ""

-"Configuration for Sylpheed-Claws %s found.\n"
+"Configuration for %s (or previous) found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"Bola nájdená konfigurácia pre Sylpheed-Claws %s.\n"
+"Bola nájdená konfigurácia pre verziu %s (alebo staršiu).\n"

 "Chcete túto konfiguráciu premigrovať a použiť?"
 
 "Chcete túto konfiguráciu premigrovať a použiť?"
 

-#: src/main.c:273
-msgid "1.0.5 or previous"
-msgstr "1.0.5 alebo starší"
-
-#: src/main.c:273
-msgid "1.9.15 or previous"
-msgstr "1.9.15 alebo starší"
-
-#: src/main.c:276
+#: src/main.c:274

 msgid "Migration of configuration"
 msgstr "Migrácia konfigurácie"
 
 msgid "Migration of configuration"
 msgstr "Migrácia konfigurácie"
 

-#: src/main.c:282
+#: src/main.c:280

 msgid "Copying configuration..."
 msgstr "Kopírujem konfiguráciu..."
 
 msgid "Copying configuration..."
 msgstr "Kopírujem konfiguráciu..."
 

-#: src/main.c:287
+#: src/main.c:285

 msgid "Migration failed!"
 msgstr "Migrácia sa nepodarila!"
 
 msgid "Migration failed!"
 msgstr "Migrácia sa nepodarila!"
 

-#: src/main.c:529
+#: src/main.c:572

 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 

-#: src/main.c:535
+#: src/main.c:578

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with a more recent GTK+ library than is "
+"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 "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "

-"recompile Sylpheed-Claws."
+"recompile Claws Mail."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws bol skompilovaný s novšou verziou knižnice GTK+, než aká je "
+"Claws Mail bol skompilovaný s novšou verziou knižnice GTK+, než aká je "

 "momentálne dostupná na tomto počítači. Toto môže spôsobiť pád aplikácie. "
 "Doporučuje sa buď nainštalovať novšiu verziu GTK+, alebo znovu skompilovať "
 "momentálne dostupná na tomto počítači. Toto môže spôsobiť pád aplikácie. "
 "Doporučuje sa buď nainštalovať novšiu verziu GTK+, alebo znovu skompilovať "

-"Sylpheed-Claws."
+"Claws Mail."

 
 

-#: src/main.c:544
+#: src/main.c:587

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with an older GTK+ library than is "
-"currently available. This will cause crashes. You need to recompile Sylpheed-"
-"Claws."
+"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 ""
 msgstr ""

-"Sylpheed-Claws bol skompilovaný s novšou verziou knižnice GTK+, než aká je "
+"Claws Mail bol skompilovaný s novšou verziou knižnice GTK+, než aká je "

 "momentálne dostupná na tomto počítači. Toto môže spôsobiť pád aplikácie. "
 "momentálne dostupná na tomto počítači. Toto môže spôsobiť pád aplikácie. "

-"Doporučuje sa znovu skompilovať Sylpheed-Claws."
+"Doporučuje sa znovu skompilovať Claws Mail."

 
 

-#: src/main.c:754
+#: src/main.c:810

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."


@@ -4772,30 +5092,40 @@ msgstr ""
 "Niektoré pluginy sa nepodarilo načítať. Skontrolujte okno načítania pluginov "
 "pre viac informácií."
 
 "Niektoré pluginy sa nepodarilo načítať. Skontrolujte okno načítania pluginov "
 "pre viac informácií."
 

-#: src/main.c:765
+#: src/main.c:822
+msgid ""
+"Claws Mail has detected a configured mailbox, but is it incomplete. It is "
+"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
+"mailbox's folder to try to fix it."
+msgstr ""
+"Claws Mail našiel nakonfigurovanú poštovú schránku, ktorá ale nie je "
+"úplná. Toto je pravdepodobne spôsobené zlyhávajúcim kontom IMAP. Použite "
+"voľbu \"Obnoviť strom priečinkov\" na schránku pre pokus o jej opravu."
+
+#: src/main.c:828

 msgid ""
 msgid ""

-"Sylpheed-Claws has detected a configured mailbox, but could not load it. It "
-"is probably provided by an out-of-date external plugin. Please reinstall the "
+"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 ""
 "plugin and try again."
 msgstr ""

-"Sylpheed-Claws našiel nakonfigurovanú poštovú schránku, ale nepodarilo sa ju "
+"Claws Mail našiel nakonfigurovanú poštovú schránku, ale nepodarilo sa ju "

 "načítať. Pravdepodobne je vytvorená zastaralým pluginom. Prosím, "
 "preinštalujte plugin, a skúste znovu."
 
 "načítať. Pravdepodobne je vytvorená zastaralým pluginom. Prosím, "
 "preinštalujte plugin, a skúste znovu."
 

-#: src/main.c:1008
+#: src/main.c:1074

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 

-#: src/main.c:1010
+#: src/main.c:1076

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 

-#: src/main.c:1011
+#: src/main.c:1077

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      prihlásiť zadanú URI, ak je to možné"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      prihlásiť zadanú URI, ak je to možné"
 

-#: src/main.c:1012
+#: src/main.c:1078

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -4805,23 +5135,23 @@ msgstr ""
 "                         otvorí okno pre písanie novej správy s pripojenými\n"
 "                         uvedenými súbormi"
 
 "                         otvorí okno pre písanie novej správy s pripojenými\n"
 "                         uvedenými súbormi"
 

-#: src/main.c:1015
+#: src/main.c:1081

 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 

-#: src/main.c:1016
+#: src/main.c:1082

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 

-#: src/main.c:1017
+#: src/main.c:1083

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 

-#: src/main.c:1018
+#: src/main.c:1084

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 

-#: src/main.c:1019
+#: src/main.c:1085

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -4829,76 +5159,76 @@ msgstr ""
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 

-#: src/main.c:1021
+#: src/main.c:1087

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"

-"                         folder is a folder id like '#mh/Mailbox/inbox'"
+"                         folder is a folder id like 'folder/sub_folder'"

 msgstr ""
 "  --select priečinok[/správa]  otvorí zadaný priečinok alebo správu\n"
 msgstr ""
 "  --select priečinok[/správa]  otvorí zadaný priečinok alebo správu\n"

-"                         priečinok musí byť v tvare '#mh/Mailbox/inbox'"
+"                         priečinok musí byť v tvare 'priečinok/podpriečinok'"

 
 

-#: src/main.c:1023
+#: src/main.c:1089

 msgid "  --online               switch to online mode"
 msgstr "  --online               prepne do online režimu"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               prepne do online režimu"
 

-#: src/main.c:1024
+#: src/main.c:1090

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              prepne do režimu offline"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              prepne do režimu offline"
 

-#: src/main.c:1025
-msgid "  --exit                 exit Sylpheed-Claws"
-msgstr "  --exit                 ukončí Sylpheed-Claws"
+#: src/main.c:1091
+msgid "  --exit                 exit Claws Mail"
+msgstr "  --exit                 ukončí Claws Mail"

 
 

-#: src/main.c:1026
+#: src/main.c:1092

 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 

-#: src/main.c:1027
+#: src/main.c:1093

 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 

-#: src/main.c:1028
+#: src/main.c:1094

 msgid "  --version              output version information and exit"
 msgstr "  --version                zobrazí informácie o verzii a ukončí program"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version                zobrazí informácie o verzii a ukončí program"
 

-#: src/main.c:1029
+#: src/main.c:1095

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           výstupný priečinok s nastaveniami"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           výstupný priečinok s nastaveniami"
 

-#: src/main.c:1094
+#: src/main.c:1160

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Spracúvam (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Spracúvam (%s)..."
 

-#: src/main.c:1097
+#: src/main.c:1163

 msgid "top level folder"
 msgstr "priečinok vrchnej úrovne"
 
 msgid "top level folder"
 msgstr "priečinok vrchnej úrovne"
 

-#: src/main.c:1161
+#: src/main.c:1227

 msgid "Really quit?"
 msgstr "Naozaj ukončiť?"
 
 msgid "Really quit?"
 msgstr "Naozaj ukončiť?"
 

-#: src/main.c:1162
+#: src/main.c:1228

 msgid "Composing message exists."
 msgstr "Máte rozpísanú správu."
 
 msgid "Composing message exists."
 msgstr "Máte rozpísanú správu."
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Save to Draft"
 msgstr "Uložiť medzi _koncepty"
 
 msgid "_Save to Draft"
 msgstr "Uložiť medzi _koncepty"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Discard them"
 msgstr "_Zahodiť"
 
 msgid "_Discard them"
 msgstr "_Zahodiť"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "Do_n't quit"
 msgstr "_Neukončiť"
 
 msgid "Do_n't quit"
 msgstr "_Neukončiť"
 

-#: src/main.c:1178
+#: src/main.c:1244

 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 

-#: src/main.c:1179
+#: src/main.c:1245

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 


@@ -5754,23 +6084,24 @@ msgid "Select account"
 msgstr "Zvoliť konto"
 
 #: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738
 msgstr "Zvoliť konto"
 
 #: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738

-#: src/mainwindow.c:1774 src/mainwindow.c:1816 src/prefs_folder_item.c:756
+#: src/mainwindow.c:1774 src/mainwindow.c:1817
+#: src/plugins/trayicon/trayicon.c:143 src/prefs_folder_item.c:762

 msgid "Untitled"
 msgstr "Bez názvu"
 
 msgid "Untitled"
 msgstr "Bez názvu"
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1818

 msgid "none"
 msgstr "žiadny"
 
 msgid "none"
 msgstr "žiadny"
 

-#: src/mainwindow.c:2079
+#: src/mainwindow.c:2080

 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 
 msgid "Delete all messages in trash folders?"
 msgstr "Zmazať všetky správy v košoch?"
 

-#: src/mainwindow.c:2098
+#: src/mainwindow.c:2099

 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 

-#: src/mainwindow.c:2099
+#: src/mainwindow.c:2100

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -5780,16 +6111,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 

-#: src/mainwindow.c:2105
+#: src/mainwindow.c:2106

 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 

-#: src/mainwindow.c:2110 src/setup.c:51
+#: src/mainwindow.c:2111 src/setup.c:51

 msgid "Mailbox"
 msgstr "Mailbox"
 
 msgid "Mailbox"
 msgstr "Mailbox"
 

-#: src/mainwindow.c:2115 src/setup.c:54
+#: src/mainwindow.c:2116 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 "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -5799,51 +6130,51 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 

-#: src/mainwindow.c:2431
+#: src/mainwindow.c:2432

 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 
 msgid "No posting allowed"
 msgstr "Prispievanie nie je povolené"
 

-#: src/mainwindow.c:2696
-msgid "Sylpheed-Claws - Folder View"
-msgstr "Sylpheed-Claws - Zobrazenie priečinku"
+#: src/mainwindow.c:2699
+msgid "Claws Mail - Folder View"
+msgstr "Claws Mail - Zobrazenie priečinku"

 
 

-#: src/mainwindow.c:2732 src/messageview.c:449 src/messageview.c:855
-msgid "Sylpheed-Claws - Message View"
-msgstr "Sylpheed-Claws - Zobrazenie správy"
+#: src/mainwindow.c:2735 src/messageview.c:449 src/messageview.c:855
+msgid "Claws Mail - Message View"
+msgstr "Claws Mail - Zobrazenie správy"

 
 

-#: src/mainwindow.c:3082
+#: src/mainwindow.c:3085

 msgid "Mbox import has failed."
 msgstr "Nepodarilo sa importovať súbor mbox."
 
 msgid "Mbox import has failed."
 msgstr "Nepodarilo sa importovať súbor mbox."
 

-#: src/mainwindow.c:3091 src/mainwindow.c:3100
+#: src/mainwindow.c:3094 src/mainwindow.c:3103

 msgid "Export to mbox has failed."
 msgstr "Nepodarilo sa exportovať správy do súboru mbox."
 
 msgid "Export to mbox has failed."
 msgstr "Nepodarilo sa exportovať správy do súboru mbox."
 

-#: src/mainwindow.c:3123 src/plugins/trayicon/trayicon.c:426
+#: src/mainwindow.c:3126 src/plugins/trayicon/trayicon.c:474

 msgid "Exit"
 msgstr "Ukončiť"
 
 msgid "Exit"
 msgstr "Ukončiť"
 

-#: src/mainwindow.c:3123
-msgid "Exit Sylpheed-Claws?"
-msgstr "Ukončiť Sylpheed-Claws?"
+#: src/mainwindow.c:3126
+msgid "Exit Claws Mail?"
+msgstr "Ukončiť Claws Mail?"

 
 

-#: src/mainwindow.c:3269
+#: src/mainwindow.c:3271

 msgid "Folder synchronisation"
 msgstr "Synchronizácia priečinkov"
 
 msgid "Folder synchronisation"
 msgstr "Synchronizácia priečinkov"
 

-#: src/mainwindow.c:3270
+#: src/mainwindow.c:3272

 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať Vaše priečinky?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Chcete teraz synchronizovať Vaše priečinky?"
 

-#: src/mainwindow.c:3271
+#: src/mainwindow.c:3273

 msgid "+_Synchronise"
 msgstr "+_Synchronizovať"
 
 msgid "+_Synchronise"
 msgstr "+_Synchronizovať"
 

-#: src/mainwindow.c:3602
+#: src/mainwindow.c:3604

 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 

-#: src/mainwindow.c:3636
+#: src/mainwindow.c:3641

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"


@@ -5851,39 +6182,44 @@ msgstr[0] "%d duplikátna správa v %d priečinkoch bola zmazaná.\n"
 msgstr[1] "%d duplikátne správy v %d priečinkoch boli zmazané.\n"
 msgstr[2] "%d duplikátnych správ v %d priečinkoch bolo zmazaných.\n"
 
 msgstr[1] "%d duplikátne správy v %d priečinkoch boli zmazané.\n"
 msgstr[2] "%d duplikátnych správ v %d priečinkoch bolo zmazaných.\n"
 

-#: src/mainwindow.c:3795 src/summaryview.c:4775
+#: src/mainwindow.c:3800 src/summaryview.c:4783

 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracúvania použité pred pravidlami priečinkov"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracúvania použité pred pravidlami priečinkov"
 

-#: src/mainwindow.c:3804
+#: src/mainwindow.c:3809

 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracúvania použité po pravidlách priečinkov"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracúvania použité po pravidlách priečinkov"
 

-#: src/mainwindow.c:3813 src/summaryview.c:4786
+#: src/mainwindow.c:3818 src/summaryview.c:4794

 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 

-#: src/mainwindow.c:4067
+#: src/mainwindow.c:4072

 #, c-format
 msgid "not initialized\n"
 msgstr "neinicializoavný\n"
 
 #, c-format
 msgid "not initialized\n"
 msgstr "neinicializoavný\n"
 

-#: src/mainwindow.c:4079 src/mainwindow.c:4090
+#: src/mainwindow.c:4084 src/mainwindow.c:4095

 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "vyberám priečinok '%s'\n"
 
 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "vyberám priečinok '%s'\n"
 

-#: src/mainwindow.c:4094
+#: src/mainwindow.c:4099

 #, c-format
 msgid "selecting message %d\n"
 msgstr "vyberám správu %d\n"
 
 #, c-format
 msgid "selecting message %d\n"
 msgstr "vyberám správu %d\n"
 

+#: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
+#: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
+msgid "Filtering Matcher Menu|All"
+msgstr "Všetky"
+

 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(žiadna)"
 
 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(žiadna)"
 

-#: src/mbox.c:85
+#: src/mbox.c:98

 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 #, c-format
 msgid ""
 "Could not open mbox file:\n"


@@ -5892,25 +6228,25 @@ msgstr ""
 "Nepodarilo sa otvoriť súbor mbox:\n"
 "%s\n"
 
 "Nepodarilo sa otvoriť súbor mbox:\n"
 "%s\n"
 

-#: src/mbox.c:121
+#: src/mbox.c:134

 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Importujem zo súboru mbox... (%d správ naimportovaných)"
 
 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Importujem zo súboru mbox... (%d správ naimportovaných)"
 

-#: src/mbox.c:468
+#: src/mbox.c:481

 msgid "Overwrite mbox file"
 msgstr "Prepísať existujúci súbor mbox"
 
 msgid "Overwrite mbox file"
 msgstr "Prepísať existujúci súbor mbox"
 

-#: src/mbox.c:469
+#: src/mbox.c:482

 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento súbor už existuje. Chcete ho prepísať?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Tento súbor už existuje. Chcete ho prepísať?"
 

-#: src/mbox.c:470 src/messageview.c:1143 src/mimeview.c:1422
-#: src/textview.c:2650
+#: src/mbox.c:483 src/messageview.c:1143 src/mimeview.c:1443
+#: src/textview.c:2654

 msgid "Overwrite"
 msgstr "Prepísať"
 
 msgid "Overwrite"
 msgstr "Prepísať"
 

-#: src/mbox.c:479
+#: src/mbox.c:492

 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 #, c-format
 msgid ""
 "Could not create mbox file:\n"


@@ -5919,39 +6255,39 @@ msgstr ""
 "Nepodarilo sa vytvoriť súbor mbox:\n"
 "%s\n"
 
 "Nepodarilo sa vytvoriť súbor mbox:\n"
 "%s\n"
 

-#: src/mbox.c:483
+#: src/mbox.c:500

 msgid "Exporting to mbox..."
 msgstr "Exportujem do súboru mbox..."
 
 msgid "Exporting to mbox..."
 msgstr "Exportujem do súboru mbox..."
 

-#: src/message_search.c:162
+#: src/message_search.c:169

 msgid "Find in current message"
 msgstr "Nájdi v súčasnej správe"
 
 msgid "Find in current message"
 msgstr "Nájdi v súčasnej správe"
 

-#: src/message_search.c:180
+#: src/message_search.c:187

 msgid "Find text:"
 msgstr "Nájdi text:"
 
 msgid "Find text:"
 msgstr "Nájdi text:"
 

-#: src/message_search.c:195 src/prefs_matcher.c:649 src/summary_search.c:324
+#: src/message_search.c:210 src/prefs_matcher.c:649 src/summary_search.c:392

 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
 
 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
 

-#: src/message_search.c:301 src/summary_search.c:535
+#: src/message_search.c:323 src/summary_search.c:637

 msgid "Search failed"
 msgstr "Hľadanie zlyhalo"
 
 msgid "Search failed"
 msgstr "Hľadanie zlyhalo"
 

-#: src/message_search.c:302 src/summary_search.c:536
+#: src/message_search.c:324 src/summary_search.c:638

 msgid "Search string not found."
 msgstr "Hľadaný reťazec sa nenašiel."
 
 msgid "Search string not found."
 msgstr "Hľadaný reťazec sa nenašiel."
 

-#: src/message_search.c:311
+#: src/message_search.c:333

 msgid "Beginning of message reached; continue from end?"
 msgstr "Dosiahnutý začiatok správy; pokračovať z konca?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "Dosiahnutý začiatok správy; pokračovať z konca?"
 

-#: src/message_search.c:314
+#: src/message_search.c:336

 msgid "End of message reached; continue from beginning?"
 msgstr "Dosiahnutý koniec správy; pokračovať od začiatku?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Dosiahnutý koniec správy; pokračovať od začiatku?"
 

-#: src/message_search.c:317 src/summary_search.c:547
+#: src/message_search.c:339 src/summary_search.c:649

 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 
 msgid "Search finished"
 msgstr "Hľadanie dokončené"
 


@@ -6031,8 +6367,8 @@ msgstr ""
 msgid "Couldn't decrypt: %s"
 msgstr "Nepodarilo sa rozšifrovať: %s"
 
 msgid "Couldn't decrypt: %s"
 msgstr "Nepodarilo sa rozšifrovať: %s"
 

-#: src/messageview.c:1138 src/mimeview.c:1560 src/summaryview.c:4065
-#: src/summaryview.c:4068 src/textview.c:2638
+#: src/messageview.c:1138 src/mimeview.c:1582 src/summaryview.c:4065
+#: src/summaryview.c:4068 src/textview.c:2642

 msgid "Save as"
 msgstr "Uložiť ako"
 
 msgid "Save as"
 msgstr "Uložiť ako"
 


@@ -6131,7 +6467,7 @@ msgstr "+_Zrušiť"
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nedá sa tlačiť: správa neobsahuje text."
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Nedá sa tlačiť: správa neobsahuje text."
 

-#: src/messageview.c:1503 src/summaryview.c:4125
+#: src/messageview.c:1520 src/summaryview.c:4125

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6140,7 +6476,7 @@ msgstr ""
 "Zadajte príkazový riadok tlače:\n"
 "('%s' bude nahradené názvom súboru)"
 
 "Zadajte príkazový riadok tlače:\n"
 "('%s' bude nahradené názvom súboru)"
 

-#: src/messageview.c:1509 src/summaryview.c:4131
+#: src/messageview.c:1526 src/summaryview.c:4131

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6149,8 +6485,8 @@ msgstr ""
 "Príkazový riadok tlače je neplatný:\n"
 "'%s'"
 
 "Príkazový riadok tlače je neplatný:\n"
 "'%s'"
 

-#: src/messageview.c:1775 src/messageview.c:1781 src/summaryview.c:3521
-#: src/summaryview.c:5527
+#: src/messageview.c:1796 src/messageview.c:1802 src/summaryview.c:3521
+#: src/summaryview.c:5540

 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "Nastala chyba pri učení.\n"
 


@@ -6167,11 +6503,11 @@ msgstr "Presúvam správy..."
 msgid "Deleting messages..."
 msgstr "Odstraňujem správy..."
 
 msgid "Deleting messages..."
 msgstr "Odstraňujem správy..."
 

-#: src/mh_gtk.c:59
+#: src/mh_gtk.c:62

 msgid "/Remove _mailbox..."
 msgstr "/_Odstrániť schránku..."
 
 msgid "/Remove _mailbox..."
 msgstr "/_Odstrániť schránku..."
 

-#: src/mh_gtk.c:323
+#: src/mh_gtk.c:324

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"


@@ -6180,11 +6516,11 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 

-#: src/mh_gtk.c:325
+#: src/mh_gtk.c:326

 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 

-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:327

 msgid "_Remove"
 msgstr "_Odstrániť"
 
 msgid "_Remove"
 msgstr "_Odstrániť"
 


@@ -6212,60 +6548,60 @@ msgstr "/Uložiť _všetky..."
 msgid "MIME Type"
 msgstr "MIME typ"
 
 msgid "MIME Type"
 msgstr "MIME typ"
 

-#: src/mimeview.c:721
+#: src/mimeview.c:742

 msgid "Check signature"
 msgstr "Overiť podpis"
 
 msgid "Check signature"
 msgstr "Overiť podpis"
 

-#: src/mimeview.c:726 src/mimeview.c:731 src/mimeview.c:736
+#: src/mimeview.c:747 src/mimeview.c:752 src/mimeview.c:757

 msgid "View full information"
 msgstr "Zobraziť úplné informácie"
 
 msgid "View full information"
 msgstr "Zobraziť úplné informácie"
 

-#: src/mimeview.c:741 src/mimeview.c:745
+#: src/mimeview.c:762 src/mimeview.c:766

 msgid "Check again"
 msgstr "Znova overiť"
 
 msgid "Check again"
 msgstr "Znova overiť"
 

-#: src/mimeview.c:754
+#: src/mimeview.c:775

 msgid "Click the icon or hit 'C' to check it."
 msgstr "Pre overenie kliknite na ikonu, alebo stlačte 'C'."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Pre overenie kliknite na ikonu, alebo stlačte 'C'."
 

-#: src/mimeview.c:759
+#: src/mimeview.c:780

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Čas pre overenie podpisu vypršal. Kliknite na ikonu, alebo stlačte 'C' pre "
 "ďalší pokus."
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Čas pre overenie podpisu vypršal. Kliknite na ikonu, alebo stlačte 'C' pre "
 "ďalší pokus."
 

-#: src/mimeview.c:969
+#: src/mimeview.c:990

 msgid "Checking signature..."
 msgstr "Overujem podpis..."
 
 msgid "Checking signature..."
 msgstr "Overujem podpis..."
 

-#: src/mimeview.c:1011
+#: src/mimeview.c:1032

 msgid "Go back to email"
 msgstr "Naspäť na správu"
 
 msgid "Go back to email"
 msgstr "Naspäť na správu"
 

-#: src/mimeview.c:1349 src/mimeview.c:1430 src/mimeview.c:1606
-#: src/mimeview.c:1639
+#: src/mimeview.c:1370 src/mimeview.c:1451 src/mimeview.c:1628
+#: src/mimeview.c:1661

 msgid "Couldn't save the part of multipart message."
 msgstr "Nepodarilo sa uložiť časť viacdielnej správy."
 
 msgid "Couldn't save the part of multipart message."
 msgstr "Nepodarilo sa uložiť časť viacdielnej správy."
 

-#: src/mimeview.c:1419 src/textview.c:2648
+#: src/mimeview.c:1440 src/textview.c:2652

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Prepísať existujúci súbor '%s'?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Prepísať existujúci súbor '%s'?"
 

-#: src/mimeview.c:1457
+#: src/mimeview.c:1478

 msgid "Select destination folder"
 msgstr "Zvoľte cieľový priečinok"
 
 msgid "Select destination folder"
 msgstr "Zvoľte cieľový priečinok"
 

-#: src/mimeview.c:1464
+#: src/mimeview.c:1485

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' nie je priečinok."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' nie je priečinok."
 

-#: src/mimeview.c:1685 src/mimeview.c:1693 src/textview.c:2579
+#: src/mimeview.c:1707 src/mimeview.c:1715 src/textview.c:2583

 msgid "Open with"
 msgstr "Otvoriť čím"
 
 msgid "Open with"
 msgstr "Otvoriť čím"
 

-#: src/mimeview.c:1686 src/mimeview.c:1694 src/textview.c:2580
+#: src/mimeview.c:1708 src/mimeview.c:1716 src/textview.c:2584

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6280,8 +6616,8 @@ msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "nadväzujem NNTP spojenie k %s:%d ...\n"
 
 #: src/news.c:328
 msgstr "nadväzujem NNTP spojenie k %s:%d ...\n"
 
 #: src/news.c:328

-msgid "Sylpheed-Claws needs network access in order to access the News server."
-msgstr "Pre prístup k News serveru potrebuje Sylpheed-Claws pripojenie k sieti."
+msgid "Claws Mail needs network access in order to access the News server."
+msgstr "Pre prístup k News serveru potrebuje Claws Mail pripojenie k sieti."

 
 #: src/news.c:345
 #, c-format
 
 #: src/news.c:345
 #, c-format


@@ -6373,32 +6709,20 @@ msgstr "Odhlásiť sa z diskusnej skupiny"
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť sa"
 
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť sa"
 

-#: src/plugins/clamav/clamav_plugin.c:118
+#: src/plugins/clamav/clamav_plugin.c:43
+#: src/plugins/clamav/clamav_plugin_gtk.c:212
+msgid "Clam AntiVirus"
+msgstr "Clam AntiVirus"
+
+#: src/plugins/clamav/clamav_plugin.c:120

 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: testujem správu..."
 
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: testujem správu..."
 

-#: src/plugins/clamav/clamav_plugin.c:198
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the ClamAV plugin "
-"was built with"
-msgstr ""
-"Vaša verzia Sylpheed-Claws je novšia ako verzia pre ktorú bol ClamAV plugin "
-"skompilovaný"
-
-#: src/plugins/clamav/clamav_plugin.c:203
-msgid "Your version of Sylpheed-Claws is too old for the ClamAV plugin"
-msgstr "Vaša verzia Sylpheed-Claws je príliš zastaralá pre ClamAV plugin"
-
-#: src/plugins/clamav/clamav_plugin.c:209
+#: src/plugins/clamav/clamav_plugin.c:205

 msgid "Failed to register mail filtering hook"
 msgstr "Nepodarilo sa zaregistrovať hook pre filtrovanie pošty"
 
 msgid "Failed to register mail filtering hook"
 msgstr "Nepodarilo sa zaregistrovať hook pre filtrovanie pošty"
 

-#: src/plugins/clamav/clamav_plugin.c:252
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr "Clam AntiVirus"
-
-#: src/plugins/clamav/clamav_plugin.c:257
+#: src/plugins/clamav/clamav_plugin.c:253

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -6417,7 +6741,7 @@ msgstr ""
 "Nastavenia nájdete v menu '/Konfigurácia/Všeobecné nastavenia/Pluginy/ClamAV "
 "AntiVirus'"
 
 "Nastavenia nájdete v menu '/Konfigurácia/Všeobecné nastavenia/Pluginy/ClamAV "
 "AntiVirus'"
 

-#: src/plugins/clamav/clamav_plugin.c:284
+#: src/plugins/clamav/clamav_plugin.c:280

 msgid "Virus detection"
 msgstr "Detekcia vírusov"
 
 msgid "Virus detection"
 msgstr "Detekcia vírusov"
 


@@ -6459,34 +6783,22 @@ msgstr ""
 msgid "Click this button to select a folder for storing infected mail"
 msgstr "Použite toto tlačítko pre výber priečinku pre uloženie infikovanej pošty"
 
 msgid "Click this button to select a folder for storing infected mail"
 msgstr "Použite toto tlačítko pre výber priečinku pre uloženie infikovanej pošty"
 

-#: src/plugins/demo/demo.c:45
-msgid ""
-"Your sylpheed-claws version is newer than the version the plugin was built "
-"with"
-msgstr ""
-"Vaša verzia Sylpheed-Claws je novšia ako verzia, pre ktorú bol tento plugin "
-"skompilovaný"
-
-#: src/plugins/demo/demo.c:50
-msgid "Your sylpheed-claws version is too old"
-msgstr "Vaša verzia Sylpheed-Claws je príliš zastaralá"
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+msgid "Demo"
+msgstr "Demo"

 
 

-#: src/plugins/demo/demo.c:56
+#: src/plugins/demo/demo.c:52

 msgid "Failed to register log text hook"
 msgstr "Nepodarilo sa zaregistrovať hook pre záznam"
 
 msgid "Failed to register log text hook"
 msgstr "Nepodarilo sa zaregistrovať hook pre záznam"
 

-#: src/plugins/demo/demo.c:74 src/plugins/demo/demo.c:103
-msgid "Demo"
-msgstr "Demo"
-
-#: src/plugins/demo/demo.c:79
+#: src/plugins/demo/demo.c:75

 msgid ""
 msgid ""

-"This Plugin is only a demo of how to write plugins for Sylpheed-Claws. It "
+"This Plugin is only a demo of how to write plugins for Claws Mail. It "

 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"

-"It is not really useful"
+"It is not really useful."

 msgstr ""
 msgstr ""

-"Tento plugin je len demonštráciou ako písať pluginy pre Sylpheed-Claws. "
+"Tento plugin je len demonštráciou ako písať pluginy pre Claws Mail. "

 "Nainštaluje hook pre nový logový výstup a vypíše ho na štandardný výstup.\n"
 "\n"
 "Nie je veľmi užitočný"
 "Nainštaluje hook pre nový logový výstup a vypíše ho na štandardný výstup.\n"
 "\n"
 "Nie je veľmi užitočný"


@@ -6515,23 +6827,11 @@ msgstr "Celoobrazovkový režim (skryť ovládacie prvky)"
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Ekvivalent voľby '--fullwindow' pre Dillo"
 
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Ekvivalent voľby '--fullwindow' pre Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:169
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Dillo plugin "
-"was built with"
-msgstr ""
-"Vaša verzia Sylpheed-Claws je novšia ako verzia, pre ktorú bol Dillo plugin "
-"skompilovaný"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:174
-msgid "Your version of Sylpheed-Claws is too old for the Dillo plugin"
-msgstr "Vaša verzia Sylpheed-Claws je príliš zastaralá pre Dillo plugin"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:194
+#: src/plugins/dillo_viewer/dillo_viewer.c:39

 msgid "Dillo HTML Viewer"
 msgstr "Prehliadač HTML Dillo"
 
 msgid "Dillo HTML Viewer"
 msgstr "Prehliadač HTML Dillo"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:199
+#: src/plugins/dillo_viewer/dillo_viewer.c:195

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -6542,7 +6842,7 @@ msgstr ""
 "Nastavenia nájdete v menu '/Konfigurácia/Všeobecné nastavenia/Pluginy/"
 "Prehliadač HTML Dillo'"
 
 "Nastavenia nájdete v menu '/Konfigurácia/Všeobecné nastavenia/Pluginy/"
 "Prehliadač HTML Dillo'"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:223
+#: src/plugins/dillo_viewer/dillo_viewer.c:219

 msgid "text/html"
 msgstr "text/html"
 
 msgid "text/html"
 msgstr "text/html"
 


@@ -6616,7 +6916,7 @@ msgstr "Vymazať z pamäte po"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavte na '0', ak chcete uložiť heslo do pamäte  až do ukončenia"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavte na '0', ak chcete uložiť heslo do pamäte  až do ukončenia"
 

-#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:165

 msgid "minute(s)"
 msgstr "minút"
 
 msgid "minute(s)"
 msgstr "minút"
 


@@ -6719,139 +7019,144 @@ msgstr ""
 msgid "Trust key"
 msgstr "Dôveryhodnosť kľúča"
 
 msgid "Trust key"
 msgstr "Dôveryhodnosť kľúča"
 

-#: src/plugins/pgpcore/sgpgme.c:134
+#: src/plugins/pgpcore/sgpgme.c:76 src/privacy.c:211 src/privacy.c:215
+#: src/privacy.c:232 src/privacy.c:236
+msgid "No signature found"
+msgstr "Nebol nájdený žiadny podpis"
+
+#: src/plugins/pgpcore/sgpgme.c:138

 msgid "Undefined"
 msgstr "Nezadaná"
 
 msgid "Undefined"
 msgstr "Nezadaná"
 

-#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:193

 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Nikdy"
 
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Nikdy"
 

-#: src/plugins/pgpcore/sgpgme.c:138
+#: src/plugins/pgpcore/sgpgme.c:142

 msgid "Marginal"
 msgstr "Čiastočná"
 
 msgid "Marginal"
 msgstr "Čiastočná"
 

-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/sgpgme.c:146

 msgid "Ultimate"
 msgstr "Úplná"
 
 msgid "Ultimate"
 msgstr "Úplná"
 

-#: src/plugins/pgpcore/sgpgme.c:176
+#: src/plugins/pgpcore/sgpgme.c:180

 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Digitálny podpis sa nedá overiť - %s"
 
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Digitálny podpis sa nedá overiť - %s"
 

-#: src/plugins/pgpcore/sgpgme.c:180 src/plugins/pgpcore/sgpgme.c:184
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:188
+#: src/plugins/pgpcore/sgpgme.c:235

 msgid "The signature has not been checked."
 msgstr "Podpis nebol overený"
 
 msgid "The signature has not been checked."
 msgstr "Podpis nebol overený"
 

-#: src/plugins/pgpcore/sgpgme.c:190 src/plugins/pgpcore/sgpgme.c:192
+#: src/plugins/pgpcore/sgpgme.c:194 src/plugins/pgpcore/sgpgme.c:196

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Základ: Nepodarilo sa získať kľúč - nebeží gpg-agent."
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Základ: Nepodarilo sa získať kľúč - nebeží gpg-agent."
 

-#: src/plugins/pgpcore/sgpgme.c:205
+#: src/plugins/pgpcore/sgpgme.c:209

 #, c-format
 msgid "Good signature from %s."
 msgstr "Platný podpis od %s."
 
 #, c-format
 msgid "Good signature from %s."
 msgstr "Platný podpis od %s."
 

-#: src/plugins/pgpcore/sgpgme.c:211
+#: src/plugins/pgpcore/sgpgme.c:215

 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Platný podpis (bez dôvery) od %s."
 
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Platný podpis (bez dôvery) od %s."
 

-#: src/plugins/pgpcore/sgpgme.c:216
+#: src/plugins/pgpcore/sgpgme.c:220

 #, c-format
 msgid "Expired signature from %s."
 msgstr "Platnosť podpisu vypršaná od %s."
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Platnosť podpisu vypršaná od %s."
 

-#: src/plugins/pgpcore/sgpgme.c:219
+#: src/plugins/pgpcore/sgpgme.c:223

 #, c-format
 msgid "Expired key from %s."
 msgstr "Platnosť podpisu vypršaná od %s."
 
 #, c-format
 msgid "Expired key from %s."
 msgstr "Platnosť podpisu vypršaná od %s."
 

-#: src/plugins/pgpcore/sgpgme.c:222
+#: src/plugins/pgpcore/sgpgme.c:226

 #, c-format
 msgid "Bad signature from %s."
 msgstr "CHYBNÝ podpis od %s."
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr "CHYBNÝ podpis od %s."
 

-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:230

 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Nepodarilo sa nájsť verejný kľúč 0x%s pre overenie tohoto podpisu."
 
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Nepodarilo sa nájsť verejný kľúč 0x%s pre overenie tohoto podpisu."
 

-#: src/plugins/pgpcore/sgpgme.c:268
+#: src/plugins/pgpcore/sgpgme.c:272

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Podpísané s použitím %s kľúča s ID %s\n"
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Podpísané s použitím %s kľúča s ID %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:279

 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Platný podpis od \"%s\" (Dôvera %s)\n"
 
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Platný podpis od \"%s\" (Dôvera %s)\n"
 

-#: src/plugins/pgpcore/sgpgme.c:280
+#: src/plugins/pgpcore/sgpgme.c:284

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Platnosť podpisu vypršaná od \"%s\"\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Platnosť podpisu vypršaná od \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:285
+#: src/plugins/pgpcore/sgpgme.c:289

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "CHYBNÝ podpis od \"%s\"\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "CHYBNÝ podpis od \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:300

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                aka \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                aka \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:306

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Odtlačok primárneho kľúča: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Odtlačok primárneho kľúča: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:311

 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "POZOR: Podpísaná adresa \"%s\" sa nezhoduje s DNS záznamom\n"
 
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "POZOR: Podpísaná adresa \"%s\" sa nezhoduje s DNS záznamom\n"
 

-#: src/plugins/pgpcore/sgpgme.c:313
+#: src/plugins/pgpcore/sgpgme.c:317

 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Overená adresa podpisu je \"%s\"\n"
 
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Overená adresa podpisu je \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:355
+#: src/plugins/pgpcore/sgpgme.c:359

 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nepodarilo sa získať údaje zo správy, %s"
 
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Nepodarilo sa získať údaje zo správy, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:375

 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nepodarilo sa inicializovať údaje, %s"
 
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "Nepodarilo sa inicializovať údaje, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:487
+#: src/plugins/pgpcore/sgpgme.c:491

 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Súkromný kľúč nebol nájdený (%s)"
 
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Súkromný kľúč nebol nájdený (%s)"
 

-#: src/plugins/pgpcore/sgpgme.c:495
+#: src/plugins/pgpcore/sgpgme.c:499

 msgid "Secret key specification is ambiguous"
 msgstr "Zadanie súkromného kľúča je nejednoznačné"
 
 msgid "Secret key specification is ambiguous"
 msgstr "Zadanie súkromného kľúča je nejednoznačné"
 

-#: src/plugins/pgpcore/sgpgme.c:505
+#: src/plugins/pgpcore/sgpgme.c:509

 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Chyba pri určení súkromného kľúča: %s"
 
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Chyba pri určení súkromného kľúča: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:541
+#: src/plugins/pgpcore/sgpgme.c:545

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Protokol Gpgme '%s' je nepoužiteľný. Systém '%s' nie je nainštalovaný "
 "správne."
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr ""
 "Protokol Gpgme '%s' je nepoužiteľný. Systém '%s' nie je nainštalovaný "
 "správne."
 

-#: src/plugins/pgpcore/sgpgme.c:547
+#: src/plugins/pgpcore/sgpgme.c:551

 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "


@@ -6860,12 +7165,12 @@ msgstr ""
 "Protokol Gpgme '%s' je nepoužiteľný. Systém '%s' je nainštalovaný vo verzii %"
 "s, ale je potrebná verzia %s.\n"
 
 "Protokol Gpgme '%s' je nepoužiteľný. Systém '%s' je nainštalovaný vo verzii %"
 "s, ale je potrebná verzia %s.\n"
 

-#: src/plugins/pgpcore/sgpgme.c:555
+#: src/plugins/pgpcore/sgpgme.c:559

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Protokol Gpgme '%s' je nepoužiteľný (neznámy problém)"
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Protokol Gpgme '%s' je nepoužiteľný (neznámy problém)"
 

-#: src/plugins/pgpcore/sgpgme.c:571
+#: src/plugins/pgpcore/sgpgme.c:575

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -6873,7 +7178,7 @@ msgstr ""
 "GnuPG nie je správne nainštalované, alebo používate zastaralú\n"
 "verziu. Podpora OpenPGP bude vypnutá."
 
 "GnuPG nie je správne nainštalované, alebo používate zastaralú\n"
 "verziu. Podpora OpenPGP bude vypnutá."
 

-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:609

 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"


@@ -6881,26 +7186,26 @@ msgstr ""
 "Musíte uložiť údaje o konte pomocou \"OK\" predtým, ako môžete vygenerovať "
 "pár kľúčov.\n"
 
 "Musíte uložiť údaje o konte pomocou \"OK\" predtým, ako môžete vygenerovať "
 "pár kľúčov.\n"
 

-#: src/plugins/pgpcore/sgpgme.c:610
+#: src/plugins/pgpcore/sgpgme.c:614

 msgid "No PGP key found"
 msgstr "Nebol nájdený žiadny PGP kľúč"
 
 msgid "No PGP key found"
 msgstr "Nebol nájdený žiadny PGP kľúč"
 

-#: src/plugins/pgpcore/sgpgme.c:611
+#: src/plugins/pgpcore/sgpgme.c:615

 msgid ""
 msgid ""

-"Sylpheed-Claws did not find a secret PGP key, which means that you won't be "
-"able to sign emails or receive encrypted emails.\n"
+"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 ""
 "Do you want to create a new key pair now?"
 msgstr ""

-"Sylpheed-Claws nenašiel súkromný PGP kľúč, takže nebudete môcť digitálne "
+"Claws Mail nenašiel súkromný PGP kľúč, takže nebudete môcť digitálne "

 "podpisovať správy, ani prijímať šifrované správy.\n"
 "Prajete si teraz vygenerovať nový pár kľúčov?"
 
 "podpisovať správy, ani prijímať šifrované správy.\n"
 "Prajete si teraz vygenerovať nový pár kľúčov?"
 

-#: src/plugins/pgpcore/sgpgme.c:681 src/plugins/pgpcore/sgpgme.c:697
+#: src/plugins/pgpcore/sgpgme.c:685 src/plugins/pgpcore/sgpgme.c:701

 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nepodarilo sa vygenerovať nový pár kľúčov: %s"
 
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "Nepodarilo sa vygenerovať nový pár kľúčov: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:688
+#: src/plugins/pgpcore/sgpgme.c:692

 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."


@@ -6908,11 +7213,11 @@ msgstr ""
 "Prebieha generácia Vášho nového páru kľúčov... Prosím, pohybujte myšou, aby "
 "ste zvýšili entropiu v systéme..."
 
 "Prebieha generácia Vášho nového páru kľúčov... Prosím, pohybujte myšou, aby "
 "ste zvýšili entropiu v systéme..."
 

-#: src/plugins/pgpcore/sgpgme.c:703
+#: src/plugins/pgpcore/sgpgme.c:707

 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nepodarilo sa vygenerovať nový pár kľúčov: neznáma chyba"
 
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "Nepodarilo sa vygenerovať nový pár kľúčov: neznáma chyba"
 

-#: src/plugins/pgpcore/sgpgme.c:707
+#: src/plugins/pgpcore/sgpgme.c:711

 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"


@@ -6925,39 +7230,27 @@ msgstr ""
 "\n"
 "Prajete si exportovať tento pár na kľúčový server?"
 
 "\n"
 "Prajete si exportovať tento pár na kľúčový server?"
 

-#: src/plugins/pgpcore/sgpgme.c:711
+#: src/plugins/pgpcore/sgpgme.c:715

 msgid "Key generated"
 msgstr "Kľúč vygenerovaný"
 
 msgid "Key generated"
 msgstr "Kľúč vygenerovaný"
 

-#: src/plugins/pgpcore/sgpgme.c:750
+#: src/plugins/pgpcore/sgpgme.c:754

 msgid "Key exported."
 msgstr "Kľúč vyexportovaný."
 
 msgid "Key exported."
 msgstr "Kľúč vyexportovaný."
 

-#: src/plugins/pgpcore/sgpgme.c:752
+#: src/plugins/pgpcore/sgpgme.c:756

 msgid "Couldn't export key."
 msgstr "Nepodarilo sa vyexportovať kľúč."
 
 msgid "Couldn't export key."
 msgstr "Nepodarilo sa vyexportovať kľúč."
 

-#: src/plugins/pgpcore/sgpgme.c:756
-msgid "Key export isn't implemented in Windows."
-msgstr "Export kľúčov nie je pre systém Windows implementovaný."
-
-#: src/plugins/pgpcore/plugin.c:38
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin "
-"was built with"
-msgstr ""
-"Vaša verzia Sylpheed-Claws je novšia ako verzia, pre ktorú bol PGP/Základ "
-"plugin skompilovaný"
-
-#: src/plugins/pgpcore/plugin.c:43
-msgid "Your version of Sylpheed-Claws is too old for the PGP/Core plugin"
-msgstr "Vaša verzia Sylpheed-Claws je príliš zastarala pre PGP/Základ plugin"
+#: src/plugins/pgpcore/sgpgme.c:760
+msgid "Key export isn't implemented in Windows."
+msgstr "Export kľúčov nie je pre systém Windows implementovaný."

 
 

-#: src/plugins/pgpcore/plugin.c:63
+#: src/plugins/pgpcore/plugin.c:35

 msgid "PGP/Core"
 msgstr "PGP/Základ"
 
 msgid "PGP/Core"
 msgstr "PGP/Základ"
 

-#: src/plugins/pgpcore/plugin.c:68
+#: src/plugins/pgpcore/plugin.c:64

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -6976,7 +7269,7 @@ msgstr ""
 "\n"
 "Na GPGME sa vzťahuje copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "Na GPGME sa vzťahuje copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpcore/plugin.c:97
+#: src/plugins/pgpcore/plugin.c:93

 msgid "Core operations"
 msgstr "Základné operácie"
 
 msgid "Core operations"
 msgstr "Základné operácie"
 


@@ -6986,11 +7279,11 @@ msgstr "Import kľúča"
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgid ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgid ""

-"This key is not in your keyring. Do you want Sylpheed-Claws to try and "
-"import it from a keyserver?"
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"

 msgstr ""
 msgstr ""

-"Tento kľúč nie je vo Vašom zväzku kľúčov. Chcete, aby sa Sylpheed-Claws "
-"pokúsil importovať ho z kľúčového serveru?"
+"Tento kľúč nie je vo Vašom zväzku kľúčov. Chcete, aby sa Claws Mail pokúsil "
+"importovať ho z kľúčového serveru?"

 
 #: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""


@@ -7060,89 +7353,86 @@ msgstr "   Import kľúčov nie je pre systém Windows implementovaný.\n"
 msgid "   This key is in your keyring.\n"
 msgstr "   Tento kľúč je vo Vašom zväzku kľúčov.\n"
 
 msgid "   This key is in your keyring.\n"
 msgstr "   Tento kľúč je vo Vašom zväzku kľúčov.\n"
 

-#: src/plugins/pgpinline/pgpinline.c:237 src/plugins/pgpinline/pgpinline.c:385
+#: src/plugins/pgpinline/pgpinline.c:241 src/plugins/pgpinline/pgpinline.c:393

 msgid "Couldn't get text data."
 msgstr "Nepodarilo sa získať textové dáta."
 
 msgid "Couldn't get text data."
 msgstr "Nepodarilo sa získať textové dáta."
 

-#: src/plugins/pgpinline/pgpinline.c:255
+#: src/plugins/pgpinline/pgpinline.c:259

 msgid "Couldn't convert text data to any sane charset."
 msgstr "Nepodarilo sa skonvertovať textové dáta do žiadneho známeho kódovania."
 
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Nepodarilo sa skonvertovať textové dáta do žiadneho známeho kódovania."
 

-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:267 src/plugins/pgpinline/pgpinline.c:523
+#: src/plugins/pgpinline/pgpinline.c:644 src/plugins/pgpinline/pgpinline.c:691
+#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
+#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
+#: src/plugins/pgpmime/pgpmime.c:593
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "Nepodarilo sa inicializovať kontext GPG, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:386

 msgid "Couldn't parse mime part."
 msgstr "Nepodarilo sa spracovať časť mime."
 
 msgid "Couldn't parse mime part."
 msgstr "Nepodarilo sa spracovať časť mime."
 

-#: src/plugins/pgpinline/pgpinline.c:408 src/plugins/pgpmime/pgpmime.c:333
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:343

 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Nepodarilo sa otvoriť rozšifrovaný súbor %s"
 
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Nepodarilo sa otvoriť rozšifrovaný súbor %s"
 

-#: src/plugins/pgpinline/pgpinline.c:438
+#: src/plugins/pgpinline/pgpinline.c:446

 msgid "Couldn't scan decrypted file."
 msgstr "Nepodarilo sa prečítať rozšifrovaný súbor."
 
 msgid "Couldn't scan decrypted file."
 msgstr "Nepodarilo sa prečítať rozšifrovaný súbor."
 

-#: src/plugins/pgpinline/pgpinline.c:446
+#: src/plugins/pgpinline/pgpinline.c:454

 msgid "Couldn't scan decrypted file parts."
 msgstr "Nepodarilo sa prečítať rozšifrované časti súboru."
 
 msgid "Couldn't scan decrypted file parts."
 msgstr "Nepodarilo sa prečítať rozšifrované časti súboru."
 

-#: src/plugins/pgpinline/pgpinline.c:500
+#: src/plugins/pgpinline/pgpinline.c:508

 msgid "Couldn't create temporary file."
 msgstr "Nepodarilo sa vytvoriť dočasný súbor."
 
 msgid "Couldn't create temporary file."
 msgstr "Nepodarilo sa vytvoriť dočasný súbor."
 

-#: src/plugins/pgpinline/pgpinline.c:534 src/plugins/pgpmime/pgpmime.c:480
+#: src/plugins/pgpinline/pgpinline.c:546 src/plugins/pgpmime/pgpmime.c:494

 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Nepodarilo sa podpísať dáta, %s"
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Nepodarilo sa podpísať dáta, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:552 src/plugins/pgpmime/pgpmime.c:505
+#: src/plugins/pgpinline/pgpinline.c:564 src/plugins/pgpmime/pgpmime.c:519

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Nepodarilo sa podpísať dáta kvôli neplatnému podpiscovi: %s"
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Nepodarilo sa podpísať dáta kvôli neplatnému podpiscovi: %s"
 

-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:514
+#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:528

 msgid "Data signing failed, no results."
 msgstr "Nepodarilo sa podpísať dáta, bez výsledkov."
 
 msgid "Data signing failed, no results."
 msgstr "Nepodarilo sa podpísať dáta, bez výsledkov."
 

-#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:526
+#: src/plugins/pgpinline/pgpinline.c:583 src/plugins/pgpmime/pgpmime.c:539

 msgid "Data signing failed, no contents."
 msgstr "Nepodarilo sa podpísať dáta, žiadny obsah."
 
 msgid "Data signing failed, no contents."
 msgstr "Nepodarilo sa podpísať dáta, žiadny obsah."
 

-#: src/plugins/pgpinline/pgpinline.c:637 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:653 src/plugins/pgpmime/pgpmime.c:602

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nepodarilo sa pridať GPG kľúč %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Nepodarilo sa pridať GPG kľúč %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpmime/pgpmime.c:612
+#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:630

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Nepodarilo sa vytvoriť dočasný súbor, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Nepodarilo sa vytvoriť dočasný súbor, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:683 src/plugins/pgpmime/pgpmime.c:638
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:655

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Šifrovanie zlyhalo, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Šifrovanie zlyhalo, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:746
+#: src/plugins/pgpinline/pgpinline.c:767

 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 

-#: src/plugins/pgpinline/plugin.c:36
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/inline "
-"plugin was built with"
-msgstr ""
-"Vaša verzia Sylpheed-Claws je novšia ako verzia, pre ktorú bol PGP/inline "
-"plugin skompilovaný"
-
-#: src/plugins/pgpinline/plugin.c:41
-msgid "Your version of Sylpheed-Claws is too old for the PGP/inline plugin"
-msgstr "Vaša verzia Sylpheed-Claws je príliš zastaralá"
-
-#: src/plugins/pgpinline/plugin.c:57
+#: src/plugins/pgpinline/plugin.c:33

 msgid "PGP/inline"
 msgstr "PGP/inline"
 
 msgid "PGP/inline"
 msgstr "PGP/inline"
 

-#: src/plugins/pgpinline/plugin.c:62
+#: src/plugins/pgpinline/plugin.c:58

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -7168,23 +7458,11 @@ msgstr ""
 "\n"
 "Na GPGME sa vzťahuje copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "Na GPGME sa vzťahuje copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/plugin.c:35
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin "
-"was built with"
-msgstr ""
-"Vaša verzia Sylpheed-Claws je novšia ako verzia, pre ktorú bol PGP/MIME "
-"plugin skompilovaný"
-
-#: src/plugins/pgpmime/plugin.c:40
-msgid "Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"
-msgstr "Vaša verzia Sylpheed-Claws je príliš zastaralá pre PGP/MIME plugin"
-
-#: src/plugins/pgpmime/plugin.c:56
+#: src/plugins/pgpmime/plugin.c:33

 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:61
+#: src/plugins/pgpmime/plugin.c:58

 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"


@@ -7209,49 +7487,49 @@ msgstr ""
 "\n"
 "Na GPGME sa vzťahuje copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "Na GPGME sa vzťahuje copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/pgpmime.c:192
+#: src/plugins/pgpmime/pgpmime.c:201

 msgid "Signature boundary not found."
 msgstr "Hranica podpisu nebola nájdená."
 
 msgid "Signature boundary not found."
 msgstr "Hranica podpisu nebola nájdená."
 

-#: src/plugins/pgpmime/pgpmime.c:310
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "Nepodarilo sa inicializovať kontext GPG, %s"
-
-#: src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpmime/pgpmime.c:362

 msgid "Couldn't parse decrypted file."
 msgstr "Nepodarilo sa spracovať rozšifrovaný súbor."
 
 msgid "Couldn't parse decrypted file."
 msgstr "Nepodarilo sa spracovať rozšifrovaný súbor."
 

-#: src/plugins/pgpmime/pgpmime.c:358
+#: src/plugins/pgpmime/pgpmime.c:368

 msgid "Couldn't parse decrypted file parts."
 msgstr "Nepodarilo sa spracovať rozšifrované časti súboru."
 
 msgid "Couldn't parse decrypted file parts."
 msgstr "Nepodarilo sa spracovať rozšifrované časti súboru."
 

-#: src/plugins/pgpmime/pgpmime.c:404 src/plugins/pgpmime/pgpmime.c:443
+#: src/plugins/pgpmime/pgpmime.c:414 src/plugins/pgpmime/pgpmime.c:453

 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Nepodarilo sa vytvoriť dočasný súbor: %s"
 
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Nepodarilo sa vytvoriť dočasný súbor: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:704
+#: src/plugins/pgpmime/pgpmime.c:723

 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 

-#: src/plugins/spamassassin/spamassassin.c:159
+#: src/plugins/spamassassin/spamassassin.c:75
+#: src/plugins/spamassassin/spamassassin_gtk.c:549
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: src/plugins/spamassassin/spamassassin.c:161

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin plugin sa nemohol pripojiť k spamd serveru.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin plugin sa nemohol pripojiť k spamd serveru.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:175
+#: src/plugins/spamassassin/spamassassin.c:177

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Filtrovanie SpamAssassin pluginu zlyhalo.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Filtrovanie SpamAssassin pluginu zlyhalo.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:201
+#: src/plugins/spamassassin/spamassassin.c:203

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin plugin je deaktivovaný vo svojich nastaveniach.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin plugin je deaktivovaný vo svojich nastaveniach.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:206
+#: src/plugins/spamassassin/spamassassin.c:208

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrujem správu..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: filtrujem správu..."
 

-#: src/plugins/spamassassin/spamassassin.c:275
+#: src/plugins/spamassassin/spamassassin.c:277

 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "


@@ -7261,40 +7539,23 @@ msgstr ""
 "je nedostupnosť spamd serveru. Uistite sa, že spamd server beží, a je "
 "dostupný."
 
 "je nedostupnosť spamd serveru. Uistite sa, že spamd server beží, a je "
 "dostupný."
 

-#: src/plugins/spamassassin/spamassassin.c:334
+#: src/plugins/spamassassin/spamassassin.c:336

 msgid ""
 msgid ""

-"Sylpheed-Claws needs network access in order to feed this mail(s) to the "
-"remote learner."
-msgstr "Pre vzdialené učenie sa potrebuje Sylpheed-Claws pripojenie k sieti."
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."
+msgstr "Pre vzdialené učenie sa potrebuje Claws Mail pripojenie k sieti."

 
 

-#: src/plugins/spamassassin/spamassassin.c:469
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the SpamAssassin "
-"plugin was built with"
-msgstr ""
-"Vaša verzia Sylpheed-Claws je novšia ako verzia, pre ktorú bol SpamAssassin "
-"plugin skompilovaný"
-
-#: src/plugins/spamassassin/spamassassin.c:474
-msgid "Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"
-msgstr "Vaša verzia Sylpheed-Claws je príliš zastaralá pre SpamAssassin plugin"
-
-#: src/plugins/spamassassin/spamassassin.c:483
+#: src/plugins/spamassassin/spamassassin.c:479

 msgid "Failed to get username"
 msgstr "Nepodarilo sa získať meno používateľa"
 
 msgid "Failed to get username"
 msgstr "Nepodarilo sa získať meno používateľa"
 

-#: src/plugins/spamassassin/spamassassin.c:495
+#: src/plugins/spamassassin/spamassassin.c:491

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "SpamAssassin plugin je načítaný, ale je deaktivovaný vo svojich "
 "nastaveniach.\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr ""
 "SpamAssassin plugin je načítaný, ale je deaktivovaný vo svojich "
 "nastaveniach.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:523
-#: src/plugins/spamassassin/spamassassin_gtk.c:549
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
-
-#: src/plugins/spamassassin/spamassassin.c:528
+#: src/plugins/spamassassin/spamassassin.c:524

 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "


@@ -7319,11 +7580,11 @@ msgstr ""
 "Nastavenia nájdete v menu /Konfigurácia/Všeobecné nastavenia/Pluginy/"
 "SpamAssassin"
 
 "Nastavenia nájdete v menu /Konfigurácia/Všeobecné nastavenia/Pluginy/"
 "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:555

 msgid "Spam detection"
 msgstr "Detekcia spamu"
 
 msgid "Spam detection"
 msgstr "Detekcia spamu"
 

-#: src/plugins/spamassassin/spamassassin.c:560
+#: src/plugins/spamassassin/spamassassin.c:556

 msgid "Spam learning"
 msgstr "Učenie sa spamu"
 
 msgid "Spam learning"
 msgstr "Učenie sa spamu"
 


@@ -7394,6 +7655,7 @@ msgid ""
 msgstr "Maximálny čas povolený pre kontrolu. Ak kontrola trvá dlhšie, bude prerušená."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
 msgstr "Maximálny čas povolený pre kontrolu. Ak kontrola trvá dlhšie, bude prerušená."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194

+#: src/prefs_summaries.c:900

 msgid "seconds"
 msgstr "sekúnd"
 
 msgid "seconds"
 msgstr "sekúnd"
 


@@ -7417,68 +7679,60 @@ msgstr ""
 msgid "Click this button to select a folder for storing spam"
 msgstr "Toto tlačítko Vám umožní zvoliť priežinok pre ukladanie spamu"
 
 msgid "Click this button to select a folder for storing spam"
 msgstr "Toto tlačítko Vám umožní zvoliť priežinok pre ukladanie spamu"
 

-#: src/plugins/trayicon/trayicon.c:101
+#: src/plugins/trayicon/trayicon.c:59 src/plugins/trayicon/trayicon.c:497
+msgid "Trayicon"
+msgstr "Trayicon"
+
+#: src/plugins/trayicon/trayicon.c:106

 msgid "/_Get Mail"
 msgstr "/_Prijať poštu"
 
 msgid "/_Get Mail"
 msgstr "/_Prijať poštu"
 

-#: src/plugins/trayicon/trayicon.c:103
+#: src/plugins/trayicon/trayicon.c:108

 msgid "/_Email"
 msgstr "/_Nová správa"
 
 msgid "/_Email"
 msgstr "/_Nová správa"
 

-#: src/plugins/trayicon/trayicon.c:104
+#: src/plugins/trayicon/trayicon.c:109
+msgid "/_Email from account"
+msgstr "/_Správa z konta"
+
+#: src/plugins/trayicon/trayicon.c:111

 msgid "/Open A_ddressbook"
 msgstr "/Otvoriť _adresár"
 
 msgid "/Open A_ddressbook"
 msgstr "/Otvoriť _adresár"
 

-#: src/plugins/trayicon/trayicon.c:106
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Work Offline"
 msgstr "/Pracovať _offline"
 
 msgid "/_Work Offline"
 msgstr "/Pracovať _offline"
 

-#: src/plugins/trayicon/trayicon.c:108
-msgid "/E_xit Sylpheed-Claws"
-msgstr "/_Ukončiť Sylpheed-Claws"
+#: src/plugins/trayicon/trayicon.c:115
+msgid "/E_xit Claws Mail"
+msgstr "/_Ukončiť Claws Mail"

 
 

-#: src/plugins/trayicon/trayicon.c:162
+#: src/plugins/trayicon/trayicon.c:204

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nových: %d, Neprečítaných: %d, Celkovo: %d"
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "Nových: %d, Neprečítaných: %d, Celkovo: %d"
 

-#: src/plugins/trayicon/trayicon.c:236
+#: src/plugins/trayicon/trayicon.c:278

 msgid "/Work Offline"
 msgstr "/Pracovať offline"
 
 msgid "/Work Offline"
 msgstr "/Pracovať offline"
 

-#: src/plugins/trayicon/trayicon.c:239
+#: src/plugins/trayicon/trayicon.c:281

 msgid "/Get Mail"
 msgstr "/Prijať poštu"
 
 msgid "/Get Mail"
 msgstr "/Prijať poštu"
 

-#: src/plugins/trayicon/trayicon.c:315
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Trayicon plugin "
-"was built with"
-msgstr ""
-"Vaša verzia Sylpheed-Claws je novšia ako verzia, pre ktorú bol plugin "
-"Trayicon skompilovaný"
-
-#: src/plugins/trayicon/trayicon.c:320
-msgid "Your version of Sylpheed-Claws is too old for the Trayicon plugin"
-msgstr "Vaša verzia Sylpheed-Claws je príliš zastaralá pre Trayicon plugin"
-
-#: src/plugins/trayicon/trayicon.c:326
+#: src/plugins/trayicon/trayicon.c:361

 msgid "Failed to register folder item update hook"
 msgstr "Nepodarilo sa zaregistrovať aktualizačný hook pre správy"
 
 msgid "Failed to register folder item update hook"
 msgstr "Nepodarilo sa zaregistrovať aktualizačný hook pre správy"
 

-#: src/plugins/trayicon/trayicon.c:332
+#: src/plugins/trayicon/trayicon.c:367

 msgid "Failed to register folder update hook"
 msgstr "Nepodarilo sa zaregistrovať aktualizačný hook pre priečinky"
 
 msgid "Failed to register folder update hook"
 msgstr "Nepodarilo sa zaregistrovať aktualizačný hook pre priečinky"
 

-#: src/plugins/trayicon/trayicon.c:338
+#: src/plugins/trayicon/trayicon.c:373 src/plugins/trayicon/trayicon.c:379

 msgid "Failed to register offline switch hook"
 msgstr "Nepodarilo sa zaregistrovať hook pre offline režim"
 
 msgid "Failed to register offline switch hook"
 msgstr "Nepodarilo sa zaregistrovať hook pre offline režim"
 

-#: src/plugins/trayicon/trayicon.c:367 src/plugins/trayicon/trayicon.c:449
-msgid "Trayicon"
-msgstr "Trayicon"
-
-#: src/plugins/trayicon/trayicon.c:372
+#: src/plugins/trayicon/trayicon.c:415

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -7493,7 +7747,7 @@ msgstr ""
 "vykreslí list. Podržanie kurzoru myši nad ikonou ukáže počet nových a "
 "neprečítaných správ, ako aj celkový počet správ."
 
 "vykreslí list. Podržanie kurzoru myši nad ikonou ukáže počet nových a "
 "neprečítaných správ, ako aj celkový počet správ."
 

-#: src/plugins/trayicon/trayicon.c:426
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit this program?"
 msgstr "Ukončiť program?"
 
 msgid "Exit this program?"
 msgstr "Ukončiť program?"
 


@@ -7552,12 +7806,12 @@ msgstr "vyskytla sa chyba pri POP3 spojení\n"
 msgid "TOP command unsupported\n"
 msgstr "príkaz TOP nie je podporovaný\n"
 
 msgid "TOP command unsupported\n"
 msgstr "príkaz TOP nie je podporovaný\n"
 

-#: src/prefs_account.c:233 src/prefs_account.c:1454 src/prefs_account.c:2137
-#: src/wizard.c:1017
+#: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145
+#: src/wizard.c:1122

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:236 src/prefs_account.c:1580 src/prefs_account.c:2154
+#: src/prefs_account.c:236 src/prefs_account.c:1587 src/prefs_account.c:2162

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 


@@ -7565,7 +7819,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:238 src/wizard.c:1027
+#: src/prefs_account.c:238 src/wizard.c:1132

 msgid "Local mbox file"
 msgstr "Lokálna schránka mbox"
 
 msgid "Local mbox file"
 msgstr "Lokálna schránka mbox"
 


@@ -7573,166 +7827,166 @@ msgstr "Lokálna schránka mbox"
 msgid "None (SMTP only)"
 msgstr "Žiadne (len SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "Žiadne (len SMTP)"
 

-#: src/prefs_account.c:718
+#: src/prefs_account.c:725

 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "Konto%d"
 

-#: src/prefs_account.c:991
+#: src/prefs_account.c:998

 msgid "Preferences for new account"
 msgstr "Nastavenie nového konta"
 
 msgid "Preferences for new account"
 msgstr "Nastavenie nového konta"
 

-#: src/prefs_account.c:993
+#: src/prefs_account.c:1000

 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Nastavenie konta"
 
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - Nastavenie konta"
 

-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1035

 msgid "_Basic"
 msgstr "_Základné"
 
 msgid "_Basic"
 msgstr "_Základné"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1037

 msgid "_Receive"
 msgstr "_Prijať"
 
 msgid "_Receive"
 msgstr "_Prijať"
 

-#: src/prefs_account.c:1034
+#: src/prefs_account.c:1041

 msgid "Co_mpose"
 msgstr "_Nová správa"
 
 msgid "Co_mpose"
 msgstr "_Nová správa"
 

-#: src/prefs_account.c:1036
+#: src/prefs_account.c:1043

 msgid "_Privacy"
 msgstr "_Súkromie"
 
 msgid "_Privacy"
 msgstr "_Súkromie"
 

-#: src/prefs_account.c:1039
+#: src/prefs_account.c:1046

 msgid "SS_L"
 msgstr "SS_L"
 
 msgid "SS_L"
 msgstr "SS_L"
 

-#: src/prefs_account.c:1042
+#: src/prefs_account.c:1049

 msgid "A_dvanced"
 msgstr "_Rozšírené"
 
 msgid "A_dvanced"
 msgstr "_Rozšírené"
 

-#: src/prefs_account.c:1100
+#: src/prefs_account.c:1107

 msgid "Name of account"
 msgstr "Názov konta"
 
 msgid "Name of account"
 msgstr "Názov konta"
 

-#: src/prefs_account.c:1109
+#: src/prefs_account.c:1116

 msgid "Set as default"
 msgstr "Nastaviť ako východzie"
 
 msgid "Set as default"
 msgstr "Nastaviť ako východzie"
 

-#: src/prefs_account.c:1113
+#: src/prefs_account.c:1120

 msgid "Personal information"
 msgstr "Osobné informácie"
 
 msgid "Personal information"
 msgstr "Osobné informácie"
 

-#: src/prefs_account.c:1122
+#: src/prefs_account.c:1129

 msgid "Full name"
 msgstr "Celé meno"
 
 msgid "Full name"
 msgstr "Celé meno"
 

-#: src/prefs_account.c:1128
+#: src/prefs_account.c:1135

 msgid "Mail address"
 msgstr "E-mailová adresa"
 
 msgid "Mail address"
 msgstr "E-mailová adresa"
 

-#: src/prefs_account.c:1134
+#: src/prefs_account.c:1141

 msgid "Organization"
 msgstr "Organizácia"
 
 msgid "Organization"
 msgstr "Organizácia"
 

-#: src/prefs_account.c:1158
+#: src/prefs_account.c:1165

 msgid "Server information"
 msgstr "Informácie o serveri"
 
 msgid "Server information"
 msgstr "Informácie o serveri"
 

-#: src/prefs_account.c:1198 src/wizard.c:1106
+#: src/prefs_account.c:1205 src/wizard.c:1216

 msgid ""
 msgid ""

-"<span weight=\"bold\">Warning: this version of Sylpheed-Claws\n"
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"

 "has been built without IMAP support.</span>"
 msgstr ""
 "has been built without IMAP support.</span>"
 msgstr ""

-"<span weight=\"bold\">Varovanie: táto verzia Sylpheed-Claws\n"
+"<span weight=\"bold\">Varovanie: táto verzia Claws Mail\n"

 "bola skompilovaná bez podpory protokolu IMAP.</span>"
 
 "bola skompilovaná bez podpory protokolu IMAP.</span>"
 

-#: src/prefs_account.c:1227
+#: src/prefs_account.c:1234

 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizáciu"
 
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizáciu"
 

-#: src/prefs_account.c:1234
+#: src/prefs_account.c:1241

 msgid "Authenticate on connect"
 msgstr "Autentizovať pri pripojení"
 
 msgid "Authenticate on connect"
 msgstr "Autentizovať pri pripojení"
 

-#: src/prefs_account.c:1279
+#: src/prefs_account.c:1286

 msgid "News server"
 msgstr "News server"
 
 msgid "News server"
 msgstr "News server"
 

-#: src/prefs_account.c:1285
+#: src/prefs_account.c:1292

 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 

-#: src/prefs_account.c:1291
+#: src/prefs_account.c:1298

 msgid "Local mailbox"
 msgstr "Lokálna schránka"
 
 msgid "Local mailbox"
 msgstr "Lokálna schránka"
 

-#: src/prefs_account.c:1298
+#: src/prefs_account.c:1305

 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 

-#: src/prefs_account.c:1306
+#: src/prefs_account.c:1313

 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 

-#: src/prefs_account.c:1315
+#: src/prefs_account.c:1322

 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 
 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 

-#: src/prefs_account.c:1322 src/prefs_account.c:1771
+#: src/prefs_account.c:1329 src/prefs_account.c:1779

 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 

-#: src/prefs_account.c:1328 src/prefs_account.c:1780
+#: src/prefs_account.c:1335 src/prefs_account.c:1788

 msgid "Password"
 msgstr "Heslo"
 
 msgid "Password"
 msgstr "Heslo"
 

-#: src/prefs_account.c:1421
+#: src/prefs_account.c:1428

 msgid "Local"
 msgstr "Lokálne"
 
 msgid "Local"
 msgstr "Lokálne"
 

-#: src/prefs_account.c:1432 src/prefs_account.c:1527
+#: src/prefs_account.c:1439 src/prefs_account.c:1534

 msgid "Default inbox"
 msgstr "Východzí inbox"
 
 msgid "Default inbox"
 msgstr "Východzí inbox"
 

-#: src/prefs_account.c:1439 src/prefs_account.c:1447 src/prefs_account.c:1534
-#: src/prefs_account.c:1542
+#: src/prefs_account.c:1446 src/prefs_account.c:1454 src/prefs_account.c:1541
+#: src/prefs_account.c:1549

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované správy budú umiestnené v tomto priečinku"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Nefiltrované správy budú umiestnené v tomto priečinku"
 

-#: src/prefs_account.c:1444 src/prefs_account.c:1539 src/prefs_account.c:1941
+#: src/prefs_account.c:1451 src/prefs_account.c:1546 src/prefs_account.c:1949

 msgid "Bro_wse"
 msgstr "P_rehliadať"
 
 msgid "Bro_wse"
 msgstr "P_rehliadať"
 

-#: src/prefs_account.c:1462
+#: src/prefs_account.c:1469

 msgid "Use secure authentication (APOP)"
 msgstr "Použiť bezpečnú autentizáciu (APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Použiť bezpečnú autentizáciu (APOP)"
 

-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1472

 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na serveri po ich prijatí"
 
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na serveri po ich prijatí"
 

-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1483

 msgid "Remove after"
 msgstr "Vymazať po"
 
 msgid "Remove after"
 msgstr "Vymazať po"
 

-#: src/prefs_account.c:1485
+#: src/prefs_account.c:1492

 msgid "0 days: remove immediately"
 msgstr "0 dní: zmazať ihneď"
 
 msgid "0 days: remove immediately"
 msgstr "0 dní: zmazať ihneď"
 

-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1496

 msgid "days"
 msgstr "dňoch"
 
 msgid "days"
 msgstr "dňoch"
 

-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1503

 msgid "Download all messages on server"
 msgstr "Prijať všetky správy na serveri"
 
 msgid "Download all messages on server"
 msgstr "Prijať všetky správy na serveri"
 

-#: src/prefs_account.c:1502
+#: src/prefs_account.c:1509

 msgid "Receive size limit"
 msgstr "Prijať správu veľkú najviac"
 
 msgid "Receive size limit"
 msgstr "Prijať správu veľkú najviac"
 

-#: src/prefs_account.c:1505
+#: src/prefs_account.c:1512

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -7740,68 +7994,68 @@ msgstr ""
 "Správy väčšie ako táto hodnota budú stiahnuté čiastočne. Po ich zvolení ich "
 "bude možné buď stiahnuť úplne, alebo ich odstrániť."
 
 "Správy väčšie ako táto hodnota budú stiahnuté čiastočne. Po ich zvolení ich "
 "bude možné buď stiahnuť úplne, alebo ich odstrániť."
 

-#: src/prefs_account.c:1515
+#: src/prefs_account.c:1522

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1549 src/prefs_account.c:2171
+#: src/prefs_account.c:1556 src/prefs_account.c:2179

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1561
+#: src/prefs_account.c:1568

 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 
 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 

-#: src/prefs_account.c:1573
+#: src/prefs_account.c:1580

 msgid "unlimited if 0 is specified"
 msgstr "0 pre neobmedzený počet"
 
 msgid "unlimited if 0 is specified"
 msgstr "0 pre neobmedzený počet"
 

-#: src/prefs_account.c:1591 src/prefs_account.c:1741
+#: src/prefs_account.c:1598 src/prefs_account.c:1749

 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 

-#: src/prefs_account.c:1601 src/prefs_account.c:1751 src/prefs_send.c:273
+#: src/prefs_account.c:1608 src/prefs_account.c:1759 src/prefs_send.c:273

 msgid "Automatic"
 msgstr "Automatické"
 
 msgid "Automatic"
 msgstr "Automatické"
 

-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1620

 msgid "IMAP server directory"
 msgstr "Priečinok serveru IMAP"
 
 msgid "IMAP server directory"
 msgstr "Priečinok serveru IMAP"
 

-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1624

 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 
 msgid "(usually empty)"
 msgstr "(zväčša prázdne)"
 

-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1634

 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 

-#: src/prefs_account.c:1630
+#: src/prefs_account.c:1638

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "Pri voľbe 'Prijať poštu' prijať správy aj pre toto konto"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "Pri voľbe 'Prijať poštu' prijať správy aj pre toto konto"
 

-#: src/prefs_account.c:1692 src/prefs_customheader.c:205
+#: src/prefs_account.c:1700 src/prefs_customheader.c:205

 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Hlavička"
 
 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Hlavička"
 

-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1707

 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 
 msgid "Generate Message-ID"
 msgstr "Generovať hlavičku Message-ID"
 

-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1714

 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 

-#: src/prefs_account.c:1718
+#: src/prefs_account.c:1726

 msgid "Authentication"
 msgstr "Autentizácia"
 
 msgid "Authentication"
 msgstr "Autentizácia"
 

-#: src/prefs_account.c:1726
+#: src/prefs_account.c:1734

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentizácia (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentizácia (SMTP AUTH)"
 

-#: src/prefs_account.c:1802
+#: src/prefs_account.c:1810

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."


@@ -7809,212 +8063,216 @@ msgstr ""
 "Ak necháte tieto polia prázdne, bude použité to isté prihlasovacie meno a "
 "heslo ako pri prijímaní."
 
 "Ak necháte tieto polia prázdne, bude použité to isté prihlasovacie meno a "
 "heslo ako pri prijímaní."
 

-#: src/prefs_account.c:1813
+#: src/prefs_account.c:1821

 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizovať cez POP3 pred odosielaním"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizovať cez POP3 pred odosielaním"
 

-#: src/prefs_account.c:1828
+#: src/prefs_account.c:1836

 msgid "POP authentication timeout: "
 msgstr "Časový limit pre POP autentizáciu: "
 
 msgid "POP authentication timeout: "
 msgstr "Časový limit pre POP autentizáciu: "
 

-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1845

 msgid "minutes"
 msgstr "minút"
 
 msgid "minutes"
 msgstr "minút"
 

-#: src/prefs_account.c:1882 src/prefs_account.c:1933
+#: src/prefs_account.c:1890 src/prefs_account.c:1941

 msgid "Signature"
 msgstr "Podpis"
 
 msgid "Signature"
 msgstr "Podpis"
 

-#: src/prefs_account.c:1890
+#: src/prefs_account.c:1898

 msgid "Insert signature automatically"
 msgstr "Vložiť podpis automaticky"
 
 msgid "Insert signature automatically"
 msgstr "Vložiť podpis automaticky"
 

-#: src/prefs_account.c:1895
+#: src/prefs_account.c:1903

 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 

-#: src/prefs_account.c:1920
+#: src/prefs_account.c:1928

 msgid "Command output"
 msgstr "Výstup príkazu"
 
 msgid "Command output"
 msgstr "Výstup príkazu"
 

-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1961

 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 

-#: src/prefs_account.c:1962 src/prefs_filtering_action.c:1083
+#: src/prefs_account.c:1970 src/prefs_filtering_action.c:1083

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Kópia"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Kópia"
 

-#: src/prefs_account.c:1975 src/prefs_template.c:189
+#: src/prefs_account.c:1983 src/prefs_template.c:189

 msgid "Bcc"
 msgstr "Slepá kópia"
 
 msgid "Bcc"
 msgstr "Slepá kópia"
 

-#: src/prefs_account.c:1988
+#: src/prefs_account.c:1996

 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 

-#: src/prefs_account.c:2040
+#: src/prefs_account.c:2048

 msgid "Default privacy system"
 msgstr "Východzí systém súkromia"
 
 msgid "Default privacy system"
 msgstr "Východzí systém súkromia"
 

-#: src/prefs_account.c:2049
+#: src/prefs_account.c:2057

 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 
 msgid "Always sign messages"
 msgstr "Vždy podpisovať správy"
 

-#: src/prefs_account.c:2051
+#: src/prefs_account.c:2059

 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 
 msgid "Always encrypt messages"
 msgstr "Vždy šifrovať správy"
 

-#: src/prefs_account.c:2053
+#: src/prefs_account.c:2061

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Vždy šifrovať odpoveď na šifrovanú správu"
 

-#: src/prefs_account.c:2056
+#: src/prefs_account.c:2064

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Zašifrovať odoslané správy aj s vlastným kľúčom"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Zašifrovať odoslané správy aj s vlastným kľúčom"
 

-#: src/prefs_account.c:2058
+#: src/prefs_account.c:2066

 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť zašifrované správy na disk v rozšifrovanom stave"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Uložiť zašifrované správy na disk v rozšifrovanom stave"
 

-#: src/prefs_account.c:2145 src/prefs_account.c:2162 src/prefs_account.c:2178
+#: src/prefs_account.c:2153 src/prefs_account.c:2170 src/prefs_account.c:2186

 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 
 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 

-#: src/prefs_account.c:2148
+#: src/prefs_account.c:2156

 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre POP3 spojenie"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre POP3 spojenie"
 

-#: src/prefs_account.c:2151 src/prefs_account.c:2168 src/prefs_account.c:2203
+#: src/prefs_account.c:2159 src/prefs_account.c:2176 src/prefs_account.c:2211

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
 

-#: src/prefs_account.c:2165
+#: src/prefs_account.c:2173

 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 

-#: src/prefs_account.c:2187
+#: src/prefs_account.c:2195

 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 

-#: src/prefs_account.c:2189
+#: src/prefs_account.c:2197

 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2205

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať SSL (v prípade potreby použiť STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať SSL (v prípade potreby použiť STARTTLS)"
 

-#: src/prefs_account.c:2200
+#: src/prefs_account.c:2208

 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 

-#: src/prefs_account.c:2211
+#: src/prefs_account.c:2219

 msgid "Use non-blocking SSL"
 msgstr "Používať non-blocking SSL"
 
 msgid "Use non-blocking SSL"
 msgstr "Používať non-blocking SSL"
 

-#: src/prefs_account.c:2223
+#: src/prefs_account.c:2231

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Vypnite túto voľbu ak máte problémy pri SSL spojeniach"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Vypnite túto voľbu ak máte problémy pri SSL spojeniach"
 

-#: src/prefs_account.c:2349
+#: src/prefs_account.c:2357

 msgid "SMTP port"
 msgstr "SMTP port"
 
 msgid "SMTP port"
 msgstr "SMTP port"
 

-#: src/prefs_account.c:2355
+#: src/prefs_account.c:2363

 msgid "POP3 port"
 msgstr "POP3 port"
 
 msgid "POP3 port"
 msgstr "POP3 port"
 

-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2369

 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 
 msgid "IMAP4 port"
 msgstr "IMAP4 port"
 

-#: src/prefs_account.c:2367
+#: src/prefs_account.c:2375

 msgid "NNTP port"
 msgstr "NNTP port"
 
 msgid "NNTP port"
 msgstr "NNTP port"
 

-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2380

 msgid "Domain name"
 msgstr "Názov domény"
 
 msgid "Domain name"
 msgstr "Názov domény"
 

-#: src/prefs_account.c:2382
+#: src/prefs_account.c:2390

 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz pre komunikáciu so serverom"
 
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz pre komunikáciu so serverom"
 

-#: src/prefs_account.c:2390
+#: src/prefs_account.c:2398

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Označiť cross-postované správy ako prečítané a zafarbiť:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Označiť cross-postované správy ako prečítané a zafarbiť:"
 

-#: src/prefs_account.c:2437
+#: src/prefs_account.c:2445

 msgid "Browse"
 msgstr "Prehliadať"
 
 msgid "Browse"
 msgstr "Prehliadať"
 

-#: src/prefs_account.c:2450
+#: src/prefs_account.c:2458

 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 

-#: src/prefs_account.c:2452
+#: src/prefs_account.c:2460

 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 
 msgid "Put queued messages in"
 msgstr "Uložiť správy do fronty"
 

-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2462

 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 

-#: src/prefs_account.c:2456
+#: src/prefs_account.c:2464

 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 

-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2507

 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov konta."
 
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov konta."
 

-#: src/prefs_account.c:2503
+#: src/prefs_account.c:2511

 msgid "Mail address is not entered."
 msgstr "Nebola zadaná e-mailová adresa."
 
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná e-mailová adresa."
 

-#: src/prefs_account.c:2510
+#: src/prefs_account.c:2518

 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 
 msgid "SMTP server is not entered."
 msgstr "Nebol zadaný SMTP server."
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2523

 msgid "User ID is not entered."
 msgstr "Nebol zadaný user ID."
 
 msgid "User ID is not entered."
 msgstr "Nebol zadaný user ID."
 

-#: src/prefs_account.c:2520
+#: src/prefs_account.c:2528

 msgid "POP3 server is not entered."
 msgstr "Nebol zadaný POP3 server."
 
 msgid "POP3 server is not entered."
 msgstr "Nebol zadaný POP3 server."
 

-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2535
+msgid "The default inbox folder doesn't exist."
+msgstr "Implicitný priečinok príchodzích správ neexistuje."
+
+#: src/prefs_account.c:2541

 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadaný IMAP4 server."
 
 msgid "IMAP4 server is not entered."
 msgstr "Nebol zadaný IMAP4 server."
 

-#: src/prefs_account.c:2530
+#: src/prefs_account.c:2546

 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 
 msgid "NNTP server is not entered."
 msgstr "Nebol zadaný NNTP server."
 

-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2552

 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 
 msgid "local mailbox filename is not entered."
 msgstr "Nebol zadaný názov lokálnej schránky."
 

-#: src/prefs_account.c:2542
+#: src/prefs_account.c:2558

 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 
 msgid "mail command is not entered."
 msgstr "Nebol zadaný príkaz na odosielanie pošty."
 

-#: src/prefs_account.c:2607
+#: src/prefs_account.c:2623

 msgid "Select signature file"
 msgstr "Vyberte súbor so signatúrou"
 
 msgid "Select signature file"
 msgstr "Vyberte súbor so signatúrou"
 

-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2716

 msgid "Protocol:"
 msgstr "Protokol:"
 
 msgid "Protocol:"
 msgstr "Protokol:"
 

-#: src/prefs_account.c:2849
+#: src/prefs_account.c:2869

 #, c-format
 #, c-format

-msgid "Unsupported (%s)"
-msgstr "Nepodporované (%s)"
+msgid "%s (plugin not loaded)"
+msgstr "%s (plugin nie je načítaný)"

 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"
 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"


@@ -8029,7 +8287,7 @@ msgid "Command line"
 msgstr "Príkazový riadok"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
 msgstr "Príkazový riadok"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493

-#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:260
+#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:270

 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Nahradiť"
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Nahradiť"


@@ -8042,7 +8300,7 @@ msgstr "Info..."
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811

-#: src/prefs_template.c:357
+#: src/prefs_template.c:367

 msgid "(New)"
 msgstr "(Nová)"
 
 msgid "(New)"
 msgstr "(Nová)"
 


@@ -8091,19 +8349,19 @@ msgstr "Naozaj chcete zmazať túto akciu?"
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822

-#: src/prefs_template.c:416 src/prefs_template.c:433
+#: src/prefs_template.c:426 src/prefs_template.c:443

 msgid "Entry not saved"
 msgstr "Pravidlo nebolo uložené"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
 msgid "Entry not saved"
 msgstr "Pravidlo nebolo uložené"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254

-#: src/prefs_filtering.c:1276 src/prefs_template.c:417
-#: src/prefs_template.c:434
+#: src/prefs_filtering.c:1276 src/prefs_template.c:427
+#: src/prefs_template.c:444

 msgid "The entry was not saved. Close anyway?"
 msgstr "Pravidlo nebolo uložené. Zavrieť napriek tomu?"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
 msgid "The entry was not saved. Close anyway?"
 msgstr "Pravidlo nebolo uložené. Zavrieť napriek tomu?"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824

-#: src/prefs_template.c:418 src/prefs_template.c:435
+#: src/prefs_template.c:428 src/prefs_template.c:445

 msgid "+_Continue editing"
 msgstr "+_Pokračovať v úprave"
 
 msgid "+_Continue editing"
 msgstr "+_Pokračovať v úprave"
 


@@ -8201,11 +8459,15 @@ msgstr ""
 msgid "Current actions"
 msgstr "Aktuálne akcie"
 
 msgid "Current actions"
 msgstr "Aktuálne akcie"
 

-#: src/prefs_common.c:262
+#: src/prefs_common.c:210
+msgid "Hello,\\n"
+msgstr "Dobrý deň,\\n"
+
+#: src/prefs_common.c:272

 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Dňa %d\\n%f napísal:\\n\\n%q"
 
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Dňa %d\\n%f napísal:\\n\\n%q"
 

-#: src/prefs_common.c:268
+#: src/prefs_common.c:278

 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"
 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"


@@ -8214,85 +8476,97 @@ msgstr ""
 "{Komu: %t\\n}?c{Cc: %c\\n}?n{Diskusné skupiny: %n\\n}?s{Predmet: %s\\n}\\n\\n"
 "%M"
 
 "{Komu: %t\\n}?c{Cc: %c\\n}?n{Diskusné skupiny: %n\\n}?s{Predmet: %s\\n}\\n\\n"
 "%M"
 

-#: src/prefs_common.c:353
+#: src/prefs_common.c:363

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 

-#: src/prefs_compose_writing.c:106
+#: src/prefs_compose_writing.c:124

 msgid "Automatic account selection"
 msgstr "Automatická voľba konta"
 
 msgid "Automatic account selection"
 msgstr "Automatická voľba konta"
 

-#: src/prefs_compose_writing.c:114
+#: src/prefs_compose_writing.c:132

 msgid "when replying"
 msgstr "pri odpovedaní"
 
 msgid "when replying"
 msgstr "pri odpovedaní"
 

-#: src/prefs_compose_writing.c:116
+#: src/prefs_compose_writing.c:134

 msgid "when forwarding"
 msgstr "pri preposielaní"
 
 msgid "when forwarding"
 msgstr "pri preposielaní"
 

-#: src/prefs_compose_writing.c:118
+#: src/prefs_compose_writing.c:136

 msgid "when re-editing"
 msgstr "pri opätovnej úprave"
 
 msgid "when re-editing"
 msgstr "pri opätovnej úprave"
 

-#: src/prefs_compose_writing.c:120
+#: src/prefs_compose_writing.c:138

 msgid "Forwarding"
 msgstr "Preposielanie"
 
 msgid "Forwarding"
 msgstr "Preposielanie"
 

-#: src/prefs_compose_writing.c:128 src/prefs_filtering_action.c:160
+#: src/prefs_compose_writing.c:146 src/prefs_filtering_action.c:160

 msgid "Forward as attachment"
 msgstr "Poslať ďalej ako prílohu"
 
 msgid "Forward as attachment"
 msgstr "Poslať ďalej ako prílohu"
 

-#: src/prefs_compose_writing.c:131
+#: src/prefs_compose_writing.c:149

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Zachovať pôvodnú hlavičku Od pri presmerovaní"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Zachovať pôvodnú hlavičku Od pri presmerovaní"
 

-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:151

 msgid "Editing"
 msgstr "Písanie"
 
 msgid "Editing"
 msgstr "Písanie"
 

-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:159

 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustiť externý editor"
 
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustiť externý editor"
 

-#: src/prefs_compose_writing.c:148
+#: src/prefs_compose_writing.c:166

 msgid "Autosave message text to Drafts folder every"
 msgstr "Automaticky ukladať text správy medzi koncepty po každých "
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Automaticky ukladať text správy medzi koncepty po každých "
 

-#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:176 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "znakoch"
 
 msgid "characters"
 msgstr "znakoch"
 

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:184

 msgid "Undo level"
 msgstr "Počet spätných krokov (undo)"
 
 msgid "Undo level"
 msgstr "Počet spätných krokov (undo)"
 

-#: src/prefs_compose_writing.c:179
+#: src/prefs_compose_writing.c:197

 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
 

-#: src/prefs_compose_writing.c:182
+#: src/prefs_compose_writing.c:200

 msgid "When dropping files into the Compose window"
 msgstr "Pri presune súborov do okna s novou správou"
 
 msgid "When dropping files into the Compose window"
 msgstr "Pri presune súborov do okna s novou správou"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:208

 msgid "Ask"
 msgstr "Spýtať sa"
 
 msgid "Ask"
 msgstr "Spýtať sa"
 

-#: src/prefs_compose_writing.c:191 src/toolbar.c:446
+#: src/prefs_compose_writing.c:209 src/toolbar.c:456

 msgid "Insert"
 msgstr "Vložiť"
 
 msgid "Insert"
 msgstr "Vložiť"
 

-#: src/prefs_compose_writing.c:192 src/toolbar.c:447
+#: src/prefs_compose_writing.c:210 src/toolbar.c:457

 msgid "Attach"
 msgstr "Pripojiť"
 
 msgid "Attach"
 msgstr "Pripojiť"
 

-#: src/prefs_compose_writing.c:297 src/prefs_folder_item.c:1118
-#: src/prefs_quote.c:285 src/prefs_spelling.c:401 src/prefs_wrapping.c:144
-#: src/toolbar.c:1511
+#: src/prefs_compose_writing.c:226
+msgid "Use format when composing new messages"
+msgstr "Použiť pri komponovaní nových správ tvar"
+
+#: src/prefs_compose_writing.c:228
+msgid "New message format"
+msgstr "Tvar novej správy"
+
+#: src/prefs_compose_writing.c:282 src/prefs_quote.c:206
+msgid " Description of symbols... "
+msgstr " Popis znakov... "
+
+#: src/prefs_compose_writing.c:402 src/prefs_folder_item.c:1170
+#: src/prefs_quote.c:311 src/prefs_spelling.c:448 src/prefs_wrapping.c:144
+#: src/toolbar.c:1560

 msgid "Compose"
 msgstr "Nová správa"
 
 msgid "Compose"
 msgstr "Nová správa"
 

-#: src/prefs_compose_writing.c:298
+#: src/prefs_compose_writing.c:403

 msgid "Writing"
 msgstr "Písanie"
 
 msgid "Writing"
 msgstr "Písanie"
 


@@ -8438,7 +8712,7 @@ msgid "Copy"
 msgstr "Kopírovať"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
 msgstr "Kopírovať"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79

-#: src/summaryview.c:2365
+#: src/summaryview.c:2366

 msgid "Mark"
 msgstr "Označiť"
 
 msgid "Mark"
 msgstr "Označiť"
 


@@ -8458,7 +8732,7 @@ msgstr "Označiť ako prečítané"
 msgid "Mark as unread"
 msgstr "Označiť ako neprečítané"
 
 msgid "Mark as unread"
 msgstr "Označiť ako neprečítané"
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:398 src/toolbar.c:489
+#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499

 msgid "Forward"
 msgstr "Poslať ďalej"
 
 msgid "Forward"
 msgstr "Poslať ďalej"
 


@@ -8467,7 +8741,7 @@ msgid "Redirect"
 msgstr "Presmerovať"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
 msgstr "Presmerovať"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429

-#: src/toolbar.c:174 src/toolbar.c:1651
+#: src/toolbar.c:178 src/toolbar.c:1711

 msgid "Execute"
 msgstr "Vykonať"
 
 msgid "Execute"
 msgstr "Vykonať"
 


@@ -8487,7 +8761,7 @@ msgstr "Nastaviť ohodnotenie"
 msgid "Hide"
 msgstr "Skryť"
 
 msgid "Hide"
 msgstr "Skryť"
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:177
+#: src/prefs_filtering_action.c:167 src/toolbar.c:181

 msgid "Ignore thread"
 msgstr "Ignorovať vlákno"
 
 msgid "Ignore thread"
 msgstr "Ignorovať vlákno"
 


@@ -8605,6 +8879,11 @@ msgstr "Zoznam aktuálnych akcií"
 msgid "Filtering/Processing configuration"
 msgstr "Nastavenie filtrovania"
 
 msgid "Filtering/Processing configuration"
 msgstr "Nastavenie filtrovania"
 

+#: src/prefs_filtering.c:250 src/prefs_filtering.c:781
+#: src/prefs_filtering.c:872
+msgid "Filtering Account Menu|All"
+msgstr "Všetky"
+

 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Podmienka"
 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Podmienka"


@@ -8662,7 +8941,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Skryté položky"
 
 msgid "Hidden columns"
 msgstr "Skryté položky"
 

-#: src/prefs_folder_column.c:280 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:797
+#: src/prefs_summaries.c:943 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Zobrazené položky"
 
 msgid "Displayed columns"
 msgstr "Zobrazené položky"
 


@@ -8671,7 +8951,7 @@ msgstr "Zobrazené položky"
 msgid " Use default "
 msgstr " Použiť východzie "
 
 msgid " Use default "
 msgstr " Použiť východzie "
 

-#: src/prefs_folder_item.c:199 src/prefs_folder_item.c:640
+#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:646

 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 "
 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 "


@@ -8681,7 +8961,7 @@ msgstr ""
 "Môžete pomocou nich ale zmeniť nastavenie všetkých podpriečinkov pomocou "
 "voľby \"Platí aj pre podpriečinky\".</i>"
 
 "Môžete pomocou nich ale zmeniť nastavenie všetkých podpriečinkov pomocou "
 "voľby \"Platí aj pre podpriečinky\".</i>"
 

-#: src/prefs_folder_item.c:211 src/prefs_folder_item.c:652
+#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:658

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -8689,82 +8969,86 @@ msgstr ""
 "Platí aj pre\n"
 "podpriečinky"
 
 "Platí aj pre\n"
 "podpriečinky"
 

-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:238

 msgid "Normal"
 msgstr "Bežný"
 
 msgid "Normal"
 msgstr "Bežný"
 

-#: src/prefs_folder_item.c:237
+#: src/prefs_folder_item.c:240

 msgid "Outbox"
 msgstr "Odoslaná pošta"
 
 msgid "Outbox"
 msgstr "Odoslaná pošta"
 

-#: src/prefs_folder_item.c:254
+#: src/prefs_folder_item.c:257

 msgid "Folder type"
 msgstr "Typ priečinku"
 
 msgid "Folder type"
 msgstr "Typ priečinku"
 

-#: src/prefs_folder_item.c:266
+#: src/prefs_folder_item.c:269

 msgid "Simplify Subject RegExp"
 msgstr "Zjednodušiť regulérny výraz názvu správy"
 
 msgid "Simplify Subject RegExp"
 msgstr "Zjednodušiť regulérny výraz názvu správy"
 

-#: src/prefs_folder_item.c:292
+#: src/prefs_folder_item.c:295

 msgid "Test RegExp"
 msgstr "Test regulérneho výrazu"
 
 msgid "Test RegExp"
 msgstr "Test regulérneho výrazu"
 

-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:327

 msgid "Folder chmod"
 msgstr "Chmod priečinku"
 
 msgid "Folder chmod"
 msgstr "Chmod priečinku"
 

-#: src/prefs_folder_item.c:350
+#: src/prefs_folder_item.c:353

 msgid "Folder color"
 msgstr "Farba priečinku"
 
 msgid "Folder color"
 msgstr "Farba priečinku"
 

-#: src/prefs_folder_item.c:364 src/prefs_folder_item.c:995
+#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1045

 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Vyberte farbu pre priečinok"
 
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Vyberte farbu pre priečinok"
 

-#: src/prefs_folder_item.c:381
+#: src/prefs_folder_item.c:384

 msgid "Process at startup"
 msgstr "Spracovať pri štarte"
 
 msgid "Process at startup"
 msgstr "Spracovať pri štarte"
 

-#: src/prefs_folder_item.c:395
+#: src/prefs_folder_item.c:398

 msgid "Scan for new mail"
 msgstr "Zistiť novú poštu"
 
 msgid "Scan for new mail"
 msgstr "Zistiť novú poštu"
 

-#: src/prefs_folder_item.c:408
+#: src/prefs_folder_item.c:411

 msgid "Synchronise for offline use"
 msgstr "Synchronizovať pre použitie offline"
 
 msgid "Synchronise for offline use"
 msgstr "Synchronizovať pre použitie offline"
 

-#: src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:667

 msgid "Request Return Receipt"
 msgstr "Vyžiadať potvrdenie o príjme"
 
 msgid "Request Return Receipt"
 msgstr "Vyžiadať potvrdenie o príjme"
 

-#: src/prefs_folder_item.c:676
+#: src/prefs_folder_item.c:682

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Uložiť kópiu odchodzích správ do tohoto priečinku miesto do priečinku "
 "Odoslané"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 "Uložiť kópiu odchodzích správ do tohoto priečinku miesto do priečinku "
 "Odoslané"
 

-#: src/prefs_folder_item.c:689
+#: src/prefs_folder_item.c:695

 msgid "Default To: "
 msgstr "Implicitné Komu: "
 
 msgid "Default To: "
 msgstr "Implicitné Komu: "
 

-#: src/prefs_folder_item.c:710
+#: src/prefs_folder_item.c:716

 msgid "Default To for replies: "
 msgstr "Implicitné Komu pre odpovede: "
 
 msgid "Default To for replies: "
 msgstr "Implicitné Komu pre odpovede: "
 

-#: src/prefs_folder_item.c:731
+#: src/prefs_folder_item.c:737

 msgid "Default account: "
 msgstr "Východzie konto: "
 
 msgid "Default account: "
 msgstr "Východzie konto: "
 

-#: src/prefs_folder_item.c:782
+#: src/prefs_folder_item.c:788

 msgid "Default dictionary: "
 msgstr "Východzí slovník: "
 
 msgid "Default dictionary: "
 msgstr "Východzí slovník: "
 

-#: src/prefs_folder_item.c:1101
+#: src/prefs_folder_item.c:821
+msgid "Default alternate dictionary: "
+msgstr "Prednastavený alternatívny slovník: "
+
+#: src/prefs_folder_item.c:1153

 msgid "General"
 msgstr "Všeobecné"
 
 msgid "General"
 msgstr "Všeobecné"
 

-#: src/prefs_folder_item.c:1146
+#: src/prefs_folder_item.c:1198

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Vlastnosti priečinku %s"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Vlastnosti priečinku %s"


@@ -8785,7 +9069,7 @@ msgstr "Použiť odlišné písmo pre tlač"
 msgid "Message Printing"
 msgstr "Tlač správy"
 
 msgid "Message Printing"
 msgstr "Tlač správy"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1078

 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Zobrazenie"
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Zobrazenie"


@@ -9186,7 +9470,7 @@ msgstr "Vyberte farbu pre podpisy"
 msgid "Signatures"
 msgstr "Podpisy"
 
 msgid "Signatures"
 msgstr "Podpisy"
 

-#: src/prefs_msg_colors.c:376
+#: src/prefs_msg_colors.c:376 src/prefs_summaries.c:761

 msgid "Folder list"
 msgstr "Zoznam správ"
 
 msgid "Folder list"
 msgstr "Zoznam správ"
 


@@ -9218,7 +9502,7 @@ msgstr "Farebné označenia"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format

-msgid "Pick color for 'color %d'"
+msgid "Tooltip|Pick color for 'color %d'"

 msgstr "Vyberte farbu pre 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 msgstr "Vyberte farbu pre 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing


@@ -9232,8 +9516,8 @@ msgstr "Vyberte označenie pre 'color %d'"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format

-msgid "Pick color for 'color %d' "
-msgstr "Vyberte farbu pre 'color %d' "
+msgid "Dialog title|Pick color for 'color %d'"
+msgstr "Vyberte farbu pre 'color %d'"

 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "
 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "


@@ -9327,115 +9611,107 @@ msgstr "Časový limit spojení"
 msgid "Never send Return Receipts"
 msgstr "Neposielať potvrdenia o doručení"
 
 msgid "Never send Return Receipts"
 msgstr "Neposielať potvrdenia o doručení"
 

-#: src/prefs_quote.c:90
+#: src/prefs_quote.c:92

 msgid "Reply will quote by default"
 msgstr "Pri odpovedaní implicitne citovať"
 
 msgid "Reply will quote by default"
 msgstr "Pri odpovedaní implicitne citovať"
 

-#: src/prefs_quote.c:92
+#: src/prefs_quote.c:94

 msgid "Reply format"
 msgstr "Formát odpovede"
 
 msgid "Reply format"
 msgstr "Formát odpovede"
 

-#: src/prefs_quote.c:107 src/prefs_quote.c:149
+#: src/prefs_quote.c:109 src/prefs_quote.c:161

 msgid "Quotation mark"
 msgstr "Značka citácie"
 
 msgid "Quotation mark"
 msgstr "Značka citácie"
 

-#: src/prefs_quote.c:134
+#: src/prefs_quote.c:146

 msgid "Forward format"
 msgstr "Formát posielania ďalej"
 
 msgid "Forward format"
 msgstr "Formát posielania ďalej"
 

-#: src/prefs_quote.c:184
-msgid " Description of symbols... "
-msgstr " Popis znakov... "
-
-#: src/prefs_quote.c:193
+#: src/prefs_quote.c:215

 msgid "Quotation characters"
 msgstr "Znak citácie"
 
 msgid "Quotation characters"
 msgstr "Znak citácie"
 

-#: src/prefs_quote.c:208
+#: src/prefs_quote.c:230

 msgid "Treat these characters as quotation marks: "
 msgstr "Brať tieto znaky ako znaky citácie: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Brať tieto znaky ako znaky citácie: "
 

-#: src/prefs_quote.c:286
+#: src/prefs_quote.c:312

 msgid "Quoting"
 msgstr "Citácia"
 
 msgid "Quoting"
 msgstr "Citácia"
 

-#: src/prefs_receive.c:122
+#: src/prefs_receive.c:121

 msgid "External incorporation program"
 msgstr "Externý program pre príjem"
 
 msgid "External incorporation program"
 msgstr "Externý program pre príjem"
 

-#: src/prefs_receive.c:129
+#: src/prefs_receive.c:128

 msgid "Use external program for receiving mail"
 msgstr "Použiť externý program pre príjem pošty"
 
 msgid "Use external program for receiving mail"
 msgstr "Použiť externý program pre príjem pošty"
 

-#: src/prefs_receive.c:136
+#: src/prefs_receive.c:135

 msgid "Command"
 msgstr "Príkaz"
 
 msgid "Command"
 msgstr "Príkaz"
 

-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:144

 msgid "Automatic checking"
 msgstr "Automatická kontrola"
 
 msgid "Automatic checking"
 msgstr "Automatická kontrola"
 

-#: src/prefs_receive.c:156
-msgid "Automatically check for new mail"
-msgstr "Automaticky kontrolovať novú poštu"
-
-#: src/prefs_receive.c:158
-msgid "every"
-msgstr "každých"
+#: src/prefs_receive.c:155
+msgid "Automatically check for new mail every"
+msgstr "Automaticky kontrolovať novú poštu každých"

 
 

-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:173

 msgid "Check for new mail on startup"
 msgstr "Skontrolovať novú poštu pri spustení"
 
 msgid "Check for new mail on startup"
 msgstr "Skontrolovať novú poštu pri spustení"
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:176

 msgid "Dialogs"
 msgstr "Dialógy"
 
 msgid "Dialogs"
 msgstr "Dialógy"
 

-#: src/prefs_receive.c:188
+#: src/prefs_receive.c:182

 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 
 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 

-#: src/prefs_receive.c:196 src/prefs_send.c:169 src/prefs_summaries.c:958
+#: src/prefs_receive.c:190 src/prefs_send.c:169 src/prefs_summaries.c:855

 msgid "Always"
 msgstr "Vždy"
 
 msgid "Always"
 msgstr "Vždy"
 

-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:191

 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 
 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 

-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:205

 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 
 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 

-#: src/prefs_receive.c:214
+#: src/prefs_receive.c:208

 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:210

 msgid "After receiving new mail"
 msgstr "Po prijatí novej pošty"
 
 msgid "After receiving new mail"
 msgstr "Po prijatí novej pošty"
 

-#: src/prefs_receive.c:222
+#: src/prefs_receive.c:216

 msgid "Go to inbox"
 msgstr "Presunúť sa do priečinku príchodzej pošty"
 
 msgid "Go to inbox"
 msgstr "Presunúť sa do priečinku príchodzej pošty"
 

-#: src/prefs_receive.c:224
+#: src/prefs_receive.c:218

 msgid "Update all local folders"
 msgstr "Aktualizovať všetky miestne priečinky"
 
 msgid "Update all local folders"
 msgstr "Aktualizovať všetky miestne priečinky"
 

-#: src/prefs_receive.c:226
+#: src/prefs_receive.c:220

 msgid "Run command"
 msgstr "Spustiť príkaz"
 
 msgid "Run command"
 msgstr "Spustiť príkaz"
 

-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:229

 msgid "after automatic check"
 msgstr "po automatickej kontrole"
 
 msgid "after automatic check"
 msgstr "po automatickej kontrole"
 

-#: src/prefs_receive.c:237
+#: src/prefs_receive.c:231

 msgid "after manual check"
 msgstr "po ručnej kontrole"
 
 msgid "after manual check"
 msgstr "po ručnej kontrole"
 

-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:239

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -9444,11 +9720,11 @@ msgstr ""
 "Vykonať príkaz:\n"
 "(použite %d ako počet nových správ)"
 
 "Vykonať príkaz:\n"
 "(použite %d ako počet nových správ)"
 

-#: src/prefs_receive.c:371 src/prefs_send.c:337
+#: src/prefs_receive.c:365 src/prefs_send.c:337

 msgid "Mail Handling"
 msgstr "Správa pošty"
 
 msgid "Mail Handling"
 msgstr "Správa pošty"
 

-#: src/prefs_receive.c:372
+#: src/prefs_receive.c:366

 msgid "Receiving"
 msgstr "Príjem pošty"
 
 msgid "Receiving"
 msgstr "Príjem pošty"
 


@@ -9609,164 +9885,172 @@ msgstr ""
 msgid "Sending"
 msgstr "Odosielanie"
 
 msgid "Sending"
 msgstr "Odosielanie"
 

-#: src/prefs_spelling.c:105
+#: src/prefs_spelling.c:91

 msgid "Select dictionaries location"
 msgstr "Vyberte umiestnenie slovníkov"
 
 msgid "Select dictionaries location"
 msgstr "Vyberte umiestnenie slovníkov"
 

-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:126

 msgid "Pick color for misspelled word"
 msgstr "Vyberte farbu pre nesprávne slovo"
 
 msgid "Pick color for misspelled word"
 msgstr "Vyberte farbu pre nesprávne slovo"
 

-#: src/prefs_spelling.c:186
+#: src/prefs_spelling.c:183

 msgid "Enable spell checker"
 msgstr "Povoliť kontrolu pravopisu"
 
 msgid "Enable spell checker"
 msgstr "Povoliť kontrolu pravopisu"
 

-#: src/prefs_spelling.c:191
+#: src/prefs_spelling.c:188

 msgid "Enable alternate dictionary"
 msgstr "Povoliť alternatívny slovník"
 
 msgid "Enable alternate dictionary"
 msgstr "Povoliť alternatívny slovník"
 

-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194

 msgid "Faster switching with last used dictionary"
 msgstr "Rýchlejšie prepínanie s naposledy použitým slovníkom"
 
 msgid "Faster switching with last used dictionary"
 msgstr "Rýchlejšie prepínanie s naposledy použitým slovníkom"
 

-#: src/prefs_spelling.c:199
+#: src/prefs_spelling.c:196

 msgid "Path to dictionaries"
 msgstr "Cesta k slovníkom"
 
 msgid "Path to dictionaries"
 msgstr "Cesta k slovníkom"
 

-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:211

 msgid "Automatic spelling"
 msgstr "Automatická kontrola pravopisu"
 
 msgid "Automatic spelling"
 msgstr "Automatická kontrola pravopisu"
 

-#: src/prefs_spelling.c:226
+#: src/prefs_spelling.c:223

 msgid "Re-check message when changing dictionary"
 msgstr "Po zmene slovníka znovu skontrolovať správu"
 
 msgid "Re-check message when changing dictionary"
 msgstr "Po zmene slovníka znovu skontrolovať správu"
 

-#: src/prefs_spelling.c:230
+#: src/prefs_spelling.c:227

 msgid "Dictionary"
 msgstr "Slovník"
 
 msgid "Dictionary"
 msgstr "Slovník"
 

-#: src/prefs_spelling.c:243
+#: src/prefs_spelling.c:240

 msgid "Default dictionary"
 msgstr "Východzí slovník"
 
 msgid "Default dictionary"
 msgstr "Východzí slovník"
 

-#: src/prefs_spelling.c:261
+#: src/prefs_spelling.c:258
+msgid "Default alternate dictionary"
+msgstr "Prednastavený alternatívny slovník"
+
+#: src/prefs_spelling.c:277
+msgid "Check with both dictionaries"
+msgstr "Skontrolovať podľa oboch slovníkov"
+
+#: src/prefs_spelling.c:283

 msgid "Default suggestion mode"
 msgstr "Režim východzích doporučení"
 
 msgid "Default suggestion mode"
 msgstr "Režim východzích doporučení"
 

-#: src/prefs_spelling.c:283
+#: src/prefs_spelling.c:305

 msgid "Misspelled word color"
 msgstr "Farba nesprávneho slova"
 
 msgid "Misspelled word color"
 msgstr "Farba nesprávneho slova"
 

-#: src/prefs_spelling.c:297
+#: src/prefs_spelling.c:319

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Vyberte farbu pre nesprávne slovo. Pre podčiarknutie použite čiernu farbu"
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Vyberte farbu pre nesprávne slovo. Pre podčiarknutie použite čiernu farbu"
 

-#: src/prefs_spelling.c:402
+#: src/prefs_spelling.c:449

 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr "názov mesiaca"
 
 msgid "the full month name"
 msgstr "názov mesiaca"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
 
 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hodinového času"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hodinového času"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hodinového času"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hodinového času"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr "minúty"
 
 msgid "the minute as a decimal number"
 msgstr "minúty"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr "sekundy"
 
 msgid "the second as a decimal number"
 msgstr "sekundy"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr "rok"
 
 msgid "the year as a decimal number"
 msgstr "rok"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
+#: src/prefs_summaries.c:911

 msgid "Date format"
 msgstr "Formát dátumu"
 
 msgid "Date format"
 msgstr "Formát dátumu"
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr "Symbol"
 
 msgid "Specifier"
 msgstr "Symbol"
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr "Príklad"
 
 msgid "Example"
 msgstr "Príklad"
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Select key bindings"
 msgstr "Zvoliť rozloženie klávesových skratiek"
 
 msgid "Select key bindings"
 msgstr "Zvoliť rozloženie klávesových skratiek"
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr "Zvoľte sadu klávesových skratiek:"
 
 msgid "Select preset:"
 msgstr "Zvoľte sadu klávesových skratiek:"
 

-#: src/prefs_summaries.c:352 src/prefs_summaries.c:699
+#: src/prefs_summaries.c:353 src/prefs_summaries.c:700

 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:361

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."


@@ -9774,125 +10058,125 @@ msgstr ""
 "Môžete modifikovať skratky každého menu stlačením\n"
 "požadovanej skratky po ukázaní myšou na položku."
 
 "Môžete modifikovať skratky každého menu stlačením\n"
 "požadovanej skratky po ukázaní myšou na položku."
 

-#: src/prefs_summaries.c:767
-msgid "Translate header names"
-msgstr "Prekladať názvy hlavičiek"
-
-#: src/prefs_summaries.c:769
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr "Štandardné hlavičky (ako 'From:', 'Subject:') budú preložené do Vášho jazyka."
-
-#: src/prefs_summaries.c:773
+#: src/prefs_summaries.c:768

 msgid "Display unread number next to folder name"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 
 msgid "Display unread number next to folder name"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 

-#: src/prefs_summaries.c:780
+#: src/prefs_summaries.c:775

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 

-#: src/prefs_summaries.c:794
+#: src/prefs_summaries.c:789

 msgid "letters"
 msgstr "písmen"
 
 #: src/prefs_summaries.c:807
 msgid "letters"
 msgstr "písmen"
 
 #: src/prefs_summaries.c:807

-msgid "Display sender using address book"
-msgstr "Zobraziť odosielateľa za použitia adresáru"
-
-#: src/prefs_summaries.c:810
-msgid "Thread using subject in addition to standard headers"
-msgstr "Zaraďovať do vlákien dodatočne aj podľa názvu správy"
-
-#: src/prefs_summaries.c:833
-msgid "Date format help"
-msgstr "Pomôcka pre formát dátumu"
-
-#: src/prefs_summaries.c:837
-msgid "Set displayed columns"
-msgstr "Nastaviť zobrazované stĺpce"
-
-#: src/prefs_summaries.c:845
-msgid " Folder list... "
-msgstr " Zoznam priečinkov... "
-
-#: src/prefs_summaries.c:853
-msgid " Message list... "
-msgstr " Zoznam správ... "
-
-#: src/prefs_summaries.c:874
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
-
-#: src/prefs_summaries.c:876
-msgid "Messages will be marked until execution if this is turned off"
-msgstr "Správy budú označené až do vykonania,  ak je táto možnosť vypnutá"
-
-#: src/prefs_summaries.c:882
-msgid "Confirm before marking all mails in a folder as read"
-msgstr "Potvrdiť pred označením všetkých správ v priečinku ako prečítané."
-
-#: src/prefs_summaries.c:886
-msgid "Always open message when selected"
-msgstr "Otvoriť správu hneď pri zvolení v zozname"
-
-#: src/prefs_summaries.c:890
-msgid "Only mark message as read when opened in a new window"
-msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
+msgid "Message list"
+msgstr "Zoznam správ"

 
 

-#: src/prefs_summaries.c:903
+#: src/prefs_summaries.c:817

 msgid "When entering a folder"
 msgstr "Pri vstupe do priečinka"
 
 msgid "When entering a folder"
 msgstr "Pri vstupe do priečinka"
 

-#: src/prefs_summaries.c:919
+#: src/prefs_summaries.c:825

 msgid "Do nothing"
 msgstr "Nič nerobiť"
 
 msgid "Do nothing"
 msgstr "Nič nerobiť"
 

-#: src/prefs_summaries.c:920
+#: src/prefs_summaries.c:826

 msgid "Select first unread (or new or marked) message"
 msgstr "Zvoliť prvú neprečítanú (alebo novú, alebo označenú) správu"
 
 msgid "Select first unread (or new or marked) message"
 msgstr "Zvoliť prvú neprečítanú (alebo novú, alebo označenú) správu"
 

-#: src/prefs_summaries.c:922
+#: src/prefs_summaries.c:828

 msgid "Select first unread (or marked or new) message"
 msgstr "Zvoliť prvú neprečítanú (alebo označenú, alebo novú) správu"
 
 msgid "Select first unread (or marked or new) message"
 msgstr "Zvoliť prvú neprečítanú (alebo označenú, alebo novú) správu"
 

-#: src/prefs_summaries.c:924
+#: src/prefs_summaries.c:830

 msgid "Select first new (or unread or marked) message"
 msgstr "Zvoliť prvú novú (alebo neprečítanú, alebo označenú) správu"
 
 msgid "Select first new (or unread or marked) message"
 msgstr "Zvoliť prvú novú (alebo neprečítanú, alebo označenú) správu"
 

-#: src/prefs_summaries.c:926
+#: src/prefs_summaries.c:832

 msgid "Select first new (or marked or unread) message"
 msgstr "Zvoliť prvú novú (alebo označenú alebo neprečítanú) správu"
 
 msgid "Select first new (or marked or unread) message"
 msgstr "Zvoliť prvú novú (alebo označenú alebo neprečítanú) správu"
 

-#: src/prefs_summaries.c:928
+#: src/prefs_summaries.c:834

 msgid "Select first marked (or new or unread) message"
 msgstr "Zvoliť prvú označenú (alebo novú alebo neprečítanú) správu"
 
 msgid "Select first marked (or new or unread) message"
 msgstr "Zvoliť prvú označenú (alebo novú alebo neprečítanú) správu"
 

-#: src/prefs_summaries.c:930
+#: src/prefs_summaries.c:836

 msgid "Select first marked (or unread or new) message"
 msgstr "Zvoliť prvú označenú (alebo neprečítanú alebo novú) správu"
 
 msgid "Select first marked (or unread or new) message"
 msgstr "Zvoliť prvú označenú (alebo neprečítanú alebo novú) správu"
 

-#: src/prefs_summaries.c:942
+#: src/prefs_summaries.c:847

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Zobraziť dialóg \"žiadne neprečítané (alebo nové) správy\""
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Zobraziť dialóg \"žiadne neprečítané (alebo nové) správy\""
 

-#: src/prefs_summaries.c:959
+#: src/prefs_summaries.c:856

 msgid "Assume 'Yes'"
 msgstr "Predpokladať 'Áno'"
 
 msgid "Assume 'Yes'"
 msgstr "Predpokladať 'Áno'"
 

-#: src/prefs_summaries.c:961
+#: src/prefs_summaries.c:858

 msgid "Assume 'No'"
 msgstr "Predpokladať 'Nie'"
 
 msgid "Assume 'No'"
 msgstr "Predpokladať 'Nie'"
 

-#: src/prefs_summaries.c:970
+#: src/prefs_summaries.c:866
+msgid "Always open message when selected"
+msgstr "Otvoriť správu hneď pri zvolení v zozname"
+
+#: src/prefs_summaries.c:869
+msgid "Thread using subject in addition to standard headers"
+msgstr "Zaraďovať do vlákien dodatočne aj podľa názvu správy"
+
+#: src/prefs_summaries.c:875
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
+
+#: src/prefs_summaries.c:877
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr ""
+"Odloží presun, kopírovanie a mazanie správ do doby než zvolíte 'Nástroje/"
+"Vykonať'"
+
+#: src/prefs_summaries.c:882
+msgid "Only mark message as read when opened in a new window"
+msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
+
+#: src/prefs_summaries.c:889
+msgid "Mark messages as read after"
+msgstr "Označiť správy ako prečítané po"
+
+#: src/prefs_summaries.c:905
+msgid "Display sender using address book"
+msgstr "Zobraziť odosielateľa za použitia adresáru"
+
+#: src/prefs_summaries.c:937
+msgid "Date format help"
+msgstr "Pomôcka pre formát dátumu"
+
+#: src/prefs_summaries.c:955
+msgid "Confirm before marking all mails in a folder as read"
+msgstr "Potvrdiť pred označením všetkých správ v priečinku ako prečítané."
+
+#: src/prefs_summaries.c:958
+msgid "Translate header names"
+msgstr "Prekladať názvy hlavičiek"
+
+#: src/prefs_summaries.c:960
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr "Štandardné hlavičky (ako 'From:', 'Subject:') budú preložené do Vášho jazyka."
+
+#: src/prefs_summaries.c:967

 msgid " Set key bindings... "
 msgstr " Nastaviť klávesové skratky... "
 
 msgid " Set key bindings... "
 msgstr " Nastaviť klávesové skratky... "
 

-#: src/prefs_summaries.c:1077
+#: src/prefs_summaries.c:1079

 msgid "Summaries"
 msgstr "Súhrny"
 
 msgid "Summaries"
 msgstr "Súhrny"
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2359
+#: src/prefs_summary_column.c:81 src/summaryview.c:2360

 msgid "Attachment"
 msgstr "Príloha"
 
 msgid "Attachment"
 msgstr "Príloha"
 


@@ -9917,35 +10201,31 @@ msgstr ""
 msgid "This name is used as the Menu item"
 msgstr "Tento názov je použitý ako položka v menu"
 
 msgid "This name is used as the Menu item"
 msgstr "Tento názov je použitý ako položka v menu"
 

-#: src/prefs_template.c:276
+#: src/prefs_template.c:286

 msgid " Symbols... "
 msgstr " Symboly... "
 
 msgid " Symbols... "
 msgstr " Symboly... "
 

-#: src/prefs_template.c:305
+#: src/prefs_template.c:315

 msgid "Template configuration"
 msgstr "Nastavenie šablón"
 
 msgid "Template configuration"
 msgstr "Nastavenie šablón"
 

-#: src/prefs_template.c:526
-msgid "Template format error."
-msgstr "Chyba formátu šablóny."
-
-#: src/prefs_template.c:536
+#: src/prefs_template.c:557

 msgid "Template name is not set."
 msgstr "Nebol zadaný názov šablóny."
 
 msgid "Template name is not set."
 msgstr "Nebol zadaný názov šablóny."
 

-#: src/prefs_template.c:625
+#: src/prefs_template.c:667

 msgid "Delete template"
 msgstr "Zmazať šablónu"
 
 msgid "Delete template"
 msgstr "Zmazať šablónu"
 

-#: src/prefs_template.c:626
+#: src/prefs_template.c:668

 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 

-#: src/prefs_template.c:763
+#: src/prefs_template.c:805

 msgid "Current templates"
 msgstr "Aktuálne šablóny"
 
 msgid "Current templates"
 msgstr "Aktuálne šablóny"
 

-#: src/prefs_template.c:788
+#: src/prefs_template.c:830

 msgid "Template"
 msgstr "Šablóna"
 
 msgid "Template"
 msgstr "Šablóna"
 


@@ -10047,10 +10327,6 @@ msgstr ""
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d tém dostupných (%d používateľských, %d systémových, 1 interná)"
 
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d tém dostupných (%d používateľských, %d systémových, 1 interná)"
 

-#: src/prefs_themes.c:706
-msgid "The Sylpheed-Claws Team"
-msgstr "Team Sylpheed-Claws"
-

 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"


@@ -10126,8 +10402,8 @@ msgid "Message view toolbar configuration"
 msgstr "Nastavenie panelu nástrojov okna prezerania správy"
 
 #: src/prefs_toolbar.c:643
 msgstr "Nastavenie panelu nástrojov okna prezerania správy"
 
 #: src/prefs_toolbar.c:643

-msgid "Sylpheed-Claws Action"
-msgstr "Akcia Sylpheed-Claws"
+msgid "Claws Mail Action"
+msgstr "Akcia Claws Mail"

 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"
 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"


@@ -10197,10 +10473,6 @@ msgstr "Zalamovanie"
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 

-#: src/privacy.c:211 src/privacy.c:215 src/privacy.c:232 src/privacy.c:236
-msgid "No signature found"
-msgstr "Nebol nájdený žiadny podpis"
-

 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Nie sú dostupné žiadne informácie"
 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Nie sú dostupné žiadne informácie"


@@ -10213,29 +10485,29 @@ msgstr "Neboli definované žiadne kľúče príjemcov."
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba pri dekódovaní BASE64]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Chyba pri dekódovaní BASE64]\n"
 

-#: src/procmsg.c:908 src/procmsg.c:911
+#: src/procmsg.c:918 src/procmsg.c:921

 msgid "Already trying to send."
 msgstr "Pokus o doručenie už prebieha."
 
 msgid "Already trying to send."
 msgstr "Pokus o doručenie už prebieha."
 

-#: src/procmsg.c:1499
+#: src/procmsg.c:1515

 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Nepodarilo sa prečítať súbor %s."
 
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Nepodarilo sa prečítať súbor %s."
 

-#: src/procmsg.c:1593
+#: src/procmsg.c:1613

 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nepodarilo sa zašifrovať správu: %s"
 
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Nepodarilo sa zašifrovať správu: %s"
 

-#: src/procmsg.c:1626
+#: src/procmsg.c:1646

 msgid "Queued message header is broken."
 msgstr "Hlavička správy vo fronte je poškodená."
 
 msgid "Queued message header is broken."
 msgstr "Hlavička správy vo fronte je poškodená."
 

-#: src/procmsg.c:1647
+#: src/procmsg.c:1667

 msgid "An error happened during SMTP session."
 msgstr "Vyskytla sa chyba pri SMTP spojení."
 
 msgid "An error happened during SMTP session."
 msgstr "Vyskytla sa chyba pri SMTP spojení."
 

-#: src/procmsg.c:1661
+#: src/procmsg.c:1681

 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."


@@ -10243,28 +10515,28 @@ msgstr ""
 "Nebolo nájdené žiadne konto pre odoslanie, a pri SMTP spojení sa vyskytla "
 "chyba."
 
 "Nebolo nájdené žiadne konto pre odoslanie, a pri SMTP spojení sa vyskytla "
 "chyba."
 

-#: src/procmsg.c:1669
+#: src/procmsg.c:1689

 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "

-"generated by Sylpheed-Claws."
+"generated by Claws Mail."

 msgstr ""
 "Nepodarilo sa zistiť informácie pre odoslanie. Táto správa asi nebola "
 msgstr ""
 "Nepodarilo sa zistiť informácie pre odoslanie. Táto správa asi nebola "

-"vygenerovaná programom Sylpheed-Claws."
+"vygenerovaná programom Claws Mail."

 
 

-#: src/procmsg.c:1687
+#: src/procmsg.c:1707

 msgid "Couldn't create temporary file for news sending."
 msgstr "Nepodarilo sa vytvoriť dočasný súbor pre odosielanie news príspevkov."
 
 msgid "Couldn't create temporary file for news sending."
 msgstr "Nepodarilo sa vytvoriť dočasný súbor pre odosielanie news príspevkov."
 

-#: src/procmsg.c:1700
+#: src/procmsg.c:1720

 msgid "Error when writing temporary file for news sending."
 msgstr "Chyba pri zápise do dočasného súboru pre odosielanie news príspevkov."
 
 msgid "Error when writing temporary file for news sending."
 msgstr "Chyba pri zápise do dočasného súboru pre odosielanie news príspevkov."
 

-#: src/procmsg.c:1714
+#: src/procmsg.c:1734

 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 

-#: src/procmsg.c:2194
+#: src/procmsg.c:2214

 msgid "Filtering messages...\n"
 msgstr "Filtrujem správy...\n"
 
 msgid "Filtering messages...\n"
 msgstr "Filtrujem správy...\n"
 


@@ -10424,12 +10696,12 @@ msgstr "Popis symbolov"
 msgid "The following symbols can be used:"
 msgstr "Môžete použiť tieto symboly:"
 
 msgid "The following symbols can be used:"
 msgstr "Môžete použiť tieto symboly:"
 

-#: src/quote_fmt_parse.y:461
+#: src/quote_fmt_parse.y:464

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Zadajte text, ktorým chcete nahradiť '%s'"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Zadajte text, ktorým chcete nahradiť '%s'"
 

-#: src/quote_fmt_parse.y:462
+#: src/quote_fmt_parse.y:465

 msgid "Enter variable"
 msgstr "Zadajte premennú"
 
 msgid "Enter variable"
 msgstr "Zadajte premennú"
 


@@ -10552,47 +10824,47 @@ msgstr "%s - Zdroj"
 msgid "Saved SSL Certificates"
 msgstr "Uložené SSL certifikáty"
 
 msgid "Saved SSL Certificates"
 msgstr "Uložené SSL certifikáty"
 

-#: src/ssl_manager.c:386
+#: src/ssl_manager.c:428

 msgid "Delete certificate"
 msgstr "Vymazať certifikát"
 
 msgid "Delete certificate"
 msgstr "Vymazať certifikát"
 

-#: src/ssl_manager.c:387
+#: src/ssl_manager.c:429

 msgid "Do you really want to delete this certificate?"
 msgstr "Naozaj chcete vymazať tento certifikát?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Naozaj chcete vymazať tento certifikát?"
 

-#: src/summary_search.c:202
+#: src/summary_search.c:230

 msgid "Search messages"
 msgstr "Vyhľadať v správach"
 
 msgid "Search messages"
 msgstr "Vyhľadať v správach"
 

-#: src/summary_search.c:224
+#: src/summary_search.c:252

 msgid "Match any of the following"
 msgstr "Spĺňa aspoň jednu z nasledujúcich podmienok"
 
 msgid "Match any of the following"
 msgstr "Spĺňa aspoň jednu z nasledujúcich podmienok"
 

-#: src/summary_search.c:225
+#: src/summary_search.c:253

 msgid "Match all of the following"
 msgstr "Spĺňa všetky z nasledujúcich podmienok"
 
 msgid "Match all of the following"
 msgstr "Spĺňa všetky z nasledujúcich podmienok"
 

-#: src/summary_search.c:284
+#: src/summary_search.c:352

 msgid "From:"
 msgstr "Od:"
 
 msgid "From:"
 msgstr "Od:"
 

-#: src/summary_search.c:305
+#: src/summary_search.c:373

 msgid "Body:"
 msgstr "Telo:"
 
 msgid "Body:"
 msgstr "Telo:"
 

-#: src/summary_search.c:312
+#: src/summary_search.c:380

 msgid "Condition:"
 msgstr "Podmienka:"
 
 msgid "Condition:"
 msgstr "Podmienka:"
 

-#: src/summary_search.c:342
+#: src/summary_search.c:410

 msgid "Find _all"
 msgstr "Nájsť _všetky"
 
 msgid "Find _all"
 msgstr "Nájsť _všetky"
 

-#: src/summary_search.c:543
+#: src/summary_search.c:645

 msgid "Beginning of list reached; continue from end?"
 msgstr "Bol dosiahnutý začiatok zoznamu; pokračovať od konca?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "Bol dosiahnutý začiatok zoznamu; pokračovať od konca?"
 

-#: src/summary_search.c:545
+#: src/summary_search.c:647

 msgid "End of list reached; continue from beginning?"
 msgstr "Bol dosiahnutý koniec zoznamu; pokračovať od začiatku?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Bol dosiahnutý koniec zoznamu; pokračovať od začiatku?"
 


@@ -10616,11 +10888,11 @@ msgstr "/O_dpovedať komu/_odosielateľovi"
 msgid "/Repl_y to/mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 

-#: src/summaryview.c:424 src/toolbar.c:234
+#: src/summaryview.c:424 src/toolbar.c:239

 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 

-#: src/summaryview.c:425 src/toolbar.c:235
+#: src/summaryview.c:425 src/toolbar.c:240

 msgid "/For_ward as attachment"
 msgstr "/P_oslať ďalej ako prílohu"
 
 msgid "/For_ward as attachment"
 msgstr "/P_oslať ďalej ako prílohu"
 


@@ -10878,19 +11150,19 @@ msgstr " položiek zvolených"
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nových, %d neprečítaných, %d celkovo (%s)"
 
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nových, %d neprečítaných, %d celkovo (%s)"
 

-#: src/summaryview.c:2503
+#: src/summaryview.c:2504

 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 

-#: src/summaryview.c:2584
+#: src/summaryview.c:2585

 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 

-#: src/summaryview.c:2762
+#: src/summaryview.c:2763

 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 

-#: src/summaryview.c:2800
+#: src/summaryview.c:2801

 msgid "(No Recipient)"
 msgstr "(Žiadny príjemca)"
 
 msgid "(No Recipient)"
 msgstr "(Žiadny príjemca)"
 


@@ -10930,27 +11202,27 @@ msgstr "Pripojiť _za"
 msgid "_Overwrite"
 msgstr "_Prepísať"
 
 msgid "_Overwrite"
 msgstr "_Prepísať"
 

-#: src/summaryview.c:4423
+#: src/summaryview.c:4431

 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 

-#: src/summaryview.c:4642
+#: src/summaryview.c:4650

 msgid "Skip these rules"
 msgstr "Preskočiť tieto pravidlá"
 
 msgid "Skip these rules"
 msgstr "Preskočiť tieto pravidlá"
 

-#: src/summaryview.c:4645
+#: src/summaryview.c:4653

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, ku ktorému kontu patria"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, ku ktorému kontu patria"
 

-#: src/summaryview.c:4648
+#: src/summaryview.c:4656

 msgid "Apply these rules if they apply to the current account"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, či patria k aktívnemu kontu"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "Použiť tieto pravidlá bez ohľadu na to, či patria k aktívnemu kontu"
 

-#: src/summaryview.c:4677
+#: src/summaryview.c:4685

 msgid "Filtering"
 msgstr "Filtrovanie"
 
 msgid "Filtering"
 msgstr "Filtrovanie"
 

-#: src/summaryview.c:4678
+#: src/summaryview.c:4686

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -10958,19 +11230,19 @@ msgstr ""
 "Niektoré pravidlá patria konkrétnemu kontu.\n"
 "Prosím vyberte si, ako pristupovať k týmto pravidlám:"
 
 "Niektoré pravidlá patria konkrétnemu kontu.\n"
 "Prosím vyberte si, ako pristupovať k týmto pravidlám:"
 

-#: src/summaryview.c:4680
+#: src/summaryview.c:4688

 msgid "+_Filter"
 msgstr "+_Filtrovať"
 
 msgid "+_Filter"
 msgstr "+_Filtrovať"
 

-#: src/summaryview.c:4707
+#: src/summaryview.c:4715

 msgid "Filtering..."
 msgstr "Filtrujem..."
 
 msgid "Filtering..."
 msgstr "Filtrujem..."
 

-#: src/summaryview.c:4780
+#: src/summaryview.c:4788

 msgid "Processing configuration"
 msgstr "Nastavenie spracúvania"
 
 msgid "Processing configuration"
 msgstr "Nastavenie spracúvania"
 

-#: src/summaryview.c:6220
+#: src/summaryview.c:6233

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -11009,7 +11281,7 @@ msgstr "[%s  %s (%d bajtov)]"
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bajtov)]"
 
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bajtov)]"
 

-#: src/textview.c:811
+#: src/textview.c:812

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -11023,79 +11295,79 @@ msgstr ""
 "\n"
 "Použite "
 
 "\n"
 "Použite "
 

-#: src/textview.c:816
+#: src/textview.c:817

 msgid "'View Log'"
 msgstr "'Zobraziť záznam'"
 
 msgid "'View Log'"
 msgstr "'Zobraziť záznam'"
 

-#: src/textview.c:817
+#: src/textview.c:818

 msgid " in the Tools menu for more information."
 msgstr "V menu Nástroje pre viac informácií."
 
 msgid " in the Tools menu for more information."
 msgstr "V menu Nástroje pre viac informácií."
 

-#: src/textview.c:838
+#: src/textview.c:839

 msgid "  The following can be performed on this part by\n"
 msgstr "  Nasledujúce sa dá urobiť s touto časťou \n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  Nasledujúce sa dá urobiť s touto časťou \n"
 

-#: src/textview.c:839
+#: src/textview.c:840

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  pravým kliknutím na ikonu alebo položku zoznamu:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  pravým kliknutím na ikonu alebo položku zoznamu:\n"
 

-#: src/textview.c:841
+#: src/textview.c:842

 msgid "     - To save, select "
 msgstr "     - Ak ju chcete uložiť, zvoľte "
 
 msgid "     - To save, select "
 msgstr "     - Ak ju chcete uložiť, zvoľte "
 

-#: src/textview.c:842
+#: src/textview.c:843

 msgid "'Save as...'"
 msgstr "'Uložiť ako...'"
 
 msgid "'Save as...'"
 msgstr "'Uložiť ako...'"
 

-#: src/textview.c:843
+#: src/textview.c:844

 msgid " (Shortcut key: 'y')\n"
 msgstr " (Skratka: 'y')\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (Skratka: 'y')\n"
 

-#: src/textview.c:844
+#: src/textview.c:845

 msgid "     - To display as text, select "
 msgstr "     - Ak ju chcete zobraziť ako text, vyberte 'Zobraz ako text' "
 
 msgid "     - To display as text, select "
 msgstr "     - Ak ju chcete zobraziť ako text, vyberte 'Zobraz ako text' "
 

-#: src/textview.c:845
+#: src/textview.c:846

 msgid "'Display as text'"
 msgstr "'Zobraziť ako text'"
 
 msgid "'Display as text'"
 msgstr "'Zobraziť ako text'"
 

-#: src/textview.c:846
+#: src/textview.c:847

 msgid " (Shortcut key: 't')\n"
 msgstr " (Skratka: 't')\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (Skratka: 't')\n"
 

-#: src/textview.c:847
+#: src/textview.c:848

 msgid "     - To open with an external program, select "
 msgstr "     - Ak ju chcete otvoriť v inej aplikácii, vyberte "
 
 msgid "     - To open with an external program, select "
 msgstr "     - Ak ju chcete otvoriť v inej aplikácii, vyberte "
 

-#: src/textview.c:848
+#: src/textview.c:849

 msgid "'Open'"
 msgstr "'Otvoriť'"
 
 msgid "'Open'"
 msgstr "'Otvoriť'"
 

-#: src/textview.c:849
+#: src/textview.c:850

 msgid " (Shortcut key: 'l')\n"
 msgstr " (Skratka: 'l')\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (Skratka: 'l')\n"
 

-#: src/textview.c:850
+#: src/textview.c:851

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alebo dvojklik, alebo kliknutie stredným "
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (alebo dvojklik, alebo kliknutie stredným "
 

-#: src/textview.c:851
+#: src/textview.c:852

 msgid "mouse button)\n"
 msgstr "tlačítkom myši)\n"
 
 msgid "mouse button)\n"
 msgstr "tlačítkom myši)\n"
 

-#: src/textview.c:852
+#: src/textview.c:853

 msgid "     - Or use "
 msgstr "     - Alebo použite"
 
 msgid "     - Or use "
 msgstr "     - Alebo použite"
 

-#: src/textview.c:853
+#: src/textview.c:854

 msgid "'Open with...'"
 msgstr "'Otvoriť čím...'"
 
 msgid "'Open with...'"
 msgstr "'Otvoriť čím...'"
 

-#: src/textview.c:854
+#: src/textview.c:855

 msgid " (Shortcut key: 'o')\n"
 msgstr " (Skratka: 'o')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (Skratka: 'o')\n"
 

-#: src/textview.c:943
+#: src/textview.c:944

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -11106,7 +11378,7 @@ msgstr ""
 "    %s\n"
 "Kód návratu %d\n"
 
 "    %s\n"
 "Kód návratu %d\n"
 

-#: src/textview.c:2488
+#: src/textview.c:2492

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -11125,226 +11397,242 @@ msgstr ""
 "\n"
 "Otvoriť ju napriek tomu?"
 
 "\n"
 "Otvoriť ju napriek tomu?"
 

-#: src/textview.c:2497
+#: src/textview.c:2501

 msgid "Phishing attempt warning"
 msgstr "Varovanie pred phishingovým podvodom"
 
 msgid "Phishing attempt warning"
 msgstr "Varovanie pred phishingovým podvodom"
 

-#: src/textview.c:2498
+#: src/textview.c:2502

 msgid "_Open URL"
 msgstr "_Otvoriť URL"
 
 msgid "_Open URL"
 msgstr "_Otvoriť URL"
 

-#: src/toolbar.c:162 src/toolbar.c:1486
+#: src/toolbar.c:166 src/toolbar.c:1535

 msgid "Receive Mail on all Accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 

-#: src/toolbar.c:163 src/toolbar.c:1500
+#: src/toolbar.c:167 src/toolbar.c:1549

 msgid "Receive Mail on current Account"
 msgstr "Prijať novú poštu pre aktuálne konto"
 
 msgid "Receive Mail on current Account"
 msgstr "Prijať novú poštu pre aktuálne konto"
 

-#: src/toolbar.c:164 src/toolbar.c:1506
+#: src/toolbar.c:168 src/toolbar.c:1555

 msgid "Send Queued Messages"
 msgstr "Odoslať správy vo fronte"
 
 msgid "Send Queued Messages"
 msgstr "Odoslať správy vo fronte"
 

-#: src/toolbar.c:165 src/toolbar.c:1519
+#: src/toolbar.c:169 src/toolbar.c:1568

 msgid "Compose Email"
 msgstr "Nová správa"
 
 msgid "Compose Email"
 msgstr "Nová správa"
 

-#: src/toolbar.c:166 src/toolbar.c:1523
+#: src/toolbar.c:170 src/toolbar.c:1572

 msgid "Compose News"
 msgstr "Nový news príspevok"
 
 msgid "Compose News"
 msgstr "Nový news príspevok"
 

-#: src/toolbar.c:167 src/toolbar.c:1554 src/toolbar.c:1564
+#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624

 msgid "Reply to Message"
 msgstr "Odpovedať na správu"
 
 msgid "Reply to Message"
 msgstr "Odpovedať na správu"
 

-#: src/toolbar.c:168 src/toolbar.c:1571 src/toolbar.c:1581
+#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641

 msgid "Reply to Sender"
 msgstr "Odpovedať odosielateľovi"
 
 msgid "Reply to Sender"
 msgstr "Odpovedať odosielateľovi"
 

-#: src/toolbar.c:169 src/toolbar.c:1588 src/toolbar.c:1598
+#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658

 msgid "Reply to All"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
 msgid "Reply to All"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 

-#: src/toolbar.c:170 src/toolbar.c:1605 src/toolbar.c:1615
+#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675

 msgid "Reply to Mailing-list"
 msgstr "Odpovedať do diskusnej skupiny"
 
 msgid "Reply to Mailing-list"
 msgstr "Odpovedať do diskusnej skupiny"
 

-#: src/toolbar.c:171 src/toolbar.c:1622 src/toolbar.c:1632
+#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692

 msgid "Forward Message"
 msgstr "Poslať správu ďalej"
 
 msgid "Forward Message"
 msgstr "Poslať správu ďalej"
 

-#: src/toolbar.c:172 src/toolbar.c:1639
+#: src/toolbar.c:176 src/toolbar.c:1699

 msgid "Trash Message"
 msgstr "Zahodiť správu do koša"
 
 msgid "Trash Message"
 msgstr "Zahodiť správu do koša"
 

-#: src/toolbar.c:173 src/toolbar.c:1645
+#: src/toolbar.c:177 src/toolbar.c:1705

 msgid "Delete Message"
 msgstr "Zmazať správu"
 
 msgid "Delete Message"
 msgstr "Zmazať správu"
 

-#: src/toolbar.c:175 src/toolbar.c:1657
+#: src/toolbar.c:179 src/toolbar.c:1717

 msgid "Go to Previous Unread Message"
 msgstr "Prejsť na predošlú neprečítanú správu"
 
 msgid "Go to Previous Unread Message"
 msgstr "Prejsť na predošlú neprečítanú správu"
 

-#: src/toolbar.c:176 src/toolbar.c:1664
+#: src/toolbar.c:180 src/toolbar.c:1724

 msgid "Go to Next Unread Message"
 msgstr "Prejsť na ďalšiu neprečítanú správu"
 
 msgid "Go to Next Unread Message"
 msgstr "Prejsť na ďalšiu neprečítanú správu"
 

-#: src/toolbar.c:179
+#: src/toolbar.c:183

 msgid "Learn Spam or Ham"
 msgstr "Učiť sa ako spam alebo nie spam"
 
 msgid "Learn Spam or Ham"
 msgstr "Učiť sa ako spam alebo nie spam"
 

-#: src/toolbar.c:181 src/toolbar.c:1673
+#: src/toolbar.c:185 src/toolbar.c:1733

 msgid "Send Message"
 msgstr "Odoslať správu"
 
 msgid "Send Message"
 msgstr "Odoslať správu"
 

-#: src/toolbar.c:182 src/toolbar.c:1679
+#: src/toolbar.c:186 src/toolbar.c:1739

 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 

-#: src/toolbar.c:183 src/toolbar.c:1685
+#: src/toolbar.c:187 src/toolbar.c:1745

 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 

-#: src/toolbar.c:184 src/toolbar.c:1691
+#: src/toolbar.c:188 src/toolbar.c:1751

 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 

-#: src/toolbar.c:185 src/toolbar.c:1697
+#: src/toolbar.c:189 src/toolbar.c:1757

 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 

-#: src/toolbar.c:186 src/toolbar.c:1703
+#: src/toolbar.c:190 src/toolbar.c:1763

 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 

-#: src/toolbar.c:187 src/toolbar.c:1709
+#: src/toolbar.c:191 src/toolbar.c:1769

 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 

-#: src/toolbar.c:188 src/toolbar.c:1715
+#: src/toolbar.c:192 src/toolbar.c:1775

 msgid "Wrap long lines of current paragraph"
 msgstr "Zalomiť dlhé riadky aktuálneho odstavca"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Zalomiť dlhé riadky aktuálneho odstavca"
 

-#: src/toolbar.c:189 src/toolbar.c:1721
+#: src/toolbar.c:193 src/toolbar.c:1781

 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 

-#: src/toolbar.c:192 src/toolbar.c:1734
+#: src/toolbar.c:196 src/toolbar.c:1794

 msgid "Check spelling"
 msgstr "Overiť pravopis"
 
 msgid "Check spelling"
 msgstr "Overiť pravopis"
 

-#: src/toolbar.c:194
-msgid "Sylpheed-Claws Actions Feature"
-msgstr "Akcie Sylpheed-Claws"
+#: src/toolbar.c:198
+msgid "Claws Mail Actions Feature"
+msgstr "Akcie Claws Mail"
+
+#: src/toolbar.c:199 src/toolbar.c:1817
+msgid "Cancel receiving"
+msgstr "Prerušiť príjem"

 
 

-#: src/toolbar.c:214
+#: src/toolbar.c:219

 msgid "/Reply with _quote"
 msgstr "/Odpovedať s _citáciou"
 
 msgid "/Reply with _quote"
 msgstr "/Odpovedať s _citáciou"
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/_Reply without quote"
 msgstr "/_Odpovedať bez citácie"
 
 msgid "/_Reply without quote"
 msgstr "/_Odpovedať bez citácie"
 

-#: src/toolbar.c:219
+#: src/toolbar.c:224

 msgid "/Reply to all with _quote"
 msgstr "/Odpovedať _všetkým s citáciou"
 
 msgid "/Reply to all with _quote"
 msgstr "/Odpovedať _všetkým s citáciou"
 

-#: src/toolbar.c:220
+#: src/toolbar.c:225

 msgid "/_Reply to all without quote"
 msgstr "/Odpovedať všetkým _bez citácie"
 
 msgid "/_Reply to all without quote"
 msgstr "/Odpovedať všetkým _bez citácie"
 

-#: src/toolbar.c:224
+#: src/toolbar.c:229

 msgid "/Reply to list with _quote"
 msgstr "/Odpovedať do _mailinglistu s citáciou"
 
 msgid "/Reply to list with _quote"
 msgstr "/Odpovedať do _mailinglistu s citáciou"
 

-#: src/toolbar.c:225
+#: src/toolbar.c:230

 msgid "/_Reply to list without quote"
 msgstr "/Odpovedať do ma_ilinglistu bez citácie"
 
 msgid "/_Reply to list without quote"
 msgstr "/Odpovedať do ma_ilinglistu bez citácie"
 

-#: src/toolbar.c:229
+#: src/toolbar.c:234

 msgid "/Reply to sender with _quote"
 msgstr "/Odpovedať o_dosielateľovi s citáciou"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Odpovedať o_dosielateľovi s citáciou"
 

-#: src/toolbar.c:230
+#: src/toolbar.c:235

 msgid "/_Reply to sender without quote"
 msgstr "/Odpovedať odo_sielateľovi bez citácie"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Odpovedať odo_sielateľovi bez citácie"
 

-#: src/toolbar.c:236
+#: src/toolbar.c:241

 msgid "/Redirec_t"
 msgstr "/P_resmerovať"
 
 msgid "/Redirec_t"
 msgstr "/P_resmerovať"
 

-#: src/toolbar.c:389
+#: src/toolbar.c:245
+msgid "/Learn as _Spam"
+msgstr "/Naučiť ako _spam"
+
+#: src/toolbar.c:246
+msgid "/Learn as _Ham"
+msgstr "/Naučiť ako _nie spam"
+
+#: src/toolbar.c:399

 msgid "Get Mail"
 msgstr "Prijať poštu"
 
 msgid "Get Mail"
 msgstr "Prijať poštu"
 

-#: src/toolbar.c:395 src/toolbar.c:486
+#: src/toolbar.c:403
+msgid "Toolbar|Compose"
+msgstr "Nová správa"
+
+#: src/toolbar.c:405 src/toolbar.c:496

 msgid "Reply"
 msgstr "Odpovedať"
 
 msgid "Reply"
 msgstr "Odpovedať"
 

-#: src/toolbar.c:396 src/toolbar.c:487
+#: src/toolbar.c:406 src/toolbar.c:497

 msgid "All"
 msgstr "Všetky"
 
 msgid "All"
 msgstr "Všetky"
 

-#: src/toolbar.c:397 src/toolbar.c:488
+#: src/toolbar.c:407 src/toolbar.c:498

 msgid "Sender"
 msgstr "Odosielateľ"
 
 msgid "Sender"
 msgstr "Odosielateľ"
 

-#: src/toolbar.c:402 src/toolbar.c:493
+#: src/toolbar.c:412 src/toolbar.c:503

 msgid "Spam"
 msgstr "Spam"
 
 msgid "Spam"
 msgstr "Spam"
 

-#: src/toolbar.c:405 src/toolbar.c:495
+#: src/toolbar.c:415 src/toolbar.c:505

 msgid "Next"
 msgstr "Nasledujúca"
 
 msgid "Next"
 msgstr "Nasledujúca"
 

-#: src/toolbar.c:443
+#: src/toolbar.c:453

 msgid "Send later"
 msgstr "Odoslať neskôr"
 
 msgid "Send later"
 msgstr "Odoslať neskôr"
 

-#: src/toolbar.c:444
+#: src/toolbar.c:454

 msgid "Draft"
 msgstr "Koncept"
 
 msgid "Draft"
 msgstr "Koncept"
 

-#: src/toolbar.c:1493
+#: src/toolbar.c:1542

 msgid "Receive Mail on selected Account"
 msgstr "Prijať novú poštu pre zvolené konto"
 
 msgid "Receive Mail on selected Account"
 msgstr "Prijať novú poštu pre zvolené konto"
 

-#: src/toolbar.c:1530
+#: src/toolbar.c:1579

 msgid "Compose with selected Account"
 msgstr "Napísať správu zo zvoleného konta"
 
 msgid "Compose with selected Account"
 msgstr "Napísať správu zo zvoleného konta"
 

-#: src/toolbar.c:1536
+#: src/toolbar.c:1585

 msgid "Ham"
 msgstr "Nie spam"
 
 msgid "Ham"
 msgstr "Nie spam"
 

-#: src/toolbar.c:1544
+#: src/toolbar.c:1593

 msgid "Learn Spam"
 msgstr "Naučiť ako spam"
 
 msgid "Learn Spam"
 msgstr "Naučiť ako spam"
 

-#: src/toolbar.c:1548
+#: src/toolbar.c:1597

 msgid "Learn Ham"
 msgstr "Naučiť ako nie spam"
 
 msgid "Learn Ham"
 msgstr "Naučiť ako nie spam"
 

-#: src/wizard.c:459
-msgid "Welcome to Sylpheed-Claws "
-msgstr "Sylpheed-Claws Vás víta "
+#: src/toolbar.c:1607
+msgid "Learn as..."
+msgstr "Naučiť ako..."

 
 

-#: src/wizard.c:469
-msgid "Sylpheed-Claws Team"
-msgstr "Team Sylpheed-Claws"
+#: src/wizard.c:461
+msgid "Welcome Mail Subject|Welcome to Claws Mail"
+msgstr "Claws Mail Vás víta"

 
 

-#: src/wizard.c:475
+#: src/wizard.c:484

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"

-"Welcome to Sylpheed-Claws\n"
-"-------------------------\n"
+"Welcome to Claws Mail\n"
+"---------------------\n"

 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"
 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"

-"Sylpheed-Claws has lots of extra features accessible via plugins,\n"
+"Claws Mail has lots of extra features accessible via plugins,\n"

 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"
 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"


@@ -11355,7 +11643,7 @@ msgid ""
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"

-"You can find further information in the Sylpheed-Claws manual,\n"
+"You can find further information in the Claws Mail manual,\n"

 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"
 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"


@@ -11369,7 +11657,7 @@ msgid ""
 "\n"
 "LICENSE\n"
 "-------\n"
 "\n"
 "LICENSE\n"
 "-------\n"

-"Sylpheed-Claws is free software, released under the terms\n"
+"Claws Mail is free software, released under the terms\n"

 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"


@@ -11377,19 +11665,19 @@ msgid ""
 "\n"
 "DONATIONS\n"
 "---------\n"
 "\n"
 "DONATIONS\n"
 "---------\n"

-"If you wish to donate to the Sylpheed-Claws project you can do\n"
+"If you wish to donate to the Claws Mail project you can do\n"

 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"
 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"

-"Sylpheed-Claws Vás víta\n"
+"Claws Mail Vás víta\n"

 "-----------------------\n"
 "\n"
 "Teraz, keď už máte nastavené svoje poštové konto, môžete prijať\n"
 "svoju poštu kliknutím na tlačítko 'Prijať poštu' na ľavej strane\n"
 "panelu nástrojov.\n"
 "\n"
 "-----------------------\n"
 "\n"
 "Teraz, keď už máte nastavené svoje poštové konto, môžete prijať\n"
 "svoju poštu kliknutím na tlačítko 'Prijať poštu' na ľavej strane\n"
 "panelu nástrojov.\n"
 "\n"

-"Sylpheed-Claws má množstvo dodatočných funkcií dostupných v\n"
+"Claws Mail má množstvo dodatočných funkcií dostupných v\n"

 "zásuvných moduloch (pluginoch), napríklad kontrolu spamu\n"
 "(pluginy Bogofilter a SpamAssassin), ochranu súkromia (PGP pluginy)\n"
 "RSS čítačku, kalendár, a iné. Pluginy môžete začať používať cez\n"
 "zásuvných moduloch (pluginoch), napríklad kontrolu spamu\n"
 "(pluginy Bogofilter a SpamAssassin), ochranu súkromia (PGP pluginy)\n"
 "RSS čítačku, kalendár, a iné. Pluginy môžete začať používať cez\n"


@@ -11399,8 +11687,8 @@ msgstr ""
 "'/Konfigurácia/Nastavenie aktívneho konta'. Všeobecné nastavenia\n"
 "môžete zmeniť pomocou položky 'Konfigurácia/Všeobecné nastavenia'.\n"
 "\n"
 "'/Konfigurácia/Nastavenie aktívneho konta'. Všeobecné nastavenia\n"
 "môžete zmeniť pomocou položky 'Konfigurácia/Všeobecné nastavenia'.\n"
 "\n"

-"Ďalšie informácie nájdete v manuále Sylpheed-Claws, ktorý je\n"
-"dostupný cez položku menu 'Nápoveda/Manuál', alebo na webovej\n"
+"Ďalšie informácie nájdete v manuále Claws Mail, ktorý je\n"
+"dostupný cez položku menu '/Nápoveda/Manuál', alebo na webovej\n"

 "adrese uvedenej nižšie.\n"
 "\n"
 "Užitočné adresy\n"
 "adrese uvedenej nižšie.\n"
 "\n"
 "Užitočné adresy\n"


@@ -11413,7 +11701,7 @@ msgstr ""
 "\n"
 "LICENCIA\n"
 "--------\n"
 "\n"
 "LICENCIA\n"
 "--------\n"

-"Sylpheed-Claws je voľne šíriteľný softvér vydaný pod podmienkami\n"
+"Claws Mail je voľne šíriteľný softvér vydaný pod podmienkami\n"

 "licencie GNU General Public License, verzia 2 alebo novšia tak,\n"
 "ako bola publikovaná nadáciou Free Software Foundation,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Túto\n"
 "licencie GNU General Public License, verzia 2 alebo novšia tak,\n"
 "ako bola publikovaná nadáciou Free Software Foundation,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Túto\n"


@@ -11422,59 +11710,71 @@ msgstr ""
 "\n"
 "PRÍSPEVKY\n"
 "---------\n"
 "\n"
 "PRÍSPEVKY\n"
 "---------\n"

-"Ak si prajete finančne prispieť na projekt Sylpheed-Claws, môžete tak učiniť "
-"na adrese <%s>.\n"
+"Ak si prajete finančne prispieť na projekt Claws Mail, môžete tak učiniť na "
+"adrese <%s>.\n"

 "\n"
 
 "\n"
 

-#: src/wizard.c:551
+#: src/wizard.c:564

 msgid "Please enter the mailbox name."
 msgstr "Prosím, zadajte názov schránky."
 
 msgid "Please enter the mailbox name."
 msgstr "Prosím, zadajte názov schránky."
 

-#: src/wizard.c:579
+#: src/wizard.c:592

 msgid "Please enter your name and email address."
 msgstr "Prosím, zadajte Vaše meno a e-mailovú adresu."
 
 msgid "Please enter your name and email address."
 msgstr "Prosím, zadajte Vaše meno a e-mailovú adresu."
 

-#: src/wizard.c:590
+#: src/wizard.c:603

 msgid "Please enter your receiving server and username."
 msgstr "Prosím, zadajte Váš server príchodzej pošty, a používateľské meno."
 
 msgid "Please enter your receiving server and username."
 msgstr "Prosím, zadajte Váš server príchodzej pošty, a používateľské meno."
 

-#: src/wizard.c:600
+#: src/wizard.c:613

 msgid "Please enter your username."
 msgstr "Prosím, zadajte svoje používateľské meno."
 
 msgid "Please enter your username."
 msgstr "Prosím, zadajte svoje používateľské meno."
 

-#: src/wizard.c:610
+#: src/wizard.c:623

 msgid "Please enter your SMTP server."
 msgstr "Prosím, zadajte svoj SMTP server."
 
 msgid "Please enter your SMTP server."
 msgstr "Prosím, zadajte svoj SMTP server."
 

-#: src/wizard.c:621
+#: src/wizard.c:634

 msgid "Please enter your SMTP username."
 msgstr "Prosím, zadajte svoje používateľské meno pre SMTP."
 
 msgid "Please enter your SMTP username."
 msgstr "Prosím, zadajte svoje používateľské meno pre SMTP."
 

-#: src/wizard.c:832
+#: src/wizard.c:881

 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Vaše meno:</span>"
 
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Vaše meno:</span>"
 

-#: src/wizard.c:837
+#: src/wizard.c:886

 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Vaša e-mailová adresa:</span>"
 
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Vaša e-mailová adresa:</span>"
 

-#: src/wizard.c:841
+#: src/wizard.c:890

 msgid "Your organization:"
 msgstr "Vaša organizácia:"
 
 msgid "Your organization:"
 msgstr "Vaša organizácia:"
 

-#: src/wizard.c:861
+#: src/wizard.c:913
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr "Môžete takisto zadať celú cestu k priečinku, napr.: \"/home/jozef/Dokumenty/Mail\""
+
+#: src/wizard.c:917

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Názov schránky:</span>"
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Názov schránky:</span>"
 

-#: src/wizard.c:891
+#: src/wizard.c:954
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr "Môžete zadať číslo portu tak, že ho pridáte na koniec: \"mail.priklad.sk:25\""
+
+#: src/wizard.c:958

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adresa SMTP servera:</span>"
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Adresa SMTP servera:</span>"
 

-#: src/wizard.c:894
+#: src/wizard.c:961

 msgid "Use authentication"
 msgstr "Autentizovať"
 
 msgid "Use authentication"
 msgstr "Autentizovať"
 

-#: src/wizard.c:908
+#: src/wizard.c:975

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11482,7 +11782,7 @@ msgstr ""
 "Prihlasovacie meno SMTP:\n"
 "<span size=\"small\">(nechajte prázdne, ak je rovnaké ako pre príjem)</span>"
 
 "Prihlasovacie meno SMTP:\n"
 "<span size=\"small\">(nechajte prázdne, ak je rovnaké ako pre príjem)</span>"
 

-#: src/wizard.c:921
+#: src/wizard.c:988

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11490,99 +11790,104 @@ msgstr ""
 "Heslo SMTP:\n"
 "<span size=\"small\">(nechajte prázdne, ak je rovnaké ako pre príjem)</span>"
 
 "Heslo SMTP:\n"
 "<span size=\"small\">(nechajte prázdne, ak je rovnaké ako pre príjem)</span>"
 

-#: src/wizard.c:949 src/wizard.c:964 src/wizard.c:1055
+#: src/wizard.c:1000
+msgid "Use SSL to connect to SMTP server"
+msgstr "Použiť SSL pre pripojenie k SMTP serveru"
+
+#: src/wizard.c:1007 src/wizard.c:1230
+msgid "Use SSL via STARTTLS"
+msgstr "Použiť SSL pomocou STARTTLS"
+
+#: src/wizard.c:1037 src/wizard.c:1056 src/wizard.c:1165

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Adresa servera:</span>"
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Adresa servera:</span>"
 

-#: src/wizard.c:980
+#: src/wizard.c:1076

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Miestna schránka:</span>"
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Miestna schránka:</span>"
 

-#: src/wizard.c:1022
+#: src/wizard.c:1127

 msgid "IMAP"
 msgstr "IMAP"
 
 msgid "IMAP"
 msgstr "IMAP"
 

-#: src/wizard.c:1047
+#: src/wizard.c:1152

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Typ serveru:</span>"
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Typ serveru:</span>"
 

-#: src/wizard.c:1066
+#: src/wizard.c:1161
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr "Môžete zadať číslo portu tak, že ho pridáte na koniec: \"mail.priklad.sk:110\""
+
+#: src/wizard.c:1176

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Používateľské meno:</span>"
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Používateľské meno:</span>"
 

-#: src/wizard.c:1082
+#: src/wizard.c:1192

 msgid "Password:"
 msgstr "Heslo:"
 
 msgid "Password:"
 msgstr "Heslo:"
 

-#: src/wizard.c:1094
+#: src/wizard.c:1204

 msgid "IMAP server directory:"
 msgstr "Priečinok serveru IMAP:"
 
 msgid "IMAP server directory:"
 msgstr "Priečinok serveru IMAP:"
 

-#: src/wizard.c:1125
-msgid "Use SSL to connect to SMTP server"
-msgstr "Použiť SSL pre pripojenie k SMTP serveru"
-
-#: src/wizard.c:1132
+#: src/wizard.c:1223

 msgid "Use SSL to connect to receiving server"
 msgstr "Použiť SSL pre pripojenie k prijímaciemu serveru"
 
 msgid "Use SSL to connect to receiving server"
 msgstr "Použiť SSL pre pripojenie k prijímaciemu serveru"
 

-#: src/wizard.c:1248
-msgid "Sylpheed-Claws Setup Wizard"
-msgstr "Sprievodca nastavením Sylpheed-Claws"
+#: src/wizard.c:1347
+msgid "Claws Mail Setup Wizard"
+msgstr "Sprievodca nastavením Claws Mail"

 
 

-#: src/wizard.c:1280
-msgid "Welcome to Sylpheed-Claws"
-msgstr "Sylpheed-Claws Vás víta"
+#: src/wizard.c:1379
+msgid "Welcome to Claws Mail"
+msgstr "Claws Mail Vás víta"

 
 

-#: src/wizard.c:1288
+#: src/wizard.c:1387

 msgid ""
 msgid ""

-"Welcome to the Sylpheed-Claws setup wizard.\n"
+"Welcome to the Claws Mail setup wizard.\n"

 "\n"
 "We will begin by defining some basic information about you and your most "
 "\n"
 "We will begin by defining some basic information about you and your most "

-"common mail options so that you can start to use Sylpheed-Claws in less than "
+"common mail options so that you can start to use Claws Mail in less than "

 "five minutes."
 msgstr ""
 "five minutes."
 msgstr ""

-"Víta vás sprievodca nastavením Sylpheed-Claws.\n"
+"Víta vás sprievodca nastavením Claws Mail.\n"

 "\n"
 "Začneme získaním základných údajov o Vás, a Vašich poštových nastaveniach, "
 "\n"
 "Začneme získaním základných údajov o Vás, a Vašich poštových nastaveniach, "

-"aby ste mohli začať Sylpheed-Claws používať za menej ako päť minút."
+"aby ste mohli začať Claws Mail používať za menej ako päť minút."

 
 

-#: src/wizard.c:1301
+#: src/wizard.c:1400

 msgid "About You"
 msgstr "O vás"
 
 msgid "About You"
 msgstr "O vás"
 

-#: src/wizard.c:1303 src/wizard.c:1312 src/wizard.c:1321 src/wizard.c:1331
-#: src/wizard.c:1341
+#: src/wizard.c:1402 src/wizard.c:1411 src/wizard.c:1420 src/wizard.c:1430

 msgid "Bold fields must be completed"
 msgstr "Polia, označené tučným písmom musia byť vyplnené"
 
 msgid "Bold fields must be completed"
 msgstr "Polia, označené tučným písmom musia byť vyplnené"
 

-#: src/wizard.c:1310
+#: src/wizard.c:1409

 msgid "Receiving mail"
 msgstr "Príjem pošty"
 
 msgid "Receiving mail"
 msgstr "Príjem pošty"
 

-#: src/wizard.c:1319
+#: src/wizard.c:1418

 msgid "Sending mail"
 msgstr "Odosielanie pošty"
 
 msgid "Sending mail"
 msgstr "Odosielanie pošty"
 

-#: src/wizard.c:1329
+#: src/wizard.c:1428

 msgid "Saving mail on disk"
 msgstr "Ukladanie pošty na disk"
 
 msgid "Saving mail on disk"
 msgstr "Ukladanie pošty na disk"
 

-#: src/wizard.c:1339
-msgid "Security"
-msgstr "Zabezpečenie"
-
-#: src/wizard.c:1349
+#: src/wizard.c:1438

 msgid "Configuration finished"
 msgstr "Konfigurácia dokončená"
 
 msgid "Configuration finished"
 msgstr "Konfigurácia dokončená"
 

-#: src/wizard.c:1357
+#: src/wizard.c:1446

 msgid ""
 msgid ""

-"Sylpheed-Claws is now ready.\n"
+"Claws Mail is now ready.\n"

 "\n"
 "Click Save to start."
 msgstr ""
 "\n"
 "Click Save to start."
 msgstr ""

-"Program Sylpheed-Claws je pripravený.\n"
+"Program Claws Mail je pripravený.\n"

 "\n"
 "Kliknite na Uložiť."
 
 "\n"
 "Kliknite na Uložiť."
 

diff --git a/po/sr.po b/po/sr.po
index 851ff924281b8144dc03fcdd14103a3202a75bef..915c2c18a930a54692b0c5041c802b2ae67506b5 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,13 +5,13 @@
 # Maintainer: Александар Урошевић <urke@users.sf.net>
 #
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
 # Maintainer: Александар Урошевић <urke@users.sf.net>
 #
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.

-# Aleksandar Urošević <urke@users.sourceforge.net>, 2006.
+# Aleksandar Urošević <urke@users.sourceforge.net>, 2006, 2007.

 msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"

-"Report-Msgid-Bugs-To: paul@sylpheed.org\n"
-"POT-Creation-Date: 2006-09-18 10:12+0100\n"
-"PO-Revision-Date: 2006-09-18 22:23+0200\n"
+"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
+"POT-Creation-Date: 2007-01-01 10:27+0000\n"
+"PO-Revision-Date: 2007-01-03 14:09+0100\n"

 "Last-Translator: Aleksandar Urošević <urke@users.sourceforge.net>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Aleksandar Urošević <urke@users.sourceforge.net>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
 "MIME-Version: 1.0\n"


@@ -41,7 +41,10 @@ msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "
 "included."
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox in the 'G' column indicates which accounts will be "
 "included."

-msgstr "Коришћење опције „Провера поште“ омогућава преузимање порука са Вашег налога по датом редоследу, а кућица у колони „Г“ означава који ће налози бити укључени у проверу."
+msgstr ""
+"Коришћење опције „Провера поште“ омогућава преузимање порука са Вашег налога "
+"по датом редоследу, а кућица у колони „Г“ означава који ће налози бити "
+"укључени у проверу."

 
 #: src/account.c:773
 msgid " _Set as default account "
 
 #: src/account.c:773
 msgid " _Set as default account "


@@ -69,17 +72,25 @@ msgstr "(Неименовано)"
 msgid "Delete account"
 msgstr " Обриши налог "
 
 msgid "Delete account"
 msgstr " Обриши налог "
 

-#: src/account.c:1458
+#: src/account.c:1461
+msgid "Accounts List Default Column Name|D"
+msgstr "Г"
+
+#: src/account.c:1467

 msgid "Default account"
 msgstr "Подразумевани налог"
 
 msgid "Default account"
 msgstr "Подразумевани налог"
 

-#: src/account.c:1472
+#: src/account.c:1475
+msgid "Accounts List Get Column Name|G"
+msgstr "П"
+
+#: src/account.c:1481

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "„Провера поште“ проверава изабране налоге"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "„Провера поште“ проверава изабране налоге"
 

-#: src/account.c:1479 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5568 src/compose.c:5859 src/editaddress.c:953
-#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:279
+#: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132
+#: src/compose.c:5821 src/compose.c:6112 src/editaddress.c:1041
+#: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364


@@ -87,11 +98,11 @@ msgstr "„Провера поште“ проверава изабране на
 msgid "Name"
 msgstr "Назив"
 
 msgid "Name"
 msgstr "Назив"
 

-#: src/account.c:1486 src/prefs_account.c:1165 src/prefs_account.c:2682
+#: src/account.c:1495 src/prefs_account.c:1176 src/prefs_account.c:2712

 msgid "Protocol"
 msgstr "Протокол"
 
 msgid "Protocol"
 msgstr "Протокол"
 

-#: src/account.c:1493 src/ssl_manager.c:102
+#: src/account.c:1502 src/ssl_manager.c:102

 msgid "Server"
 msgstr "Сервер"
 
 msgid "Server"
 msgstr "Сервер"
 


@@ -155,7 +166,7 @@ msgstr "--- Завршено: %s\n"
 msgid "Action's input/output"
 msgstr "Улаз/излаз акција"
 
 msgid "Action's input/output"
 msgstr "Улаз/излаз акција"
 

-#: src/action.c:1527
+#: src/action.c:1529

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -166,11 +177,11 @@ msgstr ""
 "(„%%h“ ће бити замењено аргументом)\n"
 "  %s"
 
 "(„%%h“ ће бити замењено аргументом)\n"
 "  %s"
 

-#: src/action.c:1532
+#: src/action.c:1534

 msgid "Action's hidden user argument"
 msgstr "Скривени кориснички аргументи акција"
 
 msgid "Action's hidden user argument"
 msgstr "Скривени кориснички аргументи акција"
 

-#: src/action.c:1536
+#: src/action.c:1538

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -181,7 +192,7 @@ msgstr ""
 "(„%%u“ ће бити замењено аргументом)\n"
 "  %s"
 
 "(„%%u“ ће бити замењено аргументом)\n"
 "  %s"
 

-#: src/action.c:1541
+#: src/action.c:1543

 msgid "Action's user argument"
 msgstr "Кориснички аргументи акција"
 
 msgid "Action's user argument"
 msgstr "Кориснички аргументи акција"
 


@@ -190,12 +201,12 @@ msgid "Add to address book"
 msgstr "Додај у адресар"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
 msgstr "Додај у адресар"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377

-#: src/toolbar.c:449
+#: src/toolbar.c:459

 msgid "Address"
 msgstr "Адреса"
 
 msgid "Address"
 msgstr "Адреса"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:761
-#: src/editaddress.c:825 src/editgroup.c:281
+#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:849
+#: src/editaddress.c:913 src/editgroup.c:289

 msgid "Remarks"
 msgstr "Напомене"
 
 msgid "Remarks"
 msgstr "Напомене"
 


@@ -203,342 +214,348 @@ msgstr "Напомене"
 msgid "Select Address Book Folder"
 msgstr "Одаберите директоријум адресара"
 
 msgid "Select Address Book Folder"
 msgstr "Одаберите директоријум адресара"
 

-#: src/addressbook.c:133 src/editaddress.c:759 src/editaddress.c:807
-#: src/editgroup.c:280 src/expldifdlg.c:521 src/exporthtml.c:638
+#: src/addressbook.c:133 src/editaddress.c:847 src/editaddress.c:895
+#: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638

 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "Адреса е-поште"
 
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "Адреса е-поште"
 

-#: src/addressbook.c:416
+#: src/addressbook.c:419

 msgid "/_Book"
 msgstr "/_Адресар"
 
 msgid "/_Book"
 msgstr "/_Адресар"
 

-#: src/addressbook.c:417
+#: src/addressbook.c:420

 msgid "/_Book/New _Book"
 msgstr "/_Адресар/Нови _адресар"
 
 msgid "/_Book/New _Book"
 msgstr "/_Адресар/Нови _адресар"
 

-#: src/addressbook.c:418
+#: src/addressbook.c:421

 msgid "/_Book/New _Folder"
 msgstr "/_Адресар/Нови _директоријум"
 
 msgid "/_Book/New _Folder"
 msgstr "/_Адресар/Нови _директоријум"
 

-#: src/addressbook.c:419
+#: src/addressbook.c:422

 msgid "/_Book/New _vCard"
 msgstr "/_Адресар/Нови _контакт"
 
 msgid "/_Book/New _vCard"
 msgstr "/_Адресар/Нови _контакт"
 

-#: src/addressbook.c:421
+#: src/addressbook.c:424

 msgid "/_Book/New _JPilot"
 msgstr "/_Адресар/Нови _JPilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/_Адресар/Нови _JPilot"
 

-#: src/addressbook.c:424
+#: src/addressbook.c:427

 msgid "/_Book/New LDAP _Server"
 msgstr "/_Адресар/Нови LDAP _сервер"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/_Адресар/Нови LDAP _сервер"
 

-#: src/addressbook.c:426 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:432

 msgid "/_Book/---"
 msgstr "/_Адресар/---"
 
 msgid "/_Book/---"
 msgstr "/_Адресар/---"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:430

 msgid "/_Book/_Edit book"
 msgstr "/_Адресар/_Уреди адресар"
 
 msgid "/_Book/_Edit book"
 msgstr "/_Адресар/_Уреди адресар"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:431

 msgid "/_Book/_Delete book"
 msgstr "/_Адресар/_Обриши адресар"
 
 msgid "/_Book/_Delete book"
 msgstr "/_Адресар/_Обриши адресар"
 

-#: src/addressbook.c:430
+#: src/addressbook.c:433

 msgid "/_Book/_Save"
 msgstr "/_Адресар/_Сачувај"
 
 msgid "/_Book/_Save"
 msgstr "/_Адресар/_Сачувај"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:434

 msgid "/_Book/_Close"
 msgstr "/_Адресар/_Затвори"
 
 msgid "/_Book/_Close"
 msgstr "/_Адресар/_Затвори"
 

-#: src/addressbook.c:432
+#: src/addressbook.c:435

 msgid "/_Address"
 msgstr "/А_дреса"
 
 msgid "/_Address"
 msgstr "/А_дреса"
 

-#: src/addressbook.c:433
+#: src/addressbook.c:436

 msgid "/_Address/_Select all"
 msgstr "/А_дреса/_Одабери све"
 
 msgid "/_Address/_Select all"
 msgstr "/А_дреса/_Одабери све"
 

-#: src/addressbook.c:434 src/addressbook.c:438 src/addressbook.c:441
-#: src/addressbook.c:444
+#: src/addressbook.c:437 src/addressbook.c:441 src/addressbook.c:444
+#: src/addressbook.c:447

 msgid "/_Address/---"
 msgstr "/А_дреса/---"
 
 msgid "/_Address/---"
 msgstr "/А_дреса/---"
 

-#: src/addressbook.c:435
+#: src/addressbook.c:438

 msgid "/_Address/C_ut"
 msgstr "/А_дреса/_Исеци"
 
 msgid "/_Address/C_ut"
 msgstr "/А_дреса/_Исеци"
 

-#: src/addressbook.c:436
+#: src/addressbook.c:439

 msgid "/_Address/_Copy"
 msgstr "/А_дреса/_Умножи"
 
 msgid "/_Address/_Copy"
 msgstr "/А_дреса/_Умножи"
 

-#: src/addressbook.c:437
+#: src/addressbook.c:440

 msgid "/_Address/_Paste"
 msgstr "/А_дреса/_Пренеси"
 
 msgid "/_Address/_Paste"
 msgstr "/А_дреса/_Пренеси"
 

-#: src/addressbook.c:439
+#: src/addressbook.c:442

 msgid "/_Address/_Edit"
 msgstr "/А_дреса/_Измени"
 
 msgid "/_Address/_Edit"
 msgstr "/А_дреса/_Измени"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:443

 msgid "/_Address/_Delete"
 msgstr "/А_дреса/_Обриши"
 
 msgid "/_Address/_Delete"
 msgstr "/А_дреса/_Обриши"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:445

 msgid "/_Address/New _Address"
 msgstr "/А_дреса/Нова _адреса"
 
 msgid "/_Address/New _Address"
 msgstr "/А_дреса/Нова _адреса"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:446

 msgid "/_Address/New _Group"
 msgstr "/А_дреса/Нова _група"
 
 msgid "/_Address/New _Group"
 msgstr "/А_дреса/Нова _група"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:448

 msgid "/_Address/_Mail To"
 msgstr "/А_дреса/_Напиши поруку"
 
 msgid "/_Address/_Mail To"
 msgstr "/А_дреса/_Напиши поруку"
 

-#: src/addressbook.c:446 src/compose.c:756 src/mainwindow.c:799
+#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:799

 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/_Алати"
 
 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "/_Алати"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:450

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Алати/Увези _LDIF датотеку..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/_Алати/Увези _LDIF датотеку..."
 

-#: src/addressbook.c:448
+#: src/addressbook.c:451

 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Алати/Увези _Мутт датотеку..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/_Алати/Увези _Мутт датотеку..."
 

-#: src/addressbook.c:449
+#: src/addressbook.c:452

 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Алати/Увези _Пине датотеку..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/_Алати/Увези _Пине датотеку..."
 

-#: src/addressbook.c:450 src/mainwindow.c:808 src/mainwindow.c:831
+#: src/addressbook.c:453 src/mainwindow.c:808 src/mainwindow.c:831

 #: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
 #: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
 msgid "/_Tools/---"
 msgstr "/_Алати/---"
 
 #: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
 #: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
 msgid "/_Tools/---"
 msgstr "/_Алати/---"
 

-#: src/addressbook.c:451
+#: src/addressbook.c:454

 msgid "/_Tools/Export _HTML..."
 msgstr "/_Алати/Извези у _HTML датотеку..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/_Алати/Извези у _HTML датотеку..."
 

-#: src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Алати/Извези у LDI_F датотеку..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Алати/Извези у LDI_F датотеку..."
 

-#: src/addressbook.c:453 src/compose.c:761 src/mainwindow.c:874
+#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:874

 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/По_моћ"
 
 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/По_моћ"
 

-#: src/addressbook.c:454 src/compose.c:762 src/mainwindow.c:880
+#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:880

 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/По_моћ/_О програму"
 
 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/По_моћ/_О програму"
 

-#: src/addressbook.c:459 src/addressbook.c:473 src/compose.c:535
+#: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545

 #: src/mainwindow.c:518 src/messageview.c:164
 msgid "/_Edit"
 msgstr "/_Уређивање"
 
 #: src/mainwindow.c:518 src/messageview.c:164
 msgid "/_Edit"
 msgstr "/_Уређивање"
 

-#: src/addressbook.c:460 src/addressbook.c:474
+#: src/addressbook.c:463 src/addressbook.c:479

 msgid "/_Delete"
 msgstr "/_Обриши"
 
 msgid "/_Delete"
 msgstr "/_Обриши"
 

-#: src/addressbook.c:461 src/addressbook.c:463 src/addressbook.c:472
-#: src/addressbook.c:475 src/addressbook.c:478 src/addressbook.c:482
-#: src/compose.c:514 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
-#: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:54
-#: src/news_gtk.c:57 src/news_gtk.c:59 src/plugins/trayicon/trayicon.c:95
-#: src/plugins/trayicon/trayicon.c:98 src/plugins/trayicon/trayicon.c:100
-#: src/summaryview.c:422 src/summaryview.c:426 src/summaryview.c:431
-#: src/summaryview.c:449 src/summaryview.c:470 src/summaryview.c:476
-msgid "/---"
-msgstr "/---"
-
-#: src/addressbook.c:462
+#: src/addressbook.c:465
+msgid "/New _Book"
+msgstr "/Нови _адресар"
+
+#: src/addressbook.c:466

 msgid "/New _Folder"
 msgstr "/Нови _директоријум"
 
 msgid "/New _Folder"
 msgstr "/Нови _директоријум"
 

-#: src/addressbook.c:464 src/addressbook.c:479
+#: src/addressbook.c:467 src/addressbook.c:482
+msgid "/New _Group"
+msgstr "/Нова _група"
+
+#: src/addressbook.c:469 src/addressbook.c:484

 msgid "/C_ut"
 msgstr "/_Исеци"
 
 msgid "/C_ut"
 msgstr "/_Исеци"
 

-#: src/addressbook.c:465 src/addressbook.c:480
+#: src/addressbook.c:470 src/addressbook.c:485

 msgid "/_Copy"
 msgstr "/_Копирај"
 
 msgid "/_Copy"
 msgstr "/_Копирај"
 

-#: src/addressbook.c:466 src/addressbook.c:481
+#: src/addressbook.c:471 src/addressbook.c:486

 msgid "/_Paste"
 msgstr "/_Пренеси"
 
 msgid "/_Paste"
 msgstr "/_Пренеси"
 

-#: src/addressbook.c:471
+#: src/addressbook.c:476

 msgid "/_Select all"
 msgstr "/Одабери _све"
 
 msgid "/_Select all"
 msgstr "/Одабери _све"
 

-#: src/addressbook.c:476
+#: src/addressbook.c:481

 msgid "/New _Address"
 msgstr "/Нова _адреса"
 
 msgid "/New _Address"
 msgstr "/Нова _адреса"
 

-#: src/addressbook.c:477
-msgid "/New _Group"
-msgstr "/Нова _група"
-
-#: src/addressbook.c:484
+#: src/addressbook.c:489

 msgid "/_Mail To"
 msgstr "/_Напиши поруку"
 
 msgid "/_Mail To"
 msgstr "/_Напиши поруку"
 

-#: src/addressbook.c:486
+#: src/addressbook.c:491

 msgid "/_Browse Entry"
 msgstr "/_Прегледај унос"
 
 msgid "/_Browse Entry"
 msgstr "/_Прегледај унос"
 

-#: src/addressbook.c:499 src/crash.c:450 src/crash.c:469 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:127 src/prefs_themes.c:683
+#: src/addressbook.c:504 src/crash.c:453 src/crash.c:472 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_themes.c:683

 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Непознато"
 
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "Непознато"
 

-#: src/addressbook.c:506 src/addressbook.c:525 src/importldif.c:126
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:126

 msgid "Success"
 msgstr "Успешно"
 
 msgid "Success"
 msgstr "Успешно"
 

-#: src/addressbook.c:507 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127

 msgid "Bad arguments"
 msgstr "Лоши аргументи"
 
 msgid "Bad arguments"
 msgstr "Лоши аргументи"
 

-#: src/addressbook.c:508 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128

 msgid "File not specified"
 msgstr "Датотека није одређена"
 
 msgid "File not specified"
 msgstr "Датотека није одређена"
 

-#: src/addressbook.c:509 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129

 msgid "Error opening file"
 msgstr "Грешка при отварању датотеке"
 
 msgid "Error opening file"
 msgstr "Грешка при отварању датотеке"
 

-#: src/addressbook.c:510 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130

 msgid "Error reading file"
 msgstr "Грешка при читању датотеке"
 
 msgid "Error reading file"
 msgstr "Грешка при читању датотеке"
 

-#: src/addressbook.c:511 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131

 msgid "End of file encountered"
 msgstr "Детектован крај датотеке"
 
 msgid "End of file encountered"
 msgstr "Детектован крај датотеке"
 

-#: src/addressbook.c:512 src/importldif.c:132
+#: src/addressbook.c:517 src/importldif.c:132

 msgid "Error allocating memory"
 msgstr "Грешка при резервисању меморије"
 
 msgid "Error allocating memory"
 msgstr "Грешка при резервисању меморије"
 

-#: src/addressbook.c:513 src/importldif.c:133
+#: src/addressbook.c:518 src/importldif.c:133

 msgid "Bad file format"
 msgstr "Неисправан формат датотеке"
 
 msgid "Bad file format"
 msgstr "Неисправан формат датотеке"
 

-#: src/addressbook.c:514 src/importldif.c:134
+#: src/addressbook.c:519 src/importldif.c:134

 msgid "Error writing to file"
 msgstr "Грешка при писању у датотеку"
 
 msgid "Error writing to file"
 msgstr "Грешка при писању у датотеку"
 

-#: src/addressbook.c:515 src/importldif.c:135
+#: src/addressbook.c:520 src/importldif.c:135

 msgid "Error opening directory"
 msgstr "Грешка при отварању директоријума"
 
 msgid "Error opening directory"
 msgstr "Грешка при отварању директоријума"
 

-#: src/addressbook.c:516 src/importldif.c:136
+#: src/addressbook.c:521 src/importldif.c:136

 msgid "No path specified"
 msgstr "Путања није одређена"
 
 msgid "No path specified"
 msgstr "Путања није одређена"
 

-#: src/addressbook.c:526
+#: src/addressbook.c:531

 msgid "Error connecting to LDAP server"
 msgstr "Грешка при повезивању на LDAP сервер"
 
 msgid "Error connecting to LDAP server"
 msgstr "Грешка при повезивању на LDAP сервер"
 

-#: src/addressbook.c:527
+#: src/addressbook.c:532

 msgid "Error initializing LDAP"
 msgstr "Грешка при LDAP иницијализацији"
 
 msgid "Error initializing LDAP"
 msgstr "Грешка при LDAP иницијализацији"
 

-#: src/addressbook.c:528
+#: src/addressbook.c:533

 msgid "Error binding to LDAP server"
 msgstr "Грешка при спајању на LDAP сервер"
 
 msgid "Error binding to LDAP server"
 msgstr "Грешка при спајању на LDAP сервер"
 

-#: src/addressbook.c:529
+#: src/addressbook.c:534

 msgid "Error searching LDAP database"
 msgstr "Грешка при претраживању ЛДИФ базе података"
 
 msgid "Error searching LDAP database"
 msgstr "Грешка при претраживању ЛДИФ базе података"
 

-#: src/addressbook.c:530
+#: src/addressbook.c:535

 msgid "Timeout performing LDAP operation"
 msgstr "Истекло је време предвиђено за LDAP команду"
 
 msgid "Timeout performing LDAP operation"
 msgstr "Истекло је време предвиђено за LDAP команду"
 

-#: src/addressbook.c:531
+#: src/addressbook.c:536

 msgid "Error in LDAP search criteria"
 msgstr "Грешка у критеријуму за LDAP претрагу"
 
 msgid "Error in LDAP search criteria"
 msgstr "Грешка у критеријуму за LDAP претрагу"
 

-#: src/addressbook.c:532
+#: src/addressbook.c:537

 msgid "No LDAP entries found for search criteria"
 msgstr "Нема пронађених LDAP уноса за задати критеријум претраге"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "Нема пронађених LDAP уноса за задати критеријум претраге"
 

-#: src/addressbook.c:533
+#: src/addressbook.c:538

 msgid "LDAP search terminated on request"
 msgstr "Прекинута је претрага LDAP-а по захтеву"
 
 msgid "LDAP search terminated on request"
 msgstr "Прекинута је претрага LDAP-а по захтеву"
 

-#: src/addressbook.c:534
+#: src/addressbook.c:539

 msgid "Error starting TLS connection"
 msgstr "Настала је грешка при започињању TLS везе"
 
 msgid "Error starting TLS connection"
 msgstr "Настала је грешка при започињању TLS везе"
 

-#: src/addressbook.c:849
+#: src/addressbook.c:897

 msgid "Sources"
 msgstr "Извори"
 
 msgid "Sources"
 msgstr "Извори"
 

-#: src/addressbook.c:853 src/prefs_other.c:101 src/toolbar.c:190
-#: src/toolbar.c:1731
+#: src/addressbook.c:901 src/prefs_other.c:101 src/toolbar.c:194
+#: src/toolbar.c:1787

 msgid "Address book"
 msgstr "Адресар"
 
 msgid "Address book"
 msgstr "Адресар"
 

-#: src/addressbook.c:976
+#: src/addressbook.c:1033

 msgid "Lookup name:"
 msgstr "Тражи име:"
 
 msgid "Lookup name:"
 msgstr "Тражи име:"
 

-#: src/addressbook.c:1036 src/compose.c:1987 src/compose.c:4227
-#: src/compose.c:5430 src/compose.c:6175 src/summary_search.c:282
+#: src/addressbook.c:1106 src/compose.c:2129 src/compose.c:4443
+#: src/compose.c:5667 src/compose.c:6432 src/compose.c:9453
+#: src/summary_search.c:359

 msgid "To:"
 msgstr "Прималац:"
 
 msgid "To:"
 msgstr "Прималац:"
 

-#: src/addressbook.c:1040 src/compose.c:1971 src/compose.c:3994
-#: src/compose.c:4226
+#: src/addressbook.c:1110 src/compose.c:2113 src/compose.c:4182
+#: src/compose.c:4442 src/compose.c:9462

 msgid "Cc:"
 msgstr "Копија:"
 
 msgid "Cc:"
 msgstr "Копија:"
 

-#: src/addressbook.c:1044 src/compose.c:1974 src/compose.c:4025
+#: src/addressbook.c:1114 src/compose.c:2116 src/compose.c:4213

 msgid "Bcc:"
 msgstr "Невидљива копија:"
 
 msgid "Bcc:"
 msgstr "Невидљива копија:"
 

-#: src/addressbook.c:1279 src/addressbook.c:1302
+#: src/addressbook.c:1363 src/addressbook.c:1409

 msgid "Delete address(es)"
 msgstr "Обриши адресу(е)"
 
 msgid "Delete address(es)"
 msgstr "Обриши адресу(е)"
 

-#: src/addressbook.c:1280
+#: src/addressbook.c:1364

 msgid "This address data is readonly and cannot be deleted."
 msgstr "Податак о овој адреси је само за читање и не може се обрисати."
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "Податак о овој адреси је само за читање и не може се обрисати."
 

-#: src/addressbook.c:1303
+#: src/addressbook.c:1403
+msgid "Delete group"
+msgstr "Обриши rрупу"
+
+#: src/addressbook.c:1404
+msgid ""
+"Really delete the group(s)?\n"
+"The addresses it contains will not be lost."
+msgstr ""
+"Желите ли да обришете групу(е) „%s“?\n"
+"Адресе које се налазе у групи неће бити обрисане."
+
+#: src/addressbook.c:1410

 msgid "Really delete the address(es)?"
 msgstr "Да ли заиста желите да адресе буду обрисане?"
 
 msgid "Really delete the address(es)?"
 msgstr "Да ли заиста желите да адресе буду обрисане?"
 

-#: src/addressbook.c:1898
+#: src/addressbook.c:2014

 msgid "Cannot paste. Target address book is readonly."
 msgstr "Пренос није могућ. Циљни адресар је само за читање."
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "Пренос није могућ. Циљни адресар је само за читање."
 

-#: src/addressbook.c:1909
+#: src/addressbook.c:2025

 msgid "Cannot paste into an address group."
 msgstr "Пренос у групу није могућ."
 
 msgid "Cannot paste into an address group."
 msgstr "Пренос у групу није могућ."
 

-#: src/addressbook.c:2565
+#: src/addressbook.c:2708

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Желите ли да обришете резултате упита и адресе из „%s“ ?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "Желите ли да обришете резултате упита и адресе из „%s“ ?"
 

-#: src/addressbook.c:2568 src/addressbook.c:2594
+#: src/addressbook.c:2711 src/addressbook.c:2737 src/addressbook.c:2744

 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Обриши"
 
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "Обриши"
 

-#: src/addressbook.c:2577
+#: src/addressbook.c:2720

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -547,19 +564,28 @@ msgstr ""
 "Желите ли да обришете директоријум „%s“? Ако обришете само директоријум, "
 "адресе ће бити премештене у родитељски директоријум."
 
 "Желите ли да обришете директоријум „%s“? Ако обришете само директоријум, "
 "адресе ће бити премештене у родитељски директоријум."
 

-#: src/addressbook.c:2580 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2723 src/imap_gtk.c:284 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "Обриши директоријум"
 
 msgid "Delete folder"
 msgstr "Обриши директоријум"
 

-#: src/addressbook.c:2581
+#: src/addressbook.c:2724

 msgid "+Delete _folder only"
 msgstr "+Обриши _само директоријум"
 
 msgid "+Delete _folder only"
 msgstr "+Обриши _само директоријум"
 

-#: src/addressbook.c:2581
+#: src/addressbook.c:2724

 msgid "Delete folder and _addresses"
 msgstr "Обриши директоријум и _адресе"
 
 msgid "Delete folder and _addresses"
 msgstr "Обриши директоријум и _адресе"
 

-#: src/addressbook.c:2592
+#: src/addressbook.c:2735
+#, c-format
+msgid ""
+"Do you want to delete '%s'?\n"
+"The addresses it contains will not be lost."
+msgstr ""
+"Желите ли да обришете „%s“?\n"
+"Адресе које садржи неће бити обрисане."
+
+#: src/addressbook.c:2742

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -568,19 +594,19 @@ msgstr ""
 "Желите ли да обришете „%s“?\n"
 "Биће обрисане и адресе које садржи."
 
 "Желите ли да обришете „%s“?\n"
 "Биће обрисане и адресе које садржи."
 

-#: src/addressbook.c:3403
+#: src/addressbook.c:3595

 msgid "New user, could not save index file."
 msgstr "Ви сте нови корисник, није могуће сачиувати индексну датотеку."
 
 msgid "New user, could not save index file."
 msgstr "Ви сте нови корисник, није могуће сачиувати индексну датотеку."
 

-#: src/addressbook.c:3407
+#: src/addressbook.c:3599

 msgid "New user, could not save address book files."
 msgstr "Ви сте нови корисник, није могуће сачувати адресар."
 
 msgid "New user, could not save address book files."
 msgstr "Ви сте нови корисник, није могуће сачувати адресар."
 

-#: src/addressbook.c:3417
+#: src/addressbook.c:3609

 msgid "Old address book converted successfully."
 msgstr "Стари адресар је успешно конвертован."
 
 msgid "Old address book converted successfully."
 msgstr "Стари адресар је успешно конвертован."
 

-#: src/addressbook.c:3422
+#: src/addressbook.c:3614

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -588,7 +614,7 @@ msgstr ""
 "Стари адресар је конвертован,\n"
 "није могуће сачувати нову датотеку за индексе."
 
 "Стари адресар је конвертован,\n"
 "није могуће сачувати нову датотеку за индексе."
 

-#: src/addressbook.c:3435
+#: src/addressbook.c:3627

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -596,7 +622,7 @@ msgstr ""
 "Није могуће конвертовати адресар,\n"
 "али је направљена нова празна датотека за адресар."
 
 "Није могуће конвертовати адресар,\n"
 "али је направљена нова празна датотека за адресар."
 

-#: src/addressbook.c:3441
+#: src/addressbook.c:3633

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -604,7 +630,7 @@ msgstr ""
 "Није могуће конвертовати адресар,\n"
 "јер не може да се сачува нова датотека за индекс."
 
 "Није могуће конвертовати адресар,\n"
 "јер не може да се сачува нова датотека за индекс."
 

-#: src/addressbook.c:3446
+#: src/addressbook.c:3638

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -612,70 +638,70 @@ msgstr ""
 "Није могуће конвертовати адресар,\n"
 "и неје могуће направити нову датотеку за адресар."
 
 "Није могуће конвертовати адресар,\n"
 "и неје могуће направити нову датотеку за адресар."
 

-#: src/addressbook.c:3453 src/addressbook.c:3459
+#: src/addressbook.c:3645 src/addressbook.c:3651

 msgid "Addressbook conversion error"
 msgstr "Грешка при конверзији адресара"
 
 msgid "Addressbook conversion error"
 msgstr "Грешка при конверзији адресара"
 

-#: src/addressbook.c:3497
+#: src/addressbook.c:3689

 msgid "Addressbook Error"
 msgstr "Грешка у адресару"
 
 msgid "Addressbook Error"
 msgstr "Грешка у адресару"
 

-#: src/addressbook.c:3498
+#: src/addressbook.c:3690

 msgid "Could not read address index"
 msgstr "Није могуће читање датотеке за индексе"
 
 msgid "Could not read address index"
 msgstr "Није могуће читање датотеке за индексе"
 

-#: src/addressbook.c:3825
+#: src/addressbook.c:4017

 msgid "Busy searching..."
 msgstr "Претрага у току..."
 
 msgid "Busy searching..."
 msgstr "Претрага у току..."
 

-#: src/addressbook.c:3896
+#: src/addressbook.c:4088

 #, c-format
 msgid "Search '%s'"
 msgstr " Пронађи „%s“"
 
 #, c-format
 msgid "Search '%s'"
 msgstr " Пронађи „%s“"
 

-#: src/addressbook.c:4121
+#: src/addressbook.c:4313

 msgid "Interface"
 msgstr "Сучеље"
 
 msgid "Interface"
 msgstr "Сучеље"
 

-#: src/addressbook.c:4137 src/exphtmldlg.c:378 src/expldifdlg.c:394
+#: src/addressbook.c:4329 src/exphtmldlg.c:375 src/expldifdlg.c:394

 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Адресар"
 
 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "Адресар"
 

-#: src/addressbook.c:4153
+#: src/addressbook.c:4345

 msgid "Person"
 msgstr "Особа"
 
 msgid "Person"
 msgstr "Особа"
 

-#: src/addressbook.c:4169
+#: src/addressbook.c:4361

 msgid "EMail Address"
 msgstr "Адреса е-поште"
 
 msgid "EMail Address"
 msgstr "Адреса е-поште"
 

-#: src/addressbook.c:4185
+#: src/addressbook.c:4377

 msgid "Group"
 msgstr "Група"
 
 msgid "Group"
 msgstr "Група"
 

-#: src/addressbook.c:4201 src/exporthtml.c:922 src/folderview.c:462
-#: src/prefs_account.c:2395 src/prefs_folder_column.c:79
+#: src/addressbook.c:4393 src/exporthtml.c:922 src/folderview.c:470
+#: src/prefs_account.c:2417 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "Директоријум"
 
 msgid "Folder"
 msgstr "Директоријум"
 

-#: src/addressbook.c:4217
+#: src/addressbook.c:4409

 msgid "vCard"
 msgstr "Контакт"
 
 msgid "vCard"
 msgstr "Контакт"
 

-#: src/addressbook.c:4233 src/addressbook.c:4249
+#: src/addressbook.c:4425 src/addressbook.c:4441

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4265
+#: src/addressbook.c:4457

 msgid "LDAP servers"
 msgstr "LDAP сервери"
 
 msgid "LDAP servers"
 msgstr "LDAP сервери"
 

-#: src/addressbook.c:4281
+#: src/addressbook.c:4473

 msgid "LDAP Query"
 msgstr "LDAP упит"
 
 msgid "LDAP Query"
 msgstr "LDAP упит"
 

-#: src/addressbook.c:4597 src/matcher.c:303 src/matcher.c:756
+#: src/addressbook.c:4789 src/matcher.c:303 src/matcher.c:756

 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106


@@ -716,7 +742,7 @@ msgstr ""
 msgid "Folder :"
 msgstr "Директоријум :"
 
 msgid "Folder :"
 msgstr "Директоријум :"
 

-#: src/addrgather.c:365 src/exphtmldlg.c:546 src/expldifdlg.c:626
+#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Адресар :"
 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "Адресар :"


@@ -741,9 +767,9 @@ msgstr "Назив заглавља"
 msgid "Address Count"
 msgstr "Број налога"
 
 msgid "Address Count"
 msgstr "Број налога"
 

-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4562
-#: src/compose.c:9028 src/messageview.c:578 src/messageview.c:591
-#: src/plugins/pgpcore/sgpgme.c:565
+#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4794
+#: src/compose.c:9374 src/messageview.c:578 src/messageview.c:591
+#: src/plugins/pgpcore/sgpgme.c:574

 msgid "Warning"
 msgstr "Упозорење"
 
 msgid "Warning"
 msgstr "Упозорење"
 


@@ -751,7 +777,7 @@ msgstr "Упозорење"
 msgid "Header Fields"
 msgstr "Поља заглавља поруке"
 
 msgid "Header Fields"
 msgstr "Поља заглавља поруке"
 

-#: src/addrgather.c:539 src/exphtmldlg.c:666 src/expldifdlg.c:738
+#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Готово"
 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "Готово"


@@ -780,12 +806,12 @@ msgstr "Опште адресе"
 msgid "Personal address"
 msgstr "Личне адресе"
 
 msgid "Personal address"
 msgstr "Личне адресе"
 

-#: src/alertpanel.c:141 src/compose.c:7248
+#: src/alertpanel.c:141 src/compose.c:7582

 msgid "Notice"
 msgstr "Обавештење"
 
 msgid "Notice"
 msgstr "Обавештење"
 

-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4504 src/inc.c:594
-#: src/plugins/pgpcore/sgpgme.c:139 src/plugins/pgpcore/sgpgme.c:230
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4734 src/inc.c:616
+#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239

 msgid "Error"
 msgstr "Грешка"
 
 msgid "Error"
 msgstr "Грешка"
 


@@ -822,75 +848,103 @@ msgstr "Вредност особине"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Није могуће повезивање на NNTP сервер: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Није могуће повезивање на NNTP сервер: %s:%d\n"
 

-#: src/common/nntp.c:181 src/common/nntp.c:244
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:840
+msgid "SSL handshake failed\n"
+msgstr "SSL обнављање није успело\n"
+
+#: src/common/nntp.c:182 src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr "грешка у протоколу: %s\n"
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "грешка у протоколу: %s\n"
 

-#: src/common/nntp.c:204 src/common/nntp.c:250
+#: src/common/nntp.c:205 src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr "грешка у протоколу\n"
 
 msgid "protocol error\n"
 msgstr "грешка у протоколу\n"
 

-#: src/common/nntp.c:300
+#: src/common/nntp.c:301

 msgid "Error occurred while posting\n"
 msgstr "Настала је грешка при слању\n"
 
 msgid "Error occurred while posting\n"
 msgstr "Настала је грешка при слању\n"
 

-#: src/common/nntp.c:380
+#: src/common/nntp.c:381

 msgid "Error occurred while sending command\n"
 msgstr "Настала је грешка при слању наредбе\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "Настала је грешка при слању наредбе\n"
 

-#: src/common/plugin.c:52
+#: src/common/plugin.c:53

 msgid "Nothing"
 msgstr "Ништа"
 
 msgid "Nothing"
 msgstr "Ништа"
 

-#: src/common/plugin.c:53
+#: src/common/plugin.c:54

 msgid "a viewer"
 msgstr "Прегледник"
 
 msgid "a viewer"
 msgstr "Прегледник"
 

-#: src/common/plugin.c:54
+#: src/common/plugin.c:55

 msgid "folders"
 msgstr "Директоријуми"
 
 msgid "folders"
 msgstr "Директоријуми"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "filtering"
 msgstr "Филтрирање"
 
 msgid "filtering"
 msgstr "Филтрирање"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a privacy interface"
 msgstr "Интерфејс приватности"
 
 msgid "a privacy interface"
 msgstr "Интерфејс приватности"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "a notifier"
 msgstr "Обавештење"
 
 msgid "a notifier"
 msgstr "Обавештење"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "an utility"
 msgstr "Алатка"
 
 msgid "an utility"
 msgstr "Алатка"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "things"
 msgstr "Ствари"
 
 msgid "things"
 msgstr "Ствари"
 

-#: src/common/plugin.c:257
+#: src/common/plugin.c:258

 #, c-format
 msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Овај додатак омогућава %s (%s), што је већ омогућено додатком %s."
 
 #, c-format
 msgid "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "Овај додатак омогућава %s (%s), што је већ омогућено додатком %s."
 

-#: src/common/plugin.c:292
+#: src/common/plugin.c:293

 msgid "Plugin already loaded"
 msgstr "Додатак је већ учитан"
 
 msgid "Plugin already loaded"
 msgstr "Додатак је већ учитан"
 

-#: src/common/plugin.c:302
+#: src/common/plugin.c:303

 msgid "Failed to allocate memory for Plugin"
 msgstr "Неуспешно резервисање меморије за додатак"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "Неуспешно резервисање меморије за додатак"
 

-#: src/common/plugin.c:329
+#: src/common/plugin.c:330

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Овај модул није лиценциран под ОЈЛ компатибилном лиценцом"
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "Овај модул није лиценциран под ОЈЛ компатибилном лиценцом"
 

-#: src/common/plugin.c:336
-msgid "This module is for Sylpheed-Claws GTK1."
-msgstr "Овај модул је за Sylpheed Claws  GTK1."
+#: src/common/plugin.c:337
+msgid "This module is for Claws Mail GTK1."
+msgstr "Овај модул је за Claws Mail GTK1."
+
+#: src/common/plugin.c:547
+#, c-format
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr ""
+"Claws Mail који користите је новији од верзије за коју је компајлиран "
+"„%s“ додатак."
+
+#: src/common/plugin.c:550
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr "Claws Mail који користите је новији од верзије за коју је компајлиран додатак."
+
+#: src/common/plugin.c:559
+#, c-format
+msgid "Your version of Claws Mail is too old for the '%s' plugin."
+msgstr "Claws Mail који користите је сувише стар за „%s“ додатак"
+
+#: src/common/plugin.c:561
+msgid "Your version of Claws Mail is too old for the plugin."
+msgstr "Claws Mail који користите је сувише стар за додатак."

 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"


@@ -914,7 +968,7 @@ msgid "Message is too big (Maximum size is %s)\n"
 msgstr "Порука је превелика (максимална величина је %s)\n"
 
 #: src/common/smtp.c:635 src/pop.c:835
 msgstr "Порука је превелика (максимална величина је %s)\n"
 
 #: src/common/smtp.c:635 src/pop.c:835

-msgid "can't start TLS session\n"
+msgid "couldn't start TLS session\n"

 msgstr "није могуће започињање TLS сесије\n"
 
 #: src/common/socket.c:1405
 msgstr "није могуће започињање TLS сесије\n"
 
 #: src/common/socket.c:1405


@@ -931,16 +985,16 @@ msgstr "Настала је грешка при прављењу SSL садрж
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL конекција неуспела (%s)\n"
 
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL конекција неуспела (%s)\n"
 

-#: src/common/ssl_certificate.c:189 src/common/ssl_certificate.c:200
-#: src/common/ssl_certificate.c:206 src/common/ssl_certificate.c:213
-#: src/common/ssl_certificate.c:224 src/common/ssl_certificate.c:230
+#: src/common/ssl_certificate.c:208 src/common/ssl_certificate.c:219
+#: src/common/ssl_certificate.c:225 src/common/ssl_certificate.c:232
+#: src/common/ssl_certificate.c:243 src/common/ssl_certificate.c:249

 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<није сертификовано>"
 
 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<није сертификовано>"
 

-#: src/common/ssl_certificate.c:239
+#: src/common/ssl_certificate.c:258

 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"


@@ -953,486 +1007,716 @@ msgstr ""
 "  Отисак: %s\n"
 "  Статус потписа: %s"
 
 "  Отисак: %s\n"
 "  Статус потписа: %s"
 

-#: src/common/ssl_certificate.c:348
-msgid "Can't load X509 default paths"
+#: src/common/ssl_certificate.c:385
+msgid "Couldn't load X509 default paths"

 msgstr "Није могуће учитавање подразумеване путање до X509"
 
 #: src/common/string_match.c:79
 msgid "(Subject cleared by RegExp)"
 msgstr "(Тема очишћена регуларним изразом)"
 
 msgstr "Није могуће учитавање подразумеване путање до X509"
 
 #: src/common/string_match.c:79
 msgid "(Subject cleared by RegExp)"
 msgstr "(Тема очишћена регуларним изразом)"
 

-#: src/common/utils.c:355
+#: src/common/utils.c:348

 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 

-#: src/common/utils.c:356
+#: src/common/utils.c:349

 #, c-format
 #, c-format

-msgid "%d.%dKB"
-msgstr "%d.%dKB"
+msgid "%d.%02dKB"
+msgstr "%d.%02dKB"

 
 

-#: src/common/utils.c:357
+#: src/common/utils.c:350

 #, c-format
 #, c-format

-msgid "%.2fMB"
-msgstr "%.2fMB"
+msgid "%d.%02dMB"
+msgstr "%d.%02dMB"

 
 

-#: src/common/utils.c:358
+#: src/common/utils.c:351

 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 

-#: src/compose.c:512
+#: src/common/utils.c:4799
+msgid "Complete day name for use by strftime|Sunday"
+msgstr "Недеља"
+
+#: src/common/utils.c:4800
+msgid "Complete day name for use by strftime|Monday"
+msgstr "Понедељак"
+
+#: src/common/utils.c:4801
+msgid "Complete day name for use by strftime|Tuesday"
+msgstr "Уторак"
+
+#: src/common/utils.c:4802
+msgid "Complete day name for use by strftime|Wednesday"
+msgstr "Среда"
+
+#: src/common/utils.c:4803
+msgid "Complete day name for use by strftime|Thursday"
+msgstr "Четвртак"
+
+#: src/common/utils.c:4804
+msgid "Complete day name for use by strftime|Friday"
+msgstr "Петак"
+
+#: src/common/utils.c:4805
+msgid "Complete day name for use by strftime|Saturday"
+msgstr "Субота"
+
+#: src/common/utils.c:4807
+msgid "Complete month name for use by strftime|January"
+msgstr "Јануар"
+
+#: src/common/utils.c:4808
+msgid "Complete month name for use by strftime|February"
+msgstr "Фебруар"
+
+#: src/common/utils.c:4809
+msgid "Complete month name for use by strftime|March"
+msgstr "Март"
+
+#: src/common/utils.c:4810
+msgid "Complete month name for use by strftime|April"
+msgstr "Април"
+
+#: src/common/utils.c:4811
+msgid "Complete month name for use by strftime|May"
+msgstr "Мај"
+
+#: src/common/utils.c:4812
+msgid "Complete month name for use by strftime|June"
+msgstr "Јун"
+
+#: src/common/utils.c:4813
+msgid "Complete month name for use by strftime|July"
+msgstr "Јул"
+
+#: src/common/utils.c:4814
+msgid "Complete month name for use by strftime|August"
+msgstr "Август"
+
+#: src/common/utils.c:4815
+msgid "Complete month name for use by strftime|September"
+msgstr "Септембар"
+
+#: src/common/utils.c:4816
+msgid "Complete month name for use by strftime|October"
+msgstr "Октобар"
+
+#: src/common/utils.c:4817
+msgid "Complete month name for use by strftime|November"
+msgstr "Новембар"
+
+#: src/common/utils.c:4818
+msgid "Complete month name for use by strftime|December"
+msgstr "Децембар"
+
+#: src/common/utils.c:4820
+msgid "Abbr. day name for use by strftime|Sun"
+msgstr "Нед"
+
+#: src/common/utils.c:4821
+msgid "Abbr. day name for use by strftime|Mon"
+msgstr "Пон"
+
+#: src/common/utils.c:4822
+msgid "Abbr. day name for use by strftime|Tue"
+msgstr "Уто"
+
+#: src/common/utils.c:4823
+msgid "Abbr. day name for use by strftime|Wed"
+msgstr "Сре"
+
+#: src/common/utils.c:4824
+msgid "Abbr. day name for use by strftime|Thu"
+msgstr "Чет"
+
+#: src/common/utils.c:4825
+msgid "Abbr. day name for use by strftime|Fri"
+msgstr "Пет"
+
+#: src/common/utils.c:4826
+msgid "Abbr. day name for use by strftime|Sat"
+msgstr "Суб"
+
+#: src/common/utils.c:4828
+msgid "Abbr. month name for use by strftime|Jan"
+msgstr "Јан"
+
+#: src/common/utils.c:4829
+msgid "Abbr. month name for use by strftime|Feb"
+msgstr "Феб"
+
+#: src/common/utils.c:4830
+msgid "Abbr. month name for use by strftime|Mar"
+msgstr "Мар"
+
+#: src/common/utils.c:4831
+msgid "Abbr. month name for use by strftime|Apr"
+msgstr "Апр"
+
+#: src/common/utils.c:4832
+msgid "Abbr. month name for use by strftime|May"
+msgstr "Мај"
+
+#: src/common/utils.c:4833
+msgid "Abbr. month name for use by strftime|Jun"
+msgstr "Јун"
+
+#: src/common/utils.c:4834
+msgid "Abbr. month name for use by strftime|Jul"
+msgstr "Јул"
+
+#: src/common/utils.c:4835
+msgid "Abbr. month name for use by strftime|Aug"
+msgstr "Авг"
+
+#: src/common/utils.c:4836
+msgid "Abbr. month name for use by strftime|Sep"
+msgstr "Сеп"
+
+#: src/common/utils.c:4837
+msgid "Abbr. month name for use by strftime|Oct"
+msgstr "Окт"
+
+#: src/common/utils.c:4838
+msgid "Abbr. month name for use by strftime|Nov"
+msgstr "Нов"
+
+#: src/common/utils.c:4839
+msgid "Abbr. month name for use by strftime|Dec"
+msgstr "Дец"
+
+#: src/common/utils.c:4841
+msgid "For use by strftime (morning)|AM"
+msgstr "Пре подне"
+
+#: src/common/utils.c:4842
+msgid "For use by strftime (afternoon)|PM"
+msgstr "Поподне"
+
+#: src/common/utils.c:4843
+msgid "For use by strftime (morning, lowercase)|am"
+msgstr "пре подне"
+
+#: src/common/utils.c:4844
+msgid "For use by strftime (afternoon, lowercase)|pm"
+msgstr "поподне"
+
+#: src/common/utils.c:4846
+msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
+msgstr "%a, %e.%b.%Y %H:%M:%S"
+
+#: src/common/utils.c:4847
+msgid "For use by strftime (default date format)|%m/%d/%y"
+msgstr "%d.%m.%y"
+
+#: src/common/utils.c:4848
+msgid "For use by strftime (default time format)|%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#: src/common/utils.c:4850
+msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#: src/compose.c:522

 msgid "/_Add..."
 msgstr "/_Додај..."
 
 msgid "/_Add..."
 msgstr "/_Додај..."
 

-#: src/compose.c:513
+#: src/compose.c:523

 msgid "/_Remove"
 msgstr "/_Уклони"
 
 msgid "/_Remove"
 msgstr "/_Уклони"
 

-#: src/compose.c:515 src/folderview.c:292
+#: src/compose.c:525 src/folderview.c:294

 msgid "/_Properties..."
 msgstr "/_Поставке..."
 
 msgid "/_Properties..."
 msgstr "/_Поставке..."
 

-#: src/compose.c:520 src/mainwindow.c:740 src/messageview.c:285
+#: src/compose.c:530 src/mainwindow.c:740 src/messageview.c:285

 msgid "/_Message"
 msgstr "/_Порука"
 
 msgid "/_Message"
 msgstr "/_Порука"
 

-#: src/compose.c:521
+#: src/compose.c:531

 msgid "/_Message/_Send"
 msgstr "/_Порука/_Пошаљи"
 
 msgid "/_Message/_Send"
 msgstr "/_Порука/_Пошаљи"
 

-#: src/compose.c:523
+#: src/compose.c:533

 msgid "/_Message/Send _later"
 msgstr "/_Порука/Пошаљи _касније"
 
 msgid "/_Message/Send _later"
 msgstr "/_Порука/Пошаљи _касније"
 

-#: src/compose.c:525 src/compose.c:529 src/compose.c:532 src/mainwindow.c:750
+#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:750

 #: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
 #: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Порука/---"
 
 #: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
 #: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
 msgid "/_Message/---"
 msgstr "/_Порука/---"
 

-#: src/compose.c:526
+#: src/compose.c:536

 msgid "/_Message/_Attach file"
 msgstr "/_Порука/Прика_чи датотеку"
 
 msgid "/_Message/_Attach file"
 msgstr "/_Порука/Прика_чи датотеку"
 

-#: src/compose.c:527
+#: src/compose.c:537

 msgid "/_Message/_Insert file"
 msgstr "/_Порука/_Уметни датотеку"
 
 msgid "/_Message/_Insert file"
 msgstr "/_Порука/_Уметни датотеку"
 

-#: src/compose.c:528
+#: src/compose.c:538

 msgid "/_Message/Insert si_gnature"
 msgstr "/_Порука/_Потпиши поруку"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/_Порука/_Потпиши поруку"
 

-#: src/compose.c:530
+#: src/compose.c:540

 msgid "/_Message/_Save"
 msgstr "/_Порука/_Сачувај"
 
 msgid "/_Message/_Save"
 msgstr "/_Порука/_Сачувај"
 

-#: src/compose.c:533
+#: src/compose.c:543

 msgid "/_Message/_Close"
 msgstr "/_Порука/_Затвори"
 
 msgid "/_Message/_Close"
 msgstr "/_Порука/_Затвори"
 

-#: src/compose.c:536
+#: src/compose.c:546

 msgid "/_Edit/_Undo"
 msgstr "/_Уређивање/_Опозови"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Уређивање/_Опозови"
 

-#: src/compose.c:537
+#: src/compose.c:547

 msgid "/_Edit/_Redo"
 msgstr "/_Уређивање/_Понови"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Уређивање/_Понови"
 

-#: src/compose.c:538 src/compose.c:626 src/compose.c:629 src/compose.c:635
+#: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645

 #: src/mainwindow.c:522 src/messageview.c:167
 msgid "/_Edit/---"
 msgstr "/_Уређивање/---"
 
 #: src/mainwindow.c:522 src/messageview.c:167
 msgid "/_Edit/---"
 msgstr "/_Уређивање/---"
 

-#: src/compose.c:539
+#: src/compose.c:549

 msgid "/_Edit/Cu_t"
 msgstr "/_Уређивање/_Исеци"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Уређивање/_Исеци"
 

-#: src/compose.c:540 src/mainwindow.c:519 src/messageview.c:165
+#: src/compose.c:550 src/mainwindow.c:519 src/messageview.c:165

 msgid "/_Edit/_Copy"
 msgstr "/_Уређивање/_Умножи"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Уређивање/_Умножи"
 

-#: src/compose.c:541
+#: src/compose.c:551

 msgid "/_Edit/_Paste"
 msgstr "/_Уређивање/_Пренеси"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Уређивање/_Пренеси"
 

-#: src/compose.c:542
+#: src/compose.c:552

 msgid "/_Edit/Special paste"
 msgstr "/_Уређивање/Напредно уметање"
 
 msgid "/_Edit/Special paste"
 msgstr "/_Уређивање/Напредно уметање"
 

-#: src/compose.c:543
+#: src/compose.c:553

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Уређивање/Напредно уметање/као _цитат"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/_Уређивање/Напредно уметање/као _цитат"
 

-#: src/compose.c:545
+#: src/compose.c:555

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Уређивање/Напредно уметање/_преломљено"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/_Уређивање/Напредно уметање/_преломљено"
 

-#: src/compose.c:547
+#: src/compose.c:557

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Уређивање/Напредно уметање/_непреломљено"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/_Уређивање/Напредно уметање/_непреломљено"
 

-#: src/compose.c:549 src/mainwindow.c:520 src/messageview.c:166
+#: src/compose.c:559 src/mainwindow.c:520 src/messageview.c:166

 msgid "/_Edit/Select _all"
 msgstr "/_Уређивање/Одабери _све"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Уређивање/Одабери _све"
 

-#: src/compose.c:550
+#: src/compose.c:560

 msgid "/_Edit/A_dvanced"
 msgstr "/_Уређивање/_Напредно"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Уређивање/_Напредно"
 

-#: src/compose.c:551
+#: src/compose.c:561

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Уређивање/_Напредно/Помери карактер уназад"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Уређивање/_Напредно/Помери карактер уназад"
 

-#: src/compose.c:556
+#: src/compose.c:566

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Уређивање/_Напредно/Помери карактер напред"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Уређивање/_Напредно/Помери карактер напред"
 

-#: src/compose.c:561
+#: src/compose.c:571

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Уређивање/_Напредно/Помери реч уназад"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Уређивање/_Напредно/Помери реч уназад"
 

-#: src/compose.c:566
+#: src/compose.c:576

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Уређивање/_Напредно/Помери реч напред"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Уређивање/_Напредно/Помери реч напред"
 

-#: src/compose.c:571
+#: src/compose.c:581

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Уређивање/_Напредно/Помери на почетак линије"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Уређивање/_Напредно/Помери на почетак линије"
 

-#: src/compose.c:576
+#: src/compose.c:586

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Уређивање/_Напредно/Помери на крај линије"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Уређивање/_Напредно/Помери на крај линије"
 

-#: src/compose.c:581
+#: src/compose.c:591

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Уређивање/_Напредно/Помери у претходну линију"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Уређивање/_Напредно/Помери у претходну линију"
 

-#: src/compose.c:586
+#: src/compose.c:596

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Уређивање/_Напредно/Помери у следећу линију"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Уређивање/_Напредно/Помери у следећу линију"
 

-#: src/compose.c:591
+#: src/compose.c:601

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Уређивање/_Напредно/Обриши претходни карактер"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Уређивање/_Напредно/Обриши претходни карактер"
 

-#: src/compose.c:596
+#: src/compose.c:606

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Уређивање/_Напредно/Обриши следећи карактер"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Уређивање/_Напредно/Обриши следећи карактер"
 

-#: src/compose.c:601
+#: src/compose.c:611

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Уређивање/_Напредно/Обриши претходну реч"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Уређивање/_Напредно/Обриши претходну реч"
 

-#: src/compose.c:606
+#: src/compose.c:616

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Уређивање/_Напредно/Обриши следећу реч"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Уређивање/_Напредно/Обриши следећу реч"
 

-#: src/compose.c:611
+#: src/compose.c:621

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Уређивање/_Напредно/Обриши линију"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Уређивање/_Напредно/Обриши линију"
 

-#: src/compose.c:616
+#: src/compose.c:626

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Уређивање/_Напредно/Обриши комплетну линију"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Уређивање/_Напредно/Обриши комплетну линију"
 

-#: src/compose.c:621
+#: src/compose.c:631

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Уређивање/_Напредно/Обриши до краја линије"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Уређивање/_Напредно/Обриши до краја линије"
 

-#: src/compose.c:627
+#: src/compose.c:637

 msgid "/_Edit/_Find"
 msgstr "/_Уређивање/_Претрага"
 
 msgid "/_Edit/_Find"
 msgstr "/_Уређивање/_Претрага"
 

-#: src/compose.c:630
+#: src/compose.c:640

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Уређивање/Прелом _текућег пасуса"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Уређивање/Прелом _текућег пасуса"
 

-#: src/compose.c:632
+#: src/compose.c:642

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Уређивање/Прелом свих _дугих линија"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Уређивање/Прелом свих _дугих линија"
 

-#: src/compose.c:634
+#: src/compose.c:644

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Уређивање/Аут_оматски прелом дугих линија"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Уређивање/Аут_оматски прелом дугих линија"
 

-#: src/compose.c:636
+#: src/compose.c:646

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Уређивање/Измена у спољном ур_еђивачу текста"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Уређивање/Измена у спољном ур_еђивачу текста"
 

-#: src/compose.c:639
+#: src/compose.c:649

 msgid "/_Spelling"
 msgstr "/_Правопис"
 
 msgid "/_Spelling"
 msgstr "/_Правопис"
 

-#: src/compose.c:640
+#: src/compose.c:650

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Правопис/_Провери цео или одабрани текст"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Правопис/_Провери цео или одабрани текст"
 

-#: src/compose.c:642
+#: src/compose.c:652

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Правопис/_Означи све погрешно написане речи"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Правопис/_Означи све погрешно написане речи"
 

-#: src/compose.c:644
+#: src/compose.c:654

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Правопис/_Уназад провери погрешно написане речи"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Правопис/_Уназад провери погрешно написане речи"
 

-#: src/compose.c:646
+#: src/compose.c:656

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Правопис/_Иди до следеће погрешно написане речи"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Правопис/_Иди до следеће погрешно написане речи"
 

-#: src/compose.c:648
+#: src/compose.c:658

 msgid "/_Spelling/---"
 msgstr "/_Правопис/---"
 
 msgid "/_Spelling/---"
 msgstr "/_Правопис/---"
 

-#: src/compose.c:649
+#: src/compose.c:659

 msgid "/_Spelling/Options"
 msgstr "/_Правопис/Поставке"
 
 msgid "/_Spelling/Options"
 msgstr "/_Правопис/Поставке"
 

-#: src/compose.c:652
+#: src/compose.c:662

 msgid "/_Options"
 msgstr "/_Поставке"
 
 msgid "/_Options"
 msgstr "/_Поставке"
 

-#: src/compose.c:653
-msgid "/_Options/Privacy System"
-msgstr "/_Ð\9fоÑ\81Ñ\82авке/Ð\9fÑ\80иваÑ\82ноÑ\81Ñ\82"
+#: src/compose.c:663
+msgid "/_Options/Reply _mode"
+msgstr "/_Ð\9fоÑ\81Ñ\82авке/Ре_жим одговоÑ\80а"

 
 

-#: src/compose.c:654
-msgid "/_Options/Privacy System/None"
-msgstr "/_Поставке/Приватност/Искључено"
+#: src/compose.c:664
+msgid "/_Options/Reply _mode/_Normal"
+msgstr "/_Поставке/Ре_жим одговора/_Нормалан"
+
+#: src/compose.c:665
+msgid "/_Options/Reply _mode/_All"
+msgstr "/_Порука/Ре_жим одговора/_Свима"
+
+#: src/compose.c:666
+msgid "/_Options/Reply _mode/_Sender"
+msgstr "/_Порука/Ре_жим одговора/_Аутору"
+
+#: src/compose.c:667
+msgid "/_Options/Reply _mode/_Mailing-list"
+msgstr "/_Порука/Ре_жим одговора/Одговор на _дописно друштво"

 
 

-#: src/compose.c:655
+#: src/compose.c:668 src/compose.c:673 src/compose.c:680 src/compose.c:682
+#: src/compose.c:684
+msgid "/_Options/---"
+msgstr "/_Поставке/---"
+
+#: src/compose.c:669
+msgid "/_Options/Privacy _System"
+msgstr "/_Поставке/_Систем приватности"
+
+#: src/compose.c:670
+msgid "/_Options/Privacy _System/None"
+msgstr "/_Поставке/_Систем приватности/Искључено"
+
+#: src/compose.c:671

 msgid "/_Options/Si_gn"
 msgstr "/_Поставке/_Потпис"
 
 msgid "/_Options/Si_gn"
 msgstr "/_Поставке/_Потпис"
 

-#: src/compose.c:656
+#: src/compose.c:672

 msgid "/_Options/_Encrypt"
 msgstr "/_Поставке/_Енкрипција"
 
 msgid "/_Options/_Encrypt"
 msgstr "/_Поставке/_Енкрипција"
 

-#: src/compose.c:657 src/compose.c:664 src/compose.c:666 src/compose.c:668
-msgid "/_Options/---"
-msgstr "/_Поставке/---"
-
-#: src/compose.c:658
+#: src/compose.c:674

 msgid "/_Options/_Priority"
 msgstr "/_Поставке/Приорите_т"
 
 msgid "/_Options/_Priority"
 msgstr "/_Поставке/Приорите_т"
 

-#: src/compose.c:659
+#: src/compose.c:675

 msgid "/_Options/Priority/_Highest"
 msgstr "/_Поставке/Приорите_т/Н_ајвиши"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/_Поставке/Приорите_т/Н_ајвиши"
 

-#: src/compose.c:660
+#: src/compose.c:676

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Поставке/Приорите_т/_Висок"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/_Поставке/Приорите_т/_Висок"
 

-#: src/compose.c:661
+#: src/compose.c:677

 msgid "/_Options/Priority/_Normal"
 msgstr "/_Поставке/Приорите_т/_Нормалан"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/_Поставке/Приорите_т/_Нормалан"
 

-#: src/compose.c:662
+#: src/compose.c:678

 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Поставке/Приорите_т/Ни_зак"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/_Поставке/Приорите_т/Ни_зак"
 

-#: src/compose.c:663
+#: src/compose.c:679

 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Поставке/Приорите_т/На_јнижи"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/_Поставке/Приорите_т/На_јнижи"
 

-#: src/compose.c:665
+#: src/compose.c:681

 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Поставке/Захтевај потвр_ду пријема"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/_Поставке/Захтевај потвр_ду пријема"
 

-#: src/compose.c:667
+#: src/compose.c:683

 msgid "/_Options/Remo_ve references"
 msgstr "/_Поставке/Уклони ре_ференце"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/_Поставке/Уклони ре_ференце"
 

-#: src/compose.c:674
+#: src/compose.c:690

 msgid "/_Options/Character _encoding"
 msgstr "/_Поставке/С_куп знакова"
 
 msgid "/_Options/Character _encoding"
 msgstr "/_Поставке/С_куп знакова"
 

-#: src/compose.c:675
+#: src/compose.c:691

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Поставке/С_куп знакова/_Аутоматско препознавање"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/_Поставке/С_куп знакова/_Аутоматско препознавање"
 

-#: src/compose.c:677 src/compose.c:683 src/compose.c:691 src/compose.c:695
-#: src/compose.c:701 src/compose.c:705 src/compose.c:711 src/compose.c:717
-#: src/compose.c:721 src/compose.c:731 src/compose.c:735 src/compose.c:745
-#: src/compose.c:749
+#: src/compose.c:693 src/compose.c:699 src/compose.c:707 src/compose.c:711
+#: src/compose.c:717 src/compose.c:721 src/compose.c:727 src/compose.c:733
+#: src/compose.c:737 src/compose.c:747 src/compose.c:751 src/compose.c:761
+#: src/compose.c:765

 msgid "/_Options/Character _encoding/---"
 msgstr "/_Поставке/С_куп знакова/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/_Поставке/С_куп знакова/---"
 

-#: src/compose.c:679
+#: src/compose.c:695

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Поставке/С_куп знакова/7бит аски (US-ASC_II)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Поставке/С_куп знакова/7бит аски (US-ASC_II)"
 

-#: src/compose.c:681
+#: src/compose.c:697

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Поставке/С_куп знакова/Јуникод (_UTF-8)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/_Поставке/С_куп знакова/Јуникод (_UTF-8)"
 

-#: src/compose.c:685
+#: src/compose.c:701

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Поставке/С_куп знакова/Западноевропски (ISO-8859-_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/_Поставке/С_куп знакова/Западноевропски (ISO-8859-_1)"
 

-#: src/compose.c:687
+#: src/compose.c:703

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Поставке/С_куп знакова/Западноевропски (ISO-8859-15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/_Поставке/С_куп знакова/Западноевропски (ISO-8859-15)"
 

-#: src/compose.c:689
+#: src/compose.c:705

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Поставке/С_куп знакова/Западноевропски (Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/_Поставке/С_куп знакова/Западноевропски (Windows-1252)"
 

-#: src/compose.c:693
+#: src/compose.c:709

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Поставке/С_куп знакова/Централноевропски (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Поставке/С_куп знакова/Централноевропски (ISO-8859-_2)"
 

-#: src/compose.c:697
+#: src/compose.c:713

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Поставке/С_куп знакова/Балтички (ISO-8858-1_3)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Поставке/С_куп знакова/Балтички (ISO-8858-1_3)"
 

-#: src/compose.c:699
+#: src/compose.c:715

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Поставке/С_куп знакова/Балтички (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Поставке/С_куп знакова/Балтички (ISO-8859-_4)"
 

-#: src/compose.c:703
+#: src/compose.c:719

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Поставке/С_куп знакова/Грчки (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Поставке/С_куп знакова/Грчки (ISO-8859-_7)"
 

-#: src/compose.c:707
+#: src/compose.c:723

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Поставке/С_куп знакова/Хебрејски (ISO-8859-_8)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Поставке/С_куп знакова/Хебрејски (ISO-8859-_8)"
 

-#: src/compose.c:709
+#: src/compose.c:725

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Поставке/С_куп знакова/Хебрејски (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Поставке/С_куп знакова/Хебрејски (Windows-1255)"
 

-#: src/compose.c:713
+#: src/compose.c:729

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Поставке/С_куп знакова/Арапски (ISO-8859-_6)"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/_Поставке/С_куп знакова/Арапски (ISO-8859-_6)"
 

-#: src/compose.c:715
+#: src/compose.c:731

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Поставке/С_куп знакова/Арапски (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/_Поставке/С_куп знакова/Арапски (Windows-1256)"
 

-#: src/compose.c:719
+#: src/compose.c:735

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Поставке/С_куп знакова/Турски (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Поставке/С_куп знакова/Турски (ISO-8859-_9)"
 

-#: src/compose.c:723
+#: src/compose.c:739

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Поставке/С_куп знакова/Ћирилица (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Поставке/С_куп знакова/Ћирилица (ISO-8859-_5)"
 

-#: src/compose.c:725
+#: src/compose.c:741

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Поставке/С_куп знакова/Ћирилица (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Поставке/С_куп знакова/Ћирилица (KOI8-_R)"
 

-#: src/compose.c:727
+#: src/compose.c:743

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Поставке/С_куп знакова/Ћирилица (KOI8-_U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Поставке/С_куп знакова/Ћирилица (KOI8-_U)"
 

-#: src/compose.c:729
+#: src/compose.c:745

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Поставке/С_куп знакова/Ћирилица (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Поставке/С_куп знакова/Ћирилица (Windows-1251)"
 

-#: src/compose.c:733
+#: src/compose.c:749

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Поставке/С_куп знакова/Јапански (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Поставке/С_куп знакова/Јапански (ISO-2022-_JP)"
 

-#: src/compose.c:737
+#: src/compose.c:753

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Поставке/С_куп знакова/Поједностављени Кинески (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Поставке/С_куп знакова/Поједностављени Кинески (_GB2312)"
 

-#: src/compose.c:739
+#: src/compose.c:755

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Поставке/С_куп знакова/Поједностављени Кинески (GBK)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Поставке/С_куп знакова/Поједностављени Кинески (GBK)"
 

-#: src/compose.c:741
+#: src/compose.c:757

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Поставке/С_куп знакова/Традиционални Кинески (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Поставке/С_куп знакова/Традиционални Кинески (_Big5)"
 

-#: src/compose.c:743
+#: src/compose.c:759

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Поставке/С_куп знакова/Традиционални Кинески (EUC-_ТW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Поставке/С_куп знакова/Традиционални Кинески (EUC-_ТW)"
 

-#: src/compose.c:747
+#: src/compose.c:763

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Поставке/С_куп знакова/Корејски (EUC-_KR)"
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Поставке/С_куп знакова/Корејски (EUC-_KR)"
 

-#: src/compose.c:751
+#: src/compose.c:767

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Поставке/С_куп знакова/Таи (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/_Поставке/С_куп знакова/Таи (TIS-620)"
 

-#: src/compose.c:753
+#: src/compose.c:769

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Поставке/С_куп знакова/Таи (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/_Поставке/С_куп знакова/Таи (Windows-874)"
 

-#: src/compose.c:757
+#: src/compose.c:773

 msgid "/_Tools/Show _ruler"
 msgstr "/_Алати/Приказ _лењира"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Алати/Приказ _лењира"
 

-#: src/compose.c:758 src/messageview.c:303
+#: src/compose.c:774 src/messageview.c:303

 msgid "/_Tools/_Address book"
 msgstr "/_Алати/_Адресар"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Алати/_Адресар"
 

-#: src/compose.c:759
+#: src/compose.c:775

 msgid "/_Tools/_Template"
 msgstr "/_Алати/_Шаблон"
 
 msgid "/_Tools/_Template"
 msgstr "/_Алати/_Шаблон"
 

-#: src/compose.c:760 src/mainwindow.c:832 src/messageview.c:328
+#: src/compose.c:776 src/mainwindow.c:832 src/messageview.c:328

 msgid "/_Tools/Actio_ns"
 msgstr "/_Алати/Ак_ције"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Алати/Ак_ције"
 

-#: src/compose.c:1554
+#: src/compose.c:1039 src/prefs_compose_writing.c:384
+msgid "New message subject format error."
+msgstr "Неисправан формат поља за тему нове поруке."
+
+#: src/compose.c:1068 src/prefs_compose_writing.c:388
+msgid "New message body format error."
+msgstr "Неисправан формат тела нове поруке."
+
+#: src/compose.c:1438 src/prefs_quote.c:281
+msgid "Message reply format error."
+msgstr "Неисправан формат поља за одговор поруке."
+
+#: src/compose.c:1555 src/prefs_quote.c:286
+msgid "Message forward format error."
+msgstr "Неисправан формат поља за прослеђивање поруке."
+
+#: src/compose.c:1675

 msgid "Fw: multiple emails"
 msgstr "Fw: вишеструке поруке"
 
 msgid "Fw: multiple emails"
 msgstr "Fw: вишеструке поруке"
 

-#: src/compose.c:1977
+#: src/compose.c:2050
+msgid "Message redirect format error."
+msgstr "Неисправан формат поља за преусмеравање."
+
+#: src/compose.c:2119

 msgid "Reply-To:"
 msgstr "Одговор-За:"
 
 msgid "Reply-To:"
 msgstr "Одговор-За:"
 

-#: src/compose.c:1980 src/compose.c:5427 src/compose.c:6177
+#: src/compose.c:2122 src/compose.c:5664 src/compose.c:6434 src/compose.c:9472

 msgid "Newsgroups:"
 msgstr "Дискусиона група:"
 
 msgid "Newsgroups:"
 msgstr "Дискусиона група:"
 

-#: src/compose.c:1983
+#: src/compose.c:2125

 msgid "Followup-To:"
 msgstr "Настави-На:"
 
 msgid "Followup-To:"
 msgstr "Настави-На:"
 

-#: src/compose.c:2380
+#: src/compose.c:2304
+#, c-format
+msgid "The file '%s' has been attached."
+msgstr "Датотека „%s“ је приложена."
+
+#: src/compose.c:2308
+msgid "Couldn't attach a file (charset conversion failed)."
+msgstr "Није могуће прилагање датотеке (неуспела конверзија скупа знакова)."
+
+#: src/compose.c:2539

 msgid "Quote mark format error."
 msgstr "Грешка за ознаку цитата."
 
 msgid "Quote mark format error."
 msgstr "Грешка за ознаку цитата."
 

-#: src/compose.c:2396
-msgid "Message reply/forward format error."
-msgstr "Грешка за формат одговора/прослеђивања поруке."
-
-#: src/compose.c:2953
+#: src/compose.c:3133

 #, c-format
 msgid "File %s is empty."
 msgstr "Датотека %s је празна."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Датотека %s је празна."
 

-#: src/compose.c:2957
+#: src/compose.c:3137

 #, c-format
 msgid "Can't read %s."
 msgstr "Није могуће читање датотеке %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "Није могуће читање датотеке %s."
 

-#: src/compose.c:2984
+#: src/compose.c:3164

 #, c-format
 msgid "Message: %s"
 msgstr "Порука: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Порука: %s"
 

-#: src/compose.c:3796
+#: src/compose.c:3983

 msgid " [Edited]"
 msgstr " [Измењено]"
 
 msgid " [Edited]"
 msgstr " [Измењено]"
 

-#: src/compose.c:3802
+#: src/compose.c:3989

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Састављање поруке%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Састављање поруке%s"
 

-#: src/compose.c:3805
+#: src/compose.c:3992

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[без теме] - Састављање поруке%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[без теме] - Састављање поруке%s"
 

-#: src/compose.c:3830 src/messageview.c:613
+#: src/compose.c:4017 src/messageview.c:613

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1440,32 +1724,32 @@ msgstr ""
 "Нисте одредили налог за слање поруке.\n"
 "Одаберите налог е-поште пре слања."
 
 "Нисте одредили налог за слање поруке.\n"
 "Одаберите налог е-поште пре слања."
 

-#: src/compose.c:4007 src/compose.c:4038 src/compose.c:4069 src/toolbar.c:391
-#: src/toolbar.c:442
+#: src/compose.c:4195 src/compose.c:4226 src/compose.c:4258 src/toolbar.c:401
+#: src/toolbar.c:452

 msgid "Send"
 msgstr "Слање"
 
 msgid "Send"
 msgstr "Слање"
 

-#: src/compose.c:4008
+#: src/compose.c:4196

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Једини прималац је подразумевана CC адреса. Да ипак пошаљем?"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "Једини прималац је подразумевана CC адреса. Да ипак пошаљем?"
 

-#: src/compose.c:4009 src/compose.c:4040 src/compose.c:4071 src/compose.c:4504
+#: src/compose.c:4197 src/compose.c:4228 src/compose.c:4260 src/compose.c:4734

 msgid "+_Send"
 msgstr "+_Пошаљи"
 
 msgid "+_Send"
 msgstr "+_Пошаљи"
 

-#: src/compose.c:4039
+#: src/compose.c:4227

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Једини прималац је подразумевана BCC адреса. Да ипак пошаљем?"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "Једини прималац је подразумевана BCC адреса. Да ипак пошаљем?"
 

-#: src/compose.c:4056
+#: src/compose.c:4244

 msgid "Recipient is not specified."
 msgstr "Нисте одредили примаоца поруке."
 
 msgid "Recipient is not specified."
 msgstr "Нисте одредили примаоца поруке."
 

-#: src/compose.c:4070
+#: src/compose.c:4259

 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема је празна. Да ли да ипак пошаљем поруку?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема је празна. Да ли да ипак пошаљем поруку?"
 

-#: src/compose.c:4112 src/compose.c:7601
+#: src/compose.c:4305 src/compose.c:7935

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1475,7 +1759,7 @@ msgstr ""
 "\n"
 "Неуспела конверзија скупа знакова."
 
 "\n"
 "Неуспела конверзија скупа знакова."
 

-#: src/compose.c:4115 src/compose.c:7604
+#: src/compose.c:4308 src/compose.c:7938

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1485,7 +1769,7 @@ msgstr ""
 "\n"
 "Енкрипциони кључ примаоца није пронађен."
 
 "\n"
 "Енкрипциони кључ примаоца није пронађен."
 

-#: src/compose.c:4119 src/compose.c:7598
+#: src/compose.c:4312 src/compose.c:7932

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1496,7 +1780,7 @@ msgstr ""
 "\n"
 "Неуспело потписивање: %s"
 
 "\n"
 "Неуспело потписивање: %s"
 

-#: src/compose.c:4122
+#: src/compose.c:4315

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1507,11 +1791,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4124
+#: src/compose.c:4317

 msgid "Could not queue message for sending."
 msgstr "Није могуће стављање поруке у ред за слање."
 
 msgid "Could not queue message for sending."
 msgstr "Није могуће стављање поруке у ред за слање."
 

-#: src/compose.c:4138 src/compose.c:4178
+#: src/compose.c:4332 src/compose.c:4391

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1519,7 +1803,7 @@ msgstr ""
 "Порука је припремљена али није послата.\n"
 "Користите „Пошаљи припремљене поруке“ за поновно слање."
 
 "Порука је припремљена али није послата.\n"
 "Користите „Пошаљи припремљене поруке“ за поновно слање."
 

-#: src/compose.c:4172
+#: src/compose.c:4385

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -1529,7 +1813,7 @@ msgstr ""
 "Користите „Пошаљи припремљене поруке“ са главне линије алата за поновно "
 "слање."
 
 "Користите „Пошаљи припремљене поруке“ са главне линије алата за поновно "
 "слање."
 

-#: src/compose.c:4501
+#: src/compose.c:4731

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1540,7 +1824,7 @@ msgstr ""
 "у одређени %s скуп знакова.\n"
 "Слање поруке са %s скупом знакова?"
 
 "у одређени %s скуп знакова.\n"
 "Слање поруке са %s скупом знакова?"
 

-#: src/compose.c:4558
+#: src/compose.c:4790

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1553,60 +1837,60 @@ msgstr ""
 "\n"
 "Наставак слања поруке?"
 
 "\n"
 "Наставак слања поруке?"
 

-#: src/compose.c:4743
+#: src/compose.c:4978

 msgid "No account for sending mails available!"
 msgstr "Ову поруку не можете да пошаљете са одабраног налога!"
 
 msgid "No account for sending mails available!"
 msgstr "Ову поруку не можете да пошаљете са одабраног налога!"
 

-#: src/compose.c:4753
+#: src/compose.c:4988

 msgid "No account for posting news available!"
 msgstr "Овај налог није предвиђен за слање на дискусионе групе!"
 
 msgid "No account for posting news available!"
 msgstr "Овај налог није предвиђен за слање на дискусионе групе!"
 

-#: src/compose.c:5444
+#: src/compose.c:5681

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "КОристите <ТАБ> за аутоматско попуњавање из адресара"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "КОристите <ТАБ> за аутоматско попуњавање из адресара"
 

-#: src/compose.c:5556
+#: src/compose.c:5809

 msgid "Mime type"
 msgstr "MIME тип"
 
 msgid "Mime type"
 msgstr "MIME тип"
 

-#: src/compose.c:5562 src/compose.c:5858 src/mimeview.c:212
+#: src/compose.c:5815 src/compose.c:6111 src/mimeview.c:212

 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86

-#: src/summaryview.c:489
+#: src/summaryview.c:490

 msgid "Size"
 msgstr "Величина"
 
 msgid "Size"
 msgstr "Величина"
 

-#: src/compose.c:5623
+#: src/compose.c:5876

 msgid "Save Message to "
 msgstr "Сачувај поруку у "
 
 msgid "Save Message to "
 msgstr "Сачувај поруку у "
 

-#: src/compose.c:5645 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:5898 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "_Тражи"
 
 msgid "_Browse"
 msgstr "_Тражи"
 

-#: src/compose.c:5857 src/compose.c:7008
+#: src/compose.c:6110 src/compose.c:7342

 msgid "MIME type"
 msgstr "MIME тип"
 
 msgid "MIME type"
 msgstr "MIME тип"
 

-#: src/compose.c:5929
+#: src/compose.c:6182

 msgid "Hea_der"
 msgstr "_Заглавље"
 
 msgid "Hea_der"
 msgstr "_Заглавље"
 

-#: src/compose.c:5933
+#: src/compose.c:6186

 msgid "_Attachments"
 msgstr "_Прилози"
 
 msgid "_Attachments"
 msgstr "_Прилози"
 

-#: src/compose.c:5937
+#: src/compose.c:6190

 msgid "Othe_rs"
 msgstr "_Друго"
 
 msgid "Othe_rs"
 msgstr "_Друго"
 

-#: src/compose.c:5952 src/summary_search.c:289
+#: src/compose.c:6205 src/summary_search.c:366

 msgid "Subject:"
 msgstr "Тема:"
 
 msgid "Subject:"
 msgstr "Тема:"
 

-#: src/compose.c:6140
+#: src/compose.c:6396

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1615,20 +1899,20 @@ msgstr ""
 "Није могуће покретање правописне провере.\n"
 "%s"
 
 "Није могуће покретање правописне провере.\n"
 "%s"
 

-#: src/compose.c:6251
+#: src/compose.c:6508

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Пошиљалац: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "Пошиљалац: <i>%s</i>"
 

-#: src/compose.c:6282
+#: src/compose.c:6539

 msgid "Account to use for this email"
 msgstr "Налог који ће се користити за ову е-поруку"
 
 msgid "Account to use for this email"
 msgstr "Налог који ће се користити за ову е-поруку"
 

-#: src/compose.c:6284
+#: src/compose.c:6541

 msgid "Sender address to be used"
 msgstr "Адреса пошиљаоца која ће се користити."
 
 msgid "Sender address to be used"
 msgstr "Адреса пошиљаоца која ће се користити."
 

-#: src/compose.c:6408
+#: src/compose.c:6702

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "


@@ -1637,47 +1921,51 @@ msgstr ""
 "Систем приватности „%s“ не може да се учита. Нећете моћи да електрноски "
 "потпишете или криптујете ову поруку."
 
 "Систем приватности „%s“ не може да се учита. Нећете моћи да електрноски "
 "потпишете или криптујете ову поруку."
 

-#: src/compose.c:6647
-msgid "Message To format error."
-msgstr "Неисправан формат поља за примаоца (To)."
+#: src/compose.c:6864 src/prefs_template.c:549
+msgid "Template body format error."
+msgstr "Грешка формата тела у шаблону."
+
+#: src/compose.c:6972 src/prefs_template.c:587
+msgid "Template To format error."
+msgstr "Грешка формата примаоца у шаблону."

 
 

-#: src/compose.c:6660
-msgid "Message Cc format error."
-msgstr "Ð\9dеиÑ\81пÑ\80аван Ñ\84оÑ\80маÑ\82 поÑ\99а за копиÑ\98Ñ\83 (CC)."
+#: src/compose.c:6985 src/prefs_template.c:592
+msgid "Template Cc format error."
+msgstr "Ð\93Ñ\80еÑ\88ка Ñ\84оÑ\80маÑ\82а пÑ\80имаоÑ\86а копиÑ\98е Ñ\83 Ñ\88аблонÑ\83."

 
 

-#: src/compose.c:6673
-msgid "Message Bcc format error."
-msgstr "Ð\9dеиÑ\81пÑ\80аван Ñ\84оÑ\80маÑ\82 поÑ\99а за невидÑ\99ивÑ\83 копиÑ\98Ñ\83 (BCC)."
+#: src/compose.c:6998 src/prefs_template.c:597
+msgid "Template Bcc format error."
+msgstr "Ð\93Ñ\80еÑ\88ка Ñ\84оÑ\80маÑ\82а невидÑ\99ивог пÑ\80имаоÑ\86а копиÑ\98е Ñ\83 Ñ\88аблонÑ\83."

 
 

-#: src/compose.c:6687
-msgid "Message subject format error."
-msgstr "Ð\9dеиÑ\81пÑ\80аван Ñ\84оÑ\80маÑ\82 поÑ\99а за Ñ\82емÑ\83 (Subject)."
+#: src/compose.c:7012 src/prefs_template.c:602
+msgid "Template subject format error."
+msgstr "Ð\93Ñ\80еÑ\88ка Ñ\84оÑ\80маÑ\82а Ñ\82еме Ñ\83 Ñ\88аблонÑ\83."

 
 

-#: src/compose.c:6902
+#: src/compose.c:7236

 msgid "Invalid MIME type."
 msgstr "Неважећи MIME тип."
 
 msgid "Invalid MIME type."
 msgstr "Неважећи MIME тип."
 

-#: src/compose.c:6917
+#: src/compose.c:7251

 msgid "File doesn't exist or is empty."
 msgstr "Датотека не постоји или је празна."
 
 msgid "File doesn't exist or is empty."
 msgstr "Датотека не постоји или је празна."
 

-#: src/compose.c:6990
+#: src/compose.c:7324

 msgid "Properties"
 msgstr "Особине"
 
 msgid "Properties"
 msgstr "Особине"
 

-#: src/compose.c:7041
+#: src/compose.c:7375

 msgid "Encoding"
 msgstr "Енкодирање"
 
 msgid "Encoding"
 msgstr "Енкодирање"
 

-#: src/compose.c:7061
+#: src/compose.c:7395

 msgid "Path"
 msgstr "Путања"
 
 msgid "Path"
 msgstr "Путања"
 

-#: src/compose.c:7062 src/prefs_toolbar.c:1060
+#: src/compose.c:7396 src/prefs_toolbar.c:1060

 msgid "File name"
 msgstr "Назив датотеке"
 
 msgid "File name"
 msgstr "Назив датотеке"
 

-#: src/compose.c:7245
+#: src/compose.c:7579

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1688,19 +1976,19 @@ msgstr ""
 "Да ли да насилно прекинем процес?\n"
 "Шифра групе процеса: %d"
 
 "Да ли да насилно прекинем процес?\n"
 "Шифра групе процеса: %d"
 

-#: src/compose.c:7287
+#: src/compose.c:7621

 msgid "Compose: input from monitoring process\n"
 msgstr "Састављање: улаз од надгледаног процеса\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "Састављање: улаз од надгледаног процеса\n"
 

-#: src/compose.c:7568 src/messageview.c:718
-msgid "Sylpheed-Claws needs network access in order to send this email."
-msgstr "Да би Sylpheed-Claws послао ову поруку неопходан је приступ мрежи"
+#: src/compose.c:7902 src/messageview.c:718
+msgid "Claws Mail needs network access in order to send this email."
+msgstr "Да би Claws Mail послао ову поруку неопходан је приступ мрежи."

 
 

-#: src/compose.c:7593
+#: src/compose.c:7927

 msgid "Could not queue message."
 msgstr "Није могуће стављање поруке у ред за слање."
 
 msgid "Could not queue message."
 msgstr "Није могуће стављање поруке у ред за слање."
 

-#: src/compose.c:7595
+#: src/compose.c:7929

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1711,20 +1999,20 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:7715
+#: src/compose.c:8049

 msgid "Could not save draft."
 msgstr "Није могуће чување поруке као недовршене."
 
 msgid "Could not save draft."
 msgstr "Није могуће чување поруке као недовршене."
 

-#: src/compose.c:7790 src/compose.c:7813
+#: src/compose.c:8124 src/compose.c:8147

 msgid "Select file"
 msgstr "Одаберите датотеку"
 
 msgid "Select file"
 msgstr "Одаберите датотеку"
 

-#: src/compose.c:7826
+#: src/compose.c:8160

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Није могуће читање датотеке „%s“."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Није могуће читање датотеке „%s“."
 

-#: src/compose.c:7828
+#: src/compose.c:8162

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1733,44 +2021,44 @@ msgstr ""
 "Датотека „%s“ садржи неисправне знакове\n"
 "за текуће кодирање, уметање може да буде неправилно."
 
 "Датотека „%s“ садржи неисправне знакове\n"
 "за текуће кодирање, уметање може да буде неправилно."
 

-#: src/compose.c:7876
+#: src/compose.c:8210

 msgid "Discard message"
 msgstr "Одбаци поруку"
 
 msgid "Discard message"
 msgstr "Одбаци поруку"
 

-#: src/compose.c:7877
+#: src/compose.c:8211

 msgid "This message has been modified. Discard it?"
 msgstr "Ова порука је измењена. Желите ли да буде одбачена?"
 
 msgid "This message has been modified. Discard it?"
 msgstr "Ова порука је измењена. Желите ли да буде одбачена?"
 

-#: src/compose.c:7878
+#: src/compose.c:8212

 msgid "_Discard"
 msgstr "_Одбаци"
 
 msgid "_Discard"
 msgstr "_Одбаци"
 

-#: src/compose.c:7878
+#: src/compose.c:8212

 msgid "_Save to Drafts"
 msgstr "_Сачувај у Недовршено"
 
 msgid "_Save to Drafts"
 msgstr "_Сачувај у Недовршено"
 

-#: src/compose.c:7922
+#: src/compose.c:8256

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Желите ли да примените шаблон „%s“ ?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "Желите ли да примените шаблон „%s“ ?"
 

-#: src/compose.c:7924
+#: src/compose.c:8258

 msgid "Apply template"
 msgstr "Примени шаблон"
 
 msgid "Apply template"
 msgstr "Примени шаблон"
 

-#: src/compose.c:7925
+#: src/compose.c:8259

 msgid "_Replace"
 msgstr "_Замени"
 
 msgid "_Replace"
 msgstr "_Замени"
 

-#: src/compose.c:7925
+#: src/compose.c:8259

 msgid "_Insert"
 msgstr "_Уметни"
 
 msgid "_Insert"
 msgstr "_Уметни"
 

-#: src/compose.c:8613
+#: src/compose.c:8947

 msgid "Insert or attach?"
 msgstr "Уметање или прилагање?"
 
 msgid "Insert or attach?"
 msgstr "Уметање или прилагање?"
 

-#: src/compose.c:8614
+#: src/compose.c:8948

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"


@@ -1778,15 +2066,19 @@ msgstr ""
 "Да ли желите да садржај датотеке буде уметнут у текст поруке, или да "
 "датотеку приложите уз поруку?"
 
 "Да ли желите да садржај датотеке буде уметнут у текст поруке, или да "
 "датотеку приложите уз поруку?"
 

-#: src/compose.c:8616
+#: src/compose.c:8950

 msgid "+_Insert"
 msgstr "+_Уметни"
 
 msgid "+_Insert"
 msgstr "+_Уметни"
 

-#: src/compose.c:8616
+#: src/compose.c:8950

 msgid "_Attach"
 msgstr "_Приложи"
 
 msgid "_Attach"
 msgstr "_Приложи"
 

-#: src/compose.c:9022
+#: src/compose.c:9149
+msgid "Quote format error."
+msgstr "Грешка формата цитата."
+
+#: src/compose.c:9368

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -1797,12 +2089,12 @@ msgstr ""
 
 #: src/crash.c:142
 #, c-format
 
 #: src/crash.c:142
 #, c-format

-msgid "Sylpheed-Claws process (%ld) received signal %ld"
-msgstr "Sylpheed-Claws процес (%ld) је добио сигнал %ld"
+msgid "Claws Mail process (%ld) received signal %ld"
+msgstr "Claws Mail процес (%ld) је добио сигнал %ld"

 
 #: src/crash.c:188
 
 #: src/crash.c:188

-msgid "Sylpheed-Claws has crashed"
-msgstr "Sylpheed-Claws се срушио"
+msgid "Claws Mail has crashed"
+msgstr "Claws Mail се срушио"

 
 #: src/crash.c:204
 #, c-format
 
 #: src/crash.c:204
 #, c-format


@@ -1833,61 +2125,69 @@ msgstr "Направи извештај о грешци"
 msgid "Save crash information"
 msgstr "Сачувај информације о престанку рада програма"
 
 msgid "Save crash information"
 msgstr "Сачувај информације о престанку рада програма"
 

-#: src/editaddress.c:153
+#: src/editaddress.c:183

 msgid "Add New Person"
 msgstr "Додај нову особу"
 
 msgid "Add New Person"
 msgstr "Додај нову особу"
 

-#: src/editaddress.c:154
+#: src/editaddress.c:184

 msgid "Edit Person Details"
 msgstr "Измени детаље о особи"
 
 msgid "Edit Person Details"
 msgstr "Измени детаље о особи"
 

-#: src/editaddress.c:316
+#: src/editaddress.c:355

 msgid "An Email address must be supplied."
 msgstr "Морате да унесете адресу е-поште."
 
 msgid "An Email address must be supplied."
 msgstr "Морате да унесете адресу е-поште."
 

-#: src/editaddress.c:490
+#: src/editaddress.c:529

 msgid "A Name and Value must be supplied."
 msgstr "Морате да унесете назив и вредност поља."
 
 msgid "A Name and Value must be supplied."
 msgstr "Морате да унесете назив и вредност поља."
 

-#: src/editaddress.c:560
+#: src/editaddress.c:618
+msgid "Discard"
+msgstr "Одбаци"
+
+#: src/editaddress.c:619
+msgid "Apply"
+msgstr "Примени"
+
+#: src/editaddress.c:649 src/editaddress.c:698

 msgid "Edit Person Data"
 msgstr "Измени податке о особи"
 
 msgid "Edit Person Data"
 msgstr "Измени податке о особи"
 

-#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:799
+#: src/editaddress.c:759 src/expldifdlg.c:508 src/exporthtml.c:799

 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Име за приказ"
 
 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "Име за приказ"
 

-#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:827
+#: src/editaddress.c:765 src/editaddress.c:769 src/ldif.c:827

 msgid "Last Name"
 msgstr "Презиме"
 
 msgid "Last Name"
 msgstr "Презиме"
 

-#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:823
+#: src/editaddress.c:766 src/editaddress.c:768 src/ldif.c:823

 msgid "First Name"
 msgstr "Име"
 
 msgid "First Name"
 msgstr "Име"
 

-#: src/editaddress.c:683
+#: src/editaddress.c:771

 msgid "Nickname"
 msgstr "Надимак"
 
 msgid "Nickname"
 msgstr "Надимак"
 

-#: src/editaddress.c:760 src/editaddress.c:816
+#: src/editaddress.c:848 src/editaddress.c:904

 msgid "Alias"
 msgstr "Надимак"
 
 msgid "Alias"
 msgstr "Надимак"
 

-#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:222
+#: src/editaddress.c:1042 src/editaddress.c:1099 src/prefs_customheader.c:222

 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Вредност"
 
 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "Вредност"
 

-#: src/editaddress.c:1070
+#: src/editaddress.c:1161

 msgid "_User Data"
 msgstr "Подаци о _контакту"
 
 msgid "_User Data"
 msgstr "Подаци о _контакту"
 

-#: src/editaddress.c:1071
+#: src/editaddress.c:1162

 msgid "_Email Addresses"
 msgstr "Адресе _е-поште"
 
 msgid "_Email Addresses"
 msgstr "Адресе _е-поште"
 

-#: src/editaddress.c:1072
+#: src/editaddress.c:1163

 msgid "O_ther Attributes"
 msgstr "_Остали подаци"
 
 msgid "O_ther Attributes"
 msgstr "_Остали подаци"
 


@@ -1912,7 +2212,7 @@ msgid " Check File "
 msgstr " Провери датотеку "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr " Провери датотеку "
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1895
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1917

 msgid "File"
 msgstr "Датотека"
 
 msgid "File"
 msgstr "Датотека"
 


@@ -1920,51 +2220,51 @@ msgstr "Датотека"
 msgid "Add New Addressbook"
 msgstr "Додај нови адресар"
 
 msgid "Add New Addressbook"
 msgstr "Додај нови адресар"
 

-#: src/editgroup.c:103
+#: src/editgroup.c:100

 msgid "A Group Name must be supplied."
 msgstr "Морате да унесете назив групе."
 
 msgid "A Group Name must be supplied."
 msgstr "Морате да унесете назив групе."
 

-#: src/editgroup.c:286
+#: src/editgroup.c:293

 msgid "Edit Group Data"
 msgstr "Измени податке о групи"
 
 msgid "Edit Group Data"
 msgstr "Измени податке о групи"
 

-#: src/editgroup.c:314 src/exporthtml.c:635
+#: src/editgroup.c:323 src/exporthtml.c:635

 msgid "Group Name"
 msgstr "Назив групе"
 
 msgid "Group Name"
 msgstr "Назив групе"
 

-#: src/editgroup.c:333
+#: src/editgroup.c:342

 msgid "Addresses in Group"
 msgstr "Адресе у групи"
 
 msgid "Addresses in Group"
 msgstr "Адресе у групи"
 

-#: src/editgroup.c:364
+#: src/editgroup.c:373

 msgid "Available Addresses"
 msgstr "Доступне адресе"
 
 msgid "Available Addresses"
 msgstr "Доступне адресе"
 

-#: src/editgroup.c:425
+#: src/editgroup.c:445

 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr "Премести адресе е-поште у или из групе помоћу дугмета са стрелицом"
 
 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr "Премести адресе е-поште у или из групе помоћу дугмета са стрелицом"
 

-#: src/editgroup.c:473
+#: src/editgroup.c:493

 msgid "Edit Group Details"
 msgstr "Измени детаље о групи"
 
 msgid "Edit Group Details"
 msgstr "Измени детаље о групи"
 

-#: src/editgroup.c:476
+#: src/editgroup.c:496

 msgid "Add New Group"
 msgstr "Додај нову групу"
 
 msgid "Add New Group"
 msgstr "Додај нову групу"
 

-#: src/editgroup.c:526
+#: src/editgroup.c:546

 msgid "Edit folder"
 msgstr "Измени директоријум"
 
 msgid "Edit folder"
 msgstr "Измени директоријум"
 

-#: src/editgroup.c:526
+#: src/editgroup.c:546

 msgid "Input the new name of folder:"
 msgstr "Унесите нови назив за директоријум:"
 
 msgid "Input the new name of folder:"
 msgstr "Унесите нови назив за директоријум:"
 

-#: src/editgroup.c:529 src/foldersel.c:556 src/imap_gtk.c:134 src/mh_gtk.c:127
+#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:137 src/mh_gtk.c:130

 msgid "New folder"
 msgstr "Нови директоријум"
 
 msgid "New folder"
 msgstr "Нови директоријум"
 

-#: src/editgroup.c:530 src/foldersel.c:557 src/mh_gtk.c:128
+#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr "Унесите назив за нови директоријум:"
 
 msgid "Input the name of new folder:"
 msgstr "Унесите назив за нови директоријум:"
 


@@ -2045,12 +2345,12 @@ 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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "

-"computer as Sylpheed-Claws."
+"computer as Claws Mail."

 msgstr ""
 msgstr ""

-"Ово је назив сервера. На пример, „ldap.mydomain.com” може да припада "
-"организацији „mydomain.com”. ИП адреса такође може да се користи. Можете да "
-"поÑ\81Ñ\82авиÑ\82е â\80\9elocalhostâ\80\9c као Ñ\81еÑ\80веÑ\80 ако имаÑ\82е подигнÑ\83Ñ\82 LDAP Ñ\81еÑ\80веÑ\80 на иÑ\81Ñ\82ом "
-"Ñ\80аÑ\87Ñ\83наÑ\80Ñ\83 на коме коÑ\80иÑ\81Ñ\82иÑ\82е Sylpheed-Claws."
+"Ово је назив сервера. На пример, „ldap.mojdomen.rs” може да припада "
+"организацији „mojdomen.rs“. ИП адреса такође може да се користи. "
+"Ð\9cожеÑ\82е поÑ\81Ñ\82авиÑ\82и â\80\9elocalhostâ\80\9c као Ñ\81еÑ\80веÑ\80 ако имаÑ\82е покÑ\80анÑ\83Ñ\82 LDAP "
+"Ñ\81еÑ\80веÑ\80 на иÑ\81Ñ\82ом Ñ\80аÑ\87Ñ\83наÑ\80Ñ\83 на коме коÑ\80иÑ\81Ñ\82иÑ\82е Claws Mail."

 
 #: src/editldap.c:470
 msgid "TLS"
 
 #: src/editldap.c:470
 msgid "TLS"


@@ -2096,13 +2396,13 @@ msgstr "Притисните ово дугме за проверу везе са
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""

-"Ово одређује назив директоријума који ће се претраживати на серверу. Примери "
-"су:\n"
-"  dc=силфед,dc=орг\n"
+"Ово одређује назив директоријума који ће се "
+"претраживати на серверу. Примери су:\n"
+"  dc=claws-mail,dc=орг\n"

 "  ou=људи,dc=назив домена,dc=цс\n"
 "  o=Назив организације,c=Држава\n"
 
 "  ou=људи,dc=назив домена,dc=цс\n"
 "  o=Назив организације,c=Држава\n"
 


@@ -2200,13 +2500,13 @@ msgstr "Доделите ДН"
 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 "
 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 "

-"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "

 "performing a search."
 msgstr ""
 "performing a search."
 msgstr ""

-"Назив LDAP корисничког налога који ће се користити за повезивање на сервер. "
-"Ð\9eво Ñ\81е наÑ\98Ñ\87еÑ\88Ñ\9bе коÑ\80иÑ\81Ñ\82и код заÑ\88Ñ\82иÑ\9bениÑ\85 Ñ\81еÑ\80веÑ\80а. Ð\9eваÑ\98 назив Ñ\98е обиÑ\87но "
-"формиран као: „cn=корисник,dc=sylpheed,dc=com“. Обично се ова опција оставља "
-"непопуњеном приликом претраге."
+"Назив LDAP корисничког налога који ће се користити за повезивање "
+"на Ñ\81еÑ\80веÑ\80. Ð\9eво Ñ\81е наÑ\98Ñ\87еÑ\88Ñ\9bе коÑ\80иÑ\81Ñ\82и код заÑ\88Ñ\82иÑ\9bениÑ\85 Ñ\81еÑ\80веÑ\80а. Ð\9eваÑ\98 "
+"назив је обично формиран као: „cn=корисник,dc=claws-maild,dc=org“. "
+"Ð\9eбиÑ\87но Ñ\81е ова опÑ\86иÑ\98а оÑ\81Ñ\82авÑ\99а непопÑ\83Ñ\9aеном пÑ\80иликом пÑ\80еÑ\82Ñ\80аге."

 
 #: src/editldap.c:741
 msgid "Bind Password"
 
 #: src/editldap.c:741
 msgid "Bind Password"


@@ -2240,7 +2540,7 @@ msgstr "Основно"
 msgid "Search"
 msgstr "Тражи"
 
 msgid "Search"
 msgstr "Тражи"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:411
+#: src/editldap.c:810 src/gtk/quicksearch.c:490

 msgid "Extended"
 msgstr "Проширено"
 
 msgid "Extended"
 msgstr "Проширено"
 


@@ -2264,19 +2564,19 @@ msgstr "Измени vCard запис"
 msgid "Add New vCard Entry"
 msgstr "Додај нови vCard запис"
 
 msgid "Add New vCard Entry"
 msgstr "Додај нови vCard запис"
 

-#: src/exphtmldlg.c:113
+#: src/exphtmldlg.c:110

 msgid "Please specify output directory and file to create."
 msgstr "Одаберите циљни директоријум и назив датотеке за прављење."
 
 msgid "Please specify output directory and file to create."
 msgstr "Одаберите циљни директоријум и назив датотеке за прављење."
 

-#: src/exphtmldlg.c:116
+#: src/exphtmldlg.c:113

 msgid "Select stylesheet and formatting."
 msgstr "Одаберите датотеку о стилу и форматирање."
 
 msgid "Select stylesheet and formatting."
 msgstr "Одаберите датотеку о стилу и форматирање."
 

-#: src/exphtmldlg.c:119 src/expldifdlg.c:117
+#: src/exphtmldlg.c:116 src/expldifdlg.c:117

 msgid "File exported successfully."
 msgstr "Датотека је успешно извежена."
 
 msgid "File exported successfully."
 msgstr "Датотека је успешно извежена."
 

-#: src/exphtmldlg.c:184
+#: src/exphtmldlg.c:181

 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"


@@ -2285,11 +2585,11 @@ msgstr ""
 "Излазни HTML директоријум „%s“\n"
 "не постоји. Да ли да направим нови директоријум?"
 
 "Излазни HTML директоријум „%s“\n"
 "не постоји. Да ли да направим нови директоријум?"
 

-#: src/exphtmldlg.c:187 src/expldifdlg.c:193
+#: src/exphtmldlg.c:184 src/expldifdlg.c:193

 msgid "Create Directory"
 msgstr "Направи директоријум"
 
 msgid "Create Directory"
 msgstr "Направи директоријум"
 

-#: src/exphtmldlg.c:196
+#: src/exphtmldlg.c:193

 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"


@@ -2298,102 +2598,102 @@ msgstr ""
 "Није могуће направити излазни директоријум за HTML фајл:\n"
 "%s"
 
 "Није могуће направити излазни директоријум за HTML фајл:\n"
 "%s"
 

-#: src/exphtmldlg.c:198 src/expldifdlg.c:204
+#: src/exphtmldlg.c:195 src/expldifdlg.c:204

 msgid "Failed to Create Directory"
 msgstr "Неуспело прављење директоријума"
 
 msgid "Failed to Create Directory"
 msgstr "Неуспело прављење директоријума"
 

-#: src/exphtmldlg.c:240
+#: src/exphtmldlg.c:237

 msgid "Error creating HTML file"
 msgstr "Грешка при прављењу HTML датотеке"
 
 msgid "Error creating HTML file"
 msgstr "Грешка при прављењу HTML датотеке"
 

-#: src/exphtmldlg.c:326
+#: src/exphtmldlg.c:323

 msgid "Select HTML output file"
 msgstr "Одаберите излазну HTML датотеку"
 
 msgid "Select HTML output file"
 msgstr "Одаберите излазну HTML датотеку"
 

-#: src/exphtmldlg.c:390
+#: src/exphtmldlg.c:387

 msgid "HTML Output File"
 msgstr "Излазна HTML датотека"
 
 msgid "HTML Output File"
 msgstr "Излазна HTML датотека"
 

-#: src/exphtmldlg.c:399 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "Т_ражи"
 
 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "Т_ражи"
 

-#: src/exphtmldlg.c:452
+#: src/exphtmldlg.c:449

 msgid "Stylesheet"
 msgstr "Датотека о стилу"
 
 msgid "Stylesheet"
 msgstr "Датотека о стилу"
 

-#: src/exphtmldlg.c:460 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
-#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:1004 src/prefs_account.c:661
-#: src/summaryview.c:4927
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1678
+#: src/gtk/gtkaspell.c:2411 src/mainwindow.c:1003 src/prefs_account.c:667
+#: src/summaryview.c:4991

 msgid "None"
 msgstr "Ништа"
 
 msgid "None"
 msgstr "Ништа"
 

-#: src/exphtmldlg.c:461 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:458 src/prefs_summaries.c:350 src/prefs_summaries.c:691

 msgid "Default"
 msgstr "Стандардни"
 
 msgid "Default"
 msgstr "Стандардни"
 

-#: src/exphtmldlg.c:462 src/plugins/pgpcore/sgpgme.c:135
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:144

 msgid "Full"
 msgstr "Потпун"
 
 msgid "Full"
 msgstr "Потпун"
 

-#: src/exphtmldlg.c:463
+#: src/exphtmldlg.c:460

 msgid "Custom"
 msgstr "Кориснички"
 
 msgid "Custom"
 msgstr "Кориснички"
 

-#: src/exphtmldlg.c:464
+#: src/exphtmldlg.c:461

 msgid "Custom-2"
 msgstr "Кориснички-2"
 
 msgid "Custom-2"
 msgstr "Кориснички-2"
 

-#: src/exphtmldlg.c:465
+#: src/exphtmldlg.c:462

 msgid "Custom-3"
 msgstr "Кориснички-3"
 
 msgid "Custom-3"
 msgstr "Кориснички-3"
 

-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:463

 msgid "Custom-4"
 msgstr "Кориснички-4"
 
 msgid "Custom-4"
 msgstr "Кориснички-4"
 

-#: src/exphtmldlg.c:473
+#: src/exphtmldlg.c:470

 msgid "Full Name Format"
 msgstr "Пуно име"
 
 msgid "Full Name Format"
 msgstr "Пуно име"
 

-#: src/exphtmldlg.c:481
+#: src/exphtmldlg.c:478

 msgid "First Name, Last Name"
 msgstr "Име, презиме"
 
 msgid "First Name, Last Name"
 msgstr "Име, презиме"
 

-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:479

 msgid "Last Name, First Name"
 msgstr "Презиме, име"
 
 msgid "Last Name, First Name"
 msgstr "Презиме, име"
 

-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:486

 msgid "Color Banding"
 msgstr "Опсег боја"
 
 msgid "Color Banding"
 msgstr "Опсег боја"
 

-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:492

 msgid "Format Email Links"
 msgstr "Формат везе е-поште"
 
 msgid "Format Email Links"
 msgstr "Формат везе е-поште"
 

-#: src/exphtmldlg.c:501
+#: src/exphtmldlg.c:498

 msgid "Format User Attributes"
 msgstr "Кориснички атрибути"
 
 msgid "Format User Attributes"
 msgstr "Кориснички атрибути"
 

-#: src/exphtmldlg.c:556 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919

 msgid "File Name :"
 msgstr "Назив датотеке :"
 
 msgid "File Name :"
 msgstr "Назив датотеке :"
 

-#: src/exphtmldlg.c:566
+#: src/exphtmldlg.c:563

 msgid "Open with Web Browser"
 msgstr "Отвори у Веб претраживачу"
 
 msgid "Open with Web Browser"
 msgstr "Отвори у Веб претраживачу"
 

-#: src/exphtmldlg.c:598
+#: src/exphtmldlg.c:595

 msgid "Export Address Book to HTML File"
 msgstr "Извоз адресара у HTML датотеку"
 
 msgid "Export Address Book to HTML File"
 msgstr "Извоз адресара у HTML датотеку"
 

-#: src/exphtmldlg.c:664 src/expldifdlg.c:736 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027

 msgid "File Info"
 msgstr "Информације"
 
 msgid "File Info"
 msgstr "Информације"
 

-#: src/exphtmldlg.c:665
+#: src/exphtmldlg.c:662

 msgid "Format"
 msgstr "Формат"
 
 msgid "Format"
 msgstr "Формат"
 


@@ -2455,14 +2755,14 @@ msgstr "Додатак"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""

-"Додатак се крсити за прављење „Одличног Назива“ (или ОН) за LDAP унос. "
-"Примери су:\n"
-"  dc=силфед,dc=орг\n"
-"  ou=људи,dc=назив домена,dc=цс\n"
+"Додатак се крсити за прављење „Одличног Назива“ (или ОН) "
+"за LDAP Ñ\83ноÑ\81. Ð\9fÑ\80имеÑ\80и Ñ\81Ñ\83:\n"
+"  dc=claws-mail,dc=org\n"
+"  ou=људи,dc=назив домена,dc=rs\n"

 "  o=Назив организације,c=Држава\n"
 
 #: src/expldifdlg.c:488
 "  o=Назив организације,c=Држава\n"
 
 #: src/expldifdlg.c:488


@@ -2477,31 +2777,31 @@ msgstr "Јединствени број"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 msgstr ""

-"Јединствени број адресара се користи за прављење ОН који је формиран слично "
-"као и:\n"
-"  uid=102376,ou=људи,dc=силфед,dc=орг"
+"Јединствени број адресара се користи за прављење ОН "
+"коÑ\98и Ñ\98е Ñ\84оÑ\80миÑ\80ан налик на:\n"
+"  uid=102376,ou=људи,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 msgstr ""

-"„Име за приказ“ поље адресара се корсити за прављење ОН који је формиран "
-"слично као и:\n"
-"  cn=Вук Караџић,ou=људи,dc=силфед,dc=орг"
+"Поље адресара „Име за приказ“ корсити се за прављење ОН "
+"који је формиран налик на:\n"
+"  cn=Вук Караџић,ou=људи,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 msgstr ""

-"Ð\9fÑ\80ва адÑ\80еÑ\81а е-поÑ\88Ñ\82е пÑ\80ипада оÑ\81оби коÑ\98а Ñ\81е коÑ\80Ñ\81иÑ\82и за прављење ОН који је "
-"формиран слично као и:\n"
-"  mail=vuk.karadzic@prevod.org,ou=људи,dc=силфед,dc=орг"
+"Ð\9fÑ\80ва адÑ\80еÑ\81а е-поÑ\88Ñ\82е пÑ\80ипада оÑ\81оби коÑ\98а Ñ\98е коÑ\80иÑ\88Ñ\9bена за прављење ОН који је "
+"формиран налок на:\n"
+"  mail=vuk.karadzic@domen.rs,ou=људи,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:543
 msgid ""
 
 #: src/expldifdlg.c:543
 msgid ""


@@ -2549,11 +2849,11 @@ msgstr ""
 msgid "Export Address Book to LDIF File"
 msgstr "Извоз Адресара у LDIF датотеку"
 
 msgid "Export Address Book to LDIF File"
 msgstr "Извоз Адресара у LDIF датотеку"
 

-#: src/expldifdlg.c:737
+#: src/expldifdlg.c:736

 msgid "Distguished Name"
 msgstr "Одличан Назив"
 
 msgid "Distguished Name"
 msgstr "Одличан Назив"
 

-#: src/export.c:120 src/summaryview.c:6275
+#: src/export.c:120 src/summaryview.c:6368

 msgid "Export to mbox file"
 msgstr "Извези у mbox датотеку"
 
 msgid "Export to mbox file"
 msgstr "Извези у mbox датотеку"
 


@@ -2578,7 +2878,7 @@ msgid "Source folder can't be left empty."
 msgstr "Изворишни директоријум не може бити празан."
 
 #: src/export.c:229
 msgstr "Изворишни директоријум не може бити празан."
 
 #: src/export.c:229

-msgid "Can't find the source folder."
+msgid "Couldn't find the source folder."

 msgstr "Није могуће пронаћи изворишни директоријум."
 
 #: src/export.c:252
 msgstr "Није могуће пронаћи изворишни директоријум."
 
 #: src/export.c:252


@@ -2594,8 +2894,8 @@ msgid "Attributes"
 msgstr "Атрибути"
 
 #: src/exporthtml.c:1010
 msgstr "Атрибути"
 
 #: src/exporthtml.c:1010

-msgid "Sylpheed-Claws Address Book"
-msgstr "Sylpheed-Claws Адресар"
+msgid "Claws Mail Address Book"
+msgstr "Claws Mail Адресар"

 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."
 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."


@@ -2613,48 +2913,53 @@ msgstr "Назив је предугачак."
 msgid "Not specified."
 msgstr "Није одређено."
 
 msgid "Not specified."
 msgstr "Није одређено."
 

-#: src/folder.c:1277 src/foldersel.c:371 src/prefs_folder_item.c:208
+#: src/folder.c:1283 src/foldersel.c:371 src/prefs_folder_item.c:239

 msgid "Inbox"
 msgstr "Сандуче"
 
 msgid "Inbox"
 msgstr "Сандуче"
 

-#: src/folder.c:1281 src/foldersel.c:375
+#: src/folder.c:1287 src/foldersel.c:375

 msgid "Sent"
 msgstr "Послато"
 
 msgid "Sent"
 msgstr "Послато"
 

-#: src/folder.c:1285 src/foldersel.c:379 src/prefs_folder_item.c:211
+#: src/folder.c:1291 src/foldersel.c:379 src/prefs_folder_item.c:242

 msgid "Queue"
 msgstr "Припремљено"
 
 msgid "Queue"
 msgstr "Припремљено"
 

-#: src/folder.c:1289 src/foldersel.c:383 src/prefs_folder_item.c:212
-#: src/toolbar.c:366 src/toolbar.c:400 src/toolbar.c:491
+#: src/folder.c:1295 src/foldersel.c:383 src/prefs_folder_item.c:243
+#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501

 msgid "Trash"
 msgstr "Смеће"
 
 msgid "Trash"
 msgstr "Смеће"
 

-#: src/folder.c:1293 src/foldersel.c:387 src/prefs_folder_item.c:210
+#: src/folder.c:1299 src/foldersel.c:387 src/prefs_folder_item.c:241

 msgid "Drafts"
 msgstr "Недовршено"
 
 msgid "Drafts"
 msgstr "Недовршено"
 

-#: src/folder.c:1572
+#: src/folder.c:1578

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Обрада (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Обрада (%s)...\n"
 

-#: src/folder.c:2509
+#: src/folder.c:2514

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Преузимање свих порука у %s ...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "Преузимање свих порука у %s ...\n"
 

-#: src/folder.c:2798
+#: src/folder.c:2803
+#, c-format
+msgid "Copying %s to %s...\n"
+msgstr "Умножавање %s у %s...\n"
+
+#: src/folder.c:2803

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Премештање %s у %s...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Премештање %s у %s...\n"
 

-#: src/folder.c:3067
+#: src/folder.c:3090

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Освежавање оставе за %s у току ..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "Освежавање оставе за %s у току ..."
 

-#: src/folder.c:3772
+#: src/folder.c:3801

 msgid "Processing messages..."
 msgstr "Обрађујем поруке..."
 
 msgid "Processing messages..."
 msgstr "Обрађујем поруке..."
 


@@ -2662,117 +2967,112 @@ msgstr "Обрађујем поруке..."
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 

-#: src/foldersel.c:558 src/imap_gtk.c:138 src/mh_gtk.c:129
+#: src/foldersel.c:558 src/imap_gtk.c:141 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr "Нови директоријум"
 
 msgid "NewFolder"
 msgstr "Нови директоријум"
 

-#: src/foldersel.c:566 src/imap_gtk.c:146 src/imap_gtk.c:152 src/mh_gtk.c:135
-#: src/mh_gtk.c:238
+#: src/foldersel.c:566 src/imap_gtk.c:149 src/imap_gtk.c:155 src/mh_gtk.c:138
+#: src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "„%c“ не може да се налази у називу директоријума."
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "„%c“ не може да се налази у називу директоријума."
 

-#: src/foldersel.c:576 src/imap_gtk.c:162 src/imap_gtk.c:216 src/mh_gtk.c:145
-#: src/mh_gtk.c:245
+#: src/foldersel.c:576 src/imap_gtk.c:165 src/imap_gtk.c:219 src/mh_gtk.c:148
+#: src/mh_gtk.c:248

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Директоријум „%s“ већ псотоји."
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "Директоријум „%s“ већ псотоји."
 

-#: src/foldersel.c:583 src/imap_gtk.c:168 src/mh_gtk.c:151
+#: src/foldersel.c:583 src/imap_gtk.c:171 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Није могуће направити директоријум „%s“."
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "Није могуће направити директоријум „%s“."
 

-#: src/folderview.c:290
+#: src/folderview.c:291

 msgid "/Mark all re_ad"
 msgstr "/Означи све као _прочитано"
 
 msgid "/Mark all re_ad"
 msgstr "/Означи све као _прочитано"
 

-#: src/folderview.c:291
+#: src/folderview.c:293

 msgid "/_Search folder..."
 msgstr "/Пр_етражи директоријум..."
 
 msgid "/_Search folder..."
 msgstr "/Пр_етражи директоријум..."
 

-#: src/folderview.c:293
+#: src/folderview.c:295

 msgid "/Process_ing..."
 msgstr "/О_брада..."
 
 msgid "/Process_ing..."
 msgstr "/О_брада..."
 

-#: src/folderview.c:298
+#: src/folderview.c:300

 msgid "/Empty _trash..."
 msgstr "/Испразни _смеће..."
 
 msgid "/Empty _trash..."
 msgstr "/Испразни _смеће..."
 

-#: src/folderview.c:303
+#: src/folderview.c:305

 msgid "/Send _queue..."
 msgstr "/Слање _припремљених..."
 
 msgid "/Send _queue..."
 msgstr "/Слање _припремљених..."
 

-#: src/folderview.c:463 src/prefs_folder_column.c:80
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:80

 msgid "New"
 msgstr "Ново"
 
 msgid "New"
 msgstr "Ново"
 

-#: src/folderview.c:464 src/prefs_folder_column.c:81
+#: src/folderview.c:425 src/folderview.c:472 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr "Непрочитано"
 
 msgid "Unread"
 msgstr "Непрочитано"
 

+#: src/folderview.c:426 src/prefs_folder_column.c:82
+msgid "Total"
+msgstr "Укупно"
+

 #. TRANSLATORS: This in Number sign in American style
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:466 src/summaryview.c:490
+#: src/folderview.c:474 src/summaryview.c:491

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 

-#: src/folderview.c:710
+#: src/folderview.c:719

 msgid "Setting folder info..."
 msgstr "Постављам информације директоријума..."
 
 msgid "Setting folder info..."
 msgstr "Постављам информације директоријума..."
 

-#: src/folderview.c:764 src/summaryview.c:3400
+#: src/folderview.c:773 src/summaryview.c:3453

 msgid "Mark all as read"
 msgstr "Означи све као прочитано"
 
 msgid "Mark all as read"
 msgstr "Означи све као прочитано"
 

-#: src/folderview.c:765 src/summaryview.c:3401
+#: src/folderview.c:774 src/summaryview.c:3454

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Да ли заиста желите да све поруке у директоријуму буду означене као "
 "прочитано?"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr ""
 "Да ли заиста желите да све поруке у директоријуму буду означене као "
 "прочитано?"
 

-#: src/folderview.c:1054
-msgid ""
-"You have one or more IMAP accounts defined. However this version of Sylpheed-"
-"Claws has been built without IMAP support; your IMAP account(s) are "
-"disabled.\n"
-"\n"
-"You probably need to install libetpan and recompile Sylpheed-Claws."
-msgstr ""
-"Имате креираних један или више IMAP налога. Ова верзија Sylpheed-Claws-аје "
-"компајлирана без подршке за IMAP протокол; Ваши IMAP налози суискључени.\n"
-"\n"
-"Највероватније треба да инсталирате libetpan и поново компајлирате Sylpheed-"
-"Claws."
-
-#: src/folderview.c:1071 src/imap.c:3143 src/mainwindow.c:3917 src/setup.c:90
+#: src/folderview.c:1060 src/imap.c:3190 src/mainwindow.c:3923 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Скенирам директоријум %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Скенирам директоријум %s%c%s ..."
 

-#: src/folderview.c:1075 src/imap.c:3148 src/mainwindow.c:3922 src/setup.c:95
+#: src/folderview.c:1064 src/imap.c:3195 src/mainwindow.c:3928 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Скенирам директоријум %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Скенирам директоријум %s ..."
 

-#: src/folderview.c:1102
+#: src/folderview.c:1091

 msgid "Rebuild folder tree"
 msgstr "Ажурирај стабло директоријума"
 
 msgid "Rebuild folder tree"
 msgstr "Ажурирај стабло директоријума"
 

-#: src/folderview.c:1103
+#: src/folderview.c:1092

 msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 msgid "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""

-"Ажурирање стабла директоријума ће уклонити локалну оставу. Желите ли да "
-"наставите?"
+"Ажурирање стабла директоријума ће уклонити локалну оставу. "
+"Ð\96елиÑ\82е ли да наÑ\81Ñ\82авиÑ\82е?"

 
 

-#: src/folderview.c:1113
+#: src/folderview.c:1102

 msgid "Rebuilding folder tree..."
 msgstr "Ажурирам стабло директоријума..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Ажурирам стабло директоријума..."
 

-#: src/folderview.c:1115
+#: src/folderview.c:1104

 msgid "Scanning folder tree..."
 msgid "Scanning folder tree..."

-msgstr "Ажурирам стабло директоријума..."
+msgstr "Скенирам стабло директоријума..."
+
+#: src/folderview.c:1175
+#, c-format
+msgid "Couldn't scan folder %s\n"
+msgstr "Није могуће скенирање директоријума %s\n"

 
 

-#: src/folderview.c:1233
+#: src/folderview.c:1228

 msgid "Checking for new messages in all folders..."
 msgstr "Освежавам садржај свих директоријума..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Освежавам садржај свих директоријума..."
 


@@ -2802,34 +3102,34 @@ msgstr "Да ли заиста желите да све поруке из сме
 msgid "+_Empty trash"
 msgstr "+_Испразни смеће"
 
 msgid "+_Empty trash"
 msgstr "+_Испразни смеће"
 

-#: src/folderview.c:2349 src/inc.c:1444 src/toolbar.c:2126
+#: src/folderview.c:2349 src/inc.c:1465 src/toolbar.c:2196

 msgid "Offline warning"
 msgstr "Режим ван везе"
 
 msgid "Offline warning"
 msgstr "Режим ван везе"
 

-#: src/folderview.c:2350 src/toolbar.c:2127
+#: src/folderview.c:2350 src/toolbar.c:2197

 msgid "You're working offline. Override?"
 msgstr ""
 "Активан је режим ван везе.\n"
 "Да ли желите да га заобиђем?"
 
 msgid "You're working offline. Override?"
 msgstr ""
 "Активан је режим ван везе.\n"
 "Да ли желите да га заобиђем?"
 

-#: src/folderview.c:2361 src/toolbar.c:2146
+#: src/folderview.c:2361 src/toolbar.c:2216

 msgid "Send queued messages"
 msgstr "Пошаљи припремљене поруке"
 
 msgid "Send queued messages"
 msgstr "Пошаљи припремљене поруке"
 

-#: src/folderview.c:2362 src/toolbar.c:2147
+#: src/folderview.c:2362 src/toolbar.c:2217

 msgid "Send all queued messages?"
 msgstr "Слање свих припремљених порука?"
 
 #: src/folderview.c:2363 src/messageview.c:579 src/messageview.c:596
 msgid "Send all queued messages?"
 msgstr "Слање свих припремљених порука?"
 
 #: src/folderview.c:2363 src/messageview.c:579 src/messageview.c:596

-#: src/prefs_account.c:1030 src/toolbar.c:2148
+#: src/prefs_account.c:1039 src/toolbar.c:2218

 msgid "_Send"
 msgstr "_Пошаљи"
 
 msgid "_Send"
 msgstr "_Пошаљи"
 

-#: src/folderview.c:2371 src/toolbar.c:2166
+#: src/folderview.c:2371 src/toolbar.c:2236

 msgid "Some errors occurred while sending queued messages."
 msgstr "Настале су грешке при слању припремљених порука."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Настале су грешке при слању припремљених порука."
 

-#: src/folderview.c:2374 src/main.c:1285 src/toolbar.c:2169
+#: src/folderview.c:2374 src/main.c:1549 src/toolbar.c:2239

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -2840,41 +3140,63 @@ msgstr ""
 
 #: src/folderview.c:2441
 #, c-format
 
 #: src/folderview.c:2441
 #, c-format

+msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgstr "Да ли заиста желите да умножите директоријум „%s“ у „%s“ ?"
+
+#: src/folderview.c:2442
+#, c-format

 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Да ли заиста желите да направите директоријум „%s“ као поддиректоријум „%s“ ?"
 
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "Да ли заиста желите да направите директоријум „%s“ као поддиректоријум „%s“ ?"
 

+#: src/folderview.c:2444
+msgid "Copy folder"
+msgstr "Умножи директоријум"
+

 #: src/folderview.c:2444
 msgid "Move folder"
 msgstr "Премештање директоријума"
 
 #: src/folderview.c:2444
 msgid "Move folder"
 msgstr "Премештање директоријума"
 

+#: src/folderview.c:2455
+#, c-format
+msgid "Copying %s to %s..."
+msgstr "Умножавање %s у %s..."
+

 #: src/folderview.c:2455
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Премештање %s у %s..."
 
 #: src/folderview.c:2455
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Премештање %s у %s..."
 

-#: src/folderview.c:2484
+#: src/folderview.c:2486

 msgid "Source and destination are the same."
 msgstr "Извор и одредиште су на истој локацији."
 
 msgid "Source and destination are the same."
 msgstr "Извор и одредиште су на истој локацији."
 

-#: src/folderview.c:2487
+#: src/folderview.c:2489
+msgid "Can't copy a folder to one of its children."
+msgstr "Није могуће умножавање директоријума у његов поддиректоријум."
+
+#: src/folderview.c:2490

 msgid "Can't move a folder to one of its children."
 msgstr "Није могуће премештање директоријума у његов поддиректоријум."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Није могуће премештање директоријума у његов поддиректоријум."
 

-#: src/folderview.c:2490
+#: src/folderview.c:2493

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Премештање директоријума између различитих сандучића није могуће."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Премештање директоријума између различитих сандучића није могуће."
 

-#: src/folderview.c:2493
+#: src/folderview.c:2496
+msgid "Copy failed!"
+msgstr "Неуспело умножавање!"
+
+#: src/folderview.c:2496

 msgid "Move failed!"
 msgstr "Неуспело премештање!"
 
 msgid "Move failed!"
 msgstr "Неуспело премештање!"
 

-#: src/folderview.c:2529
+#: src/folderview.c:2532

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Постављање подешавања за директоријум %s"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "Постављање подешавања за директоријум %s"
 

-#: src/gedit-print.c:147 src/messageview.c:1504 src/summaryview.c:4070
-#: src/toolbar.c:178
+#: src/gedit-print.c:147 src/messageview.c:1519 src/summaryview.c:4124
+#: src/toolbar.c:182

 msgid "Print"
 msgstr "Штампање"
 
 msgid "Print"
 msgstr "Штампање"
 


@@ -2944,7 +3266,7 @@ msgstr "непознато"
 msgid "Can't retrieve newsgroup list."
 msgstr "Није могуће преузимање листе дискусионих група."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Није могуће преузимање листе дискусионих група."
 

-#: src/grouplistdialog.c:447 src/summaryview.c:1219
+#: src/grouplistdialog.c:447 src/summaryview.c:1265

 msgid "Done."
 msgstr "Готово."
 
 msgid "Done."
 msgstr "Готово."
 


@@ -2953,19 +3275,47 @@ msgstr "Готово."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d дискусионих група преузето (%s прочитано)"
 
 msgid "%d newsgroups received (%s read)"
 msgstr "%d дискусионих група преузето (%s прочитано)"
 

-#: src/gtk/about.c:78 src/textview.c:232
+#: src/gtk/about.c:79 src/textview.c:216

 msgid "/_Open with Web browser"
 msgstr "/_Отвори у Веб претраживачу"
 
 msgid "/_Open with Web browser"
 msgstr "/_Отвори у Веб претраживачу"
 

-#: src/gtk/about.c:79 src/textview.c:233
+#: src/gtk/about.c:80 src/textview.c:217

 msgid "/Copy this _link"
 msgstr "/_Умножи адресу везе"
 
 msgid "/Copy this _link"
 msgstr "/_Умножи адресу везе"
 

-#: src/gtk/about.c:119
-msgid "About Sylpheed-Claws"
-msgstr "О Sylpheed-Claws."
+#: src/gtk/about.c:138
+msgid ""
+"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
+"\n"
+"For further information visit the Claws Mail website:\n"
+msgstr ""
+"Claws Mail је једноставан, брз и подесиви клијент за е-пошту.\n"
+"\n"
+"За додатне информације посетите Claws Mail страну на Интернету:\n"
+
+#: src/gtk/about.c:144
+msgid ""
+"\n"
+"\n"
+"Claws Mail is free software released under the GPL license. If you wish to "
+"donate to the Claws Mail project you can do so at:\n"
+msgstr ""
+"\n"
+"\n"
+"Claws Mail је слободан софтвер објављен под ГНУовом ОЈЛ. Ако желите да "
+"помогнете Claws Mail пројекту то можете учинити на:\n"
+
+#: src/gtk/about.c:159
+msgid ""
+"\n"
+"\n"
+"System Information\n"
+msgstr ""
+"\n"
+"\n"
+"Системске информације\n"

 
 

-#: src/gtk/about.c:161
+#: src/gtk/about.c:165

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2976,7 +3326,7 @@ msgstr ""
 "Локалитет: %s (скуп знакова: %s)\n"
 "Оперативни систем: %s %s (%s)"
 
 "Локалитет: %s (скуп знакова: %s)\n"
 "Оперативни систем: %s %s (%s)"
 

-#: src/gtk/about.c:170
+#: src/gtk/about.c:174

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2987,7 +3337,7 @@ msgstr ""
 "Локалитет: %s (скуп знакова: %s)\n"
 "Оперативни систем: %s"
 
 "Локалитет: %s (скуп знакова: %s)\n"
 "Оперативни систем: %s"
 

-#: src/gtk/about.c:179
+#: src/gtk/about.c:183

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2998,110 +3348,79 @@ msgstr ""
 "Локалитет: %s (скуп знакова: %s)\n"
 "Оперативни систем: непознат"
 
 "Локалитет: %s (скуп знакова: %s)\n"
 "Оперативни систем: непознат"
 

-#: src/gtk/about.c:194
-#, c-format
-msgid ""
-"Compiled-in features:\n"
-"%s"
-msgstr ""
-"Уграђене могућности:\n"
-"%s"
+#: src/gtk/about.c:240 src/prefs_themes.c:706 src/wizard.c:467
+msgid "The Claws Mail Team"
+msgstr "Claws Mail тим"

 
 

-#: src/gtk/about.c:237
-msgid ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Sylpheed-Claws team"
-msgstr ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"и Sylpheed-Claws тим"
+#: src/gtk/about.c:259
+msgid "Previous team members"
+msgstr "Претходни чланови тима"

 
 

-#: src/gtk/about.c:280
-msgid ""
-"Sylpheed-Claws is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Sylpheed-Claws website:\n"
-msgstr ""
-"Sylpheed-Claws је једноставан, брз и подесиви клијент за е-пошту.\n"
-"\n"
-"За додатне информације посетите Sylpheed-Claws страну на Интернету:\n"
+#: src/gtk/about.c:278
+msgid "The translation team"
+msgstr "Тим преводилаца"

 
 

-#: src/gtk/about.c:286
-msgid ""
-"\n"
-"\n"
-"Sylpheed-Claws is free software released under the GPL license. If you wish "
-"to donate to the Sylpheed-Claws project you can do so at:\n"
-msgstr ""
-"\n"
-"\n"
-"Sylpheed-Claws је слободан софтвер објављен под ГНУовом ОЈЛ. Ако желите да "
-"помогнете Sylpheed-Claws пројекту то можете учинити на:\n"
+#: src/gtk/about.c:297
+msgid "Documentation team"
+msgstr "Тим за документацију"

 
 

-#: src/gtk/about.c:293
-msgid "\n"
-msgstr "\n"
+#: src/gtk/about.c:316
+msgid "Logo"
+msgstr "Логотип"

 
 

-#: src/gtk/about.c:304
-msgid "_Info"
-msgstr "_Информације"
+#: src/gtk/about.c:335
+msgid "Icons"
+msgstr "Иконице"

 
 

-#: src/gtk/about.c:332
-msgid "The Sylpheed-Claws Team\n"
-msgstr "Sylpheed-Claws тим\n"
+#: src/gtk/about.c:354
+msgid "Contributors"
+msgstr "Прилагачи"

 
 

-#: src/gtk/about.c:349
-msgid ""
-"\n"
-"Previous team members\n"
-msgstr ""
-"\n"
-"Претходни чланови тима\n"
+#: src/gtk/about.c:402
+msgid "Compiled-in Features\n"
+msgstr "Уграђене могућности:\n"

 
 

-#: src/gtk/about.c:366
-msgid ""
-"\n"
-"The translation team\n"
-msgstr ""
-"\n"
-"Тим преводилаца\n"
+#: src/gtk/about.c:418
+msgid "IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
+msgstr "омогућава подршку за IPv6 адресе, нови протокол адресирања на Интернету\n"

 
 

-#: src/gtk/about.c:383
-msgid ""
-"\n"
-"Documentation team\n"
-msgstr ""
-"\n"
-"Тим за документацију\n"
+#: src/gtk/about.c:429
+msgid "iconv|allows converting to and from different character sets\n"
+msgstr "омогућава конвертовање текста између различитих кодних распореда\n"

 
 

-#: src/gtk/about.c:400
-msgid ""
-"\n"
-"Logo\n"
-msgstr ""
-"\n"
-"Логотип\n"
+#: src/gtk/about.c:439
+msgid "compface|adds support for the X-Face header\n"
+msgstr "омогућава подршку за X-Face заглавље\n"

 
 

-#: src/gtk/about.c:417
-msgid ""
-"\n"
-"Icons\n"
-msgstr ""
-"\n"
-"Иконе\n"
+#: src/gtk/about.c:449
+msgid "OpenSSL|adds support for encrypted connections to servers\n"
+msgstr "омогућава подршку за криптовано повезивање са сервером\n"

 
 

-#: src/gtk/about.c:434
-msgid ""
-"\n"
-"Contributors\n"
-msgstr ""
-"\n"
-"Прилагачи\n"
+#: src/gtk/about.c:459
+msgid "LDAP|adds support for LDAP shared addressbooks\n"
+msgstr "омогућава подршку за LDAP дељене адресаре\n"

 
 

-#: src/gtk/about.c:453
-msgid "_Authors"
-msgstr "_Атуори"
+#: src/gtk/about.c:469
+msgid "JPilot|adds support for PalmOS addressbooks\n"
+msgstr "омогућава подршку за PalmOS адресаре\n"
+
+#: src/gtk/about.c:479
+msgid "GNU/aspell|adds support for spell checking\n"
+msgstr "омогућава подршку за проверу правописа\n"
+
+#: src/gtk/about.c:489
+msgid "libetpan|adds support for IMAP servers\n"
+msgstr "омогућава подршку за IMAP сервере\n"

 
 

-#: src/gtk/about.c:473
+#: src/gtk/about.c:499
+msgid "libgnomeprint|adds support for a complete print dialog\n"
+msgstr "омогућава подршку за комплетан дијалог за штампање\n"
+
+#: src/gtk/about.c:509
+msgid "libSM|adds support for session handling\n"
+msgstr "омогућава подршку за управљање сесијама\n"
+
+#: src/gtk/about.c:541

 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 "
 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 "


@@ -3115,7 +3434,7 @@ msgstr ""
 "следеће верзије.\n"
 "\n"
 
 "следеће верзије.\n"
 "\n"
 

-#: src/gtk/about.c:479
+#: src/gtk/about.c:547

 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 "
 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 "


@@ -3129,7 +3448,7 @@ msgstr ""
 "детаља.\n"
 "\n"
 
 "детаља.\n"
 "\n"
 

-#: src/gtk/about.c:485
+#: src/gtk/about.c:553

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "


@@ -3141,7 +3460,7 @@ msgstr ""
 "адресу: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301, USA.\n"
 
 "адресу: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301, USA.\n"
 

-#: src/gtk/about.c:499
+#: src/gtk/about.c:571

 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("


@@ -3149,39 +3468,69 @@ msgstr ""
 "Овај производ садржи софтвер развијен од стране OpenSSL пројекта за употребу "
 "у OpenSSL Toolkit ("
 
 "Овај производ садржи софтвер развијен од стране OpenSSL пројекта за употребу "
 "у OpenSSL Toolkit ("
 

-#: src/gtk/about.c:503
+#: src/gtk/about.c:575

 msgid ").\n"
 msgstr ").\n"
 
 msgid ").\n"
 msgstr ").\n"
 

-#: src/gtk/about.c:515
+#: src/gtk/about.c:668
+msgid "About Claws Mail"
+msgstr "О Claws Mail."
+
+#: src/gtk/about.c:719
+msgid ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"
+msgstr ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"и Claws Mail тим"
+
+#: src/gtk/about.c:733
+msgid "_Info"
+msgstr "_Информације"
+
+#: src/gtk/about.c:739
+msgid "_Authors"
+msgstr "_Атуори"
+
+#: src/gtk/about.c:745
+msgid "_Features"
+msgstr "_Могућности"
+
+#: src/gtk/about.c:751

 msgid "_License"
 msgstr "_Лиценца"
 
 msgid "_License"
 msgstr "_Лиценца"
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:300
+#: src/gtk/about.c:759
+msgid "_Release Notes"
+msgstr "_Објава"
+
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:313

 msgid "Orange"
 msgstr "Наранџаста"
 
 msgid "Orange"
 msgstr "Наранџаста"
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:304
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:317

 msgid "Red"
 msgstr "Црвена"
 
 msgid "Red"
 msgstr "Црвена"
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:308
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:321

 msgid "Pink"
 msgstr "Ружичаста"
 
 msgid "Pink"
 msgstr "Ружичаста"
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:312
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:325

 msgid "Sky blue"
 msgstr "Небо плава"
 
 msgid "Sky blue"
 msgstr "Небо плава"
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:316
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:329

 msgid "Blue"
 msgstr "Плава"
 
 msgid "Blue"
 msgstr "Плава"
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:320
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:333

 msgid "Green"
 msgstr "Зелена"
 
 msgid "Green"
 msgstr "Зелена"
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:324
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:337

 msgid "Brown"
 msgstr "Браон"
 
 msgid "Brown"
 msgstr "Браон"
 


@@ -3305,36 +3654,36 @@ msgstr "Опис писма за заглавље и подножје стран
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Писмо за испис заглавља и подножја (нпр. „Monospace 10“)"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "Писмо за испис заглавља и подножја (нпр. „Monospace 10“)"
 

-#: src/gtk/gtkaspell.c:606
+#: src/gtk/gtkaspell.c:632

 msgid "No dictionary selected."
 msgstr "Нисте одабрали речник."
 
 msgid "No dictionary selected."
 msgstr "Нисте одабрали речник."
 

-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
+#: src/gtk/gtkaspell.c:868 src/gtk/gtkaspell.c:1869 src/gtk/gtkaspell.c:2164

 msgid "Normal Mode"
 msgstr "Нормалан мод"
 
 msgid "Normal Mode"
 msgstr "Нормалан мод"
 

-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
+#: src/gtk/gtkaspell.c:870 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2176

 msgid "Bad Spellers Mode"
 msgstr "Мод лошег правописа"
 
 msgid "Bad Spellers Mode"
 msgstr "Мод лошег правописа"
 

-#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:909

 msgid "Unknown suggestion mode."
 msgstr "Непознати препоручени мод."
 
 msgid "Unknown suggestion mode."
 msgstr "Непознати препоручени мод."
 

-#: src/gtk/gtkaspell.c:1154
+#: src/gtk/gtkaspell.c:1200

 msgid "No misspelled word found."
 msgstr "Нема погрешно написаних речи."
 
 msgid "No misspelled word found."
 msgstr "Нема погрешно написаних речи."
 

-#: src/gtk/gtkaspell.c:1502
+#: src/gtk/gtkaspell.c:1548

 msgid "Replace unknown word"
 msgstr "Замени непознату реч"
 
 msgid "Replace unknown word"
 msgstr "Замени непознату реч"
 

-#: src/gtk/gtkaspell.c:1517
+#: src/gtk/gtkaspell.c:1563

 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Замени „%s“ са: </span>"
 
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Замени „%s“ са: </span>"
 

-#: src/gtk/gtkaspell.c:1562
+#: src/gtk/gtkaspell.c:1608

 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"


@@ -3342,59 +3691,63 @@ msgstr ""
 "Држећи притиснут тастер Control док притискате Ентер\n"
 "биће упамћена исправка грешке.\n"
 
 "Држећи притиснут тастер Control док притискате Ентер\n"
 "биће упамћена исправка грешке.\n"
 

-#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
+#: src/gtk/gtkaspell.c:1863 src/gtk/gtkaspell.c:2152

 msgid "Fast Mode"
 msgstr "Брзи мод"
 
 msgid "Fast Mode"
 msgstr "Брзи мод"
 

-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1970

 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "„%s“ непознат у %s"
 
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "„%s“ непознат у %s"
 

-#: src/gtk/gtkaspell.c:1930
+#: src/gtk/gtkaspell.c:1984

 msgid "Accept in this session"
 msgstr "Прихвати у овој сесији"
 
 msgid "Accept in this session"
 msgstr "Прихвати у овој сесији"
 

-#: src/gtk/gtkaspell.c:1940
+#: src/gtk/gtkaspell.c:1994

 msgid "Add to personal dictionary"
 msgstr "Додај у лични речник"
 
 msgid "Add to personal dictionary"
 msgstr "Додај у лични речник"
 

-#: src/gtk/gtkaspell.c:1950
+#: src/gtk/gtkaspell.c:2004

 msgid "Replace with..."
 msgstr "Замени са..."
 
 msgid "Replace with..."
 msgstr "Замени са..."
 

-#: src/gtk/gtkaspell.c:1963
+#: src/gtk/gtkaspell.c:2017

 #, c-format
 msgid "Check with %s"
 msgstr "Провери са %s"
 
 #, c-format
 msgid "Check with %s"
 msgstr "Провери са %s"
 

-#: src/gtk/gtkaspell.c:1985
+#: src/gtk/gtkaspell.c:2039

 msgid "(no suggestions)"
 msgstr "(нема препорука)"
 
 msgid "(no suggestions)"
 msgstr "(нема препорука)"
 

-#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
+#: src/gtk/gtkaspell.c:2050 src/gtk/gtkaspell.c:2229

 msgid "More..."
 msgstr "Још..."
 
 msgid "More..."
 msgstr "Још..."
 

-#: src/gtk/gtkaspell.c:2060
+#: src/gtk/gtkaspell.c:2114

 #, c-format
 msgid "Dictionary: %s"
 msgstr "Речник: %s"
 
 #, c-format
 msgid "Dictionary: %s"
 msgstr "Речник: %s"
 

-#: src/gtk/gtkaspell.c:2073
+#: src/gtk/gtkaspell.c:2127

 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Користи алтернативу (%s)"
 
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "Користи алтернативу (%s)"
 

-#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2138
+msgid "Use both dictionaries"
+msgstr "Користи оба речника"
+
+#: src/gtk/gtkaspell.c:2192 src/prefs_spelling.c:218

 msgid "Check while typing"
 msgstr "Провера у току куцања"
 
 msgid "Check while typing"
 msgstr "Провера у току куцања"
 

-#: src/gtk/gtkaspell.c:2137
+#: src/gtk/gtkaspell.c:2208

 msgid "Change dictionary"
 msgstr "Промена речника"
 
 msgid "Change dictionary"
 msgstr "Промена речника"
 

-#: src/gtk/gtkaspell.c:2270
+#: src/gtk/gtkaspell.c:2340

 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"


@@ -3403,6 +3756,15 @@ msgstr ""
 "Модул за правописну проверу не може да промени речник.\n"
 "%s"
 
 "Модул за правописну проверу не може да промени речник.\n"
 "%s"
 

+#: src/gtk/gtkaspell.c:2386
+#, c-format
+msgid ""
+"The spell checker could not change the alternate dictionary.\n"
+"%s"
+msgstr ""
+"Модул за правописну проверу не може да промени алтернативни речник.\n"
+"%s"
+

 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Нове поруке"
 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "Нове поруке"


@@ -3491,16 +3853,16 @@ msgstr ""
 "<span weight=\"bold\">Следеће иконе се користе за приказ статуса порука и "
 "директоријума:</span>"
 
 "<span weight=\"bold\">Следеће иконе се користе за приказ статуса порука и "
 "директоријума:</span>"
 

-#: src/gtk/inputdialog.c:186
+#: src/gtk/inputdialog.c:189

 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Унесите лозинку за %s на %s:"
 
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "Унесите лозинку за %s на %s:"
 

-#: src/gtk/inputdialog.c:188
+#: src/gtk/inputdialog.c:191

 msgid "Input password"
 msgstr "Унесите лозинку"
 
 msgid "Input password"
 msgstr "Унесите лозинку"
 

-#: src/gtk/inputdialog.c:275
+#: src/gtk/inputdialog.c:278

 msgid "Remember this"
 msgstr "Упамти ово"
 
 msgid "Remember this"
 msgstr "Упамти ово"
 


@@ -3508,7 +3870,7 @@ msgstr "Упамти ово"
 msgid "Protocol log"
 msgstr "Дневник рада протокола"
 
 msgid "Protocol log"
 msgstr "Дневник рада протокола"
 

-#: src/gtk/logwindow.c:373
+#: src/gtk/logwindow.c:384

 msgid "Clear _Log"
 msgstr "Очисти _дневник рада"
 
 msgid "Clear _Log"
 msgstr "Очисти _дневник рада"
 


@@ -3552,13 +3914,13 @@ msgstr ""
 msgid "Plugins"
 msgstr "Додаци"
 
 msgid "Plugins"
 msgstr "Додаци"
 

-#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:211

 msgid "Description"
 msgstr "Опис"
 
 #: src/gtk/pluginwindow.c:336
 msgid "Description"
 msgstr "Опис"
 
 #: src/gtk/pluginwindow.c:336

-msgid "More plugins are available from the Sylpheed-Claws website."
-msgstr "Више додатака је доступно на Sylpheed-Claws веб страни."
+msgid "More plugins are available from the Claws Mail website."
+msgstr "Више додатака је доступно на Claws Mail веб страни."

 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."
 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."


@@ -3588,187 +3950,187 @@ msgstr "Учитани додаци"
 msgid "Page Index"
 msgstr "Листа опција"
 
 msgid "Page Index"
 msgstr "Листа опција"
 

-#: src/gtk/progressdialog.c:141 src/prefs_account.c:760
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:769

 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Налог"
 
 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "Налог"
 

-#: src/gtk/progressdialog.c:149 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80
+#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
+#: src/prefs_summary_column.c:80 src/summaryview.c:2376

 msgid "Status"
 msgstr "Статус"
 
 msgid "Status"
 msgstr "Статус"
 

-#: src/gtk/quicksearch.c:252
+#: src/gtk/quicksearch.c:331

 msgid "all messages"
 msgstr "све поруке"
 
 msgid "all messages"
 msgstr "све поруке"
 

-#: src/gtk/quicksearch.c:253
+#: src/gtk/quicksearch.c:332

 msgid "messages whose age is greater than #"
 msgstr "поруке које су веће од #"
 
 msgid "messages whose age is greater than #"
 msgstr "поруке које су веће од #"
 

-#: src/gtk/quicksearch.c:254
+#: src/gtk/quicksearch.c:333

 msgid "messages whose age is less than #"
 msgstr "поруке које су мање од #"
 
 msgid "messages whose age is less than #"
 msgstr "поруке које су мање од #"
 

-#: src/gtk/quicksearch.c:255
+#: src/gtk/quicksearch.c:334

 msgid "messages which contain S in the message body"
 msgstr "поруке које садрже „С“ у телу поруке"
 
 msgid "messages which contain S in the message body"
 msgstr "поруке које садрже „С“ у телу поруке"
 

-#: src/gtk/quicksearch.c:256
+#: src/gtk/quicksearch.c:335

 msgid "messages which contain S in the whole message"
 msgstr "поруке које садрже „С“ у заглављу или телу поруке"
 
 msgid "messages which contain S in the whole message"
 msgstr "поруке које садрже „С“ у заглављу или телу поруке"
 

-#: src/gtk/quicksearch.c:257
+#: src/gtk/quicksearch.c:336

 msgid "messages carbon-copied to S"
 msgstr "поруке чија је Копија: за „С“"
 
 msgid "messages carbon-copied to S"
 msgstr "поруке чија је Копија: за „С“"
 

-#: src/gtk/quicksearch.c:258
+#: src/gtk/quicksearch.c:337

 msgid "message is either to: or cc: to S"
 msgstr "поруке у којима је Прималац: или Копија: за „С“"
 
 msgid "message is either to: or cc: to S"
 msgstr "поруке у којима је Прималац: или Копија: за „С“"
 

-#: src/gtk/quicksearch.c:259
+#: src/gtk/quicksearch.c:338

 msgid "deleted messages"
 msgstr "поруке са ознаком „обрисано“"
 
 msgid "deleted messages"
 msgstr "поруке са ознаком „обрисано“"
 

-#: src/gtk/quicksearch.c:260
+#: src/gtk/quicksearch.c:339

 msgid "messages which contain S in the Sender field"
 msgstr "поруке које садрже „С“ у пољу Аутор:"
 
 msgid "messages which contain S in the Sender field"
 msgstr "поруке које садрже „С“ у пољу Аутор:"
 

-#: src/gtk/quicksearch.c:261
+#: src/gtk/quicksearch.c:340

 msgid "true if execute \"S\" succeeds"
 msgstr "тачно ако се „С“ успешно изврши"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "тачно ако се „С“ успешно изврши"
 

-#: src/gtk/quicksearch.c:262
+#: src/gtk/quicksearch.c:341

 msgid "messages originating from user S"
 msgstr "поруке чији је аутор „С“"
 
 msgid "messages originating from user S"
 msgstr "поруке чији је аутор „С“"
 

-#: src/gtk/quicksearch.c:263
+#: src/gtk/quicksearch.c:342

 msgid "forwarded messages"
 msgstr "прослеђене поруке"
 
 msgid "forwarded messages"
 msgstr "прослеђене поруке"
 

-#: src/gtk/quicksearch.c:264
+#: src/gtk/quicksearch.c:343

 msgid "messages which contain header S"
 msgstr "поруке које садрже поље заглавља „С“"
 
 msgid "messages which contain header S"
 msgstr "поруке које садрже поље заглавља „С“"
 

-#: src/gtk/quicksearch.c:265
+#: src/gtk/quicksearch.c:344

 msgid "messages which contain S in Message-ID header"
 msgstr "поруке које садрже „С“ у „Message-ID“ пољу заглавља"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "поруке које садрже „С“ у „Message-ID“ пољу заглавља"
 

-#: src/gtk/quicksearch.c:266
+#: src/gtk/quicksearch.c:345

 msgid "messages which contain S in inreplyto header"
 msgstr "поруке које садрже „С“ у „In-Reply-To“ пољу заглавља"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "поруке које садрже „С“ у „In-Reply-To“ пољу заглавља"
 

-#: src/gtk/quicksearch.c:267
+#: src/gtk/quicksearch.c:346

 msgid "messages which are marked with color #"
 msgstr "поруке обележене бојом „#“"
 
 msgid "messages which are marked with color #"
 msgstr "поруке обележене бојом „#“"
 

-#: src/gtk/quicksearch.c:268
+#: src/gtk/quicksearch.c:347

 msgid "locked messages"
 msgstr "закључане поруке"
 
 msgid "locked messages"
 msgstr "закључане поруке"
 

-#: src/gtk/quicksearch.c:269
+#: src/gtk/quicksearch.c:348

 msgid "messages which are in newsgroup S"
 msgstr "поруке које су у дискусионој групи „С“"
 
 msgid "messages which are in newsgroup S"
 msgstr "поруке које су у дискусионој групи „С“"
 

-#: src/gtk/quicksearch.c:270
+#: src/gtk/quicksearch.c:349

 msgid "new messages"
 msgstr "нове поруке"
 
 msgid "new messages"
 msgstr "нове поруке"
 

-#: src/gtk/quicksearch.c:271
+#: src/gtk/quicksearch.c:350

 msgid "old messages"
 msgstr "старе поруке"
 
 msgid "old messages"
 msgstr "старе поруке"
 

-#: src/gtk/quicksearch.c:272
+#: src/gtk/quicksearch.c:351

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "некомплетна порука (није преузета у целости)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "некомплетна порука (није преузета у целости)"
 

-#: src/gtk/quicksearch.c:273
+#: src/gtk/quicksearch.c:352

 msgid "messages which have been replied to"
 msgstr "поруке на које постоје одговори (реплике)"
 
 msgid "messages which have been replied to"
 msgstr "поруке на које постоје одговори (реплике)"
 

-#: src/gtk/quicksearch.c:274
+#: src/gtk/quicksearch.c:353

 msgid "read messages"
 msgstr "прочитане поруке"
 
 msgid "read messages"
 msgstr "прочитане поруке"
 

-#: src/gtk/quicksearch.c:275
+#: src/gtk/quicksearch.c:354

 msgid "messages which contain S in subject"
 msgstr "поруке које садрже „С“ у теми поруке"
 
 msgid "messages which contain S in subject"
 msgstr "поруке које садрже „С“ у теми поруке"
 

-#: src/gtk/quicksearch.c:276
+#: src/gtk/quicksearch.c:355

 msgid "messages whose score is equal to #"
 msgstr "поруке са # бодова"
 
 msgid "messages whose score is equal to #"
 msgstr "поруке са # бодова"
 

-#: src/gtk/quicksearch.c:277
+#: src/gtk/quicksearch.c:356

 msgid "messages whose score is greater than #"
 msgstr "поруке са више од # бодова"
 
 msgid "messages whose score is greater than #"
 msgstr "поруке са више од # бодова"
 

-#: src/gtk/quicksearch.c:278
+#: src/gtk/quicksearch.c:357

 msgid "messages whose score is lower than #"
 msgstr "поруке са мање од # бодова"
 
 msgid "messages whose score is lower than #"
 msgstr "поруке са мање од # бодова"
 

-#: src/gtk/quicksearch.c:279
+#: src/gtk/quicksearch.c:358

 msgid "messages whose size is equal to #"
 msgstr "поруке величине # бајтова"
 
 msgid "messages whose size is equal to #"
 msgstr "поруке величине # бајтова"
 

-#: src/gtk/quicksearch.c:280
+#: src/gtk/quicksearch.c:359

 msgid "messages whose size is greater than #"
 msgstr "поруке веће од # бајтова"
 
 msgid "messages whose size is greater than #"
 msgstr "поруке веће од # бајтова"
 

-#: src/gtk/quicksearch.c:281
+#: src/gtk/quicksearch.c:360

 msgid "messages whose size is smaller than #"
 msgstr "поруке мање од # бајтова"
 
 msgid "messages whose size is smaller than #"
 msgstr "поруке мање од # бајтова"
 

-#: src/gtk/quicksearch.c:282
+#: src/gtk/quicksearch.c:361

 msgid "messages which have been sent to S"
 msgstr "поруке послате за „С“"
 
 msgid "messages which have been sent to S"
 msgstr "поруке послате за „С“"
 

-#: src/gtk/quicksearch.c:283
+#: src/gtk/quicksearch.c:362

 msgid "marked messages"
 msgstr "обележене поруке"
 
 msgid "marked messages"
 msgstr "обележене поруке"
 

-#: src/gtk/quicksearch.c:284
+#: src/gtk/quicksearch.c:363

 msgid "unread messages"
 msgstr "непрочитане поруке"
 
 msgid "unread messages"
 msgstr "непрочитане поруке"
 

-#: src/gtk/quicksearch.c:285
+#: src/gtk/quicksearch.c:364

 msgid "messages which contain S in References header"
 msgstr "поруке које садрже „С“ у „References“ пољу заглавља"
 
 msgid "messages which contain S in References header"
 msgstr "поруке које садрже „С“ у „References“ пољу заглавља"
 

-#: src/gtk/quicksearch.c:286
+#: src/gtk/quicksearch.c:365

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "порука враћа 0 при слању команди - %F је датотека поруке"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "порука враћа 0 при слању команди - %F је датотека поруке"
 

-#: src/gtk/quicksearch.c:287
+#: src/gtk/quicksearch.c:366

 msgid "messages which contain S in X-Label header"
 msgstr "поруке које садрже „С“ у „X-Label“ пољу заглавља"
 
 msgid "messages which contain S in X-Label header"
 msgstr "поруке које садрже „С“ у „X-Label“ пољу заглавља"
 

-#: src/gtk/quicksearch.c:289
+#: src/gtk/quicksearch.c:368

 msgid "logical AND operator"
 msgstr "логички оператор И"
 
 msgid "logical AND operator"
 msgstr "логички оператор И"
 

-#: src/gtk/quicksearch.c:290
+#: src/gtk/quicksearch.c:369

 msgid "logical OR operator"
 msgstr "логички оператор ИЛИ"
 
 msgid "logical OR operator"
 msgstr "логички оператор ИЛИ"
 

-#: src/gtk/quicksearch.c:291
+#: src/gtk/quicksearch.c:370

 msgid "logical NOT operator"
 msgstr "логички оператор НЕ"
 
 msgid "logical NOT operator"
 msgstr "логички оператор НЕ"
 

-#: src/gtk/quicksearch.c:292
+#: src/gtk/quicksearch.c:371

 msgid "case sensitive search"
 msgstr "величина слова је битна"
 
 msgid "case sensitive search"
 msgstr "величина слова је битна"
 

-#: src/gtk/quicksearch.c:294
+#: src/gtk/quicksearch.c:373

 msgid "all filtering expressions are allowed"
 msgstr "сви изрази за филтрирање су дозвољени"
 
 msgid "all filtering expressions are allowed"
 msgstr "сви изрази за филтрирање су дозвољени"
 

-#: src/gtk/quicksearch.c:302 src/summary_search.c:320
+#: src/gtk/quicksearch.c:381 src/summary_search.c:397

 msgid "Extended Search"
 msgstr "Напредна претрага"
 
 msgid "Extended Search"
 msgstr "Напредна претрага"
 

-#: src/gtk/quicksearch.c:303
+#: src/gtk/quicksearch.c:382

 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"
 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"


@@ -3780,47 +4142,51 @@ msgstr ""
 "\n"
 "Могу се користити следећи симболи:"
 
 "\n"
 "Могу се користити следећи симболи:"
 

-#: src/gtk/quicksearch.c:399 src/prefs_filtering_action.c:1080
-#: src/prefs_matcher.c:158 src/prefs_matcher.c:1866
-#: src/prefs_summary_column.c:82 src/prefs_template.c:190 src/quote_fmt.c:47
-#: src/summaryview.c:485
+#: src/gtk/quicksearch.c:478 src/prefs_compose_writing.c:239
+#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
+#: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
+#: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486

 msgid "Subject"
 msgstr "Тема"
 
 msgid "Subject"
 msgstr "Тема"
 

-#: src/gtk/quicksearch.c:403 src/prefs_filtering_action.c:1081
+#: src/gtk/quicksearch.c:482 src/prefs_filtering_action.c:1081

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867

-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:486
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487

 msgid "From"
 msgstr "Аутор"
 
 msgid "From"
 msgstr "Аутор"
 

-#: src/gtk/quicksearch.c:407 src/prefs_filtering_action.c:1082
+#: src/gtk/quicksearch.c:486 src/prefs_filtering_action.c:1082

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48

-#: src/summaryview.c:487
+#: src/summaryview.c:488

 msgid "To"
 msgstr "Прималац"
 
 msgid "To"
 msgstr "Прималац"
 

-#: src/gtk/quicksearch.c:418
+#: src/gtk/quicksearch.c:497

 msgid "Recursive"
 msgstr "Уназад"
 
 msgid "Recursive"
 msgstr "Уназад"
 

-#: src/gtk/quicksearch.c:428
+#: src/gtk/quicksearch.c:507

 msgid "Sticky"
 msgstr "Лепљиво"
 
 msgid "Sticky"
 msgstr "Лепљиво"
 

-#: src/gtk/quicksearch.c:459
+#: src/gtk/quicksearch.c:517
+msgid "Type-ahead"
+msgstr "У лету"
+
+#: src/gtk/quicksearch.c:548

 msgid " Clear "
 msgstr " Очисти "
 
 msgid " Clear "
 msgstr " Очисти "
 

-#: src/gtk/quicksearch.c:480 src/summary_search.c:273
+#: src/gtk/quicksearch.c:569 src/summary_search.c:350

 msgid "Edit search criteria"
 msgstr "Уређивање услова претраге"
 
 msgid "Edit search criteria"
 msgstr "Уређивање услова претраге"
 

-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:575

 msgid " Extended Symbols... "
 msgstr " Напредни симболи... "
 
 msgid " Extended Symbols... "
 msgstr " Напредни симболи... "
 

-#: src/gtk/quicksearch.c:917 src/summaryview.c:1041
+#: src/gtk/quicksearch.c:1025 src/summaryview.c:1073

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Претраживање у %s... \n"
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "Претраживање у %s... \n"


@@ -3938,11 +4304,11 @@ msgstr "_Преглед сертификата"
 msgid "Changed SSL Certificate"
 msgstr "Промењени SSL сертификат"
 
 msgid "Changed SSL Certificate"
 msgstr "Промењени SSL сертификат"
 

-#: src/headerview.c:195 src/summaryview.c:2728 src/summaryview.c:2739
+#: src/headerview.c:195 src/summaryview.c:2784 src/summaryview.c:2795

 msgid "(No From)"
 msgstr "(Без аутора)"
 
 msgid "(No From)"
 msgstr "(Без аутора)"
 

-#: src/headerview.c:210 src/summaryview.c:2763 src/summaryview.c:2766
+#: src/headerview.c:210 src/summaryview.c:2819 src/summaryview.c:2822

 msgid "(No Subject)"
 msgstr "(Без теме)"
 
 msgid "(No Subject)"
 msgstr "(Без теме)"
 


@@ -3962,7 +4328,7 @@ msgstr "Учитај слику"
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
 msgid "Content-Type:"
 msgstr "Content-Type:"
 

-#: src/imap.c:623
+#: src/imap.c:632

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3974,208 +4340,225 @@ msgstr ""
 "CRAM-MD5 пријава фукнционише само ако је libetpan компајлиран са подршком за "
 "SASL и ако је додатак CRAM-MD5 SASL иснталиран."
 
 "CRAM-MD5 пријава фукнционише само ако је libetpan компајлиран са подршком за "
 "SASL и ако је додатак CRAM-MD5 SASL иснталиран."
 

-#: src/imap.c:630
+#: src/imap.c:639

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Повезивање на %s неуспешно: пријава одбијена.%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "Повезивање на %s неуспешно: пријава одбијена.%s"
 

-#: src/imap.c:634
+#: src/imap.c:643

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Повезивање на %s неуспешно: пријава одбијена.%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "Повезивање на %s неуспешно: пријава одбијена.%s\n"
 

-#: src/imap.c:651
+#: src/imap.c:660

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Неуспешно повезивање на %s"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "Неуспешно повезивање на %s"
 

-#: src/imap.c:656 src/imap.c:659
+#: src/imap.c:665 src/imap.c:668

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 конекција са %s је прекинута. Поновно успостављање конекције...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 конекција са %s је прекинута. Поновно успостављање конекције...\n"
 

-#: src/imap.c:697 src/imap.c:2163 src/imap.c:2687 src/imap.c:2771
-#: src/imap.c:3109 src/imap.c:3864
-msgid "Sylpheed-Claws needs network access in order to access the IMAP server."
-msgstr "Да би Sylpheed-Claws приступио IMAP налогу неопходан је приступ мрежи."
+#: src/imap.c:717 src/imap.c:2239 src/imap.c:2737 src/imap.c:2822
+#: src/imap.c:3156 src/imap.c:3914
+msgid "Claws Mail needs network access in order to access the IMAP server."
+msgstr "Да би Claws Mail приступио IMAP налогу неопходан је приступ мрежи."

 
 

-#: src/imap.c:771 src/inc.c:749 src/news.c:295 src/send_message.c:299
+#: src/imap.c:789 src/inc.c:770 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "Неосигуарно повезивање"
 
 msgid "Insecure connection"
 msgstr "Неосигуарно повезивање"
 

-#: src/imap.c:772 src/inc.c:750 src/news.c:296 src/send_message.c:300
+#: src/imap.c:790 src/inc.c:771 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "

-"available in this build of Sylpheed-Claws. \n"
+"available in this build of Claws Mail. \n"

 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Постављено је да повезивање буде осигурано употребом SSL протокола, али SSL "
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Постављено је да повезивање буде осигурано употребом SSL протокола, али SSL "

-"ниÑ\98е омогÑ\83Ñ\9bен пÑ\80и изгÑ\80адÑ\9aи овог издаÑ\9aа Sylpheed-Claws.\n"
+"ниÑ\98е омогÑ\83Ñ\9bен пÑ\80и компаÑ\98лиÑ\80аÑ\9aÑ\83 Claws Mail.\n"

 "\n"
 "Желите ли да се настави повезивање са сервером? Веза неће бити осигурана."
 
 "\n"
 "Желите ли да се настави повезивање са сервером? Веза неће бити осигурана."
 

-#: src/imap.c:778 src/inc.c:756 src/news.c:302 src/send_message.c:306
+#: src/imap.c:796 src/inc.c:777 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "_Настави повезивање"
 
 msgid "Con_tinue connecting"
 msgstr "_Настави повезивање"
 

-#: src/imap.c:788
+#: src/imap.c:806

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Повезивање на IMAP4 сервер: %s ..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "Повезивање на IMAP4 сервер: %s ..."
 

-#: src/imap.c:820
+#: src/imap.c:844

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Није могуће повезивање на IMAP4 сервер: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "Није могуће повезивање на IMAP4 сервер: %s:%d"
 

-#: src/imap.c:823
+#: src/imap.c:847

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Није могуће повезивање на IMAP4 сервер: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Није могуће повезивање на IMAP4 сервер: %s:%d\n"
 

-#: src/imap.c:852 src/imap.c:2495
+#: src/imap.c:876 src/imap.c:2545

 msgid "Can't start TLS session.\n"
 msgstr "Није могуће покретање TLS сесије.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "Није могуће покретање TLS сесије.\n"
 

-#: src/imap.c:889
+#: src/imap.c:913

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Повезивање на IMAP4 сервер %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "Повезивање на IMAP4 сервер %s...\n"
 

-#: src/imap.c:900 src/imap.c:903
+#: src/imap.c:924 src/imap.c:927

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Није могућа пријава на IMAP сервер %s."
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "Није могућа пријава на IMAP сервер %s."
 

-#: src/imap.c:1077
+#: src/imap.c:1100

 msgid "Adding messages..."
 msgstr "Додавање порука..."
 
 msgid "Adding messages..."
 msgstr "Додавање порука..."
 

-#: src/imap.c:1225 src/mh.c:504
+#: src/imap.c:1252 src/mh.c:500

 msgid "Copying messages..."
 msgstr "Умножавање поруке..."
 
 msgid "Copying messages..."
 msgstr "Умножавање поруке..."
 

-#: src/imap.c:1352
+#: src/imap.c:1428

 msgid "can't set deleted flags\n"
 msgstr "није могуће постављање ознаке „Обирсано“\n"
 
 msgid "can't set deleted flags\n"
 msgstr "није могуће постављање ознаке „Обирсано“\n"
 

-#: src/imap.c:1358 src/imap.c:3616
+#: src/imap.c:1434 src/imap.c:3665

 msgid "can't expunge\n"
 msgstr "брисање није могуће\n"
 
 msgid "can't expunge\n"
 msgstr "брисање није могуће\n"
 

-#: src/imap.c:1802
+#: src/imap.c:1878

 msgid "can't create mailbox: LIST failed\n"
 msgstr "није могуће направити сандуче: неуспела команда LIST\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "није могуће направити сандуче: неуспела команда LIST\n"
 

-#: src/imap.c:1818
+#: src/imap.c:1894

 msgid "can't create mailbox\n"
 msgstr "није могуће направити сандуче\n"
 
 msgid "can't create mailbox\n"
 msgstr "није могуће направити сандуче\n"
 

-#: src/imap.c:1899
+#: src/imap.c:1975

 msgid "New folder name must not contain the namespace path separator"
 msgstr "Назив новог сандучета не сме садржати раздвојник путање (косу црту)"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr "Назив новог сандучета не сме садржати раздвојник путање (косу црту)"
 

-#: src/imap.c:1930
+#: src/imap.c:2006

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "није могуће преименовање сандучета: %s у %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "није могуће преименовање сандучета: %s у %s\n"
 

-#: src/imap.c:1994
+#: src/imap.c:2070

 msgid "can't delete mailbox\n"
 msgstr "није могуће уклањање сандучета\n"
 
 msgid "can't delete mailbox\n"
 msgstr "није могуће уклањање сандучета\n"
 

-#: src/imap.c:2275
+#: src/imap.c:2316

 msgid "LIST failed\n"
 msgstr "Неуспела наредба LIST\n"
 
 msgid "LIST failed\n"
 msgstr "Неуспела наредба LIST\n"
 

-#: src/imap.c:2383
+#: src/imap.c:2433

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "није могућ одабир директоријума: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "није могућ одабир директоријума: %s\n"
 

-#: src/imap.c:2492
+#: src/imap.c:2542

 msgid "Server requires TLS to log in.\n"
 msgstr "Сервер захтева TLS за приступ.\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "Сервер захтева TLS за приступ.\n"
 

-#: src/imap.c:2501
+#: src/imap.c:2551

 msgid "Can't refresh capabilities.\n"
 msgstr "Није могуће освежити могућности.\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "Није могуће освежити могућности.\n"
 

-#: src/imap.c:2506
+#: src/imap.c:2556

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Connection to %s failed: server requires TLS, but Sylpheed-Claws has been "
+"Connection to %s failed: server requires TLS, but Claws Mail has been "

 "compiled without OpenSSL support.\n"
 msgstr ""
 "compiled without OpenSSL support.\n"
 msgstr ""

-"Неуспешшно повезивање на %s: сервер захтева TLS, али је Sylpheed-Claws "
+"Неуспешшно повезивање на %s: сервер захтева TLS, али је Claws Mail "

 "компајлиран без подршке за OpenSSL.\n"
 
 "компајлиран без подршке за OpenSSL.\n"
 

-#: src/imap.c:2514
+#: src/imap.c:2564

 msgid "Server logins are disabled.\n"
 msgstr "Логовање на сервер није дозвољено.\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "Логовање на сервер није дозвољено.\n"
 

-#: src/imap.c:2692
+#: src/imap.c:2742

 msgid "Fetching message..."
 msgstr "Преузимање поруке..."
 
 msgid "Fetching message..."
 msgstr "Преузимање поруке..."
 

-#: src/imap.c:2858
+#: src/imap.c:2909

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преведе UTF-7 у %s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преведе UTF-7 у %s\n"
 

-#: src/imap.c:2888
+#: src/imap.c:2939

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преведе %s у UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преведе %s у UTF-7\n"
 

-#: src/imap.c:2932
+#: src/imap.c:2983

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv не може да преведе UTF-8 у UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv не може да преведе UTF-8 у UTF-7\n"
 

-#: src/imap.c:3601
+#: src/imap.c:3650

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "није могуће постављање ознаке „Обирсано“: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "није могуће постављање ознаке „Обирсано“: %d\n"
 

+#: src/imap.c:4378
+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 "
+"disabled.\n"
+"\n"
+"You probably need to install libetpan and recompile Claws Mail."
+msgstr ""
+"Имате креираних један или више IMAP налога. Ова верзија Claws Mail-а је "
+"компајлирана без подршке за IMAP протокол; Ваши IMAP налози су искључени.\n"
+"\n"
+"Највероватније треба да инсталирате libetpan и поново компајлирате Claws Mail."
+

 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/Направи _нови директоријум..."
 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/Направи _нови директоријум..."
 

-#: src/imap_gtk.c:56 src/mh_gtk.c:51
+#: src/imap_gtk.c:57 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr "/_Преименуј директоријум..."
 
 msgid "/_Rename folder..."
 msgstr "/_Преименуј директоријум..."
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:58 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr "/Пр_емести директоријум..."
 
 msgid "/M_ove folder..."
 msgstr "/Пр_емести директоријум..."
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:59 src/mh_gtk.c:54
+msgid "/Cop_y folder..."
+msgstr "/У_множи директоријум..."
+
+#: src/imap_gtk.c:61 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr "/_Обриши директоријум"
 
 msgid "/_Delete folder..."
 msgstr "/_Обриши директоријум"
 

-#: src/imap_gtk.c:60 src/news_gtk.c:55
+#: src/imap_gtk.c:63 src/news_gtk.c:55

 msgid "/Synchronise"
 msgstr "/Синхронизуј"
 
 msgid "/Synchronise"
 msgstr "/Синхронизуј"
 

-#: src/imap_gtk.c:61 src/news_gtk.c:56
+#: src/imap_gtk.c:64 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr "/Преу_зми поруке"
 
 msgid "/Down_load messages"
 msgstr "/Преу_зми поруке"
 

-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:58
+#: src/imap_gtk.c:66 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr "/Про_вери пошту"
 
 msgid "/_Check for new messages"
 msgstr "/Про_вери пошту"
 

-#: src/imap_gtk.c:64 src/mh_gtk.c:56
+#: src/imap_gtk.c:67 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr "/Про_вери нове директоријуме"
 
 msgid "/C_heck for new folders"
 msgstr "/Про_вери нове директоријуме"
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:57
+#: src/imap_gtk.c:68 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr "/Ажурирај стабло _директоријума"
 
 msgid "/R_ebuild folder tree"
 msgstr "/Ажурирај стабло _директоријума"
 

-#: src/imap_gtk.c:135
+#: src/imap_gtk.c:138

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"


@@ -4185,21 +4568,21 @@ msgstr ""
 "(ако желите да направите директоријум за смештање\n"
 "поддиректоријума без порука, додајте  „/“ на крај назива)"
 
 "(ако желите да направите директоријум за смештање\n"
 "поддиректоријума без порука, додајте  „/“ на крај назива)"
 

-#: src/imap_gtk.c:193 src/mh_gtk.c:228
+#: src/imap_gtk.c:196 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Унесите нови назив за „%s“:"
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "Унесите нови назив за „%s“:"
 

-#: src/imap_gtk.c:195 src/mh_gtk.c:230
+#: src/imap_gtk.c:198 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr "Преименуј директоријум"
 
 msgid "Rename folder"
 msgstr "Преименуј директоријум"
 

-#: src/imap_gtk.c:204 src/imap_gtk.c:209
+#: src/imap_gtk.c:207 src/imap_gtk.c:212

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ не може да се налази у називу директоријума."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ не може да се налази у називу директоријума."
 

-#: src/imap_gtk.c:226 src/mh_gtk.c:255
+#: src/imap_gtk.c:229 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -4207,7 +4590,7 @@ msgstr ""
 "Директоријум се не може преименовати.\n"
 "Нови назив директоријума није дозвољен."
 
 "Директоријум се не може преименовати.\n"
 "Нови назив директоријума није дозвољен."
 

-#: src/imap_gtk.c:280 src/mh_gtk.c:176
+#: src/imap_gtk.c:281 src/mh_gtk.c:179

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -4220,12 +4603,12 @@ msgstr ""
 "\n"
 "Да ли заиста желите да их обришете?"
 
 "\n"
 "Да ли заиста желите да их обришете?"
 

-#: src/imap_gtk.c:302 src/mh_gtk.c:198 src/news_gtk.c:238
+#: src/imap_gtk.c:303 src/mh_gtk.c:201 src/news_gtk.c:238

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Није могуће уклонити директоријум „%s“."
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Није могуће уклонити директоријум „%s“."
 

-#: src/imap_gtk.c:362 src/news_gtk.c:299
+#: src/imap_gtk.c:363 src/news_gtk.c:299

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Настала је грешка при преузимању поруке у „%s“."
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "Настала је грешка при преузимању поруке у „%s“."


@@ -4318,7 +4701,7 @@ msgstr "Одаберите LDIF датотеку за увоз."
 msgid "R"
 msgstr "Р"
 
 msgid "R"
 msgstr "Р"
 

-#: src/importldif.c:726 src/summaryview.c:483
+#: src/importldif.c:726 src/summaryview.c:484

 msgid "S"
 msgstr "С"
 
 msgid "S"
 msgstr "С"
 


@@ -4415,26 +4798,26 @@ msgid "Import Pine file into Address Book"
 msgstr "Увоз Пине датотеке у адресар"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304
 msgstr "Увоз Пине датотеке у адресар"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304

-msgid "Sylpheed-Claws needs network access in order to get mails."
-msgstr "Да би Sylpheed-Claws преузео поруке неопходан је приступ мрежи."
+msgid "Claws Mail needs network access in order to get mails."
+msgstr "Да би Claws Mail преузео поруке неопходан је приступ мрежи."

 
 

-#: src/inc.c:374
+#: src/inc.c:384

 msgid "Retrieving new messages"
 msgstr "Преузимање нових порука"
 
 msgid "Retrieving new messages"
 msgstr "Преузимање нових порука"
 

-#: src/inc.c:421
+#: src/inc.c:443

 msgid "Standby"
 msgstr "У приправности..."
 
 msgid "Standby"
 msgstr "У приправности..."
 

-#: src/inc.c:550 src/inc.c:600
+#: src/inc.c:572 src/inc.c:622

 msgid "Cancelled"
 msgstr "Отказано"
 
 msgid "Cancelled"
 msgstr "Отказано"
 

-#: src/inc.c:561
+#: src/inc.c:583

 msgid "Retrieving"
 msgstr "Преузимање у току..."
 
 msgid "Retrieving"
 msgstr "Преузимање у току..."
 

-#: src/inc.c:570
+#: src/inc.c:592

 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"


@@ -4442,27 +4825,27 @@ msgstr[0] "Готово (%d порука (%s) преузета)"
 msgstr[1] "Готово (%d поруке (%s) преузете)"
 msgstr[2] "Готово (%d порука (%s) преузето)"
 
 msgstr[1] "Готово (%d поруке (%s) преузете)"
 msgstr[2] "Готово (%d порука (%s) преузето)"
 

-#: src/inc.c:576
+#: src/inc.c:598

 msgid "Done (no new messages)"
 msgstr "Готово (нема нових порука)"
 
 msgid "Done (no new messages)"
 msgstr "Готово (нема нових порука)"
 

-#: src/inc.c:581
+#: src/inc.c:603

 msgid "Connection failed"
 msgstr "Неуспело повезивање"
 
 msgid "Connection failed"
 msgstr "Неуспело повезивање"
 

-#: src/inc.c:584
+#: src/inc.c:606

 msgid "Auth failed"
 msgstr "Неуспело пријављивање"
 
 msgid "Auth failed"
 msgstr "Неуспело пријављивање"
 

-#: src/inc.c:587 src/prefs_summary_column.c:89
+#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2372

 msgid "Locked"
 msgstr "Закључано"
 
 msgid "Locked"
 msgstr "Закључано"
 

-#: src/inc.c:597 src/plugins/spamassassin/spamassassin_gtk.c:345
+#: src/inc.c:619 src/plugins/spamassassin/spamassassin_gtk.c:345

 msgid "Timeout"
 msgstr "Време трајања"
 
 msgid "Timeout"
 msgstr "Време трајања"
 

-#: src/inc.c:691
+#: src/inc.c:712

 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"


@@ -4470,65 +4853,65 @@ msgstr[0] "Завршено (%d нова порука)"
 msgstr[1] "Завршено (%d нове поруке)"
 msgstr[2] "Завршено (%d нових порука)"
 
 msgstr[1] "Завршено (%d нове поруке)"
 msgstr[2] "Завршено (%d нових порука)"
 

-#: src/inc.c:695
+#: src/inc.c:716

 msgid "Finished (no new messages)"
 msgstr "Завршено (нема нових порука)"
 
 msgid "Finished (no new messages)"
 msgstr "Завршено (нема нових порука)"
 

-#: src/inc.c:733
+#: src/inc.c:754

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Преузимање нових порука"
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Преузимање нових порука"
 

-#: src/inc.c:765
+#: src/inc.c:786

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Повезивање на POP3 сервер: %s..."
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Повезивање на POP3 сервер: %s..."
 

-#: src/inc.c:782
+#: src/inc.c:803

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Није могуће повезивање на POP3 сервер: %s:%d"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Није могуће повезивање на POP3 сервер: %s:%d"
 

-#: src/inc.c:786
+#: src/inc.c:807

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Није могуће повезивање на POP3 сервер: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Није могуће повезивање на POP3 сервер: %s:%d\n"
 

-#: src/inc.c:866 src/send_message.c:472
+#: src/inc.c:887 src/send_message.c:472

 msgid "Authenticating..."
 msgstr "Идентификација..."
 
 msgid "Authenticating..."
 msgstr "Идентификација..."
 

-#: src/inc.c:868
+#: src/inc.c:889

 #, c-format
 msgid "Retrieving messages from %s (%s) ..."
 msgstr "Преузимање порука са %s (%s) ..."
 
 #, c-format
 msgid "Retrieving messages from %s (%s) ..."
 msgstr "Преузимање порука са %s (%s) ..."
 

-#: src/inc.c:874
+#: src/inc.c:895

 msgid "Getting the number of new messages (STAT)..."
 msgstr "Преузимање броја нових порука (STAT)..."
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Преузимање броја нових порука (STAT)..."
 

-#: src/inc.c:878
+#: src/inc.c:899

 msgid "Getting the number of new messages (LAST)..."
 msgstr "Преузимање броја нових порука (LAST)..."
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Преузимање броја нових порука (LAST)..."
 

-#: src/inc.c:882
+#: src/inc.c:903

 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Преузимање броја нових порука (UIDL)..."
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Преузимање броја нових порука (UIDL)..."
 

-#: src/inc.c:886
+#: src/inc.c:907

 msgid "Getting the size of messages (LIST)..."
 msgstr "Преузимање величине порука (LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Преузимање величине порука (LIST)..."
 

-#: src/inc.c:893 src/send_message.c:490
+#: src/inc.c:914 src/send_message.c:490

 msgid "Quitting"
 msgstr "Затварање везе са сервером"
 
 msgid "Quitting"
 msgstr "Затварање везе са сервером"
 

-#: src/inc.c:918
+#: src/inc.c:939

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Преузимање порука (%d / %d) (%s / %s)"
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Преузимање порука (%d / %d) (%s / %s)"
 

-#: src/inc.c:937
+#: src/inc.c:958

 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"


@@ -4536,20 +4919,20 @@ msgstr[0] "Преузимање (%d порука (%s) преузета)"
 msgstr[1] "Преузимање (%d поруке (%s) преузете)"
 msgstr[2] "Преузимање (%d порука (%s) преузето)"
 
 msgstr[1] "Преузимање (%d поруке (%s) преузете)"
 msgstr[2] "Преузимање (%d порука (%s) преузето)"
 

-#: src/inc.c:1093
+#: src/inc.c:1114

 msgid "Connection failed."
 msgstr "Неуспешно повезивање."
 
 msgid "Connection failed."
 msgstr "Неуспешно повезивање."
 

-#: src/inc.c:1097
+#: src/inc.c:1118

 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Повезивање са %s:%d није успело."
 
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "Повезивање са %s:%d није успело."
 

-#: src/inc.c:1102
+#: src/inc.c:1123

 msgid "Error occurred while processing mail."
 msgstr "Настала је грешка при процесирању поруке."
 
 msgid "Error occurred while processing mail."
 msgstr "Настала је грешка при процесирању поруке."
 

-#: src/inc.c:1108
+#: src/inc.c:1129

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"


@@ -4558,37 +4941,37 @@ msgstr ""
 "Настала је грешка при обради поруке:\n"
 "%s"
 
 "Настала је грешка при обради поруке:\n"
 "%s"
 

-#: src/inc.c:1114
+#: src/inc.c:1135

 msgid "No disk space left."
 msgstr "На диску више нема места."
 
 msgid "No disk space left."
 msgstr "На диску више нема места."
 

-#: src/inc.c:1119
+#: src/inc.c:1140

 msgid "Can't write file."
 msgstr "Није могуће записивање датотеке."
 
 msgid "Can't write file."
 msgstr "Није могуће записивање датотеке."
 

-#: src/inc.c:1124
+#: src/inc.c:1145

 msgid "Socket error."
 msgstr "Грешка у сокету."
 
 msgid "Socket error."
 msgstr "Грешка у сокету."
 

-#: src/inc.c:1127
+#: src/inc.c:1148

 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Грешка у сокету за везу са %s:%d"
 
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "Грешка у сокету за везу са %s:%d"
 

-#: src/inc.c:1132 src/send_message.c:400 src/send_message.c:615
+#: src/inc.c:1153 src/send_message.c:400 src/send_message.c:637

 msgid "Connection closed by the remote host."
 msgstr "Удаљени сервер је прекинуо везу."
 
 msgid "Connection closed by the remote host."
 msgstr "Удаљени сервер је прекинуо везу."
 

-#: src/inc.c:1135
+#: src/inc.c:1156

 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Повезивање са %s:%d је обуставио удаљени сервер."
 
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "Повезивање са %s:%d је обуставио удаљени сервер."
 

-#: src/inc.c:1140
+#: src/inc.c:1161

 msgid "Mailbox is locked."
 msgstr "Сандуче је закључано."
 
 msgid "Mailbox is locked."
 msgstr "Сандуче је закључано."
 

-#: src/inc.c:1144
+#: src/inc.c:1165

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 #, c-format
 msgid ""
 "Mailbox is locked:\n"


@@ -4597,11 +4980,11 @@ msgstr ""
 "Сандуче је закључано:\n"
 "%s"
 
 "Сандуче је закључано:\n"
 "%s"
 

-#: src/inc.c:1150 src/send_message.c:600
+#: src/inc.c:1171 src/send_message.c:622

 msgid "Authentication failed."
 msgstr "Неуспешна идентификација."
 
 msgid "Authentication failed."
 msgstr "Неуспешна идентификација."
 

-#: src/inc.c:1156 src/send_message.c:603
+#: src/inc.c:1177 src/send_message.c:625

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -4610,27 +4993,27 @@ msgstr ""
 "Неуспешна идентификација:\n"
 "%s"
 
 "Неуспешна идентификација:\n"
 "%s"
 

-#: src/inc.c:1161 src/send_message.c:619
+#: src/inc.c:1182 src/send_message.c:641

 msgid "Session timed out."
 msgstr "Време за сесију је истекло."
 
 msgid "Session timed out."
 msgstr "Време за сесију је истекло."
 

-#: src/inc.c:1164
+#: src/inc.c:1185

 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Истекло је време за везу са %s:%d."
 
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "Истекло је време за везу са %s:%d."
 

-#: src/inc.c:1202
+#: src/inc.c:1223

 msgid "Incorporation cancelled\n"
 msgstr "Увоз је обустављен\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Увоз је обустављен\n"
 

-#: src/inc.c:1439
+#: src/inc.c:1460

 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr ""
 "%s%sАктиван је режим ван везе.\n"
 "Желите ли заобилажење у наредних %d минута?"
 
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr ""
 "%s%sАктиван је режим ван везе.\n"
 "Желите ли заобилажење у наредних %d минута?"
 

-#: src/inc.c:1446
+#: src/inc.c:1467

 msgid "On_ly once"
 msgstr "Са_мо једном"
 
 msgid "On_ly once"
 msgstr "Са_мо једном"
 


@@ -4638,7 +5021,7 @@ msgstr "Са_мо једном"
 msgid "Nick Name"
 msgstr "Надимак"
 
 msgid "Nick Name"
 msgstr "Надимак"
 

-#: src/main.c:175
+#: src/main.c:180

 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 #, c-format
 msgid ""
 "File '%s' already exists.\n"


@@ -4647,89 +5030,90 @@ msgstr ""
 "Датотека „%s“ већ постоји.\n"
 "Није могуће прављење директоријума."
 
 "Датотека „%s“ већ постоји.\n"
 "Није могуће прављење директоријума."
 

-#: src/main.c:264
+#: src/main.c:270

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Configuration for Sylpheed-Claws %s found.\n"
+"Configuration for %s (or previous) found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"Пронађена су подешавања за Sylpheed-Claws %s.\n"
+"Пронађена су подешавања за %s (или старији).\n"

 "Желите ли да мигрирате та подешавања?"
 
 "Желите ли да мигрирате та подешавања?"
 

-#: src/main.c:267
-msgid "1.0.5 or previous"
-msgstr "1.0.5 или старији"
-
-#: src/main.c:267
-msgid "1.9.15 or previous"
-msgstr "1.9.15 или старији"
-
-#: src/main.c:270
+#: src/main.c:274

 msgid "Migration of configuration"
 msgstr "Миграција подешавања"
 
 msgid "Migration of configuration"
 msgstr "Миграција подешавања"
 

-#: src/main.c:276
+#: src/main.c:280

 msgid "Copying configuration..."
 msgstr "Копирање подешавања..."
 
 msgid "Copying configuration..."
 msgstr "Копирање подешавања..."
 

-#: src/main.c:281
+#: src/main.c:285

 msgid "Migration failed!"
 msgstr "Неуспела миграција!"
 
 msgid "Migration failed!"
 msgstr "Неуспела миграција!"
 

-#: src/main.c:348
+#: src/main.c:572

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread није подржан glib-ом.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread није подржан glib-ом.\n"
 

-#: src/main.c:354
+#: src/main.c:578

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with a more recent GTK+ library than is "
+"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 "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "

-"recompile Sylpheed-Claws."
+"recompile Claws Mail."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws је компајлиран са новијом верзијом GTK+ библиотеке од оне "
+"Claws Mail је компајлиран са новијом верзијом GTK+ библиотеке од оне "

 "која је тренутно доступна на Вашем рачунару. Ово ће довести до рушења "
 "која је тренутно доступна на Вашем рачунару. Ово ће довести до рушења "

-"програма. Морате надоградити GTK+ или рекомпајлирати Sylpheed-Claws."
+"програма. Морате надоградити GTK+ или рекомпајлирати Claws Mail."

 
 

-#: src/main.c:363
+#: src/main.c:587

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with an older GTK+ library than is "
-"currently available. This will cause crashes. You need to recompile Sylpheed-"
-"Claws."
+"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 ""
 msgstr ""

-"Sylpheed-Claws је компајлиран са старијом верзијом GTK+ библиотеке од оне "
+"Claws Mail је компајлиран са старијом верзијом GTK+ библиотеке од оне "

 "која је тренутно доступна на Вашем рачунару. Ово ће довести до рушења "
 "која је тренутно доступна на Вашем рачунару. Ово ће довести до рушења "

-"програма. Морате рекомпајлирати Sylpheed-Claws."
+"програма. Морате рекомпајлирати Claws Mail."

 
 

-#: src/main.c:570
+#: src/main.c:810

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr "Неки дадатци нису учитани. Погледајте поставке додатака за више информација."
 
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr "Неки дадатци нису учитани. Погледајте поставке додатака за више информација."
 

-#: src/main.c:580
+#: src/main.c:822
+msgid ""
+"Claws Mail has detected a configured mailbox, but is it incomplete. It is "
+"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
+"mailbox's folder to try to fix it."
+msgstr ""
+"Claws Mail је пронашао подешено сандуче али га не може учитати. "
+"Вероватно због рушења IMAP налога. Употребите „Ажурирај стабло "
+"директоријума“ на директоријуму сандучета да би га поправили."
+
+#: src/main.c:828

 msgid ""
 msgid ""

-"Sylpheed-Claws has detected a configured mailbox, but could not load it. It "
-"is probably provided by an out-of-date external plugin. Please reinstall the "
+"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 ""
 "plugin and try again."
 msgstr ""

-"Sylpheed-Claws је пронашао подешено сандуче али га не може учитати. "
-"Ð\92еÑ\80оваÑ\82но Ñ\98е заÑ\81Ñ\82аÑ\80ела веÑ\80зиÑ\98а Ñ\81поÑ\99ног додаÑ\82ка. Ð\98нÑ\81Ñ\82алиÑ\80аÑ\98Ñ\82е новиÑ\98Ñ\83 веÑ\80зиÑ\98Ñ\83 "
-"додатка и покушајте поново."
+"Claws Mail је пронашао подешено сандуче али га не може учитати. "
+"Ð\92еÑ\80оваÑ\82но Ñ\98е подеÑ\88ено заÑ\81Ñ\82аÑ\80елом веÑ\80зиÑ\98ом Ñ\81поÑ\99ног додаÑ\82ка. "
+"Ð\98нÑ\81Ñ\82алиÑ\80аÑ\98Ñ\82е новиÑ\98Ñ\83 веÑ\80зиÑ\98Ñ\83 додаÑ\82ка и покÑ\83Ñ\88аÑ\98Ñ\82е поново."

 
 

-#: src/main.c:812
+#: src/main.c:1074

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЈЕ]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЈЕ]...\n"
 

-#: src/main.c:814
+#: src/main.c:1076

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адреса]     отвара прозор за прављење поруке"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адреса]     отвара прозор за прављење поруке"
 

-#: src/main.c:815
+#: src/main.c:1077

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      пријава на дати УРИ, ако је могуће"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      пријава на дати УРИ, ако је могуће"
 

-#: src/main.c:816
+#: src/main.c:1078

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -4739,23 +5123,23 @@ msgstr ""
 "                         отвара прозор за прављење поруке са прилагањем\n"
 "                         одабраног датотеке"
 
 "                         отвара прозор за прављење поруке са прилагањем\n"
 "                         одабраног датотеке"
 

-#: src/main.c:819
+#: src/main.c:1081

 msgid "  --receive              receive new messages"
 msgstr "  --receive              преузимање нових порука"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              преузимање нових порука"
 

-#: src/main.c:820
+#: src/main.c:1082

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          преузимање нових порука са свих налога"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          преузимање нових порука са свих налога"
 

-#: src/main.c:821
+#: src/main.c:1083

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 слање свих прирпремљених порука"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 слање свих прирпремљених порука"
 

-#: src/main.c:822
+#: src/main.c:1084

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   исписује укупан броја порука"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   исписује укупан броја порука"
 

-#: src/main.c:823
+#: src/main.c:1085

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -4763,76 +5147,76 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         исписује укупан броја порука за сваки директоријум"
 
 "  --status-full [folder]...\n"
 "                         исписује укупан броја порука за сваки директоријум"
 

-#: src/main.c:825
+#: src/main.c:1087

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"

-"                         folder is a folder id like '#mh/Mailbox/inbox'"
+"                         folder is a folder id like 'folder/sub_folder'"

 msgstr ""
 "  --select folder[/msg]  прелази на одређени директоријум/поруку\n"
 msgstr ""
 "  --select folder[/msg]  прелази на одређени директоријум/поруку\n"

-"                         директоријум је ИД типа „#mh/Mailbox/inbox“"
+"                         директоријум је ИД типа „директоријум/подиректоријум“"

 
 

-#: src/main.c:827
+#: src/main.c:1089

 msgid "  --online               switch to online mode"
 msgstr "  --online               прелазак у режим на вези"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               прелазак у режим на вези"
 

-#: src/main.c:828
+#: src/main.c:1090

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              прелазак у режим ван везе"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              прелазак у режим ван везе"
 

-#: src/main.c:829
-msgid "  --exit                 exit Sylpheed-Claws"
-msgstr "  --exit                 затвара Sylpheed-Claws"
+#: src/main.c:1091
+msgid "  --exit                 exit Claws Mail"
+msgstr "  --exit                 затвара Claws Mail"

 
 

-#: src/main.c:830
+#: src/main.c:1092

 msgid "  --debug                debug mode"
 msgstr "  --debug                мод за проналажење грешака"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                мод за проналажење грешака"
 

-#: src/main.c:831
+#: src/main.c:1093

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 приказује ову помоћ и затвара програм"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 приказује ову помоћ и затвара програм"
 

-#: src/main.c:832
+#: src/main.c:1094

 msgid "  --version              output version information and exit"
 msgstr "  --version              исписује верзију и затвара програм"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              исписује верзију и затвара програм"
 

-#: src/main.c:833
+#: src/main.c:1095

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           исписује конфигурациони директоријум"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           исписује конфигурациони директоријум"
 

-#: src/main.c:898
+#: src/main.c:1160

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Обрада (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Обрада (%s)..."
 

-#: src/main.c:901
+#: src/main.c:1163

 msgid "top level folder"
 msgstr "директоријум највишег нивоа"
 
 msgid "top level folder"
 msgstr "директоријум највишег нивоа"
 

-#: src/main.c:968
+#: src/main.c:1227

 msgid "Really quit?"
 msgstr "Да ли заиста желите да напустите програм?"
 
 msgid "Really quit?"
 msgstr "Да ли заиста желите да напустите програм?"
 

-#: src/main.c:969
+#: src/main.c:1228

 msgid "Composing message exists."
 msgstr "Састављање поруке је у току."
 
 msgid "Composing message exists."
 msgstr "Састављање поруке је у току."
 

-#: src/main.c:970
+#: src/main.c:1229

 msgid "_Save to Draft"
 msgstr "_Сачувај у Недовршено"
 
 msgid "_Save to Draft"
 msgstr "_Сачувај у Недовршено"
 

-#: src/main.c:970
+#: src/main.c:1229

 msgid "_Discard them"
 msgstr "_Одбаци"
 
 msgid "_Discard them"
 msgstr "_Одбаци"
 

-#: src/main.c:970
+#: src/main.c:1229

 msgid "Do_n't quit"
 msgstr "Нео_дустај"
 
 msgid "Do_n't quit"
 msgstr "Нео_дустај"
 

-#: src/main.c:985
+#: src/main.c:1244

 msgid "Queued messages"
 msgstr "Припремљене поруке"
 
 msgid "Queued messages"
 msgstr "Припремљене поруке"
 

-#: src/main.c:986
+#: src/main.c:1245

 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Неке непослате поруке су стављене у директоријум за слање. Да ли желите да "
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Неке непослате поруке су стављене у директоријум за слање. Да ли желите да "


@@ -4912,7 +5296,7 @@ msgstr "/_Уређивање/Претражи _директоријум..."
 msgid "/_Edit/_Quick search"
 msgstr "/_Уређивање/_Брза претрага"
 
 msgid "/_Edit/_Quick search"
 msgstr "/_Уређивање/_Брза претрага"
 

-#: src/mainwindow.c:527 src/messageview.c:171 src/summaryview.c:471
+#: src/mainwindow.c:527 src/messageview.c:171 src/summaryview.c:472

 msgid "/_View"
 msgstr "/П_реглед"
 
 msgid "/_View"
 msgstr "/П_реглед"
 


@@ -5300,7 +5684,7 @@ msgstr "/П_реглед/Дешифровање/_База 64"
 msgid "/_View/Decode/_Uuencode"
 msgstr "/П_реглед/Дешифровање/_Уу шифровано"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/П_реглед/Дешифровање/_Уу шифровано"
 

-#: src/mainwindow.c:730 src/summaryview.c:472
+#: src/mainwindow.c:730 src/summaryview.c:473

 msgid "/_View/Open in new _window"
 msgstr "/П_реглед/Приказ у _новом прозору"
 
 msgid "/_View/Open in new _window"
 msgstr "/П_реглед/Приказ у _новом прозору"
 


@@ -5672,24 +6056,25 @@ msgstr "/По_моћ/Значење _икона"
 msgid "/_Help/---"
 msgstr "/По_моћ/---"
 
 msgid "/_Help/---"
 msgstr "/По_моћ/---"
 

-#: src/mainwindow.c:1228
+#: src/mainwindow.c:1227

 msgid "Some error(s) happened. Click here to view log."
 msgstr "Дошло је до неких грешака. Кликните овде да видите дневник рада."
 
 msgid "Some error(s) happened. Click here to view log."
 msgstr "Дошло је до неких грешака. Кликните овде да видите дневник рада."
 

-#: src/mainwindow.c:1242
+#: src/mainwindow.c:1241

 msgid "You are online. Click the icon to go offline"
 msgstr "Тренутно је активан режим на вези. Кликните на икону за режим ван везе"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "Тренутно је активан режим на вези. Кликните на икону за режим ван везе"
 

-#: src/mainwindow.c:1245
+#: src/mainwindow.c:1244

 msgid "You are offline. Click the icon to go online"
 msgstr "Тренутно је активан режим ван везе. Кликните на икону за режим на вези"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "Тренутно је активан режим ван везе. Кликните на икону за режим на вези"
 

-#: src/mainwindow.c:1261
+#: src/mainwindow.c:1260

 msgid "Select account"
 msgstr " Одабери налог "
 
 msgid "Select account"
 msgstr " Одабери налог "
 

-#: src/mainwindow.c:1662 src/mainwindow.c:1703 src/mainwindow.c:1739
-#: src/mainwindow.c:1775 src/mainwindow.c:1817 src/prefs_folder_item.c:668
+#: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738
+#: src/mainwindow.c:1774 src/mainwindow.c:1817
+#: src/plugins/trayicon/trayicon.c:143 src/prefs_folder_item.c:762

 msgid "Untitled"
 msgstr "Неименовано"
 
 msgid "Untitled"
 msgstr "Неименовано"
 


@@ -5737,47 +6122,47 @@ msgstr ""
 msgid "No posting allowed"
 msgstr "Слање није дозвољено"
 
 msgid "No posting allowed"
 msgstr "Слање није дозвољено"
 

-#: src/mainwindow.c:2697
-msgid "Sylpheed-Claws - Folder View"
-msgstr "Sylpheed-Claws — Стабло директоријума"
+#: src/mainwindow.c:2699
+msgid "Claws Mail - Folder View"
+msgstr "Claws Mail - Стабло директоријума"

 
 

-#: src/mainwindow.c:2733 src/messageview.c:449 src/messageview.c:855
-msgid "Sylpheed-Claws - Message View"
-msgstr "Sylpheed-Claws — Приказ порука"
+#: src/mainwindow.c:2735 src/messageview.c:449 src/messageview.c:855
+msgid "Claws Mail - Message View"
+msgstr "Claws Mail - Приказ порука"

 
 

-#: src/mainwindow.c:3083
+#: src/mainwindow.c:3085

 msgid "Mbox import has failed."
 msgstr "Неуспешан увоз из mbox датотеке."
 
 msgid "Mbox import has failed."
 msgstr "Неуспешан увоз из mbox датотеке."
 

-#: src/mainwindow.c:3092 src/mainwindow.c:3101
+#: src/mainwindow.c:3094 src/mainwindow.c:3103

 msgid "Export to mbox has failed."
 msgstr "Неуспешан извоз у mbox датотеку."
 
 msgid "Export to mbox has failed."
 msgstr "Неуспешан извоз у mbox датотеку."
 

-#: src/mainwindow.c:3124 src/plugins/trayicon/trayicon.c:399
+#: src/mainwindow.c:3126 src/plugins/trayicon/trayicon.c:474

 msgid "Exit"
 msgstr "Излаз"
 
 msgid "Exit"
 msgstr "Излаз"
 

-#: src/mainwindow.c:3124
-msgid "Exit Sylpheed-Claws?"
-msgstr "Напуштате Sylpheed-Claws?"
+#: src/mainwindow.c:3126
+msgid "Exit Claws Mail?"
+msgstr "Напуштате Claws Mail?"

 
 

-#: src/mainwindow.c:3270
+#: src/mainwindow.c:3271

 msgid "Folder synchronisation"
 msgstr "Синхронизација директоријума"
 
 msgid "Folder synchronisation"
 msgstr "Синхронизација директоријума"
 

-#: src/mainwindow.c:3271
+#: src/mainwindow.c:3272

 msgid "Do you want to synchronise your folders now?"
 msgstr "Желите ли да директоријуми сада буду синхронизовани?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "Желите ли да директоријуми сада буду синхронизовани?"
 

-#: src/mainwindow.c:3272
+#: src/mainwindow.c:3273

 msgid "+_Synchronise"
 msgstr "+_Синхронизуј"
 
 msgid "+_Synchronise"
 msgstr "+_Синхронизуј"
 

-#: src/mainwindow.c:3601
+#: src/mainwindow.c:3604

 msgid "Deleting duplicated messages..."
 msgstr "Уклањање дуплираних порука..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Уклањање дуплираних порука..."
 

-#: src/mainwindow.c:3635
+#: src/mainwindow.c:3641

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"


@@ -5785,39 +6170,44 @@ msgstr[0] "Обрисана је %d дуплирана порука из %d ди
 msgstr[1] "Обрисане су %d дуплиране поруке из %d директоријума.\n"
 msgstr[2] "Обрисано је %d дуплираних порука из %d директоријума.\n"
 
 msgstr[1] "Обрисане су %d дуплиране поруке из %d директоријума.\n"
 msgstr[2] "Обрисано је %d дуплираних порука из %d директоријума.\n"
 

-#: src/mainwindow.c:3794 src/summaryview.c:4719
+#: src/mainwindow.c:3800 src/summaryview.c:4783

 msgid "Processing rules to apply before folder rules"
 msgstr "Правило за обраду пре правила директоријума"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Правило за обраду пре правила директоријума"
 

-#: src/mainwindow.c:3803
+#: src/mainwindow.c:3809

 msgid "Processing rules to apply after folder rules"
 msgstr "Правило за обраду после правила директоријума"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Правило за обраду после правила директоријума"
 

-#: src/mainwindow.c:3812 src/summaryview.c:4730
+#: src/mainwindow.c:3818 src/summaryview.c:4794

 msgid "Filtering configuration"
 msgstr "Подешавања филтера"
 
 msgid "Filtering configuration"
 msgstr "Подешавања филтера"
 

-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4072

 #, c-format
 msgid "not initialized\n"
 msgstr "није иницијализовано\n"
 
 #, c-format
 msgid "not initialized\n"
 msgstr "није иницијализовано\n"
 

-#: src/mainwindow.c:4078 src/mainwindow.c:4089
+#: src/mainwindow.c:4084 src/mainwindow.c:4095

 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "одабир директоријума „%s“\n"
 
 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "одабир директоријума „%s“\n"
 

-#: src/mainwindow.c:4093
+#: src/mainwindow.c:4099

 #, c-format
 msgid "selecting message %d\n"
 msgstr "одабир поруке %d\n"
 
 #, c-format
 msgid "selecting message %d\n"
 msgstr "одабир поруке %d\n"
 

+#: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
+#: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
+msgid "Filtering Matcher Menu|All"
+msgstr "Све"
+

 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(ништа)"
 
 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(ништа)"
 

-#: src/mbox.c:85
+#: src/mbox.c:98

 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 #, c-format
 msgid ""
 "Could not open mbox file:\n"


@@ -5826,25 +6216,25 @@ msgstr ""
 "Није могуће отворити mbox датотеку:\n"
 "%s\n"
 
 "Није могуће отворити mbox датотеку:\n"
 "%s\n"
 

-#: src/mbox.c:121
+#: src/mbox.c:134

 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Увоз из mbox... (%d порука увежено)"
 
 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "Увоз из mbox... (%d порука увежено)"
 

-#: src/mbox.c:468
+#: src/mbox.c:481

 msgid "Overwrite mbox file"
 msgstr "Писање преко постојеће mbox датотеке"
 
 msgid "Overwrite mbox file"
 msgstr "Писање преко постојеће mbox датотеке"
 

-#: src/mbox.c:469
+#: src/mbox.c:482

 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ова датотека већ постоји. Желите ли да буде преписана?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "Ова датотека већ постоји. Желите ли да буде преписана?"
 

-#: src/mbox.c:470 src/messageview.c:1145 src/mimeview.c:1422
+#: src/mbox.c:483 src/messageview.c:1143 src/mimeview.c:1443

 #: src/textview.c:2654
 msgid "Overwrite"
 msgstr "Препиши"
 
 #: src/textview.c:2654
 msgid "Overwrite"
 msgstr "Препиши"
 

-#: src/mbox.c:479
+#: src/mbox.c:492

 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 #, c-format
 msgid ""
 "Could not create mbox file:\n"


@@ -5853,39 +6243,39 @@ msgstr ""
 "Није могуће направити mbox датотеку:\n"
 "%s\n"
 
 "Није могуће направити mbox датотеку:\n"
 "%s\n"
 

-#: src/mbox.c:483
+#: src/mbox.c:500

 msgid "Exporting to mbox..."
 msgstr "Извоз у mbox..."
 
 msgid "Exporting to mbox..."
 msgstr "Извоз у mbox..."
 

-#: src/message_search.c:131
+#: src/message_search.c:169

 msgid "Find in current message"
 msgstr "Пронађи текст у поруци"
 
 msgid "Find in current message"
 msgstr "Пронађи текст у поруци"
 

-#: src/message_search.c:149
+#: src/message_search.c:187

 msgid "Find text:"
 msgstr "Пронађи текст:"
 
 msgid "Find text:"
 msgstr "Пронађи текст:"
 

-#: src/message_search.c:164 src/prefs_matcher.c:649 src/summary_search.c:315
+#: src/message_search.c:210 src/prefs_matcher.c:649 src/summary_search.c:392

 msgid "Case sensitive"
 msgstr "Величина слова је битна"
 
 msgid "Case sensitive"
 msgstr "Величина слова је битна"
 

-#: src/message_search.c:240 src/summary_search.c:521
+#: src/message_search.c:323 src/summary_search.c:637

 msgid "Search failed"
 msgstr "Неуспешна претрага"
 
 msgid "Search failed"
 msgstr "Неуспешна претрага"
 

-#: src/message_search.c:241 src/summary_search.c:522
+#: src/message_search.c:324 src/summary_search.c:638

 msgid "Search string not found."
 msgstr "Тражени критеријум није пронађен."
 
 msgid "Search string not found."
 msgstr "Тражени критеријум није пронађен."
 

-#: src/message_search.c:250
+#: src/message_search.c:333

 msgid "Beginning of message reached; continue from end?"
 msgstr "Дошао сам до почетка поруке. Да наставим од краја?"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "Дошао сам до почетка поруке. Да наставим од краја?"
 

-#: src/message_search.c:253
+#: src/message_search.c:336

 msgid "End of message reached; continue from beginning?"
 msgstr "Дошап сам до краја поруке. Да наставим од почетка?"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "Дошап сам до краја поруке. Да наставим од почетка?"
 

-#: src/message_search.c:256 src/summary_search.c:533
+#: src/message_search.c:339 src/summary_search.c:649

 msgid "Search finished"
 msgstr "Готова претрага."
 
 msgid "Search finished"
 msgstr "Готова претрага."
 


@@ -5960,39 +6350,39 @@ msgstr ""
 "да она није званично послата Вама.\n"
 "Препоручљиво је да не шаљете потврду пријема."
 
 "да она није званично послата Вама.\n"
 "Препоручљиво је да не шаљете потврду пријема."
 

-#: src/messageview.c:809 src/procmime.c:825
+#: src/messageview.c:809 src/procmime.c:873

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Није могућа декрипција: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "Није могућа декрипција: %s"
 

-#: src/messageview.c:1140 src/mimeview.c:1560 src/summaryview.c:4011
-#: src/summaryview.c:4014 src/textview.c:2642
+#: src/messageview.c:1138 src/mimeview.c:1582 src/summaryview.c:4065
+#: src/summaryview.c:4068 src/textview.c:2642

 msgid "Save as"
 msgstr "Сачувај као"
 
 msgid "Save as"
 msgstr "Сачувај као"
 

-#: src/messageview.c:1146
+#: src/messageview.c:1144

 msgid "Overwrite existing file?"
 msgstr "Да ли желите да се препише постојећа датотека?"
 
 msgid "Overwrite existing file?"
 msgstr "Да ли желите да се препише постојећа датотека?"
 

-#: src/messageview.c:1154 src/summaryview.c:4031 src/summaryview.c:4034
-#: src/summaryview.c:4049
+#: src/messageview.c:1152 src/summaryview.c:4085 src/summaryview.c:4088
+#: src/summaryview.c:4103

 #, c-format
 #, c-format

-msgid "Can't save the file '%s'."
+msgid "Couldn't save the file '%s'."

 msgstr "Није могуће сачувати датотеку „%s“."
 
 msgstr "Није могуће сачувати датотеку „%s“."
 

-#: src/messageview.c:1235
+#: src/messageview.c:1233

 msgid "You asked for a return receipt in this message."
 msgstr "У овој поруци захтевате потврду пријема."
 
 msgid "You asked for a return receipt in this message."
 msgstr "У овој поруци захтевате потврду пријема."
 

-#: src/messageview.c:1239
+#: src/messageview.c:1237

 msgid "This message asks for a return receipt."
 msgstr "У овој поруци се захтева потврда пријема."
 
 msgid "This message asks for a return receipt."
 msgstr "У овој поруци се захтева потврда пријема."
 

-#: src/messageview.c:1240
+#: src/messageview.c:1238

 msgid "Send receipt"
 msgstr "Слање потврде"
 
 msgid "Send receipt"
 msgstr "Слање потврде"
 

-#: src/messageview.c:1283
+#: src/messageview.c:1281

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -6000,7 +6390,7 @@ msgstr ""
 "Ова порука је делимично преузета,\n"
 "и обрисана је са сервера."
 
 "Ова порука је делимично преузета,\n"
 "и обрисана је са сервера."
 

-#: src/messageview.c:1289
+#: src/messageview.c:1287

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6009,15 +6399,15 @@ msgstr ""
 "Ова порука је делимично преузета;\n"
 "величине је %s."
 
 "Ова порука је делимично преузета;\n"
 "величине је %s."
 

-#: src/messageview.c:1293 src/messageview.c:1315
+#: src/messageview.c:1291 src/messageview.c:1313

 msgid "Mark for download"
 msgstr "Преузимање"
 
 msgid "Mark for download"
 msgstr "Преузимање"
 

-#: src/messageview.c:1294 src/messageview.c:1306
+#: src/messageview.c:1292 src/messageview.c:1304

 msgid "Mark for deletion"
 msgstr "Уклањање"
 
 msgid "Mark for deletion"
 msgstr "Уклањање"
 

-#: src/messageview.c:1299
+#: src/messageview.c:1297

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6026,12 +6416,12 @@ msgstr ""
 "Ова порука је делимично преузета;\n"
 "величине је %s и биће преузета."
 
 "Ова порука је делимично преузета;\n"
 "величине је %s и биће преузета."
 

-#: src/messageview.c:1304 src/messageview.c:1317
+#: src/messageview.c:1302 src/messageview.c:1315

 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Уклањање ознаке"
 
 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "Уклањање ознаке"
 

-#: src/messageview.c:1310
+#: src/messageview.c:1308

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6040,11 +6430,11 @@ msgstr ""
 "Ова порука је делимично преузета;\n"
 "величине је %s и биће обрисана."
 
 "Ова порука је делимично преузета;\n"
 "величине је %s и биће обрисана."
 

-#: src/messageview.c:1386
+#: src/messageview.c:1384

 msgid "Return Receipt Notification"
 msgstr "Слање обавештења о пријему поруке"
 
 msgid "Return Receipt Notification"
 msgstr "Слање обавештења о пријему поруке"
 

-#: src/messageview.c:1387
+#: src/messageview.c:1385

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -6053,19 +6443,19 @@ msgstr ""
 "Порука је послата на више налога чији сте Ви власник.\n"
 "Одаберите са ког ће се налога послати обавештење о пријему поруке:"
 
 "Порука је послата на више налога чији сте Ви власник.\n"
 "Одаберите са ког ће се налога послати обавештење о пријему поруке:"
 

-#: src/messageview.c:1391
+#: src/messageview.c:1389

 msgid "_Send Notification"
 msgstr "_Пошаљи обавештење"
 
 msgid "_Send Notification"
 msgstr "_Пошаљи обавештење"
 

-#: src/messageview.c:1391
+#: src/messageview.c:1389

 msgid "+_Cancel"
 msgstr "+_Поништи"
 
 msgid "+_Cancel"
 msgstr "+_Поништи"
 

-#: src/messageview.c:1458
+#: src/messageview.c:1456

 msgid "Cannot print: the message doesn't contain text."
 msgstr "Штампање није могуће: порука не садржи текст."
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "Штампање није могуће: порука не садржи текст."
 

-#: src/messageview.c:1505 src/summaryview.c:4071
+#: src/messageview.c:1520 src/summaryview.c:4125

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6074,7 +6464,7 @@ msgstr ""
 "Унесите наредбу за штампање:\n"
 "(„%s“ ће бити замењено називом датотеке)"
 
 "Унесите наредбу за штампање:\n"
 "(„%s“ ће бити замењено називом датотеке)"
 

-#: src/messageview.c:1511 src/summaryview.c:4077
+#: src/messageview.c:1526 src/summaryview.c:4131

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6083,29 +6473,29 @@ msgstr ""
 "Наредба за штампање је неисправна:\n"
 "„%s“"
 
 "Наредба за штампање је неисправна:\n"
 "„%s“"
 

-#: src/messageview.c:1777 src/messageview.c:1783 src/summaryview.c:3466
-#: src/summaryview.c:5471
+#: src/messageview.c:1796 src/messageview.c:1802 src/summaryview.c:3521
+#: src/summaryview.c:5540

 msgid "An error happened while learning.\n"
 msgstr "настала је грешка при учењу.\n"
 
 msgid "An error happened while learning.\n"
 msgstr "настала је грешка при учењу.\n"
 

-#: src/mh.c:427
+#: src/mh.c:423

 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "није могуће копирати поруку %s у %s\n"
 
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "није могуће копирати поруку %s у %s\n"
 

-#: src/mh.c:502
+#: src/mh.c:498

 msgid "Moving messages..."
 msgstr "Премештање порука..."
 
 msgid "Moving messages..."
 msgstr "Премештање порука..."
 

-#: src/mh.c:642
+#: src/mh.c:638

 msgid "Deleting messages..."
 msgstr "Уклањање порука..."
 
 msgid "Deleting messages..."
 msgstr "Уклањање порука..."
 

-#: src/mh_gtk.c:59
+#: src/mh_gtk.c:62

 msgid "/Remove _mailbox..."
 msgstr "/Уклони _сандуче..."
 
 msgid "/Remove _mailbox..."
 msgstr "/Уклони _сандуче..."
 

-#: src/mh_gtk.c:323
+#: src/mh_gtk.c:324

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"


@@ -6114,11 +6504,11 @@ msgstr ""
 "Да ли заиста желите да уклоните налог „%s“ ?\n"
 "(Поруке НЕЋЕ бити обрисане са диска)"
 
 "Да ли заиста желите да уклоните налог „%s“ ?\n"
 "(Поруке НЕЋЕ бити обрисане са диска)"
 

-#: src/mh_gtk.c:325
+#: src/mh_gtk.c:326

 msgid "Remove mailbox"
 msgstr "Уколни налог"
 
 msgid "Remove mailbox"
 msgstr "Уколни налог"
 

-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:327

 msgid "_Remove"
 msgstr "_Уклони"
 
 msgid "_Remove"
 msgstr "_Уклони"
 


@@ -6134,7 +6524,7 @@ msgstr "/Отвори _са..."
 msgid "/_Display as text"
 msgstr "/_Прикажи као текст"
 
 msgid "/_Display as text"
 msgstr "/_Прикажи као текст"
 

-#: src/mimeview.c:171 src/summaryview.c:477
+#: src/mimeview.c:171 src/summaryview.c:478

 msgid "/_Save as..."
 msgstr "/Са_чувај као..."
 
 msgid "/_Save as..."
 msgstr "/Са_чувај као..."
 


@@ -6146,60 +6536,60 @@ msgstr "/Сачувај с_ве прилоге..."
 msgid "MIME Type"
 msgstr "MIME тип"
 
 msgid "MIME Type"
 msgstr "MIME тип"
 

-#: src/mimeview.c:721
+#: src/mimeview.c:742

 msgid "Check signature"
 msgstr "Провера потписа"
 
 msgid "Check signature"
 msgstr "Провера потписа"
 

-#: src/mimeview.c:726 src/mimeview.c:731 src/mimeview.c:736
+#: src/mimeview.c:747 src/mimeview.c:752 src/mimeview.c:757

 msgid "View full information"
 msgstr "Приказ комплетних података"
 
 msgid "View full information"
 msgstr "Приказ комплетних података"
 

-#: src/mimeview.c:741 src/mimeview.c:745
+#: src/mimeview.c:762 src/mimeview.c:766

 msgid "Check again"
 msgstr "Поново провери"
 
 msgid "Check again"
 msgstr "Поново провери"
 

-#: src/mimeview.c:754
+#: src/mimeview.c:775

 msgid "Click the icon or hit 'C' to check it."
 msgstr "Кликните на икону или притисните „Ц“ за проверу."
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "Кликните на икону или притисните „Ц“ за проверу."
 

-#: src/mimeview.c:759
+#: src/mimeview.c:780

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Истекло је време за проверу потписа. Кликните на икону или притинсите тастер "
 "„Ц“ за поновни покушај."
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr ""
 "Истекло је време за проверу потписа. Кликните на икону или притинсите тастер "
 "„Ц“ за поновни покушај."
 

-#: src/mimeview.c:969
+#: src/mimeview.c:990

 msgid "Checking signature..."
 msgstr "Проверавам потпис..."
 
 msgid "Checking signature..."
 msgstr "Проверавам потпис..."
 

-#: src/mimeview.c:1011
+#: src/mimeview.c:1032

 msgid "Go back to email"
 msgstr "Назад на поруку"
 
 msgid "Go back to email"
 msgstr "Назад на поруку"
 

-#: src/mimeview.c:1349 src/mimeview.c:1430 src/mimeview.c:1606
-#: src/mimeview.c:1639
-msgid "Can't save the part of multipart message."
+#: src/mimeview.c:1370 src/mimeview.c:1451 src/mimeview.c:1628
+#: src/mimeview.c:1661
+msgid "Couldn't save the part of multipart message."

 msgstr "Није могуће сачувати део комбиноване поруке."
 
 msgstr "Није могуће сачувати део комбиноване поруке."
 

-#: src/mimeview.c:1419 src/textview.c:2652
+#: src/mimeview.c:1440 src/textview.c:2652

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Да ли желите преписивање постојеће датотеке „%s“?"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "Да ли желите преписивање постојеће датотеке „%s“?"
 

-#: src/mimeview.c:1457
+#: src/mimeview.c:1478

 msgid "Select destination folder"
 msgstr "Изаберите одредишни директоријум"
 
 msgid "Select destination folder"
 msgstr "Изаберите одредишни директоријум"
 

-#: src/mimeview.c:1464
+#: src/mimeview.c:1485

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s“ није директоријум.."
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "„%s“ није директоријум.."
 

-#: src/mimeview.c:1685 src/mimeview.c:1693 src/textview.c:2583
+#: src/mimeview.c:1707 src/mimeview.c:1715 src/textview.c:2583

 msgid "Open with"
 msgstr "Отвори са"
 
 msgid "Open with"
 msgstr "Отвори са"
 

-#: src/mimeview.c:1686 src/mimeview.c:1694 src/textview.c:2584
+#: src/mimeview.c:1708 src/mimeview.c:1716 src/textview.c:2584

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6214,10 +6604,10 @@ msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Успостављање NNTP конекције са %s:%d ...\n"
 
 #: src/news.c:328
 msgstr "Успостављање NNTP конекције са %s:%d ...\n"
 
 #: src/news.c:328

-msgid "Sylpheed-Claws needs network access in order to access the News server."
+msgid "Claws Mail needs network access in order to access the News server."

 msgstr ""
 msgstr ""

-"Да би Sylpheed-Claws приступио серверу за дискусионе групе, неопходна је "
-"веза са мрежом."
+"Да би Claws Mail приступио серверу за дискусионе групе, "
+"неопÑ\85одна Ñ\98е веза Ñ\81а мÑ\80ежом."

 
 #: src/news.c:345
 #, c-format
 
 #: src/news.c:345
 #, c-format


@@ -6229,22 +6619,22 @@ msgid "can't retrieve newsgroup list\n"
 msgstr "ниј емогуће преузимање листе дискусионих група\n"
 
 #: src/news.c:588
 msgstr "ниј емогуће преузимање листе дискусионих група\n"
 
 #: src/news.c:588

-msgid "can't post article.\n"
+msgid "couldn't post article.\n"

 msgstr "није могуће слање чланка.\n"
 
 #: src/news.c:614
 #, c-format
 msgstr "није могуће слање чланка.\n"
 
 #: src/news.c:614
 #, c-format

-msgid "can't retrieve article %d\n"
+msgid "couldn't retrieve article %d\n"

 msgstr "није могуће преузимање чланка %d\n"
 
 #: src/news.c:663
 #, c-format
 msgstr "није могуће преузимање чланка %d\n"
 
 #: src/news.c:663
 #, c-format

-msgid "can't select group: %s\n"
+msgid "couldn't select group: %s\n"

 msgstr "није могућ одабир групе: %s\n"
 
 #: src/news.c:888
 #, c-format
 msgstr "није могућ одабир групе: %s\n"
 
 #: src/news.c:888
 #, c-format

-msgid "can't set group: %s\n"
+msgid "couldn't set group: %s\n"

 msgstr "није могуће постављање групе: %s\n"
 
 #: src/news.c:897
 msgstr "није могуће постављање групе: %s\n"
 
 #: src/news.c:897


@@ -6263,25 +6653,25 @@ msgid "getting xover %d in %s...\n"
 msgstr "преузимање XOVER %d у %s...\n"
 
 #: src/news.c:962 src/news.c:1056
 msgstr "преузимање XOVER %d у %s...\n"
 
 #: src/news.c:962 src/news.c:1056

-msgid "can't get xover\n"
-msgstr "није могуће преузимање XOVER одговора\n"
+msgid "couldn't get xover\n"
+msgstr "није могуће преузимање XOVER\n"

 
 #: src/news.c:972 src/news.c:1068
 msgid "error occurred while getting xover.\n"
 
 #: src/news.c:972 src/news.c:1068
 msgid "error occurred while getting xover.\n"

-msgstr "настала је грешка при преузимању XOVER одговора.\n"
+msgstr "настала је грешка при преузимању XOVER.\n"

 
 #: src/news.c:979 src/news.c:1082
 #, c-format
 msgid "invalid xover line: %s\n"
 
 #: src/news.c:979 src/news.c:1082
 #, c-format
 msgid "invalid xover line: %s\n"

-msgstr "неисправна линија XOVER одговора: %s\n"
+msgstr "неисправна XOVER линија: %s\n"

 
 #: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133
 
 #: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133

-msgid "can't get xhdr\n"
-msgstr "није могуће преузиимање XHDR одговора\n"
+msgid "couldn't get xhdr\n"
+msgstr "није могуће преузиимање XHDR\n"

 
 #: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146
 msgid "error occurred while getting xhdr.\n"
 
 #: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146
 msgid "error occurred while getting xhdr.\n"

-msgstr "настала је грешка при преузимању XHDR одговора.\n"
+msgstr "настала је грешка при преузимању XHDR.\n"

 
 #: src/news.c:1052
 #, c-format
 
 #: src/news.c:1052
 #, c-format


@@ -6309,32 +6699,20 @@ msgstr "Одјављивање са дискусионе групе"
 msgid "_Unsubscribe"
 msgstr "_Одјављивање са дискусионе групе"
 
 msgid "_Unsubscribe"
 msgstr "_Одјављивање са дискусионе групе"
 

-#: src/plugins/clamav/clamav_plugin.c:118
+#: src/plugins/clamav/clamav_plugin.c:43
+#: src/plugins/clamav/clamav_plugin_gtk.c:212
+msgid "Clam AntiVirus"
+msgstr "Clam АнтиВирус"
+
+#: src/plugins/clamav/clamav_plugin.c:120

 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: проверавам поруке..."
 
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: проверавам поруке..."
 

-#: src/plugins/clamav/clamav_plugin.c:197
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the ClamAV plugin "
-"was built with"
-msgstr ""
-"Sylpheed-Claws који користите је новији од верзије за коју је компајлиран "
-"ClamAV додатак"
-
-#: src/plugins/clamav/clamav_plugin.c:202
-msgid "Your version of Sylpheed-Claws is too old for the ClamAV plugin"
-msgstr "Sylpheed-Claws који користите је сувише стар за ClamAV додатак"
-
-#: src/plugins/clamav/clamav_plugin.c:208
+#: src/plugins/clamav/clamav_plugin.c:205

 msgid "Failed to register mail filtering hook"
 msgstr "Неуспешно пријављивање процеса филтрирања поште"
 
 msgid "Failed to register mail filtering hook"
 msgstr "Неуспешно пријављивање процеса филтрирања поште"
 

-#: src/plugins/clamav/clamav_plugin.c:251
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr "Clam АнтиВирус"
-
-#: src/plugins/clamav/clamav_plugin.c:256
+#: src/plugins/clamav/clamav_plugin.c:253

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -6352,7 +6730,7 @@ msgstr ""
 "\n"
 "Опције можете да пронађете у /Подешавања/Поставке/Додаци/Clam АнтиВирус"
 
 "\n"
 "Опције можете да пронађете у /Подешавања/Поставке/Додаци/Clam АнтиВирус"
 

-#: src/plugins/clamav/clamav_plugin.c:283
+#: src/plugins/clamav/clamav_plugin.c:280

 msgid "Virus detection"
 msgstr "Откривен је вирус"
 
 msgid "Virus detection"
 msgstr "Откривен је вирус"
 


@@ -6396,34 +6774,22 @@ msgstr ""
 "Кликните на ово дугме да би изабрали директоријум у који ће се смештати "
 "инфициране поруке."
 
 "Кликните на ово дугме да би изабрали директоријум у који ће се смештати "
 "инфициране поруке."
 

-#: src/plugins/demo/demo.c:45
-msgid ""
-"Your sylpheed-claws version is newer than the version the plugin was built "
-"with"
-msgstr ""
-"Sylpheed-Claws који користите је новији од верзије за коју је компајлиран "
-"додатак"
-
-#: src/plugins/demo/demo.c:50
-msgid "Your sylpheed-claws version is too old"
-msgstr "Sylpheed-Claws који користите је превише стар"
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+msgid "Demo"
+msgstr "Показни"

 
 

-#: src/plugins/demo/demo.c:56
+#: src/plugins/demo/demo.c:52

 msgid "Failed to register log text hook"
 msgstr "Неуспешно пријављивање процеса дневника рада"
 
 msgid "Failed to register log text hook"
 msgstr "Неуспешно пријављивање процеса дневника рада"
 

-#: src/plugins/demo/demo.c:74 src/plugins/demo/demo.c:103
-msgid "Demo"
-msgstr "Показни"
-
-#: src/plugins/demo/demo.c:79
+#: src/plugins/demo/demo.c:75

 msgid ""
 msgid ""

-"This Plugin is only a demo of how to write plugins for Sylpheed-Claws. It "
+"This Plugin is only a demo of how to write plugins for Claws Mail. It "

 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"

-"It is not really useful"
+"It is not really useful."

 msgstr ""
 msgstr ""

-"Овај додатак је само приказ начина на који треба писати додатке за Sylpheed. "
+"Овај додатак је само приказ начина на који треба писати додатке за Claws Mail. "

 "Он поставља излаз за нови дневник рада и исписује га на стандардном излазу.\n"
 "\n"
 "У суштини, овај додатак нема употребну вредност."
 "Он поставља излаз за нови дневник рада и исписује га на стандардном излазу.\n"
 "\n"
 "У суштини, овај додатак нема употребну вредност."


@@ -6452,23 +6818,11 @@ msgstr "Режим увећаног приказа (скривање контр
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Еквивалент Дило опцији „--fullwindow“"
 
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "Еквивалент Дило опцији „--fullwindow“"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:169
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Dillo plugin "
-"was built with"
-msgstr ""
-"Sylpheed-Claws који користите је новији од верзије за коју је компајлиран "
-"Dillo додатак"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:174
-msgid "Your version of Sylpheed-Claws is too old for the Dillo plugin"
-msgstr "Sylpheed-Claws који користите је сувише стар за Dillo додатак"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:194
+#: src/plugins/dillo_viewer/dillo_viewer.c:39

 msgid "Dillo HTML Viewer"
 msgstr "Дило HTML прегледник"
 
 msgid "Dillo HTML Viewer"
 msgstr "Дило HTML прегледник"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:199
+#: src/plugins/dillo_viewer/dillo_viewer.c:195

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -6478,7 +6832,7 @@ msgstr ""
 "\n"
 "Подешавања можете пронаћи у /Подешавање/Поставке/Додаци/Dillo претраживач"
 
 "\n"
 "Подешавања можете пронаћи у /Подешавање/Поставке/Додаци/Dillo претраживач"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:223
+#: src/plugins/dillo_viewer/dillo_viewer.c:219

 msgid "text/html"
 msgstr "text/html"
 
 msgid "text/html"
 msgstr "text/html"
 


@@ -6552,7 +6906,7 @@ msgstr "Истиче након"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Поставите на „0“ за чување помоћне фразе током целе сесије"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Поставите на „0“ за чување помоћне фразе током целе сесије"
 

-#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:165

 msgid "minute(s)"
 msgstr "минут(а)"
 
 msgid "minute(s)"
 msgstr "минут(а)"
 


@@ -6655,137 +7009,142 @@ msgstr ""
 msgid "Trust key"
 msgstr "Веродостојност кључа"
 
 msgid "Trust key"
 msgstr "Веродостојност кључа"
 

-#: src/plugins/pgpcore/sgpgme.c:129
+#: src/plugins/pgpcore/sgpgme.c:76 src/privacy.c:211 src/privacy.c:215
+#: src/privacy.c:232 src/privacy.c:236
+msgid "No signature found"
+msgstr "Потпис није пронађен"
+
+#: src/plugins/pgpcore/sgpgme.c:138

 msgid "Undefined"
 msgstr "Неодређено"
 
 msgid "Undefined"
 msgstr "Неодређено"
 

-#: src/plugins/pgpcore/sgpgme.c:131 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:193

 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Никада"
 
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "Никада"
 

-#: src/plugins/pgpcore/sgpgme.c:133
+#: src/plugins/pgpcore/sgpgme.c:142

 msgid "Marginal"
 msgstr "Површно"
 
 msgid "Marginal"
 msgstr "Површно"
 

-#: src/plugins/pgpcore/sgpgme.c:137
+#: src/plugins/pgpcore/sgpgme.c:146

 msgid "Ultimate"
 msgstr "Основно"
 
 msgid "Ultimate"
 msgstr "Основно"
 

-#: src/plugins/pgpcore/sgpgme.c:171
+#: src/plugins/pgpcore/sgpgme.c:180

 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Потпис се не може проверити — %s"
 
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "Потпис се не може проверити — %s"
 

-#: src/plugins/pgpcore/sgpgme.c:175 src/plugins/pgpcore/sgpgme.c:179
-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:188
+#: src/plugins/pgpcore/sgpgme.c:235

 msgid "The signature has not been checked."
 msgstr "Потпис није проверен."
 
 msgid "The signature has not been checked."
 msgstr "Потпис није проверен."
 

-#: src/plugins/pgpcore/sgpgme.c:185 src/plugins/pgpcore/sgpgme.c:187
+#: src/plugins/pgpcore/sgpgme.c:194 src/plugins/pgpcore/sgpgme.c:196

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "ПГП језгро: Није могуће добавити кључ - није покренут gpg-agent."
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "ПГП језгро: Није могуће добавити кључ - није покренут gpg-agent."
 

-#: src/plugins/pgpcore/sgpgme.c:200
+#: src/plugins/pgpcore/sgpgme.c:209

 #, c-format
 msgid "Good signature from %s."
 msgstr "Добар потпис од „%s“."
 
 #, c-format
 msgid "Good signature from %s."
 msgstr "Добар потпис од „%s“."
 

-#: src/plugins/pgpcore/sgpgme.c:206
+#: src/plugins/pgpcore/sgpgme.c:215

 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Добар потпис (неповерљив) од %s."
 
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "Добар потпис (неповерљив) од %s."
 

-#: src/plugins/pgpcore/sgpgme.c:211
+#: src/plugins/pgpcore/sgpgme.c:220

 #, c-format
 msgid "Expired signature from %s."
 msgstr "Потпис од „%s“ је истекао."
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr "Потпис од „%s“ је истекао."
 

-#: src/plugins/pgpcore/sgpgme.c:214
+#: src/plugins/pgpcore/sgpgme.c:223

 #, c-format
 msgid "Expired key from %s."
 msgstr "Кључ од „%s“ је истекао."
 
 #, c-format
 msgid "Expired key from %s."
 msgstr "Кључ од „%s“ је истекао."
 

-#: src/plugins/pgpcore/sgpgme.c:217
+#: src/plugins/pgpcore/sgpgme.c:226

 #, c-format
 msgid "Bad signature from %s."
 msgstr "ЛОШ (невалидан) потпис од „%s“."
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr "ЛОШ (невалидан) потпис од „%s“."
 

-#: src/plugins/pgpcore/sgpgme.c:221
+#: src/plugins/pgpcore/sgpgme.c:230

 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Кључ 0x%s није доступан за верификацију овог потписа."
 
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "Кључ 0x%s није доступан за верификацију овог потписа."
 

-#: src/plugins/pgpcore/sgpgme.c:263
+#: src/plugins/pgpcore/sgpgme.c:272

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Потпис је направљен користећи %s кључ број %s\n"
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "Потпис је направљен користећи %s кључ број %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:270
+#: src/plugins/pgpcore/sgpgme.c:279

 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Важећи потпис од „%s“ (Поверљиво: %s)\n"
 
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "Важећи потпис од „%s“ (Поверљиво: %s)\n"
 

-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:284

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Потпис од „%s“ је истекао\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Потпис од „%s“ је истекао\n"
 

-#: src/plugins/pgpcore/sgpgme.c:280
+#: src/plugins/pgpcore/sgpgme.c:289

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ЛОШ (невалидан) потпис од „%s“\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ЛОШ (невалидан) потпис од „%s“\n"
 

-#: src/plugins/pgpcore/sgpgme.c:291
+#: src/plugins/pgpcore/sgpgme.c:300

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                такође познат као „%s“\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                такође познат као „%s“\n"
 

-#: src/plugins/pgpcore/sgpgme.c:297
+#: src/plugins/pgpcore/sgpgme.c:306

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Отисак примарног кључа: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Отисак примарног кључа: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:311

 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "УПОЗОРЕЊЕ: Адреса потписника „%s“ не одговара DNS садржају\n"
 
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "УПОЗОРЕЊЕ: Адреса потписника „%s“ не одговара DNS садржају\n"
 

-#: src/plugins/pgpcore/sgpgme.c:308
+#: src/plugins/pgpcore/sgpgme.c:317

 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Потврђена адреса потписника је „%s“\n"
 
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "Потврђена адреса потписника је „%s“\n"
 

-#: src/plugins/pgpcore/sgpgme.c:350
+#: src/plugins/pgpcore/sgpgme.c:359

 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Није могуће узети податке из поруке, %s"
 
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "Није могуће узети податке из поруке, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:366
+#: src/plugins/pgpcore/sgpgme.c:375

 #, c-format
 msgid "Couldn't initialize data, %s"
 #, c-format
 msgid "Couldn't initialize data, %s"

-msgstr "није могуе иницијализовати податке, %s"
+msgstr "Ð\9dије могуе иницијализовати податке, %s"

 
 

-#: src/plugins/pgpcore/sgpgme.c:482
+#: src/plugins/pgpcore/sgpgme.c:491

 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Изабрани кључ није пронађен (%s)"
 
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "Изабрани кључ није пронађен (%s)"
 

-#: src/plugins/pgpcore/sgpgme.c:490
+#: src/plugins/pgpcore/sgpgme.c:499

 msgid "Secret key specification is ambiguous"
 msgstr "Спецификација тајног кључа је нејасна"
 
 msgid "Secret key specification is ambiguous"
 msgstr "Спецификација тајног кључа је нејасна"
 

-#: src/plugins/pgpcore/sgpgme.c:500
+#: src/plugins/pgpcore/sgpgme.c:509

 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Грешка при постављању тајног кључа: %s"
 
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "Грешка при постављању тајног кључа: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:536
+#: src/plugins/pgpcore/sgpgme.c:545

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "Gpgme протокол „%s“ је неупотребљив: Машина „%s“ није правилно инсталирана."
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "Gpgme протокол „%s“ је неупотребљив: Машина „%s“ није правилно инсталирана."
 

-#: src/plugins/pgpcore/sgpgme.c:542
+#: src/plugins/pgpcore/sgpgme.c:551

 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "


@@ -6794,12 +7153,12 @@ msgstr ""
 "Gpgme протокол „%s“ је неупотребљив: Машина „%s“ верзија %s је инсталирана, "
 "али је потребна верзија %s.\n"
 
 "Gpgme протокол „%s“ је неупотребљив: Машина „%s“ верзија %s је инсталирана, "
 "али је потребна верзија %s.\n"
 

-#: src/plugins/pgpcore/sgpgme.c:550
+#: src/plugins/pgpcore/sgpgme.c:559

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme протокол „%s“ је неупотребљив (непознати проблем)"
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme протокол „%s“ је неупотребљив (непознати проблем)"
 

-#: src/plugins/pgpcore/sgpgme.c:566
+#: src/plugins/pgpcore/sgpgme.c:575

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -6807,61 +7166,79 @@ msgstr ""
 "GnuPG није правилно инсталиран, или га треба надоградити.\n"
 "OpenPGP подршка је искључена."
 
 "GnuPG није правилно инсталиран, или га треба надоградити.\n"
 "OpenPGP подршка је искључена."
 

-#: src/plugins/pgpcore/sgpgme.c:600
+#: src/plugins/pgpcore/sgpgme.c:609
+msgid ""
+"You have to save the account's information with \"OK\" before being able to "
+"generate a key pair.\n"
+msgstr ""
+"Морате сачувати информације о налогу са „У реду“ пре него што "
+"започнете са прављењем пара кључева.\n"
+
+#: src/plugins/pgpcore/sgpgme.c:614

 msgid "No PGP key found"
 msgstr "Није пронађен ПГП кључ"
 
 msgid "No PGP key found"
 msgstr "Није пронађен ПГП кључ"
 

-#: src/plugins/pgpcore/sgpgme.c:601
+#: src/plugins/pgpcore/sgpgme.c:615

 msgid ""
 msgid ""

-"Sylpheed-Claws did not find a secret PGP key, which means that you won't be "
-"able to sign emails or receive encrypted emails.\n"
+"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 ""
 "Do you want to create a new key pair now?"
 msgstr ""

-"Sylpheed-Claws није пронашао тајни ПГП кључ, што значи да нећете моћи да "
-"потписујете поруке, нити да их примате.\n"
+"Claws Mail није пронашао тајни ПГП кључ, што значи да "
+"неÑ\9bеÑ\82е моÑ\9bи да поÑ\82пиÑ\81Ñ\83Ñ\98еÑ\82е поÑ\80Ñ\83ке, ниÑ\82и да иÑ\85 пÑ\80имаÑ\82е.\n"

 "Желите ли да сада направите нови пар кључева?"
 
 "Желите ли да сада направите нови пар кључева?"
 

-#: src/plugins/pgpcore/sgpgme.c:671 src/plugins/pgpcore/sgpgme.c:687
+#: src/plugins/pgpcore/sgpgme.c:685 src/plugins/pgpcore/sgpgme.c:701

 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 #, c-format
 msgid "Couldn't generate a new key pair: %s"

-msgstr "Ð\9dиÑ\98е могÑ\83Ñ\9bе генеÑ\80иÑ\81ање новог пара кључева: %s"
+msgstr "Ð\9dиÑ\98е могÑ\83Ñ\9bе пÑ\80авÑ\99ење новог пара кључева: %s"

 
 

-#: src/plugins/pgpcore/sgpgme.c:678
+#: src/plugins/pgpcore/sgpgme.c:692

 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr ""

-"Ð\93енеÑ\80иÑ\81аÑ\9aе ваÑ\88ег новог пара кључева... Померајте миша како би помогли "
-"енÑ\82Ñ\80опиÑ\98и генеÑ\80иÑ\81ања..."
+"Ð\9fÑ\80авÑ\99еÑ\9aе новог пара кључева... Померајте миша како би помогли "
+"енÑ\82Ñ\80опиÑ\98и пÑ\80авÑ\99ења..."

 
 

-#: src/plugins/pgpcore/sgpgme.c:693
+#: src/plugins/pgpcore/sgpgme.c:707

 msgid "Couldn't generate a new key pair: unknown error"
 msgid "Couldn't generate a new key pair: unknown error"

-msgstr "Ð\9dеÑ\83Ñ\81пеÑ\88но генеÑ\80иÑ\81ање новог пара кључева: непозната грешка"
+msgstr "Ð\9dеÑ\83Ñ\81пеÑ\88но пÑ\80авÑ\99ење новог пара кључева: непозната грешка"

 
 

-#: src/plugins/pgpcore/sgpgme.c:697
+#: src/plugins/pgpcore/sgpgme.c:711

 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"

-"%s"
+"%s\n"
+"\n"
+"Do you want to export it to a keyserver?"

 msgstr ""
 msgstr ""

-"Ваш нови пар кључева је генерисан. Њихов отисак је:\n"
-"%s"
+"Ваш нови пар кључева је направљен. Њихов отисак је:\n"
+"%s\n"
+"\n"
+"Да ли желите да кључеви буду послати на сервер кључева?"

 
 

-#: src/plugins/pgpcore/plugin.c:37
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin "
-"was built with"
-msgstr "Sylpheed-Claws који користите је новији од верзије за коју је компајлиран PGP/Core додатак"
+#: src/plugins/pgpcore/sgpgme.c:715
+msgid "Key generated"
+msgstr "Кључ је направљен"
+
+#: src/plugins/pgpcore/sgpgme.c:754
+msgid "Key exported."
+msgstr "Кључ је извежен."

 
 

-#: src/plugins/pgpcore/plugin.c:42
-msgid "Your version of Sylpheed-Claws is too old for the PGP/Core plugin"
-msgstr "Sylpheed-Claws који користите је сувише стар за PGP/Core додатак"
+#: src/plugins/pgpcore/sgpgme.c:756
+msgid "Couldn't export key."
+msgstr "Није могућ извоз кључа."

 
 

-#: src/plugins/pgpcore/plugin.c:60
+#: src/plugins/pgpcore/sgpgme.c:760
+msgid "Key export isn't implemented in Windows."
+msgstr "Извиз кључа није могућ на Windows платформи."
+
+#: src/plugins/pgpcore/plugin.c:35

 msgid "PGP/Core"
 msgstr "PGP/Core"
 
 msgid "PGP/Core"
 msgstr "PGP/Core"
 

-#: src/plugins/pgpcore/plugin.c:65
+#: src/plugins/pgpcore/plugin.c:64

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -6883,91 +7260,170 @@ msgstr ""
 "\n"
 "GPGME је заштићен 2001 од стране Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME је заштићен 2001 од стране Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpcore/plugin.c:94
+#: src/plugins/pgpcore/plugin.c:93

 msgid "Core operations"
 msgstr "Основне операције"
 
 msgid "Core operations"
 msgstr "Основне операције"
 

-#: src/plugins/pgpinline/pgpinline.c:237 src/plugins/pgpinline/pgpinline.c:385
+#: src/plugins/pgpcore/pgp_viewer.c:118
+msgid "Key import"
+msgstr "Увоз кључа"
+
+#: src/plugins/pgpcore/pgp_viewer.c:119
+msgid ""
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"
+msgstr ""
+"Овај кључ није у вачем ланцу кључева. Желите ли да Claws Mail "
+"покуша да га добави са сервера кључева?"
+
+#: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
+msgid ""
+"\n"
+"  Key ID "
+msgstr ""
+"\n"
+"„ИД кључа“"
+
+#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:186
+msgid "   This key is not in your keyring.\n"
+msgstr "   Овај кључ није у Вашем ланцу кључева.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:130
+msgid "   It should be possible to import it "
+msgstr "   Могуће га је увести "
+
+#: src/plugins/pgpcore/pgp_viewer.c:132
+msgid ""
+"when working online,\n"
+"   or "
+msgstr ""
+"када будете повезани на мрежу,\n"
+"   или "
+
+#: src/plugins/pgpcore/pgp_viewer.c:133
+msgid ""
+"with the following command: \n"
+"\n"
+"     "
+msgstr ""
+"следећом наредбом: \n"
+"\n"
+"     "
+
+#: src/plugins/pgpcore/pgp_viewer.c:140
+msgid ""
+"\n"
+"  Importing key ID "
+msgstr ""
+"\n"
+"„увозим ИД кључа“"
+
+#: src/plugins/pgpcore/pgp_viewer.c:179
+msgid "   This key has been imported to your keyring.\n"
+msgstr "  Овај кључ је увежен у Ваш ланац кључева.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:181
+msgid "   This key couldn't be imported to your keyring.\n"
+msgstr "   Овај кључ не може да се увезе у Ваш ланац кључева.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid ""
+"   You can try to import it manually with the command:\n"
+"\n"
+"     "
+msgstr ""
+"   Можете покушати да га увезете ручно наредбом:\n"
+"\n"
+"     "
+
+#: src/plugins/pgpcore/pgp_viewer.c:187
+msgid "   Key import isn't implemented in Windows.\n"
+msgstr "   Увоз кључева није уграђен у Windows верзију програма.\n"
+
+#: src/plugins/pgpcore/pgp_viewer.c:196
+msgid "   This key is in your keyring.\n"
+msgstr "   Овај кључ се налази у Вашем ланцу кључева.\n"
+
+#: src/plugins/pgpinline/pgpinline.c:241 src/plugins/pgpinline/pgpinline.c:393

 msgid "Couldn't get text data."
 msgstr "Није могуће пронаћи текст поруке."
 
 msgid "Couldn't get text data."
 msgstr "Није могуће пронаћи текст поруке."
 

-#: src/plugins/pgpinline/pgpinline.c:255
+#: src/plugins/pgpinline/pgpinline.c:259

 msgid "Couldn't convert text data to any sane charset."
 msgstr "Није могуће превести садржај текста у разумљиви кодни распоред."
 
 msgid "Couldn't convert text data to any sane charset."
 msgstr "Није могуће превести садржај текста у разумљиви кодни распоред."
 

-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:267 src/plugins/pgpinline/pgpinline.c:523
+#: src/plugins/pgpinline/pgpinline.c:644 src/plugins/pgpinline/pgpinline.c:691
+#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
+#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
+#: src/plugins/pgpmime/pgpmime.c:593
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "Није могуће иницијализовати GPG садржај, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:386

 msgid "Couldn't parse mime part."
 msgstr "Није могуће расчланити mime део."
 
 msgid "Couldn't parse mime part."
 msgstr "Није могуће расчланити mime део."
 

-#: src/plugins/pgpinline/pgpinline.c:408 src/plugins/pgpmime/pgpmime.c:333
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:343

 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Није могуће отворити декриптовану датотеку %s"
 
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "Није могуће отворити декриптовану датотеку %s"
 

-#: src/plugins/pgpinline/pgpinline.c:438
+#: src/plugins/pgpinline/pgpinline.c:446

 msgid "Couldn't scan decrypted file."
 msgstr "Није могуће скенирање декриптоване датотеке."
 
 msgid "Couldn't scan decrypted file."
 msgstr "Није могуће скенирање декриптоване датотеке."
 

-#: src/plugins/pgpinline/pgpinline.c:446
+#: src/plugins/pgpinline/pgpinline.c:454

 msgid "Couldn't scan decrypted file parts."
 msgstr "Није могуће скенирати делове декриптоване датотеке."
 
 msgid "Couldn't scan decrypted file parts."
 msgstr "Није могуће скенирати делове декриптоване датотеке."
 

-#: src/plugins/pgpinline/pgpinline.c:500
+#: src/plugins/pgpinline/pgpinline.c:508

 msgid "Couldn't create temporary file."
 msgstr "Није могуће прављење привремене датотеке."
 
 msgid "Couldn't create temporary file."
 msgstr "Није могуће прављење привремене датотеке."
 

-#: src/plugins/pgpinline/pgpinline.c:534 src/plugins/pgpmime/pgpmime.c:480
+#: src/plugins/pgpinline/pgpinline.c:546 src/plugins/pgpmime/pgpmime.c:494

 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Неуспело потписивање података, %s"
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "Неуспело потписивање података, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:552 src/plugins/pgpmime/pgpmime.c:505
+#: src/plugins/pgpinline/pgpinline.c:564 src/plugins/pgpmime/pgpmime.c:519

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Неуспело потписивање података због погрешног потписника: %s"
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "Неуспело потписивање података због погрешног потписника: %s"
 

-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:514
+#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:528

 msgid "Data signing failed, no results."
 msgstr "Неуспело потписивање података, нема резултата."
 
 msgid "Data signing failed, no results."
 msgstr "Неуспело потписивање података, нема резултата."
 

-#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:526
+#: src/plugins/pgpinline/pgpinline.c:583 src/plugins/pgpmime/pgpmime.c:539

 msgid "Data signing failed, no contents."
 msgstr "Неуспело потписивање података, нема садржаја."
 
 msgid "Data signing failed, no contents."
 msgstr "Неуспело потписивање података, нема садржаја."
 

-#: src/plugins/pgpinline/pgpinline.c:637 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:653 src/plugins/pgpmime/pgpmime.c:602

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Није могуће додати GPG кључ %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "Није могуће додати GPG кључ %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpmime/pgpmime.c:612
+#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:630

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Није могуће прављење привремене датотеке, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "Није могуће прављење привремене датотеке, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:683 src/plugins/pgpmime/pgpmime.c:638
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:655

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Неуспела енкрипција, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "Неуспела енкрипција, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:746
+#: src/plugins/pgpinline/pgpinline.c:767

 msgid "PGP/Inline"
 msgstr "ПГП/линијски"
 
 msgid "PGP/Inline"
 msgstr "ПГП/линијски"
 

-#: src/plugins/pgpinline/plugin.c:36
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/inline "
-"plugin was built with"
-msgstr "Sylpheed-Claws који користите је новији од верзије за коју је компајлиран PGP/inline додатак"
-
-#: src/plugins/pgpinline/plugin.c:41
-msgid "Your version of Sylpheed-Claws is too old for the PGP/inline plugin"
-msgstr "Sylpheed-Claws који користите је сувише стар за PGP/inline додатак"
-
-#: src/plugins/pgpinline/plugin.c:57
+#: src/plugins/pgpinline/plugin.c:33

 msgid "PGP/inline"
 msgstr "ПГП/линијски"
 
 msgid "PGP/inline"
 msgstr "ПГП/линијски"
 

-#: src/plugins/pgpinline/plugin.c:62
+#: src/plugins/pgpinline/plugin.c:58

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -6993,21 +7449,11 @@ msgstr ""
 "\n"
 "GPGME је заштићен 2001 од стране Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME је заштићен 2001 од стране Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/plugin.c:35
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin "
-"was built with"
-msgstr "Sylpheed-Claws који користите је новији од верзије за коју је компајлиран PGP/MIME додатак"
-
-#: src/plugins/pgpmime/plugin.c:40
-msgid "Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"
-msgstr "Sylpheed-Claws који користите је сувише стар за PGP/MIME додатак"
-
-#: src/plugins/pgpmime/plugin.c:56
+#: src/plugins/pgpmime/plugin.c:33

 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:61
+#: src/plugins/pgpmime/plugin.c:58

 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"


@@ -7032,49 +7478,49 @@ msgstr ""
 "\n"
 "GPGME је заштићен 2001 од стране Werner Koch <dd9jn@gnu.org>"
 
 "\n"
 "GPGME је заштићен 2001 од стране Werner Koch <dd9jn@gnu.org>"
 

-#: src/plugins/pgpmime/pgpmime.c:192
+#: src/plugins/pgpmime/pgpmime.c:201

 msgid "Signature boundary not found."
 msgstr "Оквир потписа није пронађен."
 
 msgid "Signature boundary not found."
 msgstr "Оквир потписа није пронађен."
 

-#: src/plugins/pgpmime/pgpmime.c:310
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "Није могуће иницијализовати GPG садржај, %s"
-
-#: src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpmime/pgpmime.c:362

 msgid "Couldn't parse decrypted file."
 msgstr "Није могуће расчланити декриптовану датотеку."
 
 msgid "Couldn't parse decrypted file."
 msgstr "Није могуће расчланити декриптовану датотеку."
 

-#: src/plugins/pgpmime/pgpmime.c:358
+#: src/plugins/pgpmime/pgpmime.c:368

 msgid "Couldn't parse decrypted file parts."
 msgstr "Није могуће расчланити делове декриптоване датотеке."
 
 msgid "Couldn't parse decrypted file parts."
 msgstr "Није могуће расчланити делове декриптоване датотеке."
 

-#: src/plugins/pgpmime/pgpmime.c:404 src/plugins/pgpmime/pgpmime.c:443
+#: src/plugins/pgpmime/pgpmime.c:414 src/plugins/pgpmime/pgpmime.c:453

 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Није могуће направити привремену датотеку: %s"
 
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "Није могуће направити привремену датотеку: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:704
+#: src/plugins/pgpmime/pgpmime.c:723

 msgid "PGP/Mime"
 msgstr "ПГП/Миме"
 
 msgid "PGP/Mime"
 msgstr "ПГП/Миме"
 

-#: src/plugins/spamassassin/spamassassin.c:159
+#: src/plugins/spamassassin/spamassassin.c:75
+#: src/plugins/spamassassin/spamassassin_gtk.c:549
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: src/plugins/spamassassin/spamassassin.c:161

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin додатак не може да се повеже на spamd.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin додатак не може да се повеже на spamd.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:175
+#: src/plugins/spamassassin/spamassassin.c:177

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Неуспешно филтрирање порука SpamAssassin додатком.\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "Неуспешно филтрирање порука SpamAssassin додатком.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:201
+#: src/plugins/spamassassin/spamassassin.c:203

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin додатак је искључен у подешавањима.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin додатак је искључен у подешавањима.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:206
+#: src/plugins/spamassassin/spamassassin.c:208

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: филтрирање порука..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: филтрирање порука..."
 

-#: src/plugins/spamassassin/spamassassin.c:274
+#: src/plugins/spamassassin/spamassassin.c:277

 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "


@@ -7083,38 +7529,23 @@ msgstr ""
 "SpamAssassin додатак не може да филтрира поруке. Узрок ове грешке је "
 "недоступан spamd сервис. Проверите да ли је spamd покренут и доступан."
 
 "SpamAssassin додатак не може да филтрира поруке. Узрок ове грешке је "
 "недоступан spamd сервис. Проверите да ли је spamd покренут и доступан."
 

-#: src/plugins/spamassassin/spamassassin.c:333
+#: src/plugins/spamassassin/spamassassin.c:336

 msgid ""
 msgid ""

-"Sylpheed-Claws needs network access in order to feed this mail(s) to the "
-"remote learner."
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."

 msgstr ""
 msgstr ""

-"Да би Sylpheed-Claws проследио ове поруке на удаљени спем сервер, неопходна "
-"је веза са мрежом."
+"Да би Claws Mail проследио ове поруке на удаљени спем сервер, "
+"неопходна је веза са мрежом."

 
 

-#: src/plugins/spamassassin/spamassassin.c:468
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the SpamAssassin "
-"plugin was built with"
-msgstr "Sylpheed-Claws који користите је новији од верзије за коју је компајлиран SpamAssassin додатак"
-
-#: src/plugins/spamassassin/spamassassin.c:473
-msgid "Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"
-msgstr "Sylpheed-Claws који користите је сувише стар за SpamAssassin додатак"
-
-#: src/plugins/spamassassin/spamassassin.c:482
+#: src/plugins/spamassassin/spamassassin.c:479

 msgid "Failed to get username"
 msgstr "Неуспело прибављање корисничког имена"
 
 msgid "Failed to get username"
 msgstr "Неуспело прибављање корисничког имена"
 

-#: src/plugins/spamassassin/spamassassin.c:494
+#: src/plugins/spamassassin/spamassassin.c:491

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin додатак је учитан али је искључен у подешавањима.\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin додатак је учитан али је искључен у подешавањима.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:522
-#: src/plugins/spamassassin/spamassassin_gtk.c:549
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
-
-#: src/plugins/spamassassin/spamassassin.c:527
+#: src/plugins/spamassassin/spamassassin.c:524

 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "


@@ -7138,11 +7569,11 @@ msgstr ""
 "\n"
 "Поставке можете пронаћи у /Подешавање/Поставке/Додаци/SpamAssassin"
 
 "\n"
 "Поставке можете пронаћи у /Подешавање/Поставке/Додаци/SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:558
+#: src/plugins/spamassassin/spamassassin.c:555

 msgid "Spam detection"
 msgstr "Откривање спема"
 
 msgid "Spam detection"
 msgstr "Откривање спема"
 

-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:556

 msgid "Spam learning"
 msgstr "Учење спема"
 
 msgid "Spam learning"
 msgstr "Учење спема"
 


@@ -7215,6 +7646,7 @@ msgstr ""
 "обустављена."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
 "обустављена."
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194

+#: src/prefs_summaries.c:900

 msgid "seconds"
 msgstr "секунди"
 
 msgid "seconds"
 msgstr "секунди"
 


@@ -7238,64 +7670,60 @@ msgstr ""
 msgid "Click this button to select a folder for storing spam"
 msgstr "Кликните на ово дугме за избор директоријума за смештање спема."
 
 msgid "Click this button to select a folder for storing spam"
 msgstr "Кликните на ово дугме за избор директоријума за смештање спема."
 

-#: src/plugins/trayicon/trayicon.c:94
+#: src/plugins/trayicon/trayicon.c:59 src/plugins/trayicon/trayicon.c:497
+msgid "Trayicon"
+msgstr "Икона у системском путу"
+
+#: src/plugins/trayicon/trayicon.c:106

 msgid "/_Get Mail"
 msgstr "/_Провера поште"
 
 msgid "/_Get Mail"
 msgstr "/_Провера поште"
 

-#: src/plugins/trayicon/trayicon.c:96
+#: src/plugins/trayicon/trayicon.c:108

 msgid "/_Email"
 msgstr "/_Е-пошта"
 
 msgid "/_Email"
 msgstr "/_Е-пошта"
 

-#: src/plugins/trayicon/trayicon.c:97
+#: src/plugins/trayicon/trayicon.c:109
+msgid "/_Email from account"
+msgstr "/_Е-пошта са налога"
+
+#: src/plugins/trayicon/trayicon.c:111

 msgid "/Open A_ddressbook"
 msgstr "/Отвори _адресар"
 
 msgid "/Open A_ddressbook"
 msgstr "/Отвори _адресар"
 

-#: src/plugins/trayicon/trayicon.c:99
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Work Offline"
 msgstr "/Режим ва_н везе"
 
 msgid "/_Work Offline"
 msgstr "/Режим ва_н везе"
 

-#: src/plugins/trayicon/trayicon.c:101
-msgid "/E_xit Sylpheed-Claws"
-msgstr "/_Затвори Sylpheed-Claws"
+#: src/plugins/trayicon/trayicon.c:115
+msgid "/E_xit Claws Mail"
+msgstr "/_Затвори Claws Mail"

 
 

-#: src/plugins/trayicon/trayicon.c:155
+#: src/plugins/trayicon/trayicon.c:204

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "нових: %d, непрочитаних: %d, укупно: %d"
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "нових: %d, непрочитаних: %d, укупно: %d"
 

-#: src/plugins/trayicon/trayicon.c:223
+#: src/plugins/trayicon/trayicon.c:278

 msgid "/Work Offline"
 msgstr "/Режим ва_н везе"
 
 msgid "/Work Offline"
 msgstr "/Режим ва_н везе"
 

-#: src/plugins/trayicon/trayicon.c:226
+#: src/plugins/trayicon/trayicon.c:281

 msgid "/Get Mail"
 msgstr "/Провера поште"
 
 msgid "/Get Mail"
 msgstr "/Провера поште"
 

-#: src/plugins/trayicon/trayicon.c:295
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Trayicon plugin "
-"was built with"
-msgstr ""
-"Sylpheed-Claws који користите је новији од верзије за коју је компајлиран "
-"Trayicon додатак"
-
-#: src/plugins/trayicon/trayicon.c:300
-msgid "Your version of Sylpheed-Claws is too old for the Trayicon plugin"
-msgstr "Sylpheed-Claws који користите је сувише стар за Trayicon додатак"
-
-#: src/plugins/trayicon/trayicon.c:306
+#: src/plugins/trayicon/trayicon.c:361

 msgid "Failed to register folder item update hook"
 msgstr "Неуспешно пријављивање процеса освежавања ставке директоријума"
 
 msgid "Failed to register folder item update hook"
 msgstr "Неуспешно пријављивање процеса освежавања ставке директоријума"
 

-#: src/plugins/trayicon/trayicon.c:312
+#: src/plugins/trayicon/trayicon.c:367

 msgid "Failed to register folder update hook"
 msgstr "Неуспешно пријављивање процеса освежавања директоријума"
 
 msgid "Failed to register folder update hook"
 msgstr "Неуспешно пријављивање процеса освежавања директоријума"
 

-#: src/plugins/trayicon/trayicon.c:340 src/plugins/trayicon/trayicon.c:422
-msgid "Trayicon"
-msgstr "Ð\98кона Ñ\83 Ñ\81иÑ\81Ñ\82емÑ\81ком пÑ\83Ñ\82Ñ\83"
+#: src/plugins/trayicon/trayicon.c:373 src/plugins/trayicon/trayicon.c:379
+msgid "Failed to register offline switch hook"
+msgstr "Ð\9dеÑ\83Ñ\81пеÑ\88но пÑ\80иÑ\98авÑ\99иваÑ\9aе пÑ\80оÑ\86еÑ\81а иÑ\81кÑ\99Ñ\83Ñ\87еÑ\9aа Ñ\81а мÑ\80еже"

 
 

-#: src/plugins/trayicon/trayicon.c:345
+#: src/plugins/trayicon/trayicon.c:415

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -7310,7 +7738,7 @@ msgstr ""
 "садржи писмо. Балончић помоћи приказује нове, непрочитане и укупан број свих "
 "порука."
 
 "садржи писмо. Балончић помоћи приказује нове, непрочитане и укупан број свих "
 "порука."
 

-#: src/plugins/trayicon/trayicon.c:399
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit this program?"
 msgstr "Излаз из програма?"
 
 msgid "Exit this program?"
 msgstr "Излаз из програма?"
 


@@ -7369,179 +7797,187 @@ msgstr "настала је грешка у POP3 сесији\n"
 msgid "TOP command unsupported\n"
 msgstr "команда TOP није подржана\n"
 
 msgid "TOP command unsupported\n"
 msgstr "команда TOP није подржана\n"
 

-#: src/prefs_account.c:231 src/prefs_account.c:1440 src/prefs_account.c:2123
-#: src/wizard.c:997
+#: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145
+#: src/wizard.c:1122

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:234 src/prefs_account.c:1566 src/prefs_account.c:2140
+#: src/prefs_account.c:236 src/prefs_account.c:1587 src/prefs_account.c:2162

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:235
+#: src/prefs_account.c:237

 msgid "News (NNTP)"
 msgstr "Дискусионе групе (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "Дискусионе групе (NNTP)"
 

-#: src/prefs_account.c:236 src/wizard.c:1007
+#: src/prefs_account.c:238 src/wizard.c:1132

 msgid "Local mbox file"
 msgstr "Датотека локалног мбокс сандучића"
 
 msgid "Local mbox file"
 msgstr "Датотека локалног мбокс сандучића"
 

-#: src/prefs_account.c:237
+#: src/prefs_account.c:239

 msgid "None (SMTP only)"
 msgstr "Ништа (само СМТП)"
 
 msgid "None (SMTP only)"
 msgstr "Ништа (само СМТП)"
 

-#: src/prefs_account.c:716
+#: src/prefs_account.c:725

 #, c-format
 msgid "Account%d"
 msgstr "Налог%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "Налог%d"
 

-#: src/prefs_account.c:989
+#: src/prefs_account.c:998

 msgid "Preferences for new account"
 msgstr "Подешавања новог налога"
 
 msgid "Preferences for new account"
 msgstr "Подешавања новог налога"
 

-#: src/prefs_account.c:991
+#: src/prefs_account.c:1000

 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s — Подешавања налога"
 
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s — Подешавања налога"
 

-#: src/prefs_account.c:1026
+#: src/prefs_account.c:1035

 msgid "_Basic"
 msgstr "_Основно"
 
 msgid "_Basic"
 msgstr "_Основно"
 

-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1037

 msgid "_Receive"
 msgstr "_Преузимање"
 
 msgid "_Receive"
 msgstr "_Преузимање"
 

-#: src/prefs_account.c:1032
+#: src/prefs_account.c:1041

 msgid "Co_mpose"
 msgstr "П_рављење"
 
 msgid "Co_mpose"
 msgstr "П_рављење"
 

-#: src/prefs_account.c:1034
+#: src/prefs_account.c:1043

 msgid "_Privacy"
 msgstr "При_ватност"
 
 msgid "_Privacy"
 msgstr "При_ватност"
 

-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1046

 msgid "SS_L"
 msgstr "SS_L"
 
 msgid "SS_L"
 msgstr "SS_L"
 

-#: src/prefs_account.c:1040
+#: src/prefs_account.c:1049

 msgid "A_dvanced"
 msgstr "На_предно"
 
 msgid "A_dvanced"
 msgstr "На_предно"
 

-#: src/prefs_account.c:1096
+#: src/prefs_account.c:1107

 msgid "Name of account"
 msgstr "Назив налога"
 
 msgid "Name of account"
 msgstr "Назив налога"
 

-#: src/prefs_account.c:1105
+#: src/prefs_account.c:1116

 msgid "Set as default"
 msgstr "Подразумевани налог"
 
 msgid "Set as default"
 msgstr "Подразумевани налог"
 

-#: src/prefs_account.c:1109
+#: src/prefs_account.c:1120

 msgid "Personal information"
 msgstr "Лични подаци"
 
 msgid "Personal information"
 msgstr "Лични подаци"
 

-#: src/prefs_account.c:1118
+#: src/prefs_account.c:1129

 msgid "Full name"
 msgstr "Име и презиме"
 
 msgid "Full name"
 msgstr "Име и презиме"
 

-#: src/prefs_account.c:1124
+#: src/prefs_account.c:1135

 msgid "Mail address"
 msgstr "Адреса е-поште"
 
 msgid "Mail address"
 msgstr "Адреса е-поште"
 

-#: src/prefs_account.c:1130
+#: src/prefs_account.c:1141

 msgid "Organization"
 msgstr "Организација"
 
 msgid "Organization"
 msgstr "Организација"
 

-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1165

 msgid "Server information"
 msgstr "Информације о серверу"
 
 msgid "Server information"
 msgstr "Информације о серверу"
 

-#: src/prefs_account.c:1213
+#: src/prefs_account.c:1205 src/wizard.c:1216
+msgid ""
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"
+"has been built without IMAP support.</span>"
+msgstr ""
+"<span weight=\"bold\">Упозорење: ова верзија Claws Mail\n"
+"је компајлирана без подршке за IMAP.</span>"
+
+#: src/prefs_account.c:1234

 msgid "This server requires authentication"
 msgstr "Овај сервер захтева идентификацију"
 
 msgid "This server requires authentication"
 msgstr "Овај сервер захтева идентификацију"
 

-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1241

 msgid "Authenticate on connect"
 msgstr "Идентификација при повезивању"
 
 msgid "Authenticate on connect"
 msgstr "Идентификација при повезивању"
 

-#: src/prefs_account.c:1265
+#: src/prefs_account.c:1286

 msgid "News server"
 msgstr "Сервер за дискусионе групе"
 
 msgid "News server"
 msgstr "Сервер за дискусионе групе"
 

-#: src/prefs_account.c:1271
+#: src/prefs_account.c:1292

 msgid "Server for receiving"
 msgstr "Сервер за преузимане порука"
 
 msgid "Server for receiving"
 msgstr "Сервер за преузимане порука"
 

-#: src/prefs_account.c:1277
+#: src/prefs_account.c:1298

 msgid "Local mailbox"
 msgstr "Локални сандучић"
 
 msgid "Local mailbox"
 msgstr "Локални сандучић"
 

-#: src/prefs_account.c:1284
+#: src/prefs_account.c:1305

 msgid "SMTP server (send)"
 msgstr "Сервер за слање порука (SMTP)"
 
 msgid "SMTP server (send)"
 msgstr "Сервер за слање порука (SMTP)"
 

-#: src/prefs_account.c:1292
+#: src/prefs_account.c:1313

 msgid "Use mail command rather than SMTP server"
 msgstr "Користи mail команду уместо SMTP сервера"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Користи mail команду уместо SMTP сервера"
 

-#: src/prefs_account.c:1301
+#: src/prefs_account.c:1322

 msgid "command to send mails"
 msgstr "Команда за слање порука"
 
 msgid "command to send mails"
 msgstr "Команда за слање порука"
 

-#: src/prefs_account.c:1308 src/prefs_account.c:1757
+#: src/prefs_account.c:1329 src/prefs_account.c:1779

 msgid "User ID"
 msgstr "Корисничко име"
 
 msgid "User ID"
 msgstr "Корисничко име"
 

-#: src/prefs_account.c:1314 src/prefs_account.c:1766
+#: src/prefs_account.c:1335 src/prefs_account.c:1788

 msgid "Password"
 msgstr "Лозинка"
 
 msgid "Password"
 msgstr "Лозинка"
 

-#: src/prefs_account.c:1407
+#: src/prefs_account.c:1428

 msgid "Local"
 msgstr "Локални рачунар"
 
 msgid "Local"
 msgstr "Локални рачунар"
 

-#: src/prefs_account.c:1418 src/prefs_account.c:1513
+#: src/prefs_account.c:1439 src/prefs_account.c:1534

 msgid "Default inbox"
 msgstr "Подразумевано сандуче"
 
 msgid "Default inbox"
 msgstr "Подразумевано сандуче"
 

-#: src/prefs_account.c:1425 src/prefs_account.c:1433 src/prefs_account.c:1520
-#: src/prefs_account.c:1528
+#: src/prefs_account.c:1446 src/prefs_account.c:1454 src/prefs_account.c:1541
+#: src/prefs_account.c:1549

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Нефилтриране поруке ће бити смештене у овај директоријум"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "Нефилтриране поруке ће бити смештене у овај директоријум"
 

-#: src/prefs_account.c:1430 src/prefs_account.c:1525 src/prefs_account.c:1927
+#: src/prefs_account.c:1451 src/prefs_account.c:1546 src/prefs_account.c:1949

 msgid "Bro_wse"
 msgstr "Тра_жи"
 
 msgid "Bro_wse"
 msgstr "Тра_жи"
 

-#: src/prefs_account.c:1448
+#: src/prefs_account.c:1469

 msgid "Use secure authentication (APOP)"
 msgstr "Употреба криптоване идентификације (АПОП)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "Употреба криптоване идентификације (АПОП)"
 

-#: src/prefs_account.c:1451
+#: src/prefs_account.c:1472

 msgid "Remove messages on server when received"
 msgstr "Брисање порука са сервера при преузимању"
 
 msgid "Remove messages on server when received"
 msgstr "Брисање порука са сервера при преузимању"
 

-#: src/prefs_account.c:1462
+#: src/prefs_account.c:1483

 msgid "Remove after"
 msgstr "Брисање након"
 
 msgid "Remove after"
 msgstr "Брисање након"
 

-#: src/prefs_account.c:1471
+#: src/prefs_account.c:1492

 msgid "0 days: remove immediately"
 msgstr "Упишете 0 (нулу) за моментално брисање порука по преузимању"
 
 msgid "0 days: remove immediately"
 msgstr "Упишете 0 (нулу) за моментално брисање порука по преузимању"
 

-#: src/prefs_account.c:1475
+#: src/prefs_account.c:1496

 msgid "days"
 msgstr "дана"
 
 msgid "days"
 msgstr "дана"
 

-#: src/prefs_account.c:1482
+#: src/prefs_account.c:1503

 msgid "Download all messages on server"
 msgstr "Преузимање свих порука са сервера"
 
 msgid "Download all messages on server"
 msgstr "Преузимање свих порука са сервера"
 

-#: src/prefs_account.c:1488
+#: src/prefs_account.c:1509

 msgid "Receive size limit"
 msgstr "Преузимање само порука мањих од"
 
 msgid "Receive size limit"
 msgstr "Преузимање само порука мањих од"
 

-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1512

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -7549,68 +7985,68 @@ msgstr ""
 "Поруке које прелазе ово ограничење ће бити делимично преузете. Када их "
 "одаберете можижете да их означите за преузимање у потпуности или уклањање."
 
 "Поруке које прелазе ово ограничење ће бити делимично преузете. Када их "
 "одаберете можижете да их означите за преузимање у потпуности или уклањање."
 

-#: src/prefs_account.c:1501
+#: src/prefs_account.c:1522

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1535 src/prefs_account.c:2157
+#: src/prefs_account.c:1556 src/prefs_account.c:2179

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1547
+#: src/prefs_account.c:1568

 msgid "Maximum number of articles to download"
 msgstr "Максималан број чланака за преузимање"
 
 msgid "Maximum number of articles to download"
 msgstr "Максималан број чланака за преузимање"
 

-#: src/prefs_account.c:1559
+#: src/prefs_account.c:1580

 msgid "unlimited if 0 is specified"
 msgstr "неограничено ако је вредност 0"
 
 msgid "unlimited if 0 is specified"
 msgstr "неограничено ако је вредност 0"
 

-#: src/prefs_account.c:1577 src/prefs_account.c:1727
+#: src/prefs_account.c:1598 src/prefs_account.c:1749

 msgid "Authentication method"
 msgstr "Метод идентификације"
 
 msgid "Authentication method"
 msgstr "Метод идентификације"
 

-#: src/prefs_account.c:1587 src/prefs_account.c:1737 src/prefs_send.c:273
+#: src/prefs_account.c:1608 src/prefs_account.c:1759 src/prefs_send.c:273

 msgid "Automatic"
 msgstr "Аутоматски"
 
 msgid "Automatic"
 msgstr "Аутоматски"
 

-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1620

 msgid "IMAP server directory"
 msgstr "Директоријум IMAP сервера"
 
 msgid "IMAP server directory"
 msgstr "Директоријум IMAP сервера"
 

-#: src/prefs_account.c:1602
+#: src/prefs_account.c:1624

 msgid "(usually empty)"
 msgstr "(најчешће празно)"
 
 msgid "(usually empty)"
 msgstr "(најчешће празно)"
 

-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1634

 msgid "Filter messages on receiving"
 msgstr "Примена филтера при преузимању порука"
 
 msgid "Filter messages on receiving"
 msgstr "Примена филтера при преузимању порука"
 

-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1638

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "„Провера поште“ проверава да ли постоје нове поруке и на овом налогу"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "„Провера поште“ проверава да ли постоје нове поруке и на овом налогу"
 

-#: src/prefs_account.c:1678 src/prefs_customheader.c:205
+#: src/prefs_account.c:1700 src/prefs_customheader.c:205

 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Поље заглавља"
 
 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "Поље заглавља"
 

-#: src/prefs_account.c:1685
+#: src/prefs_account.c:1707

 msgid "Generate Message-ID"
 msgstr "Генерисање „Message-ID“ поља заглавља"
 
 msgid "Generate Message-ID"
 msgstr "Генерисање „Message-ID“ поља заглавља"
 

-#: src/prefs_account.c:1692
+#: src/prefs_account.c:1714

 msgid "Add user-defined header"
 msgstr "Додавање кориснички дефинисих поља заглавља"
 
 msgid "Add user-defined header"
 msgstr "Додавање кориснички дефинисих поља заглавља"
 

-#: src/prefs_account.c:1704
+#: src/prefs_account.c:1726

 msgid "Authentication"
 msgstr "Идентификација"
 
 msgid "Authentication"
 msgstr "Идентификација"
 

-#: src/prefs_account.c:1712
+#: src/prefs_account.c:1734

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP идентифкација (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP идентифкација (SMTP AUTH)"
 

-#: src/prefs_account.c:1788
+#: src/prefs_account.c:1810

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."


@@ -7618,212 +8054,216 @@ msgstr ""
 "Ако оставите ово поље непопуњено, користиће се исто корисничко име и лозинка "
 "као за преузимање."
 
 "Ако оставите ово поље непопуњено, користиће се исто корисничко име и лозинка "
 "као за преузимање."
 

-#: src/prefs_account.c:1799
+#: src/prefs_account.c:1821

 msgid "Authenticate with POP3 before sending"
 msgstr "Идентификација са POP3 пре слања"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Идентификација са POP3 пре слања"
 

-#: src/prefs_account.c:1814
+#: src/prefs_account.c:1836

 msgid "POP authentication timeout: "
 msgstr "Време трајања POP идентификације: "
 
 msgid "POP authentication timeout: "
 msgstr "Време трајања POP идентификације: "
 

-#: src/prefs_account.c:1823
+#: src/prefs_account.c:1845

 msgid "minutes"
 msgstr "минут(а)"
 
 msgid "minutes"
 msgstr "минут(а)"
 

-#: src/prefs_account.c:1868 src/prefs_account.c:1919
+#: src/prefs_account.c:1890 src/prefs_account.c:1941

 msgid "Signature"
 msgstr "Потпис"
 
 msgid "Signature"
 msgstr "Потпис"
 

-#: src/prefs_account.c:1876
+#: src/prefs_account.c:1898

 msgid "Insert signature automatically"
 msgstr "Аутоматско убацивање потписа"
 
 msgid "Insert signature automatically"
 msgstr "Аутоматско убацивање потписа"
 

-#: src/prefs_account.c:1881
+#: src/prefs_account.c:1903

 msgid "Signature separator"
 msgstr "Раздвајач потписа"
 
 msgid "Signature separator"
 msgstr "Раздвајач потписа"
 

-#: src/prefs_account.c:1906
+#: src/prefs_account.c:1928

 msgid "Command output"
 msgstr "Резултат команде"
 
 msgid "Command output"
 msgstr "Резултат команде"
 

-#: src/prefs_account.c:1939
+#: src/prefs_account.c:1961

 msgid "Automatically set the following addresses"
 msgstr "Аутоматско постављање адреса за прослеђивање"
 
 msgid "Automatically set the following addresses"
 msgstr "Аутоматско постављање адреса за прослеђивање"
 

-#: src/prefs_account.c:1948 src/prefs_filtering_action.c:1083
+#: src/prefs_account.c:1970 src/prefs_filtering_action.c:1083

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Копија"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Копија"
 

-#: src/prefs_account.c:1961 src/prefs_template.c:189
+#: src/prefs_account.c:1983 src/prefs_template.c:189

 msgid "Bcc"
 msgstr "Невидљива копија"
 
 msgid "Bcc"
 msgstr "Невидљива копија"
 

-#: src/prefs_account.c:1974
+#: src/prefs_account.c:1996

 msgid "Reply-To"
 msgstr "Одговор-За"
 
 msgid "Reply-To"
 msgstr "Одговор-За"
 

-#: src/prefs_account.c:2026
+#: src/prefs_account.c:2048

 msgid "Default privacy system"
 msgstr "Подразумевани систем приватности"
 
 msgid "Default privacy system"
 msgstr "Подразумевани систем приватности"
 

-#: src/prefs_account.c:2035
+#: src/prefs_account.c:2057

 msgid "Always sign messages"
 msgstr "Увек потпиши поруке"
 
 msgid "Always sign messages"
 msgstr "Увек потпиши поруке"
 

-#: src/prefs_account.c:2037
+#: src/prefs_account.c:2059

 msgid "Always encrypt messages"
 msgstr "Увек криптуј поруке"
 
 msgid "Always encrypt messages"
 msgstr "Увек криптуј поруке"
 

-#: src/prefs_account.c:2039
+#: src/prefs_account.c:2061

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Увек криптуј поруке при одговору на криптовану поруку"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "Увек криптуј поруке при одговору на криптовану поруку"
 

-#: src/prefs_account.c:2042
+#: src/prefs_account.c:2064

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Криптуј послате поруке властитим кључем након криптовања кључем примаоца"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "Криптуј послате поруке властитим кључем након криптовања кључем примаоца"
 

-#: src/prefs_account.c:2044
+#: src/prefs_account.c:2066

 msgid "Save sent encrypted messages as clear text"
 msgstr "Сачувај послате кодиране поруке као обичан текст"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "Сачувај послате кодиране поруке као обичан текст"
 

-#: src/prefs_account.c:2131 src/prefs_account.c:2148 src/prefs_account.c:2164
+#: src/prefs_account.c:2153 src/prefs_account.c:2170 src/prefs_account.c:2186

 msgid "Don't use SSL"
 msgstr "Без употребе SSL"
 
 msgid "Don't use SSL"
 msgstr "Без употребе SSL"
 

-#: src/prefs_account.c:2134
+#: src/prefs_account.c:2156

 msgid "Use SSL for POP3 connection"
 msgstr "Употреба SSL за POP3 везу"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Употреба SSL за POP3 везу"
 

-#: src/prefs_account.c:2137 src/prefs_account.c:2154 src/prefs_account.c:2189
+#: src/prefs_account.c:2159 src/prefs_account.c:2176 src/prefs_account.c:2211

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Употреба STARTTLS команде за покретање SSL сесије"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Употреба STARTTLS команде за покретање SSL сесије"
 

-#: src/prefs_account.c:2151
+#: src/prefs_account.c:2173

 msgid "Use SSL for IMAP4 connection"
 msgstr "Употреба SSL за IMAP4 везу"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Употреба SSL за IMAP4 везу"
 

-#: src/prefs_account.c:2173
+#: src/prefs_account.c:2195

 msgid "Use SSL for NNTP connection"
 msgstr "Употреба SSL за NNTP везу"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Употреба SSL за NNTP везу"
 

-#: src/prefs_account.c:2175
+#: src/prefs_account.c:2197

 msgid "Send (SMTP)"
 msgstr "Слање (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Слање (SMTP)"
 

-#: src/prefs_account.c:2183
+#: src/prefs_account.c:2205

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Без употребе SSL (ако је неопходно, употребаљава се STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Без употребе SSL (ако је неопходно, употребаљава се STARTTLS)"
 

-#: src/prefs_account.c:2186
+#: src/prefs_account.c:2208

 msgid "Use SSL for SMTP connection"
 msgstr "Употреба SSL за SMTP везу"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Употреба SSL за SMTP везу"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2219

 msgid "Use non-blocking SSL"
 msgstr "Употреба неблокирајућег SSL"
 
 msgid "Use non-blocking SSL"
 msgstr "Употреба неблокирајућег SSL"
 

-#: src/prefs_account.c:2209
+#: src/prefs_account.c:2231

 msgid "Turn this off if you have SSL connection problems"
 msgstr "Искључите ову опцију ако имате проблема са SSL конекцијама"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "Искључите ову опцију ако имате проблема са SSL конекцијама"
 

-#: src/prefs_account.c:2335
+#: src/prefs_account.c:2357

 msgid "SMTP port"
 msgstr "SMTP порт"
 
 msgid "SMTP port"
 msgstr "SMTP порт"
 

-#: src/prefs_account.c:2341
+#: src/prefs_account.c:2363

 msgid "POP3 port"
 msgstr "POP3 порт"
 
 msgid "POP3 port"
 msgstr "POP3 порт"
 

-#: src/prefs_account.c:2347
+#: src/prefs_account.c:2369

 msgid "IMAP4 port"
 msgstr "IMAP4 порт"
 
 msgid "IMAP4 port"
 msgstr "IMAP4 порт"
 

-#: src/prefs_account.c:2353
+#: src/prefs_account.c:2375

 msgid "NNTP port"
 msgstr "NNTP порт"
 
 msgid "NNTP port"
 msgstr "NNTP порт"
 

-#: src/prefs_account.c:2358
+#: src/prefs_account.c:2380

 msgid "Domain name"
 msgstr "Домен"
 
 msgid "Domain name"
 msgstr "Домен"
 

-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2390

 msgid "Use command to communicate with server"
 msgstr "Употреба команде за комуникацију са сервером"
 
 msgid "Use command to communicate with server"
 msgstr "Употреба команде за комуникацију са сервером"
 

-#: src/prefs_account.c:2376
+#: src/prefs_account.c:2398

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Обележавање кроспостованих порука као „прочитано“ и бојење у:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Обележавање кроспостованих порука као „прочитано“ и бојење у:"
 

-#: src/prefs_account.c:2423
+#: src/prefs_account.c:2445

 msgid "Browse"
 msgstr "Тражи"
 
 msgid "Browse"
 msgstr "Тражи"
 

-#: src/prefs_account.c:2436
+#: src/prefs_account.c:2458

 msgid "Put sent messages in"
 msgstr "Смести послате поруке у"
 
 msgid "Put sent messages in"
 msgstr "Смести послате поруке у"
 

-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2460

 msgid "Put queued messages in"
 msgstr "Смести припремљене поруке у"
 
 msgid "Put queued messages in"
 msgstr "Смести припремљене поруке у"
 

-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2462

 msgid "Put draft messages in"
 msgstr "Смести недовршене поруке у"
 
 msgid "Put draft messages in"
 msgstr "Смести недовршене поруке у"
 

-#: src/prefs_account.c:2442
+#: src/prefs_account.c:2464

 msgid "Put deleted messages in"
 msgstr "Смести обрисане поруке у"
 
 msgid "Put deleted messages in"
 msgstr "Смести обрисане поруке у"
 

-#: src/prefs_account.c:2485
+#: src/prefs_account.c:2507

 msgid "Account name is not entered."
 msgstr "НИсте унели назив налога."
 
 msgid "Account name is not entered."
 msgstr "НИсте унели назив налога."
 

-#: src/prefs_account.c:2489
+#: src/prefs_account.c:2511

 msgid "Mail address is not entered."
 msgstr "Нисте унели адресу е-поште."
 
 msgid "Mail address is not entered."
 msgstr "Нисте унели адресу е-поште."
 

-#: src/prefs_account.c:2496
+#: src/prefs_account.c:2518

 msgid "SMTP server is not entered."
 msgstr "Нисте унели SMTP сервер."
 
 msgid "SMTP server is not entered."
 msgstr "Нисте унели SMTP сервер."
 

-#: src/prefs_account.c:2501
+#: src/prefs_account.c:2523

 msgid "User ID is not entered."
 msgstr "Нисте унели корисничко име."
 
 msgid "User ID is not entered."
 msgstr "Нисте унели корисничко име."
 

-#: src/prefs_account.c:2506
+#: src/prefs_account.c:2528

 msgid "POP3 server is not entered."
 msgstr "Нисте унели POP3 сервер."
 
 msgid "POP3 server is not entered."
 msgstr "Нисте унели POP3 сервер."
 

-#: src/prefs_account.c:2511
+#: src/prefs_account.c:2535
+msgid "The default inbox folder doesn't exist."
+msgstr "Подразумевани директоријум сандучета не постоји."
+
+#: src/prefs_account.c:2541

 msgid "IMAP4 server is not entered."
 msgstr "Нисте унели IMAP4 сервер."
 
 msgid "IMAP4 server is not entered."
 msgstr "Нисте унели IMAP4 сервер."
 

-#: src/prefs_account.c:2516
+#: src/prefs_account.c:2546

 msgid "NNTP server is not entered."
 msgstr "Нисте унели NNTP сервер."
 
 msgid "NNTP server is not entered."
 msgstr "Нисте унели NNTP сервер."
 

-#: src/prefs_account.c:2522
+#: src/prefs_account.c:2552

 msgid "local mailbox filename is not entered."
 msgstr "Нисте унели назив датотеке локалног сандучета."
 
 msgid "local mailbox filename is not entered."
 msgstr "Нисте унели назив датотеке локалног сандучета."
 

-#: src/prefs_account.c:2528
+#: src/prefs_account.c:2558

 msgid "mail command is not entered."
 msgstr "Нисте унели команду за слање порука."
 
 msgid "mail command is not entered."
 msgstr "Нисте унели команду за слање порука."
 

-#: src/prefs_account.c:2593
+#: src/prefs_account.c:2623

 msgid "Select signature file"
 msgstr "Одаберите датотеку потписа"
 
 msgid "Select signature file"
 msgstr "Одаберите датотеку потписа"
 

-#: src/prefs_account.c:2686
+#: src/prefs_account.c:2716

 msgid "Protocol:"
 msgstr "Протокол:"
 
 msgid "Protocol:"
 msgstr "Протокол:"
 

-#: src/prefs_account.c:2826
+#: src/prefs_account.c:2869

 #, c-format
 #, c-format

-msgid "Unsupported (%s)"
-msgstr "Неподржано (%s)"
+msgid "%s (plugin not loaded)"
+msgstr "%s (додатак није учитан)"

 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"
 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"


@@ -7838,7 +8278,7 @@ msgid "Command line"
 msgstr "Командна линија"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
 msgstr "Командна линија"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493

-#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:259
+#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:270

 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Замени"
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "Замени"


@@ -7851,7 +8291,7 @@ msgstr "Информације..."
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811

-#: src/prefs_template.c:355
+#: src/prefs_template.c:367

 msgid "(New)"
 msgstr "(ново)"
 
 msgid "(New)"
 msgstr "(ново)"
 


@@ -7900,13 +8340,13 @@ msgstr "Да ли заиста желите да ова акција буде о
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822

-#: src/prefs_template.c:405 src/prefs_template.c:422
+#: src/prefs_template.c:426 src/prefs_template.c:443

 msgid "Entry not saved"
 msgstr "Унос није сачуван"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
 msgid "Entry not saved"
 msgstr "Унос није сачуван"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254

-#: src/prefs_filtering.c:1276 src/prefs_template.c:406
-#: src/prefs_template.c:423
+#: src/prefs_filtering.c:1276 src/prefs_template.c:427
+#: src/prefs_template.c:444

 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 "Унос није сачуван.\n"
 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 "Унос није сачуван.\n"


@@ -7914,7 +8354,7 @@ msgstr ""
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824

-#: src/prefs_template.c:407 src/prefs_template.c:424
+#: src/prefs_template.c:428 src/prefs_template.c:445

 msgid "+_Continue editing"
 msgstr "+_Настави уређивање"
 
 msgid "+_Continue editing"
 msgstr "+_Настави уређивање"
 


@@ -8010,11 +8450,15 @@ msgstr ""
 msgid "Current actions"
 msgstr "Постојеће акције"
 
 msgid "Current actions"
 msgstr "Постојеће акције"
 

-#: src/prefs_common.c:259
+#: src/prefs_common.c:210
+msgid "Hello,\\n"
+msgstr "Здраво,\\n"
+
+#: src/prefs_common.c:272

 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Дана %d\\n%f написа:\\n\\n%q"
 
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "Дана %d\\n%f написа:\\n\\n%q"
 

-#: src/prefs_common.c:265
+#: src/prefs_common.c:278

 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"
 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"


@@ -8023,87 +8467,99 @@ msgstr ""
 "{Прималац: %t\\n}?c{Копија: %c\\n}?n{Дискусиона група: %n\\n}?s{Тема: %s\\n}"
 "\\n\\n%M"
 
 "{Прималац: %t\\n}?c{Копија: %c\\n}?n{Дискусиона група: %n\\n}?s{Тема: %s\\n}"
 "\\n\\n%M"
 

-#: src/prefs_common.c:350
+#: src/prefs_common.c:363

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr "%y/%m/%d(%a) %H:%M"
 

-#: src/prefs_compose_writing.c:106
+#: src/prefs_compose_writing.c:124

 msgid "Automatic account selection"
 msgstr "Аутоматски одабир налога"
 
 msgid "Automatic account selection"
 msgstr "Аутоматски одабир налога"
 

-#: src/prefs_compose_writing.c:114
+#: src/prefs_compose_writing.c:132

 msgid "when replying"
 msgstr "при одговору"
 
 msgid "when replying"
 msgstr "при одговору"
 

-#: src/prefs_compose_writing.c:116
+#: src/prefs_compose_writing.c:134

 msgid "when forwarding"
 msgstr "при прослеђивању"
 
 msgid "when forwarding"
 msgstr "при прослеђивању"
 

-#: src/prefs_compose_writing.c:118
+#: src/prefs_compose_writing.c:136

 msgid "when re-editing"
 msgstr "при преуређивању"
 
 msgid "when re-editing"
 msgstr "при преуређивању"
 

-#: src/prefs_compose_writing.c:120
+#: src/prefs_compose_writing.c:138

 msgid "Forwarding"
 msgstr "Прослеђивање"
 
 msgid "Forwarding"
 msgstr "Прослеђивање"
 

-#: src/prefs_compose_writing.c:128 src/prefs_filtering_action.c:160
+#: src/prefs_compose_writing.c:146 src/prefs_filtering_action.c:160

 msgid "Forward as attachment"
 msgstr "Прослеђивање поруке као прилога"
 
 msgid "Forward as attachment"
 msgstr "Прослеђивање поруке као прилога"
 

-#: src/prefs_compose_writing.c:131
+#: src/prefs_compose_writing.c:149

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Задржавање оригиналног заглавља „Аутор“ код преусмеравања"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Задржавање оригиналног заглавља „Аутор“ код преусмеравања"
 

-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:151

 msgid "Editing"
 msgstr "Писање"
 
 msgid "Editing"
 msgstr "Писање"
 

-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:159

 msgid "Automatically launch the external editor"
 msgstr "Аутоматско покретање спољног уређивача текста"
 
 msgid "Automatically launch the external editor"
 msgstr "Аутоматско покретање спољног уређивача текста"
 

-#: src/prefs_compose_writing.c:148
+#: src/prefs_compose_writing.c:166

 msgid "Autosave message text to Drafts folder every"
 msgstr "Аутоматско чување измена у директоријум „Недовршено“ сваких"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "Аутоматско чување измена у директоријум „Недовршено“ сваких"
 

-#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:176 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "карактера"
 
 msgid "characters"
 msgstr "карактера"
 

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:184

 msgid "Undo level"
 msgstr "Максималан број опозива последње акције"
 
 msgid "Undo level"
 msgstr "Максималан број опозива последње акције"
 

-#: src/prefs_compose_writing.c:179
+#: src/prefs_compose_writing.c:197

 msgid "Reply button invokes mailing list reply"
 msgstr "Дугме за „Одговор“ шаље одговор на дописно друштво"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Дугме за „Одговор“ шаље одговор на дописно друштво"
 

-#: src/prefs_compose_writing.c:182
+#: src/prefs_compose_writing.c:200

 msgid "When dropping files into the Compose window"
 msgstr ""
 "При спуштању датотеке\n"
 "у прозор за састављање поруке"
 
 msgid "When dropping files into the Compose window"
 msgstr ""
 "При спуштању датотеке\n"
 "у прозор за састављање поруке"
 

-#: src/prefs_compose_writing.c:190
-msgid "Ask whether to insert or attach"
-msgstr "Упитај за начин уметања"
+#: src/prefs_compose_writing.c:208
+msgid "Ask"
+msgstr "Питај"
+
+#: src/prefs_compose_writing.c:209 src/toolbar.c:456
+msgid "Insert"
+msgstr "Уметни"
+
+#: src/prefs_compose_writing.c:210 src/toolbar.c:457
+msgid "Attach"
+msgstr "Прилог"
+
+#: src/prefs_compose_writing.c:226
+msgid "Use format when composing new messages"
+msgstr "Користи предефинисани формат поруке при писању нове поруке"

 
 

-#: src/prefs_compose_writing.c:191
-msgid "Always insert"
-msgstr "Увек Ñ\83меÑ\82ни"
+#: src/prefs_compose_writing.c:228
+msgid "New message format"
+msgstr "ФоÑ\80маÑ\82 нове поÑ\80Ñ\83ке"

 
 

-#: src/prefs_compose_writing.c:192
-msgid "Always attach"
-msgstr "Увек приложи"
+#: src/prefs_compose_writing.c:282 src/prefs_quote.c:206
+msgid " Description of symbols... "
+msgstr " Опис симбола... "

 
 

-#: src/prefs_compose_writing.c:297 src/prefs_folder_item.c:935
-#: src/prefs_quote.c:285 src/prefs_spelling.c:401 src/prefs_wrapping.c:144
-#: src/toolbar.c:1515
+#: src/prefs_compose_writing.c:402 src/prefs_folder_item.c:1170
+#: src/prefs_quote.c:311 src/prefs_spelling.c:448 src/prefs_wrapping.c:144
+#: src/toolbar.c:1560

 msgid "Compose"
 msgstr "Састављање"
 
 msgid "Compose"
 msgstr "Састављање"
 

-#: src/prefs_compose_writing.c:298
+#: src/prefs_compose_writing.c:403

 msgid "Writing"
 msgstr "Писање"
 
 msgid "Writing"
 msgstr "Писање"
 


@@ -8247,6 +8703,7 @@ msgid "Copy"
 msgstr "Копирај"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
 msgstr "Копирај"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79

+#: src/summaryview.c:2366

 msgid "Mark"
 msgstr "Означи"
 
 msgid "Mark"
 msgstr "Означи"
 


@@ -8266,7 +8723,7 @@ msgstr "Означи као прочитано"
 msgid "Mark as unread"
 msgstr "Означи као непрочитано"
 
 msgid "Mark as unread"
 msgstr "Означи као непрочитано"
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:398 src/toolbar.c:489
+#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499

 msgid "Forward"
 msgstr "Проследи"
 
 msgid "Forward"
 msgstr "Проследи"
 


@@ -8275,7 +8732,7 @@ msgid "Redirect"
 msgstr "Преусмери"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
 msgstr "Преусмери"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429

-#: src/toolbar.c:174 src/toolbar.c:1655
+#: src/toolbar.c:178 src/toolbar.c:1711

 msgid "Execute"
 msgstr "Изврши означене акције"
 
 msgid "Execute"
 msgstr "Изврши означене акције"
 


@@ -8295,7 +8752,7 @@ msgstr "Постави бодове"
 msgid "Hide"
 msgstr "Сакриј"
 
 msgid "Hide"
 msgstr "Сакриј"
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:177
+#: src/prefs_filtering_action.c:167 src/toolbar.c:181

 msgid "Ignore thread"
 msgstr "Игнориши нит расправе"
 
 msgid "Ignore thread"
 msgstr "Игнориши нит расправе"
 


@@ -8320,7 +8777,7 @@ msgid "Recipient"
 msgstr "Прималац"
 
 #: src/prefs_filtering_action.c:439 src/prefs_summary_column.c:88
 msgstr "Прималац"
 
 #: src/prefs_filtering_action.c:439 src/prefs_summary_column.c:88

-#: src/summaryview.c:491
+#: src/summaryview.c:492

 msgid "Score"
 msgstr "Бодови"
 
 msgid "Score"
 msgstr "Бодови"
 


@@ -8349,12 +8806,12 @@ msgid "No action was defined."
 msgstr "Нисте одредили акцију."
 
 #: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1865
 msgstr "Нисте одредили акцију."
 
 #: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1865

-#: src/quote_fmt.c:58
+#: src/quote_fmt.c:62

 msgid "literal %"
 msgstr "Карактер „%“ (проценат)"
 
 #: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1870
 msgid "literal %"
 msgstr "Карактер „%“ (проценат)"
 
 #: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1870

-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:488
+#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:489

 msgid "Date"
 msgstr "Датум"
 
 msgid "Date"
 msgstr "Датум"
 


@@ -8405,7 +8862,7 @@ msgstr ""
 "\n"
 "Могу да се користе следећи симболи:"
 
 "\n"
 "Могу да се користе следећи симболи:"
 

-#: src/prefs_filtering_action.c:1404
+#: src/prefs_filtering_action.c:1408

 msgid "Current action list"
 msgstr "Постојеће акције"
 
 msgid "Current action list"
 msgstr "Постојеће акције"
 


@@ -8413,6 +8870,11 @@ msgstr "Постојеће акције"
 msgid "Filtering/Processing configuration"
 msgstr "Подешавање филтрирања/обраде"
 
 msgid "Filtering/Processing configuration"
 msgstr "Подешавање филтрирања/обраде"
 

+#: src/prefs_filtering.c:250 src/prefs_filtering.c:781
+#: src/prefs_filtering.c:872
+msgid "Filtering Account Menu|All"
+msgstr "Све"
+

 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Услов"
 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "Услов"


@@ -8453,10 +8915,6 @@ msgstr "Укључено"
 msgid "Rule"
 msgstr "Правило"
 
 msgid "Rule"
 msgstr "Правило"
 

-#: src/prefs_folder_column.c:82
-msgid "Total"
-msgstr "Укупно"
-

 #: src/prefs_folder_column.c:205
 msgid "Folder list columns configuration"
 msgstr "Подешавање колона за попис порука"
 #: src/prefs_folder_column.c:205
 msgid "Folder list columns configuration"
 msgstr "Подешавање колона за попис порука"


@@ -8473,7 +8931,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "Скривене колоне"
 
 msgid "Hidden columns"
 msgstr "Скривене колоне"
 

-#: src/prefs_folder_column.c:280 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:797
+#: src/prefs_summaries.c:943 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "Колоне за приказ"
 
 msgid "Displayed columns"
 msgstr "Колоне за приказ"
 


@@ -8482,7 +8941,18 @@ msgstr "Колоне за приказ"
 msgid " Use default "
 msgstr " Врати на подразумевано "
 
 msgid " Use default "
 msgstr " Врати на подразумевано "
 

-#: src/prefs_folder_item.c:183 src/prefs_folder_item.c:566
+#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:646
+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 ""
+"<i>Подешавања неће бити сачувана пошто је овај директоријум "
+"први у хијерархији. Ипак, можете га користити за постављање "
+"подешавања за цело стабло сандучета користећи опцију "
+"„Примени на све поддиректоријуме“.</i>"
+
+#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:658

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -8490,76 +8960,84 @@ msgstr ""
 "Примени за\n"
 "поддиректоријуме"
 
 "Примени за\n"
 "поддиректоријуме"
 

-#: src/prefs_folder_item.c:207
+#: src/prefs_folder_item.c:238

 msgid "Normal"
 msgstr "Нормалан"
 
 msgid "Normal"
 msgstr "Нормалан"
 

-#: src/prefs_folder_item.c:209
+#: src/prefs_folder_item.c:240

 msgid "Outbox"
 msgstr "Одлазна пошта"
 
 msgid "Outbox"
 msgstr "Одлазна пошта"
 

-#: src/prefs_folder_item.c:226
-msgid "Folder type:"
-msgstr "Врста директоријума:"
+#: src/prefs_folder_item.c:257
+msgid "Folder type"
+msgstr "Врста директоријума"

 
 

-#: src/prefs_folder_item.c:238
-msgid "Simplify Subject RegExp: "
-msgstr "Регуларни израз за скраћивање теме: "
+#: src/prefs_folder_item.c:269
+msgid "Simplify Subject RegExp"
+msgstr "Регуларни израз за скраћивање теме"

 
 

-#: src/prefs_folder_item.c:258
-msgid "Folder chmod: "
-msgstr "Ð\9fÑ\80иÑ\81Ñ\82Ñ\83пни мод диÑ\80екÑ\82оÑ\80иÑ\98Ñ\83ма: "
+#: src/prefs_folder_item.c:295
+msgid "Test RegExp"
+msgstr "Ð\9fÑ\80оба Ñ\80егÑ\83лаÑ\80ног изÑ\80аза"

 
 

-#: src/prefs_folder_item.c:284
-msgid "Folder color: "
-msgstr "Ð\91оÑ\98а назива диÑ\80екÑ\82оÑ\80иÑ\98Ñ\83ма: "
+#: src/prefs_folder_item.c:327
+msgid "Folder chmod"
+msgstr "Ð\9fÑ\80иÑ\81Ñ\82Ñ\83пни мод диÑ\80екÑ\82оÑ\80иÑ\98Ñ\83ма"

 
 

-#: src/prefs_folder_item.c:298 src/prefs_folder_item.c:906
+#: src/prefs_folder_item.c:353
+msgid "Folder color"
+msgstr "Боја назива директоријума"
+
+#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1045

 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Одаберите боју за назив директоријума"
 
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "Одаберите боју за назив директоријума"
 

-#: src/prefs_folder_item.c:315
+#: src/prefs_folder_item.c:384

 msgid "Process at startup"
 msgstr "Обрада при покретању програма"
 
 msgid "Process at startup"
 msgstr "Обрада при покретању програма"
 

-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:398

 msgid "Scan for new mail"
 msgstr "Освежавање нових порука"
 
 msgid "Scan for new mail"
 msgstr "Освежавање нових порука"
 

-#: src/prefs_folder_item.c:342
+#: src/prefs_folder_item.c:411

 msgid "Synchronise for offline use"
 msgstr "Синхронизуј за режим ван везе"
 
 msgid "Synchronise for offline use"
 msgstr "Синхронизуј за режим ван везе"
 

-#: src/prefs_folder_item.c:575
+#: src/prefs_folder_item.c:667

 msgid "Request Return Receipt"
 msgstr "Захтевање потврде пријема поруке"
 
 msgid "Request Return Receipt"
 msgstr "Захтевање потврде пријема поруке"
 

-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:682

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Сачувај копију послате поруке у овај уместо у директоријум „Послато“"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Сачувај копију послате поруке у овај уместо у директоријум „Послато“"
 

-#: src/prefs_folder_item.c:603
+#: src/prefs_folder_item.c:695

 msgid "Default To: "
 msgstr "Подразумевани Прималац: "
 
 msgid "Default To: "
 msgstr "Подразумевани Прималац: "
 

-#: src/prefs_folder_item.c:623
+#: src/prefs_folder_item.c:716

 msgid "Default To for replies: "
 msgstr "Подразумевани Прималац за одговоре: "
 
 msgid "Default To for replies: "
 msgstr "Подразумевани Прималац за одговоре: "
 

-#: src/prefs_folder_item.c:643
+#: src/prefs_folder_item.c:737

 msgid "Default account: "
 msgstr "Подразумевани налог: "
 
 msgid "Default account: "
 msgstr "Подразумевани налог: "
 

-#: src/prefs_folder_item.c:694
+#: src/prefs_folder_item.c:788

 msgid "Default dictionary: "
 msgstr "Подразумевани речник: "
 
 msgid "Default dictionary: "
 msgstr "Подразумевани речник: "
 

-#: src/prefs_folder_item.c:918
+#: src/prefs_folder_item.c:821
+msgid "Default alternate dictionary: "
+msgstr "Алтернативни речник: "
+
+#: src/prefs_folder_item.c:1153

 msgid "General"
 msgstr "Опште"
 
 msgid "General"
 msgstr "Опште"
 

-#: src/prefs_folder_item.c:961
+#: src/prefs_folder_item.c:1198

 #, c-format
 msgid "Properties for folder %s"
 msgstr "Подешавања за директоријум %s"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "Подешавања за директоријум %s"


@@ -8580,7 +9058,7 @@ msgstr "Користи другачији фонт за штампу"
 msgid "Message Printing"
 msgstr "Штампање поруке"
 
 msgid "Message Printing"
 msgstr "Штампање поруке"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1078

 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Приказ"
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "Приказ"


@@ -8589,7 +9067,7 @@ msgstr "Приказ"
 msgid "Fonts"
 msgstr "Писма"
 
 msgid "Fonts"
 msgstr "Писма"
 

-#: src/prefs_gtk.c:871
+#: src/prefs_gtk.c:908

 msgid "Preferences"
 msgstr "Поставке"
 
 msgid "Preferences"
 msgstr "Поставке"
 


@@ -8981,7 +9459,7 @@ msgstr "Одаберите боју за потпис"
 msgid "Signatures"
 msgstr "Потпис"
 
 msgid "Signatures"
 msgstr "Потпис"
 

-#: src/prefs_msg_colors.c:376
+#: src/prefs_msg_colors.c:376 src/prefs_summaries.c:761

 msgid "Folder list"
 msgstr "Попис директоријума"
 
 msgid "Folder list"
 msgstr "Попис директоријума"
 


@@ -9013,22 +9491,22 @@ msgstr "Боја поруке"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format

-msgid "Pick color for 'color %d'"
-msgstr "Одаберите боју за „боја #%d“"
+msgid "Tooltip|Pick color for 'color %d'"
+msgstr "Одаберите боју за „боја %d“"

 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:452 src/prefs_msg_colors.c:484
 #, c-format
 msgid "Set label for 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:452 src/prefs_msg_colors.c:484
 #, c-format
 msgid "Set label for 'color %d'"

-msgstr "Одаберите назив за „боја #%d“"
+msgstr "Одаберите назив за „боја %d“"

 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format

-msgid "Pick color for 'color %d' "
-msgstr "Одаберите боју за „боја #%d“"
+msgid "Dialog title|Pick color for 'color %d'"
+msgstr "Одаберите боју за „боја %d“"

 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "
 
 #: src/prefs_msg_colors.c:621
 msgid "Pick color for 1st level text "


@@ -9122,115 +9600,107 @@ msgstr "Истекло време трајања I/O сокета"
 msgid "Never send Return Receipts"
 msgstr "Никада не шаљи потврду пријема"
 
 msgid "Never send Return Receipts"
 msgstr "Никада не шаљи потврду пријема"
 

-#: src/prefs_quote.c:90
+#: src/prefs_quote.c:92

 msgid "Reply will quote by default"
 msgstr "Одговор са цитатом"
 
 msgid "Reply will quote by default"
 msgstr "Одговор са цитатом"
 

-#: src/prefs_quote.c:92
+#: src/prefs_quote.c:94

 msgid "Reply format"
 msgstr "Формат одговора"
 
 msgid "Reply format"
 msgstr "Формат одговора"
 

-#: src/prefs_quote.c:107 src/prefs_quote.c:149
+#: src/prefs_quote.c:109 src/prefs_quote.c:161

 msgid "Quotation mark"
 msgstr "Карактер за цитат"
 
 msgid "Quotation mark"
 msgstr "Карактер за цитат"
 

-#: src/prefs_quote.c:134
+#: src/prefs_quote.c:146

 msgid "Forward format"
 msgstr "Формат прослеђивања"
 
 msgid "Forward format"
 msgstr "Формат прослеђивања"
 

-#: src/prefs_quote.c:184
-msgid " Description of symbols... "
-msgstr " Опис симбола... "
-
-#: src/prefs_quote.c:193
+#: src/prefs_quote.c:215

 msgid "Quotation characters"
 msgstr "Карактери за цитат"
 
 msgid "Quotation characters"
 msgstr "Карактери за цитат"
 

-#: src/prefs_quote.c:208
+#: src/prefs_quote.c:230

 msgid "Treat these characters as quotation marks: "
 msgstr "Третирај ове карактере као ознаке за цитат: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Третирај ове карактере као ознаке за цитат: "
 

-#: src/prefs_quote.c:286
+#: src/prefs_quote.c:312

 msgid "Quoting"
 msgstr "Цитирање"
 
 msgid "Quoting"
 msgstr "Цитирање"
 

-#: src/prefs_receive.c:122
+#: src/prefs_receive.c:121

 msgid "External incorporation program"
 msgstr "Спољашњи програми за увоз"
 
 msgid "External incorporation program"
 msgstr "Спољашњи програми за увоз"
 

-#: src/prefs_receive.c:129
+#: src/prefs_receive.c:128

 msgid "Use external program for receiving mail"
 msgstr "Користи спољашњи програм за увоз поште"
 
 msgid "Use external program for receiving mail"
 msgstr "Користи спољашњи програм за увоз поште"
 

-#: src/prefs_receive.c:136
+#: src/prefs_receive.c:135

 msgid "Command"
 msgstr "Команда"
 
 msgid "Command"
 msgstr "Команда"
 

-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:144

 msgid "Automatic checking"
 msgstr "Аутоматска провера"
 
 msgid "Automatic checking"
 msgstr "Аутоматска провера"
 

-#: src/prefs_receive.c:156
-msgid "Automatically check for new mail"
-msgstr "Аутоматска провера поште"
-
-#: src/prefs_receive.c:158
-msgid "every"
-msgstr "на"
+#: src/prefs_receive.c:155
+msgid "Automatically check for new mail every"
+msgstr "Аутоматска провера поште на сваких"

 
 

-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:173

 msgid "Check for new mail on startup"
 msgstr "Провера поште при покретању програма"
 
 msgid "Check for new mail on startup"
 msgstr "Провера поште при покретању програма"
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:176

 msgid "Dialogs"
 msgstr "Дијалози"
 
 msgid "Dialogs"
 msgstr "Дијалози"
 

-#: src/prefs_receive.c:188
+#: src/prefs_receive.c:182

 msgid "Show receive dialog"
 msgstr "Приказ дијалога за преузимање порука"
 
 msgid "Show receive dialog"
 msgstr "Приказ дијалога за преузимање порука"
 

-#: src/prefs_receive.c:196 src/prefs_send.c:169 src/prefs_summaries.c:958
+#: src/prefs_receive.c:190 src/prefs_send.c:169 src/prefs_summaries.c:855

 msgid "Always"
 msgstr "Увек"
 
 msgid "Always"
 msgstr "Увек"
 

-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:191

 msgid "Only on manual receiving"
 msgstr "Само при ручној провери"
 
 msgid "Only on manual receiving"
 msgstr "Само при ручној провери"
 

-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:205

 msgid "Close receive dialog when finished"
 msgstr "Затварање дијалога за преузимање по завршетку преноса"
 
 msgid "Close receive dialog when finished"
 msgstr "Затварање дијалога за преузимање по завршетку преноса"
 

-#: src/prefs_receive.c:214
+#: src/prefs_receive.c:208

 msgid "Don't popup error dialog on receive error"
 msgstr "Не приказивати дијалог о грешци у случају настанка грешке"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Не приказивати дијалог о грешци у случају настанка грешке"
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:210

 msgid "After receiving new mail"
 msgstr "Након преузимања поште"
 
 msgid "After receiving new mail"
 msgstr "Након преузимања поште"
 

-#: src/prefs_receive.c:222
+#: src/prefs_receive.c:216

 msgid "Go to inbox"
 msgstr "Прелазак у „Сандуче“"
 
 msgid "Go to inbox"
 msgstr "Прелазак у „Сандуче“"
 

-#: src/prefs_receive.c:224
+#: src/prefs_receive.c:218

 msgid "Update all local folders"
 msgstr "Освежавање свих локалних директоријума"
 
 msgid "Update all local folders"
 msgstr "Освежавање свих локалних директоријума"
 

-#: src/prefs_receive.c:226
+#: src/prefs_receive.c:220

 msgid "Run command"
 msgstr "Извршавање наредбе"
 
 msgid "Run command"
 msgstr "Извршавање наредбе"
 

-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:229

 msgid "after automatic check"
 msgstr "након аутоматске провере"
 
 msgid "after automatic check"
 msgstr "након аутоматске провере"
 

-#: src/prefs_receive.c:237
+#: src/prefs_receive.c:231

 msgid "after manual check"
 msgstr "након ручне провере"
 
 msgid "after manual check"
 msgstr "након ручне провере"
 

-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:239

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -9239,11 +9709,11 @@ msgstr ""
 "Команда за извршавање:\n"
 "(%d за број нових порука)"
 
 "Команда за извршавање:\n"
 "(%d за број нових порука)"
 

-#: src/prefs_receive.c:371 src/prefs_send.c:337
+#: src/prefs_receive.c:365 src/prefs_send.c:337

 msgid "Mail Handling"
 msgstr "Управљање поштом"
 
 msgid "Mail Handling"
 msgstr "Управљање поштом"
 

-#: src/prefs_receive.c:372
+#: src/prefs_receive.c:366

 msgid "Receiving"
 msgstr "Преузимање"
 
 msgid "Receiving"
 msgstr "Преузимање"
 


@@ -9404,164 +9874,172 @@ msgstr ""
 msgid "Sending"
 msgstr "Слање порука"
 
 msgid "Sending"
 msgstr "Слање порука"
 

-#: src/prefs_spelling.c:105
+#: src/prefs_spelling.c:91

 msgid "Select dictionaries location"
 msgstr "Одаберите адресу речника"
 
 msgid "Select dictionaries location"
 msgstr "Одаберите адресу речника"
 

-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:126

 msgid "Pick color for misspelled word"
 msgstr "Одаберите боју за погрешно написане речи"
 
 msgid "Pick color for misspelled word"
 msgstr "Одаберите боју за погрешно написане речи"
 

-#: src/prefs_spelling.c:186
+#: src/prefs_spelling.c:183

 msgid "Enable spell checker"
 msgstr "Активна правописна провера"
 
 msgid "Enable spell checker"
 msgstr "Активна правописна провера"
 

-#: src/prefs_spelling.c:191
+#: src/prefs_spelling.c:188

 msgid "Enable alternate dictionary"
 msgstr "Омогућена употреба алтернативног речника"
 
 msgid "Enable alternate dictionary"
 msgstr "Омогућена употреба алтернативног речника"
 

-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194

 msgid "Faster switching with last used dictionary"
 msgstr "Бржи прелазак на последње коришћени речник."
 
 msgid "Faster switching with last used dictionary"
 msgstr "Бржи прелазак на последње коришћени речник."
 

-#: src/prefs_spelling.c:199
+#: src/prefs_spelling.c:196

 msgid "Path to dictionaries"
 msgstr "Путања до речника"
 
 msgid "Path to dictionaries"
 msgstr "Путања до речника"
 

-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:211

 msgid "Automatic spelling"
 msgstr "Аутоматска провера правописа"
 
 msgid "Automatic spelling"
 msgstr "Аутоматска провера правописа"
 

-#: src/prefs_spelling.c:226
+#: src/prefs_spelling.c:223

 msgid "Re-check message when changing dictionary"
 msgstr "Поновна провера поруке након промене речника"
 
 msgid "Re-check message when changing dictionary"
 msgstr "Поновна провера поруке након промене речника"
 

-#: src/prefs_spelling.c:230
+#: src/prefs_spelling.c:227

 msgid "Dictionary"
 msgstr "Речник"
 
 msgid "Dictionary"
 msgstr "Речник"
 

-#: src/prefs_spelling.c:243
+#: src/prefs_spelling.c:240

 msgid "Default dictionary"
 msgstr "Подразумевани речник"
 
 msgid "Default dictionary"
 msgstr "Подразумевани речник"
 

-#: src/prefs_spelling.c:261
+#: src/prefs_spelling.c:258
+msgid "Default alternate dictionary"
+msgstr "Алтернатива подразумеваног речника"
+
+#: src/prefs_spelling.c:277
+msgid "Check with both dictionaries"
+msgstr "Провера са оба речника"
+
+#: src/prefs_spelling.c:283

 msgid "Default suggestion mode"
 msgstr "Подразумевани препоручени режим"
 
 msgid "Default suggestion mode"
 msgstr "Подразумевани препоручени режим"
 

-#: src/prefs_spelling.c:283
+#: src/prefs_spelling.c:305

 msgid "Misspelled word color"
 msgstr "Боја погрешно написаних речи"
 
 msgid "Misspelled word color"
 msgstr "Боја погрешно написаних речи"
 

-#: src/prefs_spelling.c:297
+#: src/prefs_spelling.c:319

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Одаберите боју за погрешно написане речи. Користите црну за подвлачење."
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Одаберите боју за погрешно написане речи. Користите црну за подвлачење."
 

-#: src/prefs_spelling.c:402
+#: src/prefs_spelling.c:449

 msgid "Spell Checking"
 msgstr "Провера правописа"
 
 msgid "Spell Checking"
 msgstr "Провера правописа"
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr "скраћени назив назива дана у недељи"
 
 msgid "the full abbreviated weekday name"
 msgstr "скраћени назив назива дана у недељи"
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr "пун назив дана у недељи"
 
 msgid "the full weekday name"
 msgstr "пун назив дана у недељи"
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr "скраћени назив месеца"
 
 msgid "the abbreviated month name"
 msgstr "скраћени назив месеца"
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr "пун назив месеца"
 
 msgid "the full month name"
 msgstr "пун назив месеца"
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr "приоритетан датум и време тренутне локализације"
 
 msgid "the preferred date and time for the current locale"
 msgstr "приоритетан датум и време тренутне локализације"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr "формат века (година/100)"
 
 msgid "the century number (year/100)"
 msgstr "формат века (година/100)"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr "дан у месецу као децималан број"
 
 msgid "the day of the month as a decimal number"
 msgstr "дан у месецу као децималан број"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час као децималан број користећи 24-часовно време"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час као децималан број користећи 24-часовно време"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час као децималан број користећи 12-часовно време"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час као децималан број користећи 12-часовно време"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr "дан у години као децималан број"
 
 msgid "the day of the year as a decimal number"
 msgstr "дан у години као децималан број"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr "месец као децималан број"
 
 msgid "the month as a decimal number"
 msgstr "месец као децималан број"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr "минут као децималан број"
 
 msgid "the minute as a decimal number"
 msgstr "минут као децималан број"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr "АМ или ПМ"
 
 msgid "either AM or PM"
 msgstr "АМ или ПМ"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr "секунде као децималан број"
 
 msgid "the second as a decimal number"
 msgstr "секунде као децималан број"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr "дан у седмици као децималан број"
 
 msgid "the day of the week as a decimal number"
 msgstr "дан у седмици као децималан број"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr "приоритетан датум за тренутну локализацију"
 
 msgid "the preferred date for the current locale"
 msgstr "приоритетан датум за тренутну локализацију"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr "последње две цифре године"
 
 msgid "the last two digits of a year"
 msgstr "последње две цифре године"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr "година као децималан број"
 
 msgid "the year as a decimal number"
 msgstr "година као децималан број"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr "временска зона"
 
 msgid "the time zone or name or abbreviation"
 msgstr "временска зона"
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
+#: src/prefs_summaries.c:911

 msgid "Date format"
 msgstr "Формат датума"
 
 msgid "Date format"
 msgstr "Формат датума"
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr "Идентификатор"
 
 msgid "Specifier"
 msgstr "Идентификатор"
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr "Пример"
 
 msgid "Example"
 msgstr "Пример"
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Select key bindings"
 msgstr "Одаберите тастерске пречице"
 
 msgid "Select key bindings"
 msgstr "Одаберите тастерске пречице"
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr "Одаберите предефинисани скуп тастерских пречица:"
 
 msgid "Select preset:"
 msgstr "Одаберите предефинисани скуп тастерских пречица:"
 

-#: src/prefs_summaries.c:352 src/prefs_summaries.c:699
+#: src/prefs_summaries.c:353 src/prefs_summaries.c:700

 msgid "Old Sylpheed"
 msgstr "Стари Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Стари Sylpheed"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:361

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."


@@ -9569,129 +10047,125 @@ msgstr ""
 "Такође можете мењати пречице ставки менија притиском било\n"
 "ког тастера када је показивач миша на опцији менија."
 
 "Такође можете мењати пречице ставки менија притиском било\n"
 "ког тастера када је показивач миша на опцији менија."
 

-#: src/prefs_summaries.c:767
-msgid "Translate header names"
-msgstr "Превод назива заглавља"
-
-#: src/prefs_summaries.c:769
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"Називи уобичајених заглавља (попут „From:“ и „Subject:“) биће преведени на "
-"Ваш језик."
-
-#: src/prefs_summaries.c:773
+#: src/prefs_summaries.c:768

 msgid "Display unread number next to folder name"
 msgstr "Приказ броја непрочитаних порука иза назива директоријума"
 
 msgid "Display unread number next to folder name"
 msgstr "Приказ броја непрочитаних порука иза назива директоријума"
 

-#: src/prefs_summaries.c:780
+#: src/prefs_summaries.c:775

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Скраћивање назива дискусионе групе ако је дужи од"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Скраћивање назива дискусионе групе ако је дужи од"
 

-#: src/prefs_summaries.c:794
+#: src/prefs_summaries.c:789

 msgid "letters"
 msgstr "карактера"
 
 #: src/prefs_summaries.c:807
 msgid "letters"
 msgstr "карактера"
 
 #: src/prefs_summaries.c:807

-msgid "Display sender using address book"
-msgstr "Приказ пошиљаоца помоћу адресар"
-
-#: src/prefs_summaries.c:810
-msgid "Thread using subject in addition to standard headers"
-msgstr "Формирање нити расправе допуњујући стандардне делове заглавља темом"
-
-#: src/prefs_summaries.c:833
-msgid "Date format help"
-msgstr "Помоћ за формат датума"
-
-#: src/prefs_summaries.c:837
-msgid "Set displayed columns"
-msgstr "Колоне за приказ"
-
-#: src/prefs_summaries.c:845
-msgid " Folder list... "
-msgstr " Попис директоријума "
-
-#: src/prefs_summaries.c:853
-msgid " Message list... "
-msgstr " Попис порука "
-
-#: src/prefs_summaries.c:874
-msgid "Execute immediately when moving or deleting messages"
-msgstr "Перманентно премештање или уклањање порука (без чекања)"
-
-#: src/prefs_summaries.c:876
-msgid "Messages will be marked until execution if this is turned off"
-msgstr ""
-"Ако је ова опција искључена, порука ће до следећег извршавања бити само "
-"обележена за акцију"
-
-#: src/prefs_summaries.c:882
-msgid "Confirm before marking all mails in a folder as read"
-msgstr "Потврда пре обележавања свих порука у директоријуму прочитаним"
-
-#: src/prefs_summaries.c:886
-msgid "Always open message when selected"
-msgstr "Порука се при избору увек отвара"
+msgid "Message list"
+msgstr "Попис порука"

 
 

-#: src/prefs_summaries.c:890
-msgid "Only mark message as read when opened in a new window"
-msgstr "Обележавање поруке прочитаном само када се отвори у новом прозору"
-
-#: src/prefs_summaries.c:903
+#: src/prefs_summaries.c:817

 msgid "When entering a folder"
 msgstr "При улазу у директоријум"
 
 msgid "When entering a folder"
 msgstr "При улазу у директоријум"
 

-#: src/prefs_summaries.c:919
+#: src/prefs_summaries.c:825

 msgid "Do nothing"
 msgstr "Не чини ништа"
 
 msgid "Do nothing"
 msgstr "Не чини ништа"
 

-#: src/prefs_summaries.c:920
+#: src/prefs_summaries.c:826

 msgid "Select first unread (or new or marked) message"
 msgstr "Избор прве непрочитане (или нове или означене) поруке"
 
 msgid "Select first unread (or new or marked) message"
 msgstr "Избор прве непрочитане (или нове или означене) поруке"
 

-#: src/prefs_summaries.c:922
+#: src/prefs_summaries.c:828

 msgid "Select first unread (or marked or new) message"
 msgstr "Избор прве непрочитане (или означене или нове) поруке"
 
 msgid "Select first unread (or marked or new) message"
 msgstr "Избор прве непрочитане (или означене или нове) поруке"
 

-#: src/prefs_summaries.c:924
+#: src/prefs_summaries.c:830

 msgid "Select first new (or unread or marked) message"
 msgstr "Избор прве нове (или непрочитане или означене) поруке"
 
 msgid "Select first new (or unread or marked) message"
 msgstr "Избор прве нове (или непрочитане или означене) поруке"
 

-#: src/prefs_summaries.c:926
+#: src/prefs_summaries.c:832

 msgid "Select first new (or marked or unread) message"
 msgstr "Избор прве нове (или означене или непрочитане) поруке"
 
 msgid "Select first new (or marked or unread) message"
 msgstr "Избор прве нове (или означене или непрочитане) поруке"
 

-#: src/prefs_summaries.c:928
+#: src/prefs_summaries.c:834

 msgid "Select first marked (or new or unread) message"
 msgstr "Избор прве означене (или нове или непрочитане) поруке"
 
 msgid "Select first marked (or new or unread) message"
 msgstr "Избор прве означене (или нове или непрочитане) поруке"
 

-#: src/prefs_summaries.c:930
+#: src/prefs_summaries.c:836

 msgid "Select first marked (or unread or new) message"
 msgstr "Избор прве означене (или непрочитане или нове) поруке"
 
 msgid "Select first marked (or unread or new) message"
 msgstr "Избор прве означене (или непрочитане или нове) поруке"
 

-#: src/prefs_summaries.c:942
+#: src/prefs_summaries.c:847

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Приказ дијалога „Нема непрочитаних (или нових) порука“"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "Приказ дијалога „Нема непрочитаних (или нових) порука“"
 

-#: src/prefs_summaries.c:959
+#: src/prefs_summaries.c:856

 msgid "Assume 'Yes'"
 msgstr "Подразумева се „Да“"
 
 msgid "Assume 'Yes'"
 msgstr "Подразумева се „Да“"
 

-#: src/prefs_summaries.c:961
+#: src/prefs_summaries.c:858

 msgid "Assume 'No'"
 msgstr "Подразумева се „Не“"
 
 msgid "Assume 'No'"
 msgstr "Подразумева се „Не“"
 

-#: src/prefs_summaries.c:970
+#: src/prefs_summaries.c:866
+msgid "Always open message when selected"
+msgstr "Порука се при избору увек отвара"
+
+#: src/prefs_summaries.c:869
+msgid "Thread using subject in addition to standard headers"
+msgstr "Формирање нити расправе допуњујући стандардне делове заглавља темом"
+
+#: src/prefs_summaries.c:875
+msgid "Execute immediately when moving or deleting messages"
+msgstr "Перманентно премештање или уклањање порука (без чекања)"
+
+#: src/prefs_summaries.c:877
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr "Одлаже премештање, умножавање и уклањање порука док се не кликне на „Линија алата/Изврши одабране акције“"
+
+#: src/prefs_summaries.c:882
+msgid "Only mark message as read when opened in a new window"
+msgstr "Обележавање поруке прочитаном само када се отвори у новом прозору"
+
+#: src/prefs_summaries.c:889
+msgid "Mark messages as read after"
+msgstr "Обележавање поруке као „прочитано“ након"
+
+#: src/prefs_summaries.c:905
+msgid "Display sender using address book"
+msgstr "Приказ пошиљаоца помоћу адресар"
+
+#: src/prefs_summaries.c:937
+msgid "Date format help"
+msgstr "Помоћ за формат датума"
+
+#: src/prefs_summaries.c:955
+msgid "Confirm before marking all mails in a folder as read"
+msgstr "Потврда пре обележавања свих порука у директоријуму прочитаним"
+
+#: src/prefs_summaries.c:958
+msgid "Translate header names"
+msgstr "Превод назива заглавља"
+
+#: src/prefs_summaries.c:960
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"Називи уобичајених заглавља (попут „From:“ и „Subject:“) биће преведени на "
+"Ваш језик."
+
+#: src/prefs_summaries.c:967

 msgid " Set key bindings... "
 msgstr " Одаберите предефинисани скуп тастерских пречица... "
 
 msgid " Set key bindings... "
 msgstr " Одаберите предефинисани скуп тастерских пречица... "
 

-#: src/prefs_summaries.c:1077
+#: src/prefs_summaries.c:1079

 msgid "Summaries"
 msgstr "Листа порука"
 
 msgid "Summaries"
 msgstr "Листа порука"
 

-#: src/prefs_summary_column.c:81
+#: src/prefs_summary_column.c:81 src/summaryview.c:2360

 msgid "Attachment"
 msgstr "Прилог"
 
 msgid "Attachment"
 msgstr "Прилог"
 


@@ -9715,35 +10189,31 @@ msgstr ""
 msgid "This name is used as the Menu item"
 msgstr "Овај назив се користи за ставку менија"
 
 msgid "This name is used as the Menu item"
 msgstr "Овај назив се користи за ставку менија"
 

-#: src/prefs_template.c:275
+#: src/prefs_template.c:286

 msgid " Symbols... "
 msgstr " Симболи... "
 
 msgid " Symbols... "
 msgstr " Симболи... "
 

-#: src/prefs_template.c:304
+#: src/prefs_template.c:315

 msgid "Template configuration"
 msgstr "Подешавање шабона"
 
 msgid "Template configuration"
 msgstr "Подешавање шабона"
 

-#: src/prefs_template.c:515
-msgid "Template format error."
-msgstr "Грешка у формату шаблона."
-
-#: src/prefs_template.c:525
+#: src/prefs_template.c:557

 msgid "Template name is not set."
 msgstr "Назив шаблона није одређен."
 
 msgid "Template name is not set."
 msgstr "Назив шаблона није одређен."
 

-#: src/prefs_template.c:614
+#: src/prefs_template.c:667

 msgid "Delete template"
 msgstr "Обриши шаблон"
 
 msgid "Delete template"
 msgstr "Обриши шаблон"
 

-#: src/prefs_template.c:615
+#: src/prefs_template.c:668

 msgid "Do you really want to delete this template?"
 msgstr "Да ли заиста желите да обришете овај шаблон?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Да ли заиста желите да обришете овај шаблон?"
 

-#: src/prefs_template.c:752
+#: src/prefs_template.c:805

 msgid "Current templates"
 msgstr "Постојећи шаблони"
 
 msgid "Current templates"
 msgstr "Постојећи шаблони"
 

-#: src/prefs_template.c:777
+#: src/prefs_template.c:830

 msgid "Template"
 msgstr "Шаблон"
 
 msgid "Template"
 msgstr "Шаблон"
 


@@ -9845,10 +10315,6 @@ msgstr ""
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d тема доступно (%d корисничких, %d системских, 1 интерна)"
 
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "%d тема доступно (%d корисничких, %d системских, 1 интерна)"
 

-#: src/prefs_themes.c:706
-msgid "The Sylpheed-Claws Team"
-msgstr "Sylpheed-Claws тим"
-

 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"


@@ -9859,7 +10325,7 @@ msgid "No info file available for this theme"
 msgstr "Нема доступне информационе датотеке за ову тему"
 
 #: src/prefs_themes.c:732
 msgstr "Нема доступне информационе датотеке за ову тему"
 
 #: src/prefs_themes.c:732

-msgid "Error: can't get theme status"
+msgid "Error: couldn't get theme status"

 msgstr "Грешка: немогуће распознавање статуса теме"
 
 #: src/prefs_themes.c:756
 msgstr "Грешка: немогуће распознавање статуса теме"
 
 #: src/prefs_themes.c:756


@@ -9924,8 +10390,8 @@ msgid "Message view toolbar configuration"
 msgstr "Подешавање линије алата прозора за преглед порука"
 
 #: src/prefs_toolbar.c:643
 msgstr "Подешавање линије алата прозора за преглед порука"
 
 #: src/prefs_toolbar.c:643

-msgid "Sylpheed-Claws Action"
-msgstr "Sylpheed-Claws Акција"
+msgid "Claws Mail Action"
+msgstr "Claws Mail Акција"

 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"
 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"


@@ -9995,10 +10461,6 @@ msgstr "Прелом текста"
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
 msgid "Unknown error"
 msgstr "Непозната грешка"
 

-#: src/privacy.c:211 src/privacy.c:215 src/privacy.c:232 src/privacy.c:236
-msgid "No signature found"
-msgstr "Потпис није пронађен"
-

 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Нема доступних информација"
 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "Нема доступних информација"


@@ -10007,37 +10469,33 @@ msgstr "Нема доступних информација"
 msgid "No recipient keys defined."
 msgstr "Нису одређени кључеви примаоца."
 
 msgid "No recipient keys defined."
 msgstr "Нису одређени кључеви примаоца."
 

-#: src/procmime.c:298 src/procmime.c:300
+#: src/procmime.c:340 src/procmime.c:342

 msgid "[Error decoding BASE64]\n"
 msgstr "[Грешка при декодирању BASE64]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[Грешка при декодирању BASE64]\n"
 

-#: src/procmsg.c:907
-msgid "Already trying to send\n"
-msgstr "Већ се покушава слање\n"
-
-#: src/procmsg.c:910
+#: src/procmsg.c:918 src/procmsg.c:921

 msgid "Already trying to send."
 msgstr "Већ се покушава слање."
 
 msgid "Already trying to send."
 msgstr "Већ се покушава слање."
 

-#: src/procmsg.c:1498
+#: src/procmsg.c:1515

 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Није могуће отворити датотеку %s."
 
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "Није могуће отворити датотеку %s."
 

-#: src/procmsg.c:1592
+#: src/procmsg.c:1613

 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Није могуће енкриптовати поруку: %s"
 
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "Није могуће енкриптовати поруку: %s"
 

-#: src/procmsg.c:1625
+#: src/procmsg.c:1646

 msgid "Queued message header is broken."
 msgstr "Заглавље припремљене поруке је оштећено."
 
 msgid "Queued message header is broken."
 msgstr "Заглавље припремљене поруке је оштећено."
 

-#: src/procmsg.c:1646
+#: src/procmsg.c:1667

 msgid "An error happened during SMTP session."
 msgstr "настала је грешка у току SMTP сесије."
 
 msgid "An error happened during SMTP session."
 msgstr "настала је грешка у току SMTP сесије."
 

-#: src/procmsg.c:1660
+#: src/procmsg.c:1681

 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."


@@ -10045,30 +10503,30 @@ msgstr ""
 "Одређени налог није пронађен за слање. Зато је дошло до грешке у току SMTP "
 "сесије."
 
 "Одређени налог није пронађен за слање. Зато је дошло до грешке у току SMTP "
 "сесије."
 

-#: src/procmsg.c:1668
+#: src/procmsg.c:1689

 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "

-"generated by Sylpheed-Claws."
+"generated by Claws Mail."

 msgstr ""
 "Није могуће разазнавање информација за слање. Можда е-порука није направљена "
 msgstr ""
 "Није могуће разазнавање информација за слање. Можда е-порука није направљена "

-"Sylpheed-Claws-ом."
+"Claws Mail-ом."

 
 

-#: src/procmsg.c:1686
-msgid "Could not create temporary file for news sending."
-msgstr "Ð\9dиÑ\98е могÑ\83Ñ\9bе пÑ\80авÑ\99еÑ\9aе пÑ\80ивÑ\80емене даÑ\82оÑ\82еке за Ñ\81лаÑ\9aе поÑ\80Ñ\83ке на диÑ\81кÑ\83Ñ\81ионÑ\83 гÑ\80Ñ\83пÑ\83."
+#: src/procmsg.c:1707
+msgid "Couldn't create temporary file for news sending."
+msgstr "Није могуће прављење привремене датотеке за слање на дискусиону групу."

 
 

-#: src/procmsg.c:1699
+#: src/procmsg.c:1720

 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Настала је грешка при писању привремене датотеке за слање поруке на "
 "дискусиону групу."
 
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Настала је грешка при писању привремене датотеке за слање поруке на "
 "дискусиону групу."
 

-#: src/procmsg.c:1713
+#: src/procmsg.c:1734

 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Настала је грешка при слању поруке на %s."
 
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "Настала је грешка при слању поруке на %s."
 

-#: src/procmsg.c:2190
+#: src/procmsg.c:2214

 msgid "Filtering messages...\n"
 msgstr "Филтрирање порука...\n"
 
 msgid "Filtering messages...\n"
 msgstr "Филтрирање порука...\n"
 


@@ -10112,55 +10570,71 @@ msgstr "цитирано тело поруке без потписа"
 msgid "cursor position"
 msgstr "положај курсора"
 
 msgid "cursor position"
 msgstr "положај курсора"
 

+#: src/quote_fmt.c:58
+msgid "Account property: your name"
+msgstr "Поставке налога: Ваше име"
+

 #: src/quote_fmt.c:59
 #: src/quote_fmt.c:59

+msgid "Account property: your email address"
+msgstr "Поставке налога: адреса Ваше е-поште"
+
+#: src/quote_fmt.c:60
+msgid "Account property: account name"
+msgstr "Поставке налога: назив налога"
+
+#: src/quote_fmt.c:61
+msgid "Account property: organization"
+msgstr "Поставке налога: организација"
+
+#: src/quote_fmt.c:63

 msgid "literal backslash"
 msgstr "карактер „\\“ (опадајућа коса црта)"
 
 msgid "literal backslash"
 msgstr "карактер „\\“ (опадајућа коса црта)"
 

-#: src/quote_fmt.c:60
+#: src/quote_fmt.c:64

 msgid "literal question mark"
 msgstr "карактер „?“ (упитник)"
 
 msgid "literal question mark"
 msgstr "карактер „?“ (упитник)"
 

-#: src/quote_fmt.c:61
+#: src/quote_fmt.c:65

 msgid "literal exclamation mark"
 msgstr "карактер „!“ (узвичник)"
 
 msgid "literal exclamation mark"
 msgstr "карактер „!“ (узвичник)"
 

-#: src/quote_fmt.c:62
+#: src/quote_fmt.c:66

 msgid "literal pipe"
 msgstr "карактер „|“ (усправна линија, цев)"
 
 msgid "literal pipe"
 msgstr "карактер „|“ (усправна линија, цев)"
 

-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:67

 msgid "literal opening curly brace"
 msgstr "карактер „{“ (отворена витичаста заграда)"
 
 msgid "literal opening curly brace"
 msgstr "карактер „{“ (отворена витичаста заграда)"
 

-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:68

 msgid "literal closing curly brace"
 msgstr "карактер „}“ (затворена витичаста заграда)"
 
 msgid "literal closing curly brace"
 msgstr "карактер „}“ (затворена витичаста заграда)"
 

-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:69

 msgid "tab"
 msgstr "табулатор"
 
 msgid "tab"
 msgstr "табулатор"
 

-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:70

 msgid "linefeed"
 msgstr "почетак реда"
 
 msgid "linefeed"
 msgstr "почетак реда"
 

-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:72

 msgid ""
 "insert expr if x is set\n"
 msgid ""
 "insert expr if x is set\n"

-"(where x is one of the dfNFLIstcnri characters)"
+"(where x is one of the dfNFLIstcnri characters or af, ao)"

 msgstr ""
 "убаци expr ако је дато x\n"
 msgstr ""
 "убаци expr ако је дато x\n"

-"(где је x неки од карактера dfNFLIstcnri)"
+"(где је x неки од карактера „dfNFLIstcnri“ или „af, ao“)"

 
 

-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:73

 msgid ""
 "insert expr if x is not set\n"
 msgid ""
 "insert expr if x is not set\n"

-"(where x is one of the dfNFLIstcnri characters)"
+"(where x is one of the dfNFLIstcnri characters or af, ao)"

 msgstr ""
 msgstr ""

-"убаци expr ако је дато x\n"
-"(где је x један од карактера dfNFLIstcnri)"
+"убаци expr ако није дато x\n"
+"(где је x један од карактера „dfNFLIstcnri“ или „af, ao“)"

 
 

-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:74

 msgid ""
 "insert file:\n"
 "sub_expr is evaluated as a filename to insert"
 msgid ""
 "insert file:\n"
 "sub_expr is evaluated as a filename to insert"


@@ -10168,7 +10642,7 @@ msgstr ""
 "уметни датотеку:\n"
 "sub_expr се третира као назив даотеке за уметање"
 
 "уметни датотеку:\n"
 "sub_expr се третира као назив даотеке за уметање"
 

-#: src/quote_fmt.c:71
+#: src/quote_fmt.c:75

 msgid ""
 "insert program output:\n"
 "sub_expr is evaluated as a command-line to get\n"
 msgid ""
 "insert program output:\n"
 "sub_expr is evaluated as a command-line to get\n"


@@ -10178,7 +10652,7 @@ msgstr ""
 "sub_expr се третира као наредба од које\n"
 "ће бити преузет резултат"
 
 "sub_expr се третира као наредба од које\n"
 "ће бити преузет резултат"
 

-#: src/quote_fmt.c:72
+#: src/quote_fmt.c:76

 msgid ""
 "insert user input:\n"
 "sub_expr is a variable to be replaced by\n"
 msgid ""
 "insert user input:\n"
 "sub_expr is a variable to be replaced by\n"


@@ -10188,15 +10662,15 @@ msgstr ""
 "sub_expr је променљива која се замењује\n"
 "текстом који унесе корисник"
 
 "sub_expr је променљива која се замењује\n"
 "текстом који унесе корисник"
 

-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:78

 msgid "terms definition:"
 msgstr "дефиниција термина:"
 
 msgid "terms definition:"
 msgstr "дефиниција термина:"
 

-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:79

 msgid "text that can contain any of the symbols above"
 msgstr "текст који садржи било који од следећих симбола"
 
 msgid "text that can contain any of the symbols above"
 msgstr "текст који садржи било који од следећих симбола"
 

-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:80

 msgid ""
 "text that can contain any of the symbols above\n"
 "but ?x{}, !x{}, |f{}, |p{} and |i{}"
 msgid ""
 "text that can contain any of the symbols above\n"
 "but ?x{}, !x{}, |f{}, |p{} and |i{}"


@@ -10204,20 +10678,20 @@ msgstr ""
 "текст који садржи било који од следећих симбола\n"
 "осим ?x{}, !x{}, |f{}, |p{} и |i{}"
 
 "текст који садржи било који од следећих симбола\n"
 "осим ?x{}, !x{}, |f{}, |p{} и |i{}"
 

-#: src/quote_fmt.c:84
+#: src/quote_fmt.c:88

 msgid "Description of symbols"
 msgstr "Опис симбола"
 
 msgid "Description of symbols"
 msgstr "Опис симбола"
 

-#: src/quote_fmt.c:85
+#: src/quote_fmt.c:89

 msgid "The following symbols can be used:"
 msgstr "Можете користити следеће знакове:"
 
 msgid "The following symbols can be used:"
 msgstr "Можете користити следеће знакове:"
 

-#: src/quote_fmt_parse.y:458
+#: src/quote_fmt_parse.y:464

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Унесите текст да замени „%s“"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "Унесите текст да замени „%s“"
 

-#: src/quote_fmt_parse.y:459
+#: src/quote_fmt_parse.y:465

 msgid "Enter variable"
 msgstr "Унос променљиве"
 
 msgid "Enter variable"
 msgstr "Унос променљиве"
 


@@ -10228,7 +10702,7 @@ msgstr "Шаљем поруку користећи наредбу %s\n"
 
 #: src/send_message.c:151
 #, c-format
 
 #: src/send_message.c:151
 #, c-format

-msgid "Can't execute command: %s"
+msgid "Couldn't execute command: %s"

 msgstr "Није могуће извршење наредбе: %s"
 
 #: src/send_message.c:186
 msgstr "Није могуће извршење наредбе: %s"
 
 #: src/send_message.c:186


@@ -10294,15 +10768,15 @@ msgstr "Затварање конекције..."
 msgid "Sending message (%d / %d bytes)"
 msgstr "Слање поруке (%d / %d бајтова)"
 
 msgid "Sending message (%d / %d bytes)"
 msgstr "Слање поруке (%d / %d бајтова)"
 

-#: src/send_message.c:545
+#: src/send_message.c:555

 msgid "Sending message"
 msgstr "Слање припремљене поруке"
 
 msgid "Sending message"
 msgstr "Слање припремљене поруке"
 

-#: src/send_message.c:591 src/send_message.c:611
+#: src/send_message.c:613 src/send_message.c:633

 msgid "Error occurred while sending the message."
 msgstr "Настала је грешка при слању поруке."
 
 msgid "Error occurred while sending the message."
 msgstr "Настала је грешка при слању поруке."
 

-#: src/send_message.c:594
+#: src/send_message.c:616

 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"


@@ -10340,405 +10814,405 @@ msgstr "%s - Извор"
 msgid "Saved SSL Certificates"
 msgstr "Сачувани SSL сертификати"
 
 msgid "Saved SSL Certificates"
 msgstr "Сачувани SSL сертификати"
 

-#: src/ssl_manager.c:386
+#: src/ssl_manager.c:428

 msgid "Delete certificate"
 msgstr "Обриши сертификат"
 
 msgid "Delete certificate"
 msgstr "Обриши сертификат"
 

-#: src/ssl_manager.c:387
+#: src/ssl_manager.c:429

 msgid "Do you really want to delete this certificate?"
 msgstr "Да ли заиста желите да обришете овај сертификат?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Да ли заиста желите да обришете овај сертификат?"
 

-#: src/summary_search.c:193
+#: src/summary_search.c:230

 msgid "Search messages"
 msgstr "Претражи поруку(е)"
 
 msgid "Search messages"
 msgstr "Претражи поруку(е)"
 

-#: src/summary_search.c:215
+#: src/summary_search.c:252

 msgid "Match any of the following"
 msgstr "Поклапање било ког од следећих"
 
 msgid "Match any of the following"
 msgstr "Поклапање било ког од следећих"
 

-#: src/summary_search.c:216
+#: src/summary_search.c:253

 msgid "Match all of the following"
 msgstr "Поклапање свих следећих"
 
 msgid "Match all of the following"
 msgstr "Поклапање свих следећих"
 

-#: src/summary_search.c:275
+#: src/summary_search.c:352

 msgid "From:"
 msgstr "Аутор:"
 
 msgid "From:"
 msgstr "Аутор:"
 

-#: src/summary_search.c:296
+#: src/summary_search.c:373

 msgid "Body:"
 msgstr "Тело:"
 
 msgid "Body:"
 msgstr "Тело:"
 

-#: src/summary_search.c:303
+#: src/summary_search.c:380

 msgid "Condition:"
 msgstr "Услов:"
 
 msgid "Condition:"
 msgstr "Услов:"
 

-#: src/summary_search.c:333
+#: src/summary_search.c:410

 msgid "Find _all"
 msgstr "Пронађи _све"
 
 msgid "Find _all"
 msgstr "Пронађи _све"
 

-#: src/summary_search.c:529
+#: src/summary_search.c:645

 msgid "Beginning of list reached; continue from end?"
 msgstr "Дошао сам до почетка листе. Да наставим од краја?"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "Дошао сам до почетка листе. Да наставим од краја?"
 

-#: src/summary_search.c:531
+#: src/summary_search.c:647

 msgid "End of list reached; continue from beginning?"
 msgstr "Дошао сам до краја листе. Да наставим од почетка?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Дошао сам до краја листе. Да наставим од почетка?"
 

-#: src/summaryview.c:416
+#: src/summaryview.c:417

 msgid "/_Reply"
 msgstr "/_Одговор"
 
 msgid "/_Reply"
 msgstr "/_Одговор"
 

-#: src/summaryview.c:417
+#: src/summaryview.c:418

 msgid "/Repl_y to"
 msgstr "/О_дговор"
 
 msgid "/Repl_y to"
 msgstr "/О_дговор"
 

-#: src/summaryview.c:418
+#: src/summaryview.c:419

 msgid "/Repl_y to/_all"
 msgstr "/О_дговор/_Свима"
 
 msgid "/Repl_y to/_all"
 msgstr "/О_дговор/_Свима"
 

-#: src/summaryview.c:419
+#: src/summaryview.c:420

 msgid "/Repl_y to/_sender"
 msgstr "/О_дговор/_Аутору"
 
 msgid "/Repl_y to/_sender"
 msgstr "/О_дговор/_Аутору"
 

-#: src/summaryview.c:420
+#: src/summaryview.c:421

 msgid "/Repl_y to/mailing _list"
 msgstr "/О_дговор/На _дописно друштво"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/О_дговор/На _дописно друштво"
 

-#: src/summaryview.c:423 src/toolbar.c:234
+#: src/summaryview.c:424 src/toolbar.c:239

 msgid "/_Forward"
 msgstr "/Прос_леди"
 
 msgid "/_Forward"
 msgstr "/Прос_леди"
 

-#: src/summaryview.c:424 src/toolbar.c:235
+#: src/summaryview.c:425 src/toolbar.c:240

 msgid "/For_ward as attachment"
 msgstr "/Прос_леди као прилог"
 
 msgid "/For_ward as attachment"
 msgstr "/Прос_леди као прилог"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:426

 msgid "/Redirect"
 msgstr "/Преу_смери"
 
 msgid "/Redirect"
 msgstr "/Преу_смери"
 

-#: src/summaryview.c:427
+#: src/summaryview.c:428

 msgid "/M_ove..."
 msgstr "/Пре_мести"
 
 msgid "/M_ove..."
 msgstr "/Пре_мести"
 

-#: src/summaryview.c:428
+#: src/summaryview.c:429

 msgid "/_Copy..."
 msgstr "/Умно_жи"
 
 msgid "/_Copy..."
 msgstr "/Умно_жи"
 

-#: src/summaryview.c:429
+#: src/summaryview.c:430

 msgid "/Move to _trash"
 msgstr "/Премести у _смеће"
 
 msgid "/Move to _trash"
 msgstr "/Премести у _смеће"
 

-#: src/summaryview.c:430
+#: src/summaryview.c:431

 msgid "/_Delete..."
 msgstr "/_Обриши..."
 
 msgid "/_Delete..."
 msgstr "/_Обриши..."
 

-#: src/summaryview.c:432
+#: src/summaryview.c:433

 msgid "/_Mark"
 msgstr "/Обележава_ње"
 
 msgid "/_Mark"
 msgstr "/Обележава_ње"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:434

 msgid "/_Mark/_Mark"
 msgstr "/Обележава_ње/_Означи"
 
 msgid "/_Mark/_Mark"
 msgstr "/Обележава_ње/_Означи"
 

-#: src/summaryview.c:434
+#: src/summaryview.c:435

 msgid "/_Mark/_Unmark"
 msgstr "/Обележава_ње/Уклони о_знаку"
 
 msgid "/_Mark/_Unmark"
 msgstr "/Обележава_ње/Уклони о_знаку"
 

-#: src/summaryview.c:435 src/summaryview.c:441 src/summaryview.c:444
+#: src/summaryview.c:436 src/summaryview.c:442 src/summaryview.c:445

 msgid "/_Mark/---"
 msgstr "/Обележава_ње/---"
 
 msgid "/_Mark/---"
 msgstr "/Обележава_ње/---"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:437

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Обележава_ње/_Непрочитано"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Обележава_ње/_Непрочитано"
 

-#: src/summaryview.c:437
+#: src/summaryview.c:438

 msgid "/_Mark/Mark as rea_d"
 msgstr "/Обележава_ње/_Прочитано"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Обележава_ње/_Прочитано"
 

-#: src/summaryview.c:438
+#: src/summaryview.c:439

 msgid "/_Mark/Mark all read"
 msgstr "/Обележава_ње/_Све прочитано"
 
 msgid "/_Mark/Mark all read"
 msgstr "/Обележава_ње/_Све прочитано"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:440

 msgid "/_Mark/Ignore thread"
 msgstr "/Обележава_ње/_Игнориши разговор"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/Обележава_ње/_Игнориши разговор"
 

-#: src/summaryview.c:440
+#: src/summaryview.c:441

 msgid "/_Mark/Unignore thread"
 msgstr "/Обележава_ње/Укини и_гнорисање разговора"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/Обележава_ње/Укини и_гнорисање разговора"
 

-#: src/summaryview.c:442
+#: src/summaryview.c:443

 msgid "/_Mark/Mark as _spam"
 msgstr "/Обележава_ње/Порука _је спем"
 
 msgid "/_Mark/Mark as _spam"
 msgstr "/Обележава_ње/Порука _је спем"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:444

 msgid "/_Mark/Mark as _ham"
 msgstr "/Обележава_ње/Порука _није спем"
 
 msgid "/_Mark/Mark as _ham"
 msgstr "/Обележава_ње/Порука _није спем"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:446

 msgid "/_Mark/Lock"
 msgstr "/Обележава_ње/За_кључано"
 
 msgid "/_Mark/Lock"
 msgstr "/Обележава_ње/За_кључано"
 

-#: src/summaryview.c:446
+#: src/summaryview.c:447

 msgid "/_Mark/Unlock"
 msgstr "/Обележава_ње/Отк_ључано"
 
 msgid "/_Mark/Unlock"
 msgstr "/Обележава_ње/Отк_ључано"
 

-#: src/summaryview.c:447
+#: src/summaryview.c:448

 msgid "/Color la_bel"
 msgstr "/_Боја поруке"
 
 msgid "/Color la_bel"
 msgstr "/_Боја поруке"
 

-#: src/summaryview.c:450
+#: src/summaryview.c:451

 msgid "/Add sender to address boo_k"
 msgstr "/Додај аутора у _адресар"
 
 msgid "/Add sender to address boo_k"
 msgstr "/Додај аутора у _адресар"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:453

 msgid "/Create f_ilter rule"
 msgstr "/Ново правило _филтера"
 
 msgid "/Create f_ilter rule"
 msgstr "/Ново правило _филтера"
 

-#: src/summaryview.c:453
+#: src/summaryview.c:454

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Ново правило _филтера/Ауто_матски"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Ново правило _филтера/Ауто_матски"
 

-#: src/summaryview.c:455
+#: src/summaryview.c:456

 msgid "/Create f_ilter rule/by _From"
 msgstr "/Ново правило _филтера/по _аутору"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Ново правило _филтера/по _аутору"
 

-#: src/summaryview.c:457
+#: src/summaryview.c:458

 msgid "/Create f_ilter rule/by _To"
 msgstr "/Ново правило _филтера/по _примаоцу"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Ново правило _филтера/по _примаоцу"
 

-#: src/summaryview.c:459
+#: src/summaryview.c:460

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Ново правило _филтера/по _теми"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Ново правило _филтера/по _теми"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:462

 msgid "/Create processing rule"
 msgstr "/Ново правило за об_раду"
 
 msgid "/Create processing rule"
 msgstr "/Ново правило за об_раду"
 

-#: src/summaryview.c:462
+#: src/summaryview.c:463

 msgid "/Create processing rule/_Automatically"
 msgstr "/Ново правило за об_раду/Ауто_матски"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/Ново правило за об_раду/Ауто_матски"
 

-#: src/summaryview.c:464
+#: src/summaryview.c:465

 msgid "/Create processing rule/by _From"
 msgstr "/Ново правило за об_раду/по _аутору"
 
 msgid "/Create processing rule/by _From"
 msgstr "/Ново правило за об_раду/по _аутору"
 

-#: src/summaryview.c:466
+#: src/summaryview.c:467

 msgid "/Create processing rule/by _To"
 msgstr "/Ново правило за об_раду/по _примаоцу"
 
 msgid "/Create processing rule/by _To"
 msgstr "/Ново правило за об_раду/по _примаоцу"
 

-#: src/summaryview.c:468
+#: src/summaryview.c:469

 msgid "/Create processing rule/by _Subject"
 msgstr "/Ново правило за об_раду/по _теми"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/Ново правило за об_раду/по _теми"
 

-#: src/summaryview.c:474
+#: src/summaryview.c:475

 msgid "/_View/Message _source"
 msgstr "/П_реглед/И_зворна порука"
 
 msgid "/_View/Message _source"
 msgstr "/П_реглед/И_зворна порука"
 

-#: src/summaryview.c:475
+#: src/summaryview.c:476

 msgid "/_View/All _headers"
 msgstr "/П_реглед/Комплетно _заглавље"
 
 msgid "/_View/All _headers"
 msgstr "/П_реглед/Комплетно _заглавље"
 

-#: src/summaryview.c:478
+#: src/summaryview.c:479

 msgid "/_Print..."
 msgstr "/_Штампа..."
 
 msgid "/_Print..."
 msgstr "/_Штампа..."
 

-#: src/summaryview.c:558
+#: src/summaryview.c:585

 msgid "Toggle quick search bar"
 msgstr "Приказ/скривање поље за брзу претрагу"
 
 msgid "Toggle quick search bar"
 msgstr "Приказ/скривање поље за брзу претрагу"
 

-#: src/summaryview.c:932
+#: src/summaryview.c:963

 msgid "Process mark"
 msgstr "Процесирање означених порука"
 
 msgid "Process mark"
 msgstr "Процесирање означених порука"
 

-#: src/summaryview.c:933
+#: src/summaryview.c:964

 msgid "Some marks are left. Process them?"
 msgstr "Заостале су неке неизвршене акције. Да ли да их довршим?"
 
 msgid "Some marks are left. Process them?"
 msgstr "Заостале су неке неизвршене акције. Да ли да их довршим?"
 

-#: src/summaryview.c:990
+#: src/summaryview.c:1021

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Претражујем директоријум (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Претражујем директоријум (%s)..."
 

-#: src/summaryview.c:1463 src/summaryview.c:1515
+#: src/summaryview.c:1509 src/summaryview.c:1561

 msgid "No more unread messages"
 msgstr "Нема више непрочитаних порука"
 
 msgid "No more unread messages"
 msgstr "Нема више непрочитаних порука"
 

-#: src/summaryview.c:1464
+#: src/summaryview.c:1510

 msgid "No unread message found. Search from the end?"
 msgstr "Нема непрочитаних порука. Да наставим претрагу од краја?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Нема непрочитаних порука. Да наставим претрагу од краја?"
 

-#: src/summaryview.c:1476 src/summaryview.c:1528 src/summaryview.c:1575
-#: src/summaryview.c:1627 src/summaryview.c:1706
+#: src/summaryview.c:1522 src/summaryview.c:1574 src/summaryview.c:1621
+#: src/summaryview.c:1673 src/summaryview.c:1752

 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Интерна грешка: неочекивана вредност за prefs_common.next_unread_msg_dialog\n"
 
 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Интерна грешка: неочекивана вредност за prefs_common.next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1484
+#: src/summaryview.c:1530

 msgid "No unread messages."
 msgstr "Нема непрочитаних порука."
 
 msgid "No unread messages."
 msgstr "Нема непрочитаних порука."
 

-#: src/summaryview.c:1516
+#: src/summaryview.c:1562

 msgid "No unread message found. Go to next folder?"
 msgstr "Нема непрочитаних порука. Да идем у следећи директоријум?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Нема непрочитаних порука. Да идем у следећи директоријум?"
 

-#: src/summaryview.c:1562 src/summaryview.c:1614
+#: src/summaryview.c:1608 src/summaryview.c:1660

 msgid "No more new messages"
 msgstr "Нема више нових порука"
 
 msgid "No more new messages"
 msgstr "Нема више нових порука"
 

-#: src/summaryview.c:1563
+#: src/summaryview.c:1609

 msgid "No new message found. Search from the end?"
 msgstr "Нема више нових порука. Да наставим претрагу од краја?"
 
 msgid "No new message found. Search from the end?"
 msgstr "Нема више нових порука. Да наставим претрагу од краја?"
 

-#: src/summaryview.c:1583
+#: src/summaryview.c:1629

 msgid "No new messages."
 msgstr "Нема нових порука."
 
 msgid "No new messages."
 msgstr "Нема нових порука."
 

-#: src/summaryview.c:1615
+#: src/summaryview.c:1661

 msgid "No new message found. Go to next folder?"
 msgstr "Нема нових порука. Да идем у следећи директоријум?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Нема нових порука. Да идем у следећи директоријум?"
 

-#: src/summaryview.c:1652 src/summaryview.c:1693
+#: src/summaryview.c:1698 src/summaryview.c:1739

 msgid "No more marked messages"
 msgstr "Нема више обележених порука"
 
 msgid "No more marked messages"
 msgstr "Нема више обележених порука"
 

-#: src/summaryview.c:1653
+#: src/summaryview.c:1699

 msgid "No marked message found. Search from the end?"
 msgstr "Нема обележених порука. Да наставим претрагу од краја?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Нема обележених порука. Да наставим претрагу од краја?"
 

-#: src/summaryview.c:1662
+#: src/summaryview.c:1708

 msgid "No marked messages."
 msgstr "Нема обележених порука."
 
 msgid "No marked messages."
 msgstr "Нема обележених порука."
 

-#: src/summaryview.c:1694
+#: src/summaryview.c:1740

 msgid "No marked message found. Go to next folder?"
 msgstr "Нема означених порука. Да идем у следећи директоријум?"
 
 msgid "No marked message found. Go to next folder?"
 msgstr "Нема означених порука. Да идем у следећи директоријум?"
 

-#: src/summaryview.c:1731 src/summaryview.c:1756
+#: src/summaryview.c:1777 src/summaryview.c:1802

 msgid "No more labeled messages"
 msgstr "Нема обојених порука"
 
 msgid "No more labeled messages"
 msgstr "Нема обојених порука"
 

-#: src/summaryview.c:1732
+#: src/summaryview.c:1778

 msgid "No labeled message found. Search from the end?"
 msgstr "Нема више обојених порука. Да наставим претрагу од краја?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Нема више обојених порука. Да наставим претрагу од краја?"
 

-#: src/summaryview.c:1741 src/summaryview.c:1766
+#: src/summaryview.c:1787 src/summaryview.c:1812

 msgid "No labeled messages."
 msgstr "Нема обојених порука."
 
 msgid "No labeled messages."
 msgstr "Нема обојених порука."
 

-#: src/summaryview.c:1757
+#: src/summaryview.c:1803

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Нема више обојених порука. Да наставим претрагу од почетка?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Нема више обојених порука. Да наставим претрагу од почетка?"
 

-#: src/summaryview.c:2048
+#: src/summaryview.c:2094

 msgid "Attracting messages by subject..."
 msgstr "Ређање порука по теми..."
 
 msgid "Attracting messages by subject..."
 msgstr "Ређање порука по теми..."
 

-#: src/summaryview.c:2206
+#: src/summaryview.c:2252

 #, c-format
 msgid "%d deleted"
 msgstr "%d обрисан"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d обрисан"
 

-#: src/summaryview.c:2210
+#: src/summaryview.c:2256

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d премештен"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d премештен"
 

-#: src/summaryview.c:2211 src/summaryview.c:2218
+#: src/summaryview.c:2257 src/summaryview.c:2264

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:2216
+#: src/summaryview.c:2262

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копиран"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копиран"
 

-#: src/summaryview.c:2231
+#: src/summaryview.c:2277

 msgid " item selected"
 msgstr " одабрана порука"
 
 msgid " item selected"
 msgstr " одабрана порука"
 

-#: src/summaryview.c:2233
+#: src/summaryview.c:2279

 msgid " items selected"
 msgstr " одабране(их) поруке(а)"
 
 msgid " items selected"
 msgstr " одабране(их) поруке(а)"
 

-#: src/summaryview.c:2249
+#: src/summaryview.c:2295

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "нових: %d, непрочитаних: %d, укупно: %d (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "нових: %d, непрочитаних: %d, укупно: %d (%s)"
 

-#: src/summaryview.c:2453
+#: src/summaryview.c:2504

 msgid "Sorting summary..."
 msgstr "Сортирање листе порука..."
 
 msgid "Sorting summary..."
 msgstr "Сортирање листе порука..."
 

-#: src/summaryview.c:2536
+#: src/summaryview.c:2585

 msgid "Setting summary from message data..."
 msgstr "Обележавам поруке у листи на основу информација у порукама..."
 
 msgid "Setting summary from message data..."
 msgstr "Обележавам поруке у листи на основу информација у порукама..."
 

-#: src/summaryview.c:2707
+#: src/summaryview.c:2763

 msgid "(No Date)"
 msgstr "(Без датума)"
 
 msgid "(No Date)"
 msgstr "(Без датума)"
 

-#: src/summaryview.c:2745
+#: src/summaryview.c:2801

 msgid "(No Recipient)"
 msgstr "(без примаоца)"
 
 msgid "(No Recipient)"
 msgstr "(без примаоца)"
 

-#: src/summaryview.c:3567
+#: src/summaryview.c:3622

 msgid "You're not the author of the article.\n"
 msgstr "Ви нисте аутор чланка.\n"
 
 msgid "You're not the author of the article.\n"
 msgstr "Ви нисте аутор чланка.\n"
 

-#: src/summaryview.c:3653
+#: src/summaryview.c:3707

 msgid "Delete message(s)"
 msgstr "Брисање порука"
 
 msgid "Delete message(s)"
 msgstr "Брисање порука"
 

-#: src/summaryview.c:3654
+#: src/summaryview.c:3708

 msgid "Do you really want to delete selected message(s)?"
 msgstr "Да ли заиста желите да изабране поруке буду обрисане?"
 
 msgid "Do you really want to delete selected message(s)?"
 msgstr "Да ли заиста желите да изабране поруке буду обрисане?"
 

-#: src/summaryview.c:3807
+#: src/summaryview.c:3861

 msgid "Destination is same as current folder."
 msgstr "Дестинација је иста као и тренутни директоријум."
 
 msgid "Destination is same as current folder."
 msgstr "Дестинација је иста као и тренутни директоријум."
 

-#: src/summaryview.c:3898
+#: src/summaryview.c:3952

 msgid "Destination to copy is same as current folder."
 msgstr "Дестинација за копирање је иста као и тренутни директоријум."
 
 msgid "Destination to copy is same as current folder."
 msgstr "Дестинација за копирање је иста као и тренутни директоријум."
 

-#: src/summaryview.c:4018
+#: src/summaryview.c:4072

 msgid "Append or Overwrite"
 msgstr "Додај или препиши"
 
 msgid "Append or Overwrite"
 msgstr "Додај или препиши"
 

-#: src/summaryview.c:4019
+#: src/summaryview.c:4073

 msgid "Append or overwrite existing file?"
 msgstr "Да ли да додам на крај или да препишем постојећу датотеку?"
 
 msgid "Append or overwrite existing file?"
 msgstr "Да ли да додам на крај или да препишем постојећу датотеку?"
 

-#: src/summaryview.c:4020
+#: src/summaryview.c:4074

 msgid "_Append"
 msgstr "_Надодај"
 
 msgid "_Append"
 msgstr "_Надодај"
 

-#: src/summaryview.c:4020
+#: src/summaryview.c:4074

 msgid "_Overwrite"
 msgstr "_Препиши"
 
 msgid "_Overwrite"
 msgstr "_Препиши"
 

-#: src/summaryview.c:4367
+#: src/summaryview.c:4431

 msgid "Building threads..."
 msgstr "Правим нити разговора..."
 
 msgid "Building threads..."
 msgstr "Правим нити разговора..."
 

-#: src/summaryview.c:4586
+#: src/summaryview.c:4650

 msgid "Skip these rules"
 msgstr "Прескочи ова правила"
 
 msgid "Skip these rules"
 msgstr "Прескочи ова правила"
 

-#: src/summaryview.c:4589
+#: src/summaryview.c:4653

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Примени ова правила за налог коме припадају"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "Примени ова правила за налог коме припадају"
 

-#: src/summaryview.c:4592
-msgid "Use current account for these rules"
-msgstr "Ð\9aоÑ\80иÑ\81Ñ\82и Ñ\82Ñ\80енÑ\83Ñ\82ни налог за ова пÑ\80авила"
+#: src/summaryview.c:4656
+msgid "Apply these rules if they apply to the current account"
+msgstr "Ð\9fÑ\80имени ова пÑ\80авила ако Ñ\81е одноÑ\81е на Ñ\82Ñ\80енÑ\83Ñ\82ни налог"

 
 

-#: src/summaryview.c:4621
+#: src/summaryview.c:4685

 msgid "Filtering"
 msgstr "Филтрирање"
 
 msgid "Filtering"
 msgstr "Филтрирање"
 

-#: src/summaryview.c:4622
+#: src/summaryview.c:4686

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -10746,19 +11220,19 @@ msgstr ""
 "Постоје нека правила филтрирања која припадају неком налогу.\n"
 "Изаберите шта желите да се учини са овим правилима:"
 
 "Постоје нека правила филтрирања која припадају неком налогу.\n"
 "Изаберите шта желите да се учини са овим правилима:"
 

-#: src/summaryview.c:4624
+#: src/summaryview.c:4688

 msgid "+_Filter"
 msgstr "+_Филтрирај"
 
 msgid "+_Filter"
 msgstr "+_Филтрирај"
 

-#: src/summaryview.c:4651
+#: src/summaryview.c:4715

 msgid "Filtering..."
 msgstr "Филтрирање у току..."
 
 msgid "Filtering..."
 msgstr "Филтрирање у току..."
 

-#: src/summaryview.c:4724
+#: src/summaryview.c:4788

 msgid "Processing configuration"
 msgstr "Подешавање предобраде"
 
 msgid "Processing configuration"
 msgstr "Подешавање предобраде"
 

-#: src/summaryview.c:6164
+#: src/summaryview.c:6233

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -10767,37 +11241,37 @@ msgstr ""
 "Грешка у регуларним изразима (regexp):\n"
 "%s"
 
 "Грешка у регуларним изразима (regexp):\n"
 "%s"
 

-#: src/textview.c:238
+#: src/textview.c:222

 msgid "/Compose _new message"
 msgstr "/Направи _нову поруку"
 
 msgid "/Compose _new message"
 msgstr "/Направи _нову поруку"
 

-#: src/textview.c:239
+#: src/textview.c:223

 msgid "/Add to _address book"
 msgstr "/Додај у _адресар"
 
 msgid "/Add to _address book"
 msgstr "/Додај у _адресар"
 

-#: src/textview.c:240
+#: src/textview.c:224

 msgid "/Copy this add_ress"
 msgstr "/Умножи а_дресу"
 
 msgid "/Copy this add_ress"
 msgstr "/Умножи а_дресу"
 

-#: src/textview.c:245
+#: src/textview.c:229

 msgid "/_Open image"
 msgstr "/_Отвори слику"
 
 msgid "/_Open image"
 msgstr "/_Отвори слику"
 

-#: src/textview.c:246
+#: src/textview.c:230

 msgid "/_Save image..."
 msgstr "/_Сачувај слику"
 
 msgid "/_Save image..."
 msgstr "/_Сачувај слику"
 

-#: src/textview.c:674
+#: src/textview.c:639

 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d bytes)]"
 

-#: src/textview.c:677
+#: src/textview.c:642

 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d bytes)]"
 

-#: src/textview.c:846
+#: src/textview.c:812

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -10811,79 +11285,79 @@ msgstr ""
 "\n"
 "  Употребите ставку "
 
 "\n"
 "  Употребите ставку "
 

-#: src/textview.c:851
+#: src/textview.c:817

 msgid "'View Log'"
 msgstr "„Преглед дневника рада“"
 
 msgid "'View Log'"
 msgstr "„Преглед дневника рада“"
 

-#: src/textview.c:852
+#: src/textview.c:818

 msgid " in the Tools menu for more information."
 msgstr " у менију „Алати“ за више информација."
 
 msgid " in the Tools menu for more information."
 msgstr " у менију „Алати“ за више информација."
 

-#: src/textview.c:873
+#: src/textview.c:839

 msgid "  The following can be performed on this part by\n"
 msgstr " Над овим прилогом можете извршити следеће акције\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr " Над овим прилогом можете извршити следеће акције\n"
 

-#: src/textview.c:874
+#: src/textview.c:840

 msgid "  right-clicking the icon or list item:\n"
 msgstr " десним кликом на иконицу или ставку у листи:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr " десним кликом на иконицу или ставку у листи:\n"
 

-#: src/textview.c:876
+#: src/textview.c:842

 msgid "     - To save, select "
 msgstr "     - Да га сачивате одаберите "
 
 msgid "     - To save, select "
 msgstr "     - Да га сачивате одаберите "
 

-#: src/textview.c:877
+#: src/textview.c:843

 msgid "'Save as...'"
 msgstr "„Сачувај као...“"
 
 msgid "'Save as...'"
 msgstr "„Сачувај као...“"
 

-#: src/textview.c:878
+#: src/textview.c:844

 msgid " (Shortcut key: 'y')\n"
 msgstr " (пречица: „ч“)\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (пречица: „ч“)\n"
 

-#: src/textview.c:879
+#: src/textview.c:845

 msgid "     - To display as text, select "
 msgstr "     - Да буде приказан као обичан текст одаберите "
 
 msgid "     - To display as text, select "
 msgstr "     - Да буде приказан као обичан текст одаберите "
 

-#: src/textview.c:880
+#: src/textview.c:846

 msgid "'Display as text'"
 msgstr "„Прикажи као текст“"
 
 msgid "'Display as text'"
 msgstr "„Прикажи као текст“"
 

-#: src/textview.c:881
+#: src/textview.c:847

 msgid " (Shortcut key: 't')\n"
 msgstr " (пречица: „п“)\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (пречица: „п“)\n"
 

-#: src/textview.c:882
+#: src/textview.c:848

 msgid "     - To open with an external program, select "
 msgstr "     - Да буде отворен у спољном програму одаберите "
 
 msgid "     - To open with an external program, select "
 msgstr "     - Да буде отворен у спољном програму одаберите "
 

-#: src/textview.c:883
+#: src/textview.c:849

 msgid "'Open'"
 msgstr "„Отвори“"
 
 msgid "'Open'"
 msgstr "„Отвори“"
 

-#: src/textview.c:884
+#: src/textview.c:850

 msgid " (Shortcut key: 'l')\n"
 msgstr " (пречица: „о“),\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (пречица: „о“),\n"
 

-#: src/textview.c:885
+#: src/textview.c:851

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (алтернатива је двоклик, или средњи клик мишем"
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (алтернатива је двоклик, или средњи клик мишем"
 

-#: src/textview.c:886
+#: src/textview.c:852

 msgid "mouse button)\n"
 msgstr ")\n"
 
 msgid "mouse button)\n"
 msgstr ")\n"
 

-#: src/textview.c:887
+#: src/textview.c:853

 msgid "     - Or use "
 msgstr "     - Или употребите "
 
 msgid "     - Or use "
 msgstr "     - Или употребите "
 

-#: src/textview.c:888
+#: src/textview.c:854

 msgid "'Open with...'"
 msgstr "„Отвори са...“"
 
 msgid "'Open with...'"
 msgstr "„Отвори са...“"
 

-#: src/textview.c:889
+#: src/textview.c:855

 msgid " (Shortcut key: 'o')\n"
 msgstr " за избор спољног програма (пречица: „с“)\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " за избор спољног програма (пречица: „с“)\n"
 

-#: src/textview.c:981
+#: src/textview.c:944

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -10921,226 +11395,234 @@ msgstr "Упозорење! Покушај фишинга"
 msgid "_Open URL"
 msgstr "_Отвори УРЛ"
 
 msgid "_Open URL"
 msgstr "_Отвори УРЛ"
 

-#: src/toolbar.c:162 src/toolbar.c:1490
+#: src/toolbar.c:166 src/toolbar.c:1535

 msgid "Receive Mail on all Accounts"
 msgstr "Преузимање поште за одабране налоге"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Преузимање поште за одабране налоге"
 

-#: src/toolbar.c:163 src/toolbar.c:1504
+#: src/toolbar.c:167 src/toolbar.c:1549

 msgid "Receive Mail on current Account"
 msgstr "Преузимање поште активног налога"
 
 msgid "Receive Mail on current Account"
 msgstr "Преузимање поште активног налога"
 

-#: src/toolbar.c:164 src/toolbar.c:1510
+#: src/toolbar.c:168 src/toolbar.c:1555

 msgid "Send Queued Messages"
 msgstr "Слање припремљених порука"
 
 msgid "Send Queued Messages"
 msgstr "Слање припремљених порука"
 

-#: src/toolbar.c:165 src/toolbar.c:1523
+#: src/toolbar.c:169 src/toolbar.c:1568

 msgid "Compose Email"
 msgstr "Ново електронско писмо"
 
 msgid "Compose Email"
 msgstr "Ново електронско писмо"
 

-#: src/toolbar.c:166 src/toolbar.c:1527
+#: src/toolbar.c:170 src/toolbar.c:1572

 msgid "Compose News"
 msgstr "Нови чланак за дискусиону групу"
 
 msgid "Compose News"
 msgstr "Нови чланак за дискусиону групу"
 

-#: src/toolbar.c:167 src/toolbar.c:1558 src/toolbar.c:1568
+#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624

 msgid "Reply to Message"
 msgstr "Одговор на поруку"
 
 msgid "Reply to Message"
 msgstr "Одговор на поруку"
 

-#: src/toolbar.c:168 src/toolbar.c:1575 src/toolbar.c:1585
+#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641

 msgid "Reply to Sender"
 msgstr "Одговор аутору"
 
 msgid "Reply to Sender"
 msgstr "Одговор аутору"
 

-#: src/toolbar.c:169 src/toolbar.c:1592 src/toolbar.c:1602
+#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658

 msgid "Reply to All"
 msgstr "Одговор свима"
 
 msgid "Reply to All"
 msgstr "Одговор свима"
 

-#: src/toolbar.c:170 src/toolbar.c:1609 src/toolbar.c:1619
+#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675

 msgid "Reply to Mailing-list"
 msgstr "Одговор на дописно друштво"
 
 msgid "Reply to Mailing-list"
 msgstr "Одговор на дописно друштво"
 

-#: src/toolbar.c:171 src/toolbar.c:1626 src/toolbar.c:1636
+#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692

 msgid "Forward Message"
 msgstr "Прослеђивање поруке"
 
 msgid "Forward Message"
 msgstr "Прослеђивање поруке"
 

-#: src/toolbar.c:172 src/toolbar.c:1643
+#: src/toolbar.c:176 src/toolbar.c:1699

 msgid "Trash Message"
 msgstr "Премести у смеће"
 
 msgid "Trash Message"
 msgstr "Премести у смеће"
 

-#: src/toolbar.c:173 src/toolbar.c:1649
+#: src/toolbar.c:177 src/toolbar.c:1705

 msgid "Delete Message"
 msgstr "Уклањање поруке"
 
 msgid "Delete Message"
 msgstr "Уклањање поруке"
 

-#: src/toolbar.c:175 src/toolbar.c:1661
+#: src/toolbar.c:179 src/toolbar.c:1717

 msgid "Go to Previous Unread Message"
 msgstr "Претходна непрочитана порука"
 
 msgid "Go to Previous Unread Message"
 msgstr "Претходна непрочитана порука"
 

-#: src/toolbar.c:176 src/toolbar.c:1668
+#: src/toolbar.c:180 src/toolbar.c:1724

 msgid "Go to Next Unread Message"
 msgstr "Следећа непрочитана порука"
 
 msgid "Go to Next Unread Message"
 msgstr "Следећа непрочитана порука"
 

-#: src/toolbar.c:179
+#: src/toolbar.c:183

 msgid "Learn Spam or Ham"
 msgstr "Учење нежељене и жељене поште"
 
 msgid "Learn Spam or Ham"
 msgstr "Учење нежељене и жељене поште"
 

-#: src/toolbar.c:181 src/toolbar.c:1677
+#: src/toolbar.c:185 src/toolbar.c:1733

 msgid "Send Message"
 msgstr "Одмах пошаљи поруку"
 
 msgid "Send Message"
 msgstr "Одмах пошаљи поруку"
 

-#: src/toolbar.c:182 src/toolbar.c:1683
+#: src/toolbar.c:186 src/toolbar.c:1739

 msgid "Put into queue folder and send later"
 msgstr "Сачувај у директоријуму „Припремљено“ и пошаљи касније"
 
 msgid "Put into queue folder and send later"
 msgstr "Сачувај у директоријуму „Припремљено“ и пошаљи касније"
 

-#: src/toolbar.c:183 src/toolbar.c:1689
+#: src/toolbar.c:187 src/toolbar.c:1745

 msgid "Save to draft folder"
 msgstr "Сачувај у директоријуму „Недовршено“"
 
 msgid "Save to draft folder"
 msgstr "Сачувај у директоријуму „Недовршено“"
 

-#: src/toolbar.c:184 src/toolbar.c:1695
+#: src/toolbar.c:188 src/toolbar.c:1751

 msgid "Insert file"
 msgstr "Уметни датотеку као текст у поруку"
 
 msgid "Insert file"
 msgstr "Уметни датотеку као текст у поруку"
 

-#: src/toolbar.c:185 src/toolbar.c:1701
+#: src/toolbar.c:189 src/toolbar.c:1757

 msgid "Attach file"
 msgstr "Приложи датотеку уз поруку"
 
 msgid "Attach file"
 msgstr "Приложи датотеку уз поруку"
 

-#: src/toolbar.c:186 src/toolbar.c:1707
+#: src/toolbar.c:190 src/toolbar.c:1763

 msgid "Insert signature"
 msgstr "Потпиши поруку"
 
 msgid "Insert signature"
 msgstr "Потпиши поруку"
 

-#: src/toolbar.c:187 src/toolbar.c:1713
+#: src/toolbar.c:191 src/toolbar.c:1769

 msgid "Edit with external editor"
 msgstr "Измена поруке у спољном уређивачу текста"
 
 msgid "Edit with external editor"
 msgstr "Измена поруке у спољном уређивачу текста"
 

-#: src/toolbar.c:188 src/toolbar.c:1719
+#: src/toolbar.c:192 src/toolbar.c:1775

 msgid "Wrap long lines of current paragraph"
 msgstr "Преламање дугих линија текста текућег пасуса"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "Преламање дугих линија текста текућег пасуса"
 

-#: src/toolbar.c:189 src/toolbar.c:1725
+#: src/toolbar.c:193 src/toolbar.c:1781

 msgid "Wrap all long lines"
 msgstr "Прелом свих дугих линија"
 
 msgid "Wrap all long lines"
 msgstr "Прелом свих дугих линија"
 

-#: src/toolbar.c:192 src/toolbar.c:1738
+#: src/toolbar.c:196 src/toolbar.c:1794

 msgid "Check spelling"
 msgstr "Провера правописа"
 
 msgid "Check spelling"
 msgstr "Провера правописа"
 

-#: src/toolbar.c:194
-msgid "Sylpheed-Claws Actions Feature"
-msgstr "Sylpheed-Claws Акције"
+#: src/toolbar.c:198
+msgid "Claws Mail Actions Feature"
+msgstr "Claws Mail Акције"
+
+#: src/toolbar.c:199 src/toolbar.c:1817
+msgid "Cancel receiving"
+msgstr "Прекини преузимање"

 
 

-#: src/toolbar.c:214
+#: src/toolbar.c:219

 msgid "/Reply with _quote"
 msgstr "/Одговор _са цитатом"
 
 msgid "/Reply with _quote"
 msgstr "/Одговор _са цитатом"
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/_Reply without quote"
 msgstr "/Одговор _без цитата"
 
 msgid "/_Reply without quote"
 msgstr "/Одговор _без цитата"
 

-#: src/toolbar.c:219
+#: src/toolbar.c:224

 msgid "/Reply to all with _quote"
 msgstr "/Одговор свима _са цитатом"
 
 msgid "/Reply to all with _quote"
 msgstr "/Одговор свима _са цитатом"
 

-#: src/toolbar.c:220
+#: src/toolbar.c:225

 msgid "/_Reply to all without quote"
 msgstr "/Одговор свима _без цитата"
 
 msgid "/_Reply to all without quote"
 msgstr "/Одговор свима _без цитата"
 

-#: src/toolbar.c:224
+#: src/toolbar.c:229

 msgid "/Reply to list with _quote"
 msgstr "/Одговор на дописно друштво _са цитатом"
 
 msgid "/Reply to list with _quote"
 msgstr "/Одговор на дописно друштво _са цитатом"
 

-#: src/toolbar.c:225
+#: src/toolbar.c:230

 msgid "/_Reply to list without quote"
 msgstr "/Одговор на дописно друштво _без цитата"
 
 msgid "/_Reply to list without quote"
 msgstr "/Одговор на дописно друштво _без цитата"
 

-#: src/toolbar.c:229
+#: src/toolbar.c:234

 msgid "/Reply to sender with _quote"
 msgstr "/Одговор аутору _са цитатом"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Одговор аутору _са цитатом"
 

-#: src/toolbar.c:230
+#: src/toolbar.c:235

 msgid "/_Reply to sender without quote"
 msgstr "/Одговор аутору _без цитата"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Одговор аутору _без цитата"
 

-#: src/toolbar.c:236
+#: src/toolbar.c:241

 msgid "/Redirec_t"
 msgstr "/П_реусмери"
 
 msgid "/Redirec_t"
 msgstr "/П_реусмери"
 

-#: src/toolbar.c:389
+#: src/toolbar.c:245
+msgid "/Learn as _Spam"
+msgstr "/Упамти као _нежељену поруку"
+
+#: src/toolbar.c:246
+msgid "/Learn as _Ham"
+msgstr "/Упамти као _жељену поруку"
+
+#: src/toolbar.c:399

 msgid "Get Mail"
 msgstr "Провера поште"
 
 msgid "Get Mail"
 msgstr "Провера поште"
 

-#: src/toolbar.c:395 src/toolbar.c:486
+#: src/toolbar.c:403
+msgid "Toolbar|Compose"
+msgstr "Састављање"
+
+#: src/toolbar.c:405 src/toolbar.c:496

 msgid "Reply"
 msgstr "Одговори"
 
 msgid "Reply"
 msgstr "Одговори"
 

-#: src/toolbar.c:396 src/toolbar.c:487
+#: src/toolbar.c:406 src/toolbar.c:497

 msgid "All"
 msgstr "Свима"
 
 msgid "All"
 msgstr "Свима"
 

-#: src/toolbar.c:397 src/toolbar.c:488
+#: src/toolbar.c:407 src/toolbar.c:498

 msgid "Sender"
 msgstr "Аутор"
 
 msgid "Sender"
 msgstr "Аутор"
 

-#: src/toolbar.c:402 src/toolbar.c:493
+#: src/toolbar.c:412 src/toolbar.c:503

 msgid "Spam"
 msgstr "Спем"
 
 msgid "Spam"
 msgstr "Спем"
 

-#: src/toolbar.c:405 src/toolbar.c:495
+#: src/toolbar.c:415 src/toolbar.c:505

 msgid "Next"
 msgstr "Напред"
 
 msgid "Next"
 msgstr "Напред"
 

-#: src/toolbar.c:443
+#: src/toolbar.c:453

 msgid "Send later"
 msgstr "Пошаљи касније"
 
 msgid "Send later"
 msgstr "Пошаљи касније"
 

-#: src/toolbar.c:444
+#: src/toolbar.c:454

 msgid "Draft"
 msgstr "Недовршено"
 
 msgid "Draft"
 msgstr "Недовршено"
 

-#: src/toolbar.c:446
-msgid "Insert"
-msgstr "Уметни"
-
-#: src/toolbar.c:447
-msgid "Attach"
-msgstr "Прилог"
-
-#: src/toolbar.c:1497
+#: src/toolbar.c:1542

 msgid "Receive Mail on selected Account"
 msgstr "Преузимање поште за одабране налоге"
 
 msgid "Receive Mail on selected Account"
 msgstr "Преузимање поште за одабране налоге"
 

-#: src/toolbar.c:1534
+#: src/toolbar.c:1579

 msgid "Compose with selected Account"
 msgstr "Направи користећи одабрани налог"
 
 msgid "Compose with selected Account"
 msgstr "Направи користећи одабрани налог"
 

-#: src/toolbar.c:1540
+#: src/toolbar.c:1585

 msgid "Ham"
 msgstr "Није спем"
 
 msgid "Ham"
 msgstr "Није спем"
 

-#: src/toolbar.c:1548
+#: src/toolbar.c:1593

 msgid "Learn Spam"
 msgid "Learn Spam"

-msgstr "Ð\9eво Ñ\98е нежеÑ\99ена поÑ\80Ñ\83ка"
+msgstr "УпамÑ\82и као нежеÑ\99енÑ\83 поÑ\80Ñ\83кÑ\83"

 
 

-#: src/toolbar.c:1552
+#: src/toolbar.c:1597

 msgid "Learn Ham"
 msgid "Learn Ham"

-msgstr "Ð\9eво ниÑ\98е нежеÑ\99ена поÑ\80Ñ\83ка"
+msgstr "УпамÑ\82и као жеÑ\99енÑ\83 поÑ\80Ñ\83кÑ\83"

 
 

-#: src/wizard.c:459
-msgid "Welcome to Sylpheed-Claws "
-msgstr "Ð\94обÑ\80о доÑ\88ли Ñ\83 Sylpheed-Claws "
+#: src/toolbar.c:1607
+msgid "Learn as..."
+msgstr "УпамÑ\82и као..."

 
 

-#: src/wizard.c:469
-msgid "Sylpheed-Claws Team"
-msgstr "Sylpheed Claws тим"
+#: src/wizard.c:461
+msgid "Welcome Mail Subject|Welcome to Claws Mail"
+msgstr "Добро дошли у Claws Mail"

 
 

-#: src/wizard.c:475
+#: src/wizard.c:484

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"

-"Welcome to Sylpheed-Claws\n"
-"-------------------------\n"
+"Welcome to Claws Mail\n"
+"---------------------\n"

 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"
 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"

-"Sylpheed-Claws has lots of extra features accessible via plugins,\n"
+"Claws Mail has lots of extra features accessible via plugins,\n"

 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"
 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"


@@ -11151,7 +11633,7 @@ msgid ""
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"

-"You can find further information in the Sylpheed-Claws manual,\n"
+"You can find further information in the Claws Mail manual,\n"

 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"
 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"


@@ -11165,7 +11647,7 @@ msgid ""
 "\n"
 "LICENSE\n"
 "-------\n"
 "\n"
 "LICENSE\n"
 "-------\n"

-"Sylpheed-Claws is free software, released under the terms\n"
+"Claws Mail is free software, released under the terms\n"

 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"


@@ -11173,19 +11655,19 @@ msgid ""
 "\n"
 "DONATIONS\n"
 "---------\n"
 "\n"
 "DONATIONS\n"
 "---------\n"

-"If you wish to donate to the Sylpheed-Claws project you can do\n"
+"If you wish to donate to the Claws Mail project you can do\n"

 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"
 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"

-"Добро дошли у Sylpheed-Claws\n"
-"----------------------------\n"
+"Добро дошли у Claws Mail\n"
+"------------------------\n"

 "\n"
 "Пошто сте подесили Ваш налог, можете да проверите\n"
 "пошту кликом на дугме „Провера поште“ лево на линији\n"
 "алата.\n"
 "\n"
 "\n"
 "Пошто сте подесили Ваш налог, можете да проверите\n"
 "пошту кликом на дугме „Провера поште“ лево на линији\n"
 "алата.\n"
 "\n"

-"Sylpheed-Claws поседује доста напредних могућности које су\n"
+"Claws Mail поседује доста напредних могућности које су\n"

 "доступне преко додатака, попут филтрирања и учења спема\n"
 "(помоћу Bogofilter или SpamAssassin додатака), потом заштите\n"
 "приватности (помоћу PGP/Mime), читача RSS извора, календара,\n"
 "доступне преко додатака, попут филтрирања и учења спема\n"
 "(помоћу Bogofilter или SpamAssassin додатака), потом заштите\n"
 "приватности (помоћу PGP/Mime), читача RSS извора, календара,\n"


@@ -11197,7 +11679,7 @@ msgstr ""
 "поставке користећи ставку менија „/Подешавање/Поставке“.\n"
 "\n"
 "Више информација убудуће можете пронаћи у приручнику за\n"
 "поставке користећи ставку менија „/Подешавање/Поставке“.\n"
 "\n"
 "Више информација убудуће можете пронаћи у приручнику за\n"

-"Sylpheed-Claws, коме се приступа избором ставке менија\n"
+"Claws Mail, коме се приступа избором ставке менија\n"

 "„/Помоћ/Приручник“ или на Интернету са следећих адреса.\n"
 "\n"
 "Корисне адресе\n"
 "„/Помоћ/Приручник“ или на Интернету са следећих адреса.\n"
 "\n"
 "Корисне адресе\n"


@@ -11210,7 +11692,7 @@ msgstr ""
 "\n"
 "ЛИЦЕНЦА\n"
 "-------\n"
 "\n"
 "ЛИЦЕНЦА\n"
 "-------\n"

-"Sylpheed-Claws је слободан софтвер, објављен под условима\n"
+"Claws Mail је слободан софтвер, објављен под условима\n"

 "ГНУове Опште Јавне Лиценце у верзији 2 или новијој, која је\n"
 "објављена од стране Фондације за слободан софтвер,\n"
 "Free Software Foundation, 51 Franklin Street, Fifth Floor,\n"
 "ГНУове Опште Јавне Лиценце у верзији 2 или новијој, која је\n"
 "објављена од стране Фондације за слободан софтвер,\n"
 "Free Software Foundation, 51 Franklin Street, Fifth Floor,\n"


@@ -11219,59 +11701,71 @@ msgstr ""
 "\n"
 "ДОНАЦИЈЕ\n"
 "--------\n"
 "\n"
 "ДОНАЦИЈЕ\n"
 "--------\n"

-"Ако желите да помогнете Sylpheed-Claws пројекат, то можете\n"
+"Ако желите да помогнете Claws Mail пројекат, то можете\n"

 "учинити на адреси <%s>.\n"
 "\n"
 
 "учинити на адреси <%s>.\n"
 "\n"
 

-#: src/wizard.c:551
+#: src/wizard.c:564

 msgid "Please enter the mailbox name."
 msgstr "Унесите назив сандучета."
 
 msgid "Please enter the mailbox name."
 msgstr "Унесите назив сандучета."
 

-#: src/wizard.c:579
+#: src/wizard.c:592

 msgid "Please enter your name and email address."
 msgstr "Унесите Ваше име и адресу е-поште."
 
 msgid "Please enter your name and email address."
 msgstr "Унесите Ваше име и адресу е-поште."
 

-#: src/wizard.c:590
+#: src/wizard.c:603

 msgid "Please enter your receiving server and username."
 msgstr "Унесите сервер за преузимање поште и Ваше корисничко име"
 
 msgid "Please enter your receiving server and username."
 msgstr "Унесите сервер за преузимање поште и Ваше корисничко име"
 

-#: src/wizard.c:600
+#: src/wizard.c:613

 msgid "Please enter your username."
 msgstr "Унесите Ваше корисничко име."
 
 msgid "Please enter your username."
 msgstr "Унесите Ваше корисничко име."
 

-#: src/wizard.c:610
+#: src/wizard.c:623

 msgid "Please enter your SMTP server."
 msgstr "Унесите Ваш SMTP сервер."
 
 msgid "Please enter your SMTP server."
 msgstr "Унесите Ваш SMTP сервер."
 

-#: src/wizard.c:621
+#: src/wizard.c:634

 msgid "Please enter your SMTP username."
 msgstr "Унесите Ваше корисничко име за SMTP."
 
 msgid "Please enter your SMTP username."
 msgstr "Унесите Ваше корисничко име за SMTP."
 

-#: src/wizard.c:829
+#: src/wizard.c:881

 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Ваше име:</span>"
 
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">Ваше име:</span>"
 

-#: src/wizard.c:834
+#: src/wizard.c:886

 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Адреса е-поште:</span>"
 
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">Адреса е-поште:</span>"
 

-#: src/wizard.c:838
+#: src/wizard.c:890

 msgid "Your organization:"
 msgstr "Организација:"
 
 msgid "Your organization:"
 msgstr "Организација:"
 

-#: src/wizard.c:858
+#: src/wizard.c:913
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr "Можете одредити и апсолутну путању, на пример: „/home/urke/Documents/Mail“"
+
+#: src/wizard.c:917

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Назив сандучета:</span>"
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">Назив сандучета:</span>"
 

-#: src/wizard.c:888
+#: src/wizard.c:954
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr "Можете задати порт дописујући га на крају адресе: „mail.primer.cs:25“"
+
+#: src/wizard.c:958

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Адреса SMTP сервера:</span>"
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">Адреса SMTP сервера:</span>"
 

-#: src/wizard.c:891
+#: src/wizard.c:961

 msgid "Use authentication"
 msgstr "Користи идентификацију"
 
 msgid "Use authentication"
 msgstr "Користи идентификацију"
 

-#: src/wizard.c:905
+#: src/wizard.c:975

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11279,7 +11773,7 @@ msgstr ""
 "SMTP корисничко име:\n"
 "<span size=\"small\">(оставите празно ако је исто као и за преузимање)</span>"
 
 "SMTP корисничко име:\n"
 "<span size=\"small\">(оставите празно ако је исто као и за преузимање)</span>"
 

-#: src/wizard.c:918
+#: src/wizard.c:988

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11287,100 +11781,105 @@ msgstr ""
 "SMTP лозинка:\n"
 "<span size=\"small\">(оставите празно ако је исто као и за преузимање)</span>"
 
 "SMTP лозинка:\n"
 "<span size=\"small\">(оставите празно ако је исто као и за преузимање)</span>"
 

-#: src/wizard.c:945 src/wizard.c:957 src/wizard.c:1041
+#: src/wizard.c:1000
+msgid "Use SSL to connect to SMTP server"
+msgstr "Користи ССЛ за повезивање на SMTP сервер"
+
+#: src/wizard.c:1007 src/wizard.c:1230
+msgid "Use SSL via STARTTLS"
+msgstr "Користи SSL преко STARTTLS"
+
+#: src/wizard.c:1037 src/wizard.c:1056 src/wizard.c:1165

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Адреса сервера:</span>"
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">Адреса сервера:</span>"
 

-#: src/wizard.c:962
+#: src/wizard.c:1076

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Локално сандуче:</span>"
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">Локално сандуче:</span>"
 

-#: src/wizard.c:1002
+#: src/wizard.c:1127

 msgid "IMAP"
 msgstr "IMAP"
 
 msgid "IMAP"
 msgstr "IMAP"
 

-#: src/wizard.c:1033
+#: src/wizard.c:1152

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Тип сервера:</span>"
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">Тип сервера:</span>"
 

-#: src/wizard.c:1052
+#: src/wizard.c:1161
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr "Можете задати порт дописујући га на крају адресе: „mail.primer.cs:110“"
+
+#: src/wizard.c:1176

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Корисничко име:</span>"
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">Корисничко име:</span>"
 

-#: src/wizard.c:1068
+#: src/wizard.c:1192

 msgid "Password:"
 msgstr "Лозинка:"
 
 msgid "Password:"
 msgstr "Лозинка:"
 

-#: src/wizard.c:1080
+#: src/wizard.c:1204

 msgid "IMAP server directory:"
 msgstr "Директоријум IMAP сервера:"
 
 msgid "IMAP server directory:"
 msgstr "Директоријум IMAP сервера:"
 

-#: src/wizard.c:1104
-msgid "Use SSL to connect to SMTP server"
-msgstr "Користи ССЛ за повезивање на SMTP сервер"
-
-#: src/wizard.c:1111
+#: src/wizard.c:1223

 msgid "Use SSL to connect to receiving server"
 msgstr "Користи ССЛ за повезивање на сервер за преузимање"
 
 msgid "Use SSL to connect to receiving server"
 msgstr "Користи ССЛ за повезивање на сервер за преузимање"
 

-#: src/wizard.c:1227
-msgid "Sylpheed-Claws Setup Wizard"
-msgstr "Sylpheed-Claws чаробњак за подешавање"
+#: src/wizard.c:1347
+msgid "Claws Mail Setup Wizard"
+msgstr "Claws Mail чаробњак за подешавање"

 
 

-#: src/wizard.c:1259
-msgid "Welcome to Sylpheed-Claws"
-msgstr "Добро дошли у Sylpheed-Claws"
+#: src/wizard.c:1379
+msgid "Welcome to Claws Mail"
+msgstr "Добро дошли у Claws Mail"

 
 

-#: src/wizard.c:1267
+#: src/wizard.c:1387

 msgid ""
 msgid ""

-"Welcome to the Sylpheed-Claws setup wizard.\n"
+"Welcome to the Claws Mail setup wizard.\n"

 "\n"
 "We will begin by defining some basic information about you and your most "
 "\n"
 "We will begin by defining some basic information about you and your most "

-"common mail options so that you can start to use Sylpheed-Claws in less than "
+"common mail options so that you can start to use Claws Mail in less than "

 "five minutes."
 msgstr ""
 "five minutes."
 msgstr ""

-"Добро дошли у Sylpheed-Claws чаробњак за подешавање.\n"
+"Добро дошли у Claws Mail чаробњак за подешавање.\n"

 "\n"
 "Започећемо са одређивањем основних података о Вама и вашој примарној адреси "
 "електронске поште тако да одмах након тога можете да почнете да користите "
 "\n"
 "Започећемо са одређивањем основних података о Вама и вашој примарној адреси "
 "електронске поште тако да одмах након тога можете да почнете да користите "

-"Sylpheed-Claws."
+"Claws Mail."

 
 

-#: src/wizard.c:1280
+#: src/wizard.c:1400

 msgid "About You"
 msgstr "О Вамау"
 
 msgid "About You"
 msgstr "О Вамау"
 

-#: src/wizard.c:1282 src/wizard.c:1291 src/wizard.c:1300 src/wizard.c:1310
-#: src/wizard.c:1320
+#: src/wizard.c:1402 src/wizard.c:1411 src/wizard.c:1420 src/wizard.c:1430

 msgid "Bold fields must be completed"
 msgstr "Наглашена поља су обавезна"
 
 msgid "Bold fields must be completed"
 msgstr "Наглашена поља су обавезна"
 

-#: src/wizard.c:1289
+#: src/wizard.c:1409

 msgid "Receiving mail"
 msgstr "Преузимање поште"
 
 msgid "Receiving mail"
 msgstr "Преузимање поште"
 

-#: src/wizard.c:1298
+#: src/wizard.c:1418

 msgid "Sending mail"
 msgstr "Слање поште"
 
 msgid "Sending mail"
 msgstr "Слање поште"
 

-#: src/wizard.c:1308
+#: src/wizard.c:1428

 msgid "Saving mail on disk"
 msgstr "Чување поште на диску"
 
 msgid "Saving mail on disk"
 msgstr "Чување поште на диску"
 

-#: src/wizard.c:1318
-msgid "Security"
-msgstr "Безбедност"
-
-#: src/wizard.c:1328
+#: src/wizard.c:1438

 msgid "Configuration finished"
 msgstr "Завршено подешавање"
 
 msgid "Configuration finished"
 msgstr "Завршено подешавање"
 

-#: src/wizard.c:1336
+#: src/wizard.c:1446

 msgid ""
 msgid ""

-"Sylpheed-Claws is now ready.\n"
+"Claws Mail is now ready.\n"

 "\n"
 "Click Save to start."
 msgstr ""
 "\n"
 "Click Save to start."
 msgstr ""

-"Sylpheed-Claws је спреман.\n"
+"Claws Mail је спреман.\n"

 "\n"
 "Кликните на „Сачувај“ за покретање."
 
 "\n"
 "Кликните на „Сачувај“ за покретање."
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a638b013a979ccd70b4a1ae60f2cf515749e9e36..81afc331d0b32368a819b86f8f615704b5396178 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claw\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claw\n"

-"Report-Msgid-Bugs-To: paul@sylpheed.org\n"
-"POT-Creation-Date: 2006-10-30 07:42+0000\n"
-"PO-Revision-Date: 2006-11-03 23:53+0800\n"
+"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
+"POT-Creation-Date: 2007-01-08 07:07+0000\n"
+"PO-Revision-Date: 2007-01-06 01:22中國標準時間\n"

 "Last-Translator: Ralgh Young <bamanzi@gmail.com>\n"
 "Last-Translator: Ralgh Young <bamanzi@gmail.com>\n"

-"Language-Team: Sylpheed-Claws <sylpheed-claws-translators@lists.sourceforge.net> \n"
+"Language-Team: Sylpheed-Claws <sylpheed-claws-translators@lists.sourceforge."
+"net> \n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"


@@ -67,17 +68,25 @@ msgstr "(未命名)"
 msgid "Delete account"
 msgstr "删除帐号"
 
 msgid "Delete account"
 msgstr "删除帐号"
 

-#: src/account.c:1458
+#: src/account.c:1461
+msgid "Accounts List Default Column Name|D"
+msgstr "缺省"
+
+#: src/account.c:1467

 msgid "Default account"
 msgstr "缺省帐号"
 
 msgid "Default account"
 msgstr "缺省帐号"
 

-#: src/account.c:1472
+#: src/account.c:1475
+msgid "Accounts List Get Column Name|G"
+msgstr "收取"
+
+#: src/account.c:1481

 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'收信'时收取下面选中账户的邮件"
 
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "'收信'时收取下面选中账户的邮件"
 

-#: src/account.c:1479 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5677 src/compose.c:5968 src/editaddress.c:953
-#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:287
+#: src/account.c:1488 src/addressadd.c:196 src/addressbook.c:132
+#: src/compose.c:5824 src/compose.c:6115 src/editaddress.c:1041
+#: src/editaddress.c:1090 src/editbook.c:175 src/editgroup.c:287

 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
 #: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
 #: src/plugins/pgpcore/select-keys.c:376 src/prefs_filtering.c:364


@@ -85,11 +94,11 @@ msgstr "'收信'时收取下面选中账户的邮件"
 msgid "Name"
 msgstr "名称"
 
 msgid "Name"
 msgstr "名称"
 

-#: src/account.c:1486 src/prefs_account.c:1169 src/prefs_account.c:2696
+#: src/account.c:1495 src/prefs_account.c:1176 src/prefs_account.c:2712

 msgid "Protocol"
 msgstr "通讯协议"
 
 msgid "Protocol"
 msgstr "通讯协议"
 

-#: src/account.c:1493 src/ssl_manager.c:102
+#: src/account.c:1502 src/ssl_manager.c:102

 msgid "Server"
 msgstr "服务器"
 
 msgid "Server"
 msgstr "服务器"
 


@@ -153,7 +162,7 @@ msgstr "--- 已经结束: %s\n"
 msgid "Action's input/output"
 msgstr "动作输入/输出"
 
 msgid "Action's input/output"
 msgstr "动作输入/输出"
 

-#: src/action.c:1527
+#: src/action.c:1529

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -164,11 +173,11 @@ msgstr ""
 "(`%%h' 将被所输入的参数替换)\n"
 "  %s"
 
 "(`%%h' 将被所输入的参数替换)\n"
 "  %s"
 

-#: src/action.c:1532
+#: src/action.c:1534

 msgid "Action's hidden user argument"
 msgstr "用户提供的参数(输入时不回显)"
 
 msgid "Action's hidden user argument"
 msgstr "用户提供的参数(输入时不回显)"
 

-#: src/action.c:1536
+#: src/action.c:1538

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -179,7 +188,7 @@ msgstr ""
 "(`%%u' 将被输入的参数替换)\n"
 "  %s"
 
 "(`%%u' 将被输入的参数替换)\n"
 "  %s"
 

-#: src/action.c:1541
+#: src/action.c:1543

 msgid "Action's user argument"
 msgstr "用户提供的参数"
 
 msgid "Action's user argument"
 msgstr "用户提供的参数"
 


@@ -188,12 +197,12 @@ msgid "Add to address book"
 msgstr "将地址加入地址簿"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377
 msgstr "将地址加入地址簿"
 
 #: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:377

-#: src/toolbar.c:449
+#: src/toolbar.c:459

 msgid "Address"
 msgstr "地址"
 
 msgid "Address"
 msgstr "地址"
 

-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:761
-#: src/editaddress.c:825 src/editgroup.c:289
+#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:849
+#: src/editaddress.c:913 src/editgroup.c:289

 msgid "Remarks"
 msgstr "备注"
 
 msgid "Remarks"
 msgstr "备注"
 


@@ -201,328 +210,318 @@ msgstr "备注"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 

-#: src/addressbook.c:133 src/editaddress.c:759 src/editaddress.c:807
+#: src/addressbook.c:133 src/editaddress.c:847 src/editaddress.c:895

 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "电子邮件"
 
 #: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:638
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "电子邮件"
 

-#: src/addressbook.c:416
+#: src/addressbook.c:419

 msgid "/_Book"
 msgstr "/地址簿(_B)"
 
 msgid "/_Book"
 msgstr "/地址簿(_B)"
 

-#: src/addressbook.c:417
+#: src/addressbook.c:420

 msgid "/_Book/New _Book"
 msgstr "/地址簿(_B)/新增地址簿(_B)"
 
 msgid "/_Book/New _Book"
 msgstr "/地址簿(_B)/新增地址簿(_B)"
 

-#: src/addressbook.c:418
+#: src/addressbook.c:421

 msgid "/_Book/New _Folder"
 msgstr "/地址簿(_B)/新增文件夹(_F)"
 
 msgid "/_Book/New _Folder"
 msgstr "/地址簿(_B)/新增文件夹(_F)"
 

-#: src/addressbook.c:419
+#: src/addressbook.c:422

 msgid "/_Book/New _vCard"
 msgstr "/地址簿(_B)/新增_vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/地址簿(_B)/新增_vCard"
 

-#: src/addressbook.c:421
+#: src/addressbook.c:424

 msgid "/_Book/New _JPilot"
 msgstr "/地址簿(_B)/新增_J-Pilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/地址簿(_B)/新增_J-Pilot"
 

-#: src/addressbook.c:424
+#: src/addressbook.c:427

 msgid "/_Book/New LDAP _Server"
 msgstr "/地址簿(_B)/新增LDAP服务器(_S)"
 
 msgid "/_Book/New LDAP _Server"
 msgstr "/地址簿(_B)/新增LDAP服务器(_S)"
 

-#: src/addressbook.c:426 src/addressbook.c:429
+#: src/addressbook.c:429 src/addressbook.c:432

 msgid "/_Book/---"
 msgstr "/地址簿(_B)/---"
 
 msgid "/_Book/---"
 msgstr "/地址簿(_B)/---"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:430

 msgid "/_Book/_Edit book"
 msgstr "/地址簿(_B)/编辑地址簿(_E)"
 
 msgid "/_Book/_Edit book"
 msgstr "/地址簿(_B)/编辑地址簿(_E)"
 

-#: src/addressbook.c:428
+#: src/addressbook.c:431

 msgid "/_Book/_Delete book"
 msgstr "/地址簿(_B)/删除地址簿(_D)"
 
 msgid "/_Book/_Delete book"
 msgstr "/地址簿(_B)/删除地址簿(_D)"
 

-#: src/addressbook.c:430
+#: src/addressbook.c:433

 msgid "/_Book/_Save"
 msgstr "/地址簿(_B)/保存(_S)"
 
 msgid "/_Book/_Save"
 msgstr "/地址簿(_B)/保存(_S)"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:434

 msgid "/_Book/_Close"
 msgstr "/地址簿(_B)/关闭(_C)"
 
 msgid "/_Book/_Close"
 msgstr "/地址簿(_B)/关闭(_C)"
 

-#: src/addressbook.c:432
+#: src/addressbook.c:435

 msgid "/_Address"
 msgstr "/地址(_A)"
 
 msgid "/_Address"
 msgstr "/地址(_A)"
 

-#: src/addressbook.c:433
+#: src/addressbook.c:436

 msgid "/_Address/_Select all"
 msgstr "/地址(_A)/全选(_S)"
 
 msgid "/_Address/_Select all"
 msgstr "/地址(_A)/全选(_S)"
 

-#: src/addressbook.c:434 src/addressbook.c:438 src/addressbook.c:441
-#: src/addressbook.c:444
+#: src/addressbook.c:437 src/addressbook.c:441 src/addressbook.c:444
+#: src/addressbook.c:447

 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 

-#: src/addressbook.c:435
+#: src/addressbook.c:438

 msgid "/_Address/C_ut"
 msgstr "/地址(_A)/剪切(_u)"
 
 msgid "/_Address/C_ut"
 msgstr "/地址(_A)/剪切(_u)"
 

-#: src/addressbook.c:436
+#: src/addressbook.c:439

 msgid "/_Address/_Copy"
 msgid "/_Address/_Copy"

-msgstr "/地址(_A)/拷贝(_C)"
+msgstr "/地址(_A)/复制(_C)"

 
 

-#: src/addressbook.c:437
+#: src/addressbook.c:440

 msgid "/_Address/_Paste"
 msgstr "/地址(_A)/删除(_P)"
 
 msgid "/_Address/_Paste"
 msgstr "/地址(_A)/删除(_P)"
 

-#: src/addressbook.c:439
+#: src/addressbook.c:442

 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 

-#: src/addressbook.c:440
+#: src/addressbook.c:443

 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 

-#: src/addressbook.c:442
+#: src/addressbook.c:445

 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 

-#: src/addressbook.c:443
+#: src/addressbook.c:446

 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群组(_G)"
 
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群组(_G)"
 

-#: src/addressbook.c:445
+#: src/addressbook.c:448

 msgid "/_Address/_Mail To"
 msgstr "/地址(_A)/发送邮件(_M)"
 
 msgid "/_Address/_Mail To"
 msgstr "/地址(_A)/发送邮件(_M)"
 

-#: src/addressbook.c:446 src/compose.c:767 src/mainwindow.c:799
+#: src/addressbook.c:449 src/compose.c:772 src/mainwindow.c:800

 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "工具(_T)"
 
 #: src/messageview.c:302
 msgid "/_Tools"
 msgstr "工具(_T)"
 

-#: src/addressbook.c:447
+#: src/addressbook.c:450

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/工具(_T)/导入 _LDIF 文件..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/工具(_T)/导入 _LDIF 文件..."
 

-#: src/addressbook.c:448
+#: src/addressbook.c:451

 msgid "/_Tools/Import M_utt file..."
 msgstr "/工具(_T)/导入 M_utt 文件..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/工具(_T)/导入 M_utt 文件..."
 

-#: src/addressbook.c:449
+#: src/addressbook.c:452

 msgid "/_Tools/Import _Pine file..."
 msgstr "/工具(_T)/导入 _Pine 文件..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/工具(_T)/导入 _Pine 文件..."
 

-#: src/addressbook.c:450 src/mainwindow.c:808 src/mainwindow.c:831
-#: src/mainwindow.c:833 src/mainwindow.c:842 src/mainwindow.c:845
-#: src/mainwindow.c:849 src/messageview.c:306 src/messageview.c:327
+#: src/addressbook.c:453 src/mainwindow.c:809 src/mainwindow.c:832
+#: src/mainwindow.c:834 src/mainwindow.c:843 src/mainwindow.c:846
+#: src/mainwindow.c:850 src/messageview.c:306 src/messageview.c:327

 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 

-#: src/addressbook.c:451
+#: src/addressbook.c:454

 msgid "/_Tools/Export _HTML..."
 msgstr "/工具(_T)/导出为 _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/工具(_T)/导出为 _HTML..."
 

-#: src/addressbook.c:452
+#: src/addressbook.c:455

 msgid "/_Tools/Export LDI_F..."
 msgstr "/工具(_T)/导出为 LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/工具(_T)/导出为 LDI_F..."
 

-#: src/addressbook.c:453 src/compose.c:772 src/mainwindow.c:874
+#: src/addressbook.c:456 src/compose.c:777 src/mainwindow.c:875

 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
 #: src/messageview.c:330
 msgid "/_Help"
 msgstr "/帮助(_H)"
 

-#: src/addressbook.c:454 src/compose.c:773 src/mainwindow.c:880
+#: src/addressbook.c:457 src/compose.c:778 src/mainwindow.c:881

 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
 #: src/messageview.c:331
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 

-#: src/addressbook.c:459 src/addressbook.c:475 src/compose.c:540
-#: src/mainwindow.c:518 src/messageview.c:164
+#: src/addressbook.c:462 src/addressbook.c:478 src/compose.c:545
+#: src/mainwindow.c:519 src/messageview.c:164

 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 

-#: src/addressbook.c:460 src/addressbook.c:476
+#: src/addressbook.c:463 src/addressbook.c:479

 msgid "/_Delete"
 msgstr "/删除(_D)"
 
 msgid "/_Delete"
 msgstr "/删除(_D)"
 

-#: src/addressbook.c:461 src/addressbook.c:465 src/addressbook.c:474
-#: src/addressbook.c:477 src/addressbook.c:480 src/addressbook.c:484
-#: src/compose.c:519 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
-#: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:54
-#: src/news_gtk.c:57 src/news_gtk.c:59 src/plugins/trayicon/trayicon.c:102
-#: src/plugins/trayicon/trayicon.c:105 src/plugins/trayicon/trayicon.c:107
-#: src/summaryview.c:423 src/summaryview.c:427 src/summaryview.c:432
-#: src/summaryview.c:450 src/summaryview.c:471 src/summaryview.c:477
-msgid "/---"
-msgstr "/---"
-
-#: src/addressbook.c:462
+#: src/addressbook.c:465

 msgid "/New _Book"
 msgstr "/新建地址簿(_B)"
 
 msgid "/New _Book"
 msgstr "/新建地址簿(_B)"
 

-#: src/addressbook.c:463
+#: src/addressbook.c:466

 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 

-#: src/addressbook.c:464 src/addressbook.c:479
+#: src/addressbook.c:467 src/addressbook.c:482

 msgid "/New _Group"
 msgstr "/新建群组(_G)"
 
 msgid "/New _Group"
 msgstr "/新建群组(_G)"
 

-#: src/addressbook.c:466 src/addressbook.c:481
+#: src/addressbook.c:469 src/addressbook.c:484

 msgid "/C_ut"
 msgstr "/剪切(_u)"
 
 msgid "/C_ut"
 msgstr "/剪切(_u)"
 

-#: src/addressbook.c:467 src/addressbook.c:482
+#: src/addressbook.c:470 src/addressbook.c:485

 msgid "/_Copy"
 msgstr "/复制(_C)"
 
 msgid "/_Copy"
 msgstr "/复制(_C)"
 

-#: src/addressbook.c:468 src/addressbook.c:483
+#: src/addressbook.c:471 src/addressbook.c:486

 msgid "/_Paste"
 msgstr "/粘贴(_P)"
 
 msgid "/_Paste"
 msgstr "/粘贴(_P)"
 

-#: src/addressbook.c:473
+#: src/addressbook.c:476

 msgid "/_Select all"
 msgstr "/全选(_S)"
 
 msgid "/_Select all"
 msgstr "/全选(_S)"
 

-#: src/addressbook.c:478
+#: src/addressbook.c:481

 msgid "/New _Address"
 msgstr "/新建联系地址(_A)"
 
 msgid "/New _Address"
 msgstr "/新建联系地址(_A)"
 

-#: src/addressbook.c:486
+#: src/addressbook.c:489

 msgid "/_Mail To"
 msgstr "/发送邮件(_M)"
 
 msgid "/_Mail To"
 msgstr "/发送邮件(_M)"
 

-#: src/addressbook.c:488
+#: src/addressbook.c:491

 msgid "/_Browse Entry"
 msgstr "/查看项目(_B)"
 
 msgid "/_Browse Entry"
 msgstr "/查看项目(_B)"
 

-#: src/addressbook.c:501 src/crash.c:450 src/crash.c:469 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:132 src/prefs_themes.c:683
+#: src/addressbook.c:504 src/crash.c:453 src/crash.c:472 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_themes.c:683

 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "未知"
 
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "未知"
 

-#: src/addressbook.c:508 src/addressbook.c:527 src/importldif.c:126
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:126

 msgid "Success"
 msgstr "成功"
 
 msgid "Success"
 msgstr "成功"
 

-#: src/addressbook.c:509 src/importldif.c:127
+#: src/addressbook.c:512 src/importldif.c:127

 msgid "Bad arguments"
 msgstr "错误的参数"
 
 msgid "Bad arguments"
 msgstr "错误的参数"
 

-#: src/addressbook.c:510 src/importldif.c:128
+#: src/addressbook.c:513 src/importldif.c:128

 msgid "File not specified"
 msgstr "未指定文件"
 
 msgid "File not specified"
 msgstr "未指定文件"
 

-#: src/addressbook.c:511 src/importldif.c:129
+#: src/addressbook.c:514 src/importldif.c:129

 msgid "Error opening file"
 msgstr "打开文件错误"
 
 msgid "Error opening file"
 msgstr "打开文件错误"
 

-#: src/addressbook.c:512 src/importldif.c:130
+#: src/addressbook.c:515 src/importldif.c:130

 msgid "Error reading file"
 msgstr "读取文件错误"
 
 msgid "Error reading file"
 msgstr "读取文件错误"
 

-#: src/addressbook.c:513 src/importldif.c:131
+#: src/addressbook.c:516 src/importldif.c:131

 msgid "End of file encountered"
 msgstr "遇到文件末尾"
 
 msgid "End of file encountered"
 msgstr "遇到文件末尾"
 

-#: src/addressbook.c:514 src/importldif.c:132
+#: src/addressbook.c:517 src/importldif.c:132

 msgid "Error allocating memory"
 msgstr "内存分配错误"
 
 msgid "Error allocating memory"
 msgstr "内存分配错误"
 

-#: src/addressbook.c:515 src/importldif.c:133
+#: src/addressbook.c:518 src/importldif.c:133

 msgid "Bad file format"
 msgstr "文件格式错误"
 
 msgid "Bad file format"
 msgstr "文件格式错误"
 

-#: src/addressbook.c:516 src/importldif.c:134
+#: src/addressbook.c:519 src/importldif.c:134

 msgid "Error writing to file"
 msgstr "文件写入错误"
 
 msgid "Error writing to file"
 msgstr "文件写入错误"
 

-#: src/addressbook.c:517 src/importldif.c:135
+#: src/addressbook.c:520 src/importldif.c:135

 msgid "Error opening directory"
 msgstr "打开目录错误"
 
 msgid "Error opening directory"
 msgstr "打开目录错误"
 

-#: src/addressbook.c:518 src/importldif.c:136
+#: src/addressbook.c:521 src/importldif.c:136

 msgid "No path specified"
 msgstr "未指定文件路径"
 
 msgid "No path specified"
 msgstr "未指定文件路径"
 

-#: src/addressbook.c:528
+#: src/addressbook.c:531

 msgid "Error connecting to LDAP server"
 msgstr "LDAP 服务器连接错误"
 
 msgid "Error connecting to LDAP server"
 msgstr "LDAP 服务器连接错误"
 

-#: src/addressbook.c:529
+#: src/addressbook.c:532

 msgid "Error initializing LDAP"
 msgstr "LDAP 起始错误"
 
 msgid "Error initializing LDAP"
 msgstr "LDAP 起始错误"
 

-#: src/addressbook.c:530
+#: src/addressbook.c:533

 msgid "Error binding to LDAP server"
 msgstr "无法连接到LDAP服务器"
 
 msgid "Error binding to LDAP server"
 msgstr "无法连接到LDAP服务器"
 

-#: src/addressbook.c:531
+#: src/addressbook.c:534

 msgid "Error searching LDAP database"
 msgstr "搜寻LDAP资料库时出错"
 
 msgid "Error searching LDAP database"
 msgstr "搜寻LDAP资料库时出错"
 

-#: src/addressbook.c:532
+#: src/addressbook.c:535

 msgid "Timeout performing LDAP operation"
 msgstr "进行LDAP操作时超时"
 
 msgid "Timeout performing LDAP operation"
 msgstr "进行LDAP操作时超时"
 

-#: src/addressbook.c:533
+#: src/addressbook.c:536

 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜寻条件错误"
 
 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜寻条件错误"
 

-#: src/addressbook.c:534
+#: src/addressbook.c:537

 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP搜寻没有结果"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP搜寻没有结果"
 

-#: src/addressbook.c:535
+#: src/addressbook.c:538

 msgid "LDAP search terminated on request"
 msgstr "LDAP已按请求终止"
 
 msgid "LDAP search terminated on request"
 msgstr "LDAP已按请求终止"
 

-#: src/addressbook.c:536
+#: src/addressbook.c:539

 msgid "Error starting TLS connection"
 msgstr "创建TLS链接时发生错误"
 
 msgid "Error starting TLS connection"
 msgstr "创建TLS链接时发生错误"
 

-#: src/addressbook.c:853
+#: src/addressbook.c:897

 msgid "Sources"
 msgstr "来源"
 
 msgid "Sources"
 msgstr "来源"
 

-#: src/addressbook.c:857 src/prefs_other.c:101 src/toolbar.c:190
-#: src/toolbar.c:1727
+#: src/addressbook.c:901 src/prefs_other.c:101 src/toolbar.c:194
+#: src/toolbar.c:1787

 msgid "Address book"
 msgstr "地址簿"
 
 msgid "Address book"
 msgstr "地址簿"
 

-#: src/addressbook.c:980
+#: src/addressbook.c:1033

 msgid "Lookup name:"
 msgstr "查找姓名:"
 
 msgid "Lookup name:"
 msgstr "查找姓名:"
 

-#: src/addressbook.c:1040 src/compose.c:2031 src/compose.c:4301
-#: src/compose.c:5523 src/compose.c:6286 src/summary_search.c:291
+#: src/addressbook.c:1106 src/compose.c:2129 src/compose.c:4446
+#: src/compose.c:5670 src/compose.c:6435 src/compose.c:9456
+#: src/summary_search.c:359

 msgid "To:"
 msgstr "To:"
 
 msgid "To:"
 msgstr "To:"
 

-#: src/addressbook.c:1044 src/compose.c:2015 src/compose.c:4044
-#: src/compose.c:4300
+#: src/addressbook.c:1110 src/compose.c:2113 src/compose.c:4182
+#: src/compose.c:4445 src/compose.c:9465

 msgid "Cc:"
 msgstr "Cc:"
 
 msgid "Cc:"
 msgstr "Cc:"
 

-#: src/addressbook.c:1048 src/compose.c:2018 src/compose.c:4075
+#: src/addressbook.c:1114 src/compose.c:2116 src/compose.c:4213

 msgid "Bcc:"
 msgstr "Bcc:"
 
 msgid "Bcc:"
 msgstr "Bcc:"
 

-#: src/addressbook.c:1283 src/addressbook.c:1329
+#: src/addressbook.c:1363 src/addressbook.c:1409

 msgid "Delete address(es)"
 msgstr "删除邮件地址"
 
 msgid "Delete address(es)"
 msgstr "删除邮件地址"
 

-#: src/addressbook.c:1284
+#: src/addressbook.c:1364

 msgid "This address data is readonly and cannot be deleted."
 msgstr "此邮件地址数据是只读的，不能删除。"
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "此邮件地址数据是只读的，不能删除。"
 

-#: src/addressbook.c:1323
+#: src/addressbook.c:1403

 msgid "Delete group"
 msgstr "删除群组"
 
 msgid "Delete group"
 msgstr "删除群组"
 

-#: src/addressbook.c:1324
+#: src/addressbook.c:1404

 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."


@@ -530,30 +529,30 @@ msgstr ""
 "你想要删除这个群组吗?\n"
 "里面的地址数据将会丢失。"
 
 "你想要删除这个群组吗?\n"
 "里面的地址数据将会丢失。"
 

-#: src/addressbook.c:1330
+#: src/addressbook.c:1410

 msgid "Really delete the address(es)?"
 msgstr "确定删除邮件地址?"
 
 msgid "Really delete the address(es)?"
 msgstr "确定删除邮件地址?"
 

-#: src/addressbook.c:1932
+#: src/addressbook.c:2014

 msgid "Cannot paste. Target address book is readonly."
 msgstr "无法粘贴，该地址簿已设为只读。"
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "无法粘贴，该地址簿已设为只读。"
 

-#: src/addressbook.c:1943
+#: src/addressbook.c:2025

 msgid "Cannot paste into an address group."
 msgstr "无法贴入指定的通讯群组。"
 
 # c-format
 msgid "Cannot paste into an address group."
 msgstr "无法贴入指定的通讯群组。"
 
 # c-format

-#: src/addressbook.c:2619
+#: src/addressbook.c:2708

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "你想要删除'%s'里面的查询结果和地址信息吗?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "你想要删除'%s'里面的查询结果和地址信息吗?"
 

-#: src/addressbook.c:2622 src/addressbook.c:2648 src/addressbook.c:2655
+#: src/addressbook.c:2711 src/addressbook.c:2737 src/addressbook.c:2744

 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "删除"
 
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "删除"
 

-#: src/addressbook.c:2631
+#: src/addressbook.c:2720

 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "


@@ -562,19 +561,19 @@ msgstr ""
 "你确定要删除'%s'这个文件夹以及里面所有的地址吗？ \n"
 "如果只删除文件夹，地址簿会被移到上一层的文件夹中。"
 
 "你确定要删除'%s'这个文件夹以及里面所有的地址吗？ \n"
 "如果只删除文件夹，地址簿会被移到上一层的文件夹中。"
 

-#: src/addressbook.c:2634 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2723 src/imap_gtk.c:286 src/mh_gtk.c:182

 msgid "Delete folder"
 msgstr "删除文件夹"
 
 msgid "Delete folder"
 msgstr "删除文件夹"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "+Delete _folder only"
 msgstr "+只删除目录(_f)"
 
 msgid "+Delete _folder only"
 msgstr "+只删除目录(_f)"
 

-#: src/addressbook.c:2635
+#: src/addressbook.c:2724

 msgid "Delete folder and _addresses"
 msgstr "删除目录及地址数据"
 
 msgid "Delete folder and _addresses"
 msgstr "删除目录及地址数据"
 

-#: src/addressbook.c:2646
+#: src/addressbook.c:2735

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -583,7 +582,7 @@ msgstr ""
 "你想要删除'%s'吗?\n"
 "里面的地址数据将会丢失。"
 
 "你想要删除'%s'吗?\n"
 "里面的地址数据将会丢失。"
 

-#: src/addressbook.c:2653
+#: src/addressbook.c:2742

 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"


@@ -592,19 +591,19 @@ msgstr ""
 "你想要删除'%s'吗?\n"
 "里面的地址数据将会丢失。"
 
 "你想要删除'%s'吗?\n"
 "里面的地址数据将会丢失。"
 

-#: src/addressbook.c:3465
+#: src/addressbook.c:3595

 msgid "New user, could not save index file."
 msgstr "新用户，无法保存索引文件。"
 
 msgid "New user, could not save index file."
 msgstr "新用户，无法保存索引文件。"
 

-#: src/addressbook.c:3469
+#: src/addressbook.c:3599

 msgid "New user, could not save address book files."
 msgstr "新用户，无法保存地址簿文件。"
 
 msgid "New user, could not save address book files."
 msgstr "新用户，无法保存地址簿文件。"
 

-#: src/addressbook.c:3479
+#: src/addressbook.c:3609

 msgid "Old address book converted successfully."
 msgstr "转换旧地址簿格式完成。"
 
 msgid "Old address book converted successfully."
 msgstr "转换旧地址簿格式完成。"
 

-#: src/addressbook.c:3484
+#: src/addressbook.c:3614

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."


@@ -612,7 +611,7 @@ msgstr ""
 "旧地址簿格式已转换，\n"
 "但无法保存新的索引文件。"
 
 "旧地址簿格式已转换，\n"
 "但无法保存新的索引文件。"
 

-#: src/addressbook.c:3497
+#: src/addressbook.c:3627

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -620,7 +619,7 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "但空的新地址簿文件已经生成。"
 
 "无法转换地址簿格式，\n"
 "但空的新地址簿文件已经生成。"
 

-#: src/addressbook.c:3503
+#: src/addressbook.c:3633

 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."


@@ -628,7 +627,7 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "无法保存新的地址簿索引文件。"
 
 "无法转换地址簿格式，\n"
 "无法保存新的地址簿索引文件。"
 

-#: src/addressbook.c:3508
+#: src/addressbook.c:3638

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -636,71 +635,71 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "亦无法产生新的地址簿文件。"
 
 "无法转换地址簿格式，\n"
 "亦无法产生新的地址簿文件。"
 

-#: src/addressbook.c:3515 src/addressbook.c:3521
+#: src/addressbook.c:3645 src/addressbook.c:3651

 msgid "Addressbook conversion error"
 msgstr "转换地址簿格式时发生错误"
 
 msgid "Addressbook conversion error"
 msgstr "转换地址簿格式时发生错误"
 

-#: src/addressbook.c:3559
+#: src/addressbook.c:3689

 msgid "Addressbook Error"
 msgstr "地址簿发生错误"
 
 msgid "Addressbook Error"
 msgstr "地址簿发生错误"
 

-#: src/addressbook.c:3560
+#: src/addressbook.c:3690

 msgid "Could not read address index"
 msgstr "无法读取地址簿索引"
 
 msgid "Could not read address index"
 msgstr "无法读取地址簿索引"
 

-#: src/addressbook.c:3887
+#: src/addressbook.c:4017

 msgid "Busy searching..."
 msgstr "正在搜索..."
 
 # c-format
 msgid "Busy searching..."
 msgstr "正在搜索..."
 
 # c-format

-#: src/addressbook.c:3958
+#: src/addressbook.c:4088

 #, c-format
 msgid "Search '%s'"
 msgstr "搜索 '%s'"
 
 #, c-format
 msgid "Search '%s'"
 msgstr "搜索 '%s'"
 

-#: src/addressbook.c:4183
+#: src/addressbook.c:4313

 msgid "Interface"
 msgstr "界面"
 
 msgid "Interface"
 msgstr "界面"
 

-#: src/addressbook.c:4199 src/exphtmldlg.c:378 src/expldifdlg.c:394
+#: src/addressbook.c:4329 src/exphtmldlg.c:375 src/expldifdlg.c:394

 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "地址簿"
 
 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "地址簿"
 

-#: src/addressbook.c:4215
+#: src/addressbook.c:4345

 msgid "Person"
 msgstr "人名"
 
 msgid "Person"
 msgstr "人名"
 

-#: src/addressbook.c:4231
+#: src/addressbook.c:4361

 msgid "EMail Address"
 msgstr "电子邮件邮箱"
 
 msgid "EMail Address"
 msgstr "电子邮件邮箱"
 

-#: src/addressbook.c:4247
+#: src/addressbook.c:4377

 msgid "Group"
 msgstr "群组"
 
 msgid "Group"
 msgstr "群组"
 

-#: src/addressbook.c:4263 src/exporthtml.c:922 src/folderview.c:468
-#: src/prefs_account.c:2409 src/prefs_folder_column.c:79
+#: src/addressbook.c:4393 src/exporthtml.c:922 src/folderview.c:470
+#: src/prefs_account.c:2417 src/prefs_folder_column.c:79

 msgid "Folder"
 msgstr "文件夹"
 
 msgid "Folder"
 msgstr "文件夹"
 

-#: src/addressbook.c:4279
+#: src/addressbook.c:4409

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4295 src/addressbook.c:4311
+#: src/addressbook.c:4425 src/addressbook.c:4441

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4327
+#: src/addressbook.c:4457

 msgid "LDAP servers"
 msgstr "LDAP 服务器"
 
 msgid "LDAP servers"
 msgstr "LDAP 服务器"
 

-#: src/addressbook.c:4343
+#: src/addressbook.c:4473

 msgid "LDAP Query"
 msgstr "LDAP 查询"
 
 msgid "LDAP Query"
 msgstr "LDAP 查询"
 

-#: src/addressbook.c:4659 src/matcher.c:303 src/matcher.c:756
+#: src/addressbook.c:4789 src/matcher.c:303 src/matcher.c:756

 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106
 #: src/matcher.c:889 src/prefs_matcher.c:218 src/prefs_matcher.c:521
 #: src/prefs_matcher.c:1332 src/prefs_matcher.c:1349 src/prefs_matcher.c:1351
 #: src/prefs_matcher.c:2102 src/prefs_matcher.c:2106


@@ -738,7 +737,7 @@ msgstr "请选取选择需要处理的文件夹，或者选择一封或多封邮
 msgid "Folder :"
 msgstr "文件夹 :"
 
 msgid "Folder :"
 msgstr "文件夹 :"
 

-#: src/addrgather.c:365 src/exphtmldlg.c:546 src/expldifdlg.c:626
+#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626

 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "地址簿 :"
 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "地址簿 :"


@@ -763,9 +762,9 @@ msgstr "信头名称"
 msgid "Address Count"
 msgstr "邮件地址数目"
 
 msgid "Address Count"
 msgstr "邮件地址数目"
 

-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4650
-#: src/compose.c:9176 src/messageview.c:578 src/messageview.c:591
-#: src/plugins/pgpcore/sgpgme.c:570
+#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4797
+#: src/compose.c:9377 src/messageview.c:580 src/messageview.c:593
+#: src/plugins/pgpcore/sgpgme.c:575

 msgid "Warning"
 msgstr "警告"
 
 msgid "Warning"
 msgstr "警告"
 


@@ -773,7 +772,7 @@ msgstr "警告"
 msgid "Header Fields"
 msgstr "信头字段"
 
 msgid "Header Fields"
 msgstr "信头字段"
 

-#: src/addrgather.c:539 src/exphtmldlg.c:666 src/expldifdlg.c:738
+#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737

 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "完成"
 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "完成"


@@ -802,12 +801,12 @@ msgstr "公用邮件地址"
 msgid "Personal address"
 msgstr "个人邮件地址"
 
 msgid "Personal address"
 msgstr "个人邮件地址"
 

-#: src/alertpanel.c:141 src/compose.c:7396
+#: src/alertpanel.c:141 src/compose.c:7585

 msgid "Notice"
 msgstr "注意"
 
 msgid "Notice"
 msgstr "注意"
 

-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4590 src/inc.c:616
-#: src/plugins/pgpcore/sgpgme.c:144 src/plugins/pgpcore/sgpgme.c:235
+#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4737 src/inc.c:616
+#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239

 msgid "Error"
 msgstr "错误"
 
 msgid "Error"
 msgstr "错误"
 


@@ -844,76 +843,103 @@ msgstr "属性值"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "无法连接NNTP服务器: %s:%d\n"
 
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "无法连接NNTP服务器: %s:%d\n"
 

-#: src/common/nntp.c:181 src/common/nntp.c:244
+#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:840
+#, fuzzy
+msgid "SSL handshake failed\n"
+msgstr "SSL连接失败 (%s)\n"
+
+#: src/common/nntp.c:182 src/common/nntp.c:245

 #, c-format
 msgid "protocol error: %s\n"
 msgstr "通讯协议错误: %s\n"
 
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "通讯协议错误: %s\n"
 

-#: src/common/nntp.c:204 src/common/nntp.c:250
+#: src/common/nntp.c:205 src/common/nntp.c:251

 msgid "protocol error\n"
 msgstr "通讯协议错误\n"
 
 msgid "protocol error\n"
 msgstr "通讯协议错误\n"
 

-#: src/common/nntp.c:300
+#: src/common/nntp.c:301

 msgid "Error occurred while posting\n"
 msgstr "发表文章时发生错误\n"
 
 msgid "Error occurred while posting\n"
 msgstr "发表文章时发生错误\n"
 

-#: src/common/nntp.c:380
+#: src/common/nntp.c:381

 msgid "Error occurred while sending command\n"
 msgstr "发送命令时发生错误\n"
 
 msgid "Error occurred while sending command\n"
 msgstr "发送命令时发生错误\n"
 

-#: src/common/plugin.c:52
+#: src/common/plugin.c:53

 msgid "Nothing"
 msgstr "无用"
 
 msgid "Nothing"
 msgstr "无用"
 

-#: src/common/plugin.c:53
+#: src/common/plugin.c:54

 msgid "a viewer"
 msgstr "图片查看器"
 
 msgid "a viewer"
 msgstr "图片查看器"
 

-#: src/common/plugin.c:54
+#: src/common/plugin.c:55

 msgid "folders"
 msgstr "文件夹"
 
 msgid "folders"
 msgstr "文件夹"
 

-#: src/common/plugin.c:55
+#: src/common/plugin.c:56

 msgid "filtering"
 msgstr "过滤器"
 
 msgid "filtering"
 msgstr "过滤器"
 

-#: src/common/plugin.c:56
+#: src/common/plugin.c:57

 msgid "a privacy interface"
 msgstr "隐私系统"
 
 msgid "a privacy interface"
 msgstr "隐私系统"
 

-#: src/common/plugin.c:57
+#: src/common/plugin.c:58

 msgid "a notifier"
 msgstr "通知器"
 
 msgid "a notifier"
 msgstr "通知器"
 

-#: src/common/plugin.c:58
+#: src/common/plugin.c:59

 msgid "an utility"
 msgstr "工具"
 
 msgid "an utility"
 msgstr "工具"
 

-#: src/common/plugin.c:59
+#: src/common/plugin.c:60

 msgid "things"
 msgstr "其它"
 
 msgid "things"
 msgstr "其它"
 

-#: src/common/plugin.c:257
+#: src/common/plugin.c:258

 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "该账户提供%s(%s)功能，但%s插件已经提供了此功能。"
 
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "该账户提供%s(%s)功能，但%s插件已经提供了此功能。"
 

-#: src/common/plugin.c:292
+#: src/common/plugin.c:293

 msgid "Plugin already loaded"
 msgstr "插件已经加载"
 
 msgid "Plugin already loaded"
 msgstr "插件已经加载"
 

-#: src/common/plugin.c:302
+#: src/common/plugin.c:303

 msgid "Failed to allocate memory for Plugin"
 msgstr "为插件分配内存失败"
 
 msgid "Failed to allocate memory for Plugin"
 msgstr "为插件分配内存失败"
 

-#: src/common/plugin.c:329
+#: src/common/plugin.c:330

 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "该模块并不以通用许可协议(GPL)兼容协议发布。"
 
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "该模块并不以通用许可协议(GPL)兼容协议发布。"
 

-#: src/common/plugin.c:336
-msgid "This module is for Sylpheed-Claws GTK1."
-msgstr "该模块是为GTK1版本的Sylpheed-Claws。"
+#: src/common/plugin.c:337
+msgid "This module is for Claws Mail GTK1."
+msgstr "该模块是为GTK1版本的Claws Mail。"
+
+#: src/common/plugin.c:550
+#, c-format
+msgid ""
+"Your version of Claws Mail is newer than the version the '%s' plugin was "
+"built with."
+msgstr ""
+
+#: src/common/plugin.c:553
+msgid ""
+"Your version of Claws Mail is newer than the version the plugin was built "
+"with."
+msgstr ""
+
+#: src/common/plugin.c:562
+#, c-format
+msgid "Your version of Claws Mail is too old for the '%s' plugin."
+msgstr ""
+
+#: src/common/plugin.c:564
+msgid "Your version of Claws Mail is too old for the plugin."
+msgstr ""

 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"
 
 #: src/common/smtp.c:176
 msgid "SMTP AUTH not available\n"


@@ -954,16 +980,16 @@ msgstr "创建SSL环境出错\n"
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL连接失败 (%s)\n"
 
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL连接失败 (%s)\n"
 

-#: src/common/ssl_certificate.c:189 src/common/ssl_certificate.c:200
-#: src/common/ssl_certificate.c:206 src/common/ssl_certificate.c:213
-#: src/common/ssl_certificate.c:224 src/common/ssl_certificate.c:230
+#: src/common/ssl_certificate.c:208 src/common/ssl_certificate.c:219
+#: src/common/ssl_certificate.c:225 src/common/ssl_certificate.c:232
+#: src/common/ssl_certificate.c:243 src/common/ssl_certificate.c:249

 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<不在认证之内>"
 
 #: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
 #: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
 #: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
 msgid "<not in certificate>"
 msgstr "<不在认证之内>"
 

-#: src/common/ssl_certificate.c:239
+#: src/common/ssl_certificate.c:258

 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"
 #, c-format
 msgid ""
 "  Owner: %s (%s) in %s\n"


@@ -976,7 +1002,7 @@ msgstr ""
 "  指纹: %s\n"
 "  签名状态: %s"
 
 "  指纹: %s\n"
 "  签名状态: %s"
 

-#: src/common/ssl_certificate.c:348
+#: src/common/ssl_certificate.c:385

 msgid "Couldn't load X509 default paths"
 msgstr "无法加载X509缺省路径"
 
 msgid "Couldn't load X509 default paths"
 msgstr "无法加载X509缺省路径"
 


@@ -1004,479 +1030,688 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
 msgid "%.2fGB"
 msgstr ""
 

-#: src/compose.c:517
+#: src/common/utils.c:4799
+msgid "Complete day name for use by strftime|Sunday"
+msgstr "星期日"
+
+#: src/common/utils.c:4800
+msgid "Complete day name for use by strftime|Monday"
+msgstr "星期一"
+
+#: src/common/utils.c:4801
+msgid "Complete day name for use by strftime|Tuesday"
+msgstr "星期二"
+
+#: src/common/utils.c:4802
+msgid "Complete day name for use by strftime|Wednesday"
+msgstr "星期三"
+
+#: src/common/utils.c:4803
+msgid "Complete day name for use by strftime|Thursday"
+msgstr "星期四"
+
+#: src/common/utils.c:4804
+msgid "Complete day name for use by strftime|Friday"
+msgstr "星期五"
+
+#: src/common/utils.c:4805
+msgid "Complete day name for use by strftime|Saturday"
+msgstr "星期六"
+
+#: src/common/utils.c:4807
+msgid "Complete month name for use by strftime|January"
+msgstr "一月"
+
+#: src/common/utils.c:4808
+msgid "Complete month name for use by strftime|February"
+msgstr "二月"
+
+#: src/common/utils.c:4809
+msgid "Complete month name for use by strftime|March"
+msgstr "三月"
+
+#: src/common/utils.c:4810
+msgid "Complete month name for use by strftime|April"
+msgstr "四月"
+
+#: src/common/utils.c:4811
+msgid "Complete month name for use by strftime|May"
+msgstr "五月"
+
+#: src/common/utils.c:4812
+msgid "Complete month name for use by strftime|June"
+msgstr "六月"
+
+#: src/common/utils.c:4813
+msgid "Complete month name for use by strftime|July"
+msgstr "七月"
+
+#: src/common/utils.c:4814
+msgid "Complete month name for use by strftime|August"
+msgstr "八月"
+
+#: src/common/utils.c:4815
+msgid "Complete month name for use by strftime|September"
+msgstr "九月"
+
+#: src/common/utils.c:4816
+msgid "Complete month name for use by strftime|October"
+msgstr "十月"
+
+#: src/common/utils.c:4817
+msgid "Complete month name for use by strftime|November"
+msgstr "十一月"
+
+#: src/common/utils.c:4818
+msgid "Complete month name for use by strftime|December"
+msgstr "十二月"
+
+#: src/common/utils.c:4820
+msgid "Abbr. day name for use by strftime|Sun"
+msgstr "日"
+
+#: src/common/utils.c:4821
+msgid "Abbr. day name for use by strftime|Mon"
+msgstr "一"
+
+#: src/common/utils.c:4822
+msgid "Abbr. day name for use by strftime|Tue"
+msgstr "二"
+
+#: src/common/utils.c:4823
+msgid "Abbr. day name for use by strftime|Wed"
+msgstr "三"
+
+#: src/common/utils.c:4824
+msgid "Abbr. day name for use by strftime|Thu"
+msgstr "四"
+
+#: src/common/utils.c:4825
+msgid "Abbr. day name for use by strftime|Fri"
+msgstr "五"
+
+#: src/common/utils.c:4826
+msgid "Abbr. day name for use by strftime|Sat"
+msgstr "六"
+
+#: src/common/utils.c:4828
+msgid "Abbr. month name for use by strftime|Jan"
+msgstr "一"
+
+#: src/common/utils.c:4829
+msgid "Abbr. month name for use by strftime|Feb"
+msgstr "二"
+
+#: src/common/utils.c:4830
+msgid "Abbr. month name for use by strftime|Mar"
+msgstr "三"
+
+#: src/common/utils.c:4831
+msgid "Abbr. month name for use by strftime|Apr"
+msgstr "四"
+
+#: src/common/utils.c:4832
+msgid "Abbr. month name for use by strftime|May"
+msgstr "五"
+
+#: src/common/utils.c:4833
+msgid "Abbr. month name for use by strftime|Jun"
+msgstr "六"
+
+#: src/common/utils.c:4834
+msgid "Abbr. month name for use by strftime|Jul"
+msgstr "七"
+
+#: src/common/utils.c:4835
+msgid "Abbr. month name for use by strftime|Aug"
+msgstr "八"
+
+#: src/common/utils.c:4836
+msgid "Abbr. month name for use by strftime|Sep"
+msgstr "九"
+
+#: src/common/utils.c:4837
+msgid "Abbr. month name for use by strftime|Oct"
+msgstr "十"
+
+#: src/common/utils.c:4838
+msgid "Abbr. month name for use by strftime|Nov"
+msgstr "十一"
+
+#: src/common/utils.c:4839
+msgid "Abbr. month name for use by strftime|Dec"
+msgstr "十二"
+
+#: src/common/utils.c:4841
+msgid "For use by strftime (morning)|AM"
+msgstr "上午"
+
+#: src/common/utils.c:4842
+msgid "For use by strftime (afternoon)|PM"
+msgstr "下午"
+
+#: src/common/utils.c:4843
+msgid "For use by strftime (morning, lowercase)|am"
+msgstr "am"
+
+#: src/common/utils.c:4844
+msgid "For use by strftime (afternoon, lowercase)|pm"
+msgstr "pm"
+
+#: src/common/utils.c:4846
+msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
+msgstr ""
+
+#: src/common/utils.c:4847
+msgid "For use by strftime (default date format)|%m/%d/%y"
+msgstr ""
+
+#: src/common/utils.c:4848
+msgid "For use by strftime (default time format)|%H:%M:%S"
+msgstr ""
+
+#: src/common/utils.c:4850
+msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
+msgstr ""
+
+#: src/compose.c:522

 msgid "/_Add..."
 msgstr "/新增(_A)..."
 
 msgid "/_Add..."
 msgstr "/新增(_A)..."
 

-#: src/compose.c:518
+#: src/compose.c:523

 msgid "/_Remove"
 msgstr "/删除(_R)"
 
 msgid "/_Remove"
 msgstr "/删除(_R)"
 

-#: src/compose.c:520 src/folderview.c:292
+#: src/compose.c:525 src/folderview.c:294

 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 

-#: src/compose.c:525 src/mainwindow.c:740 src/messageview.c:285
+#: src/compose.c:530 src/mainwindow.c:741 src/messageview.c:285

 msgid "/_Message"
 msgstr "/邮件(_M)"
 
 msgid "/_Message"
 msgstr "/邮件(_M)"
 

-#: src/compose.c:526
+#: src/compose.c:531

 msgid "/_Message/_Send"
 msgstr "/邮件(_M)/发送(_S)"
 
 msgid "/_Message/_Send"
 msgstr "/邮件(_M)/发送(_S)"
 

-#: src/compose.c:528
+#: src/compose.c:533

 msgid "/_Message/Send _later"
 msgstr "/邮件(_M)/稍后发送(_l)"
 
 msgid "/_Message/Send _later"
 msgstr "/邮件(_M)/稍后发送(_l)"
 

-#: src/compose.c:530 src/compose.c:534 src/compose.c:537 src/mainwindow.c:750
-#: src/mainwindow.c:760 src/mainwindow.c:773 src/mainwindow.c:779
-#: src/mainwindow.c:796 src/messageview.c:288 src/messageview.c:296
+#: src/compose.c:535 src/compose.c:539 src/compose.c:542 src/mainwindow.c:751
+#: src/mainwindow.c:761 src/mainwindow.c:774 src/mainwindow.c:780
+#: src/mainwindow.c:797 src/messageview.c:288 src/messageview.c:296

 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 

-#: src/compose.c:531
+#: src/compose.c:536

 msgid "/_Message/_Attach file"
 msgstr "/邮件(_M)/附加(_A)"
 
 msgid "/_Message/_Attach file"
 msgstr "/邮件(_M)/附加(_A)"
 

-#: src/compose.c:532
+#: src/compose.c:537

 msgid "/_Message/_Insert file"
 msgstr "/邮件(_M)/插入文件(_I)"
 
 msgid "/_Message/_Insert file"
 msgstr "/邮件(_M)/插入文件(_I)"
 

-#: src/compose.c:533
+#: src/compose.c:538

 msgid "/_Message/Insert si_gnature"
 msgstr "/邮件(_M)/插入签名(_g)"
 
 msgid "/_Message/Insert si_gnature"
 msgstr "/邮件(_M)/插入签名(_g)"
 

-#: src/compose.c:535
+#: src/compose.c:540

 msgid "/_Message/_Save"
 msgstr "/邮件(_M)/保存(_S)"
 
 msgid "/_Message/_Save"
 msgstr "/邮件(_M)/保存(_S)"
 

-#: src/compose.c:538
+#: src/compose.c:543

 msgid "/_Message/_Close"
 msgstr "/邮件(_M)/关闭(_C)"
 
 msgid "/_Message/_Close"
 msgstr "/邮件(_M)/关闭(_C)"
 

-#: src/compose.c:541
+#: src/compose.c:546

 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤消(_U)"
 
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤消(_U)"
 

-#: src/compose.c:542
+#: src/compose.c:547

 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复前一个动作(_R)"
 
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复前一个动作(_R)"
 

-#: src/compose.c:543 src/compose.c:631 src/compose.c:634 src/compose.c:640
-#: src/mainwindow.c:522 src/messageview.c:167
+#: src/compose.c:548 src/compose.c:636 src/compose.c:639 src/compose.c:645
+#: src/mainwindow.c:523 src/messageview.c:167

 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 

-#: src/compose.c:544
+#: src/compose.c:549

 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_t)"
 
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_t)"
 

-#: src/compose.c:545 src/mainwindow.c:519 src/messageview.c:165
+#: src/compose.c:550 src/mainwindow.c:520 src/messageview.c:165

 msgid "/_Edit/_Copy"
 msgid "/_Edit/_Copy"

-msgstr "/编辑(_E)/拷贝(_C)"
+msgstr "/编辑(_E)/复制(_C)"

 
 

-#: src/compose.c:546
+#: src/compose.c:551

 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 

-#: src/compose.c:547
+#: src/compose.c:552

 msgid "/_Edit/Special paste"
 msgstr "/编辑(_E)/选择性粘贴"
 
 msgid "/_Edit/Special paste"
 msgstr "/编辑(_E)/选择性粘贴"
 

-#: src/compose.c:548
+#: src/compose.c:553

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/编辑(_E)/选择性粘贴/粘贴为引文(_q)"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/编辑(_E)/选择性粘贴/粘贴为引文(_q)"
 

-#: src/compose.c:550
+#: src/compose.c:555

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/编辑(_E)/选择性粘贴/自动折行(_w)"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/编辑(_E)/选择性粘贴/自动折行(_w)"
 

-#: src/compose.c:552
+#: src/compose.c:557

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/编辑(_E)/选择性粘贴/不自动折行(_u)"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/编辑(_E)/选择性粘贴/不自动折行(_u)"
 

-#: src/compose.c:554 src/mainwindow.c:520 src/messageview.c:166
+#: src/compose.c:559 src/mainwindow.c:521 src/messageview.c:166

 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_a)"
 
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_a)"
 

-#: src/compose.c:555
+#: src/compose.c:560

 msgid "/_Edit/A_dvanced"
 msgstr "/编辑(_E)/高级(_d)"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/编辑(_E)/高级(_d)"
 

-#: src/compose.c:556
+#: src/compose.c:561

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字符"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字符"
 

-#: src/compose.c:561
+#: src/compose.c:566

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字符"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字符"
 

-#: src/compose.c:566
+#: src/compose.c:571

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字"
 

-#: src/compose.c:571
+#: src/compose.c:576

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字"
 

-#: src/compose.c:576
+#: src/compose.c:581

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/编辑(_E)/高级(_d)/移到行开头"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/编辑(_E)/高级(_d)/移到行开头"
 

-#: src/compose.c:581
+#: src/compose.c:586

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/编辑(_E)/高级(_d)/移到行尾"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/编辑(_E)/高级(_d)/移到行尾"
 

-#: src/compose.c:586
+#: src/compose.c:591

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/编辑(_E)/高级(_d)/移到前一行"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/编辑(_E)/高级(_d)/移到前一行"
 

-#: src/compose.c:591
+#: src/compose.c:596

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/编辑(_E)/高级(_d)/移到下一行"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/编辑(_E)/高级(_d)/移到下一行"
 

-#: src/compose.c:596
+#: src/compose.c:601

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字符"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字符"
 

-#: src/compose.c:601
+#: src/compose.c:606

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字符"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字符"
 

-#: src/compose.c:606
+#: src/compose.c:611

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字"
 

-#: src/compose.c:611
+#: src/compose.c:616

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字"
 

-#: src/compose.c:616
+#: src/compose.c:621

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 

-#: src/compose.c:621
+#: src/compose.c:626

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 

-#: src/compose.c:626
+#: src/compose.c:631

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/编辑(_E)/高级(_d)/从游标处起删除至行尾"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/编辑(_E)/高级(_d)/从游标处起删除至行尾"
 

-#: src/compose.c:632
+#: src/compose.c:637

 msgid "/_Edit/_Find"
 msgstr "/编辑(_E)/查找(_F)"
 
 msgid "/_Edit/_Find"
 msgstr "/编辑(_E)/查找(_F)"
 

-#: src/compose.c:635
+#: src/compose.c:640

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/将当前段落折行(_W)"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/将当前段落折行(_W)"
 

-#: src/compose.c:637
+#: src/compose.c:642

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/将所有过长的行折行(_l)"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/将所有过长的行折行(_l)"
 

-#: src/compose.c:639
+#: src/compose.c:644

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_o)"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_o)"
 

-#: src/compose.c:641
+#: src/compose.c:646

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/编辑(_E)/使用外部编辑器(_x)"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/编辑(_E)/使用外部编辑器(_x)"
 

-#: src/compose.c:644
+#: src/compose.c:649

 msgid "/_Spelling"
 msgstr "/拼写(_S)"
 
 msgid "/_Spelling"
 msgstr "/拼写(_S)"
 

-#: src/compose.c:645
+#: src/compose.c:650

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/拼写(_S)/检查全文或选定区域(_C)"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/拼写(_S)/检查全文或选定区域(_C)"
 

-#: src/compose.c:647
+#: src/compose.c:652

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/拼写(_S)/显示所有拼错的单词(_H)"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/拼写(_S)/显示所有拼错的单词(_H)"
 

-#: src/compose.c:649
+#: src/compose.c:654

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/拼写(_S)/向后检查拼错的单词(_b)"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/拼写(_S)/向后检查拼错的单词(_b)"
 

-#: src/compose.c:651
+#: src/compose.c:656

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/拼写(_S)/向前检查拼错的单词(_F)"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/拼写(_S)/向前检查拼错的单词(_F)"
 

-#: src/compose.c:653
+#: src/compose.c:658

 msgid "/_Spelling/---"
 msgstr "/拼写(_S)/---"
 
 msgid "/_Spelling/---"
 msgstr "/拼写(_S)/---"
 

-#: src/compose.c:654
+#: src/compose.c:659

 msgid "/_Spelling/Options"
 msgstr "/拼写(_S)/选项"
 
 msgid "/_Spelling/Options"
 msgstr "/拼写(_S)/选项"
 

-#: src/compose.c:657
+#: src/compose.c:662

 msgid "/_Options"
 msgstr "/选项(_O)"
 
 msgid "/_Options"
 msgstr "/选项(_O)"
 

-#: src/compose.c:658
+#: src/compose.c:663

 msgid "/_Options/Reply _mode"
 msgstr "/选项(_O)/回复方式(_m)"
 
 msgid "/_Options/Reply _mode"
 msgstr "/选项(_O)/回复方式(_m)"
 

-#: src/compose.c:659
+#: src/compose.c:664

 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/选项(_O)/回复方式(_m)/普通(_N)"
 
 msgid "/_Options/Reply _mode/_Normal"
 msgstr "/选项(_O)/回复方式(_m)/普通(_N)"
 

-#: src/compose.c:660
+#: src/compose.c:665

 msgid "/_Options/Reply _mode/_All"
 msgstr "/选项(_O)/回复方式(_m)/全部人(_a)"
 
 msgid "/_Options/Reply _mode/_All"
 msgstr "/选项(_O)/回复方式(_m)/全部人(_a)"
 

-#: src/compose.c:661
+#: src/compose.c:666

 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/选项(_O)/回复方式(_m)/发信人(_s)"
 
 msgid "/_Options/Reply _mode/_Sender"
 msgstr "/选项(_O)/回复方式(_m)/发信人(_s)"
 

-#: src/compose.c:662
+#: src/compose.c:667

 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/选项(_O)/回复方式(_m)/邮件列表(_M)"
 
 msgid "/_Options/Reply _mode/_Mailing-list"
 msgstr "/选项(_O)/回复方式(_m)/邮件列表(_M)"
 

-#: src/compose.c:663 src/compose.c:668 src/compose.c:675 src/compose.c:677
-#: src/compose.c:679
+#: src/compose.c:668 src/compose.c:673 src/compose.c:680 src/compose.c:682
+#: src/compose.c:684

 msgid "/_Options/---"
 msgstr "/选项(_O)/---"
 
 msgid "/_Options/---"
 msgstr "/选项(_O)/---"
 

-#: src/compose.c:664
+#: src/compose.c:669

 msgid "/_Options/Privacy _System"
 msgstr "/选项(_O)/隐私系统(_S)"
 
 msgid "/_Options/Privacy _System"
 msgstr "/选项(_O)/隐私系统(_S)"
 

-#: src/compose.c:665
+#: src/compose.c:670

 msgid "/_Options/Privacy _System/None"
 msgstr "/选项(_O)/隐私系统(_S)/无"
 
 msgid "/_Options/Privacy _System/None"
 msgstr "/选项(_O)/隐私系统(_S)/无"
 

-#: src/compose.c:666
+#: src/compose.c:671

 msgid "/_Options/Si_gn"
 msgstr "/选项(_O)/签名(_g)"
 
 msgid "/_Options/Si_gn"
 msgstr "/选项(_O)/签名(_g)"
 

-#: src/compose.c:667
+#: src/compose.c:672

 msgid "/_Options/_Encrypt"
 msgstr "/选项(_O)/加密(_E)"
 
 msgid "/_Options/_Encrypt"
 msgstr "/选项(_O)/加密(_E)"
 

-#: src/compose.c:669
+#: src/compose.c:674

 msgid "/_Options/_Priority"
 msgstr "/选项(_O)/优先级(_P)"
 
 msgid "/_Options/_Priority"
 msgstr "/选项(_O)/优先级(_P)"
 

-#: src/compose.c:670
+#: src/compose.c:675

 msgid "/_Options/Priority/_Highest"
 msgstr "/选项(_O)/优先顺序/最优先(_H)"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/选项(_O)/优先顺序/最优先(_H)"
 

-#: src/compose.c:671
+#: src/compose.c:676

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/选项(_O)/优先顺序/优先(_g)"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/选项(_O)/优先顺序/优先(_g)"
 

-#: src/compose.c:672
+#: src/compose.c:677

 msgid "/_Options/Priority/_Normal"
 msgstr "/选项(_O)/优先顺序/普通(_N)"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/选项(_O)/优先顺序/普通(_N)"
 

-#: src/compose.c:673
+#: src/compose.c:678

 msgid "/_Options/Priority/Lo_w"
 msgstr "/选项(_O)/优先顺序/低(_w)"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/选项(_O)/优先顺序/低(_w)"
 

-#: src/compose.c:674
+#: src/compose.c:679

 msgid "/_Options/Priority/_Lowest"
 msgstr "/选项(_O)/优先顺序/最低(_L)"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/选项(_O)/优先顺序/最低(_L)"
 

-#: src/compose.c:676
+#: src/compose.c:681

 msgid "/_Options/_Request Return Receipt"
 msgstr "/选项(_O)/请求回执(_R)"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/选项(_O)/请求回执(_R)"
 

-#: src/compose.c:678
+#: src/compose.c:683

 msgid "/_Options/Remo_ve references"
 msgstr "/选项(_O)/删除引用(_V)"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/选项(_O)/删除引用(_V)"
 

-#: src/compose.c:685
+#: src/compose.c:690

 msgid "/_Options/Character _encoding"
 msgstr "/选项(_O)/字符编码(_e)"
 
 msgid "/_Options/Character _encoding"
 msgstr "/选项(_O)/字符编码(_e)"
 

-#: src/compose.c:686
+#: src/compose.c:691

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/选项(_O)/字符集(_e)/自动侦测(_A)"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/选项(_O)/字符集(_e)/自动侦测(_A)"
 

-#: src/compose.c:688 src/compose.c:694 src/compose.c:702 src/compose.c:706
-#: src/compose.c:712 src/compose.c:716 src/compose.c:722 src/compose.c:728
-#: src/compose.c:732 src/compose.c:742 src/compose.c:746 src/compose.c:756
-#: src/compose.c:760
+#: src/compose.c:693 src/compose.c:699 src/compose.c:707 src/compose.c:711
+#: src/compose.c:717 src/compose.c:721 src/compose.c:727 src/compose.c:733
+#: src/compose.c:737 src/compose.c:747 src/compose.c:751 src/compose.c:761
+#: src/compose.c:765

 msgid "/_Options/Character _encoding/---"
 msgstr "/选项(_O)/字符编码(_e)/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/选项(_O)/字符编码(_e)/---"
 

-#: src/compose.c:690
+#: src/compose.c:695

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/选项(_O)/字符集(_e)/7bit ascii (US-ASCII)(_ I)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/选项(_O)/字符集(_e)/7bit ascii (US-ASCII)(_ I)"
 

-#: src/compose.c:692
+#: src/compose.c:697

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/选项(_O)/字符集(_e)/Unicode (UTF-8)(_U)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/选项(_O)/字符集(_e)/Unicode (UTF-8)(_U)"
 

-#: src/compose.c:696
+#: src/compose.c:701

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-1)(_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-1)(_1)"
 

-#: src/compose.c:698
+#: src/compose.c:703

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-15)"
 

-#: src/compose.c:700
+#: src/compose.c:705

 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/选项(_O)/字符集(_e)/西欧(Windows-1252)"
 
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/选项(_O)/字符集(_e)/西欧(Windows-1252)"
 

-#: src/compose.c:704
+#: src/compose.c:709

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-_2)"
 

-#: src/compose.c:708
+#: src/compose.c:713

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 

-#: src/compose.c:710
+#: src/compose.c:715

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-_4)"
 

-#: src/compose.c:714
+#: src/compose.c:719

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 

-#: src/compose.c:718
+#: src/compose.c:723

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 

-#: src/compose.c:720
+#: src/compose.c:725

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1255)"
 

-#: src/compose.c:724
+#: src/compose.c:729

 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (ISO-8859-_6"
 
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (ISO-8859-_6"
 

-#: src/compose.c:726
+#: src/compose.c:731

 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (Windows-1256)"
 
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (Windows-1256)"
 

-#: src/compose.c:730
+#: src/compose.c:735

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/选项(_O)/字符集(_e)/土耳其 (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/选项(_O)/字符集(_e)/土耳其 (ISO-8859-_9)"
 

-#: src/compose.c:734
+#: src/compose.c:739

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 

-#: src/compose.c:736
+#: src/compose.c:741

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (KOI8-_R)"
 

-#: src/compose.c:738
+#: src/compose.c:743

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫(KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫(KOI8-U)"
 

-#: src/compose.c:740
+#: src/compose.c:745

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1251)"
 

-#: src/compose.c:744
+#: src/compose.c:749

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/选项(_O)/字符集(_e)/日文 (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/选项(_O)/字符集(_e)/日文 (ISO-2022-_JP)"
 

-#: src/compose.c:748
+#: src/compose.c:753

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (_GB2312)"
 

-#: src/compose.c:750
+#: src/compose.c:755

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (GBK)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (GBK)"
 

-#: src/compose.c:752
+#: src/compose.c:757

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (_Big5)"
 

-#: src/compose.c:754
+#: src/compose.c:759

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (EUC-_TW)"
 

-#: src/compose.c:758
+#: src/compose.c:763

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/选项(_O)/字符集(_e)/韩文 (EUC-_KR) "
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/选项(_O)/字符集(_e)/韩文 (EUC-_KR) "
 

-#: src/compose.c:762
+#: src/compose.c:767

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (TIS-620)"
 

-#: src/compose.c:764
+#: src/compose.c:769

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (Windows-874)"
 

-#: src/compose.c:768
+#: src/compose.c:773

 msgid "/_Tools/Show _ruler"
 msgstr "/工具(_T)/显示标尺(_r)"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/工具(_T)/显示标尺(_r)"
 

-#: src/compose.c:769 src/messageview.c:303
+#: src/compose.c:774 src/messageview.c:303

 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 

-#: src/compose.c:770
+#: src/compose.c:775

 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用邮件模板(_T)"
 
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用邮件模板(_T)"
 

-#: src/compose.c:771 src/mainwindow.c:832 src/messageview.c:328
+#: src/compose.c:776 src/mainwindow.c:833 src/messageview.c:328

 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/执行动作(_n)"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/执行动作(_n)"
 

-#: src/compose.c:1598
+#: src/compose.c:1039 src/prefs_compose_writing.c:384
+msgid "New message subject format error."
+msgstr "新邮件'主题'格式错误。"
+
+#: src/compose.c:1068 src/prefs_compose_writing.c:388
+msgid "New message body format error."
+msgstr "新邮件内容格式错误。"
+
+#: src/compose.c:1438 src/prefs_quote.c:281
+msgid "Message reply format error."
+msgstr "邮件回复格式错误。"
+
+#: src/compose.c:1555 src/prefs_quote.c:286
+msgid "Message forward format error."
+msgstr "邮件转发格式错误。"
+
+#: src/compose.c:1675

 msgid "Fw: multiple emails"
 msgstr "转发: 多封邮件"
 
 msgid "Fw: multiple emails"
 msgstr "转发: 多封邮件"
 

-#: src/compose.c:2021
+#: src/compose.c:2050
+msgid "Message redirect format error."
+msgstr "邮件重定向格式错误。"
+
+#: src/compose.c:2119

 msgid "Reply-To:"
 msgstr ""
 
 msgid "Reply-To:"
 msgstr ""
 

-#: src/compose.c:2024 src/compose.c:5520 src/compose.c:6288
+#: src/compose.c:2122 src/compose.c:5667 src/compose.c:6437 src/compose.c:9475

 msgid "Newsgroups:"
 msgstr "新闻组:"
 
 msgid "Newsgroups:"
 msgstr "新闻组:"
 

-#: src/compose.c:2027
+#: src/compose.c:2125

 msgid "Followup-To:"
 msgstr ""
 
 msgid "Followup-To:"
 msgstr ""
 

-#: src/compose.c:2424
+#: src/compose.c:2304
+#, c-format
+msgid "The file '%s' has been attached."
+msgstr "已经添加附件'%s'。"
+
+#: src/compose.c:2308
+msgid "Couldn't attach a file (charset conversion failed)."
+msgstr "无法添加附件(转换字符集失败)。"
+
+#: src/compose.c:2539

 msgid "Quote mark format error."
 msgstr "引文格式错误。"
 
 msgid "Quote mark format error."
 msgstr "引文格式错误。"
 

-#: src/compose.c:2440
-msgid "Message reply/forward format error."
-msgstr "回复/转发邮件格式错误。"
-
-#: src/compose.c:2997
+#: src/compose.c:3133

 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 不存在。"
 
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 不存在。"
 

-#: src/compose.c:3001
+#: src/compose.c:3137

 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 

-#: src/compose.c:3028
+#: src/compose.c:3164

 #, c-format
 msgid "Message: %s"
 msgstr "邮件: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "邮件: %s"
 

-#: src/compose.c:3846
+#: src/compose.c:3983

 msgid " [Edited]"
 msgstr " [已修改] "
 
 msgid " [Edited]"
 msgstr " [已修改] "
 

-#: src/compose.c:3852
+#: src/compose.c:3989

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新邮件%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新邮件%s"
 

-#: src/compose.c:3855
+#: src/compose.c:3992

 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[无主题] - 撰写新邮件%s"
 
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[无主题] - 撰写新邮件%s"
 

-#: src/compose.c:3880 src/messageview.c:613
+#: src/compose.c:4017 src/messageview.c:615

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1484,32 +1719,32 @@ msgstr ""
 "你选用的帐号并非一个电子邮件帐号，可能是用来在新闻组上发表文章用的。\n"
 "要发送邮件请选择一个电子邮件帐号。"
 
 "你选用的帐号并非一个电子邮件帐号，可能是用来在新闻组上发表文章用的。\n"
 "要发送邮件请选择一个电子邮件帐号。"
 

-#: src/compose.c:4057 src/compose.c:4088 src/compose.c:4119 src/toolbar.c:391
-#: src/toolbar.c:442
+#: src/compose.c:4195 src/compose.c:4226 src/compose.c:4258 src/toolbar.c:401
+#: src/toolbar.c:452

 msgid "Send"
 msgstr "发送"
 
 msgid "Send"
 msgstr "发送"
 

-#: src/compose.c:4058
+#: src/compose.c:4196

 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "缺省的抄送地址是仅有的收件人，要发送吗？"
 
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "缺省的抄送地址是仅有的收件人，要发送吗？"
 

-#: src/compose.c:4059 src/compose.c:4090 src/compose.c:4121 src/compose.c:4590
+#: src/compose.c:4197 src/compose.c:4228 src/compose.c:4260 src/compose.c:4737

 msgid "+_Send"
 msgstr "+ 发送(_S)"
 
 msgid "+_Send"
 msgstr "+ 发送(_S)"
 

-#: src/compose.c:4089
+#: src/compose.c:4227

 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "缺省的密送地址是仅有的收件若，要发送吗？"
 
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "缺省的密送地址是仅有的收件若，要发送吗？"
 

-#: src/compose.c:4106
+#: src/compose.c:4244

 msgid "Recipient is not specified."
 msgstr "没有指定收信人。"
 
 msgid "Recipient is not specified."
 msgstr "没有指定收信人。"
 

-#: src/compose.c:4120
+#: src/compose.c:4259

 msgid "Subject is empty. Send it anyway?"
 msgstr "没有标题。确定要发送？"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "没有标题。确定要发送？"
 

-#: src/compose.c:4163 src/compose.c:7749
+#: src/compose.c:4306 src/compose.c:7938

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1519,7 +1754,7 @@ msgstr ""
 "\n"
 "转换字符集失败。"
 
 "\n"
 "转换字符集失败。"
 

-#: src/compose.c:4166 src/compose.c:7752
+#: src/compose.c:4309 src/compose.c:7941

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1529,7 +1764,7 @@ msgstr ""
 "\n"
 "无法获取收件人的加密密钥。"
 
 "\n"
 "无法获取收件人的加密密钥。"
 

-#: src/compose.c:4170 src/compose.c:7746
+#: src/compose.c:4313 src/compose.c:7935

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1540,7 +1775,7 @@ msgstr ""
 "\n"
 "签名失败: %s"
 
 "\n"
 "签名失败: %s"
 

-#: src/compose.c:4173
+#: src/compose.c:4316

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1551,11 +1786,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:4175
+#: src/compose.c:4318

 msgid "Could not queue message for sending."
 msgstr "无法将邮件加入待发送队列"
 
 msgid "Could not queue message for sending."
 msgstr "无法将邮件加入待发送队列"
 

-#: src/compose.c:4190 src/compose.c:4249
+#: src/compose.c:4333 src/compose.c:4394

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1563,7 +1798,7 @@ msgstr ""
 "邮件已加入发送队列，但无法发送出去。\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 
 "邮件已加入发送队列，但无法发送出去。\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 

-#: src/compose.c:4243
+#: src/compose.c:4388

 #, c-format
 msgid ""
 "%s\n"
 #, c-format
 msgid ""
 "%s\n"


@@ -1572,7 +1807,7 @@ msgstr ""
 "%s\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 
 "%s\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 

-#: src/compose.c:4587
+#: src/compose.c:4734

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1582,7 +1817,7 @@ msgstr ""
 "无法将邮件的字符编码转换为 %s 。\n"
 "以 %s 发送吗？"
 
 "无法将邮件的字符编码转换为 %s 。\n"
 "以 %s 发送吗？"
 

-#: src/compose.c:4646
+#: src/compose.c:4793

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1595,60 +1830,60 @@ msgstr ""
 "\n"
 "确实要发送吗?"
 
 "\n"
 "确实要发送吗?"
 

-#: src/compose.c:4834
+#: src/compose.c:4981

 msgid "No account for sending mails available!"
 msgstr "没有发信所需的帐号！"
 
 msgid "No account for sending mails available!"
 msgstr "没有发信所需的帐号！"
 

-#: src/compose.c:4844
+#: src/compose.c:4991

 msgid "No account for posting news available!"
 msgstr "没有张贴news所需的帐号！"
 
 msgid "No account for posting news available!"
 msgstr "没有张贴news所需的帐号！"
 

-#: src/compose.c:5537
+#: src/compose.c:5684

 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "可以使用<tab>键自动完成地址"
 
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "可以使用<tab>键自动完成地址"
 

-#: src/compose.c:5665
+#: src/compose.c:5812

 msgid "Mime type"
 msgstr "MIME 类型"
 
 msgid "Mime type"
 msgstr "MIME 类型"
 

-#: src/compose.c:5671 src/compose.c:5967 src/mimeview.c:212
+#: src/compose.c:5818 src/compose.c:6114 src/mimeview.c:212

 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "大小"
 
 #: src/plugins/pgpcore/select-keys.c:374 src/prefs_summary_column.c:86
 #: src/summaryview.c:490
 msgid "Size"
 msgstr "大小"
 

-#: src/compose.c:5732
+#: src/compose.c:5879

 msgid "Save Message to "
 msgstr "将邮件保存至"
 
 msgid "Save Message to "
 msgstr "将邮件保存至"
 

-#: src/compose.c:5754 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:5901 src/editjpilot.c:289 src/editldap.c:526

 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:146

-#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
+#: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:207

 msgid "_Browse"
 msgstr "浏览(_B)"
 
 msgid "_Browse"
 msgstr "浏览(_B)"
 

-#: src/compose.c:5966 src/compose.c:7156
+#: src/compose.c:6113 src/compose.c:7345

 msgid "MIME type"
 msgstr "MIME 类型"
 
 msgid "MIME type"
 msgstr "MIME 类型"
 

-#: src/compose.c:6038
+#: src/compose.c:6185

 msgid "Hea_der"
 msgstr "邮件头(_d)"
 
 msgid "Hea_der"
 msgstr "邮件头(_d)"
 

-#: src/compose.c:6042
+#: src/compose.c:6189

 msgid "_Attachments"
 msgstr "附件(_A)"
 
 msgid "_Attachments"
 msgstr "附件(_A)"
 

-#: src/compose.c:6046
+#: src/compose.c:6193

 msgid "Othe_rs"
 msgstr "其他(_r)"
 
 msgid "Othe_rs"
 msgstr "其他(_r)"
 

-#: src/compose.c:6061 src/summary_search.c:298
+#: src/compose.c:6208 src/summary_search.c:366

 msgid "Subject:"
 msgstr "主题:"
 
 msgid "Subject:"
 msgstr "主题:"
 

-#: src/compose.c:6250
+#: src/compose.c:6399

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1657,67 +1892,71 @@ msgstr ""
 "无法启动拼写检查器.\n"
 "%s"
 
 "无法启动拼写检查器.\n"
 "%s"
 

-#: src/compose.c:6362
+#: src/compose.c:6511

 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "发信人: <i>%s</i>"
 
 #, c-format
 msgid "From: <i>%s</i>"
 msgstr "发信人: <i>%s</i>"
 

-#: src/compose.c:6393
+#: src/compose.c:6542

 msgid "Account to use for this email"
 msgstr "用于此邮件的帐号"
 
 msgid "Account to use for this email"
 msgstr "用于此邮件的帐号"
 

-#: src/compose.c:6395
+#: src/compose.c:6544

 msgid "Sender address to be used"
 msgstr "想要使用的发送邮件地址"
 
 msgid "Sender address to be used"
 msgstr "想要使用的发送邮件地址"
 

-#: src/compose.c:6549
+#: src/compose.c:6705

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "无法加载隐私系统`%s'，签名和邮件加密功能将不可用。"
 
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "无法加载隐私系统`%s'，签名和邮件加密功能将不可用。"
 

-#: src/compose.c:6788
-msgid "Message To format error."
-msgstr "'收件人'格式错误。"
+#: src/compose.c:6867 src/prefs_template.c:549
+msgid "Template body format error."
+msgstr "模板内容格式错误。"
+
+#: src/compose.c:6975 src/prefs_template.c:587
+msgid "Template To format error."
+msgstr "模板中'收件人'格式错误。"

 
 

-#: src/compose.c:6801
-msgid "Message Cc format error."
-msgstr "'抄送人'格式错误。"
+#: src/compose.c:6988 src/prefs_template.c:592
+msgid "Template Cc format error."
+msgstr "模板中'抄送'格式错误。"

 
 

-#: src/compose.c:6814
-msgid "Message Bcc format error."
-msgstr "'秘送'格式错误。"
+#: src/compose.c:7001 src/prefs_template.c:597
+msgid "Template Bcc format error."
+msgstr "模板中'密送'格式错误。"

 
 

-#: src/compose.c:6828
-msgid "Message subject format error."
-msgstr "'主题'格式错误。"
+#: src/compose.c:7015 src/prefs_template.c:602
+msgid "Template subject format error."
+msgstr "模板中'主题'格式错误。"

 
 

-#: src/compose.c:7050
+#: src/compose.c:7239

 msgid "Invalid MIME type."
 msgstr "不正确的MIME类型。"
 
 msgid "Invalid MIME type."
 msgstr "不正确的MIME类型。"
 

-#: src/compose.c:7065
+#: src/compose.c:7254

 msgid "File doesn't exist or is empty."
 msgstr "文件是空的或不存在。"
 
 msgid "File doesn't exist or is empty."
 msgstr "文件是空的或不存在。"
 

-#: src/compose.c:7138
+#: src/compose.c:7327

 msgid "Properties"
 msgstr "属性"
 
 msgid "Properties"
 msgstr "属性"
 

-#: src/compose.c:7189
+#: src/compose.c:7378

 msgid "Encoding"
 msgstr "编码"
 
 msgid "Encoding"
 msgstr "编码"
 

-#: src/compose.c:7209
+#: src/compose.c:7398

 msgid "Path"
 msgstr "路径"
 
 msgid "Path"
 msgstr "路径"
 

-#: src/compose.c:7210 src/prefs_toolbar.c:1060
+#: src/compose.c:7399 src/prefs_toolbar.c:1060

 msgid "File name"
 msgstr "文件名"
 
 msgid "File name"
 msgstr "文件名"
 

-#: src/compose.c:7393
+#: src/compose.c:7582

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1728,19 +1967,19 @@ msgstr ""
 "强制关闭该进程吗？\n"
 "进程祖id: %d"
 
 "强制关闭该进程吗？\n"
 "进程祖id: %d"
 

-#: src/compose.c:7435
+#: src/compose.c:7624

 msgid "Compose: input from monitoring process\n"
 msgstr "撰写: 从被监视的进程中输入\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写: 从被监视的进程中输入\n"
 

-#: src/compose.c:7716 src/messageview.c:718
-msgid "Sylpheed-Claws needs network access in order to send this email."
-msgstr "Sylpheed-Claws需要访问网络才能发送这封邮件。"
+#: src/compose.c:7905 src/messageview.c:720
+msgid "Claws Mail needs network access in order to send this email."
+msgstr "Claws Mail需要访问网络才能发送这封邮件。"

 
 

-#: src/compose.c:7741
+#: src/compose.c:7930

 msgid "Could not queue message."
 msgstr "无法将邮件加入待发送队列。"
 
 msgid "Could not queue message."
 msgstr "无法将邮件加入待发送队列。"
 

-#: src/compose.c:7743
+#: src/compose.c:7932

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1751,20 +1990,20 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:7863
+#: src/compose.c:8052

 msgid "Could not save draft."
 msgstr "无法保存草稿。"
 
 msgid "Could not save draft."
 msgstr "无法保存草稿。"
 

-#: src/compose.c:7938 src/compose.c:7961
+#: src/compose.c:8127 src/compose.c:8150

 msgid "Select file"
 msgstr "选择文件"
 
 msgid "Select file"
 msgstr "选择文件"
 

-#: src/compose.c:7974
+#: src/compose.c:8163

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "无法读取文件 '%s'。"
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "无法读取文件 '%s'。"
 

-#: src/compose.c:7976
+#: src/compose.c:8165

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1773,58 +2012,62 @@ msgstr ""
 "文件 '%s' 包含有不属于当前编码集的无效字符,\n"
 "插入部分可能不正确."
 
 "文件 '%s' 包含有不属于当前编码集的无效字符,\n"
 "插入部分可能不正确."
 

-#: src/compose.c:8024
+#: src/compose.c:8213

 msgid "Discard message"
 msgstr "摈弃讯息"
 
 msgid "Discard message"
 msgstr "摈弃讯息"
 

-#: src/compose.c:8025
+#: src/compose.c:8214

 msgid "This message has been modified. Discard it?"
 msgstr "这封邮件已被更改，是否摈弃？"
 
 msgid "This message has been modified. Discard it?"
 msgstr "这封邮件已被更改，是否摈弃？"
 

-#: src/compose.c:8026
+#: src/compose.c:8215

 msgid "_Discard"
 msgstr "摈弃(_D)"
 
 msgid "_Discard"
 msgstr "摈弃(_D)"
 

-#: src/compose.c:8026
+#: src/compose.c:8215

 msgid "_Save to Drafts"
 msgstr "存为草稿(_S)"
 
 msgid "_Save to Drafts"
 msgstr "存为草稿(_S)"
 

-#: src/compose.c:8070
+#: src/compose.c:8259

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "是否应用模板'%s'?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "是否应用模板'%s'?"
 

-#: src/compose.c:8072
+#: src/compose.c:8261

 msgid "Apply template"
 msgstr "使用模板"
 
 msgid "Apply template"
 msgstr "使用模板"
 

-#: src/compose.c:8073
+#: src/compose.c:8262

 msgid "_Replace"
 msgstr "替换(_R)"
 
 msgid "_Replace"
 msgstr "替换(_R)"
 

-#: src/compose.c:8073
+#: src/compose.c:8262

 msgid "_Insert"
 msgstr "插入(_I)"
 
 msgid "_Insert"
 msgstr "插入(_I)"
 

-#: src/compose.c:8761
+#: src/compose.c:8950

 msgid "Insert or attach?"
 msgstr "插入其内容还是添加附件?"
 
 msgid "Insert or attach?"
 msgstr "插入其内容还是添加附件?"
 

-#: src/compose.c:8762
+#: src/compose.c:8951

 msgid ""
 "Do you want to insert the contents of the file(s) into the message body, or "
 "attach it to the email?"
 msgstr "请问是将文件的内容插入到邮件中，还是添加为附件？"
 
 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:8764
+#: src/compose.c:8953

 msgid "+_Insert"
 msgstr "+插入(_I)"
 
 msgid "+_Insert"
 msgstr "+插入(_I)"
 

-#: src/compose.c:8764
+#: src/compose.c:8953

 msgid "_Attach"
 msgstr "附加文件(_A)"
 
 msgid "_Attach"
 msgstr "附加文件(_A)"
 

-#: src/compose.c:9170
+#: src/compose.c:9152
+msgid "Quote format error."
+msgstr "引文格式错误。"
+
+#: src/compose.c:9371

 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "


@@ -1833,12 +2076,12 @@ msgstr "你想要回复%d封邮件。打开这些窗口需要一定时间。是
 
 #: src/crash.c:142
 #, c-format
 
 #: src/crash.c:142
 #, c-format

-msgid "Sylpheed-Claws process (%ld) received signal %ld"
-msgstr "Sylpheed 程序(%ld)接收到%ld讯号"
+msgid "Claws Mail process (%ld) received signal %ld"
+msgstr "Claws Mail程序序(%ld)接收到%ld讯号"

 
 #: src/crash.c:188
 
 #: src/crash.c:188

-msgid "Sylpheed-Claws has crashed"
-msgstr "Sylpheed已经崩溃"
+msgid "Claws Mail has crashed"
+msgstr "Claws Mail已经崩溃"

 
 #: src/crash.c:204
 #, c-format
 
 #: src/crash.c:204
 #, c-format


@@ -1869,61 +2112,69 @@ msgstr "创建BUG报告"
 msgid "Save crash information"
 msgstr "保存崩溃的信息"
 
 msgid "Save crash information"
 msgstr "保存崩溃的信息"
 

-#: src/editaddress.c:153
+#: src/editaddress.c:183

 msgid "Add New Person"
 msgstr "加入新的用户"
 
 msgid "Add New Person"
 msgstr "加入新的用户"
 

-#: src/editaddress.c:154
+#: src/editaddress.c:184

 msgid "Edit Person Details"
 msgstr "编辑个人的详细资料"
 
 msgid "Edit Person Details"
 msgstr "编辑个人的详细资料"
 

-#: src/editaddress.c:316
+#: src/editaddress.c:355

 msgid "An Email address must be supplied."
 msgstr "请务必提供一个电子邮件地址。"
 
 msgid "An Email address must be supplied."
 msgstr "请务必提供一个电子邮件地址。"
 

-#: src/editaddress.c:490
+#: src/editaddress.c:529

 msgid "A Name and Value must be supplied."
 msgstr "请务必提供名称和值。"
 
 msgid "A Name and Value must be supplied."
 msgstr "请务必提供名称和值。"
 

-#: src/editaddress.c:560
+#: src/editaddress.c:618
+msgid "Discard"
+msgstr "摈弃"
+
+#: src/editaddress.c:619
+msgid "Apply"
+msgstr "应用"
+
+#: src/editaddress.c:649 src/editaddress.c:698

 msgid "Edit Person Data"
 msgstr "编辑个人资料"
 
 msgid "Edit Person Data"
 msgstr "编辑个人资料"
 

-#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:799
+#: src/editaddress.c:759 src/expldifdlg.c:508 src/exporthtml.c:799

 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "用户名称"
 
 #: src/ldif.c:819
 msgid "Display Name"
 msgstr "用户名称"
 

-#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:827
+#: src/editaddress.c:765 src/editaddress.c:769 src/ldif.c:827

 msgid "Last Name"
 msgstr "姓"
 
 msgid "Last Name"
 msgstr "姓"
 

-#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:823
+#: src/editaddress.c:766 src/editaddress.c:768 src/ldif.c:823

 msgid "First Name"
 msgstr "名"
 
 msgid "First Name"
 msgstr "名"
 

-#: src/editaddress.c:683
+#: src/editaddress.c:771

 msgid "Nickname"
 msgstr "绰号"
 
 msgid "Nickname"
 msgstr "绰号"
 

-#: src/editaddress.c:760 src/editaddress.c:816
+#: src/editaddress.c:848 src/editaddress.c:904

 msgid "Alias"
 msgstr "别名"
 
 msgid "Alias"
 msgstr "别名"
 

-#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:222
+#: src/editaddress.c:1042 src/editaddress.c:1099 src/prefs_customheader.c:222

 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "值"
 
 #: src/prefs_matcher.c:530
 msgid "Value"
 msgstr "值"
 

-#: src/editaddress.c:1070
+#: src/editaddress.c:1161

 msgid "_User Data"
 msgstr "用户数据(_U)"
 
 msgid "_User Data"
 msgstr "用户数据(_U)"
 

-#: src/editaddress.c:1071
+#: src/editaddress.c:1162

 msgid "_Email Addresses"
 msgstr "电子邮件帐号(_E)"
 
 msgid "_Email Addresses"
 msgstr "电子邮件帐号(_E)"
 

-#: src/editaddress.c:1072
+#: src/editaddress.c:1163

 msgid "O_ther Attributes"
 msgstr "其他属性(_t)"
 
 msgid "O_ther Attributes"
 msgstr "其他属性(_t)"
 


@@ -1948,7 +2199,7 @@ msgid " Check File "
 msgstr "检查文件"
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr "检查文件"
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1909
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1917

 msgid "File"
 msgstr "文件"
 
 msgid "File"
 msgstr "文件"
 


@@ -1996,11 +2247,11 @@ msgstr "增加新的文件夹"
 msgid "Input the new name of folder:"
 msgstr "请输入文件夹的新名字:"
 
 msgid "Input the new name of folder:"
 msgstr "请输入文件夹的新名字:"
 

-#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:134 src/mh_gtk.c:127
+#: src/editgroup.c:549 src/foldersel.c:556 src/imap_gtk.c:139 src/mh_gtk.c:130

 msgid "New folder"
 msgstr "新文件夹"
 
 msgid "New folder"
 msgstr "新文件夹"
 

-#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:128
+#: src/editgroup.c:550 src/foldersel.c:557 src/mh_gtk.c:131

 msgid "Input the name of new folder:"
 msgstr "请输入文件夹的新名字:"
 
 msgid "Input the name of new folder:"
 msgstr "请输入文件夹的新名字:"
 


@@ -2081,11 +2332,11 @@ 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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "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 "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "

-"computer as Sylpheed-Claws."
+"computer as Claws Mail."

 msgstr ""
 "LDAP服务器的机器名。例如\"ldap.mydomain.com\"很可能就是机构\"mydomain.com\"的"
 msgstr ""
 "LDAP服务器的机器名。例如\"ldap.mydomain.com\"很可能就是机构\"mydomain.com\"的"

-"LDAP服务器名称。也可以填入IP地址。如果LDAP服务与Sylpheed在同一台机器上运行，"
-"则可以填入\"localhost\"。"
+"LDAP服务器名称。也可以填入IP地址。如果LDAP服务与Claws Mail在同一台机器上运"
+"行，则可以填入\"localhost\"。"

 
 #: src/editldap.c:470
 msgid "TLS"
 
 #: src/editldap.c:470
 msgid "TLS"


@@ -2129,11 +2380,11 @@ msgstr "点击此按钮测试到服务器的连接。"
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""

-"指定要在服务器上搜索的目录名称。例如:  dc=sylpheed,dc=org\n"
+"指定要在服务器上搜索的目录名称。例如:  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 


@@ -2221,11 +2472,11 @@ msgstr "绑定 DN"
 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 "
 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 "

-"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"as: \"cn=user,dc=claws-mail,dc=org\". This is usually left empty when "

 "performing a search."
 msgstr ""
 "用于连接LDAP服务器的用户名。这通常只在带有保护的服务器上使用。这个值的形式通"
 "performing a search."
 msgstr ""
 "用于连接LDAP服务器的用户名。这通常只在带有保护的服务器上使用。这个值的形式通"

-"常是这样: \"cn=user,dc=sylpheed,dc=com\"。只用于搜索时这项通常为空。"
+"常是这样: \"cn=user,dc=claws-mail,dc=com\"。只用于搜索时这项通常为空。"

 
 #: src/editldap.c:741
 msgid "Bind Password"
 
 #: src/editldap.c:741
 msgid "Bind Password"


@@ -2260,7 +2511,7 @@ msgstr "基本设置"
 msgid "Search"
 msgstr "搜寻"
 
 msgid "Search"
 msgstr "搜寻"
 

-#: src/editldap.c:810 src/gtk/quicksearch.c:488
+#: src/editldap.c:810 src/gtk/quicksearch.c:490

 msgid "Extended"
 msgstr "扩展"
 
 msgid "Extended"
 msgstr "扩展"
 


@@ -2284,19 +2535,19 @@ msgstr "编辑vCard条目"
 msgid "Add New vCard Entry"
 msgstr "增加新的vCard条目"
 
 msgid "Add New vCard Entry"
 msgstr "增加新的vCard条目"
 

-#: src/exphtmldlg.c:113
+#: src/exphtmldlg.c:110

 msgid "Please specify output directory and file to create."
 msgstr "请指明所要创建的目录以及文件。"
 
 msgid "Please specify output directory and file to create."
 msgstr "请指明所要创建的目录以及文件。"
 

-#: src/exphtmldlg.c:116
+#: src/exphtmldlg.c:113

 msgid "Select stylesheet and formatting."
 msgstr "选择形式及格式。"
 
 msgid "Select stylesheet and formatting."
 msgstr "选择形式及格式。"
 

-#: src/exphtmldlg.c:119 src/expldifdlg.c:117
+#: src/exphtmldlg.c:116 src/expldifdlg.c:117

 msgid "File exported successfully."
 msgstr "文件已成功导出。"
 
 msgid "File exported successfully."
 msgstr "文件已成功导出。"
 

-#: src/exphtmldlg.c:184
+#: src/exphtmldlg.c:181

 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"


@@ -2305,11 +2556,11 @@ msgstr ""
 "HTML输出目录 '%s'\n"
 "并不存在。创建新目录？"
 
 "HTML输出目录 '%s'\n"
 "并不存在。创建新目录？"
 

-#: src/exphtmldlg.c:187 src/expldifdlg.c:193
+#: src/exphtmldlg.c:184 src/expldifdlg.c:193

 msgid "Create Directory"
 msgstr "创建目录"
 
 msgid "Create Directory"
 msgstr "创建目录"
 

-#: src/exphtmldlg.c:196
+#: src/exphtmldlg.c:193

 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"


@@ -2318,102 +2569,102 @@ msgstr ""
 "无法为HTML文件创建输出目录:\n"
 "%s"
 
 "无法为HTML文件创建输出目录:\n"
 "%s"
 

-#: src/exphtmldlg.c:198 src/expldifdlg.c:204
+#: src/exphtmldlg.c:195 src/expldifdlg.c:204

 msgid "Failed to Create Directory"
 msgstr "创建目录失败"
 
 msgid "Failed to Create Directory"
 msgstr "创建目录失败"
 

-#: src/exphtmldlg.c:240
+#: src/exphtmldlg.c:237

 msgid "Error creating HTML file"
 msgstr "创建HTML文件时发生错误"
 
 msgid "Error creating HTML file"
 msgstr "创建HTML文件时发生错误"
 

-#: src/exphtmldlg.c:326
+#: src/exphtmldlg.c:323

 msgid "Select HTML output file"
 msgstr "选择HTML输出文件"
 
 msgid "Select HTML output file"
 msgstr "选择HTML输出文件"
 

-#: src/exphtmldlg.c:390
+#: src/exphtmldlg.c:387

 msgid "HTML Output File"
 msgstr "HTML输出文件"
 
 msgid "HTML Output File"
 msgstr "HTML输出文件"
 

-#: src/exphtmldlg.c:399 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178

 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "棕色(_r)"
 
 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "棕色(_r)"
 

-#: src/exphtmldlg.c:452
+#: src/exphtmldlg.c:449

 msgid "Stylesheet"
 msgstr "样式表"
 
 msgid "Stylesheet"
 msgstr "样式表"
 

-#: src/exphtmldlg.c:460 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
-#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:1003 src/prefs_account.c:663
-#: src/summaryview.c:4983
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1678
+#: src/gtk/gtkaspell.c:2411 src/mainwindow.c:1004 src/prefs_account.c:667
+#: src/summaryview.c:4991

 msgid "None"
 msgstr "无"
 
 msgid "None"
 msgstr "无"
 

-#: src/exphtmldlg.c:461 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:458 src/prefs_summaries.c:350 src/prefs_summaries.c:691

 msgid "Default"
 msgstr "缺省"
 
 msgid "Default"
 msgstr "缺省"
 

-#: src/exphtmldlg.c:462 src/plugins/pgpcore/sgpgme.c:140
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:144

 msgid "Full"
 msgstr "完整"
 
 msgid "Full"
 msgstr "完整"
 

-#: src/exphtmldlg.c:463
+#: src/exphtmldlg.c:460

 msgid "Custom"
 msgstr "自定义"
 
 msgid "Custom"
 msgstr "自定义"
 

-#: src/exphtmldlg.c:464
+#: src/exphtmldlg.c:461

 msgid "Custom-2"
 msgstr "自定义-2"
 
 msgid "Custom-2"
 msgstr "自定义-2"
 

-#: src/exphtmldlg.c:465
+#: src/exphtmldlg.c:462

 msgid "Custom-3"
 msgstr "自定义-3"
 
 msgid "Custom-3"
 msgstr "自定义-3"
 

-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:463

 msgid "Custom-4"
 msgstr "自定义-4"
 
 msgid "Custom-4"
 msgstr "自定义-4"
 

-#: src/exphtmldlg.c:473
+#: src/exphtmldlg.c:470

 msgid "Full Name Format"
 msgstr "完整名称格式"
 
 msgid "Full Name Format"
 msgstr "完整名称格式"
 

-#: src/exphtmldlg.c:481
+#: src/exphtmldlg.c:478

 msgid "First Name, Last Name"
 msgstr "名，姓"
 
 msgid "First Name, Last Name"
 msgstr "名，姓"
 

-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:479

 msgid "Last Name, First Name"
 msgstr "姓，名"
 
 msgid "Last Name, First Name"
 msgstr "姓，名"
 

-#: src/exphtmldlg.c:489
+#: src/exphtmldlg.c:486

 msgid "Color Banding"
 msgstr "彩色分带显示"
 
 msgid "Color Banding"
 msgstr "彩色分带显示"
 

-#: src/exphtmldlg.c:495
+#: src/exphtmldlg.c:492

 msgid "Format Email Links"
 msgstr "电子邮件地址格式化为超链接"
 
 msgid "Format Email Links"
 msgstr "电子邮件地址格式化为超链接"
 

-#: src/exphtmldlg.c:501
+#: src/exphtmldlg.c:498

 msgid "Format User Attributes"
 msgstr "将用户属性数据格式化"
 
 msgid "Format User Attributes"
 msgstr "将用户属性数据格式化"
 

-#: src/exphtmldlg.c:556 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919

 msgid "File Name :"
 msgstr "文件名:"
 
 msgid "File Name :"
 msgstr "文件名:"
 

-#: src/exphtmldlg.c:566
+#: src/exphtmldlg.c:563

 msgid "Open with Web Browser"
 msgstr "用网页浏览器打开"
 
 msgid "Open with Web Browser"
 msgstr "用网页浏览器打开"
 

-#: src/exphtmldlg.c:598
+#: src/exphtmldlg.c:595

 msgid "Export Address Book to HTML File"
 msgstr "将地址簿输出成HTML文件"
 
 msgid "Export Address Book to HTML File"
 msgstr "将地址簿输出成HTML文件"
 

-#: src/exphtmldlg.c:664 src/expldifdlg.c:736 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027

 msgid "File Info"
 msgstr "文件内容"
 
 msgid "File Info"
 msgstr "文件内容"
 

-#: src/exphtmldlg.c:665
+#: src/exphtmldlg.c:662

 msgid "Format"
 msgstr "格式"
 
 msgid "Format"
 msgstr "格式"
 


@@ -2474,12 +2725,12 @@ msgstr "后缀"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"

-"  dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "此后缀用于为LDAP条目创建唯一标识\"Distinguished Name\" (简称 DN)。示例:  \n"
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 msgstr ""
 "此后缀用于为LDAP条目创建唯一标识\"Distinguished Name\" (简称 DN)。示例:  \n"

-"dc=sylpheed,dc=org\n"
+"  dc=claws-mail,dc=org\n"

 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 


@@ -2495,28 +2746,28 @@ msgstr "唯一ID"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "用地址簿里面的唯一ID生成DN数据，结果格式如下:\n"
 msgstr ""
 "用地址簿里面的唯一ID生成DN数据，结果格式如下:\n"

-"  uid=102376,ou=people,dc=sylpheed,dc=org"
+"  uid=102376,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
 
 #: src/expldifdlg.c:516
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "用地址簿里面的显示名生成DN数据，结果格式如下:\n"
 msgstr ""
 "用地址簿里面的显示名生成DN数据，结果格式如下:\n"

-"  cn=John Doe,ou=people,dc=sylpheed,dc=org"
+"  cn=John Doe,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
 
 #: src/expldifdlg.c:529
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 msgstr ""
 "用该人所拥有的第一个邮件地址生成DN数据，结果格式如下:\n"
 msgstr ""
 "用该人所拥有的第一个邮件地址生成DN数据，结果格式如下:\n"

-"  mail=john.doe@domain.com,ou=people,dc=sylpheed,dc=org"
+"  mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"

 
 #: src/expldifdlg.c:543
 msgid ""
 
 #: src/expldifdlg.c:543
 msgid ""


@@ -2560,11 +2811,11 @@ msgstr "地址簿中的联系人可能没有邮件地址。选中此项则可以
 msgid "Export Address Book to LDIF File"
 msgstr "将地址簿输出成LDIF文件"
 
 msgid "Export Address Book to LDIF File"
 msgstr "将地址簿输出成LDIF文件"
 

-#: src/expldifdlg.c:737
+#: src/expldifdlg.c:736

 msgid "Distguished Name"
 msgstr "唯一名称(DN)"
 
 msgid "Distguished Name"
 msgstr "唯一名称(DN)"
 

-#: src/export.c:120 src/summaryview.c:6355
+#: src/export.c:120 src/summaryview.c:6370

 msgid "Export to mbox file"
 msgstr "以mbox格式导出文件夹"
 
 msgid "Export to mbox file"
 msgstr "以mbox格式导出文件夹"
 


@@ -2605,8 +2856,8 @@ msgid "Attributes"
 msgstr "属性"
 
 #: src/exporthtml.c:1010
 msgstr "属性"
 
 #: src/exporthtml.c:1010

-msgid "Sylpheed-Claws Address Book"
-msgstr "Sylpheed 地址簿"
+msgid "Claws Mail Address Book"
+msgstr "Claws Mail地址簿"

 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."
 
 #: src/exporthtml.c:1124 src/exportldif.c:601
 msgid "Name already exists but is not a directory."


@@ -2624,48 +2875,53 @@ msgstr "名字太长。"
 msgid "Not specified."
 msgstr "不确定。"
 
 msgid "Not specified."
 msgstr "不确定。"
 

-#: src/folder.c:1277 src/foldersel.c:371 src/prefs_folder_item.c:236
+#: src/folder.c:1283 src/foldersel.c:371 src/prefs_folder_item.c:239

 msgid "Inbox"
 msgstr "收信夹"
 
 msgid "Inbox"
 msgstr "收信夹"
 

-#: src/folder.c:1281 src/foldersel.c:375
+#: src/folder.c:1287 src/foldersel.c:375

 msgid "Sent"
 msgstr "已发送"
 
 msgid "Sent"
 msgstr "已发送"
 

-#: src/folder.c:1285 src/foldersel.c:379 src/prefs_folder_item.c:239
+#: src/folder.c:1291 src/foldersel.c:379 src/prefs_folder_item.c:242

 msgid "Queue"
 msgstr "待发送"
 
 msgid "Queue"
 msgstr "待发送"
 

-#: src/folder.c:1289 src/foldersel.c:383 src/prefs_folder_item.c:240
-#: src/toolbar.c:366 src/toolbar.c:400 src/toolbar.c:491
+#: src/folder.c:1295 src/foldersel.c:383 src/prefs_folder_item.c:243
+#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501

 msgid "Trash"
 msgstr "垃圾桶"
 
 msgid "Trash"
 msgstr "垃圾桶"
 

-#: src/folder.c:1293 src/foldersel.c:387 src/prefs_folder_item.c:238
+#: src/folder.c:1299 src/foldersel.c:387 src/prefs_folder_item.c:241

 msgid "Drafts"
 msgstr "草稿"
 
 msgid "Drafts"
 msgstr "草稿"
 

-#: src/folder.c:1572
+#: src/folder.c:1578

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "处理中(%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "处理中(%s)...\n"
 

-#: src/folder.c:2508
+#: src/folder.c:2514

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "正在收取 %s 中所有邮件...\n"
 
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "正在收取 %s 中所有邮件...\n"
 

-#: src/folder.c:2797
+#: src/folder.c:2803
+#, c-format
+msgid "Copying %s to %s...\n"
+msgstr "将%s 复制到%s...\n"
+
+#: src/folder.c:2803

 #, c-format
 msgid "Moving %s to %s...\n"
 #, c-format
 msgid "Moving %s to %s...\n"

-msgstr "将%s 移到%s...\n"
+msgstr "å°\86%s 移å\8a¨å\88°%s...\n"

 
 

-#: src/folder.c:3073
+#: src/folder.c:3090

 #, c-format
 msgid "Updating cache for %s..."
 msgstr "正在更新文件夹 %s 的缓存..."
 
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "正在更新文件夹 %s 的缓存..."
 

-#: src/folder.c:3784
+#: src/folder.c:3801

 msgid "Processing messages..."
 msgstr "正在处理邮件..."
 
 msgid "Processing messages..."
 msgstr "正在处理邮件..."
 


@@ -2673,159 +2929,164 @@ msgstr "正在处理邮件..."
 msgid "Select folder"
 msgstr "选择文件夹"
 
 msgid "Select folder"
 msgstr "选择文件夹"
 

-#: src/foldersel.c:558 src/imap_gtk.c:138 src/mh_gtk.c:129
+#: src/foldersel.c:558 src/imap_gtk.c:143 src/mh_gtk.c:132

 msgid "NewFolder"
 msgstr "新文件夹"
 
 msgid "NewFolder"
 msgstr "新文件夹"
 

-#: src/foldersel.c:566 src/imap_gtk.c:146 src/imap_gtk.c:152 src/mh_gtk.c:135
-#: src/mh_gtk.c:238
+#: src/foldersel.c:566 src/imap_gtk.c:151 src/imap_gtk.c:157 src/mh_gtk.c:138
+#: src/mh_gtk.c:241

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "文件夹名称不能包含`%c'。"
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "文件夹名称不能包含`%c'。"
 

-#: src/foldersel.c:576 src/imap_gtk.c:162 src/imap_gtk.c:216 src/mh_gtk.c:145
-#: src/mh_gtk.c:245
+#: src/foldersel.c:576 src/imap_gtk.c:167 src/imap_gtk.c:221 src/mh_gtk.c:148
+#: src/mh_gtk.c:248

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "文件夹'%s'已存在。"
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "文件夹'%s'已存在。"
 

-#: src/foldersel.c:583 src/imap_gtk.c:168 src/mh_gtk.c:151
+#: src/foldersel.c:583 src/imap_gtk.c:173 src/mh_gtk.c:154

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "无法创建文件夹'%s'。"
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "无法创建文件夹'%s'。"
 

-#: src/folderview.c:290
+#: src/folderview.c:291

 msgid "/Mark all re_ad"
 msgstr "/标记所有邮件为已读(_a)"
 
 msgid "/Mark all re_ad"
 msgstr "/标记所有邮件为已读(_a)"
 

-#: src/folderview.c:291
+#: src/folderview.c:293

 msgid "/_Search folder..."
 msgstr "/在文件夹中搜索(_S)..."
 
 msgid "/_Search folder..."
 msgstr "/在文件夹中搜索(_S)..."
 

-#: src/folderview.c:293
+#: src/folderview.c:295

 msgid "/Process_ing..."
 msgstr "/处理(_i)..."
 
 msgid "/Process_ing..."
 msgstr "/处理(_i)..."
 

-#: src/folderview.c:298
+#: src/folderview.c:300

 msgid "/Empty _trash..."
 msgstr "/清空垃圾桶(_t)..."
 
 msgid "/Empty _trash..."
 msgstr "/清空垃圾桶(_t)..."
 

-#: src/folderview.c:303
+#: src/folderview.c:305

 msgid "/Send _queue..."
 msgstr "/发送队列(_q)..."
 
 msgid "/Send _queue..."
 msgstr "/发送队列(_q)..."
 

-#: src/folderview.c:422 src/folderview.c:469 src/prefs_folder_column.c:80
+#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:80

 msgid "New"
 msgstr "新邮件"
 
 msgid "New"
 msgstr "新邮件"
 

-#: src/folderview.c:423 src/folderview.c:470 src/prefs_folder_column.c:81
+#: src/folderview.c:425 src/folderview.c:472 src/prefs_folder_column.c:81

 msgid "Unread"
 msgstr "未读"
 
 msgid "Unread"
 msgstr "未读"
 

-#: src/folderview.c:424 src/prefs_folder_column.c:82
+#: src/folderview.c:426 src/prefs_folder_column.c:82

 msgid "Total"
 msgstr "全部"
 
 #. TRANSLATORS: This in Number sign in American style
 msgid "Total"
 msgstr "全部"
 
 #. TRANSLATORS: This in Number sign in American style

-#: src/folderview.c:472 src/summaryview.c:491
+#: src/folderview.c:474 src/summaryview.c:491

 msgid "#"
 msgstr "＃"
 
 msgid "#"
 msgstr "＃"
 

-#: src/folderview.c:717
+#: src/folderview.c:719

 msgid "Setting folder info..."
 msgstr "设置文件夹资料..."
 
 msgid "Setting folder info..."
 msgstr "设置文件夹资料..."
 

-#: src/folderview.c:771 src/summaryview.c:3455
+#: src/folderview.c:773 src/summaryview.c:3453

 msgid "Mark all as read"
 msgstr "设所有为已读"
 
 msgid "Mark all as read"
 msgstr "设所有为已读"
 

-#: src/folderview.c:772 src/summaryview.c:3456
+#: src/folderview.c:774 src/summaryview.c:3454

 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "确定要将此文件夹中所有邮件设置已读？"
 
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "确定要将此文件夹中所有邮件设置已读？"
 

-#: src/folderview.c:1058 src/imap.c:3192 src/mainwindow.c:3918 src/setup.c:90
+#: src/folderview.c:1060 src/imap.c:3190 src/mainwindow.c:3934 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "扫描文件夹%s%c%s..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "扫描文件夹%s%c%s..."
 

-#: src/folderview.c:1062 src/imap.c:3197 src/mainwindow.c:3923 src/setup.c:95
+#: src/folderview.c:1064 src/imap.c:3195 src/mainwindow.c:3939 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr " 扫描文件夹 %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr " 扫描文件夹 %s ..."
 

-#: src/folderview.c:1089
+#: src/folderview.c:1091

 msgid "Rebuild folder tree"
 msgstr "重建文件夹树"
 
 msgid "Rebuild folder tree"
 msgstr "重建文件夹树"
 

-#: src/folderview.c:1090
+#: src/folderview.c:1092

 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "重建文件夹树将删除原有的本地缓存。是否要继续?"
 
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "重建文件夹树将删除原有的本地缓存。是否要继续?"
 

-#: src/folderview.c:1100
+#: src/folderview.c:1102

 msgid "Rebuilding folder tree..."
 msgstr " 重新建立文件夹树 ..."
 
 msgid "Rebuilding folder tree..."
 msgstr " 重新建立文件夹树 ..."
 

-#: src/folderview.c:1102
+#: src/folderview.c:1104

 msgid "Scanning folder tree..."
 msgstr " 正在扫描文件夹..."
 
 msgid "Scanning folder tree..."
 msgstr " 正在扫描文件夹..."
 

-#: src/folderview.c:1220
+#: src/folderview.c:1175
+#, c-format
+msgid "Couldn't scan folder %s\n"
+msgstr "无法扫描文件夹 %s\n"
+
+#: src/folderview.c:1228

 msgid "Checking for new messages in all folders..."
 msgstr "检查所有文件夹中的新邮件..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "检查所有文件夹中的新邮件..."
 

-#: src/folderview.c:2081
+#: src/folderview.c:2090

 #, c-format
 msgid "Closing Folder %s..."
 msgstr "关闭文件夹%s..."
 
 #, c-format
 msgid "Closing Folder %s..."
 msgstr "关闭文件夹%s..."
 

-#: src/folderview.c:2120
+#: src/folderview.c:2129

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "打开文件夹%s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "打开文件夹%s..."
 

-#: src/folderview.c:2133
+#: src/folderview.c:2142

 msgid "Folder could not be opened."
 msgstr "无法打开文件夹。"
 
 msgid "Folder could not be opened."
 msgstr "无法打开文件夹。"
 

-#: src/folderview.c:2294 src/mainwindow.c:2078
+#: src/folderview.c:2303 src/mainwindow.c:2080

 msgid "Empty trash"
 msgstr "清空垃圾桶"
 
 msgid "Empty trash"
 msgstr "清空垃圾桶"
 

-#: src/folderview.c:2295
+#: src/folderview.c:2304

 msgid "Delete all messages in trash?"
 msgstr "清空垃圾桶内所有邮件？"
 
 msgid "Delete all messages in trash?"
 msgstr "清空垃圾桶内所有邮件？"
 

-#: src/folderview.c:2296 src/mainwindow.c:2080
+#: src/folderview.c:2305 src/mainwindow.c:2082

 msgid "+_Empty trash"
 msgstr "+清空垃圾桶(_E)"
 
 msgid "+_Empty trash"
 msgstr "+清空垃圾桶(_E)"
 

-#: src/folderview.c:2340 src/inc.c:1465 src/toolbar.c:2122
+#: src/folderview.c:2349 src/inc.c:1465 src/toolbar.c:2196

 msgid "Offline warning"
 msgstr "脱机警告"
 
 msgid "Offline warning"
 msgstr "脱机警告"
 

-#: src/folderview.c:2341 src/toolbar.c:2123
+#: src/folderview.c:2350 src/toolbar.c:2197

 msgid "You're working offline. Override?"
 msgstr "你正在脱机工作。是否更改？"
 
 msgid "You're working offline. Override?"
 msgstr "你正在脱机工作。是否更改？"
 

-#: src/folderview.c:2352 src/toolbar.c:2142
+#: src/folderview.c:2361 src/toolbar.c:2216

 msgid "Send queued messages"
 msgstr "送出待发送邮件"
 
 msgid "Send queued messages"
 msgstr "送出待发送邮件"
 

-#: src/folderview.c:2353 src/toolbar.c:2143
+#: src/folderview.c:2362 src/toolbar.c:2217

 msgid "Send all queued messages?"
 msgstr "送出所有待发送邮件?"
 
 msgid "Send all queued messages?"
 msgstr "送出所有待发送邮件?"
 

-#: src/folderview.c:2354 src/messageview.c:579 src/messageview.c:596
-#: src/prefs_account.c:1032 src/toolbar.c:2144
+#: src/folderview.c:2363 src/messageview.c:581 src/messageview.c:598
+#: src/prefs_account.c:1039 src/toolbar.c:2218

 msgid "_Send"
 msgstr "发送(_S)"
 
 msgid "_Send"
 msgstr "发送(_S)"
 

-#: src/folderview.c:2362 src/toolbar.c:2162
+#: src/folderview.c:2371 src/toolbar.c:2236

 msgid "Some errors occurred while sending queued messages."
 msgstr "发送邮件时发生错误。"
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "发送邮件时发生错误。"
 

-#: src/folderview.c:2365 src/main.c:1478 src/toolbar.c:2165
+#: src/folderview.c:2374 src/main.c:1549 src/toolbar.c:2239

 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"


@@ -2834,43 +3095,65 @@ msgstr ""
 "发送邮件时发生错误:\n"
 "%s"
 
 "发送邮件时发生错误:\n"
 "%s"
 

-#: src/folderview.c:2432
+#: src/folderview.c:2441
+#, c-format
+msgid "Do you really want to copy folder '%s' in '%s' ?"
+msgstr "确定要复制文件夹 '%s' 到 '%s'？"
+
+#: src/folderview.c:2442

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "确定要将文件夹 '%s' 改为 '%s' 的一个子文件夹？"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "确定要将文件夹 '%s' 改为 '%s' 的一个子文件夹？"
 

-#: src/folderview.c:2435
+#: src/folderview.c:2444
+msgid "Copy folder"
+msgstr "复制文件夹"
+
+#: src/folderview.c:2444

 msgid "Move folder"
 msgstr "移动文件夹"
 
 msgid "Move folder"
 msgstr "移动文件夹"
 

-#: src/folderview.c:2446
+#: src/folderview.c:2455
+#, c-format
+msgid "Copying %s to %s..."
+msgstr "将%s 复制到%s..."
+
+#: src/folderview.c:2455

 #, c-format
 msgid "Moving %s to %s..."
 #, c-format
 msgid "Moving %s to %s..."

-msgstr "将%s 移到%s..."
+msgstr "å°\86%s 移å\8a¨å\88°%s..."

 
 

-#: src/folderview.c:2475
+#: src/folderview.c:2486

 msgid "Source and destination are the same."
 msgstr "文件来源和目的相同。"
 
 msgid "Source and destination are the same."
 msgstr "文件来源和目的相同。"
 

-#: src/folderview.c:2478
+#: src/folderview.c:2489
+msgid "Can't copy a folder to one of its children."
+msgstr "无法将文件夹复制到其子文件夹中。"
+
+#: src/folderview.c:2490

 msgid "Can't move a folder to one of its children."
 msgid "Can't move a folder to one of its children."

-msgstr "无法将上一层文件夹移到其子文件夹中。"
+msgstr "无法将文件夹移到其子文件夹中。"

 
 

-#: src/folderview.c:2481
+#: src/folderview.c:2493

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "文件夹不能跨邮箱移动。"
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "文件夹不能跨邮箱移动。"
 

-#: src/folderview.c:2484
+#: src/folderview.c:2496
+msgid "Copy failed!"
+msgstr "复制失败！"
+
+#: src/folderview.c:2496

 msgid "Move failed!"
 msgstr "移动失败！"
 
 msgid "Move failed!"
 msgstr "移动失败！"
 

-#: src/folderview.c:2520
+#: src/folderview.c:2532

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "文件夹 %s 的邮件分拣配置"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "文件夹 %s 的邮件分拣配置"
 

-#: src/gedit-print.c:147 src/messageview.c:1502 src/summaryview.c:4124
-#: src/toolbar.c:178
+#: src/gedit-print.c:147 src/messageview.c:1525 src/summaryview.c:4124
+#: src/toolbar.c:182

 msgid "Print"
 msgstr "打印"
 
 msgid "Print"
 msgstr "打印"
 


@@ -2949,19 +3232,47 @@ msgstr "完成。"
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收%d新闻组(已读%s)"
 
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收%d新闻组(已读%s)"
 

-#: src/gtk/about.c:78 src/textview.c:216
+#: src/gtk/about.c:79 src/textview.c:216

 msgid "/_Open with Web browser"
 msgstr "/用网页浏览器打开(_O)"
 
 msgid "/_Open with Web browser"
 msgstr "/用网页浏览器打开(_O)"
 

-#: src/gtk/about.c:79 src/textview.c:217
+#: src/gtk/about.c:80 src/textview.c:217

 msgid "/Copy this _link"
 msgid "/Copy this _link"

-msgstr "/拷贝链接地址(_l)"
+msgstr "/复制链接地址(_l)"

 
 

-#: src/gtk/about.c:119
-msgid "About Sylpheed-Claws"
-msgstr "关于Sylpheed Claws"
+#: src/gtk/about.c:138
+msgid ""
+"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
+"\n"
+"For further information visit the Claws Mail website:\n"
+msgstr ""
+"Claws Mail是一个轻量级的邮件客户端，具有速度快、可配置性强的特点。\n"
+"\n"
+"如欲获得进一步的信息，请访问Claws Mail网站:\n"

 
 

-#: src/gtk/about.c:161
+#: src/gtk/about.c:144
+msgid ""
+"\n"
+"\n"
+"Claws Mail is free software released under the GPL license. If you wish to "
+"donate to the Claws Mail project you can do so at:\n"
+msgstr ""
+"\n"
+"\n"
+"Claws Mail是自由软件，在遵循通用许可协议(GPL)的前提下发布。如果你想给Claws "
+"Mail项目捐款，可访问如下网址:\n"
+
+#: src/gtk/about.c:159
+msgid ""
+"\n"
+"\n"
+"System Information\n"
+msgstr ""
+"\n"
+"\n"
+"系统信息\n"
+
+#: src/gtk/about.c:165

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2972,7 +3283,7 @@ msgstr ""
 "本地语言: %s (字符集: %s)\n"
 "操作系统: %s %s (%s)"
 
 "本地语言: %s (字符集: %s)\n"
 "操作系统: %s %s (%s)"
 

-#: src/gtk/about.c:170
+#: src/gtk/about.c:174

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2983,7 +3294,7 @@ msgstr ""
 "本地语言: %s (字符集: %s)\n"
 "操作系统: %s"
 
 "本地语言: %s (字符集: %s)\n"
 "操作系统: %s"
 

-#: src/gtk/about.c:179
+#: src/gtk/about.c:183

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2994,110 +3305,80 @@ msgstr ""
 "本地语言: %s (字符集: %s)\n"
 "操作系统: (未知)"
 
 "本地语言: %s (字符集: %s)\n"
 "操作系统: (未知)"
 

-#: src/gtk/about.c:194
-#, c-format
-msgid ""
-"Compiled-in features:\n"
-"%s"
-msgstr ""
-"本版本编译进的特性:\n"
-"%s"
+#: src/gtk/about.c:240 src/prefs_themes.c:706 src/wizard.c:467
+msgid "The Claws Mail Team"
+msgstr "Claws Mail开发组"

 
 

-#: src/gtk/about.c:240
-msgid ""
-"Copyright (C) 1999-2006 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
-"and the Sylpheed-Claws team"
-msgstr ""
-"版本所有 (C) 1999-2006\n"
-"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>和Sylpheed-Claws开发组"
+#: src/gtk/about.c:259
+msgid "Previous team members"
+msgstr "以前的开发小组成员"

 
 

-#: src/gtk/about.c:283
-msgid ""
-"Sylpheed-Claws is a lightweight, fast and highly-configurable email client.\n"
-"\n"
-"For further information visit the Sylpheed-Claws website:\n"
-msgstr ""
-"Sylpheed-Claws是一个轻量级的邮件客户端，具有速度快、可配置性强的特点。\n"
-"\n"
-"如欲获得进一步的信息，请访问Sylpheed-Claws网站:\n"
+#: src/gtk/about.c:278
+msgid "The translation team"
+msgstr "翻译小组"

 
 

-#: src/gtk/about.c:289
-msgid ""
-"\n"
-"\n"
-"Sylpheed-Claws is free software released under the GPL license. If you wish "
-"to donate to the Sylpheed-Claws project you can do so at:\n"
-msgstr ""
-"\n"
-"\n"
-"Sylpheed-Claws是自由软件，在遵循通用许可协议(GPL)的前提下发布。如果你想给"
-"Sylpheed-Claws项目捐款，可访问如下网址:\n"
+#: src/gtk/about.c:297
+msgid "Documentation team"
+msgstr "文档小组"

 
 

-#: src/gtk/about.c:296
-msgid "\n"
-msgstr ""
-
-#: src/gtk/about.c:307
-msgid "_Info"
-msgstr "说明(_I)"
+#: src/gtk/about.c:316
+msgid "Logo"
+msgstr "徽标"

 
 #: src/gtk/about.c:335
 
 #: src/gtk/about.c:335

-msgid "The Sylpheed-Claws Team\n"
-msgstr "Sylpheed Claws开发组\n"
+msgid "Icons"
+msgstr "图标"

 
 

-#: src/gtk/about.c:352
-msgid ""
-"\n"
-"Previous team members\n"
-msgstr ""
-"\n"
-"以前的开发小组成员\n"
+#: src/gtk/about.c:354
+msgid "Contributors"
+msgstr "其他有贡献人员"

 
 

-#: src/gtk/about.c:369
-msgid ""
-"\n"
-"The translation team\n"
-msgstr ""
-"\n"
-"翻译小组\n"
+#: src/gtk/about.c:402
+msgid "Compiled-in Features\n"
+msgstr "本版本编译进的特性\n"

 
 

-#: src/gtk/about.c:386
+#: src/gtk/about.c:418

 msgid ""
 msgid ""

-"\n"
-"Documentation team\n"
-msgstr ""
-"\n"
-"文档小组\n"
+"IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
+msgstr "提供对IPv6地址的支持，IPv6是新一代的因特网寻址协议\n"

 
 

-#: src/gtk/about.c:403
-msgid ""
-"\n"
-"Logo\n"
-msgstr ""
-"\n"
-"徽标\n"
+#: src/gtk/about.c:429
+msgid "iconv|allows converting to and from different character sets\n"
+msgstr "提供在不同字符集之间的转换功能\n"

 
 

-#: src/gtk/about.c:420
-msgid ""
-"\n"
-"Icons\n"
-msgstr ""
-"\n"
-"图标\n"
+#: src/gtk/about.c:439
+msgid "compface|adds support for the X-Face header\n"
+msgstr "提供X-Face邮件头的支持\n"

 
 

-#: src/gtk/about.c:437
-msgid ""
-"\n"
-"Contributors\n"
-msgstr ""
-"\n"
-"其他有贡献人员\n"
+#: src/gtk/about.c:449
+msgid "OpenSSL|adds support for encrypted connections to servers\n"
+msgstr "提供安全连接服务器的功能\n"

 
 

-#: src/gtk/about.c:456
-msgid "_Authors"
-msgstr "作者(_A)"
+#: src/gtk/about.c:459
+msgid "LDAP|adds support for LDAP shared addressbooks\n"
+msgstr "提供LDAP共享地址簿支持\n"
+
+#: src/gtk/about.c:469
+msgid "JPilot|adds support for PalmOS addressbooks\n"
+msgstr "提供PalmOS地址簿支持\n"
+
+#: src/gtk/about.c:479
+msgid "GNU/aspell|adds support for spell checking\n"
+msgstr "提供拼写检查功能\n"
+
+#: src/gtk/about.c:489
+msgid "libetpan|adds support for IMAP servers\n"
+msgstr "提供连接IMAP服务器的功能\n"

 
 

-#: src/gtk/about.c:476
+#: src/gtk/about.c:499
+msgid "libgnomeprint|adds support for a complete print dialog\n"
+msgstr "提供打印设置对话框\n"
+
+#: src/gtk/about.c:509
+msgid "libSM|adds support for session handling\n"
+msgstr "提供会话管理接口\n"
+
+#: src/gtk/about.c:541

 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 "
 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 "


@@ -3109,7 +3390,7 @@ msgstr ""
 "用许可协议(可以是第二版或者更高版本)中列出的条款。\n"
 "\n"
 
 "用许可协议(可以是第二版或者更高版本)中列出的条款。\n"
 "\n"
 

-#: src/gtk/about.c:482
+#: src/gtk/about.c:547

 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 "
 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 "


@@ -3121,7 +3402,7 @@ msgstr ""
 "隐含的质量担保，也没有特殊用途的担保。请阅读GNU通用许可协议以了解详情。\n"
 "\n"
 
 "隐含的质量担保，也没有特殊用途的担保。请阅读GNU通用许可协议以了解详情。\n"
 "\n"
 

-#: src/gtk/about.c:488
+#: src/gtk/about.c:553

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "


@@ -3133,45 +3414,75 @@ msgstr ""
 "02111-1307, USA.\n"
 "\n"
 
 "02111-1307, USA.\n"
 "\n"
 

-#: src/gtk/about.c:502
+#: src/gtk/about.c:571

 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgstr "本产品包含了根据OpenSSL开发包开发的软件, 该开发包由OpenSSL项目组提供("
 
 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
 msgstr "本产品包含了根据OpenSSL开发包开发的软件, 该开发包由OpenSSL项目组提供("
 

-#: src/gtk/about.c:506
+#: src/gtk/about.c:575

 msgid ").\n"
 msgstr ")。\n"
 
 msgid ").\n"
 msgstr ")。\n"
 

-#: src/gtk/about.c:518
+#: src/gtk/about.c:668
+msgid "About Claws Mail"
+msgstr "关于Claws Mail"
+
+#: src/gtk/about.c:719
+msgid ""
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"
+msgstr ""
+"版本所有 (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"和Claws Mail开发组"
+
+#: src/gtk/about.c:733
+msgid "_Info"
+msgstr "说明(_I)"
+
+#: src/gtk/about.c:739
+msgid "_Authors"
+msgstr "作者(_A)"
+
+#: src/gtk/about.c:745
+msgid "_Features"
+msgstr "特性(_F)"
+
+#: src/gtk/about.c:751

 msgid "_License"
 msgstr "许可协议(_L)"
 
 msgid "_License"
 msgstr "许可协议(_L)"
 

-#: src/gtk/colorlabel.c:48 src/prefs_common.c:303
+#: src/gtk/about.c:759
+msgid "_Release Notes"
+msgstr "发布说明(_R)"
+
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:313

 msgid "Orange"
 msgstr "橙色"
 
 msgid "Orange"
 msgstr "橙色"
 

-#: src/gtk/colorlabel.c:49 src/prefs_common.c:307
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:317

 msgid "Red"
 msgstr "红色"
 
 msgid "Red"
 msgstr "红色"
 

-#: src/gtk/colorlabel.c:50 src/prefs_common.c:311
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:321

 msgid "Pink"
 msgstr "粉红"
 
 msgid "Pink"
 msgstr "粉红"
 

-#: src/gtk/colorlabel.c:51 src/prefs_common.c:315
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:325

 msgid "Sky blue"
 msgstr "天蓝"
 
 msgid "Sky blue"
 msgstr "天蓝"
 

-#: src/gtk/colorlabel.c:52 src/prefs_common.c:319
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:329

 msgid "Blue"
 msgstr "蓝色"
 
 msgid "Blue"
 msgstr "蓝色"
 

-#: src/gtk/colorlabel.c:53 src/prefs_common.c:323
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:333

 msgid "Green"
 msgstr "绿色"
 
 msgid "Green"
 msgstr "绿色"
 

-#: src/gtk/colorlabel.c:54 src/prefs_common.c:327
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:337

 msgid "Brown"
 msgstr "棕色"
 
 msgid "Brown"
 msgstr "棕色"
 


@@ -3295,36 +3606,36 @@ msgstr "页眉和页脚字体"
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "用于打印页眉和页脚的字体(例如: \"Monospace 10\")"
 
 msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
 msgstr "用于打印页眉和页脚的字体(例如: \"Monospace 10\")"
 

-#: src/gtk/gtkaspell.c:606
+#: src/gtk/gtkaspell.c:632

 msgid "No dictionary selected."
 msgstr "没有选择任何字典。"
 
 msgid "No dictionary selected."
 msgstr "没有选择任何字典。"
 

-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
+#: src/gtk/gtkaspell.c:868 src/gtk/gtkaspell.c:1869 src/gtk/gtkaspell.c:2164

 msgid "Normal Mode"
 msgstr "一般模式"
 
 msgid "Normal Mode"
 msgstr "一般模式"
 

-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
+#: src/gtk/gtkaspell.c:870 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2176

 msgid "Bad Spellers Mode"
 msgstr "拼错字模式"
 
 msgid "Bad Spellers Mode"
 msgstr "拼错字模式"
 

-#: src/gtk/gtkaspell.c:870
+#: src/gtk/gtkaspell.c:909

 msgid "Unknown suggestion mode."
 msgstr "未知的建议模式。"
 
 msgid "Unknown suggestion mode."
 msgstr "未知的建议模式。"
 

-#: src/gtk/gtkaspell.c:1154
+#: src/gtk/gtkaspell.c:1200

 msgid "No misspelled word found."
 msgstr "没有发现错字。"
 
 msgid "No misspelled word found."
 msgstr "没有发现错字。"
 

-#: src/gtk/gtkaspell.c:1502
+#: src/gtk/gtkaspell.c:1548

 msgid "Replace unknown word"
 msgstr "替换未知的字"
 
 msgid "Replace unknown word"
 msgstr "替换未知的字"
 

-#: src/gtk/gtkaspell.c:1517
+#: src/gtk/gtkaspell.c:1563

 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">将 \"%s\" 替换为: </span>"
 
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">将 \"%s\" 替换为: </span>"
 

-#: src/gtk/gtkaspell.c:1562
+#: src/gtk/gtkaspell.c:1608

 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"


@@ -3332,59 +3643,63 @@ msgstr ""
 "学习功能: 按住Control键时按Enter\n"
 "可以将被认为拼写错误的单词加入到单词本。\n"
 
 "学习功能: 按住Control键时按Enter\n"
 "可以将被认为拼写错误的单词加入到单词本。\n"
 

-#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
+#: src/gtk/gtkaspell.c:1863 src/gtk/gtkaspell.c:2152

 msgid "Fast Mode"
 msgstr "快速模式"
 
 msgid "Fast Mode"
 msgstr "快速模式"
 

-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1970

 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "%s中的\"%s\"未知"
 
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "%s中的\"%s\"未知"
 

-#: src/gtk/gtkaspell.c:1930
+#: src/gtk/gtkaspell.c:1984

 msgid "Accept in this session"
 msgstr "接受这一次"
 
 msgid "Accept in this session"
 msgstr "接受这一次"
 

-#: src/gtk/gtkaspell.c:1940
+#: src/gtk/gtkaspell.c:1994

 msgid "Add to personal dictionary"
 msgstr "加入个人的字典"
 
 msgid "Add to personal dictionary"
 msgstr "加入个人的字典"
 

-#: src/gtk/gtkaspell.c:1950
+#: src/gtk/gtkaspell.c:2004

 msgid "Replace with..."
 msgstr "更换成..."
 
 msgid "Replace with..."
 msgstr "更换成..."
 

-#: src/gtk/gtkaspell.c:1963
+#: src/gtk/gtkaspell.c:2017

 #, c-format
 msgid "Check with %s"
 msgstr "用%s检查"
 
 #, c-format
 msgid "Check with %s"
 msgstr "用%s检查"
 

-#: src/gtk/gtkaspell.c:1985
+#: src/gtk/gtkaspell.c:2039

 msgid "(no suggestions)"
 msgstr "(没有建议)"
 
 msgid "(no suggestions)"
 msgstr "(没有建议)"
 

-#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
+#: src/gtk/gtkaspell.c:2050 src/gtk/gtkaspell.c:2229

 msgid "More..."
 msgstr "更多..."
 
 msgid "More..."
 msgstr "更多..."
 

-#: src/gtk/gtkaspell.c:2060
+#: src/gtk/gtkaspell.c:2114

 #, c-format
 msgid "Dictionary: %s"
 msgstr "字典: %s"
 
 #, c-format
 msgid "Dictionary: %s"
 msgstr "字典: %s"
 

-#: src/gtk/gtkaspell.c:2073
+#: src/gtk/gtkaspell.c:2127

 #, c-format
 msgid "Use alternate (%s)"
 msgstr "用另一个(%s)"
 
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "用另一个(%s)"
 

-#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2138
+msgid "Use both dictionaries"
+msgstr "使用两个字典"
+
+#: src/gtk/gtkaspell.c:2192 src/prefs_spelling.c:218

 msgid "Check while typing"
 msgstr "键入时实时检查"
 
 msgid "Check while typing"
 msgstr "键入时实时检查"
 

-#: src/gtk/gtkaspell.c:2137
+#: src/gtk/gtkaspell.c:2208

 msgid "Change dictionary"
 msgstr "切换字典"
 
 msgid "Change dictionary"
 msgstr "切换字典"
 

-#: src/gtk/gtkaspell.c:2270
+#: src/gtk/gtkaspell.c:2340

 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"


@@ -3393,6 +3708,15 @@ msgstr ""
 "拼写检查器切换字典失败\n"
 "%s"
 
 "拼写检查器切换字典失败\n"
 "%s"
 

+#: src/gtk/gtkaspell.c:2386
+#, c-format
+msgid ""
+"The spell checker could not change the alternate dictionary.\n"
+"%s"
+msgstr ""
+"拼写检查器切换字典失败。\n"
+"%s"
+

 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "新邮件"
 #: src/gtk/icon_legend.c:67
 msgid "New message"
 msgstr "新邮件"


@@ -3451,7 +3775,7 @@ msgstr "待移动的邮件"
 
 #: src/gtk/icon_legend.c:83
 msgid "Message is marked for copying"
 
 #: src/gtk/icon_legend.c:83
 msgid "Message is marked for copying"

-msgstr "待拷贝的邮件"
+msgstr "待复制的邮件"

 
 #: src/gtk/icon_legend.c:85
 msgid "Locked message"
 
 #: src/gtk/icon_legend.c:85
 msgid "Locked message"


@@ -3496,7 +3820,7 @@ msgstr "不再询问"
 msgid "Protocol log"
 msgstr "协议日志"
 
 msgid "Protocol log"
 msgstr "协议日志"
 

-#: src/gtk/logwindow.c:373
+#: src/gtk/logwindow.c:384

 msgid "Clear _Log"
 msgstr "清除日志(_L)"
 
 msgid "Clear _Log"
 msgstr "清除日志(_L)"
 


@@ -3540,13 +3864,13 @@ msgstr ""
 msgid "Plugins"
 msgstr "插件"
 
 msgid "Plugins"
 msgstr "插件"
 

-#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:319 src/prefs_summaries.c:211

 msgid "Description"
 msgstr "描述"
 
 #: src/gtk/pluginwindow.c:336
 msgid "Description"
 msgstr "描述"
 
 #: src/gtk/pluginwindow.c:336

-msgid "More plugins are available from the Sylpheed-Claws website."
-msgstr "可从Sylpheed-Claws网站下载更多插件。"
+msgid "More plugins are available from the Claws Mail website."
+msgstr "可从Claws Mail网站下载更多插件。"

 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."
 
 #: src/gtk/pluginwindow.c:342 src/prefs_themes.c:866
 msgid "Get more..."


@@ -3576,187 +3900,187 @@ msgstr "已加载的插件"
 msgid "Page Index"
 msgstr "页面"
 
 msgid "Page Index"
 msgstr "页面"
 

-#: src/gtk/progressdialog.c:140 src/prefs_account.c:762
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:769

 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "帐号"
 
 #: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
 #: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
 #: src/prefs_filtering.c:1490
 msgid "Account"
 msgstr "帐号"
 
 #: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136

-#: src/prefs_summary_column.c:80 src/summaryview.c:2375
+#: src/prefs_summary_column.c:80 src/summaryview.c:2376

 msgid "Status"
 msgstr "状态"
 
 msgid "Status"
 msgstr "状态"
 

-#: src/gtk/quicksearch.c:329
+#: src/gtk/quicksearch.c:331

 msgid "all messages"
 msgstr "所有邮件"
 
 msgid "all messages"
 msgstr "所有邮件"
 

-#: src/gtk/quicksearch.c:330
+#: src/gtk/quicksearch.c:332

 msgid "messages whose age is greater than #"
 msgstr "比# 旧的邮件"
 
 msgid "messages whose age is greater than #"
 msgstr "比# 旧的邮件"
 

-#: src/gtk/quicksearch.c:331
+#: src/gtk/quicksearch.c:333

 msgid "messages whose age is less than #"
 msgstr "比# 新的邮件"
 
 msgid "messages whose age is less than #"
 msgstr "比# 新的邮件"
 

-#: src/gtk/quicksearch.c:332
+#: src/gtk/quicksearch.c:334

 msgid "messages which contain S in the message body"
 msgstr "在文件主体中包含 S 的邮件"
 
 msgid "messages which contain S in the message body"
 msgstr "在文件主体中包含 S 的邮件"
 

-#: src/gtk/quicksearch.c:333
+#: src/gtk/quicksearch.c:335

 msgid "messages which contain S in the whole message"
 msgstr "整篇文章中包含 S 的邮件"
 
 msgid "messages which contain S in the whole message"
 msgstr "整篇文章中包含 S 的邮件"
 

-#: src/gtk/quicksearch.c:334
+#: src/gtk/quicksearch.c:336

 msgid "messages carbon-copied to S"
 msgstr "被抄送给 S 的邮件"
 
 msgid "messages carbon-copied to S"
 msgstr "被抄送给 S 的邮件"
 

-#: src/gtk/quicksearch.c:335
+#: src/gtk/quicksearch.c:337

 msgid "message is either to: or cc: to S"
 msgstr "寄给或是副本抄送给 S 的邮件"
 
 msgid "message is either to: or cc: to S"
 msgstr "寄给或是副本抄送给 S 的邮件"
 

-#: src/gtk/quicksearch.c:336
+#: src/gtk/quicksearch.c:338

 msgid "deleted messages"
 msgstr "已删除的邮件"
 
 msgid "deleted messages"
 msgstr "已删除的邮件"
 

-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:339

 msgid "messages which contain S in the Sender field"
 msgstr "在发信人栏中包含S的邮件"
 
 msgid "messages which contain S in the Sender field"
 msgstr "在发信人栏中包含S的邮件"
 

-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:340

 msgid "true if execute \"S\" succeeds"
 msgstr "如果执行 \"S\"成功"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "如果执行 \"S\"成功"
 

-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:341

 msgid "messages originating from user S"
 msgstr "由S所发出的邮件"
 
 msgid "messages originating from user S"
 msgstr "由S所发出的邮件"
 

-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:342

 msgid "forwarded messages"
 msgstr "已转发的邮件"
 
 msgid "forwarded messages"
 msgstr "已转发的邮件"
 

-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:343

 msgid "messages which contain header S"
 msgstr "在信头中包含S的邮件"
 
 msgid "messages which contain header S"
 msgstr "在信头中包含S的邮件"
 

-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:344

 msgid "messages which contain S in Message-ID header"
 msgstr "在邮件信头中包含 S 的邮件"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "在邮件信头中包含 S 的邮件"
 

-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:345

 msgid "messages which contain S in inreplyto header"
 msgstr "在回复信头中包含S的邮件"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "在回复信头中包含S的邮件"
 

-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:346

 msgid "messages which are marked with color #"
 msgstr "带颜色标记#的邮件"
 
 msgid "messages which are marked with color #"
 msgstr "带颜色标记#的邮件"
 

-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:347

 msgid "locked messages"
 msgstr "已锁定的邮件"
 
 msgid "locked messages"
 msgstr "已锁定的邮件"
 

-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:348

 msgid "messages which are in newsgroup S"
 msgstr "在新闻组S中的邮件"
 
 msgid "messages which are in newsgroup S"
 msgstr "在新闻组S中的邮件"
 

-#: src/gtk/quicksearch.c:347
+#: src/gtk/quicksearch.c:349

 msgid "new messages"
 msgstr "新邮件"
 
 msgid "new messages"
 msgstr "新邮件"
 

-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:350

 msgid "old messages"
 msgstr "旧邮件"
 
 msgid "old messages"
 msgstr "旧邮件"
 

-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:351

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "不完整的邮件(未完全下载)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "不完整的邮件(未完全下载)"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:352

 msgid "messages which have been replied to"
 msgstr "已回复的邮件"
 
 msgid "messages which have been replied to"
 msgstr "已回复的邮件"
 

-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:353

 msgid "read messages"
 msgstr "已读邮件"
 
 msgid "read messages"
 msgstr "已读邮件"
 

-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:354

 msgid "messages which contain S in subject"
 msgstr "主题中包含S的邮件"
 
 msgid "messages which contain S in subject"
 msgstr "主题中包含S的邮件"
 

-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:355

 msgid "messages whose score is equal to #"
 msgstr "得分与#一样高的邮件"
 
 msgid "messages whose score is equal to #"
 msgstr "得分与#一样高的邮件"
 

-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:356

 msgid "messages whose score is greater than #"
 msgstr "得分较#高的邮件"
 
 msgid "messages whose score is greater than #"
 msgstr "得分较#高的邮件"
 

-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:357

 msgid "messages whose score is lower than #"
 msgstr "得分较#低的邮件"
 
 msgid "messages whose score is lower than #"
 msgstr "得分较#低的邮件"
 

-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:358

 msgid "messages whose size is equal to #"
 msgstr "文件与#一样大的邮件"
 
 msgid "messages whose size is equal to #"
 msgstr "文件与#一样大的邮件"
 

-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:359

 msgid "messages whose size is greater than #"
 msgstr "文件比#大的邮件"
 
 msgid "messages whose size is greater than #"
 msgstr "文件比#大的邮件"
 

-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:360

 msgid "messages whose size is smaller than #"
 msgstr "文件比#小的邮件"
 
 msgid "messages whose size is smaller than #"
 msgstr "文件比#小的邮件"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:361

 msgid "messages which have been sent to S"
 msgstr "已经送给S的邮件"
 
 msgid "messages which have been sent to S"
 msgstr "已经送给S的邮件"
 

-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:362

 msgid "marked messages"
 msgstr "已标记的邮件"
 
 msgid "marked messages"
 msgstr "已标记的邮件"
 

-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:363

 msgid "unread messages"
 msgstr "未读邮件"
 
 msgid "unread messages"
 msgstr "未读邮件"
 

-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:364

 msgid "messages which contain S in References header"
 msgstr "在References信息头里含有S的邮件"
 
 msgid "messages which contain S in References header"
 msgstr "在References信息头里含有S的邮件"
 

-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:365

 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "邮件传送给命令进行处理时返回0 - %F为邮件文件名称"
 
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "邮件传送给命令进行处理时返回0 - %F为邮件文件名称"
 

-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:366

 msgid "messages which contain S in X-Label header"
 msgstr "在X-Label信息头里含有S的邮件"
 
 msgid "messages which contain S in X-Label header"
 msgstr "在X-Label信息头里含有S的邮件"
 

-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:368

 msgid "logical AND operator"
 msgstr "逻辑运算AND"
 
 msgid "logical AND operator"
 msgstr "逻辑运算AND"
 

-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:369

 msgid "logical OR operator"
 msgstr "逻辑运算OR"
 
 msgid "logical OR operator"
 msgstr "逻辑运算OR"
 

-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:370

 msgid "logical NOT operator"
 msgstr "逻辑运算NOT"
 
 msgid "logical NOT operator"
 msgstr "逻辑运算NOT"
 

-#: src/gtk/quicksearch.c:369
+#: src/gtk/quicksearch.c:371

 msgid "case sensitive search"
 msgstr "区分大小写的搜寻"
 
 msgid "case sensitive search"
 msgstr "区分大小写的搜寻"
 

-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:373

 msgid "all filtering expressions are allowed"
 msgstr "允许使用所有过滤表达式"
 
 msgid "all filtering expressions are allowed"
 msgstr "允许使用所有过滤表达式"
 

-#: src/gtk/quicksearch.c:379 src/summary_search.c:329
+#: src/gtk/quicksearch.c:381 src/summary_search.c:397

 msgid "Extended Search"
 msgstr "高级搜索"
 
 msgid "Extended Search"
 msgstr "高级搜索"
 

-#: src/gtk/quicksearch.c:380
+#: src/gtk/quicksearch.c:382

 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"
 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"


@@ -3767,51 +4091,51 @@ msgstr ""
 "\n"
 "可以使用如下一些符号:"
 
 "\n"
 "可以使用如下一些符号:"
 

-#: src/gtk/quicksearch.c:476 src/prefs_filtering_action.c:1080
-#: src/prefs_matcher.c:158 src/prefs_matcher.c:1866
-#: src/prefs_summary_column.c:82 src/prefs_template.c:190 src/quote_fmt.c:47
-#: src/summaryview.c:486
+#: src/gtk/quicksearch.c:478 src/prefs_compose_writing.c:239
+#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:158
+#: src/prefs_matcher.c:1866 src/prefs_summary_column.c:82
+#: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486

 msgid "Subject"
 msgstr "主题"
 
 msgid "Subject"
 msgstr "主题"
 

-#: src/gtk/quicksearch.c:480 src/prefs_filtering_action.c:1081
+#: src/gtk/quicksearch.c:482 src/prefs_filtering_action.c:1081

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "发信人"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1867
 #: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "发信人"
 

-#: src/gtk/quicksearch.c:484 src/prefs_filtering_action.c:1082
+#: src/gtk/quicksearch.c:486 src/prefs_filtering_action.c:1082

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr "收信人"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1868
 #: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
 #: src/summaryview.c:488
 msgid "To"
 msgstr "收信人"
 

-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:497

 msgid "Recursive"
 msgstr "搜索子文件夹"
 
 msgid "Recursive"
 msgstr "搜索子文件夹"
 

-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:507

 msgid "Sticky"
 msgstr "切换文件夹时保持有效"
 
 msgid "Sticky"
 msgstr "切换文件夹时保持有效"
 

-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:517

 msgid "Type-ahead"
 msgid "Type-ahead"

-msgstr ""
+msgstr "递增式"

 
 

-#: src/gtk/quicksearch.c:546
+#: src/gtk/quicksearch.c:548

 msgid " Clear "
 msgid " Clear "

-msgstr "清除"
+msgstr " 清除 "

 
 

-#: src/gtk/quicksearch.c:567 src/summary_search.c:282
+#: src/gtk/quicksearch.c:569 src/summary_search.c:350

 msgid "Edit search criteria"
 msgstr "编辑搜索条件"
 
 msgid "Edit search criteria"
 msgstr "编辑搜索条件"
 

-#: src/gtk/quicksearch.c:573
+#: src/gtk/quicksearch.c:575

 msgid " Extended Symbols... "
 msgstr "扩展符号"
 
 msgid " Extended Symbols... "
 msgstr "扩展符号"
 

-#: src/gtk/quicksearch.c:1020 src/summaryview.c:1073
+#: src/gtk/quicksearch.c:1025 src/summaryview.c:1073

 #, c-format
 msgid "Searching in %s... \n"
 msgstr "正在搜索(%s)... \n"
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "正在搜索(%s)... \n"


@@ -3929,31 +4253,31 @@ msgstr "查看认证(_V)"
 msgid "Changed SSL Certificate"
 msgstr "更改SSL认证"
 
 msgid "Changed SSL Certificate"
 msgstr "更改SSL认证"
 

-#: src/headerview.c:195 src/summaryview.c:2783 src/summaryview.c:2794
+#: src/headerview.c:195 src/summaryview.c:2784 src/summaryview.c:2795

 msgid "(No From)"
 msgstr "(没有发信人)"
 
 msgid "(No From)"
 msgstr "(没有发信人)"
 

-#: src/headerview.c:210 src/summaryview.c:2818 src/summaryview.c:2821
+#: src/headerview.c:210 src/summaryview.c:2819 src/summaryview.c:2822

 msgid "(No Subject)"
 msgstr "(没有主题)"
 
 msgid "(No Subject)"
 msgstr "(没有主题)"
 

-#: src/image_viewer.c:283
+#: src/image_viewer.c:284

 msgid "Filename:"
 msgstr "文件名"
 
 msgid "Filename:"
 msgstr "文件名"
 

-#: src/image_viewer.c:290
+#: src/image_viewer.c:291

 msgid "Filesize:"
 msgstr "文件大小 :"
 
 msgid "Filesize:"
 msgstr "文件大小 :"
 

-#: src/image_viewer.c:311
+#: src/image_viewer.c:312

 msgid "Load Image"
 msgstr "加载图片"
 
 msgid "Load Image"
 msgstr "加载图片"
 

-#: src/image_viewer.c:317
+#: src/image_viewer.c:318

 msgid "Content-Type:"
 msgstr ""
 
 msgid "Content-Type:"
 msgstr ""
 

-#: src/imap.c:625
+#: src/imap.c:632

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3965,162 +4289,162 @@ msgstr ""
 "CRAM-MD5登录方式仅仅在libetpan编译进了SASL支持并且CRAM-MD5 SASL插件已经加载的"
 "情况下可用。"
 
 "CRAM-MD5登录方式仅仅在libetpan编译进了SASL支持并且CRAM-MD5 SASL插件已经加载的"
 "情况下可用。"
 

-#: src/imap.c:632
+#: src/imap.c:639

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "连接到 %s 失败: 登录被拒绝。%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "连接到 %s 失败: 登录被拒绝。%s"
 

-#: src/imap.c:636
+#: src/imap.c:643

 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "连接到 %s 失败: 登录被拒绝。%s\n"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "连接到 %s 失败: 登录被拒绝。%s\n"
 

-#: src/imap.c:653
+#: src/imap.c:660

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "连接到 %s 失败"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "连接到 %s 失败"
 

-#: src/imap.c:658 src/imap.c:661
+#: src/imap.c:665 src/imap.c:668

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "与 %s 的IMAP4连接已经断开。正在重新连接...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "与 %s 的IMAP4连接已经断开。正在重新连接...\n"
 

-#: src/imap.c:699 src/imap.c:2215 src/imap.c:2739 src/imap.c:2824
-#: src/imap.c:3158 src/imap.c:3913
-msgid "Sylpheed-Claws needs network access in order to access the IMAP server."
-msgstr "Sylpheed-Claws需要访问网络才能连接IMAP服务。"
+#: src/imap.c:717 src/imap.c:2239 src/imap.c:2737 src/imap.c:2822
+#: src/imap.c:3156 src/imap.c:3914
+msgid "Claws Mail needs network access in order to access the IMAP server."
+msgstr "Claws Mail需要访问网络才能连接IMAP服务。"

 
 

-#: src/imap.c:773 src/inc.c:770 src/news.c:295 src/send_message.c:299
+#: src/imap.c:789 src/inc.c:770 src/news.c:295 src/send_message.c:299

 msgid "Insecure connection"
 msgstr "不安全的连接"
 
 msgid "Insecure connection"
 msgstr "不安全的连接"
 

-#: src/imap.c:774 src/inc.c:771 src/news.c:296 src/send_message.c:300
+#: src/imap.c:790 src/inc.c:771 src/news.c:296 src/send_message.c:300

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "

-"available in this build of Sylpheed-Claws. \n"
+"available in this build of Claws Mail. \n"

 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "\n"
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""

-"该连接已经被配置为使用SSL确保安全，但本版本中并没有SSL功能(编译时没有加"
-"入)。\n"
-"请问是否要继续连接该服务器? 如果继续的话，通讯并不能保证是安全的。"
+"该连接已经被配置为使用SSL确保安全，但本版本的Claws Mail并没有SSL功能(编译时没"
+"有加入)。\n"
+"请问是否要继续连接该服务器? 如果继续的话，并不能保证通讯是安全的。"

 
 

-#: src/imap.c:780 src/inc.c:777 src/news.c:302 src/send_message.c:306
+#: src/imap.c:796 src/inc.c:777 src/news.c:302 src/send_message.c:306

 msgid "Con_tinue connecting"
 msgstr "继续连接(_t)"
 
 msgid "Con_tinue connecting"
 msgstr "继续连接(_t)"
 

-#: src/imap.c:790
+#: src/imap.c:806

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "连接到 IMAP4 服务器: %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "连接到 IMAP4 服务器: %s..."
 

-#: src/imap.c:822
+#: src/imap.c:844

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "无法连接到 IMAP4 服务器: %s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "无法连接到 IMAP4 服务器: %s:%d"
 

-#: src/imap.c:825
+#: src/imap.c:847

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到 IMAP4 服务器: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到 IMAP4 服务器: %s:%d\n"
 

-#: src/imap.c:854 src/imap.c:2547
+#: src/imap.c:876 src/imap.c:2545

 msgid "Can't start TLS session.\n"
 msgstr "无法启动TLS。\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "无法启动TLS。\n"
 

-#: src/imap.c:891
+#: src/imap.c:913

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "正在连接 IMAP4 服务器 %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "正在连接 IMAP4 服务器 %s...\n"
 

-#: src/imap.c:902 src/imap.c:905
+#: src/imap.c:924 src/imap.c:927

 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "无法登录到 IMAP 服务器 %s。"
 
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "无法登录到 IMAP 服务器 %s。"
 

-#: src/imap.c:1079
+#: src/imap.c:1100

 msgid "Adding messages..."
 msgstr "正在添加邮件..."
 
 msgid "Adding messages..."
 msgstr "正在添加邮件..."
 

-#: src/imap.c:1229 src/mh.c:500
+#: src/imap.c:1252 src/mh.c:500

 msgid "Copying messages..."
 msgid "Copying messages..."

-msgstr "正在拷贝邮件..."
+msgstr "正在复制邮件..."

 
 

-#: src/imap.c:1404
+#: src/imap.c:1428

 msgid "can't set deleted flags\n"
 msgstr "不能设置删除标记\n"
 
 msgid "can't set deleted flags\n"
 msgstr "不能设置删除标记\n"
 

-#: src/imap.c:1410 src/imap.c:3665
+#: src/imap.c:1434 src/imap.c:3665

 msgid "can't expunge\n"
 msgstr "无法擦除\n"
 
 msgid "can't expunge\n"
 msgstr "无法擦除\n"
 

-#: src/imap.c:1854
+#: src/imap.c:1878

 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建收信夹: LIST失败\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建收信夹: LIST失败\n"
 

-#: src/imap.c:1870
+#: src/imap.c:1894

 msgid "can't create mailbox\n"
 msgstr "无法启动收信夹\n"
 
 msgid "can't create mailbox\n"
 msgstr "无法启动收信夹\n"
 

-#: src/imap.c:1951
+#: src/imap.c:1975

 msgid "New folder name must not contain the namespace path separator"
 msgstr "新目录并不能包含名字空间分隔符"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr "新目录并不能包含名字空间分隔符"
 

-#: src/imap.c:1982
+#: src/imap.c:2006

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱%s 重新命名为 %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱%s 重新命名为 %s\n"
 

-#: src/imap.c:2046
+#: src/imap.c:2070

 msgid "can't delete mailbox\n"
 msgstr "无法删除信夹\n"
 
 msgid "can't delete mailbox\n"
 msgstr "无法删除信夹\n"
 

-#: src/imap.c:2327
+#: src/imap.c:2316

 msgid "LIST failed\n"
 msgstr ""
 
 msgid "LIST failed\n"
 msgstr ""
 

-#: src/imap.c:2435
+#: src/imap.c:2433

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹: %s\n"
 

-#: src/imap.c:2544
+#: src/imap.c:2542

 msgid "Server requires TLS to log in.\n"
 msgstr "需要TLS特性才能登录服务器。\n"
 
 msgid "Server requires TLS to log in.\n"
 msgstr "需要TLS特性才能登录服务器。\n"
 

-#: src/imap.c:2553
+#: src/imap.c:2551

 msgid "Can't refresh capabilities.\n"
 msgstr "无法更新能力基线数据。\n"
 
 msgid "Can't refresh capabilities.\n"
 msgstr "无法更新能力基线数据。\n"
 

-#: src/imap.c:2558
+#: src/imap.c:2556

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Connection to %s failed: server requires TLS, but Sylpheed-Claws has been "
+"Connection to %s failed: server requires TLS, but Claws Mail has been "

 "compiled without OpenSSL support.\n"
 msgstr ""
 "compiled without OpenSSL support.\n"
 msgstr ""

-"不能成功连接上%s: 需要TLS特性才能登录该服务器，但编译时Sylpheed-Claws没有指定"
-"要包含OpenSSL支持。\n"
+"不能成功连接上%s: 需要TLS特性才能登录该服务器，但编译时Claws Mail没有指定要包"
+"含OpenSSL支持。\n"

 
 

-#: src/imap.c:2566
+#: src/imap.c:2564

 msgid "Server logins are disabled.\n"
 msgstr "登录功能已被禁用。\n"
 
 msgid "Server logins are disabled.\n"
 msgstr "登录功能已被禁用。\n"
 

-#: src/imap.c:2744
+#: src/imap.c:2742

 msgid "Fetching message..."
 msgstr "正在收取邮件..."
 
 msgid "Fetching message..."
 msgstr "正在收取邮件..."
 

-#: src/imap.c:2911
+#: src/imap.c:2909

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv无法将UTF-7转换成%s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv无法将UTF-7转换成%s\n"
 

-#: src/imap.c:2941
+#: src/imap.c:2939

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv无法将%s转换成UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv无法将%s转换成UTF-7\n"
 

-#: src/imap.c:2985
+#: src/imap.c:2983

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv无法将UTF-8转换成UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv无法将UTF-8转换成UTF-7\n"
 


@@ -4129,56 +4453,60 @@ msgstr "iconv无法将UTF-8转换成UTF-7\n"
 msgid "can't set deleted flags: %d\n"
 msgstr "不能设置删除标记: %d\n"
 
 msgid "can't set deleted flags: %d\n"
 msgstr "不能设置删除标记: %d\n"
 

-#: src/imap.c:4375
+#: src/imap.c:4376

 msgid ""
 msgid ""

-"You have one or more IMAP accounts defined. However this version of Sylpheed-"
-"Claws has been built without IMAP support; your IMAP account(s) are "
+"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 "

 "disabled.\n"
 "\n"
 "disabled.\n"
 "\n"

-"You probably need to install libetpan and recompile Sylpheed-Claws."
+"You probably need to install libetpan and recompile Claws Mail."

 msgstr ""
 msgstr ""

-"你定义了多个IMAP帐号, 但当前的这个Sylpheed-Claws编译时并没有附带IMAP支持，故"
-"IMAP帐号将被禁用。\n"
+"你定义了多个IMAP帐号, 但当前的这个Claws Mail编译时并没有添加IMAP支持，故IMAP"
+"帐号将被禁用。\n"

 "\n"
 "\n"

-"你需要安装libetpan并重新编译Sylpheed-Claws。"
+"你需要安装libetpan并重新编译Claws Mail。"

 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/创建新文件夹(_n)..."
 
 
 #: src/imap_gtk.c:55 src/mh_gtk.c:50
 msgid "/Create _new folder..."
 msgstr "/创建新文件夹(_n)..."
 

-#: src/imap_gtk.c:56 src/mh_gtk.c:51
+#: src/imap_gtk.c:57 src/mh_gtk.c:52

 msgid "/_Rename folder..."
 msgstr "/重命名文件夹(_R)..."
 
 msgid "/_Rename folder..."
 msgstr "/重命名文件夹(_R)..."
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:52
+#: src/imap_gtk.c:58 src/mh_gtk.c:53

 msgid "/M_ove folder..."
 msgstr "/移动文件夹(_o)..."
 
 msgid "/M_ove folder..."
 msgstr "/移动文件夹(_o)..."
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:53
+#: src/imap_gtk.c:59 src/mh_gtk.c:54
+msgid "/Cop_y folder..."
+msgstr "/复制文件夹(_y)..."
+
+#: src/imap_gtk.c:61 src/mh_gtk.c:56

 msgid "/_Delete folder..."
 msgstr "/删除文件夹(_D)..."
 
 msgid "/_Delete folder..."
 msgstr "/删除文件夹(_D)..."
 

-#: src/imap_gtk.c:60 src/news_gtk.c:55
+#: src/imap_gtk.c:63 src/news_gtk.c:55

 msgid "/Synchronise"
 msgstr "/同步"
 
 msgid "/Synchronise"
 msgstr "/同步"
 

-#: src/imap_gtk.c:61 src/news_gtk.c:56
+#: src/imap_gtk.c:64 src/news_gtk.c:56

 msgid "/Down_load messages"
 msgstr "/下载邮件(_l)"
 
 msgid "/Down_load messages"
 msgstr "/下载邮件(_l)"
 

-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:58
+#: src/imap_gtk.c:66 src/mh_gtk.c:58 src/news_gtk.c:58

 msgid "/_Check for new messages"
 msgstr "/检查新邮件(_C)"
 
 msgid "/_Check for new messages"
 msgstr "/检查新邮件(_C)"
 

-#: src/imap_gtk.c:64 src/mh_gtk.c:56
+#: src/imap_gtk.c:67 src/mh_gtk.c:59

 msgid "/C_heck for new folders"
 msgstr "/检查新文件夹(_C)"
 
 msgid "/C_heck for new folders"
 msgstr "/检查新文件夹(_C)"
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:57
+#: src/imap_gtk.c:68 src/mh_gtk.c:60

 msgid "/R_ebuild folder tree"
 msgstr "/重新建立文件夹树(_e)"
 
 msgid "/R_ebuild folder tree"
 msgstr "/重新建立文件夹树(_e)"
 

-#: src/imap_gtk.c:135
+#: src/imap_gtk.c:140

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders\n"


@@ -4188,21 +4516,21 @@ msgstr ""
 "(如果想创建一个可包含子夹但不包含邮件的文件夹，\n"
 "请在名字的后面加上'/')"
 
 "(如果想创建一个可包含子夹但不包含邮件的文件夹，\n"
 "请在名字的后面加上'/')"
 

-#: src/imap_gtk.c:193 src/mh_gtk.c:228
+#: src/imap_gtk.c:198 src/mh_gtk.c:231

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "请输入'%s'的新名字:"
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "请输入'%s'的新名字:"
 

-#: src/imap_gtk.c:195 src/mh_gtk.c:230
+#: src/imap_gtk.c:200 src/mh_gtk.c:233

 msgid "Rename folder"
 msgstr "重新命名文件夹"
 
 msgid "Rename folder"
 msgstr "重新命名文件夹"
 

-#: src/imap_gtk.c:204 src/imap_gtk.c:209
+#: src/imap_gtk.c:209 src/imap_gtk.c:214

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "文件夹名称不能包含`%c'。"
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "文件夹名称不能包含`%c'。"
 

-#: src/imap_gtk.c:226 src/mh_gtk.c:255
+#: src/imap_gtk.c:231 src/mh_gtk.c:258

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -4210,7 +4538,7 @@ msgstr ""
 "不能重命名该目录。\n"
 "新指定的目录名不合法。"
 
 "不能重命名该目录。\n"
 "新指定的目录名不合法。"
 

-#: src/imap_gtk.c:280 src/mh_gtk.c:176
+#: src/imap_gtk.c:283 src/mh_gtk.c:179

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -4222,12 +4550,12 @@ msgstr ""
 "\n"
 "确实要删除吗？"
 
 "\n"
 "确实要删除吗？"
 

-#: src/imap_gtk.c:302 src/mh_gtk.c:198 src/news_gtk.c:238
+#: src/imap_gtk.c:305 src/mh_gtk.c:201 src/news_gtk.c:241

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹'%s'。"
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹'%s'。"
 

-#: src/imap_gtk.c:362 src/news_gtk.c:299
+#: src/imap_gtk.c:365 src/news_gtk.c:302

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "从 `%s' 下载邮件时发生错误。"
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "从 `%s' 下载邮件时发生错误。"


@@ -4414,8 +4742,8 @@ msgid "Import Pine file into Address Book"
 msgstr "将Pine文件导入至地址簿中"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304
 msgstr "将Pine文件导入至地址簿中"
 
 #: src/inc.c:173 src/inc.c:278 src/inc.c:304

-msgid "Sylpheed-Claws needs network access in order to get mails."
-msgstr "Sylpheed-Claws需要访问网络才能收取邮件。"
+msgid "Claws Mail needs network access in order to get mails."
+msgstr "Claws Mail需要访问网络才能收取邮件。"

 
 #: src/inc.c:384
 msgid "Retrieving new messages"
 
 #: src/inc.c:384
 msgid "Retrieving new messages"


@@ -4451,7 +4779,7 @@ msgstr "连接失败"
 msgid "Auth failed"
 msgstr "授权失败"
 
 msgid "Auth failed"
 msgstr "授权失败"
 

-#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2371
+#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2372

 msgid "Locked"
 msgstr "已锁定"
 
 msgid "Locked"
 msgstr "已锁定"
 


@@ -4641,83 +4969,83 @@ msgstr ""
 #: src/main.c:270
 #, c-format
 msgid ""
 #: src/main.c:270
 #, c-format
 msgid ""

-"Configuration for Sylpheed-Claws %s found.\n"
+"Configuration for %s (or previous) found.\n"

 "Do you want to migrate this configuration?"
 msgstr ""
 "Do you want to migrate this configuration?"
 msgstr ""

-"找到Sylpheed-Claws %s 的配置。\n"
+"找到 %s (或者以前版本) 的配置。\n"

 "是否要将该配置迁移过来?"
 
 "是否要将该配置迁移过来?"
 

-#: src/main.c:273
-msgid "1.0.5 or previous"
-msgstr "1.0.5或者更老版本"
-
-#: src/main.c:273
-msgid "1.9.15 or previous"
-msgstr "1.9.15或者更老版本"
-
-#: src/main.c:276
+#: src/main.c:274

 msgid "Migration of configuration"
 msgstr "迁移设置"
 
 msgid "Migration of configuration"
 msgstr "迁移设置"
 

-#: src/main.c:282
+#: src/main.c:280

 msgid "Copying configuration..."
 msgid "Copying configuration..."

-msgstr "正在拷贝设置..."
+msgstr "正在复制设置..."

 
 

-#: src/main.c:287
+#: src/main.c:285

 msgid "Migration failed!"
 msgstr "迁移失败！"
 
 msgid "Migration failed!"
 msgstr "迁移失败！"
 

-#: src/main.c:529
+#: src/main.c:572

 msgid "g_thread is not supported by glib.\n"
 msgstr "glib不支持g_thread。\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib不支持g_thread。\n"
 

-#: src/main.c:535
+#: src/main.c:578

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with a more recent GTK+ library than is "
+"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 "
 "currently available. This will cause crashes. You need to upgrade GTK+ or "

-"recompile Sylpheed-Claws."
+"recompile Claws Mail."

 msgstr ""
 msgstr ""

-"Sylpheed-Claws编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。"
-"请升级GTK+的版本，或者重新编译Sylpheed-Claws。"
+"Claws Mail编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。请升"
+"级GTK+的版本，或者重新编译Claws Mail。"

 
 

-#: src/main.c:544
+#: src/main.c:587

 msgid ""
 msgid ""

-"Sylpheed-Claws has been compiled with an older GTK+ library than is "
-"currently available. This will cause crashes. You need to recompile Sylpheed-"
-"Claws."
+"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 ""
 msgstr ""

-"Sylpheed-Claws编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。"
-"请升级GTK+的版本，或者重新编译Sylpheed-Claws。"
+"Claws Mail编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。请升"
+"级GTK+的版本，或者重新编译Claws Mail。"

 
 

-#: src/main.c:754
+#: src/main.c:810

 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr "部分插件无法成功加载，请检查插件配置以获取详细信息。"
 
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr "部分插件无法成功加载，请检查插件配置以获取详细信息。"
 

-#: src/main.c:765
+#: src/main.c:822
+msgid ""
+"Claws Mail has detected a configured mailbox, but is it incomplete. It is "
+"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
+"mailbox's folder to try to fix it."
+msgstr ""
+"Claws Mail检测到一个尚未配置完全的邮箱。它很可能是由于IMAP帐号失败造成的。请"
+"选择邮箱，用\"重建邮件夹树\"来尝试修复它。"
+
+#: src/main.c:828

 msgid ""
 msgid ""

-"Sylpheed-Claws has detected a configured mailbox, but could not load it. It "
-"is probably provided by an out-of-date external plugin. Please reinstall the "
+"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 ""
 "plugin and try again."
 msgstr ""

-"Sylpheed-Claws检测到一个已经配置的邮箱，但无法加载。它可能是由一个已经过时的"
-"第三方插件建立的。请重新安装该插件后再尝试。"
+"Claws Mail检测到一个已经配置的邮箱，但无法加载。它可能是由一个已经过时的第三"
+"方插件建立的。请重新安装该插件后再尝试。"

 
 

-#: src/main.c:1008
+#: src/main.c:1074

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法: %s [选项]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法: %s [选项]...\n"
 

-#: src/main.c:1010
+#: src/main.c:1076

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [地址]       打开写信窗口"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [地址]       打开写信窗口"
 

-#: src/main.c:1011
+#: src/main.c:1077

 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      订阅指定的URI"
 
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      订阅指定的URI"
 

-#: src/main.c:1012
+#: src/main.c:1078

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -4726,23 +5054,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开写新邮件窗口，并附上所指定的文件"
 
 "  --attach 文件1 [文件2]...\n"
 "                         打开写新邮件窗口，并附上所指定的文件"
 

-#: src/main.c:1015
+#: src/main.c:1081

 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 

-#: src/main.c:1016
+#: src/main.c:1082

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 

-#: src/main.c:1017
+#: src/main.c:1083

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送所有待发送邮件"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送所有待发送邮件"
 

-#: src/main.c:1018
+#: src/main.c:1084

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               显示所有邮件的数目"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               显示所有邮件的数目"
 

-#: src/main.c:1019
+#: src/main.c:1085

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -4750,947 +5078,948 @@ msgstr ""
 "  --status-full [文件夹]...\n"
 "                         显示每个文件夹的状态"
 
 "  --status-full [文件夹]...\n"
 "                         显示每个文件夹的状态"
 

-#: src/main.c:1021
+#: src/main.c:1087

 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"

-"                         folder is a folder id like '#mh/Mailbox/inbox'"
+"                         folder is a folder id like 'folder/sub_folder'"

 msgstr ""
 "  --select folder[/msg]  跳转到指定的文件夹/邮件\n"
 msgstr ""
 "  --select folder[/msg]  跳转到指定的文件夹/邮件\n"

-"                         可采用如下方式指定文件夹: '#mh/Mailbox/inbox'"
+"                         可采用如下方式指定文件夹: 'folder/sub_folder'"

 
 

-#: src/main.c:1023
+#: src/main.c:1089

 msgid "  --online               switch to online mode"
 msgstr "  --online               切换到联机模式"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               切换到联机模式"
 

-#: src/main.c:1024
+#: src/main.c:1090

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切换到脱机模式"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切换到脱机模式"
 

-#: src/main.c:1025
-msgid "  --exit                 exit Sylpheed-Claws"
-msgstr "  --exit                 退出Sylpheed-Claws"
+#: src/main.c:1091
+msgid "  --exit                 exit Claws Mail"
+msgstr "  --exit                 退出Claws Mail"

 
 

-#: src/main.c:1026
+#: src/main.c:1092

 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 

-#: src/main.c:1027
+#: src/main.c:1093

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示本说明并结束程序"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示本说明并结束程序"
 

-#: src/main.c:1028
+#: src/main.c:1094

 msgid "  --version              output version information and exit"
 msgstr "  --version              显示版本内容并结束程序"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              显示版本内容并结束程序"
 

-#: src/main.c:1029
+#: src/main.c:1095

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           显示配置数据目录"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           显示配置数据目录"
 

-#: src/main.c:1094
+#: src/main.c:1160

 #, c-format
 msgid "Processing (%s)..."
 msgstr "正在处理(%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "正在处理(%s)..."
 

-#: src/main.c:1097
+#: src/main.c:1163

 msgid "top level folder"
 msgstr "最上一层文件夹"
 
 msgid "top level folder"
 msgstr "最上一层文件夹"
 

-#: src/main.c:1161
+#: src/main.c:1227

 msgid "Really quit?"
 msgstr "确定要退出吗?"
 
 msgid "Really quit?"
 msgstr "确定要退出吗?"
 

-#: src/main.c:1162
+#: src/main.c:1228

 msgid "Composing message exists."
 msgstr "所编辑的文件已经存在。"
 
 msgid "Composing message exists."
 msgstr "所编辑的文件已经存在。"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Save to Draft"
 msgstr "存为草稿(_S)"
 
 msgid "_Save to Draft"
 msgstr "存为草稿(_S)"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "_Discard them"
 msgstr "摈弃(_D)"
 
 msgid "_Discard them"
 msgstr "摈弃(_D)"
 

-#: src/main.c:1163
+#: src/main.c:1229

 msgid "Do_n't quit"
 msgstr "不退出(_n)"
 
 msgid "Do_n't quit"
 msgstr "不退出(_n)"
 

-#: src/main.c:1178
+#: src/main.c:1244

 msgid "Queued messages"
 msgstr "待发送的邮件"
 
 msgid "Queued messages"
 msgstr "待发送的邮件"
 

-#: src/main.c:1179
+#: src/main.c:1245

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "待发送文件夹内尚有邮件。要退出吗？"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "待发送文件夹内尚有邮件。要退出吗？"
 

-#: src/mainwindow.c:496 src/messageview.c:158
+#: src/mainwindow.c:497 src/messageview.c:158

 msgid "/_File"
 msgstr "/文件(_F)"
 
 msgid "/_File"
 msgstr "/文件(_F)"
 

-#: src/mainwindow.c:497
+#: src/mainwindow.c:498

 msgid "/_File/_Add mailbox"
 msgstr "/文件(_F)/添加邮箱(_A)..."
 
 msgid "/_File/_Add mailbox"
 msgstr "/文件(_F)/添加邮箱(_A)..."
 

-#: src/mainwindow.c:498
+#: src/mainwindow.c:499

 msgid "/_File/_Add mailbox/MH..."
 msgstr "/文件(_F)/增加邮箱(_A)/MH格式..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/文件(_F)/增加邮箱(_A)/MH格式..."
 

-#: src/mainwindow.c:499 src/mainwindow.c:501 src/mainwindow.c:506
-#: src/mainwindow.c:508 src/mainwindow.c:511 src/mainwindow.c:514
+#: src/mainwindow.c:500 src/mainwindow.c:502 src/mainwindow.c:507
+#: src/mainwindow.c:509 src/mainwindow.c:512 src/mainwindow.c:515

 #: src/messageview.c:161
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
 #: src/messageview.c:161
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:501

 msgid "/_File/Change folder order..."
 msgstr "/文件(_F)/修改文件夹顺序..."
 
 msgid "/_File/Change folder order..."
 msgstr "/文件(_F)/修改文件夹顺序..."
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:503

 msgid "/_File/_Import mbox file..."
 msgstr "/文件(_F)/导入mbox的文件(_I)... "
 
 msgid "/_File/_Import mbox file..."
 msgstr "/文件(_F)/导入mbox的文件(_I)... "
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:504

 msgid "/_File/_Export to mbox file..."
 msgstr "/文件(_F)/以mbox格式导出文件夹(_E)..."
 
 msgid "/_File/_Export to mbox file..."
 msgstr "/文件(_F)/以mbox格式导出文件夹(_E)..."
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:505

 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr "/文件(_F)/以mbox格式导出选中的邮件(_o)..."
 
 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr "/文件(_F)/以mbox格式导出选中的邮件(_o)..."
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:508

 msgid "/_File/Empty all _Trash folders"
 msgstr "/文件(_F)/清空所有垃圾桶(_T)"
 
 msgid "/_File/Empty all _Trash folders"
 msgstr "/文件(_F)/清空所有垃圾桶(_T)"
 

-#: src/mainwindow.c:509 src/messageview.c:159
+#: src/mainwindow.c:510 src/messageview.c:159

 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/保存为(_S)..."
 
 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/保存为(_S)..."
 

-#: src/mainwindow.c:510 src/messageview.c:160
+#: src/mainwindow.c:511 src/messageview.c:160

 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 
 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 

-#: src/mainwindow.c:512
+#: src/mainwindow.c:513

 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/脱机工作(_W)"
 
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/脱机工作(_W)"
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:514

 msgid "/_File/Synchronise folders"
 msgstr "/文件(_F)/同步文件夹"
 
 msgid "/_File/Synchronise folders"
 msgstr "/文件(_F)/同步文件夹"
 

-#: src/mainwindow.c:516
+#: src/mainwindow.c:517

 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_x)"
 
 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_x)"
 

-#: src/mainwindow.c:521
+#: src/mainwindow.c:522

 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 

-#: src/mainwindow.c:523 src/messageview.c:168
+#: src/mainwindow.c:524 src/messageview.c:168

 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在邮件中查找(_F)..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在邮件中查找(_F)..."
 

-#: src/mainwindow.c:525
+#: src/mainwindow.c:526

 msgid "/_Edit/_Search folder..."
 msgstr "/编辑(_E)/在文件夹中搜索(_S)..."
 
 msgid "/_Edit/_Search folder..."
 msgstr "/编辑(_E)/在文件夹中搜索(_S)..."
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:527

 msgid "/_Edit/_Quick search"
 msgstr "/编辑(_E)/快速搜索(_Q)"
 
 msgid "/_Edit/_Quick search"
 msgstr "/编辑(_E)/快速搜索(_Q)"
 

-#: src/mainwindow.c:527 src/messageview.c:171 src/summaryview.c:472
+#: src/mainwindow.c:528 src/messageview.c:171 src/summaryview.c:472

 msgid "/_View"
 msgstr "/查看(_V)"
 
 msgid "/_View"
 msgstr "/查看(_V)"
 

-#: src/mainwindow.c:528
+#: src/mainwindow.c:529

 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_d)"
 
 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_d)"
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:530

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_d)/文件夹树(_F)"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_d)/文件夹树(_F)"
 

-#: src/mainwindow.c:531
+#: src/mainwindow.c:532

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_d)/邮件内容(_M)"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_d)/邮件内容(_M)"
 

-#: src/mainwindow.c:533
+#: src/mainwindow.c:534

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)"
 

-#: src/mainwindow.c:535
+#: src/mainwindow.c:536

 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字在图标下方(_b)"
 
 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字在图标下方(_b)"
 

-#: src/mainwindow.c:537
+#: src/mainwindow.c:538

 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字在图标旁边(_s)"
 
 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字在图标旁边(_s)"
 

-#: src/mainwindow.c:539
+#: src/mainwindow.c:540

 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/仅显示图标(_I)"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/仅显示图标(_I)"
 

-#: src/mainwindow.c:541
+#: src/mainwindow.c:542

 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/仅显示文字(_T)"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/仅显示文字(_T)"
 

-#: src/mainwindow.c:543
+#: src/mainwindow.c:544

 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/均不显示(_H)"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/均不显示(_H)"
 

-#: src/mainwindow.c:545
+#: src/mainwindow.c:546

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_d)/隐藏工具栏(_b)"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_d)/隐藏工具栏(_b)"
 

-#: src/mainwindow.c:547
+#: src/mainwindow.c:548

 msgid "/_View/Set displayed _columns"
 msgstr "/查看(_V)/设置显示列(_c)..."
 
 msgid "/_View/Set displayed _columns"
 msgstr "/查看(_V)/设置显示列(_c)..."
 

-#: src/mainwindow.c:548
+#: src/mainwindow.c:549

 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr "/查看(_V)/设置显示列(_c)/文件夹列表(_F)..."
 
 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr "/查看(_V)/设置显示列(_c)/文件夹列表(_F)..."
 

-#: src/mainwindow.c:549
+#: src/mainwindow.c:550

 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/查看(_V)/设置显示列(_c)/邮件列表(M)..."
 
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/查看(_V)/设置显示列(_c)/邮件列表(M)..."
 

-#: src/mainwindow.c:551 src/mainwindow.c:554 src/mainwindow.c:582
-#: src/mainwindow.c:612 src/mainwindow.c:729 src/mainwindow.c:737
+#: src/mainwindow.c:552 src/mainwindow.c:555 src/mainwindow.c:583
+#: src/mainwindow.c:613 src/mainwindow.c:730 src/mainwindow.c:738

 #: src/messageview.c:277
 msgid "/_View/---"
 msgstr "/显示(_V)/---"
 
 #: src/messageview.c:277
 msgid "/_View/---"
 msgstr "/显示(_V)/---"
 

-#: src/mainwindow.c:552
+#: src/mainwindow.c:553

 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/用单独窗口显示文件夹树(_o)"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/用单独窗口显示文件夹树(_o)"
 

-#: src/mainwindow.c:553
+#: src/mainwindow.c:554

 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/用单独窗口中显示邮件内容(_m)"
 
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/用单独窗口中显示邮件内容(_m)"
 

-#: src/mainwindow.c:555
+#: src/mainwindow.c:556

 msgid "/_View/_Sort"
 msgstr "/查看(_V)/排序(_S)"
 
 msgid "/_View/_Sort"
 msgstr "/查看(_V)/排序(_S)"
 

-#: src/mainwindow.c:556
+#: src/mainwindow.c:557

 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按顺序(_n)"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按顺序(_n)"
 

-#: src/mainwindow.c:557
+#: src/mainwindow.c:558

 msgid "/_View/_Sort/by S_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_i)"
 
 msgid "/_View/_Sort/by S_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_i)"
 

-#: src/mainwindow.c:558
+#: src/mainwindow.c:559

 msgid "/_View/_Sort/by _Date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
 msgid "/_View/_Sort/by _Date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 

-#: src/mainwindow.c:559
+#: src/mainwindow.c:560

 msgid "/_View/_Sort/by _From"
 msgstr "/查看(_V)/排序(_S)/按发信人(_F)"
 
 msgid "/_View/_Sort/by _From"
 msgstr "/查看(_V)/排序(_S)/按发信人(_F)"
 

-#: src/mainwindow.c:560
+#: src/mainwindow.c:561

 msgid "/_View/_Sort/by _To"
 msgstr "/查看(_V)/排序(_S)/按收信人(_T)"
 
 msgid "/_View/_Sort/by _To"
 msgstr "/查看(_V)/排序(_S)/按收信人(_T)"
 

-#: src/mainwindow.c:561
+#: src/mainwindow.c:562

 msgid "/_View/_Sort/by S_ubject"
 msgstr "/查看(_V)/排序(_S)/按主题(_u)"
 
 msgid "/_View/_Sort/by S_ubject"
 msgstr "/查看(_V)/排序(_S)/按主题(_u)"
 

-#: src/mainwindow.c:562
+#: src/mainwindow.c:563

 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标签(_c)"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标签(_c)"
 

-#: src/mainwindow.c:564
+#: src/mainwindow.c:565

 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_m)"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_m)"
 

-#: src/mainwindow.c:565
+#: src/mainwindow.c:566

 msgid "/_View/_Sort/by _status"
 msgstr "/查看(_V)/排序(_S)/按状态(_s)"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/查看(_V)/排序(_S)/按状态(_s)"
 

-#: src/mainwindow.c:566
+#: src/mainwindow.c:567

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_t)"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_t)"
 

-#: src/mainwindow.c:568
+#: src/mainwindow.c:569

 msgid "/_View/_Sort/by score"
 msgstr "/查看(_V)/排序(_S)/按得分"
 
 msgid "/_View/_Sort/by score"
 msgstr "/查看(_V)/排序(_S)/按得分"
 

-#: src/mainwindow.c:569
+#: src/mainwindow.c:570

 msgid "/_View/_Sort/by locked"
 msgstr "/查看(_V)/排序(_S)/按锁定状态"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/查看(_V)/排序(_S)/按锁定状态"
 

-#: src/mainwindow.c:570
+#: src/mainwindow.c:571

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_o)"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_o)"
 

-#: src/mainwindow.c:571 src/mainwindow.c:574
+#: src/mainwindow.c:572 src/mainwindow.c:575

 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 

-#: src/mainwindow.c:572
+#: src/mainwindow.c:573

 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 

-#: src/mainwindow.c:573
+#: src/mainwindow.c:574

 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 

-#: src/mainwindow.c:575
+#: src/mainwindow.c:576

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题排列(_A)"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题排列(_A)"
 

-#: src/mainwindow.c:577
+#: src/mainwindow.c:578

 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 

-#: src/mainwindow.c:578
+#: src/mainwindow.c:579

 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 

-#: src/mainwindow.c:579
+#: src/mainwindow.c:580

 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/折叠所有线索(_L)"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/折叠所有线索(_L)"
 

-#: src/mainwindow.c:580
+#: src/mainwindow.c:581

 msgid "/_View/_Hide read messages"
 msgstr "/查看(_V)/隐藏已读邮件(_H) "
 
 msgid "/_View/_Hide read messages"
 msgstr "/查看(_V)/隐藏已读邮件(_H) "
 

-#: src/mainwindow.c:583
+#: src/mainwindow.c:584

 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 

-#: src/mainwindow.c:584
+#: src/mainwindow.c:585

 msgid "/_View/_Go to/_Previous message"
 msgstr "/查看(_V)/转到(_G)/上一封(_P)"
 
 msgid "/_View/_Go to/_Previous message"
 msgstr "/查看(_V)/转到(_G)/上一封(_P)"
 

-#: src/mainwindow.c:585
+#: src/mainwindow.c:586

 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一封(_N)"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一封(_N)"
 

-#: src/mainwindow.c:586 src/mainwindow.c:591 src/mainwindow.c:594
-#: src/mainwindow.c:599 src/mainwindow.c:604 src/mainwindow.c:609
+#: src/mainwindow.c:587 src/mainwindow.c:592 src/mainwindow.c:595
+#: src/mainwindow.c:600 src/mainwindow.c:605 src/mainwindow.c:610

 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 

-#: src/mainwindow.c:587
+#: src/mainwindow.c:588

 msgid "/_View/_Go to/P_revious unread message"
 msgstr "/查看(_V)/转到(_G)/上一封未读邮件(_r)"
 
 msgid "/_View/_Go to/P_revious unread message"
 msgstr "/查看(_V)/转到(_G)/上一封未读邮件(_r)"
 

-#: src/mainwindow.c:589
+#: src/mainwindow.c:590

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一封未读邮件(_e)"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一封未读邮件(_e)"
 

-#: src/mainwindow.c:592
+#: src/mainwindow.c:593

 msgid "/_View/_Go to/Previous ne_w message"
 msgstr "/查看(_V)/转到(_G)/前一封新邮件(_w)"
 
 msgid "/_View/_Go to/Previous ne_w message"
 msgstr "/查看(_V)/转到(_G)/前一封新邮件(_w)"
 

-#: src/mainwindow.c:593
+#: src/mainwindow.c:594

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一封新邮件(_x)"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一封新邮件(_x)"
 

-#: src/mainwindow.c:595
+#: src/mainwindow.c:596

 msgid "/_View/_Go to/Previous _marked message"
 msgstr "/查看(_V)/ 转到(_G)/前一封标记过的邮件(_M)"
 
 msgid "/_View/_Go to/Previous _marked message"
 msgstr "/查看(_V)/ 转到(_G)/前一封标记过的邮件(_M)"
 

-#: src/mainwindow.c:597
+#: src/mainwindow.c:598

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/ 转到(_G)/下一封标记过的邮件(_a)"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/ 转到(_G)/下一封标记过的邮件(_a)"
 

-#: src/mainwindow.c:600
+#: src/mainwindow.c:601

 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/查看(_V)/ 转到(_G)/前一封打标签的邮件(_l)"
 
 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/查看(_V)/ 转到(_G)/前一封打标签的邮件(_l)"
 

-#: src/mainwindow.c:602
+#: src/mainwindow.c:603

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/ 转到(_G)/下一封打标签的邮件(_b)"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/ 转到(_G)/下一封打标签的邮件(_b)"
 

-#: src/mainwindow.c:605
+#: src/mainwindow.c:606

 msgid "/_View/_Go to/Last read message"
 msgstr "/查看(_V)/转到(_G)/最近阅读过的邮件"
 
 msgid "/_View/_Go to/Last read message"
 msgstr "/查看(_V)/转到(_G)/最近阅读过的邮件"
 

-#: src/mainwindow.c:607
+#: src/mainwindow.c:608

 msgid "/_View/_Go to/Parent message"
 msgstr "/查看(_V)/转到(_G)/下一封(_N)"
 
 msgid "/_View/_Go to/Parent message"
 msgstr "/查看(_V)/转到(_G)/下一封(_N)"
 

-#: src/mainwindow.c:610
+#: src/mainwindow.c:611

 msgid "/_View/_Go to/Next unread _folder"
 msgstr "/查看(_V)/转到(_G)/下一个未读文件夹(_f)"
 
 msgid "/_View/_Go to/Next unread _folder"
 msgstr "/查看(_V)/转到(_G)/下一个未读文件夹(_f)"
 

-#: src/mainwindow.c:611
+#: src/mainwindow.c:612

 msgid "/_View/_Go to/_Other folder..."
 msgstr "/查看(_V)/转到(_G)/其他文件夹(_O)..."
 
 msgid "/_View/_Go to/_Other folder..."
 msgstr "/查看(_V)/转到(_G)/其他文件夹(_O)..."
 

-#: src/mainwindow.c:615 src/mainwindow.c:622 src/messageview.c:174
+#: src/mainwindow.c:616 src/mainwindow.c:623 src/messageview.c:174

 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_e)/---"
 
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_e)/---"
 

-#: src/mainwindow.c:619 src/messageview.c:178
+#: src/mainwindow.c:620 src/messageview.c:178

 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_e)"
 
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_e)"
 

-#: src/mainwindow.c:620 src/messageview.c:179
+#: src/mainwindow.c:621 src/messageview.c:179

 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符集(_e)/自动侦测(_A)"
 
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符集(_e)/自动侦测(_A)"
 

-#: src/mainwindow.c:623 src/messageview.c:182
+#: src/mainwindow.c:624 src/messageview.c:182

 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符集(_e)/7bit ascii (US-ASCI_I)"
 
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符集(_e)/7bit ascii (US-ASCI_I)"
 

-#: src/mainwindow.c:625 src/messageview.c:185
+#: src/mainwindow.c:626 src/messageview.c:185

 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符集(_e)/Unicode (_UTF-8)"
 
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符集(_e)/Unicode (_UTF-8)"
 

-#: src/mainwindow.c:629 src/messageview.c:188
+#: src/mainwindow.c:630 src/messageview.c:188

 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_1)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_1)"
 

-#: src/mainwindow.c:631 src/messageview.c:190
+#: src/mainwindow.c:632 src/messageview.c:190

 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-15)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-15)"
 

-#: src/mainwindow.c:633 src/messageview.c:192
+#: src/mainwindow.c:634 src/messageview.c:192

 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/查看(_V)/字符集(_e)/西欧(Windows-1252)"
 
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/查看(_V)/字符集(_e)/西欧(Windows-1252)"
 

-#: src/mainwindow.c:637 src/messageview.c:195
+#: src/mainwindow.c:638 src/messageview.c:195

 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_2) "
 
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_2) "
 

-#: src/mainwindow.c:641 src/messageview.c:198
+#: src/mainwindow.c:642 src/messageview.c:198

 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 

-#: src/mainwindow.c:643 src/messageview.c:200
+#: src/mainwindow.c:644 src/messageview.c:200

 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-_4) "
 
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-_4) "
 

-#: src/mainwindow.c:647 src/messageview.c:203
+#: src/mainwindow.c:648 src/messageview.c:203

 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符集(_e)/希腊 (ISO-8859-_7)"
 
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符集(_e)/希腊 (ISO-8859-_7)"
 

-#: src/mainwindow.c:651 src/messageview.c:206
+#: src/mainwindow.c:652 src/messageview.c:206

 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (ISO-8859-_8)"
 
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (ISO-8859-_8)"
 

-#: src/mainwindow.c:653 src/messageview.c:208
+#: src/mainwindow.c:654 src/messageview.c:208

 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (Windows-1251)"
 
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (Windows-1251)"
 

-#: src/mainwindow.c:657 src/messageview.c:211
+#: src/mainwindow.c:658 src/messageview.c:211

 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (ISO-8859-_6) "
 
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (ISO-8859-_6) "
 

-#: src/mainwindow.c:659 src/messageview.c:213
+#: src/mainwindow.c:660 src/messageview.c:213

 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (Windows-1256)"
 
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (Windows-1256)"
 

-#: src/mainwindow.c:663 src/messageview.c:216
+#: src/mainwindow.c:664 src/messageview.c:216

 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符集(_e)/土耳其 (ISO-8859-_9)"
 
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符集(_e)/土耳其 (ISO-8859-_9)"
 

-#: src/mainwindow.c:667 src/messageview.c:219
+#: src/mainwindow.c:668 src/messageview.c:219

 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 

-#: src/mainwindow.c:669 src/messageview.c:221
+#: src/mainwindow.c:670 src/messageview.c:221

 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-_R)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-_R)"
 

-#: src/mainwindow.c:671 src/messageview.c:223
+#: src/mainwindow.c:672 src/messageview.c:223

 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-U)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-U)"
 

-#: src/mainwindow.c:673 src/messageview.c:225
+#: src/mainwindow.c:674 src/messageview.c:225

 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (Windows-1251)"
 
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (Windows-1251)"
 

-#: src/mainwindow.c:677 src/messageview.c:228
+#: src/mainwindow.c:678 src/messageview.c:228

 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-_JP)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-_JP)"
 

-#: src/mainwindow.c:679 src/messageview.c:230
+#: src/mainwindow.c:680 src/messageview.c:230

 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-JP-2)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-JP-2)"
 

-#: src/mainwindow.c:681 src/messageview.c:232
+#: src/mainwindow.c:682 src/messageview.c:232

 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_EUC-JP)"
 
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_EUC-JP)"
 

-#: src/mainwindow.c:683 src/messageview.c:234
+#: src/mainwindow.c:684 src/messageview.c:234

 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_Shift__JIS)"
 
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_Shift__JIS)"
 

-#: src/mainwindow.c:687 src/messageview.c:237
+#: src/mainwindow.c:688 src/messageview.c:237

 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (_GB2312)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (_GB2312)"
 

-#: src/mainwindow.c:689 src/messageview.c:239
+#: src/mainwindow.c:690 src/messageview.c:239

 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (GBK)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (GBK)"
 

-#: src/mainwindow.c:691 src/messageview.c:241
+#: src/mainwindow.c:692 src/messageview.c:241

 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (_Big5)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (_Big5)"
 

-#: src/mainwindow.c:693 src/messageview.c:243
+#: src/mainwindow.c:694 src/messageview.c:243

 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (EUC-_TW)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (EUC-_TW)"
 

-#: src/mainwindow.c:695 src/messageview.c:245
+#: src/mainwindow.c:696 src/messageview.c:245

 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符集(_e)/中文 (ISO-2022-_CN)"
 
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符集(_e)/中文 (ISO-2022-_CN)"
 

-#: src/mainwindow.c:699 src/messageview.c:248
+#: src/mainwindow.c:700 src/messageview.c:248

 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (EUC-_KR) "
 
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (EUC-_KR) "
 

-#: src/mainwindow.c:701 src/messageview.c:250
+#: src/mainwindow.c:702 src/messageview.c:250

 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (ISO-2022-KR)"
 
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (ISO-2022-KR)"
 

-#: src/mainwindow.c:705 src/messageview.c:253
+#: src/mainwindow.c:706 src/messageview.c:253

 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (TIS-620)"
 
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (TIS-620)"
 

-#: src/mainwindow.c:707 src/messageview.c:255
+#: src/mainwindow.c:708 src/messageview.c:255

 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (Windows-874)"
 
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (Windows-874)"
 

-#: src/mainwindow.c:714 src/mainwindow.c:720 src/messageview.c:262
+#: src/mainwindow.c:715 src/mainwindow.c:721 src/messageview.c:262

 #: src/messageview.c:268
 msgid "/_View/Decode/---"
 msgstr "/查看(_V)/解码/---"
 
 #: src/messageview.c:268
 msgid "/_View/Decode/---"
 msgstr "/查看(_V)/解码/---"
 

-#: src/mainwindow.c:717 src/messageview.c:265
+#: src/mainwindow.c:718 src/messageview.c:265

 msgid "/_View/Decode"
 msgstr "/查看(_V)/解码"
 
 msgid "/_View/Decode"
 msgstr "/查看(_V)/解码"
 

-#: src/mainwindow.c:718 src/messageview.c:266
+#: src/mainwindow.c:719 src/messageview.c:266

 msgid "/_View/Decode/_Auto detect"
 msgstr "/查看(_V)/解码/自动侦测(_A)"
 
 msgid "/_View/Decode/_Auto detect"
 msgstr "/查看(_V)/解码/自动侦测(_A)"
 

-#: src/mainwindow.c:721 src/messageview.c:269
+#: src/mainwindow.c:722 src/messageview.c:269

 msgid "/_View/Decode/_8bit"
 msgstr "/查看(_V)/解码/_8位"
 
 msgid "/_View/Decode/_8bit"
 msgstr "/查看(_V)/解码/_8位"
 

-#: src/mainwindow.c:722 src/messageview.c:270
+#: src/mainwindow.c:723 src/messageview.c:270

 msgid "/_View/Decode/_Quoted printable"
 msgstr "/查看(_V)/解码/_Quoted Printable"
 
 msgid "/_View/Decode/_Quoted printable"
 msgstr "/查看(_V)/解码/_Quoted Printable"
 

-#: src/mainwindow.c:723 src/messageview.c:271
+#: src/mainwindow.c:724 src/messageview.c:271

 msgid "/_View/Decode/_Base64"
 msgstr "/查看(_V)/解码/_Base64"
 
 msgid "/_View/Decode/_Base64"
 msgstr "/查看(_V)/解码/_Base64"
 

-#: src/mainwindow.c:724 src/messageview.c:272
+#: src/mainwindow.c:725 src/messageview.c:272

 msgid "/_View/Decode/_Uuencode"
 msgstr "/查看(_V)/解码/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/查看(_V)/解码/_Uuencode"
 

-#: src/mainwindow.c:730 src/summaryview.c:473
+#: src/mainwindow.c:731 src/summaryview.c:473

 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_w)"
 
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_w)"
 

-#: src/mainwindow.c:731 src/messageview.c:278
+#: src/mainwindow.c:732 src/messageview.c:278

 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_a)"
 
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_a)"
 

-#: src/mainwindow.c:732
+#: src/mainwindow.c:733

 msgid "/_View/All headers"
 msgstr "/查看(_V)/所有信头"
 
 msgid "/_View/All headers"
 msgstr "/查看(_V)/所有信头"
 

-#: src/mainwindow.c:733 src/messageview.c:280
+#: src/mainwindow.c:734 src/messageview.c:280

 msgid "/_View/Quotes"
 msgstr "/查看(_V)/引文"
 
 msgid "/_View/Quotes"
 msgstr "/查看(_V)/引文"
 

-#: src/mainwindow.c:734 src/messageview.c:281
+#: src/mainwindow.c:735 src/messageview.c:281

 msgid "/_View/Quotes/_Fold all"
 msgstr "/查看(_V)/引文/全部折叠"
 
 msgid "/_View/Quotes/_Fold all"
 msgstr "/查看(_V)/引文/全部折叠"
 

-#: src/mainwindow.c:735 src/messageview.c:282
+#: src/mainwindow.c:736 src/messageview.c:282

 msgid "/_View/Quotes/Fold from level _2"
 msgstr "/查看(_V)/引文/从第二级开始折叠(_2)"
 
 msgid "/_View/Quotes/Fold from level _2"
 msgstr "/查看(_V)/引文/从第二级开始折叠(_2)"
 

-#: src/mainwindow.c:736 src/messageview.c:283
+#: src/mainwindow.c:737 src/messageview.c:283

 msgid "/_View/Quotes/Fold from level _3"
 msgstr "/查看(_V)/引文/从第三级开始折叠(_3)"
 
 msgid "/_View/Quotes/Fold from level _3"
 msgstr "/查看(_V)/引文/从第三级开始折叠(_3)"
 

-#: src/mainwindow.c:738
+#: src/mainwindow.c:739

 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新邮件摘要列表(_U)"
 
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新邮件摘要列表(_U)"
 

-#: src/mainwindow.c:741
+#: src/mainwindow.c:742

 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/收取(_v)"
 
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/收取(_v)"
 

-#: src/mainwindow.c:742
+#: src/mainwindow.c:743

 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/收取(_v)/从当前帐号收取(_c)"
 
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/收取(_v)/从当前帐号收取(_c)"
 

-#: src/mainwindow.c:744
+#: src/mainwindow.c:745

 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/收取(_v)/从所有帐号收取(_c)"
 
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/收取(_v)/从所有帐号收取(_c)"
 

-#: src/mainwindow.c:746
+#: src/mainwindow.c:747

 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/收取(_v)/取消(_g)"
 
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/收取(_v)/取消(_g)"
 

-#: src/mainwindow.c:748
+#: src/mainwindow.c:749

 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/收取(_v)/---"
 
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/收取(_v)/---"
 

-#: src/mainwindow.c:749
+#: src/mainwindow.c:750

 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/送出待发送邮件(_S)"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/送出待发送邮件(_S)"
 

-#: src/mainwindow.c:751
+#: src/mainwindow.c:752

 msgid "/_Message/Compose a_n email message"
 msgstr "/邮件(_M)/写信(_n)"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/邮件(_M)/写信(_n)"
 

-#: src/mainwindow.c:752
+#: src/mainwindow.c:753

 msgid "/_Message/Compose a news message"
 msgstr "/邮件(_M)/写新闻群留言"
 
 msgid "/_Message/Compose a news message"
 msgstr "/邮件(_M)/写新闻群留言"
 

-#: src/mainwindow.c:753 src/messageview.c:289
+#: src/mainwindow.c:754 src/messageview.c:289

 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回信(_R)"
 
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回信(_R)"
 

-#: src/mainwindow.c:754
+#: src/mainwindow.c:755

 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回信给(_y)"
 
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回信给(_y)"
 

-#: src/mainwindow.c:755 src/messageview.c:290
+#: src/mainwindow.c:756 src/messageview.c:290

 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回信给(_y)/全部人(_a)"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回信给(_y)/全部人(_a)"
 

-#: src/mainwindow.c:756 src/messageview.c:292
+#: src/mainwindow.c:757 src/messageview.c:292

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回信给(_y)/发信人(_s)"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回信给(_y)/发信人(_s)"
 

-#: src/mainwindow.c:757 src/messageview.c:294
+#: src/mainwindow.c:758 src/messageview.c:294

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回信给(_y)/邮件列表(_l)"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回信给(_y)/邮件列表(_l)"
 

-#: src/mainwindow.c:759
+#: src/mainwindow.c:760

 msgid "/_Message/Follow-up and reply to"
 msgstr "/邮件(_M)/跟贴"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/邮件(_M)/跟贴"
 

-#: src/mainwindow.c:761 src/messageview.c:297
+#: src/mainwindow.c:762 src/messageview.c:297

 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 

-#: src/mainwindow.c:762 src/messageview.c:298
+#: src/mainwindow.c:763 src/messageview.c:298

 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/以附加文件形式转发(_A)"
 
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/以附加文件形式转发(_A)"
 

-#: src/mainwindow.c:763
+#: src/mainwindow.c:764

 msgid "/_Message/Redirect"
 msgstr "/邮件(_M)/重定向"
 
 msgid "/_Message/Redirect"
 msgstr "/邮件(_M)/重定向"
 

-#: src/mainwindow.c:765
+#: src/mainwindow.c:766

 msgid "/_Message/Mailing-_List"
 msgstr "/邮件(_M)/邮件列表(_L)"
 
 msgid "/_Message/Mailing-_List"
 msgstr "/邮件(_M)/邮件列表(_L)"
 

-#: src/mainwindow.c:766
+#: src/mainwindow.c:767

 msgid "/_Message/Mailing-_List/Post"
 msgstr "/邮件(_M)/邮件列表(_L)/发贴"
 
 msgid "/_Message/Mailing-_List/Post"
 msgstr "/邮件(_M)/邮件列表(_L)/发贴"
 

-#: src/mainwindow.c:767
+#: src/mainwindow.c:768

 msgid "/_Message/Mailing-_List/Help"
 msgstr "/邮件(_M)/邮件列表(_l)/帮助"
 
 msgid "/_Message/Mailing-_List/Help"
 msgstr "/邮件(_M)/邮件列表(_l)/帮助"
 

-#: src/mainwindow.c:768
+#: src/mainwindow.c:769

 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr "/邮件(_M)/邮件列表(_L)/订阅"
 
 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr "/邮件(_M)/邮件列表(_L)/订阅"
 

-#: src/mainwindow.c:769
+#: src/mainwindow.c:770

 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr "/邮件(_M)/邮件列表(_L)/退订"
 
 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr "/邮件(_M)/邮件列表(_L)/退订"
 

-#: src/mainwindow.c:770
+#: src/mainwindow.c:771

 msgid "/_Message/Mailing-_List/View archive"
 msgstr "/邮件(_M)/邮件列表(_L)/查看归档邮件"
 
 msgid "/_Message/Mailing-_List/View archive"
 msgstr "/邮件(_M)/邮件列表(_L)/查看归档邮件"
 

-#: src/mainwindow.c:771
+#: src/mainwindow.c:772

 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr "/邮件(_M)/邮件列表(_L)/联系作者"
 
 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr "/邮件(_M)/邮件列表(_L)/联系作者"
 

-#: src/mainwindow.c:774
+#: src/mainwindow.c:775

 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_o)"
 
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_o)"
 

-#: src/mainwindow.c:775
+#: src/mainwindow.c:776

 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)"
 
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)"
 

-#: src/mainwindow.c:776
+#: src/mainwindow.c:777

 msgid "/_Message/Move to _trash"
 msgstr "/邮件(_M)/移动到垃圾桶(_t)"
 
 msgid "/_Message/Move to _trash"
 msgstr "/邮件(_M)/移动到垃圾桶(_t)"
 

-#: src/mainwindow.c:777
+#: src/mainwindow.c:778

 msgid "/_Message/_Delete..."
 msgstr "/邮件(_M)/删除(_D)..."
 
 msgid "/_Message/_Delete..."
 msgstr "/邮件(_M)/删除(_D)..."
 

-#: src/mainwindow.c:778
+#: src/mainwindow.c:779

 msgid "/_Message/Cancel a news message"
 msgstr "/邮件(_M)/取消新邮件"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/邮件(_M)/取消新邮件"
 

-#: src/mainwindow.c:780
+#: src/mainwindow.c:781

 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 

-#: src/mainwindow.c:781
+#: src/mainwindow.c:782

 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/ 标记(_M) "
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/ 标记(_M) "
 

-#: src/mainwindow.c:782
+#: src/mainwindow.c:783

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/ 不标记(_U)"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/ 不标记(_U)"
 

-#: src/mainwindow.c:783 src/mainwindow.c:789 src/mainwindow.c:792
+#: src/mainwindow.c:784 src/mainwindow.c:790 src/mainwindow.c:793

 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 

-#: src/mainwindow.c:784
+#: src/mainwindow.c:785

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_e)"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_e)"
 

-#: src/mainwindow.c:785
+#: src/mainwindow.c:786

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_d)"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_d)"
 

-#: src/mainwindow.c:786
+#: src/mainwindow.c:787

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/标记所有为已读(_r)"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/标记所有为已读(_r)"
 

-#: src/mainwindow.c:787
+#: src/mainwindow.c:788

 msgid "/_Message/_Mark/Ignore thread"
 msgstr "/邮件(_M)/标记(_M)/忽略邮件线索"
 
 msgid "/_Message/_Mark/Ignore thread"
 msgstr "/邮件(_M)/标记(_M)/忽略邮件线索"
 

-#: src/mainwindow.c:788
+#: src/mainwindow.c:789

 msgid "/_Message/_Mark/Unignore thread"
 msgstr "/邮件(_M)/标记(_M)/不忽略邮件线索"
 
 msgid "/_Message/_Mark/Unignore thread"
 msgstr "/邮件(_M)/标记(_M)/不忽略邮件线索"
 

-#: src/mainwindow.c:790
+#: src/mainwindow.c:791

 msgid "/_Message/_Mark/Mark as _spam"
 msgstr "/邮件(_M)/标记(_M)/标记为垃圾邮件(_s)"
 
 msgid "/_Message/_Mark/Mark as _spam"
 msgstr "/邮件(_M)/标记(_M)/标记为垃圾邮件(_s)"
 

-#: src/mainwindow.c:791
+#: src/mainwindow.c:792

 msgid "/_Message/_Mark/Mark as _ham"
 msgstr "/邮件(_M)/标记(_M)/标记为非垃圾邮件(_h)"
 
 msgid "/_Message/_Mark/Mark as _ham"
 msgstr "/邮件(_M)/标记(_M)/标记为非垃圾邮件(_h)"
 

-#: src/mainwindow.c:793
+#: src/mainwindow.c:794

 msgid "/_Message/_Mark/Lock"
 msgstr "/邮件(_M)/标记(_M)/锁定"
 
 msgid "/_Message/_Mark/Lock"
 msgstr "/邮件(_M)/标记(_M)/锁定"
 

-#: src/mainwindow.c:794
+#: src/mainwindow.c:795

 msgid "/_Message/_Mark/Unlock"
 msgstr "/邮件(_M)/标记(_M)/解除锁定"
 
 msgid "/_Message/_Mark/Unlock"
 msgstr "/邮件(_M)/标记(_M)/解除锁定"
 

-#: src/mainwindow.c:795
+#: src/mainwindow.c:796

 msgid "/_Message/Color la_bel"
 msgstr "/邮件(_M)/彩色标记(_b)"
 
 msgid "/_Message/Color la_bel"
 msgstr "/邮件(_M)/彩色标记(_b)"
 

-#: src/mainwindow.c:797
+#: src/mainwindow.c:798

 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_e)"
 
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_e)"
 

-#: src/mainwindow.c:800
+#: src/mainwindow.c:801

 msgid "/_Tools/_Address book..."
 msgstr "/工具(_T)/地址簿(_A)..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/工具(_T)/地址簿(_A)..."
 

-#: src/mainwindow.c:801 src/messageview.c:304
+#: src/mainwindow.c:802 src/messageview.c:304

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发信人加入地址簿中(_k)"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发信人加入地址簿中(_k)"
 

-#: src/mainwindow.c:803
+#: src/mainwindow.c:804

 msgid "/_Tools/_Harvest addresses"
 msgstr "/工具(_T)/批量提取通讯地址(_H)"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/工具(_T)/批量提取通讯地址(_H)"
 

-#: src/mainwindow.c:804
+#: src/mainwindow.c:805

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从文件夹(_F)"
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从文件夹(_F)"
 

-#: src/mainwindow.c:806
+#: src/mainwindow.c:807

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件(_M)"
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件(_M)"
 

-#: src/mainwindow.c:809
+#: src/mainwindow.c:810

 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有邮件(_F)"
 
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤文件夹中所有邮件(_F)"
 

-#: src/mainwindow.c:811
+#: src/mainwindow.c:812

 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选定的邮件(_F)"
 
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选定的邮件(_F)"
 

-#: src/mainwindow.c:813 src/messageview.c:307
+#: src/mainwindow.c:814 src/messageview.c:307

 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 

-#: src/mainwindow.c:814 src/messageview.c:309
+#: src/mainwindow.c:815 src/messageview.c:309

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动创建(_A)"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动创建(_A)"
 

-#: src/mainwindow.c:816 src/messageview.c:311
+#: src/mainwindow.c:817 src/messageview.c:311

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/由发信人(_F)"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/由发信人(_F)"
 

-#: src/mainwindow.c:818 src/messageview.c:313
+#: src/mainwindow.c:819 src/messageview.c:313

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/由收信人(_T)"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/由收信人(_T)"
 

-#: src/mainwindow.c:820 src/messageview.c:315
+#: src/mainwindow.c:821 src/messageview.c:315

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/由主题(_S)"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/由主题(_S)"
 

-#: src/mainwindow.c:822
+#: src/mainwindow.c:823

 msgid "/_Tools/C_reate processing rule"
 msgstr "/工具(_T)/创建处理规则(_r)"
 
 msgid "/_Tools/C_reate processing rule"
 msgstr "/工具(_T)/创建处理规则(_r)"
 

-#: src/mainwindow.c:823
+#: src/mainwindow.c:824

 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr "/工具(_T)/创建处理规则(_r)/自动创建(_A)"
 
 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr "/工具(_T)/创建处理规则(_r)/自动创建(_A)"
 

-#: src/mainwindow.c:825
+#: src/mainwindow.c:826

 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr "/工具(_T)/创建处理规则(_r)/由发信人(_F)"
 
 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr "/工具(_T)/创建处理规则(_r)/由发信人(_F)"
 

-#: src/mainwindow.c:827
+#: src/mainwindow.c:828

 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr "/工具(_T)/创建处理规则(_r)/由收信人(_T)"
 
 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr "/工具(_T)/创建处理规则(_r)/由收信人(_T)"
 

-#: src/mainwindow.c:829
+#: src/mainwindow.c:830

 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则(_r)/由主题(_S)"
 
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则(_r)/由主题(_S)"
 

-#: src/mainwindow.c:834
+#: src/mainwindow.c:835

 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/工具(_T)/检查所有文件夹中的新邮件(_e)"
 
 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/工具(_T)/检查所有文件夹中的新邮件(_e)"
 

-#: src/mainwindow.c:836
+#: src/mainwindow.c:837

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复邮件(_p)"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复邮件(_p)"
 

-#: src/mainwindow.c:838
+#: src/mainwindow.c:839

 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr "/工具(_T)/删除重复邮件(_p)/选定文件夹"
 
 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr "/工具(_T)/删除重复邮件(_p)/选定文件夹"
 

-#: src/mainwindow.c:840
+#: src/mainwindow.c:841

 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr "/工具(_T)/删除重复邮件(_p)/所有文件夹"
 
 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr "/工具(_T)/删除重复邮件(_p)/所有文件夹"
 

-#: src/mainwindow.c:843
+#: src/mainwindow.c:844

 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_x)"
 
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_x)"
 

-#: src/mainwindow.c:846
+#: src/mainwindow.c:847

 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/工具(_T)/SSL认证(_t)"
 
 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/工具(_T)/SSL认证(_t)"
 

-#: src/mainwindow.c:850
+#: src/mainwindow.c:851

 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/日志窗口(_L)"
 
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/日志窗口(_L)"
 

-#: src/mainwindow.c:852
+#: src/mainwindow.c:853

 msgid "/_Configuration"
 msgstr "/设置(_C)"
 
 msgid "/_Configuration"
 msgstr "/设置(_C)"
 

-#: src/mainwindow.c:853
+#: src/mainwindow.c:854

 msgid "/_Configuration/C_hange current account"
 msgstr "/设置(_C)/更改目前帐号(_h)"
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/设置(_C)/更改目前帐号(_h)"
 

-#: src/mainwindow.c:855
+#: src/mainwindow.c:856

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/设置(_C)/目前帐号的偏好设置(_P)..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/设置(_C)/目前帐号的偏好设置(_P)..."
 

-#: src/mainwindow.c:857
+#: src/mainwindow.c:858

 msgid "/_Configuration/Create _new account..."
 msgstr "/设置(_C)/创建新帐号(_n)..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/设置(_C)/创建新帐号(_n)..."
 

-#: src/mainwindow.c:859
+#: src/mainwindow.c:860

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/设置(_C)/编辑帐号(_E)..."
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/设置(_C)/编辑帐号(_E)..."
 

-#: src/mainwindow.c:861
+#: src/mainwindow.c:862

 msgid "/_Configuration/---"
 msgstr "/设置(_C)/---"
 
 msgid "/_Configuration/---"
 msgstr "/设置(_C)/---"
 

-#: src/mainwindow.c:862
+#: src/mainwindow.c:863

 msgid "/_Configuration/P_references..."
 msgstr "/设置(_C)/偏好(_r)..."
 
 msgid "/_Configuration/P_references..."
 msgstr "/设置(_C)/偏好(_r)..."
 

-#: src/mainwindow.c:864
+#: src/mainwindow.c:865

 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr "/设置(_C)/预处理(_o)..."
 
 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr "/设置(_C)/预处理(_o)..."
 

-#: src/mainwindow.c:866
+#: src/mainwindow.c:867

 msgid "/_Configuration/Post-pro_cessing..."
 msgstr "/设置(_C)/后处理(_c)..."
 
 msgid "/_Configuration/Post-pro_cessing..."
 msgstr "/设置(_C)/后处理(_c)..."
 

-#: src/mainwindow.c:868
+#: src/mainwindow.c:869

 msgid "/_Configuration/_Filtering..."
 msgstr "/设置(_C)/过滤(_F)..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/设置(_C)/过滤(_F)..."
 

-#: src/mainwindow.c:870
+#: src/mainwindow.c:871

 msgid "/_Configuration/_Templates..."
 msgstr "/设置(_C)/模板(_T)..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/设置(_C)/模板(_T)..."
 

-#: src/mainwindow.c:871
+#: src/mainwindow.c:872

 msgid "/_Configuration/_Actions..."
 msgstr "/设置(_C)/动作(_A)..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/设置(_C)/动作(_A)..."
 

-#: src/mainwindow.c:872
+#: src/mainwindow.c:873

 msgid "/_Configuration/Plu_gins..."
 msgstr "/设置(_C)/插件(_g)..."
 
 msgid "/_Configuration/Plu_gins..."
 msgstr "/设置(_C)/插件(_g)..."
 

-#: src/mainwindow.c:875
+#: src/mainwindow.c:876

 msgid "/_Help/_Manual"
 msgstr "/求助(_H)/联机手册(_M)"
 
 msgid "/_Help/_Manual"
 msgstr "/求助(_H)/联机手册(_M)"
 

-#: src/mainwindow.c:876
+#: src/mainwindow.c:877

 msgid "/_Help/_Online User-contributed FAQ"
 msgstr "/帮助(_H)/在线FAQ(_O)"
 
 msgid "/_Help/_Online User-contributed FAQ"
 msgstr "/帮助(_H)/在线FAQ(_O)"
 

-#: src/mainwindow.c:878
+#: src/mainwindow.c:879

 msgid "/_Help/Icon _Legend"
 msgstr "/帮助(_H)/图标说明(_L)"
 
 msgid "/_Help/Icon _Legend"
 msgstr "/帮助(_H)/图标说明(_L)"
 

-#: src/mainwindow.c:879
+#: src/mainwindow.c:880

 msgid "/_Help/---"
 msgstr "/求助(_H)/---"
 
 msgid "/_Help/---"
 msgstr "/求助(_H)/---"
 

-#: src/mainwindow.c:1227
+#: src/mainwindow.c:1228

 msgid "Some error(s) happened. Click here to view log."
 msgstr "有错误发生，请点击此处查看日志。"
 
 msgid "Some error(s) happened. Click here to view log."
 msgstr "有错误发生，请点击此处查看日志。"
 

-#: src/mainwindow.c:1241
+#: src/mainwindow.c:1242

 msgid "You are online. Click the icon to go offline"
 msgstr "目前在线。点击图标转到离线模式。"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "目前在线。点击图标转到离线模式。"
 

-#: src/mainwindow.c:1244
+#: src/mainwindow.c:1245

 msgid "You are offline. Click the icon to go online"
 msgstr "目前离线。点击图标转到在线状态。"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "目前离线。点击图标转到在线状态。"
 

-#: src/mainwindow.c:1260
+#: src/mainwindow.c:1261

 msgid "Select account"
 msgstr "选择帐号"
 
 msgid "Select account"
 msgstr "选择帐号"
 

-#: src/mainwindow.c:1661 src/mainwindow.c:1702 src/mainwindow.c:1738
-#: src/mainwindow.c:1774 src/mainwindow.c:1816 src/prefs_folder_item.c:756
+#: src/mainwindow.c:1662 src/mainwindow.c:1703 src/mainwindow.c:1739
+#: src/mainwindow.c:1775 src/mainwindow.c:1818
+#: src/plugins/trayicon/trayicon.c:143 src/prefs_folder_item.c:764

 msgid "Untitled"
 msgstr "未命名"
 
 msgid "Untitled"
 msgstr "未命名"
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1819

 msgid "none"
 msgstr "无"
 
 msgid "none"
 msgstr "无"
 

-#: src/mainwindow.c:2079
+#: src/mainwindow.c:2081

 msgid "Delete all messages in trash folders?"
 msgstr "清空垃圾桶内所有邮件？"
 
 msgid "Delete all messages in trash folders?"
 msgstr "清空垃圾桶内所有邮件？"
 

-#: src/mainwindow.c:2098
+#: src/mainwindow.c:2100

 msgid "Add mailbox"
 msgstr "添加邮箱"
 
 msgid "Add mailbox"
 msgstr "添加邮箱"
 

-#: src/mainwindow.c:2099
+#: src/mainwindow.c:2101

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -5699,16 +6028,16 @@ msgstr ""
 "请输入邮箱位置。\n"
 "如果指定已存在的邮箱，它将会自动被扫描。"
 
 "请输入邮箱位置。\n"
 "如果指定已存在的邮箱，它将会自动被扫描。"
 

-#: src/mainwindow.c:2105
+#: src/mainwindow.c:2107

 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "邮箱 `%s' 已经存在。"
 
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "邮箱 `%s' 已经存在。"
 

-#: src/mainwindow.c:2110 src/setup.c:51
+#: src/mainwindow.c:2112 src/setup.c:51

 msgid "Mailbox"
 msgstr "邮箱"
 
 msgid "Mailbox"
 msgstr "邮箱"
 

-#: src/mainwindow.c:2115 src/setup.c:54
+#: src/mainwindow.c:2117 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 "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -5717,89 +6046,79 @@ msgstr ""
 "创建邮箱失败。\n"
 "也许某些文件已经存在，或者你没有足够的写权限。"
 
 "创建邮箱失败。\n"
 "也许某些文件已经存在，或者你没有足够的写权限。"
 

-#: src/mainwindow.c:2431
+#: src/mainwindow.c:2437

 msgid "No posting allowed"
 msgstr "不允许发贴"
 
 msgid "No posting allowed"
 msgstr "不允许发贴"
 

-#: src/mainwindow.c:2696
-msgid "Sylpheed-Claws - Folder View"
-msgstr "Sylpheed-Claws - 文件夹"
+#: src/mainwindow.c:2704
+msgid "Claws Mail - Folder View"
+msgstr "Claws Mail - 文件夹"

 
 

-#: src/mainwindow.c:2732 src/messageview.c:449 src/messageview.c:855
-msgid "Sylpheed-Claws - Message View"
-msgstr "Sylpheed-Claws - 邮件"
+#: src/mainwindow.c:2740 src/messageview.c:449 src/messageview.c:861
+msgid "Claws Mail - Message View"
+msgstr "Claws Mail - 邮件"

 
 

-#: src/mainwindow.c:3082
+#: src/mainwindow.c:3090

 msgid "Mbox import has failed."
 msgstr "导入mbox文件失败。"
 
 msgid "Mbox import has failed."
 msgstr "导入mbox文件失败。"
 

-#: src/mainwindow.c:3091 src/mainwindow.c:3100
+#: src/mainwindow.c:3099 src/mainwindow.c:3108

 msgid "Export to mbox has failed."
 msgstr "导出到mbox失败。"
 
 msgid "Export to mbox has failed."
 msgstr "导出到mbox失败。"
 

-#: src/mainwindow.c:3123 src/plugins/trayicon/trayicon.c:426
+#: src/mainwindow.c:3131 src/plugins/trayicon/trayicon.c:474

 msgid "Exit"
 msgstr "退出"
 
 msgid "Exit"
 msgstr "退出"
 

-#: src/mainwindow.c:3123
-msgid "Exit Sylpheed-Claws?"
-msgstr "退出 Sylpheed-Claws?"
+#: src/mainwindow.c:3131
+msgid "Exit Claws Mail?"
+msgstr "退出 Claws Mail?"

 
 

-#: src/mainwindow.c:3269
+#: src/mainwindow.c:3282

 msgid "Folder synchronisation"
 msgstr "文件夹同步"
 
 msgid "Folder synchronisation"
 msgstr "文件夹同步"
 

-#: src/mainwindow.c:3270
+#: src/mainwindow.c:3283

 msgid "Do you want to synchronise your folders now?"
 msgstr "是否现在同步文件夹?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "是否现在同步文件夹?"
 

-#: src/mainwindow.c:3271
+#: src/mainwindow.c:3284

 msgid "+_Synchronise"
 msgstr "+同步(_S)"
 
 msgid "+_Synchronise"
 msgstr "+同步(_S)"
 

-#: src/mainwindow.c:3602
+#: src/mainwindow.c:3615

 msgid "Deleting duplicated messages..."
 msgstr "删除重复的邮件..."
 
 msgid "Deleting duplicated messages..."
 msgstr "删除重复的邮件..."
 

-#: src/mainwindow.c:3636
+#: src/mainwindow.c:3652

 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "删除 %d 个重复的邮件(分布于 %d 个文件夹)。\n"
 
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "删除 %d 个重复的邮件(分布于 %d 个文件夹)。\n"
 

-#: src/mainwindow.c:3795 src/summaryview.c:4775
+#: src/mainwindow.c:3811 src/summaryview.c:4783

 msgid "Processing rules to apply before folder rules"
 msgstr "在文件夹规则前应用的规则"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "在文件夹规则前应用的规则"
 

-#: src/mainwindow.c:3804
+#: src/mainwindow.c:3820

 msgid "Processing rules to apply after folder rules"
 msgstr "在文件夹规则后应用的规则"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "在文件夹规则后应用的规则"
 

-#: src/mainwindow.c:3813 src/summaryview.c:4786
+#: src/mainwindow.c:3829 src/summaryview.c:4794

 msgid "Filtering configuration"
 msgstr "过滤/处理 配置"
 
 msgid "Filtering configuration"
 msgstr "过滤/处理 配置"
 

-#: src/mainwindow.c:4067
-#, c-format
-msgid "not initialized\n"
-msgstr "未初始化\n"
-
-#: src/mainwindow.c:4079 src/mainwindow.c:4090
-#, c-format
-msgid "selecting folder '%s'\n"
-msgstr "选择文件夹: '%s'\n"
-
-#: src/mainwindow.c:4094
-#, c-format
-msgid "selecting message %d\n"
-msgstr "选择邮件 %d\n"
+#: src/matcher.c:758 src/matcher.c:891 src/prefs_matcher.c:520
+#: src/prefs_matcher.c:1329 src/prefs_matcher.c:1346 src/prefs_matcher.c:2099
+msgid "Filtering Matcher Menu|All"
+msgstr "全部"

 
 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(无)"
 
 
 #: src/matcher.c:1463 src/matcher.c:1464 src/matcher.c:1465 src/matcher.c:1466
 #: src/matcher.c:1467 src/matcher.c:1468 src/matcher.c:1469 src/matcher.c:1470
 msgid "(none)"
 msgstr "(无)"
 

-#: src/mbox.c:85
+#: src/mbox.c:98

 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 #, c-format
 msgid ""
 "Could not open mbox file:\n"


@@ -5808,25 +6127,25 @@ msgstr ""
 "无法打开mbox文件:\n"
 "%s\n"
 
 "无法打开mbox文件:\n"
 "%s\n"
 

-#: src/mbox.c:121
+#: src/mbox.c:134

 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "正在从mbox文件导入... (已经导入%d封邮件)"
 
 #, c-format
 msgid "Importing from mbox... (%d mails imported)"
 msgstr "正在从mbox文件导入... (已经导入%d封邮件)"
 

-#: src/mbox.c:468
+#: src/mbox.c:481

 msgid "Overwrite mbox file"
 msgstr "覆盖mbox文件"
 
 msgid "Overwrite mbox file"
 msgstr "覆盖mbox文件"
 

-#: src/mbox.c:469
+#: src/mbox.c:482

 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "该文件已经存在, 是否要覆盖?"
 
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "该文件已经存在, 是否要覆盖?"
 

-#: src/mbox.c:470 src/messageview.c:1143 src/mimeview.c:1422
-#: src/textview.c:2650
+#: src/mbox.c:483 src/messageview.c:1149 src/mimeview.c:1443
+#: src/textview.c:2654

 msgid "Overwrite"
 msgstr "覆盖"
 
 msgid "Overwrite"
 msgstr "覆盖"
 

-#: src/mbox.c:479
+#: src/mbox.c:492

 #, c-format
 msgid ""
 "Could not create mbox file:\n"
 #, c-format
 msgid ""
 "Could not create mbox file:\n"


@@ -5835,39 +6154,39 @@ msgstr ""
 "无法创建mbox文件:\n"
 "%s\n"
 
 "无法创建mbox文件:\n"
 "%s\n"
 

-#: src/mbox.c:483
+#: src/mbox.c:500

 msgid "Exporting to mbox..."
 msgstr "正在导出文件夹到mbox文件..."
 
 msgid "Exporting to mbox..."
 msgstr "正在导出文件夹到mbox文件..."
 

-#: src/message_search.c:162
+#: src/message_search.c:169

 msgid "Find in current message"
 msgstr "在当前邮件中查找"
 
 msgid "Find in current message"
 msgstr "在当前邮件中查找"
 

-#: src/message_search.c:180
+#: src/message_search.c:187

 msgid "Find text:"
 msgstr "查找文字"
 
 msgid "Find text:"
 msgstr "查找文字"
 

-#: src/message_search.c:195 src/prefs_matcher.c:649 src/summary_search.c:324
+#: src/message_search.c:210 src/prefs_matcher.c:649 src/summary_search.c:392

 msgid "Case sensitive"
 msgstr "大小写敏感"
 
 msgid "Case sensitive"
 msgstr "大小写敏感"
 

-#: src/message_search.c:301 src/summary_search.c:535
+#: src/message_search.c:323 src/summary_search.c:637

 msgid "Search failed"
 msgstr "搜索失败"
 
 msgid "Search failed"
 msgstr "搜索失败"
 

-#: src/message_search.c:302 src/summary_search.c:536
+#: src/message_search.c:324 src/summary_search.c:638

 msgid "Search string not found."
 msgstr "未找到指定字符串。"
 
 msgid "Search string not found."
 msgstr "未找到指定字符串。"
 

-#: src/message_search.c:311
+#: src/message_search.c:333

 msgid "Beginning of message reached; continue from end?"
 msgstr "已到达邮件顶部，是否绕到尾部继续查找？"
 
 msgid "Beginning of message reached; continue from end?"
 msgstr "已到达邮件顶部，是否绕到尾部继续查找？"
 

-#: src/message_search.c:314
+#: src/message_search.c:336

 msgid "End of message reached; continue from beginning?"
 msgstr "已到达邮件末尾，是否重新开始查找？"
 
 msgid "End of message reached; continue from beginning?"
 msgstr "已到达邮件末尾，是否重新开始查找？"
 

-#: src/message_search.c:317 src/summary_search.c:547
+#: src/message_search.c:339 src/summary_search.c:649

 msgid "Search finished"
 msgstr "搜索完成"
 
 msgid "Search finished"
 msgstr "搜索完成"
 


@@ -5907,11 +6226,11 @@ msgstr "/工具(_T)/创建处理规则/由收信人(_T)"
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则/由主题(_S)"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则/由主题(_S)"
 

-#: src/messageview.c:564
+#: src/messageview.c:566

 msgid "<No Return-Path found>"
 msgstr "<未找到回信地址>"
 
 msgid "<No Return-Path found>"
 msgstr "<未找到回信地址>"
 

-#: src/messageview.c:572
+#: src/messageview.c:574

 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"


@@ -5925,11 +6244,11 @@ msgstr ""
 " 返回路径: %s\n"
 "建议不发送此回执。"
 
 " 返回路径: %s\n"
 "建议不发送此回执。"
 

-#: src/messageview.c:579 src/messageview.c:596
+#: src/messageview.c:581 src/messageview.c:598

 msgid "_Don't Send"
 msgstr "不发送(_D)"
 
 msgid "_Don't Send"
 msgstr "不发送(_D)"
 

-#: src/messageview.c:592
+#: src/messageview.c:594

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -5941,39 +6260,39 @@ msgstr ""
 "\n"
 "建议不发送回执。"
 
 "\n"
 "建议不发送回执。"
 

-#: src/messageview.c:809 src/procmime.c:873
+#: src/messageview.c:815 src/procmime.c:873

 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "无法解密: %s"
 
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "无法解密: %s"
 

-#: src/messageview.c:1138 src/mimeview.c:1560 src/summaryview.c:4065
-#: src/summaryview.c:4068 src/textview.c:2638
+#: src/messageview.c:1144 src/mimeview.c:1582 src/summaryview.c:4065
+#: src/summaryview.c:4068 src/textview.c:2642

 msgid "Save as"
 msgstr "保存为"
 
 msgid "Save as"
 msgstr "保存为"
 

-#: src/messageview.c:1144
+#: src/messageview.c:1150

 msgid "Overwrite existing file?"
 msgstr "附加已有文件？"
 
 msgid "Overwrite existing file?"
 msgstr "附加已有文件？"
 

-#: src/messageview.c:1152 src/summaryview.c:4085 src/summaryview.c:4088
+#: src/messageview.c:1158 src/summaryview.c:4085 src/summaryview.c:4088

 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "无法保存文件 '%s'。"
 
 #: src/summaryview.c:4103
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr "无法保存文件 '%s'。"
 

-#: src/messageview.c:1233
+#: src/messageview.c:1239

 msgid "You asked for a return receipt in this message."
 msgstr "该邮件要求返回回执。"
 
 msgid "You asked for a return receipt in this message."
 msgstr "该邮件要求返回回执。"
 

-#: src/messageview.c:1237
+#: src/messageview.c:1243

 msgid "This message asks for a return receipt."
 msgstr "该邮件要求返回回执。"
 
 msgid "This message asks for a return receipt."
 msgstr "该邮件要求返回回执。"
 

-#: src/messageview.c:1238
+#: src/messageview.c:1244

 msgid "Send receipt"
 msgstr "发送回执"
 
 msgid "Send receipt"
 msgstr "发送回执"
 

-#: src/messageview.c:1281
+#: src/messageview.c:1287

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -5981,7 +6300,7 @@ msgstr ""
 "这封邮件只有部分被取回, \n"
 "并已经从服务器删除了。"
 
 "这封邮件只有部分被取回, \n"
 "并已经从服务器删除了。"
 

-#: src/messageview.c:1287
+#: src/messageview.c:1293

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -5990,15 +6309,15 @@ msgstr ""
 "这封邮件只有部分被取回; \n"
 "它是 %s。"
 
 "这封邮件只有部分被取回; \n"
 "它是 %s。"
 

-#: src/messageview.c:1291 src/messageview.c:1313
+#: src/messageview.c:1297 src/messageview.c:1319

 msgid "Mark for download"
 msgstr "标记为待下载"
 
 msgid "Mark for download"
 msgstr "标记为待下载"
 

-#: src/messageview.c:1292 src/messageview.c:1304
+#: src/messageview.c:1298 src/messageview.c:1310

 msgid "Mark for deletion"
 msgstr "标记为待删除"
 
 msgid "Mark for deletion"
 msgstr "标记为待删除"
 

-#: src/messageview.c:1297
+#: src/messageview.c:1303

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6007,12 +6326,12 @@ msgstr ""
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被下载。"
 
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被下载。"
 

-#: src/messageview.c:1302 src/messageview.c:1315
+#: src/messageview.c:1308 src/messageview.c:1321

 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "不标记"
 
 #: src/prefs_filtering_action.c:154
 msgid "Unmark"
 msgstr "不标记"
 

-#: src/messageview.c:1308
+#: src/messageview.c:1314

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -6021,11 +6340,11 @@ msgstr ""
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被删除。"
 
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被删除。"
 

-#: src/messageview.c:1384
+#: src/messageview.c:1390

 msgid "Return Receipt Notification"
 msgstr "返回回执"
 
 msgid "Return Receipt Notification"
 msgstr "返回回执"
 

-#: src/messageview.c:1385
+#: src/messageview.c:1391

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -6034,19 +6353,19 @@ msgstr ""
 "该邮件发送到了你的多个帐号中。\n"
 "请选择用以发送回执的帐号: "
 
 "该邮件发送到了你的多个帐号中。\n"
 "请选择用以发送回执的帐号: "
 

-#: src/messageview.c:1389
+#: src/messageview.c:1395

 msgid "_Send Notification"
 msgstr "发送通知(_S)"
 
 msgid "_Send Notification"
 msgstr "发送通知(_S)"
 

-#: src/messageview.c:1389
+#: src/messageview.c:1395

 msgid "+_Cancel"
 msgstr "+取消(_C)"
 
 msgid "+_Cancel"
 msgstr "+取消(_C)"
 

-#: src/messageview.c:1456
+#: src/messageview.c:1462

 msgid "Cannot print: the message doesn't contain text."
 msgstr "无法打印: 该邮件不包含任何文字。"
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "无法打印: 该邮件不包含任何文字。"
 

-#: src/messageview.c:1503 src/summaryview.c:4125
+#: src/messageview.c:1526 src/summaryview.c:4125

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -6055,7 +6374,7 @@ msgstr ""
 "请输入用于打印的命令行:\n"
 "(`%s' 将被替换为文件名)"
 
 "请输入用于打印的命令行:\n"
 "(`%s' 将被替换为文件名)"
 

-#: src/messageview.c:1509 src/summaryview.c:4131
+#: src/messageview.c:1532 src/summaryview.c:4131

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -6064,15 +6383,15 @@ msgstr ""
 "打印命令行无效:\n"
 "`%s'"
 
 "打印命令行无效:\n"
 "`%s'"
 

-#: src/messageview.c:1775 src/messageview.c:1781 src/summaryview.c:3521
-#: src/summaryview.c:5527
+#: src/messageview.c:1807 src/messageview.c:1813 src/summaryview.c:3521
+#: src/summaryview.c:5542

 msgid "An error happened while learning.\n"
 msgstr "培训时发生错误.\n"
 
 #: src/mh.c:423
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgid "An error happened while learning.\n"
 msgstr "培训时发生错误.\n"
 
 #: src/mh.c:423
 #, c-format
 msgid "can't copy message %s to %s\n"

-msgstr "无法将邮件 %s 拷贝到 %s\n"
+msgstr "无法将邮件 %s 复制到 %s\n"

 
 #: src/mh.c:498
 msgid "Moving messages..."
 
 #: src/mh.c:498
 msgid "Moving messages..."


@@ -6082,11 +6401,11 @@ msgstr "正在移动邮件..."
 msgid "Deleting messages..."
 msgstr "正在删除邮件..."
 
 msgid "Deleting messages..."
 msgstr "正在删除邮件..."
 

-#: src/mh_gtk.c:59
+#: src/mh_gtk.c:62

 msgid "/Remove _mailbox..."
 msgstr "/删除邮箱(_m)..."
 
 msgid "/Remove _mailbox..."
 msgstr "/删除邮箱(_m)..."
 

-#: src/mh_gtk.c:323
+#: src/mh_gtk.c:324

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"


@@ -6095,11 +6414,11 @@ msgstr ""
 "确定要删除邮箱'%s'？\n"
 "(其中的邮件并不会从磁盘中删除)"
 
 "确定要删除邮箱'%s'？\n"
 "(其中的邮件并不会从磁盘中删除)"
 

-#: src/mh_gtk.c:325
+#: src/mh_gtk.c:326

 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 

-#: src/mh_gtk.c:326
+#: src/mh_gtk.c:327

 msgid "_Remove"
 msgstr "删除(_R)"
 
 msgid "_Remove"
 msgstr "删除(_R)"
 


@@ -6127,58 +6446,58 @@ msgstr "/全部保存(_a)..."
 msgid "MIME Type"
 msgstr "MIME类型"
 
 msgid "MIME Type"
 msgstr "MIME类型"
 

-#: src/mimeview.c:721
+#: src/mimeview.c:742

 msgid "Check signature"
 msgstr "检查签名"
 
 msgid "Check signature"
 msgstr "检查签名"
 

-#: src/mimeview.c:726 src/mimeview.c:731 src/mimeview.c:736
+#: src/mimeview.c:747 src/mimeview.c:752 src/mimeview.c:757

 msgid "View full information"
 msgstr "查看详细信息"
 
 msgid "View full information"
 msgstr "查看详细信息"
 

-#: src/mimeview.c:741 src/mimeview.c:745
+#: src/mimeview.c:762 src/mimeview.c:766

 msgid "Check again"
 msgstr "再次检查"
 
 msgid "Check again"
 msgstr "再次检查"
 

-#: src/mimeview.c:754
+#: src/mimeview.c:775

 msgid "Click the icon or hit 'C' to check it."
 msgstr "点击图标或者按'C'选中。"
 
 msgid "Click the icon or hit 'C' to check it."
 msgstr "点击图标或者按'C'选中。"
 

-#: src/mimeview.c:759
+#: src/mimeview.c:780

 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr "检查签名超时。请点击图标或者按'C'以重试。"
 
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr "检查签名超时。请点击图标或者按'C'以重试。"
 

-#: src/mimeview.c:969
+#: src/mimeview.c:990

 msgid "Checking signature..."
 msgstr "正在检查签名..."
 
 msgid "Checking signature..."
 msgstr "正在检查签名..."
 

-#: src/mimeview.c:1011
+#: src/mimeview.c:1032

 msgid "Go back to email"
 msgstr "回到邮件"
 
 msgid "Go back to email"
 msgstr "回到邮件"
 

-#: src/mimeview.c:1349 src/mimeview.c:1430 src/mimeview.c:1606
-#: src/mimeview.c:1639
+#: src/mimeview.c:1370 src/mimeview.c:1451 src/mimeview.c:1628
+#: src/mimeview.c:1661

 msgid "Couldn't save the part of multipart message."
 msgstr "无法保存复合邮件的这一部分。"
 
 msgid "Couldn't save the part of multipart message."
 msgstr "无法保存复合邮件的这一部分。"
 

-#: src/mimeview.c:1419 src/textview.c:2648
+#: src/mimeview.c:1440 src/textview.c:2652

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆盖已有文件 '%s' 吗？"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆盖已有文件 '%s' 吗？"
 

-#: src/mimeview.c:1457
+#: src/mimeview.c:1478

 msgid "Select destination folder"
 msgstr "选择目的文件夹"
 
 msgid "Select destination folder"
 msgstr "选择目的文件夹"
 

-#: src/mimeview.c:1464
+#: src/mimeview.c:1485

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "`%s'不是一个目录。"
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "`%s'不是一个目录。"
 

-#: src/mimeview.c:1685 src/mimeview.c:1693 src/textview.c:2579
+#: src/mimeview.c:1707 src/mimeview.c:1715 src/textview.c:2583

 msgid "Open with"
 msgstr "打开方式"
 
 msgid "Open with"
 msgstr "打开方式"
 

-#: src/mimeview.c:1686 src/mimeview.c:1694 src/textview.c:2580
+#: src/mimeview.c:1708 src/mimeview.c:1716 src/textview.c:2584

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -6193,8 +6512,8 @@ msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "正在与 %s 建立NNTP连接:%d ...\n"
 
 #: src/news.c:328
 msgstr "正在与 %s 建立NNTP连接:%d ...\n"
 
 #: src/news.c:328

-msgid "Sylpheed-Claws needs network access in order to access the News server."
-msgstr "Sylpheed-Claws需要访问网络才能链接倒News服务器。"
+msgid "Claws Mail needs network access in order to access the News server."
+msgstr "Claws Mail需要访问网络才能链接倒News服务器。"

 
 #: src/news.c:345
 #, c-format
 
 #: src/news.c:345
 #, c-format


@@ -6273,43 +6592,33 @@ msgstr "/订阅新闻组 (_S)..."
 msgid "/_Unsubscribe newsgroup"
 msgstr "/退订新闻组 (_S)..."
 
 msgid "/_Unsubscribe newsgroup"
 msgstr "/退订新闻组 (_S)..."
 

-#: src/news_gtk.c:223
+#: src/news_gtk.c:226

 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "确定要退订新闻组'%s'？"
 
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "确定要退订新闻组'%s'？"
 

-#: src/news_gtk.c:224
+#: src/news_gtk.c:227

 msgid "Unsubscribe newsgroup"
 msgstr "退订新闻组"
 
 msgid "Unsubscribe newsgroup"
 msgstr "退订新闻组"
 

-#: src/news_gtk.c:225
+#: src/news_gtk.c:228

 msgid "_Unsubscribe"
 msgstr "/退订新闻组(_S)"
 
 msgid "_Unsubscribe"
 msgstr "/退订新闻组(_S)"
 

-#: src/plugins/clamav/clamav_plugin.c:118
+#: src/plugins/clamav/clamav_plugin.c:43
+#: src/plugins/clamav/clamav_plugin_gtk.c:212
+msgid "Clam AntiVirus"
+msgstr ""
+
+#: src/plugins/clamav/clamav_plugin.c:120

 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: 正在扫描邮件..."
 
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: 正在扫描邮件..."
 

-#: src/plugins/clamav/clamav_plugin.c:198
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the ClamAV plugin "
-"was built with"
-msgstr "Sylpheed-Claws的版本比ClamAV插件编译时所采用的版本更新"
-
-#: src/plugins/clamav/clamav_plugin.c:203
-msgid "Your version of Sylpheed-Claws is too old for the ClamAV plugin"
-msgstr "你所使用的Sylpheed-Claws太老了，无法使用此版本的ClamAV插件"
-
-#: src/plugins/clamav/clamav_plugin.c:209
+#: src/plugins/clamav/clamav_plugin.c:205

 msgid "Failed to register mail filtering hook"
 msgstr "注册邮件过滤器失败"
 
 msgid "Failed to register mail filtering hook"
 msgstr "注册邮件过滤器失败"
 

-#: src/plugins/clamav/clamav_plugin.c:252
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin.c:257
+#: src/plugins/clamav/clamav_plugin.c:253

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -6325,7 +6634,7 @@ msgstr ""
 "\n"
 "你可以在/配置/偏好/插件/Clam AntiVirus中配置选项。"
 
 "\n"
 "你可以在/配置/偏好/插件/Clam AntiVirus中配置选项。"
 

-#: src/plugins/clamav/clamav_plugin.c:284
+#: src/plugins/clamav/clamav_plugin.c:280

 msgid "Virus detection"
 msgstr "检查病毒"
 
 msgid "Virus detection"
 msgstr "检查病毒"
 


@@ -6366,33 +6675,23 @@ msgstr "用于保存受感染邮件的文件夹，不设置时将缺省使用垃
 msgid "Click this button to select a folder for storing infected mail"
 msgstr "点击此按钮可选择一个文件夹，以用于存放受感染的邮件"
 
 msgid "Click this button to select a folder for storing infected mail"
 msgstr "点击此按钮可选择一个文件夹，以用于存放受感染的邮件"
 

-#: src/plugins/demo/demo.c:45
-msgid ""
-"Your sylpheed-claws version is newer than the version the plugin was built "
-"with"
-msgstr "当前Sylpheed-Claws比编译此插件时所采用的版本更新"
-
-#: src/plugins/demo/demo.c:50
-msgid "Your sylpheed-claws version is too old"
-msgstr "你的Sylpheed-Claws版本太老"
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+msgid "Demo"
+msgstr "演示"

 
 

-#: src/plugins/demo/demo.c:56
+#: src/plugins/demo/demo.c:52

 msgid "Failed to register log text hook"
 msgstr "注册写日志钩子失败"
 
 msgid "Failed to register log text hook"
 msgstr "注册写日志钩子失败"
 

-#: src/plugins/demo/demo.c:74 src/plugins/demo/demo.c:103
-msgid "Demo"
-msgstr "演示"
-
-#: src/plugins/demo/demo.c:79
+#: src/plugins/demo/demo.c:75

 msgid ""
 msgid ""

-"This Plugin is only a demo of how to write plugins for Sylpheed-Claws. It "
+"This Plugin is only a demo of how to write plugins for Claws Mail. It "

 "installs a hook for new log output and writes it to stdout.\n"
 "\n"
 "installs a hook for new log output and writes it to stdout.\n"
 "\n"

-"It is not really useful"
+"It is not really useful."

 msgstr ""
 msgstr ""

-"本插件仅用于演示如何编写Sylpheed插件。它将为日志输出安装一个钩子以将日志写到"
-"标准输出。\n"
+"本插件仅用于演示如何编写Claws Mail插件。它将为日志输出安装一个钩子以将日志写"
+"到标准输出。\n"

 "\n"
 "它没有什么实际用途"
 
 "\n"
 "它没有什么实际用途"
 


@@ -6420,21 +6719,11 @@ msgstr "全窗口模式(隐藏工具条)"
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "等价于Dillo的'--fullwindow'选项"
 
 msgid "Equivalent to Dillo's '--fullwindow' option"
 msgstr "等价于Dillo的'--fullwindow'选项"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:169
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Dillo plugin "
-"was built with"
-msgstr "当前Sylpheed-Claws的版本比编译Dillo插件时所采用的版本更新"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:174
-msgid "Your version of Sylpheed-Claws is too old for the Dillo plugin"
-msgstr "你的Sylpheed-Claws版本太老了，无法使用Dillo插件的当前版本"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:194
+#: src/plugins/dillo_viewer/dillo_viewer.c:39

 msgid "Dillo HTML Viewer"
 msgstr "Dillo网页查看器"
 
 msgid "Dillo HTML Viewer"
 msgstr "Dillo网页查看器"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:199
+#: src/plugins/dillo_viewer/dillo_viewer.c:195

 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"
 msgid ""
 "This plugin renders HTML mail using the Dillo web browser.\n"
 "\n"


@@ -6444,7 +6733,7 @@ msgstr ""
 "\n"
 "你以在'/配置/偏好/插件/Dillo浏览器'中配置选项。"
 
 "\n"
 "你以在'/配置/偏好/插件/Dillo浏览器'中配置选项。"
 

-#: src/plugins/dillo_viewer/dillo_viewer.c:223
+#: src/plugins/dillo_viewer/dillo_viewer.c:219

 msgid "text/html"
 msgstr ""
 
 msgid "text/html"
 msgstr ""
 


@@ -6516,7 +6805,7 @@ msgstr " 有限期"
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "若设置为 '0' 则会在整个会话期内保存passphrase"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "若设置为 '0' 则会在整个会话期内保存passphrase"
 

-#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:170
+#: src/plugins/pgpcore/prefs_gpg.c:131 src/prefs_receive.c:165

 msgid "minute(s)"
 msgstr "分钟"
 
 msgid "minute(s)"
 msgstr "分钟"
 


@@ -6618,137 +6907,142 @@ msgstr ""
 msgid "Trust key"
 msgstr "信任密钥"
 
 msgid "Trust key"
 msgstr "信任密钥"
 

-#: src/plugins/pgpcore/sgpgme.c:134
+#: src/plugins/pgpcore/sgpgme.c:76 src/privacy.c:211 src/privacy.c:215
+#: src/privacy.c:232 src/privacy.c:236
+msgid "No signature found"
+msgstr "未发现签名"
+
+#: src/plugins/pgpcore/sgpgme.c:138

 msgid "Undefined"
 msgstr "未定义"
 
 msgid "Undefined"
 msgstr "未定义"
 

-#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:193

 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "从不显示"
 
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "从不显示"
 

-#: src/plugins/pgpcore/sgpgme.c:138
+#: src/plugins/pgpcore/sgpgme.c:142

 msgid "Marginal"
 msgstr ""
 
 msgid "Marginal"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/sgpgme.c:146

 msgid "Ultimate"
 msgstr ""
 
 msgid "Ultimate"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:176
+#: src/plugins/pgpcore/sgpgme.c:180

 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "该签名无法被校验 - %s。"
 
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "该签名无法被校验 - %s。"
 

-#: src/plugins/pgpcore/sgpgme.c:180 src/plugins/pgpcore/sgpgme.c:184
-#: src/plugins/pgpcore/sgpgme.c:231
+#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:188
+#: src/plugins/pgpcore/sgpgme.c:235

 msgid "The signature has not been checked."
 msgstr "该签名尚未被检查。"
 
 msgid "The signature has not been checked."
 msgstr "该签名尚未被检查。"
 

-#: src/plugins/pgpcore/sgpgme.c:190 src/plugins/pgpcore/sgpgme.c:192
+#: src/plugins/pgpcore/sgpgme.c:194 src/plugins/pgpcore/sgpgme.c:196

 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: 无法获取密钥 - gpg-agent没有启动运行"
 
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: 无法获取密钥 - gpg-agent没有启动运行"
 

-#: src/plugins/pgpcore/sgpgme.c:205
+#: src/plugins/pgpcore/sgpgme.c:209

 #, c-format
 msgid "Good signature from %s."
 msgstr "来自 \"%s\" 的签名正确。"
 
 #, c-format
 msgid "Good signature from %s."
 msgstr "来自 \"%s\" 的签名正确。"
 

-#: src/plugins/pgpcore/sgpgme.c:211
+#: src/plugins/pgpcore/sgpgme.c:215

 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "来自 \"%s\" 的签名完好(但尚未被信任)。"
 
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "来自 \"%s\" 的签名完好(但尚未被信任)。"
 

-#: src/plugins/pgpcore/sgpgme.c:216
+#: src/plugins/pgpcore/sgpgme.c:220

 #, c-format
 msgid "Expired signature from %s."
 msgstr "来自 %s 的签名已过期。"
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr "来自 %s 的签名已过期。"
 

-#: src/plugins/pgpcore/sgpgme.c:219
+#: src/plugins/pgpcore/sgpgme.c:223

 #, c-format
 msgid "Expired key from %s."
 msgstr "来自 %s 的密钥已过期。"
 
 #, c-format
 msgid "Expired key from %s."
 msgstr "来自 %s 的密钥已过期。"
 

-#: src/plugins/pgpcore/sgpgme.c:222
+#: src/plugins/pgpcore/sgpgme.c:226

 #, c-format
 msgid "Bad signature from %s."
 msgstr "来自 %s 的签名检查不通过。"
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr "来自 %s 的签名检查不通过。"
 

-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:230

 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "没有匹配的密钥0x%s，无法检查此签名。"
 
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "没有匹配的密钥0x%s，无法检查此签名。"
 

-#: src/plugins/pgpcore/sgpgme.c:268
+#: src/plugins/pgpcore/sgpgme.c:272

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "签名采用%s制作，密钥ID: %s\n"
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "签名采用%s制作，密钥ID: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:279

 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "\"%s\"的签名有效 (信任: %s)\n"
 
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "\"%s\"的签名有效 (信任: %s)\n"
 

-#: src/plugins/pgpcore/sgpgme.c:280
+#: src/plugins/pgpcore/sgpgme.c:284

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名已过期\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名已过期\n"
 

-#: src/plugins/pgpcore/sgpgme.c:285
+#: src/plugins/pgpcore/sgpgme.c:289

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名检查错误\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名检查错误\n"
 

-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:300

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               又称为 \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               又称为 \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:306

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "主密钥指纹: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "主密钥指纹: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:307
+#: src/plugins/pgpcore/sgpgme.c:311

 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "警告: 签名者的地址\"%s\"与DNS中的数据并不相符\n"
 
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "警告: 签名者的地址\"%s\"与DNS中的数据并不相符\n"
 

-#: src/plugins/pgpcore/sgpgme.c:313
+#: src/plugins/pgpcore/sgpgme.c:317

 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "经验证的签名者地址是\"%s\"\n"
 
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "经验证的签名者地址是\"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:355
+#: src/plugins/pgpcore/sgpgme.c:359

 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "无法取得邮件的数据, %s"
 
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "无法取得邮件的数据, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:371
+#: src/plugins/pgpcore/sgpgme.c:375

 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "不能初始化数据, %s"
 
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "不能初始化数据, %s"
 

-#: src/plugins/pgpcore/sgpgme.c:487
+#: src/plugins/pgpcore/sgpgme.c:492

 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "没有找到密钥(%s)"
 
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "没有找到密钥(%s)"
 

-#: src/plugins/pgpcore/sgpgme.c:495
+#: src/plugins/pgpcore/sgpgme.c:500

 msgid "Secret key specification is ambiguous"
 msgstr "密钥存在二义性"
 
 msgid "Secret key specification is ambiguous"
 msgstr "密钥存在二义性"
 

-#: src/plugins/pgpcore/sgpgme.c:505
+#: src/plugins/pgpcore/sgpgme.c:510

 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "设置密钥时出错: %s"
 
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "设置密钥时出错: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:541
+#: src/plugins/pgpcore/sgpgme.c:546

 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "GPGME协议 '%s'不可用: '%s'引擎未被正确安装。"
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "GPGME协议 '%s'不可用: '%s'引擎未被正确安装。"
 

-#: src/plugins/pgpcore/sgpgme.c:547
+#: src/plugins/pgpcore/sgpgme.c:552

 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "


@@ -6756,12 +7050,12 @@ msgid ""
 msgstr ""
 "GPGME协议'%s'不可用: '%s'引擎虽已安装，但当前版本为%s(至少需要版本%s)。\n"
 
 msgstr ""
 "GPGME协议'%s'不可用: '%s'引擎虽已安装，但当前版本为%s(至少需要版本%s)。\n"
 

-#: src/plugins/pgpcore/sgpgme.c:555
+#: src/plugins/pgpcore/sgpgme.c:560

 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "GPGME协议'%s'不可用(未知错误)"
 
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "GPGME协议'%s'不可用(未知错误)"
 

-#: src/plugins/pgpcore/sgpgme.c:571
+#: src/plugins/pgpcore/sgpgme.c:576

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -6769,42 +7063,41 @@ msgstr ""
 "GnuPG的安装不正常，或需要升级。\n"
 "OpenPGP支持已被禁用。"
 
 "GnuPG的安装不正常，或需要升级。\n"
 "OpenPGP支持已被禁用。"
 

-#: src/plugins/pgpcore/sgpgme.c:605
+#: src/plugins/pgpcore/sgpgme.c:610

 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"

-msgstr ""
-"您必须先点击\"确定\"按钮保存账户信息，然后才能生成一个密钥对。\n"
+msgstr "您必须先点击\"确定\"按钮保存账户信息，然后才能生成一个密钥对。\n"

 
 

-#: src/plugins/pgpcore/sgpgme.c:610
+#: src/plugins/pgpcore/sgpgme.c:615

 msgid "No PGP key found"
 msgstr "没有找到PGP密钥"
 
 msgid "No PGP key found"
 msgstr "没有找到PGP密钥"
 

-#: src/plugins/pgpcore/sgpgme.c:611
+#: src/plugins/pgpcore/sgpgme.c:616

 msgid ""
 msgid ""

-"Sylpheed-Claws did not find a secret PGP key, which means that you won't be "
-"able to sign emails or receive encrypted emails.\n"
+"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 ""
 "没有找到一个PGP密钥, 这意味着你不能加密邮件，也不能收取已加密的邮件。\n"
 "是否现在就生成一对?"
 
 "Do you want to create a new key pair now?"
 msgstr ""
 "没有找到一个PGP密钥, 这意味着你不能加密邮件，也不能收取已加密的邮件。\n"
 "是否现在就生成一对?"
 

-#: src/plugins/pgpcore/sgpgme.c:681 src/plugins/pgpcore/sgpgme.c:697
+#: src/plugins/pgpcore/sgpgme.c:686 src/plugins/pgpcore/sgpgme.c:702

 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "无法生成新的密钥对: %s"
 
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "无法生成新的密钥对: %s"
 

-#: src/plugins/pgpcore/sgpgme.c:688
+#: src/plugins/pgpcore/sgpgme.c:693

 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr "正在生成密钥对...请晃动鼠标以增加熵值 :-)..."
 
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr "正在生成密钥对...请晃动鼠标以增加熵值 :-)..."
 

-#: src/plugins/pgpcore/sgpgme.c:703
+#: src/plugins/pgpcore/sgpgme.c:708

 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "无法生成新的密钥对: 错误原因未知"
 
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "无法生成新的密钥对: 错误原因未知"
 

-#: src/plugins/pgpcore/sgpgme.c:707
+#: src/plugins/pgpcore/sgpgme.c:712

 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"


@@ -6817,37 +7110,27 @@ msgstr ""
 "\n"
 "是否要将其输出到一个密钥服务器上？"
 
 "\n"
 "是否要将其输出到一个密钥服务器上？"
 

-#: src/plugins/pgpcore/sgpgme.c:711
+#: src/plugins/pgpcore/sgpgme.c:716

 msgid "Key generated"
 msgstr "密钥已生成"
 
 msgid "Key generated"
 msgstr "密钥已生成"
 

-#: src/plugins/pgpcore/sgpgme.c:750
+#: src/plugins/pgpcore/sgpgme.c:755

 msgid "Key exported."
 msgstr "完成密钥导出。"
 
 msgid "Key exported."
 msgstr "完成密钥导出。"
 

-#: src/plugins/pgpcore/sgpgme.c:752
+#: src/plugins/pgpcore/sgpgme.c:757

 msgid "Couldn't export key."
 msgstr "无法导出密钥。"
 
 msgid "Couldn't export key."
 msgstr "无法导出密钥。"
 

-#: src/plugins/pgpcore/sgpgme.c:756
+#: src/plugins/pgpcore/sgpgme.c:761

 msgid "Key export isn't implemented in Windows."
 msgstr "尚不支持Windows上导出密钥功能."
 
 msgid "Key export isn't implemented in Windows."
 msgstr "尚不支持Windows上导出密钥功能."
 

-#: src/plugins/pgpcore/plugin.c:38
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin "
-"was built with"
-msgstr "当前Sylpheed-Claws比编译PGP/Core插件时所采用的版本更新"
-
-#: src/plugins/pgpcore/plugin.c:43
-msgid "Your version of Sylpheed-Claws is too old for the PGP/Core plugin"
-msgstr "你的Sylpheed-Claws版本太老了，无法使用PGP/Core插件的当前版本"
-
-#: src/plugins/pgpcore/plugin.c:63
+#: src/plugins/pgpcore/plugin.c:35

 msgid "PGP/Core"
 msgstr ""
 
 msgid "PGP/Core"
 msgstr ""
 

-#: src/plugins/pgpcore/plugin.c:68
+#: src/plugins/pgpcore/plugin.c:64

 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"
 msgid ""
 "This plugin handles PGP core operations, it is used by other plugins, like "
 "PGP/Mime.\n"


@@ -6868,7 +7151,7 @@ msgstr ""
 "\n"
 "GPGME的版权归Werner Koch <dd9jn@gnu.org>所有(2001)"
 
 "\n"
 "GPGME的版权归Werner Koch <dd9jn@gnu.org>所有(2001)"
 

-#: src/plugins/pgpcore/plugin.c:97
+#: src/plugins/pgpcore/plugin.c:93

 msgid "Core operations"
 msgstr "核心操作"
 
 msgid "Core operations"
 msgstr "核心操作"
 


@@ -6878,10 +7161,9 @@ msgstr "导入密钥"
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgid ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:119
 msgid ""

-"This key is not in your keyring. Do you want Sylpheed-Claws to try and "
-"import it from a keyserver?"
-msgstr ""
-"该密钥上不在你的密钥环内，是否连接密钥服务器导入它？"
+"This key is not in your keyring. Do you want Claws Mail to try and import it "
+"from a keyserver?"
+msgstr "该密钥上不在你的密钥环内，是否连接密钥服务器导入它？"

 
 #: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 
 #: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""


@@ -6951,87 +7233,86 @@ msgstr "   Windows上尚未实现密钥导入功能.\n"
 msgid "   This key is in your keyring.\n"
 msgstr "   该密钥已在你的密钥环里面.\n"
 
 msgid "   This key is in your keyring.\n"
 msgstr "   该密钥已在你的密钥环里面.\n"
 

-#: src/plugins/pgpinline/pgpinline.c:237 src/plugins/pgpinline/pgpinline.c:385
+#: src/plugins/pgpinline/pgpinline.c:241 src/plugins/pgpinline/pgpinline.c:393

 msgid "Couldn't get text data."
 msgstr "无法取得文本数据。"
 
 msgid "Couldn't get text data."
 msgstr "无法取得文本数据。"
 

-#: src/plugins/pgpinline/pgpinline.c:255
+#: src/plugins/pgpinline/pgpinline.c:259

 msgid "Couldn't convert text data to any sane charset."
 msgstr "无法将文本数据转换到任意字符集。"
 
 msgid "Couldn't convert text data to any sane charset."
 msgstr "无法将文本数据转换到任意字符集。"
 

-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:267 src/plugins/pgpinline/pgpinline.c:523
+#: src/plugins/pgpinline/pgpinline.c:644 src/plugins/pgpinline/pgpinline.c:691
+#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
+#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
+#: src/plugins/pgpmime/pgpmime.c:593
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr "无法初始化GPG，%s"
+
+#: src/plugins/pgpinline/pgpinline.c:386

 msgid "Couldn't parse mime part."
 msgstr "无法读取邮件的MIME部分."
 
 msgid "Couldn't parse mime part."
 msgstr "无法读取邮件的MIME部分."
 

-#: src/plugins/pgpinline/pgpinline.c:408 src/plugins/pgpmime/pgpmime.c:333
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:343

 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "无法打开已解密的文件%s"
 
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "无法打开已解密的文件%s"
 

-#: src/plugins/pgpinline/pgpinline.c:438
+#: src/plugins/pgpinline/pgpinline.c:446

 msgid "Couldn't scan decrypted file."
 msgstr "无法扫描已解密的文件。"
 
 msgid "Couldn't scan decrypted file."
 msgstr "无法扫描已解密的文件。"
 

-#: src/plugins/pgpinline/pgpinline.c:446
+#: src/plugins/pgpinline/pgpinline.c:454

 msgid "Couldn't scan decrypted file parts."
 msgstr "无法扫描已经解密的部分。"
 
 msgid "Couldn't scan decrypted file parts."
 msgstr "无法扫描已经解密的部分。"
 

-#: src/plugins/pgpinline/pgpinline.c:500
+#: src/plugins/pgpinline/pgpinline.c:508

 msgid "Couldn't create temporary file."
 msgstr "无法创建临时文件。"
 
 msgid "Couldn't create temporary file."
 msgstr "无法创建临时文件。"
 

-#: src/plugins/pgpinline/pgpinline.c:534 src/plugins/pgpmime/pgpmime.c:480
+#: src/plugins/pgpinline/pgpinline.c:546 src/plugins/pgpmime/pgpmime.c:494

 #, c-format
 msgid "Data signing failed, %s"
 msgstr "数据加密失败, %s"
 
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "数据加密失败, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:552 src/plugins/pgpmime/pgpmime.c:505
+#: src/plugins/pgpinline/pgpinline.c:564 src/plugins/pgpmime/pgpmime.c:519

 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "数据加密失败: 无效的签名: %s"
 
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "数据加密失败: 无效的签名: %s"
 

-#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:514
+#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:528

 msgid "Data signing failed, no results."
 msgstr "数据加密失败，结果为空。"
 
 msgid "Data signing failed, no results."
 msgstr "数据加密失败，结果为空。"
 

-#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:526
+#: src/plugins/pgpinline/pgpinline.c:583 src/plugins/pgpmime/pgpmime.c:539

 msgid "Data signing failed, no contents."
 msgstr "数据加密失败，内容为空。"
 
 msgid "Data signing failed, no contents."
 msgstr "数据加密失败，内容为空。"
 

-#: src/plugins/pgpinline/pgpinline.c:637 src/plugins/pgpmime/pgpmime.c:584
+#: src/plugins/pgpinline/pgpinline.c:653 src/plugins/pgpmime/pgpmime.c:602

 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "无法添加GPG密钥 %s, %s"
 
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "无法添加GPG密钥 %s, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpmime/pgpmime.c:612
+#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:630

 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "无法创建临时文件, %s"
 
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "无法创建临时文件, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:683 src/plugins/pgpmime/pgpmime.c:638
+#: src/plugins/pgpinline/pgpinline.c:702 src/plugins/pgpmime/pgpmime.c:655

 #, c-format
 msgid "Encryption failed, %s"
 msgstr "加密失败, %s"
 
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "加密失败, %s"
 

-#: src/plugins/pgpinline/pgpinline.c:746
+#: src/plugins/pgpinline/pgpinline.c:767

 msgid "PGP/Inline"
 msgstr ""
 
 msgid "PGP/Inline"
 msgstr ""
 

-#: src/plugins/pgpinline/plugin.c:36
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/inline "
-"plugin was built with"
-msgstr "当前Sylpheed-Claws比编译PGP/Core插件时所采用的版本更新"
-
-#: src/plugins/pgpinline/plugin.c:41
-msgid "Your version of Sylpheed-Claws is too old for the PGP/inline plugin"
-msgstr "你的Sylpheed-Claws版本太老了，无法使用PGP/inline插件的当前版本"
-
-#: src/plugins/pgpinline/plugin.c:57
+#: src/plugins/pgpinline/plugin.c:33

 msgid "PGP/inline"
 msgstr ""
 
 msgid "PGP/inline"
 msgstr ""
 

-#: src/plugins/pgpinline/plugin.c:62
+#: src/plugins/pgpinline/plugin.c:58

 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "
 msgid ""
 "This plugin handles the deprecated Inline method of signing and/or "
 "encrypting mails. You can decrypt mails, verify signatures or sign and "


@@ -7054,21 +7335,11 @@ msgstr ""
 "\n"
 "GPGME的版权归Werner Koch <dd9jn@gnu.org>所有(2001)"
 
 "\n"
 "GPGME的版权归Werner Koch <dd9jn@gnu.org>所有(2001)"
 

-#: src/plugins/pgpmime/plugin.c:35
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin "
-"was built with"
-msgstr "当前Sylpheed-Claws比编译PGP/MIME插件时所采用的版本更新"
-
-#: src/plugins/pgpmime/plugin.c:40
-msgid "Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"
-msgstr "你的Sylpheed-Claws版本太老了，无法使用PGP/MIME插件的当前版本"
-
-#: src/plugins/pgpmime/plugin.c:56
+#: src/plugins/pgpmime/plugin.c:33

 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 
 msgid "PGP/MIME"
 msgstr "PGP/MIME"
 

-#: src/plugins/pgpmime/plugin.c:61
+#: src/plugins/pgpmime/plugin.c:58

 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"
 msgid ""
 "This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
 "mails, verify signatures or sign and encrypt your own mails.\n"


@@ -7093,49 +7364,49 @@ msgstr ""
 "有(2001)\n"
 " "
 
 "有(2001)\n"
 " "
 

-#: src/plugins/pgpmime/pgpmime.c:192
+#: src/plugins/pgpmime/pgpmime.c:201

 msgid "Signature boundary not found."
 msgstr "未找到签名。"
 
 msgid "Signature boundary not found."
 msgstr "未找到签名。"
 

-#: src/plugins/pgpmime/pgpmime.c:310
-#, c-format
-msgid "Couldn't initialize GPG context, %s"
-msgstr "无法初始化GPG，%s"
-
-#: src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpmime/pgpmime.c:362

 msgid "Couldn't parse decrypted file."
 msgstr "无法读入已解密的文件。"
 
 msgid "Couldn't parse decrypted file."
 msgstr "无法读入已解密的文件。"
 

-#: src/plugins/pgpmime/pgpmime.c:358
+#: src/plugins/pgpmime/pgpmime.c:368

 msgid "Couldn't parse decrypted file parts."
 msgstr "无法读取已解密的部分。"
 
 msgid "Couldn't parse decrypted file parts."
 msgstr "无法读取已解密的部分。"
 

-#: src/plugins/pgpmime/pgpmime.c:404 src/plugins/pgpmime/pgpmime.c:443
+#: src/plugins/pgpmime/pgpmime.c:414 src/plugins/pgpmime/pgpmime.c:453

 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "无法创建临时文件: %s"
 
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "无法创建临时文件: %s"
 

-#: src/plugins/pgpmime/pgpmime.c:704
+#: src/plugins/pgpmime/pgpmime.c:723

 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 

-#: src/plugins/spamassassin/spamassassin.c:159
+#: src/plugins/spamassassin/spamassassin.c:75
+#: src/plugins/spamassassin/spamassassin_gtk.c:549
+msgid "SpamAssassin"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin.c:161

 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin插件无法连接到spamd服务器.\n"
 
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin插件无法连接到spamd服务器.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:175
+#: src/plugins/spamassassin/spamassassin.c:177

 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin插件过滤失败。\n"
 
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin插件过滤失败。\n"
 

-#: src/plugins/spamassassin/spamassassin.c:201
+#: src/plugins/spamassassin/spamassassin.c:203

 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin插件已经被设置为禁用.\n"
 
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin插件已经被设置为禁用.\n"
 

-#: src/plugins/spamassassin/spamassassin.c:206
+#: src/plugins/spamassassin/spamassassin.c:208

 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: 正在过滤邮件..."
 
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: 正在过滤邮件..."
 

-#: src/plugins/spamassassin/spamassassin.c:275
+#: src/plugins/spamassassin/spamassassin.c:277

 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "


@@ -7144,37 +7415,21 @@ msgstr ""
 "SpamAssassin无法过滤邮件，因为无法连接上spamd服务程序。请确定该服务器已经启动"
 "并可访问。"
 
 "SpamAssassin无法过滤邮件，因为无法连接上spamd服务程序。请确定该服务器已经启动"
 "并可访问。"
 

-#: src/plugins/spamassassin/spamassassin.c:334
-msgid ""
-"Sylpheed-Claws needs network access in order to feed this mail(s) to the "
-"remote learner."
-msgstr ""
-"Sylpheed-Claws需要访问网络才能将此邮件的内容反馈给远端的垃圾邮件识别器。"
-
-#: src/plugins/spamassassin/spamassassin.c:469
+#: src/plugins/spamassassin/spamassassin.c:336

 msgid ""
 msgid ""

-"Your version of Sylpheed-Claws is newer than the version the SpamAssassin "
-"plugin was built with"
-msgstr "当前Sylpheed-Claws比编译SpamAssassin插件时所采用的版本更新"
+"Claws Mail needs network access in order to feed this mail(s) to the remote "
+"learner."
+msgstr "Claws Mail需要访问网络才能将此邮件的内容反馈给远端的垃圾邮件识别器。"

 
 

-#: src/plugins/spamassassin/spamassassin.c:474
-msgid "Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"
-msgstr "你的Sylpheed-Claws版本太老了，无法使用SpamAssassin插件的当前版本"
-
-#: src/plugins/spamassassin/spamassassin.c:483
+#: src/plugins/spamassassin/spamassassin.c:479

 msgid "Failed to get username"
 msgstr "获取用户名失败"
 
 msgid "Failed to get username"
 msgstr "获取用户名失败"
 

-#: src/plugins/spamassassin/spamassassin.c:495
+#: src/plugins/spamassassin/spamassassin.c:491

 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin插件已经加载，但用户选择了禁用。\n"
 
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin插件已经加载，但用户选择了禁用。\n"
 

-#: src/plugins/spamassassin/spamassassin.c:523
-#: src/plugins/spamassassin/spamassassin_gtk.c:549
-msgid "SpamAssassin"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin.c:528
+#: src/plugins/spamassassin/spamassassin.c:524

 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "


@@ -7196,11 +7451,11 @@ msgstr ""
 "\n"
 "相关选项可以在'/配置/偏好/插件/SpamAssassin'中设置"
 
 "\n"
 "相关选项可以在'/配置/偏好/插件/SpamAssassin'中设置"
 

-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:555

 msgid "Spam detection"
 msgstr "垃圾邮件检测"
 
 msgid "Spam detection"
 msgstr "垃圾邮件检测"
 

-#: src/plugins/spamassassin/spamassassin.c:560
+#: src/plugins/spamassassin/spamassassin.c:556

 msgid "Spam learning"
 msgstr "学习识别能力"
 
 msgid "Spam learning"
 msgstr "学习识别能力"
 


@@ -7271,6 +7526,7 @@ msgid ""
 msgstr "允许垃圾邮件检查的最大时限。超过此时间后将退出检查。"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194
 msgstr "允许垃圾邮件检查的最大时限。超过此时间后将退出检查。"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:194

+#: src/prefs_summaries.c:900

 msgid "seconds"
 msgstr "秒"
 
 msgid "seconds"
 msgstr "秒"
 


@@ -7292,66 +7548,60 @@ msgstr "用于保存垃圾邮件的文件夹，不设置时将缺省使用垃圾
 msgid "Click this button to select a folder for storing spam"
 msgstr "点击此按钮选择用于存放垃圾邮件的文件夹"
 
 msgid "Click this button to select a folder for storing spam"
 msgstr "点击此按钮选择用于存放垃圾邮件的文件夹"
 

-#: src/plugins/trayicon/trayicon.c:101
+#: src/plugins/trayicon/trayicon.c:59 src/plugins/trayicon/trayicon.c:497
+msgid "Trayicon"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon.c:106

 msgid "/_Get Mail"
 msgstr "/收信(_G)"
 
 msgid "/_Get Mail"
 msgstr "/收信(_G)"
 

-#: src/plugins/trayicon/trayicon.c:103
+#: src/plugins/trayicon/trayicon.c:108

 msgid "/_Email"
 msgstr "/写新邮件(_E)"
 
 msgid "/_Email"
 msgstr "/写新邮件(_E)"
 

-#: src/plugins/trayicon/trayicon.c:104
+#: src/plugins/trayicon/trayicon.c:109
+msgid "/_Email from account"
+msgstr "/账户邮件(_E)"
+
+#: src/plugins/trayicon/trayicon.c:111

 msgid "/Open A_ddressbook"
 msgstr "/打开地址簿(_d)"
 
 msgid "/Open A_ddressbook"
 msgstr "/打开地址簿(_d)"
 

-#: src/plugins/trayicon/trayicon.c:106
+#: src/plugins/trayicon/trayicon.c:113

 msgid "/_Work Offline"
 msgstr "/脱机工作(_W)"
 
 msgid "/_Work Offline"
 msgstr "/脱机工作(_W)"
 

-#: src/plugins/trayicon/trayicon.c:108
-msgid "/E_xit Sylpheed-Claws"
-msgstr "/退出 Sylpheed-Claws(_x)"
+#: src/plugins/trayicon/trayicon.c:115
+msgid "/E_xit Claws Mail"
+msgstr "/退出 Claws Mail(_x)"

 
 

-#: src/plugins/trayicon/trayicon.c:162
+#: src/plugins/trayicon/trayicon.c:204

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封"
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封"
 

-#: src/plugins/trayicon/trayicon.c:236
+#: src/plugins/trayicon/trayicon.c:278

 msgid "/Work Offline"
 msgstr "/脱机工作"
 
 msgid "/Work Offline"
 msgstr "/脱机工作"
 

-#: src/plugins/trayicon/trayicon.c:239
+#: src/plugins/trayicon/trayicon.c:281

 msgid "/Get Mail"
 msgstr "/收信"
 
 msgid "/Get Mail"
 msgstr "/收信"
 

-#: src/plugins/trayicon/trayicon.c:315
-msgid ""
-"Your version of Sylpheed-Claws is newer than the version the Trayicon plugin "
-"was built with"
-msgstr "当前Sylpheed-Claws比编译Trayicon插件时所采用的版本更新"
-
-#: src/plugins/trayicon/trayicon.c:320
-msgid "Your version of Sylpheed-Claws is too old for the Trayicon plugin"
-msgstr "你的Sylpheed-Claws版本太老了，无法使用Trayicon插件的当前版本"
-
-#: src/plugins/trayicon/trayicon.c:326
+#: src/plugins/trayicon/trayicon.c:361

 msgid "Failed to register folder item update hook"
 msgstr "注册folder item update hook失败"
 
 msgid "Failed to register folder item update hook"
 msgstr "注册folder item update hook失败"
 

-#: src/plugins/trayicon/trayicon.c:332
+#: src/plugins/trayicon/trayicon.c:367

 msgid "Failed to register folder update hook"
 msgstr "注册folder update hook失败"
 
 msgid "Failed to register folder update hook"
 msgstr "注册folder update hook失败"
 

-#: src/plugins/trayicon/trayicon.c:338
+#: src/plugins/trayicon/trayicon.c:373 src/plugins/trayicon/trayicon.c:379

 msgid "Failed to register offline switch hook"
 msgstr "注册离线开关钩子失败"
 
 msgid "Failed to register offline switch hook"
 msgstr "注册离线开关钩子失败"
 

-#: src/plugins/trayicon/trayicon.c:367 src/plugins/trayicon/trayicon.c:449
-msgid "Trayicon"
-msgstr ""
-
-#: src/plugins/trayicon/trayicon.c:372
+#: src/plugins/trayicon/trayicon.c:415

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -7364,7 +7614,7 @@ msgstr ""
 "如果你没有未读的邮件，该图标将是一个空邮箱，否则则是含有邮件图样。提示信息将"
 "能够显示新邮件、未读邮件的数量和邮件总数。"
 
 "如果你没有未读的邮件，该图标将是一个空邮箱，否则则是含有邮件图样。提示信息将"
 "能够显示新邮件、未读邮件的数量和邮件总数。"
 

-#: src/plugins/trayicon/trayicon.c:426
+#: src/plugins/trayicon/trayicon.c:474

 msgid "Exit this program?"
 msgstr "退出本程序？"
 
 msgid "Exit this program?"
 msgstr "退出本程序？"
 


@@ -7423,12 +7673,12 @@ msgstr "POP3会话中出现错误\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP命令不被支持\n"
 
 msgid "TOP command unsupported\n"
 msgstr "TOP命令不被支持\n"
 

-#: src/prefs_account.c:233 src/prefs_account.c:1454 src/prefs_account.c:2137
-#: src/wizard.c:1017
+#: src/prefs_account.c:233 src/prefs_account.c:1461 src/prefs_account.c:2145
+#: src/wizard.c:1122

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:236 src/prefs_account.c:1580 src/prefs_account.c:2154
+#: src/prefs_account.c:236 src/prefs_account.c:1587 src/prefs_account.c:2162

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 


@@ -7436,7 +7686,7 @@ msgstr "IMAP4"
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:238 src/wizard.c:1027
+#: src/prefs_account.c:238 src/wizard.c:1132

 msgid "Local mbox file"
 msgstr "本地mbox文件"
 
 msgid "Local mbox file"
 msgstr "本地mbox文件"
 


@@ -7444,166 +7694,166 @@ msgstr "本地mbox文件"
 msgid "None (SMTP only)"
 msgstr "无 (仅SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "无 (仅SMTP)"
 

-#: src/prefs_account.c:718
+#: src/prefs_account.c:725

 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 

-#: src/prefs_account.c:991
+#: src/prefs_account.c:998

 msgid "Preferences for new account"
 msgstr "设置新帐号"
 
 msgid "Preferences for new account"
 msgstr "设置新帐号"
 

-#: src/prefs_account.c:993
+#: src/prefs_account.c:1000

 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帐号设置"
 
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帐号设置"
 

-#: src/prefs_account.c:1028
+#: src/prefs_account.c:1035

 msgid "_Basic"
 msgstr "基本设置(_B)"
 
 msgid "_Basic"
 msgstr "基本设置(_B)"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1037

 msgid "_Receive"
 msgstr "接收(_R)"
 
 msgid "_Receive"
 msgstr "接收(_R)"
 

-#: src/prefs_account.c:1034
+#: src/prefs_account.c:1041

 msgid "Co_mpose"
 msgstr "撰写(_m)"
 
 msgid "Co_mpose"
 msgstr "撰写(_m)"
 

-#: src/prefs_account.c:1036
+#: src/prefs_account.c:1043

 msgid "_Privacy"
 msgstr "隐私(_P)"
 
 msgid "_Privacy"
 msgstr "隐私(_P)"
 

-#: src/prefs_account.c:1039
+#: src/prefs_account.c:1046

 msgid "SS_L"
 msgstr "SS_L"
 
 msgid "SS_L"
 msgstr "SS_L"
 

-#: src/prefs_account.c:1042
+#: src/prefs_account.c:1049

 msgid "A_dvanced"
 msgstr "高级(_d)"
 
 msgid "A_dvanced"
 msgstr "高级(_d)"
 

-#: src/prefs_account.c:1100
+#: src/prefs_account.c:1107

 msgid "Name of account"
 msgstr "帐号名称"
 
 msgid "Name of account"
 msgstr "帐号名称"
 

-#: src/prefs_account.c:1109
+#: src/prefs_account.c:1116

 msgid "Set as default"
 msgstr "设为缺省帐号"
 
 msgid "Set as default"
 msgstr "设为缺省帐号"
 

-#: src/prefs_account.c:1113
+#: src/prefs_account.c:1120

 msgid "Personal information"
 msgstr "个人资料"
 
 msgid "Personal information"
 msgstr "个人资料"
 

-#: src/prefs_account.c:1122
+#: src/prefs_account.c:1129

 msgid "Full name"
 msgstr "全名"
 
 msgid "Full name"
 msgstr "全名"
 

-#: src/prefs_account.c:1128
+#: src/prefs_account.c:1135

 msgid "Mail address"
 msgstr "邮件地址"
 
 msgid "Mail address"
 msgstr "邮件地址"
 

-#: src/prefs_account.c:1134
+#: src/prefs_account.c:1141

 msgid "Organization"
 msgstr "组织"
 
 msgid "Organization"
 msgstr "组织"
 

-#: src/prefs_account.c:1158
+#: src/prefs_account.c:1165

 msgid "Server information"
 msgstr "服务器信息"
 
 msgid "Server information"
 msgstr "服务器信息"
 

-#: src/prefs_account.c:1198 src/wizard.c:1106
+#: src/prefs_account.c:1205 src/wizard.c:1216

 msgid ""
 msgid ""

-"<span weight=\"bold\">Warning: this version of Sylpheed-Claws\n"
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"

 "has been built without IMAP support.</span>"
 msgstr ""
 "has been built without IMAP support.</span>"
 msgstr ""

-"<span weight=\"bold\">警告: 当前Sylpheed-Claws\n"
+"<span weight=\"bold\">警告: 当前的Claws Mail\n"

 "编译时没有启用IMAP支持。</span>"
 
 "编译时没有启用IMAP支持。</span>"
 

-#: src/prefs_account.c:1227
+#: src/prefs_account.c:1234

 msgid "This server requires authentication"
 msgstr "服务器需要鉴权"
 
 msgid "This server requires authentication"
 msgstr "服务器需要鉴权"
 

-#: src/prefs_account.c:1234
+#: src/prefs_account.c:1241

 msgid "Authenticate on connect"
 msgstr "连接时鉴权"
 
 msgid "Authenticate on connect"
 msgstr "连接时鉴权"
 

-#: src/prefs_account.c:1279
+#: src/prefs_account.c:1286

 msgid "News server"
 msgstr "新闻服务器"
 
 msgid "News server"
 msgstr "新闻服务器"
 

-#: src/prefs_account.c:1285
+#: src/prefs_account.c:1292

 msgid "Server for receiving"
 msgstr "接收服务器"
 
 msgid "Server for receiving"
 msgstr "接收服务器"
 

-#: src/prefs_account.c:1291
+#: src/prefs_account.c:1298

 msgid "Local mailbox"
 msgstr "本地邮箱"
 
 msgid "Local mailbox"
 msgstr "本地邮箱"
 

-#: src/prefs_account.c:1298
+#: src/prefs_account.c:1305

 msgid "SMTP server (send)"
 msgstr "SMTP 服务器(发送)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP 服务器(发送)"
 

-#: src/prefs_account.c:1306
+#: src/prefs_account.c:1313

 msgid "Use mail command rather than SMTP server"
 msgstr "使用mail命令而不是SMTP服务器"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "使用mail命令而不是SMTP服务器"
 

-#: src/prefs_account.c:1315
+#: src/prefs_account.c:1322

 msgid "command to send mails"
 msgstr "发送邮件的命令"
 
 msgid "command to send mails"
 msgstr "发送邮件的命令"
 

-#: src/prefs_account.c:1322 src/prefs_account.c:1771
+#: src/prefs_account.c:1329 src/prefs_account.c:1779

 msgid "User ID"
 msgstr "用户ID"
 
 msgid "User ID"
 msgstr "用户ID"
 

-#: src/prefs_account.c:1328 src/prefs_account.c:1780
+#: src/prefs_account.c:1335 src/prefs_account.c:1788

 msgid "Password"
 msgstr "密码"
 
 msgid "Password"
 msgstr "密码"
 

-#: src/prefs_account.c:1421
+#: src/prefs_account.c:1428

 msgid "Local"
 msgstr "本机"
 
 msgid "Local"
 msgstr "本机"
 

-#: src/prefs_account.c:1432 src/prefs_account.c:1527
+#: src/prefs_account.c:1439 src/prefs_account.c:1534

 msgid "Default inbox"
 msgstr "缺省收信夹"
 
 msgid "Default inbox"
 msgstr "缺省收信夹"
 

-#: src/prefs_account.c:1439 src/prefs_account.c:1447 src/prefs_account.c:1534
-#: src/prefs_account.c:1542
+#: src/prefs_account.c:1446 src/prefs_account.c:1454 src/prefs_account.c:1541
+#: src/prefs_account.c:1549

 msgid "Unfiltered messages will be stored in this folder"
 msgstr "未被过滤的邮件将放入该文件夹"
 
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "未被过滤的邮件将放入该文件夹"
 

-#: src/prefs_account.c:1444 src/prefs_account.c:1539 src/prefs_account.c:1941
+#: src/prefs_account.c:1451 src/prefs_account.c:1546 src/prefs_account.c:1949

 msgid "Bro_wse"
 msgstr "浏览(_w)"
 
 msgid "Bro_wse"
 msgstr "浏览(_w)"
 

-#: src/prefs_account.c:1462
+#: src/prefs_account.c:1469

 msgid "Use secure authentication (APOP)"
 msgstr "采用安全鉴权(APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "采用安全鉴权(APOP)"
 

-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1472

 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 
 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 

-#: src/prefs_account.c:1476
+#: src/prefs_account.c:1483

 msgid "Remove after"
 msgstr "删除于"
 
 msgid "Remove after"
 msgstr "删除于"
 

-#: src/prefs_account.c:1485
+#: src/prefs_account.c:1492

 msgid "0 days: remove immediately"
 msgstr "(0 天: 立即删除)"
 
 msgid "0 days: remove immediately"
 msgstr "(0 天: 立即删除)"
 

-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1496

 msgid "days"
 msgstr "天后"
 
 msgid "days"
 msgstr "天后"
 

-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1503

 msgid "Download all messages on server"
 msgstr "下载服务器上所有邮件"
 
 msgid "Download all messages on server"
 msgstr "下载服务器上所有邮件"
 

-#: src/prefs_account.c:1502
+#: src/prefs_account.c:1509

 msgid "Receive size limit"
 msgstr "邮件大小限制"
 
 msgid "Receive size limit"
 msgstr "邮件大小限制"
 

-#: src/prefs_account.c:1505
+#: src/prefs_account.c:1512

 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."


@@ -7611,279 +7861,283 @@ msgstr ""
 "大小超过此限制的邮件只会被部分收取，在你查看它的时候可以选择是否要全部收取或"
 "者删除。"
 
 "大小超过此限制的邮件只会被部分收取，在你查看它的时候可以选择是否要全部收取或"
 "者删除。"
 

-#: src/prefs_account.c:1515
+#: src/prefs_account.c:1522

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1549 src/prefs_account.c:2171
+#: src/prefs_account.c:1556 src/prefs_account.c:2179

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1561
+#: src/prefs_account.c:1568

 msgid "Maximum number of articles to download"
 msgstr "帖子下载最大数量"
 
 msgid "Maximum number of articles to download"
 msgstr "帖子下载最大数量"
 

-#: src/prefs_account.c:1573
+#: src/prefs_account.c:1580

 msgid "unlimited if 0 is specified"
 msgstr "如果设为0为不作限制"
 
 msgid "unlimited if 0 is specified"
 msgstr "如果设为0为不作限制"
 

-#: src/prefs_account.c:1591 src/prefs_account.c:1741
+#: src/prefs_account.c:1598 src/prefs_account.c:1749

 msgid "Authentication method"
 msgstr "鉴权方式"
 
 msgid "Authentication method"
 msgstr "鉴权方式"
 

-#: src/prefs_account.c:1601 src/prefs_account.c:1751 src/prefs_send.c:273
+#: src/prefs_account.c:1608 src/prefs_account.c:1759 src/prefs_send.c:273

 msgid "Automatic"
 msgstr "自动"
 
 msgid "Automatic"
 msgstr "自动"
 

-#: src/prefs_account.c:1612
+#: src/prefs_account.c:1620

 msgid "IMAP server directory"
 msgstr "IMAP服务器目录:"
 
 msgid "IMAP server directory"
 msgstr "IMAP服务器目录:"
 

-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1624

 msgid "(usually empty)"
 msgstr "(一般可保持为空)"
 
 msgid "(usually empty)"
 msgstr "(一般可保持为空)"
 

-#: src/prefs_account.c:1626
+#: src/prefs_account.c:1634

 msgid "Filter messages on receiving"
 msgstr "接收邮件时进行过滤"
 
 msgid "Filter messages on receiving"
 msgstr "接收邮件时进行过滤"
 

-#: src/prefs_account.c:1630
+#: src/prefs_account.c:1638

 msgid "'Get Mail' checks for new messages on this account"
 msgstr "`全部收取'包含本帐户的新邮件"
 
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "`全部收取'包含本帐户的新邮件"
 

-#: src/prefs_account.c:1692 src/prefs_customheader.c:205
+#: src/prefs_account.c:1700 src/prefs_customheader.c:205

 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "邮件头"
 
 #: src/prefs_matcher.c:162
 msgid "Header"
 msgstr "邮件头"
 

-#: src/prefs_account.c:1699
+#: src/prefs_account.c:1707

 msgid "Generate Message-ID"
 msgstr "生成Message-ID"
 
 msgid "Generate Message-ID"
 msgstr "生成Message-ID"
 

-#: src/prefs_account.c:1706
+#: src/prefs_account.c:1714

 msgid "Add user-defined header"
 msgstr "添加自定义消息头"
 
 msgid "Add user-defined header"
 msgstr "添加自定义消息头"
 

-#: src/prefs_account.c:1718
+#: src/prefs_account.c:1726

 msgid "Authentication"
 msgstr "鉴权"
 
 msgid "Authentication"
 msgstr "鉴权"
 

-#: src/prefs_account.c:1726
+#: src/prefs_account.c:1734

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP鉴权 (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP鉴权 (SMTP AUTH)"
 

-#: src/prefs_account.c:1802
+#: src/prefs_account.c:1810

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果你保持这几项为空，将采用接收邮件的用户ID和口令。"
 
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果你保持这几项为空，将采用接收邮件的用户ID和口令。"
 

-#: src/prefs_account.c:1813
+#: src/prefs_account.c:1821

 msgid "Authenticate with POP3 before sending"
 msgstr "发送之前采用POP3进行鉴权"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "发送之前采用POP3进行鉴权"
 

-#: src/prefs_account.c:1828
+#: src/prefs_account.c:1836

 msgid "POP authentication timeout: "
 msgstr "POP鉴权超时限制"
 
 msgid "POP authentication timeout: "
 msgstr "POP鉴权超时限制"
 

-#: src/prefs_account.c:1837
+#: src/prefs_account.c:1845

 msgid "minutes"
 msgstr "分钟"
 
 msgid "minutes"
 msgstr "分钟"
 

-#: src/prefs_account.c:1882 src/prefs_account.c:1933
+#: src/prefs_account.c:1890 src/prefs_account.c:1941

 msgid "Signature"
 msgstr "签名"
 
 msgid "Signature"
 msgstr "签名"
 

-#: src/prefs_account.c:1890
+#: src/prefs_account.c:1898

 msgid "Insert signature automatically"
 msgstr "自动插入签名"
 
 msgid "Insert signature automatically"
 msgstr "自动插入签名"
 

-#: src/prefs_account.c:1895
+#: src/prefs_account.c:1903

 msgid "Signature separator"
 msgstr "签名分隔符"
 
 msgid "Signature separator"
 msgstr "签名分隔符"
 

-#: src/prefs_account.c:1920
+#: src/prefs_account.c:1928

 msgid "Command output"
 msgstr "命令输出"
 
 msgid "Command output"
 msgstr "命令输出"
 

-#: src/prefs_account.c:1953
+#: src/prefs_account.c:1961

 msgid "Automatically set the following addresses"
 msgstr "自动设置如下地址"
 
 msgid "Automatically set the following addresses"
 msgstr "自动设置如下地址"
 

-#: src/prefs_account.c:1962 src/prefs_filtering_action.c:1083
+#: src/prefs_account.c:1970 src/prefs_filtering_action.c:1083

 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "回信地址"
 
 #: src/prefs_matcher.c:159 src/prefs_matcher.c:1869 src/prefs_template.c:188
 #: src/quote_fmt.c:49
 msgid "Cc"
 msgstr "回信地址"
 

-#: src/prefs_account.c:1975 src/prefs_template.c:189
+#: src/prefs_account.c:1983 src/prefs_template.c:189

 msgid "Bcc"
 msgstr "抄送地址"
 
 msgid "Bcc"
 msgstr "抄送地址"
 

-#: src/prefs_account.c:1988
+#: src/prefs_account.c:1996

 msgid "Reply-To"
 msgstr "回信地址"
 
 msgid "Reply-To"
 msgstr "回信地址"
 

-#: src/prefs_account.c:2040
+#: src/prefs_account.c:2048

 msgid "Default privacy system"
 msgstr "缺省隐私系统"
 
 msgid "Default privacy system"
 msgstr "缺省隐私系统"
 

-#: src/prefs_account.c:2049
+#: src/prefs_account.c:2057

 msgid "Always sign messages"
 msgstr "总是添加签名"
 
 msgid "Always sign messages"
 msgstr "总是添加签名"
 

-#: src/prefs_account.c:2051
+#: src/prefs_account.c:2059

 msgid "Always encrypt messages"
 msgstr "总是加密邮件"
 
 msgid "Always encrypt messages"
 msgstr "总是加密邮件"
 

-#: src/prefs_account.c:2053
+#: src/prefs_account.c:2061

 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "回复加密邮件时也采用加密模式"
 
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "回复加密邮件时也采用加密模式"
 

-#: src/prefs_account.c:2056
+#: src/prefs_account.c:2064

 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "采用自己和收件人的密钥进行双重加密"
 
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "采用自己和收件人的密钥进行双重加密"
 

-#: src/prefs_account.c:2058
+#: src/prefs_account.c:2066

 msgid "Save sent encrypted messages as clear text"
 msgstr "将发出的加密邮件以明文保存"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "将发出的加密邮件以明文保存"
 

-#: src/prefs_account.c:2145 src/prefs_account.c:2162 src/prefs_account.c:2178
+#: src/prefs_account.c:2153 src/prefs_account.c:2170 src/prefs_account.c:2186

 msgid "Don't use SSL"
 msgstr "不采用SSL"
 
 msgid "Don't use SSL"
 msgstr "不采用SSL"
 

-#: src/prefs_account.c:2148
+#: src/prefs_account.c:2156

 msgid "Use SSL for POP3 connection"
 msgstr "用SSL进行POP3连接"
 
 msgid "Use SSL for POP3 connection"
 msgstr "用SSL进行POP3连接"
 

-#: src/prefs_account.c:2151 src/prefs_account.c:2168 src/prefs_account.c:2203
+#: src/prefs_account.c:2159 src/prefs_account.c:2176 src/prefs_account.c:2211

 msgid "Use STARTTLS command to start SSL session"
 msgstr "用STARTTLS命令开始SSL会话"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "用STARTTLS命令开始SSL会话"
 

-#: src/prefs_account.c:2165
+#: src/prefs_account.c:2173

 msgid "Use SSL for IMAP4 connection"
 msgstr "用SSL进行IMAP连接"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "用SSL进行IMAP连接"
 

-#: src/prefs_account.c:2187
+#: src/prefs_account.c:2195

 msgid "Use SSL for NNTP connection"
 msgstr "用SSL进行NNTP连接"
 
 msgid "Use SSL for NNTP connection"
 msgstr "用SSL进行NNTP连接"
 

-#: src/prefs_account.c:2189
+#: src/prefs_account.c:2197

 msgid "Send (SMTP)"
 msgstr "发送 (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "发送 (SMTP)"
 

-#: src/prefs_account.c:2197
+#: src/prefs_account.c:2205

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "不采用SSL (但在必要的情况下将启用STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "不采用SSL (但在必要的情况下将启用STARTTLS)"
 

-#: src/prefs_account.c:2200
+#: src/prefs_account.c:2208

 msgid "Use SSL for SMTP connection"
 msgstr "用SSL进行SMTP连接"
 
 msgid "Use SSL for SMTP connection"
 msgstr "用SSL进行SMTP连接"
 

-#: src/prefs_account.c:2211
+#: src/prefs_account.c:2219

 msgid "Use non-blocking SSL"
 msgstr "采用非阻塞式SSL"
 
 msgid "Use non-blocking SSL"
 msgstr "采用非阻塞式SSL"
 

-#: src/prefs_account.c:2223
+#: src/prefs_account.c:2231

 msgid "Turn this off if you have SSL connection problems"
 msgstr "(如果你在SSL连接上碰到问题请关闭本项试试)"
 
 msgid "Turn this off if you have SSL connection problems"
 msgstr "(如果你在SSL连接上碰到问题请关闭本项试试)"
 

-#: src/prefs_account.c:2349
+#: src/prefs_account.c:2357

 msgid "SMTP port"
 msgstr "SMTP端口"
 
 msgid "SMTP port"
 msgstr "SMTP端口"
 

-#: src/prefs_account.c:2355
+#: src/prefs_account.c:2363

 msgid "POP3 port"
 msgstr "POP3端口"
 
 msgid "POP3 port"
 msgstr "POP3端口"
 

-#: src/prefs_account.c:2361
+#: src/prefs_account.c:2369

 msgid "IMAP4 port"
 msgstr "IMAP4端口"
 
 msgid "IMAP4 port"
 msgstr "IMAP4端口"
 

-#: src/prefs_account.c:2367
+#: src/prefs_account.c:2375

 msgid "NNTP port"
 msgstr "NNTP端口"
 
 msgid "NNTP port"
 msgstr "NNTP端口"
 

-#: src/prefs_account.c:2372
+#: src/prefs_account.c:2380

 msgid "Domain name"
 msgstr "域名"
 
 msgid "Domain name"
 msgstr "域名"
 

-#: src/prefs_account.c:2382
+#: src/prefs_account.c:2390

 msgid "Use command to communicate with server"
 msgstr "用如下命令与服务器通讯"
 
 msgid "Use command to communicate with server"
 msgstr "用如下命令与服务器通讯"
 

-#: src/prefs_account.c:2390
+#: src/prefs_account.c:2398

 msgid "Mark cross-posted messages as read and color:"
 msgstr "将交叉投递(cross-posted)的邮件表示为已读和彩色:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "将交叉投递(cross-posted)的邮件表示为已读和彩色:"
 

-#: src/prefs_account.c:2437
+#: src/prefs_account.c:2445

 msgid "Browse"
 msgstr "浏览"
 
 msgid "Browse"
 msgstr "浏览"
 

-#: src/prefs_account.c:2450
+#: src/prefs_account.c:2458

 msgid "Put sent messages in"
 msgstr "将已发送邮件存放到"
 
 msgid "Put sent messages in"
 msgstr "将已发送邮件存放到"
 

-#: src/prefs_account.c:2452
+#: src/prefs_account.c:2460

 msgid "Put queued messages in"
 msgstr "将待发送的邮件存放到"
 
 msgid "Put queued messages in"
 msgstr "将待发送的邮件存放到"
 

-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2462

 msgid "Put draft messages in"
 msgstr "将邮件草稿存放到"
 
 msgid "Put draft messages in"
 msgstr "将邮件草稿存放到"
 

-#: src/prefs_account.c:2456
+#: src/prefs_account.c:2464

 msgid "Put deleted messages in"
 msgstr "将已删除的邮件存放到"
 
 msgid "Put deleted messages in"
 msgstr "将已删除的邮件存放到"
 

-#: src/prefs_account.c:2499
+#: src/prefs_account.c:2507

 msgid "Account name is not entered."
 msgstr "未输入帐户名称。"
 
 msgid "Account name is not entered."
 msgstr "未输入帐户名称。"
 

-#: src/prefs_account.c:2503
+#: src/prefs_account.c:2511

 msgid "Mail address is not entered."
 msgstr "未输入邮件地址。"
 
 msgid "Mail address is not entered."
 msgstr "未输入邮件地址。"
 

-#: src/prefs_account.c:2510
+#: src/prefs_account.c:2518

 msgid "SMTP server is not entered."
 msgstr "未输入SMTP服务器"
 
 msgid "SMTP server is not entered."
 msgstr "未输入SMTP服务器"
 

-#: src/prefs_account.c:2515
+#: src/prefs_account.c:2523

 msgid "User ID is not entered."
 msgstr "未输入用户ID"
 
 msgid "User ID is not entered."
 msgstr "未输入用户ID"
 

-#: src/prefs_account.c:2520
+#: src/prefs_account.c:2528

 msgid "POP3 server is not entered."
 msgstr "未输入POP3服务器"
 
 msgid "POP3 server is not entered."
 msgstr "未输入POP3服务器"
 

-#: src/prefs_account.c:2525
+#: src/prefs_account.c:2535
+msgid "The default inbox folder doesn't exist."
+msgstr "缺省的收件夹不存在。"
+
+#: src/prefs_account.c:2541

 msgid "IMAP4 server is not entered."
 msgstr "未输入IMAP4服务器"
 
 msgid "IMAP4 server is not entered."
 msgstr "未输入IMAP4服务器"
 

-#: src/prefs_account.c:2530
+#: src/prefs_account.c:2546

 msgid "NNTP server is not entered."
 msgstr "尚未输入NNTP服务器"
 
 msgid "NNTP server is not entered."
 msgstr "尚未输入NNTP服务器"
 

-#: src/prefs_account.c:2536
+#: src/prefs_account.c:2552

 msgid "local mailbox filename is not entered."
 msgstr "尚未输入本地邮箱名称"
 
 msgid "local mailbox filename is not entered."
 msgstr "尚未输入本地邮箱名称"
 

-#: src/prefs_account.c:2542
+#: src/prefs_account.c:2558

 msgid "mail command is not entered."
 msgstr "尚未输入邮件命令"
 
 msgid "mail command is not entered."
 msgstr "尚未输入邮件命令"
 

-#: src/prefs_account.c:2607
+#: src/prefs_account.c:2623

 msgid "Select signature file"
 msgstr "选择签名文件"
 
 msgid "Select signature file"
 msgstr "选择签名文件"
 

-#: src/prefs_account.c:2700
+#: src/prefs_account.c:2716

 msgid "Protocol:"
 msgstr "通讯协议:"
 
 msgid "Protocol:"
 msgstr "通讯协议:"
 

-#: src/prefs_account.c:2849
+#: src/prefs_account.c:2869

 #, c-format
 #, c-format

-msgid "Unsupported (%s)"
-msgstr "不支持的 (%s)"
+msgid "%s (plugin not loaded)"
+msgstr "%s (插件未加载)"

 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"
 
 #: src/prefs_actions.c:201
 msgid "Actions configuration"


@@ -7898,7 +8152,7 @@ msgid "Command line"
 msgstr "命令行"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
 msgstr "命令行"
 
 #: src/prefs_actions.c:275 src/prefs_filtering_action.c:493

-#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:260
+#: src/prefs_filtering.c:455 src/prefs_matcher.c:673 src/prefs_template.c:270

 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "替换"
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "替换"


@@ -7911,7 +8165,7 @@ msgstr "说明..."
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811
 #: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
 #: src/prefs_filtering.c:762 src/prefs_filtering.c:764
 #: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:811

-#: src/prefs_template.c:357
+#: src/prefs_template.c:367

 msgid "(New)"
 msgstr "(新建)"
 
 msgid "(New)"
 msgstr "(新建)"
 


@@ -7960,19 +8214,19 @@ msgstr "你真的要删除此动作码? "
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822
 
 #: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
 #: src/prefs_filtering.c:1275 src/prefs_matcher.c:1822

-#: src/prefs_template.c:416 src/prefs_template.c:433
+#: src/prefs_template.c:426 src/prefs_template.c:443

 msgid "Entry not saved"
 msgstr "项目未保存"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
 msgid "Entry not saved"
 msgstr "项目未保存"
 
 #: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254

-#: src/prefs_filtering.c:1276 src/prefs_template.c:417
-#: src/prefs_template.c:434
+#: src/prefs_filtering.c:1276 src/prefs_template.c:427
+#: src/prefs_template.c:444

 msgid "The entry was not saved. Close anyway?"
 msgstr "该项未保存，真的退出？"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824
 msgid "The entry was not saved. Close anyway?"
 msgstr "该项未保存，真的退出？"
 
 #: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
 #: src/prefs_filtering.c:1277 src/prefs_matcher.c:1824

-#: src/prefs_template.c:418 src/prefs_template.c:435
+#: src/prefs_template.c:428 src/prefs_template.c:445

 msgid "+_Continue editing"
 msgstr "+继续编辑(_C)"
 
 msgid "+_Continue editing"
 msgstr "+继续编辑(_C)"
 


@@ -8069,11 +8323,15 @@ msgstr ""
 msgid "Current actions"
 msgstr "当前动作"
 
 msgid "Current actions"
 msgstr "当前动作"
 

-#: src/prefs_common.c:262
+#: src/prefs_common.c:210
+msgid "Hello,\\n"
+msgstr "你好,\\n"
+
+#: src/prefs_common.c:272

 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "于 %d\\n%f 写道:\\n\\n%q"
 
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "于 %d\\n%f 写道:\\n\\n%q"
 

-#: src/prefs_common.c:268
+#: src/prefs_common.c:278

 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"
 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"


@@ -8081,85 +8339,97 @@ msgstr ""
 "\\n\\n===== 转发邮件:\\n\\n?d{日期: %d\\n}?f{发件人: %f\\n}?t{收件人: %t\\n}?"
 "c{抄送: %c\\n}?n{新闻组: %n\\n}?s{主题: %s\\n}\\n\\n%M"
 
 "\\n\\n===== 转发邮件:\\n\\n?d{日期: %d\\n}?f{发件人: %f\\n}?t{收件人: %t\\n}?"
 "c{抄送: %c\\n}?n{新闻组: %n\\n}?s{主题: %s\\n}\\n\\n%M"
 

-#: src/prefs_common.c:353
+#: src/prefs_common.c:363

 msgid "%y/%m/%d(%a) %H:%M"
 msgstr ""
 
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr ""
 

-#: src/prefs_compose_writing.c:106
+#: src/prefs_compose_writing.c:124

 msgid "Automatic account selection"
 msgstr "自动选择帐户"
 
 msgid "Automatic account selection"
 msgstr "自动选择帐户"
 

-#: src/prefs_compose_writing.c:114
+#: src/prefs_compose_writing.c:132

 msgid "when replying"
 msgstr "回信时"
 
 msgid "when replying"
 msgstr "回信时"
 

-#: src/prefs_compose_writing.c:116
+#: src/prefs_compose_writing.c:134

 msgid "when forwarding"
 msgstr "转发时"
 
 msgid "when forwarding"
 msgstr "转发时"
 

-#: src/prefs_compose_writing.c:118
+#: src/prefs_compose_writing.c:136

 msgid "when re-editing"
 msgstr "重新编辑时"
 
 msgid "when re-editing"
 msgstr "重新编辑时"
 

-#: src/prefs_compose_writing.c:120
+#: src/prefs_compose_writing.c:138

 msgid "Forwarding"
 msgstr "转发"
 
 msgid "Forwarding"
 msgstr "转发"
 

-#: src/prefs_compose_writing.c:128 src/prefs_filtering_action.c:160
+#: src/prefs_compose_writing.c:146 src/prefs_filtering_action.c:160

 msgid "Forward as attachment"
 msgstr "以附件形式转发"
 
 msgid "Forward as attachment"
 msgstr "以附件形式转发"
 

-#: src/prefs_compose_writing.c:131
+#: src/prefs_compose_writing.c:149

 msgid "Keep the original 'From' header when redirecting"
 msgstr "重定向时保持原来的发信人"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "重定向时保持原来的发信人"
 

-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:151

 msgid "Editing"
 msgstr "编辑"
 
 msgid "Editing"
 msgstr "编辑"
 

-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:159

 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 

-#: src/prefs_compose_writing.c:148
+#: src/prefs_compose_writing.c:166

 msgid "Autosave message text to Drafts folder every"
 msgstr "自动保存草稿:  每"
 
 msgid "Autosave message text to Drafts folder every"
 msgstr "自动保存草稿:  每"
 

-#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:176 src/prefs_wrapping.c:97

 msgid "characters"
 msgstr "个字符"
 
 msgid "characters"
 msgstr "个字符"
 

-#: src/prefs_compose_writing.c:166
+#: src/prefs_compose_writing.c:184

 msgid "Undo level"
 msgstr "撤销纪录数"
 
 msgid "Undo level"
 msgstr "撤销纪录数"
 

-#: src/prefs_compose_writing.c:179
+#: src/prefs_compose_writing.c:197

 msgid "Reply button invokes mailing list reply"
 msgstr "点击回信按钮时回复给邮件列表"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "点击回信按钮时回复给邮件列表"
 

-#: src/prefs_compose_writing.c:182
+#: src/prefs_compose_writing.c:200

 msgid "When dropping files into the Compose window"
 msgstr "拖放文件到编写邮件窗口时"
 
 msgid "When dropping files into the Compose window"
 msgstr "拖放文件到编写邮件窗口时"
 

-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:208

 msgid "Ask"
 msgstr "询问"
 
 msgid "Ask"
 msgstr "询问"
 

-#: src/prefs_compose_writing.c:191 src/toolbar.c:446
+#: src/prefs_compose_writing.c:209 src/toolbar.c:456

 msgid "Insert"
 msgstr "插入"
 
 msgid "Insert"
 msgstr "插入"
 

-#: src/prefs_compose_writing.c:192 src/toolbar.c:447
+#: src/prefs_compose_writing.c:210 src/toolbar.c:457

 msgid "Attach"
 msgstr "附加文件"
 
 msgid "Attach"
 msgstr "附加文件"
 

-#: src/prefs_compose_writing.c:297 src/prefs_folder_item.c:1118
-#: src/prefs_quote.c:285 src/prefs_spelling.c:401 src/prefs_wrapping.c:144
-#: src/toolbar.c:1511
+#: src/prefs_compose_writing.c:226
+msgid "Use format when composing new messages"
+msgstr "撰写新邮件时使用格式"
+
+#: src/prefs_compose_writing.c:228
+msgid "New message format"
+msgstr "新邮件格式"
+
+#: src/prefs_compose_writing.c:282 src/prefs_quote.c:206
+msgid " Description of symbols... "
+msgstr " 特殊符号说明... "
+
+#: src/prefs_compose_writing.c:402 src/prefs_folder_item.c:1172
+#: src/prefs_quote.c:311 src/prefs_spelling.c:448 src/prefs_wrapping.c:144
+#: src/toolbar.c:1560

 msgid "Compose"
 msgstr "撰写"
 
 msgid "Compose"
 msgstr "撰写"
 

-#: src/prefs_compose_writing.c:298
+#: src/prefs_compose_writing.c:403

 msgid "Writing"
 msgstr "编辑"
 
 msgid "Writing"
 msgstr "编辑"
 


@@ -8303,7 +8573,7 @@ msgid "Copy"
 msgstr "复制"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
 msgstr "复制"
 
 #: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79

-#: src/summaryview.c:2365
+#: src/summaryview.c:2366

 msgid "Mark"
 msgstr "标记"
 
 msgid "Mark"
 msgstr "标记"
 


@@ -8323,7 +8593,7 @@ msgstr "设为已读"
 msgid "Mark as unread"
 msgstr "设为未读"
 
 msgid "Mark as unread"
 msgstr "设为未读"
 

-#: src/prefs_filtering_action.c:159 src/toolbar.c:398 src/toolbar.c:489
+#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499

 msgid "Forward"
 msgstr "转发"
 
 msgid "Forward"
 msgstr "转发"
 


@@ -8332,7 +8602,7 @@ msgid "Redirect"
 msgstr "重新指定"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
 msgstr "重新指定"
 
 #: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429

-#: src/toolbar.c:174 src/toolbar.c:1651
+#: src/toolbar.c:178 src/toolbar.c:1711

 msgid "Execute"
 msgstr "执行"
 
 msgid "Execute"
 msgstr "执行"
 


@@ -8352,7 +8622,7 @@ msgstr "设置积分"
 msgid "Hide"
 msgstr "隐藏"
 
 msgid "Hide"
 msgstr "隐藏"
 

-#: src/prefs_filtering_action.c:167 src/toolbar.c:177
+#: src/prefs_filtering_action.c:167 src/toolbar.c:181

 msgid "Ignore thread"
 msgstr "忽略讨论线索"
 
 msgid "Ignore thread"
 msgstr "忽略讨论线索"
 


@@ -8470,6 +8740,11 @@ msgstr "当前动作列表"
 msgid "Filtering/Processing configuration"
 msgstr "过滤/处理 配置"
 
 msgid "Filtering/Processing configuration"
 msgstr "过滤/处理 配置"
 

+#: src/prefs_filtering.c:250 src/prefs_filtering.c:781
+#: src/prefs_filtering.c:872
+msgid "Filtering Account Menu|All"
+msgstr "全部"
+

 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "条件"
 #: src/prefs_filtering.c:391
 msgid "Condition"
 msgstr "条件"


@@ -8526,7 +8801,8 @@ msgstr ""
 msgid "Hidden columns"
 msgstr "隐藏列"
 
 msgid "Hidden columns"
 msgstr "隐藏列"
 

-#: src/prefs_folder_column.c:280 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:280 src/prefs_summaries.c:797
+#: src/prefs_summaries.c:943 src/prefs_summary_column.c:294

 msgid "Displayed columns"
 msgstr "显示列"
 
 msgid "Displayed columns"
 msgstr "显示列"
 


@@ -8535,17 +8811,16 @@ msgstr "显示列"
 msgid " Use default "
 msgstr "使用缺省值"
 
 msgid " Use default "
 msgstr "使用缺省值"
 

-#: src/prefs_folder_item.c:199 src/prefs_folder_item.c:640
+#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:648

 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 ""
 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 ""

-"<i>这些设置不会保存，因为当前文件夹是一个顶级目录。"
-"但你可以点击\"应用到子文件夹\"按钮，将这些设置保存到当前邮箱的所有子文件夹中去。"
-"</i>"
+"<i>这些设置不会保存，因为当前文件夹是一个顶级目录。但你可以点击\"应用到子文件"
+"夹\"按钮，将这些设置保存到当前邮箱的所有子文件夹中去。</i>"

 
 

-#: src/prefs_folder_item.c:211 src/prefs_folder_item.c:652
+#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:660

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -8553,81 +8828,84 @@ msgstr ""
 "应用于\n"
 "子文件夹"
 
 "应用于\n"
 "子文件夹"
 

-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:238

 msgid "Normal"
 msgstr "普通"
 
 msgid "Normal"
 msgstr "普通"
 

-#: src/prefs_folder_item.c:237
+#: src/prefs_folder_item.c:240

 msgid "Outbox"
 msgstr "发信夹"
 
 msgid "Outbox"
 msgstr "发信夹"
 

-#: src/prefs_folder_item.c:254
+#: src/prefs_folder_item.c:257

 msgid "Folder type"
 msgstr "文件夹类型"
 
 msgid "Folder type"
 msgstr "文件夹类型"
 

-#: src/prefs_folder_item.c:266
-#, fuzzy
+#: src/prefs_folder_item.c:269

 msgid "Simplify Subject RegExp"
 msgstr "简化邮件标题的正则表达式"
 
 msgid "Simplify Subject RegExp"
 msgstr "简化邮件标题的正则表达式"
 

-#: src/prefs_folder_item.c:292
+#: src/prefs_folder_item.c:295

 msgid "Test RegExp"
 msgstr "测试正则表达式"
 
 msgid "Test RegExp"
 msgstr "测试正则表达式"
 

-#: src/prefs_folder_item.c:324
+#: src/prefs_folder_item.c:327

 msgid "Folder chmod"
 msgstr "修改文件夹权限: "
 
 msgid "Folder chmod"
 msgstr "修改文件夹权限: "
 

-#: src/prefs_folder_item.c:350
+#: src/prefs_folder_item.c:353

 msgid "Folder color"
 msgstr "文件夹颜色"
 
 msgid "Folder color"
 msgstr "文件夹颜色"
 

-#: src/prefs_folder_item.c:364 src/prefs_folder_item.c:995
+#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1047

 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "选文件夹的颜色"
 
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "选文件夹的颜色"
 

-#: src/prefs_folder_item.c:381
+#: src/prefs_folder_item.c:384

 msgid "Process at startup"
 msgstr "启动时处理"
 
 msgid "Process at startup"
 msgstr "启动时处理"
 

-#: src/prefs_folder_item.c:395
+#: src/prefs_folder_item.c:398

 msgid "Scan for new mail"
 msgstr "检查新邮件"
 
 msgid "Scan for new mail"
 msgstr "检查新邮件"
 

-#: src/prefs_folder_item.c:408
+#: src/prefs_folder_item.c:411

 msgid "Synchronise for offline use"
 msgstr "同步数据以便离线使用"
 
 msgid "Synchronise for offline use"
 msgstr "同步数据以便离线使用"
 

-#: src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:669

 msgid "Request Return Receipt"
 msgstr "请求回执"
 
 msgid "Request Return Receipt"
 msgstr "请求回执"
 

-#: src/prefs_folder_item.c:676
+#: src/prefs_folder_item.c:684

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgid "Save copy of outgoing messages to this folder instead of Sent"

-msgstr "将发出的邮件保存一份拷贝到此文件夹"
+msgstr "将发出的邮件保存一份复制到此文件夹"

 
 

-#: src/prefs_folder_item.c:689
+#: src/prefs_folder_item.c:697

 msgid "Default To: "
 msgstr "新邮件缺省收件人: "
 
 msgid "Default To: "
 msgstr "新邮件缺省收件人: "
 

-#: src/prefs_folder_item.c:710
+#: src/prefs_folder_item.c:718

 msgid "Default To for replies: "
 msgstr "回复邮件缺省收件人: "
 
 msgid "Default To for replies: "
 msgstr "回复邮件缺省收件人: "
 

-#: src/prefs_folder_item.c:731
+#: src/prefs_folder_item.c:739

 msgid "Default account: "
 msgstr "缺省帐号: "
 
 msgid "Default account: "
 msgstr "缺省帐号: "
 

-#: src/prefs_folder_item.c:782
+#: src/prefs_folder_item.c:790

 msgid "Default dictionary: "
 msgstr "缺省字典: "
 
 msgid "Default dictionary: "
 msgstr "缺省字典: "
 

-#: src/prefs_folder_item.c:1101
+#: src/prefs_folder_item.c:823
+msgid "Default alternate dictionary: "
+msgstr "缺省的备选字典: "
+
+#: src/prefs_folder_item.c:1155

 msgid "General"
 msgstr "一般"
 
 msgid "General"
 msgstr "一般"
 

-#: src/prefs_folder_item.c:1146
+#: src/prefs_folder_item.c:1200

 #, c-format
 msgid "Properties for folder %s"
 msgstr "%s - 文件夹设置"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "%s - 文件夹设置"


@@ -8648,7 +8926,7 @@ msgstr "以不同的字体打印"
 msgid "Message Printing"
 msgstr "打印"
 
 msgid "Message Printing"
 msgstr "打印"
 

-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1078

 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "显示"
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "显示"


@@ -9048,7 +9326,7 @@ msgstr "选择签名的颜色"
 msgid "Signatures"
 msgstr "签名"
 
 msgid "Signatures"
 msgstr "签名"
 

-#: src/prefs_msg_colors.c:376
+#: src/prefs_msg_colors.c:376 src/prefs_summaries.c:761

 msgid "Folder list"
 msgstr "文件夹列表"
 
 msgid "Folder list"
 msgstr "文件夹列表"
 


@@ -9078,7 +9356,7 @@ msgstr "颜色标签"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:448 src/prefs_msg_colors.c:480
 #, c-format

-msgid "Pick color for 'color %d'"
+msgid "Tooltip|Pick color for 'color %d'"

 msgstr "选择颜色 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 msgstr "选择颜色 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing


@@ -9092,7 +9370,7 @@ msgstr "设置'color %d'的文字"
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format
 #. rule name and should not be translated
 #: src/prefs_msg_colors.c:612
 #, c-format

-msgid "Pick color for 'color %d' "
+msgid "Dialog title|Pick color for 'color %d'"

 msgstr "选择颜色 'color %d'"
 
 #: src/prefs_msg_colors.c:621
 msgstr "选择颜色 'color %d'"
 
 #: src/prefs_msg_colors.c:621


@@ -9187,115 +9465,107 @@ msgstr "Socket I/O 超时时间"
 msgid "Never send Return Receipts"
 msgstr "从不请求发送回执"
 
 msgid "Never send Return Receipts"
 msgstr "从不请求发送回执"
 

-#: src/prefs_quote.c:90
+#: src/prefs_quote.c:92

 msgid "Reply will quote by default"
 msgstr "回信时引用原文"
 
 msgid "Reply will quote by default"
 msgstr "回信时引用原文"
 

-#: src/prefs_quote.c:92
+#: src/prefs_quote.c:94

 msgid "Reply format"
 msgstr "回复格式"
 
 msgid "Reply format"
 msgstr "回复格式"
 

-#: src/prefs_quote.c:107 src/prefs_quote.c:149
+#: src/prefs_quote.c:109 src/prefs_quote.c:161

 msgid "Quotation mark"
 msgstr "引文符号"
 
 msgid "Quotation mark"
 msgstr "引文符号"
 

-#: src/prefs_quote.c:134
+#: src/prefs_quote.c:146

 msgid "Forward format"
 msgstr "转发格式"
 
 msgid "Forward format"
 msgstr "转发格式"
 

-#: src/prefs_quote.c:184
-msgid " Description of symbols... "
-msgstr " 特殊符号说明... "
-
-#: src/prefs_quote.c:193
+#: src/prefs_quote.c:215

 msgid "Quotation characters"
 msgstr "引文标识"
 
 msgid "Quotation characters"
 msgstr "引文标识"
 

-#: src/prefs_quote.c:208
+#: src/prefs_quote.c:230

 msgid "Treat these characters as quotation marks: "
 msgstr "将这些字符作为引文标识: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "将这些字符作为引文标识: "
 

-#: src/prefs_quote.c:286
+#: src/prefs_quote.c:312

 msgid "Quoting"
 msgstr "引用"
 
 msgid "Quoting"
 msgstr "引用"
 

-#: src/prefs_receive.c:122
+#: src/prefs_receive.c:121

 msgid "External incorporation program"
 msgstr "用于合并邮件的外部程序"
 
 msgid "External incorporation program"
 msgstr "用于合并邮件的外部程序"
 

-#: src/prefs_receive.c:129
+#: src/prefs_receive.c:128

 msgid "Use external program for receiving mail"
 msgstr "使用外部程序收取邮件"
 
 msgid "Use external program for receiving mail"
 msgstr "使用外部程序收取邮件"
 

-#: src/prefs_receive.c:136
+#: src/prefs_receive.c:135

 msgid "Command"
 msgstr "命令"
 
 msgid "Command"
 msgstr "命令"
 

-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:144

 msgid "Automatic checking"
 msgstr "自动检查"
 
 msgid "Automatic checking"
 msgstr "自动检查"
 

-#: src/prefs_receive.c:156
-msgid "Automatically check for new mail"
+#: src/prefs_receive.c:155
+msgid "Automatically check for new mail every"

 msgstr "自动检查新邮件"
 
 msgstr "自动检查新邮件"
 

-#: src/prefs_receive.c:158
-msgid "every"
-msgstr "每"
-
-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:173

 msgid "Check for new mail on startup"
 msgstr "启动时检查新邮件"
 
 msgid "Check for new mail on startup"
 msgstr "启动时检查新邮件"
 

-#: src/prefs_receive.c:182
+#: src/prefs_receive.c:176

 msgid "Dialogs"
 msgstr "对话框"
 
 msgid "Dialogs"
 msgstr "对话框"
 

-#: src/prefs_receive.c:188
+#: src/prefs_receive.c:182

 msgid "Show receive dialog"
 msgstr "显示收邮件进度对话框"
 
 msgid "Show receive dialog"
 msgstr "显示收邮件进度对话框"
 

-#: src/prefs_receive.c:196 src/prefs_send.c:169 src/prefs_summaries.c:958
+#: src/prefs_receive.c:190 src/prefs_send.c:169 src/prefs_summaries.c:855

 msgid "Always"
 msgstr "总显示"
 
 msgid "Always"
 msgstr "总显示"
 

-#: src/prefs_receive.c:197
+#: src/prefs_receive.c:191

 msgid "Only on manual receiving"
 msgstr "仅手工收取时显示"
 
 msgid "Only on manual receiving"
 msgstr "仅手工收取时显示"
 

-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:205

 msgid "Close receive dialog when finished"
 msgstr "收件完成后关闭收件对话框"
 
 msgid "Close receive dialog when finished"
 msgstr "收件完成后关闭收件对话框"
 

-#: src/prefs_receive.c:214
+#: src/prefs_receive.c:208

 msgid "Don't popup error dialog on receive error"
 msgstr "接收有错误时不要显示错误讯息"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "接收有错误时不要显示错误讯息"
 

-#: src/prefs_receive.c:216
+#: src/prefs_receive.c:210

 msgid "After receiving new mail"
 msgstr "接收完新邮件后"
 
 msgid "After receiving new mail"
 msgstr "接收完新邮件后"
 

-#: src/prefs_receive.c:222
+#: src/prefs_receive.c:216

 msgid "Go to inbox"
 msgstr "转到收信夹"
 
 msgid "Go to inbox"
 msgstr "转到收信夹"
 

-#: src/prefs_receive.c:224
+#: src/prefs_receive.c:218

 msgid "Update all local folders"
 msgstr "更新所有本地文件夹"
 
 msgid "Update all local folders"
 msgstr "更新所有本地文件夹"
 

-#: src/prefs_receive.c:226
+#: src/prefs_receive.c:220

 msgid "Run command"
 msgstr "运行命令"
 
 msgid "Run command"
 msgstr "运行命令"
 

-#: src/prefs_receive.c:235
+#: src/prefs_receive.c:229

 msgid "after automatic check"
 msgstr "自动检查后"
 
 msgid "after automatic check"
 msgstr "自动检查后"
 

-#: src/prefs_receive.c:237
+#: src/prefs_receive.c:231

 msgid "after manual check"
 msgstr "手工检查后"
 
 msgid "after manual check"
 msgstr "手工检查后"
 

-#: src/prefs_receive.c:245
+#: src/prefs_receive.c:239

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -9304,11 +9574,11 @@ msgstr ""
 "要执行的命令:\n"
 "(用 %d 表示新邮件数量)"
 
 "要执行的命令:\n"
 "(用 %d 表示新邮件数量)"
 

-#: src/prefs_receive.c:371 src/prefs_send.c:337
+#: src/prefs_receive.c:365 src/prefs_send.c:337

 msgid "Mail Handling"
 msgstr "邮件处理"
 
 msgid "Mail Handling"
 msgstr "邮件处理"
 

-#: src/prefs_receive.c:372
+#: src/prefs_receive.c:366

 msgid "Receiving"
 msgstr "邮件收取"
 
 msgid "Receiving"
 msgstr "邮件收取"
 


@@ -9465,164 +9735,172 @@ msgstr "指定当邮件含有非ASCII字符时的邮件内容编码方式"
 msgid "Sending"
 msgstr "邮件发送"
 
 msgid "Sending"
 msgstr "邮件发送"
 

-#: src/prefs_spelling.c:105
+#: src/prefs_spelling.c:91

 msgid "Select dictionaries location"
 msgstr "选择词典位置"
 
 msgid "Select dictionaries location"
 msgstr "选择词典位置"
 

-#: src/prefs_spelling.c:134
+#: src/prefs_spelling.c:126

 msgid "Pick color for misspelled word"
 msgstr "为拼写错误选择颜色"
 
 msgid "Pick color for misspelled word"
 msgstr "为拼写错误选择颜色"
 

-#: src/prefs_spelling.c:186
+#: src/prefs_spelling.c:183

 msgid "Enable spell checker"
 msgstr "启用语法检查器"
 
 msgid "Enable spell checker"
 msgstr "启用语法检查器"
 

-#: src/prefs_spelling.c:191
+#: src/prefs_spelling.c:188

 msgid "Enable alternate dictionary"
 msgstr "启用备选字典"
 
 msgid "Enable alternate dictionary"
 msgstr "启用备选字典"
 

-#: src/prefs_spelling.c:197
+#: src/prefs_spelling.c:194

 msgid "Faster switching with last used dictionary"
 msgstr "快速切换最后使用的字典"
 
 msgid "Faster switching with last used dictionary"
 msgstr "快速切换最后使用的字典"
 

-#: src/prefs_spelling.c:199
+#: src/prefs_spelling.c:196

 msgid "Path to dictionaries"
 msgstr "字典文件位置"
 
 msgid "Path to dictionaries"
 msgstr "字典文件位置"
 

-#: src/prefs_spelling.c:214
+#: src/prefs_spelling.c:211

 msgid "Automatic spelling"
 msgstr "自动检查"
 
 msgid "Automatic spelling"
 msgstr "自动检查"
 

-#: src/prefs_spelling.c:226
+#: src/prefs_spelling.c:223

 msgid "Re-check message when changing dictionary"
 msgstr "改变字典时重新检查邮件"
 
 msgid "Re-check message when changing dictionary"
 msgstr "改变字典时重新检查邮件"
 

-#: src/prefs_spelling.c:230
+#: src/prefs_spelling.c:227

 msgid "Dictionary"
 msgstr "字典"
 
 msgid "Dictionary"
 msgstr "字典"
 

-#: src/prefs_spelling.c:243
+#: src/prefs_spelling.c:240

 msgid "Default dictionary"
 msgstr "缺省字典"
 
 msgid "Default dictionary"
 msgstr "缺省字典"
 

-#: src/prefs_spelling.c:261
+#: src/prefs_spelling.c:258
+msgid "Default alternate dictionary"
+msgstr "缺省的备选字典"
+
+#: src/prefs_spelling.c:277
+msgid "Check with both dictionaries"
+msgstr "采用主、备两个字典检查"
+
+#: src/prefs_spelling.c:283

 msgid "Default suggestion mode"
 msgstr "缺省的建议模式"
 
 msgid "Default suggestion mode"
 msgstr "缺省的建议模式"
 

-#: src/prefs_spelling.c:283
+#: src/prefs_spelling.c:305

 msgid "Misspelled word color"
 msgstr "错误单词的颜色"
 
 msgid "Misspelled word color"
 msgstr "错误单词的颜色"
 

-#: src/prefs_spelling.c:297
+#: src/prefs_spelling.c:319

 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "选择拼写错误时的颜色(黑色表示下划线)"
 
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "选择拼写错误时的颜色(黑色表示下划线)"
 

-#: src/prefs_spelling.c:402
+#: src/prefs_spelling.c:449

 msgid "Spell Checking"
 msgstr "拼写检查"
 
 msgid "Spell Checking"
 msgstr "拼写检查"
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr "(星期)一、二、..."
 
 msgid "the full abbreviated weekday name"
 msgstr "(星期)一、二、..."
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 
 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 
 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr "一月、二月、..."
 
 msgid "the full month name"
 msgstr "一月、二月、..."
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr "完整的西元日期与时间（本地时间）"
 
 msgid "the preferred date and time for the current locale"
 msgstr "完整的西元日期与时间（本地时间）"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr "世纪 (年/100)"
 
 msgid "the century number (year/100)"
 msgstr "世纪 (年/100)"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr "今天是几号 (以数字表示)"
 
 msgid "the day of the month as a decimal number"
 msgstr "今天是几号 (以数字表示)"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "现在几点钟 (廿四时制，以数字表示)"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "现在几点钟 (廿四时制，以数字表示)"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "现在几点钟 (十二时制，以数字表示)"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "现在几点钟 (十二时制，以数字表示)"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第几天 (以数字表示)"
 
 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第几天 (以数字表示)"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr "现在是几月 (以数字表示)"
 
 msgid "the month as a decimal number"
 msgstr "现在是几月 (以数字表示)"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr "现在是几分 (以数字表示)"
 
 msgid "the minute as a decimal number"
 msgstr "现在是几分 (以数字表示)"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr "上午或下午"
 
 msgid "either AM or PM"
 msgstr "上午或下午"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr "现在是几秒 (以数字表示)"
 
 msgid "the second as a decimal number"
 msgstr "现在是几秒 (以数字表示)"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr "现在是一周的第几天 (以数字表示)"
 
 msgid "the day of the week as a decimal number"
 msgstr "现在是一周的第几天 (以数字表示)"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr "完整的西元日期 (本地时间)"
 
 msgid "the preferred date for the current locale"
 msgstr "完整的西元日期 (本地时间)"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr "西元年份的末两位数字"
 
 msgid "the last two digits of a year"
 msgstr "西元年份的末两位数字"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr "西元年份 (以数字表示)"
 
 msgid "the year as a decimal number"
 msgstr "西元年份 (以数字表示)"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr "时区"
 
 msgid "the time zone or name or abbreviation"
 msgstr "时区"
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
+#: src/prefs_summaries.c:911

 msgid "Date format"
 msgstr "日期格式"
 
 msgid "Date format"
 msgstr "日期格式"
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr "特殊符号"
 
 msgid "Specifier"
 msgstr "特殊符号"
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr "示例"
 
 msgid "Example"
 msgstr "示例"
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Select key bindings"
 msgstr "设置键绑定"
 
 msgid "Select key bindings"
 msgstr "设置键绑定"
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr "选择预设值:"
 
 msgid "Select preset:"
 msgstr "选择预设值:"
 

-#: src/prefs_summaries.c:352 src/prefs_summaries.c:699
+#: src/prefs_summaries.c:353 src/prefs_summaries.c:700

 msgid "Old Sylpheed"
 msgstr "老 Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "老 Sylpheed"
 

-#: src/prefs_summaries.c:360
+#: src/prefs_summaries.c:361

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."


@@ -9630,127 +9908,125 @@ msgstr ""
 "提示: 在鼠标移动到菜单项上面时，\n"
 "你可以通过按键来修改该菜单项的快捷键。"
 
 "提示: 在鼠标移动到菜单项上面时，\n"
 "你可以通过按键来修改该菜单项的快捷键。"
 

-#: src/prefs_summaries.c:767
-msgid "Translate header names"
-msgstr "翻译信头名称"
-
-#: src/prefs_summaries.c:769
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr ""
-"标准信头(比如'From:', 'Subject')也将翻译为你所采用的语言(比如'发件人', '主"
-"题')。"
-
-#: src/prefs_summaries.c:773
+#: src/prefs_summaries.c:768

 msgid "Display unread number next to folder name"
 msgstr "在文件夹名称后显示未读邮件数"
 
 msgid "Display unread number next to folder name"
 msgstr "在文件夹名称后显示未读邮件数"
 

-#: src/prefs_summaries.c:780
+#: src/prefs_summaries.c:775

 msgid "Abbreviate newsgroup names longer than"
 msgstr "缩写新闻组名称，如果其长度大于"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "缩写新闻组名称，如果其长度大于"
 

-#: src/prefs_summaries.c:794
+#: src/prefs_summaries.c:789

 msgid "letters"
 msgstr "个字母"
 
 #: src/prefs_summaries.c:807
 msgid "letters"
 msgstr "个字母"
 
 #: src/prefs_summaries.c:807

-msgid "Display sender using address book"
-msgstr "以地址簿中的名字显示发信人"
-
-#: src/prefs_summaries.c:810
-msgid "Thread using subject in addition to standard headers"
-msgstr "按线索分组时也考虑邮件主题（除了标准信头中的信息）"
-
-#: src/prefs_summaries.c:833
-msgid "Date format help"
-msgstr "日期格式说明"
-
-#: src/prefs_summaries.c:837
-msgid "Set displayed columns"
-msgstr "设置显示列"
-
-#: src/prefs_summaries.c:845
-msgid " Folder list... "
-msgstr " 文件夹列表..."
-
-#: src/prefs_summaries.c:853
-msgid " Message list... "
-msgstr " 邮件列表... "
-
-#: src/prefs_summaries.c:874
-msgid "Execute immediately when moving or deleting messages"
-msgstr "移动或删除邮件时立即执行"
-
-#: src/prefs_summaries.c:876
-msgid "Messages will be marked until execution if this is turned off"
-msgstr "（若此选项关闭，则必须按下「执行」才会执行移动或删除）"
-
-#: src/prefs_summaries.c:882
-msgid "Confirm before marking all mails in a folder as read"
-msgstr "在标记文件夹里所有邮件为只读时请求确认"
-
-#: src/prefs_summaries.c:886
-msgid "Always open message when selected"
-msgstr "选中文件夹时总打开里面的邮件"
-
-#: src/prefs_summaries.c:890
-msgid "Only mark message as read when opened in a new window"
-msgstr "只在用新窗口打开邮件时标记为已读"
+msgid "Message list"
+msgstr " 邮件列表"

 
 

-#: src/prefs_summaries.c:903
+#: src/prefs_summaries.c:817

 msgid "When entering a folder"
 msgstr "进入文件夹时"
 
 msgid "When entering a folder"
 msgstr "进入文件夹时"
 

-#: src/prefs_summaries.c:919
+#: src/prefs_summaries.c:825

 msgid "Do nothing"
 msgstr "不错"
 
 msgid "Do nothing"
 msgstr "不错"
 

-#: src/prefs_summaries.c:920
+#: src/prefs_summaries.c:826

 msgid "Select first unread (or new or marked) message"
 msgstr "选择第一个未读/新/已标记邮件"
 
 msgid "Select first unread (or new or marked) message"
 msgstr "选择第一个未读/新/已标记邮件"
 

-#: src/prefs_summaries.c:922
+#: src/prefs_summaries.c:828

 msgid "Select first unread (or marked or new) message"
 msgstr "选择第一个未读/已标记/新邮件"
 
 msgid "Select first unread (or marked or new) message"
 msgstr "选择第一个未读/已标记/新邮件"
 

-#: src/prefs_summaries.c:924
+#: src/prefs_summaries.c:830

 msgid "Select first new (or unread or marked) message"
 msgstr "选择第一个新/未读/已标记邮件"
 
 msgid "Select first new (or unread or marked) message"
 msgstr "选择第一个新/未读/已标记邮件"
 

-#: src/prefs_summaries.c:926
+#: src/prefs_summaries.c:832

 msgid "Select first new (or marked or unread) message"
 msgstr "选择第一个新/已标记/未读邮件"
 
 msgid "Select first new (or marked or unread) message"
 msgstr "选择第一个新/已标记/未读邮件"
 

-#: src/prefs_summaries.c:928
+#: src/prefs_summaries.c:834

 msgid "Select first marked (or new or unread) message"
 msgstr "选择第一个已标记/新/未读邮件"
 
 msgid "Select first marked (or new or unread) message"
 msgstr "选择第一个已标记/新/未读邮件"
 

-#: src/prefs_summaries.c:930
+#: src/prefs_summaries.c:836

 msgid "Select first marked (or unread or new) message"
 msgstr "选择第一个已标记/未读/新邮件"
 
 msgid "Select first marked (or unread or new) message"
 msgstr "选择第一个已标记/未读/新邮件"
 

-#: src/prefs_summaries.c:942
+#: src/prefs_summaries.c:847

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "显示\"没有未读邮件和新邮件\"对话框"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "显示\"没有未读邮件和新邮件\"对话框"
 

-#: src/prefs_summaries.c:959
+#: src/prefs_summaries.c:856

 msgid "Assume 'Yes'"
 msgstr "缺省回答'是'"
 
 msgid "Assume 'Yes'"
 msgstr "缺省回答'是'"
 

-#: src/prefs_summaries.c:961
+#: src/prefs_summaries.c:858

 msgid "Assume 'No'"
 msgstr "缺省回答'否'"
 
 msgid "Assume 'No'"
 msgstr "缺省回答'否'"
 

-#: src/prefs_summaries.c:970
+#: src/prefs_summaries.c:866
+msgid "Always open message when selected"
+msgstr "选中文件夹时总打开里面的邮件"
+
+#: src/prefs_summaries.c:869
+msgid "Thread using subject in addition to standard headers"
+msgstr "按线索分组时也考虑邮件主题（除了标准信头中的信息）"
+
+#: src/prefs_summaries.c:875
+msgid "Execute immediately when moving or deleting messages"
+msgstr "移动或删除邮件时立即执行"
+
+#: src/prefs_summaries.c:877
+msgid ""
+"Defers moving, copying and deleting of messages until you choose 'Tools/"
+"Execute'"
+msgstr "将移动、复制和删除操作延迟到选择了'工具/执行'之后再处理"
+
+#: src/prefs_summaries.c:882
+msgid "Only mark message as read when opened in a new window"
+msgstr "只在用新窗口打开邮件时标记为已读"
+
+#: src/prefs_summaries.c:889
+msgid "Mark messages as read after"
+msgstr "一段时间后将邮件标记为已读"
+
+#: src/prefs_summaries.c:905
+msgid "Display sender using address book"
+msgstr "以地址簿中的名字显示发信人"
+
+#: src/prefs_summaries.c:937
+msgid "Date format help"
+msgstr "日期格式说明"
+
+#: src/prefs_summaries.c:955
+msgid "Confirm before marking all mails in a folder as read"
+msgstr "在标记文件夹里所有邮件为只读时请求确认"
+
+#: src/prefs_summaries.c:958
+msgid "Translate header names"
+msgstr "翻译信头名称"
+
+#: src/prefs_summaries.c:960
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr ""
+"标准信头(比如'From:', 'Subject')也将翻译为你所采用的语言(比如'发件人', '主"
+"题')。"
+
+#: src/prefs_summaries.c:967

 msgid " Set key bindings... "
 msgstr " 设置键绑定... "
 
 msgid " Set key bindings... "
 msgstr " 设置键绑定... "
 

-#: src/prefs_summaries.c:1077
+#: src/prefs_summaries.c:1079

 msgid "Summaries"
 msgstr "邮件列表"
 
 msgid "Summaries"
 msgstr "邮件列表"
 

-#: src/prefs_summary_column.c:81 src/summaryview.c:2359
+#: src/prefs_summary_column.c:81 src/summaryview.c:2360

 msgid "Attachment"
 msgstr "附件"
 
 msgid "Attachment"
 msgstr "附件"
 


@@ -9774,35 +10050,31 @@ msgstr ""
 msgid "This name is used as the Menu item"
 msgstr "该名称已经用于菜单项"
 
 msgid "This name is used as the Menu item"
 msgstr "该名称已经用于菜单项"
 

-#: src/prefs_template.c:276
+#: src/prefs_template.c:286

 msgid " Symbols... "
 msgstr " 符号... "
 
 msgid " Symbols... "
 msgstr " 符号... "
 

-#: src/prefs_template.c:305
+#: src/prefs_template.c:315

 msgid "Template configuration"
 msgstr "模板设置"
 
 msgid "Template configuration"
 msgstr "模板设置"
 

-#: src/prefs_template.c:526
-msgid "Template format error."
-msgstr "模板格式错误"
-
-#: src/prefs_template.c:536
+#: src/prefs_template.c:557

 msgid "Template name is not set."
 msgstr "未设定模板名称。"
 
 msgid "Template name is not set."
 msgstr "未设定模板名称。"
 

-#: src/prefs_template.c:625
+#: src/prefs_template.c:667

 msgid "Delete template"
 msgstr "删除模板"
 
 msgid "Delete template"
 msgstr "删除模板"
 

-#: src/prefs_template.c:626
+#: src/prefs_template.c:668

 msgid "Do you really want to delete this template?"
 msgstr "确定删除这个模板吗？"
 
 msgid "Do you really want to delete this template?"
 msgstr "确定删除这个模板吗？"
 

-#: src/prefs_template.c:763
+#: src/prefs_template.c:805

 msgid "Current templates"
 msgstr "目前使用的模板"
 
 msgid "Current templates"
 msgstr "目前使用的模板"
 

-#: src/prefs_template.c:788
+#: src/prefs_template.c:830

 msgid "Template"
 msgstr "模板"
 
 msgid "Template"
 msgstr "模板"
 


@@ -9904,10 +10176,6 @@ msgstr ""
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "共有%d个主题可用 (用户目录%d个，系统目录%d个，内置1个)"
 
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "共有%d个主题可用 (用户目录%d个，系统目录%d个，内置1个)"
 

-#: src/prefs_themes.c:706
-msgid "The Sylpheed-Claws Team"
-msgstr "Sylpheed-Claws开发组"
-

 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"
 #: src/prefs_themes.c:708
 #, c-format
 msgid "Internal theme has %d icons"


@@ -9983,8 +10251,8 @@ msgid "Message view toolbar configuration"
 msgstr "邮件视图工具条设置"
 
 #: src/prefs_toolbar.c:643
 msgstr "邮件视图工具条设置"
 
 #: src/prefs_toolbar.c:643

-msgid "Sylpheed-Claws Action"
-msgstr "Sylpheed-Claws 动作"
+msgid "Claws Mail Action"
+msgstr "Claws Mail动作"

 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"
 
 #: src/prefs_toolbar.c:652
 msgid "Toolbar text"


@@ -10054,10 +10322,6 @@ msgstr "自动折行"
 msgid "Unknown error"
 msgstr "未知错误"
 
 msgid "Unknown error"
 msgstr "未知错误"
 

-#: src/privacy.c:211 src/privacy.c:215 src/privacy.c:232 src/privacy.c:236
-msgid "No signature found"
-msgstr "未发现签名"
-

 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "没有信息"
 #: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "没有信息"


@@ -10071,54 +10335,54 @@ msgstr "没有定义动作。"
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64解码错误]\n"
 
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64解码错误]\n"
 

-#: src/procmsg.c:908 src/procmsg.c:911
+#: src/procmsg.c:918 src/procmsg.c:921

 msgid "Already trying to send."
 msgstr "已经在发送。"
 
 msgid "Already trying to send."
 msgstr "已经在发送。"
 

-#: src/procmsg.c:1499
+#: src/procmsg.c:1517

 #, c-format
 msgid "Couldn't open file %s."
 msgstr "无法打开文件 %s。"
 
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "无法打开文件 %s。"
 

-#: src/procmsg.c:1593
+#: src/procmsg.c:1615

 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "无法加密邮件: %s"
 
 #, c-format
 msgid "Couldn't encrypt the email: %s"
 msgstr "无法加密邮件: %s"
 

-#: src/procmsg.c:1626
+#: src/procmsg.c:1648

 msgid "Queued message header is broken."
 msgstr "待发送的邮件头已经损坏"
 
 msgid "Queued message header is broken."
 msgstr "待发送的邮件头已经损坏"
 

-#: src/procmsg.c:1647
+#: src/procmsg.c:1669

 msgid "An error happened during SMTP session."
 msgstr "建立SMTP会话时发生错误."
 
 msgid "An error happened during SMTP session."
 msgstr "建立SMTP会话时发生错误."
 

-#: src/procmsg.c:1661
+#: src/procmsg.c:1683

 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr "没有发现可供发送邮件的账户，同时在SMTP会话中发生了一个错误。"
 
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr "没有发现可供发送邮件的账户，同时在SMTP会话中发生了一个错误。"
 

-#: src/procmsg.c:1669
+#: src/procmsg.c:1691

 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "
 msgid ""
 "Couldn't determine sending informations. Maybe the email hasn't been "

-"generated by Sylpheed-Claws."
-msgstr "无法判断待发送的信息。也许这封邮件不是用Sylpheed-Claws生成的。"
+"generated by Claws Mail."
+msgstr "无法判断待发送的信息。也许这封邮件不是用Claws Mail生成的。"

 
 

-#: src/procmsg.c:1687
+#: src/procmsg.c:1709

 msgid "Couldn't create temporary file for news sending."
 msgstr "发送新闻过程中无法创建临时文件。"
 
 msgid "Couldn't create temporary file for news sending."
 msgstr "发送新闻过程中无法创建临时文件。"
 

-#: src/procmsg.c:1700
+#: src/procmsg.c:1722

 msgid "Error when writing temporary file for news sending."
 msgstr "发送新闻过程中写往临时文件时出错。"
 
 msgid "Error when writing temporary file for news sending."
 msgstr "发送新闻过程中写往临时文件时出错。"
 

-#: src/procmsg.c:1714
+#: src/procmsg.c:1736

 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "发贴至 %s 时发生错误。"
 
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "发贴至 %s 时发生错误。"
 

-#: src/procmsg.c:2194
+#: src/procmsg.c:2226

 msgid "Filtering messages...\n"
 msgstr "正在过滤邮件...\n"
 
 msgid "Filtering messages...\n"
 msgstr "正在过滤邮件...\n"
 


@@ -10278,12 +10542,12 @@ msgstr "符号描述"
 msgid "The following symbols can be used:"
 msgstr "可以使用下述符号:"
 
 msgid "The following symbols can be used:"
 msgstr "可以使用下述符号:"
 

-#: src/quote_fmt_parse.y:461
+#: src/quote_fmt_parse.y:464

 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "请输入要替换'%s'的文字"
 
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "请输入要替换'%s'的文字"
 

-#: src/quote_fmt_parse.y:462
+#: src/quote_fmt_parse.y:465

 msgid "Enter variable"
 msgstr "请输入变量"
 
 msgid "Enter variable"
 msgstr "请输入变量"
 


@@ -10406,47 +10670,47 @@ msgstr "%s - 邮件源文件"
 msgid "Saved SSL Certificates"
 msgstr "保存SSL认证"
 
 msgid "Saved SSL Certificates"
 msgstr "保存SSL认证"
 

-#: src/ssl_manager.c:386
+#: src/ssl_manager.c:428

 msgid "Delete certificate"
 msgstr "删除认证"
 
 msgid "Delete certificate"
 msgstr "删除认证"
 

-#: src/ssl_manager.c:387
+#: src/ssl_manager.c:429

 msgid "Do you really want to delete this certificate?"
 msgstr "确定删除这项认证？"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "确定删除这项认证？"
 

-#: src/summary_search.c:202
+#: src/summary_search.c:230

 msgid "Search messages"
 msgstr "搜索邮件"
 
 msgid "Search messages"
 msgstr "搜索邮件"
 

-#: src/summary_search.c:224
+#: src/summary_search.c:252

 msgid "Match any of the following"
 msgstr "满足下面任意一条件"
 
 msgid "Match any of the following"
 msgstr "满足下面任意一条件"
 

-#: src/summary_search.c:225
+#: src/summary_search.c:253

 msgid "Match all of the following"
 msgstr "满足下面所有条件"
 
 msgid "Match all of the following"
 msgstr "满足下面所有条件"
 

-#: src/summary_search.c:284
+#: src/summary_search.c:352

 msgid "From:"
 msgstr "发信人:"
 
 msgid "From:"
 msgstr "发信人:"
 

-#: src/summary_search.c:305
+#: src/summary_search.c:373

 msgid "Body:"
 msgstr "正文:"
 
 msgid "Body:"
 msgstr "正文:"
 

-#: src/summary_search.c:312
+#: src/summary_search.c:380

 msgid "Condition:"
 msgstr "条件:"
 
 msgid "Condition:"
 msgstr "条件:"
 

-#: src/summary_search.c:342
+#: src/summary_search.c:410

 msgid "Find _all"
 msgstr "查找全部(_a)"
 
 msgid "Find _all"
 msgstr "查找全部(_a)"
 

-#: src/summary_search.c:543
+#: src/summary_search.c:645

 msgid "Beginning of list reached; continue from end?"
 msgstr "搜寻已到顶端。要从结尾继续搜寻吗？"
 
 msgid "Beginning of list reached; continue from end?"
 msgstr "搜寻已到顶端。要从结尾继续搜寻吗？"
 

-#: src/summary_search.c:545
+#: src/summary_search.c:647

 msgid "End of list reached; continue from beginning?"
 msgstr "搜寻已到结尾。要从开头继续搜寻吗？"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "搜寻已到结尾。要从开头继续搜寻吗？"
 


@@ -10470,11 +10734,11 @@ msgstr "/回复给(_y)/发信人(_s)"
 msgid "/Repl_y to/mailing _list"
 msgstr "/回复给(_y)/邮件列表 (_l)"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/回复给(_y)/邮件列表 (_l)"
 

-#: src/summaryview.c:424 src/toolbar.c:234
+#: src/summaryview.c:424 src/toolbar.c:239

 msgid "/_Forward"
 msgstr "转发(_F)"
 
 msgid "/_Forward"
 msgstr "转发(_F)"
 

-#: src/summaryview.c:425 src/toolbar.c:235
+#: src/summaryview.c:425 src/toolbar.c:240

 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_w)"
 
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_w)"
 


@@ -10733,19 +10997,19 @@ msgstr "封已选择"
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封 (%s)"
 
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封 (%s)"
 

-#: src/summaryview.c:2503
+#: src/summaryview.c:2504

 msgid "Sorting summary..."
 msgstr "正在对邮件进行排序..."
 
 msgid "Sorting summary..."
 msgstr "正在对邮件进行排序..."
 

-#: src/summaryview.c:2584
+#: src/summaryview.c:2585

 msgid "Setting summary from message data..."
 msgstr "正在根据邮件数据提取摘要信息..."
 
 msgid "Setting summary from message data..."
 msgstr "正在根据邮件数据提取摘要信息..."
 

-#: src/summaryview.c:2762
+#: src/summaryview.c:2763

 msgid "(No Date)"
 msgstr "(没有日期)"
 
 msgid "(No Date)"
 msgstr "(没有日期)"
 

-#: src/summaryview.c:2800
+#: src/summaryview.c:2801

 msgid "(No Recipient)"
 msgstr "(没有收件人)"
 
 msgid "(No Recipient)"
 msgstr "(没有收件人)"
 


@@ -10785,27 +11049,27 @@ msgstr "追加(_A)"
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 

-#: src/summaryview.c:4423
+#: src/summaryview.c:4431

 msgid "Building threads..."
 msgstr "正在建立邮件线索..."
 
 msgid "Building threads..."
 msgstr "正在建立邮件线索..."
 

-#: src/summaryview.c:4642
+#: src/summaryview.c:4650

 msgid "Skip these rules"
 msgstr "忽略这些规则"
 
 msgid "Skip these rules"
 msgstr "忽略这些规则"
 

-#: src/summaryview.c:4645
+#: src/summaryview.c:4653

 msgid "Apply these rules regardless of the account they belong to"
 msgstr "使用这些规则(不管它们属于那个账户)"
 
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "使用这些规则(不管它们属于那个账户)"
 

-#: src/summaryview.c:4648
+#: src/summaryview.c:4656

 msgid "Apply these rules if they apply to the current account"
 msgstr "使用这些规则(如果它们可用于当前账户)"
 
 msgid "Apply these rules if they apply to the current account"
 msgstr "使用这些规则(如果它们可用于当前账户)"
 

-#: src/summaryview.c:4677
+#: src/summaryview.c:4685

 msgid "Filtering"
 msgstr "正在过滤邮件..."
 
 msgid "Filtering"
 msgstr "正在过滤邮件..."
 

-#: src/summaryview.c:4678
+#: src/summaryview.c:4686

 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"


@@ -10813,19 +11077,19 @@ msgstr ""
 "有些规则是专属于某个账户的。\n"
 "请选择如何使用它们:"
 
 "有些规则是专属于某个账户的。\n"
 "请选择如何使用它们:"
 

-#: src/summaryview.c:4680
+#: src/summaryview.c:4688

 msgid "+_Filter"
 msgstr "+过滤(_F)"
 
 msgid "+_Filter"
 msgstr "+过滤(_F)"
 

-#: src/summaryview.c:4707
+#: src/summaryview.c:4715

 msgid "Filtering..."
 msgstr "正在过滤邮件..."
 
 msgid "Filtering..."
 msgstr "正在过滤邮件..."
 

-#: src/summaryview.c:4780
+#: src/summaryview.c:4788

 msgid "Processing configuration"
 msgstr "过滤处理配置"
 
 msgid "Processing configuration"
 msgstr "过滤处理配置"
 

-#: src/summaryview.c:6220
+#: src/summaryview.c:6235

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -10844,7 +11108,7 @@ msgstr "/将地址加入地址簿(_a)"
 
 #: src/textview.c:224
 msgid "/Copy this add_ress"
 
 #: src/textview.c:224
 msgid "/Copy this add_ress"

-msgstr "/拷贝此地址(_r)"
+msgstr "/复制此地址(_r)"

 
 #: src/textview.c:229
 msgid "/_Open image"
 
 #: src/textview.c:229
 msgid "/_Open image"


@@ -10864,7 +11128,7 @@ msgstr "[%s %s (%d字节)]"
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d字节)]"
 
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d字节)]"
 

-#: src/textview.c:811
+#: src/textview.c:812

 msgid ""
 "\n"
 "  This message can't be displayed.\n"
 msgid ""
 "\n"
 "  This message can't be displayed.\n"


@@ -10878,79 +11142,79 @@ msgstr ""
 "\n"
 "  可用'工具'菜单中的 "
 
 "\n"
 "  可用'工具'菜单中的 "
 

-#: src/textview.c:816
+#: src/textview.c:817

 msgid "'View Log'"
 msgstr "查看日志文件"
 
 msgid "'View Log'"
 msgstr "查看日志文件"
 

-#: src/textview.c:817
+#: src/textview.c:818

 msgid " in the Tools menu for more information."
 msgstr "一项了解更多信息。"
 
 msgid " in the Tools menu for more information."
 msgstr "一项了解更多信息。"
 

-#: src/textview.c:838
+#: src/textview.c:839

 msgid "  The following can be performed on this part by\n"
 msgstr "  可对该部分执行以下操作\n"
 
 msgid "  The following can be performed on this part by\n"
 msgstr "  可对该部分执行以下操作\n"
 

-#: src/textview.c:839
+#: src/textview.c:840

 msgid "  right-clicking the icon or list item:\n"
 msgstr "  右键点击图标或者列表项:\n"
 
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  右键点击图标或者列表项:\n"
 

-#: src/textview.c:841
+#: src/textview.c:842

 msgid "     - To save, select "
 msgstr "     - 若要保存，请选择"
 
 msgid "     - To save, select "
 msgstr "     - 若要保存，请选择"
 

-#: src/textview.c:842
+#: src/textview.c:843

 msgid "'Save as...'"
 msgstr "另存为..."
 
 msgid "'Save as...'"
 msgstr "另存为..."
 

-#: src/textview.c:843
+#: src/textview.c:844

 msgid " (Shortcut key: 'y')\n"
 msgstr " (快捷键: 'y')\n"
 
 msgid " (Shortcut key: 'y')\n"
 msgstr " (快捷键: 'y')\n"
 

-#: src/textview.c:844
+#: src/textview.c:845

 msgid "     - To display as text, select "
 msgstr "     - 若要以文本方式显示，请选择 "
 
 msgid "     - To display as text, select "
 msgstr "     - 若要以文本方式显示，请选择 "
 

-#: src/textview.c:845
+#: src/textview.c:846

 msgid "'Display as text'"
 msgstr "'以文本方式显示'"
 
 msgid "'Display as text'"
 msgstr "'以文本方式显示'"
 

-#: src/textview.c:846
+#: src/textview.c:847

 msgid " (Shortcut key: 't')\n"
 msgstr " (快捷键: 't')\n"
 
 msgid " (Shortcut key: 't')\n"
 msgstr " (快捷键: 't')\n"
 

-#: src/textview.c:847
+#: src/textview.c:848

 msgid "     - To open with an external program, select "
 msgstr "    - 若要用外部程序打开，请选择"
 
 msgid "     - To open with an external program, select "
 msgstr "    - 若要用外部程序打开，请选择"
 

-#: src/textview.c:848
+#: src/textview.c:849

 msgid "'Open'"
 msgstr "'打开'"
 
 msgid "'Open'"
 msgstr "'打开'"
 

-#: src/textview.c:849
+#: src/textview.c:850

 msgid " (Shortcut key: 'l')\n"
 msgstr " (快捷键: 'l')\n"
 
 msgid " (Shortcut key: 'l')\n"
 msgstr " (快捷键: 'l')\n"
 

-#: src/textview.c:850
+#: src/textview.c:851

 msgid "       (alternately double-click, or click the middle "
 msgstr "       (也可以双击或者点击),"
 
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (也可以双击或者点击),"
 

-#: src/textview.c:851
+#: src/textview.c:852

 msgid "mouse button)\n"
 msgstr "鼠标中键)\n"
 
 msgid "mouse button)\n"
 msgstr "鼠标中键)\n"
 

-#: src/textview.c:852
+#: src/textview.c:853

 msgid "     - Or use "
 msgstr "     - 或者采用"
 
 msgid "     - Or use "
 msgstr "     - 或者采用"
 

-#: src/textview.c:853
+#: src/textview.c:854

 msgid "'Open with...'"
 msgstr "'打开方式...'"
 
 msgid "'Open with...'"
 msgstr "'打开方式...'"
 

-#: src/textview.c:854
+#: src/textview.c:855

 msgid " (Shortcut key: 'o')\n"
 msgstr " (快捷键: 'o')\n"
 
 msgid " (Shortcut key: 'o')\n"
 msgstr " (快捷键: 'o')\n"
 

-#: src/textview.c:943
+#: src/textview.c:944

 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"


@@ -10961,7 +11225,7 @@ msgstr ""
 "    %s\n"
 "程序退出码 %d\n"
 
 "    %s\n"
 "程序退出码 %d\n"
 

-#: src/textview.c:2488
+#: src/textview.c:2492

 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"
 #, c-format
 msgid ""
 "The real URL is different from the displayed URL.\n"


@@ -10980,226 +11244,242 @@ msgstr ""
 "\n"
 "真的要打开吗?"
 
 "\n"
 "真的要打开吗?"
 

-#: src/textview.c:2497
+#: src/textview.c:2501

 msgid "Phishing attempt warning"
 msgstr "钓鱼企图警告"
 
 msgid "Phishing attempt warning"
 msgstr "钓鱼企图警告"
 

-#: src/textview.c:2498
+#: src/textview.c:2502

 msgid "_Open URL"
 msgstr "打开(_O)"
 
 msgid "_Open URL"
 msgstr "打开(_O)"
 

-#: src/toolbar.c:162 src/toolbar.c:1486
+#: src/toolbar.c:166 src/toolbar.c:1535

 msgid "Receive Mail on all Accounts"
 msgstr "收所有帐号的信"
 
 msgid "Receive Mail on all Accounts"
 msgstr "收所有帐号的信"
 

-#: src/toolbar.c:163 src/toolbar.c:1500
+#: src/toolbar.c:167 src/toolbar.c:1549

 msgid "Receive Mail on current Account"
 msgstr "用目前的帐号收信"
 
 msgid "Receive Mail on current Account"
 msgstr "用目前的帐号收信"
 

-#: src/toolbar.c:164 src/toolbar.c:1506
+#: src/toolbar.c:168 src/toolbar.c:1555

 msgid "Send Queued Messages"
 msgstr "送出待发送邮件"
 
 msgid "Send Queued Messages"
 msgstr "送出待发送邮件"
 

-#: src/toolbar.c:165 src/toolbar.c:1519
+#: src/toolbar.c:169 src/toolbar.c:1568

 msgid "Compose Email"
 msgstr "写信"
 
 msgid "Compose Email"
 msgstr "写信"
 

-#: src/toolbar.c:166 src/toolbar.c:1523
+#: src/toolbar.c:170 src/toolbar.c:1572

 msgid "Compose News"
 msgstr "撰写文章"
 
 msgid "Compose News"
 msgstr "撰写文章"
 

-#: src/toolbar.c:167 src/toolbar.c:1554 src/toolbar.c:1564
+#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624

 msgid "Reply to Message"
 msgstr "回应原文"
 
 msgid "Reply to Message"
 msgstr "回应原文"
 

-#: src/toolbar.c:168 src/toolbar.c:1571 src/toolbar.c:1581
+#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641

 msgid "Reply to Sender"
 msgstr "回复给发信人"
 
 msgid "Reply to Sender"
 msgstr "回复给发信人"
 

-#: src/toolbar.c:169 src/toolbar.c:1588 src/toolbar.c:1598
+#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658

 msgid "Reply to All"
 msgstr "回复给所有人"
 
 msgid "Reply to All"
 msgstr "回复给所有人"
 

-#: src/toolbar.c:170 src/toolbar.c:1605 src/toolbar.c:1615
+#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675

 msgid "Reply to Mailing-list"
 msgstr "回复至邮件列表"
 
 msgid "Reply to Mailing-list"
 msgstr "回复至邮件列表"
 

-#: src/toolbar.c:171 src/toolbar.c:1622 src/toolbar.c:1632
+#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692

 msgid "Forward Message"
 msgstr "转发邮件"
 
 msgid "Forward Message"
 msgstr "转发邮件"
 

-#: src/toolbar.c:172 src/toolbar.c:1639
+#: src/toolbar.c:176 src/toolbar.c:1699

 msgid "Trash Message"
 msgstr "将邮件转移到垃圾桶"
 
 msgid "Trash Message"
 msgstr "将邮件转移到垃圾桶"
 

-#: src/toolbar.c:173 src/toolbar.c:1645
+#: src/toolbar.c:177 src/toolbar.c:1705

 msgid "Delete Message"
 msgstr "删除邮件"
 
 msgid "Delete Message"
 msgstr "删除邮件"
 

-#: src/toolbar.c:175 src/toolbar.c:1657
+#: src/toolbar.c:179 src/toolbar.c:1717

 msgid "Go to Previous Unread Message"
 msgstr "转到上一封未读邮件"
 
 msgid "Go to Previous Unread Message"
 msgstr "转到上一封未读邮件"
 

-#: src/toolbar.c:176 src/toolbar.c:1664
+#: src/toolbar.c:180 src/toolbar.c:1724

 msgid "Go to Next Unread Message"
 msgstr "转到下一封未读邮件"
 
 msgid "Go to Next Unread Message"
 msgstr "转到下一封未读邮件"
 

-#: src/toolbar.c:179
+#: src/toolbar.c:183

 msgid "Learn Spam or Ham"
 msgstr "训练识别垃圾邮件的能力"
 
 msgid "Learn Spam or Ham"
 msgstr "训练识别垃圾邮件的能力"
 

-#: src/toolbar.c:181 src/toolbar.c:1673
+#: src/toolbar.c:185 src/toolbar.c:1733

 msgid "Send Message"
 msgstr "发送邮件"
 
 msgid "Send Message"
 msgstr "发送邮件"
 

-#: src/toolbar.c:182 src/toolbar.c:1679
+#: src/toolbar.c:186 src/toolbar.c:1739

 msgid "Put into queue folder and send later"
 msgstr "放入待发送文件夹稍后再送"
 
 msgid "Put into queue folder and send later"
 msgstr "放入待发送文件夹稍后再送"
 

-#: src/toolbar.c:183 src/toolbar.c:1685
+#: src/toolbar.c:187 src/toolbar.c:1745

 msgid "Save to draft folder"
 msgstr "存入草稿文件夹"
 
 msgid "Save to draft folder"
 msgstr "存入草稿文件夹"
 

-#: src/toolbar.c:184 src/toolbar.c:1691
+#: src/toolbar.c:188 src/toolbar.c:1751

 msgid "Insert file"
 msgstr "插入文件"
 
 msgid "Insert file"
 msgstr "插入文件"
 

-#: src/toolbar.c:185 src/toolbar.c:1697
+#: src/toolbar.c:189 src/toolbar.c:1757

 msgid "Attach file"
 msgstr "附加文件"
 
 msgid "Attach file"
 msgstr "附加文件"
 

-#: src/toolbar.c:186 src/toolbar.c:1703
+#: src/toolbar.c:190 src/toolbar.c:1763

 msgid "Insert signature"
 msgstr "插入签名"
 
 msgid "Insert signature"
 msgstr "插入签名"
 

-#: src/toolbar.c:187 src/toolbar.c:1709
+#: src/toolbar.c:191 src/toolbar.c:1769

 msgid "Edit with external editor"
 msgstr "以外部编辑器编辑"
 
 msgid "Edit with external editor"
 msgstr "以外部编辑器编辑"
 

-#: src/toolbar.c:188 src/toolbar.c:1715
+#: src/toolbar.c:192 src/toolbar.c:1775

 msgid "Wrap long lines of current paragraph"
 msgstr "拆分当前段落中超长的行"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "拆分当前段落中超长的行"
 

-#: src/toolbar.c:189 src/toolbar.c:1721
+#: src/toolbar.c:193 src/toolbar.c:1781

 msgid "Wrap all long lines"
 msgstr "拆分所有超长的行"
 
 msgid "Wrap all long lines"
 msgstr "拆分所有超长的行"
 

-#: src/toolbar.c:192 src/toolbar.c:1734
+#: src/toolbar.c:196 src/toolbar.c:1794

 msgid "Check spelling"
 msgstr "检查拼写"
 
 msgid "Check spelling"
 msgstr "检查拼写"
 

-#: src/toolbar.c:194
-msgid "Sylpheed-Claws Actions Feature"
-msgstr "Sylpheed-Claws 动作特性"
+#: src/toolbar.c:198
+msgid "Claws Mail Actions Feature"
+msgstr "Claws Mail 动作特性"
+
+#: src/toolbar.c:199 src/toolbar.c:1817
+msgid "Cancel receiving"
+msgstr "取消收信"

 
 

-#: src/toolbar.c:214
+#: src/toolbar.c:219

 msgid "/Reply with _quote"
 msgstr "/回信时引用原文(_q)"
 
 msgid "/Reply with _quote"
 msgstr "/回信时引用原文(_q)"
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/_Reply without quote"
 msgstr "/回信时不引用原文(_R)"
 
 msgid "/_Reply without quote"
 msgstr "/回信时不引用原文(_R)"
 

-#: src/toolbar.c:219
+#: src/toolbar.c:224

 msgid "/Reply to all with _quote"
 msgstr "/回信给所有人时引用原文(_q)"
 
 msgid "/Reply to all with _quote"
 msgstr "/回信给所有人时引用原文(_q)"
 

-#: src/toolbar.c:220
+#: src/toolbar.c:225

 msgid "/_Reply to all without quote"
 msgstr "/回信给所有人时不引用原文(_R)"
 
 msgid "/_Reply to all without quote"
 msgstr "/回信给所有人时不引用原文(_R)"
 

-#: src/toolbar.c:224
+#: src/toolbar.c:229

 msgid "/Reply to list with _quote"
 msgstr "/回信给列表且引用原文(_q)"
 
 msgid "/Reply to list with _quote"
 msgstr "/回信给列表且引用原文(_q)"
 

-#: src/toolbar.c:225
+#: src/toolbar.c:230

 msgid "/_Reply to list without quote"
 msgstr "/回信到列表不引用原文(_R)"
 
 msgid "/_Reply to list without quote"
 msgstr "/回信到列表不引用原文(_R)"
 

-#: src/toolbar.c:229
+#: src/toolbar.c:234

 msgid "/Reply to sender with _quote"
 msgstr "/回信时引用原文(_q)"
 
 msgid "/Reply to sender with _quote"
 msgstr "/回信时引用原文(_q)"
 

-#: src/toolbar.c:230
+#: src/toolbar.c:235

 msgid "/_Reply to sender without quote"
 msgstr "/回信时不引用原文(_R)"
 
 msgid "/_Reply to sender without quote"
 msgstr "/回信时不引用原文(_R)"
 

-#: src/toolbar.c:236
+#: src/toolbar.c:241

 msgid "/Redirec_t"
 msgstr "/重定向(_t)"
 
 msgid "/Redirec_t"
 msgstr "/重定向(_t)"
 

-#: src/toolbar.c:389
+#: src/toolbar.c:245
+msgid "/Learn as _Spam"
+msgstr "/学习垃圾邮件"
+
+#: src/toolbar.c:246
+msgid "/Learn as _Ham"
+msgstr "/学习非垃圾邮件"
+
+#: src/toolbar.c:399

 msgid "Get Mail"
 msgstr "收信"
 
 msgid "Get Mail"
 msgstr "收信"
 

-#: src/toolbar.c:395 src/toolbar.c:486
+#: src/toolbar.c:403
+msgid "Toolbar|Compose"
+msgstr "撰写"
+
+#: src/toolbar.c:405 src/toolbar.c:496

 msgid "Reply"
 msgstr "回复"
 
 msgid "Reply"
 msgstr "回复"
 

-#: src/toolbar.c:396 src/toolbar.c:487
+#: src/toolbar.c:406 src/toolbar.c:497

 msgid "All"
 msgstr "全部"
 
 msgid "All"
 msgstr "全部"
 

-#: src/toolbar.c:397 src/toolbar.c:488
+#: src/toolbar.c:407 src/toolbar.c:498

 msgid "Sender"
 msgstr "发信人"
 
 msgid "Sender"
 msgstr "发信人"
 

-#: src/toolbar.c:402 src/toolbar.c:493
+#: src/toolbar.c:412 src/toolbar.c:503

 msgid "Spam"
 msgstr "垃圾邮件"
 
 msgid "Spam"
 msgstr "垃圾邮件"
 

-#: src/toolbar.c:405 src/toolbar.c:495
+#: src/toolbar.c:415 src/toolbar.c:505

 msgid "Next"
 msgstr "下一个"
 
 msgid "Next"
 msgstr "下一个"
 

-#: src/toolbar.c:443
+#: src/toolbar.c:453

 msgid "Send later"
 msgstr "稍后再送"
 
 msgid "Send later"
 msgstr "稍后再送"
 

-#: src/toolbar.c:444
+#: src/toolbar.c:454

 msgid "Draft"
 msgstr "草稿"
 
 msgid "Draft"
 msgstr "草稿"
 

-#: src/toolbar.c:1493
+#: src/toolbar.c:1542

 msgid "Receive Mail on selected Account"
 msgstr "收选中帐号的信"
 
 msgid "Receive Mail on selected Account"
 msgstr "收选中帐号的信"
 

-#: src/toolbar.c:1530
+#: src/toolbar.c:1579

 msgid "Compose with selected Account"
 msgstr "以选中帐号撰写邮件"
 
 msgid "Compose with selected Account"
 msgstr "以选中帐号撰写邮件"
 

-#: src/toolbar.c:1536
+#: src/toolbar.c:1585

 msgid "Ham"
 msgstr "非垃圾"
 
 msgid "Ham"
 msgstr "非垃圾"
 

-#: src/toolbar.c:1544
+#: src/toolbar.c:1593

 msgid "Learn Spam"
 msgstr "学习垃圾邮件"
 
 msgid "Learn Spam"
 msgstr "学习垃圾邮件"
 

-#: src/toolbar.c:1548
+#: src/toolbar.c:1597

 msgid "Learn Ham"
 msgstr "学习非垃圾邮件"
 
 msgid "Learn Ham"
 msgstr "学习非垃圾邮件"
 

-#: src/wizard.c:459
-msgid "Welcome to Sylpheed-Claws "
-msgstr "欢迎使用Sylpheed-Claws "
+#: src/toolbar.c:1607
+msgid "Learn as..."
+msgstr "学习..."

 
 

-#: src/wizard.c:469
-msgid "Sylpheed-Claws Team"
-msgstr "Sylpheed-Claws开发组"
+#: src/wizard.c:461
+msgid "Welcome Mail Subject|Welcome to Claws Mail"
+msgstr "欢迎使用Claws Mail"

 
 

-#: src/wizard.c:475
+#: src/wizard.c:484

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"

-"Welcome to Sylpheed-Claws\n"
-"-------------------------\n"
+"Welcome to Claws Mail\n"
+"---------------------\n"

 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"
 "\n"
 "Now that you have set up your account you can fetch your\n"
 "mail by clicking the 'Get Mail' button at the left of the\n"
 "toolbar.\n"
 "\n"

-"Sylpheed-Claws has lots of extra features accessible via plugins,\n"
+"Claws Mail has lots of extra features accessible via plugins,\n"

 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"
 "like anti-spam filtering and learning (via the Bogofilter or\n"
 "SpamAssassin plugins), privacy protection (via PGP/Mime), an RSS\n"
 "aggregator, a calendar, and much more. You can load them from\n"


@@ -11210,7 +11490,7 @@ msgid ""
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"
 "and change the general Preferences by using\n"
 "'/Configuration/Preferences'.\n"
 "\n"

-"You can find further information in the Sylpheed-Claws manual,\n"
+"You can find further information in the Claws Mail manual,\n"

 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"
 "which can be accessed by using the menu entry '/Help/Manual'\n"
 "or online at the URL given below.\n"
 "\n"


@@ -11224,7 +11504,7 @@ msgid ""
 "\n"
 "LICENSE\n"
 "-------\n"
 "\n"
 "LICENSE\n"
 "-------\n"

-"Sylpheed-Claws is free software, released under the terms\n"
+"Claws Mail is free software, released under the terms\n"

 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
 "of the GNU General Public License, version 2 or later, as\n"
 "published by the Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"


@@ -11232,18 +11512,18 @@ msgid ""
 "\n"
 "DONATIONS\n"
 "---------\n"
 "\n"
 "DONATIONS\n"
 "---------\n"

-"If you wish to donate to the Sylpheed-Claws project you can do\n"
+"If you wish to donate to the Claws Mail project you can do\n"

 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"
 "so at <%s>.\n"
 "\n"
 msgstr ""
 "\n"

-"欢迎使用Sylpheed-Claws\n"
+"欢迎使用Claws Mail\n"

 "-------------------------\n"
 "\n"
 "你已经配置了帐号，现在可以点击工具栏上的'收信'图标收取邮件。\n"
 "\n"
 "\n"
 "-------------------------\n"
 "\n"
 "你已经配置了帐号，现在可以点击工具栏上的'收信'图标收取邮件。\n"
 "\n"
 "\n"

-"Sylpheed-Claws可通过插件扩展很多功能，\n"
+"Claws Mail可通过插件扩展很多功能，\n"

 "比如过滤垃圾邮件(Bogofilter或者SpamAssassin插件)，加密邮件(PGP/Mime)，\n"
 "RSS浏览、日历或者其它功能。你可以通过菜单'/配置/插件'来加载插件。\n"
 "\n"
 "比如过滤垃圾邮件(Bogofilter或者SpamAssassin插件)，加密邮件(PGP/Mime)，\n"
 "RSS浏览、日历或者其它功能。你可以通过菜单'/配置/插件'来加载插件。\n"
 "\n"


@@ -11253,7 +11533,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
 "\n"
 "\n"
 "\n"

-"你可以在Sylpheed-Claws的手册中找到更详细的说明，它可以通过菜单项目\n"
+"你可以在Claws Mail的手册中找到更详细的说明，它可以通过菜单项目\n"

 "'/帮助/手册/'或者如下网址找到: \n"
 "\n"
 "一些有用的网址\n"
 "'/帮助/手册/'或者如下网址找到: \n"
 "\n"
 "一些有用的网址\n"


@@ -11266,7 +11546,7 @@ msgstr ""
 "\n"
 "许可协议\n"
 "-------\n"
 "\n"
 "许可协议\n"
 "-------\n"

-"Sylpheed-Claws是自由软件，受GNU通用许可协议(GPL)的条款所约束\n"
+"Claws Mail是自由软件，受GNU通用许可协议(GPL)的条款所约束\n"

 "(GPL V2或者更高版本)。GPL协议由自由软件基金会\n"
 "(Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA)\n"
 "(GPL V2或者更高版本)。GPL协议由自由软件基金会\n"
 "(Free Software Foundation, 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA)\n"


@@ -11274,59 +11554,71 @@ msgstr ""
 "\n"
 "捐款\n"
 "---------\n"
 "\n"
 "捐款\n"
 "---------\n"

-"如果你想捐款给Sylpheed-Claws项目，可访问 <%s>。\n"
+"如果你想捐款给Claws Mail项目，可访问 <%s>。\n"

 "\n"
 "\n"
 
 "\n"
 "\n"
 

-#: src/wizard.c:551
+#: src/wizard.c:564

 msgid "Please enter the mailbox name."
 msgstr "请输入邮箱名称。"
 
 msgid "Please enter the mailbox name."
 msgstr "请输入邮箱名称。"
 

-#: src/wizard.c:579
+#: src/wizard.c:592

 msgid "Please enter your name and email address."
 msgstr "按输入你的名字和邮件地址。"
 
 msgid "Please enter your name and email address."
 msgstr "按输入你的名字和邮件地址。"
 

-#: src/wizard.c:590
+#: src/wizard.c:603

 msgid "Please enter your receiving server and username."
 msgstr "请输入收信服务器和用户名。"
 
 msgid "Please enter your receiving server and username."
 msgstr "请输入收信服务器和用户名。"
 

-#: src/wizard.c:600
+#: src/wizard.c:613

 msgid "Please enter your username."
 msgstr "请输入用户名。"
 
 msgid "Please enter your username."
 msgstr "请输入用户名。"
 

-#: src/wizard.c:610
+#: src/wizard.c:623

 msgid "Please enter your SMTP server."
 msgstr "请输入SMTP服务器名。"
 
 msgid "Please enter your SMTP server."
 msgstr "请输入SMTP服务器名。"
 

-#: src/wizard.c:621
+#: src/wizard.c:634

 msgid "Please enter your SMTP username."
 msgstr "请输入SMTP用户名。"
 
 msgid "Please enter your SMTP username."
 msgstr "请输入SMTP用户名。"
 

-#: src/wizard.c:832
+#: src/wizard.c:881

 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">你的名字:</span>"
 
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">你的名字:</span>"
 

-#: src/wizard.c:837
+#: src/wizard.c:886

 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">你的邮件地址:</span>"
 
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">你的邮件地址:</span>"
 

-#: src/wizard.c:841
+#: src/wizard.c:890

 msgid "Your organization:"
 msgstr "你所在的组织"
 
 msgid "Your organization:"
 msgstr "你所在的组织"
 

-#: src/wizard.c:861
+#: src/wizard.c:913
+msgid ""
+"You can also specify an absolute path, for example: \"/home/john/Documents/"
+"Mail\""
+msgstr "您可以指定一个绝对路径，比如: \"/home/john/Documents/Mail\""
+
+#: src/wizard.c:917

 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">邮箱名称:</span>"
 
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">邮箱名称:</span>"
 

-#: src/wizard.c:891
+#: src/wizard.c:954
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:25\""
+msgstr "您可以在尾端指定端口号: \"mail.example.com:25\""
+
+#: src/wizard.c:958

 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">SMTP服务器名称:</span>"
 
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">SMTP服务器名称:</span>"
 

-#: src/wizard.c:894
+#: src/wizard.c:961

 msgid "Use authentication"
 msgstr "用户鉴权"
 
 msgid "Use authentication"
 msgstr "用户鉴权"
 

-#: src/wizard.c:908
+#: src/wizard.c:975

 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11334,7 +11626,7 @@ msgstr ""
 "SMTP 用户名:\n"
 "<span size=\"small\">(如果与收信用户名相同，可保持为空)</span>"
 
 "SMTP 用户名:\n"
 "<span size=\"small\">(如果与收信用户名相同，可保持为空)</span>"
 

-#: src/wizard.c:921
+#: src/wizard.c:988

 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"


@@ -11342,99 +11634,113 @@ msgstr ""
 "SMTP 密码:\n"
 "<span size=\"small\">(如果与收信设置相同，可保持为空)</span>"
 
 "SMTP 密码:\n"
 "<span size=\"small\">(如果与收信设置相同，可保持为空)</span>"
 

-#: src/wizard.c:949 src/wizard.c:964 src/wizard.c:1055
+#: src/wizard.c:1000
+msgid "Use SSL to connect to SMTP server"
+msgstr "采用SSL连接SMTP服务器"
+
+#: src/wizard.c:1007 src/wizard.c:1230
+msgid "Use SSL via STARTTLS"
+msgstr "通过STARTTLS使用SSL"
+
+#: src/wizard.c:1037 src/wizard.c:1056 src/wizard.c:1165

 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">服务器地址:</span>"
 
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">服务器地址:</span>"
 

-#: src/wizard.c:980
+#: src/wizard.c:1076

 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">本地邮箱:</span>"
 
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">本地邮箱:</span>"
 

-#: src/wizard.c:1022
+#: src/wizard.c:1127

 msgid "IMAP"
 msgstr "IMAP"
 
 msgid "IMAP"
 msgstr "IMAP"
 

-#: src/wizard.c:1047
+#: src/wizard.c:1152

 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">服务器类型:</span>"
 
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">服务器类型:</span>"
 

-#: src/wizard.c:1066
+#: src/wizard.c:1161
+msgid ""
+"You can specify the port number by appending it at the end: \"mail.example."
+"com:110\""
+msgstr "您可以在尾端指定端口号: \"mail.example.com:110\""
+
+#: src/wizard.c:1176

 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">用户名:</span>"
 
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">用户名:</span>"
 

-#: src/wizard.c:1082
+#: src/wizard.c:1192

 msgid "Password:"
 msgstr "密码"
 
 msgid "Password:"
 msgstr "密码"
 

-#: src/wizard.c:1094
+#: src/wizard.c:1204

 msgid "IMAP server directory:"
 msgstr "IMAP服务器目录:"
 
 msgid "IMAP server directory:"
 msgstr "IMAP服务器目录:"
 

-#: src/wizard.c:1125
-msgid "Use SSL to connect to SMTP server"
-msgstr "采用SSL连接SMTP服务器"
-
-#: src/wizard.c:1132
+#: src/wizard.c:1223

 msgid "Use SSL to connect to receiving server"
 msgstr "采用SSL连接服务器收取邮件"
 
 msgid "Use SSL to connect to receiving server"
 msgstr "采用SSL连接服务器收取邮件"
 

-#: src/wizard.c:1248
-msgid "Sylpheed-Claws Setup Wizard"
-msgstr "Sylpheed-Claws 设置向导"
+#: src/wizard.c:1347
+#, fuzzy
+msgid "Claws Mail Setup Wizard"
+msgstr "Claws Mail 设置向导"

 
 

-#: src/wizard.c:1280
-msgid "Welcome to Sylpheed-Claws"
-msgstr "欢迎使用Sylpheed-Claws"
+#: src/wizard.c:1379
+msgid "Welcome to Claws Mail"
+msgstr "欢迎使用Claws Mail "

 
 

-#: src/wizard.c:1288
+#: src/wizard.c:1387

 msgid ""
 msgid ""

-"Welcome to the Sylpheed-Claws setup wizard.\n"
+"Welcome to the Claws Mail setup wizard.\n"

 "\n"
 "We will begin by defining some basic information about you and your most "
 "\n"
 "We will begin by defining some basic information about you and your most "

-"common mail options so that you can start to use Sylpheed-Claws in less than "
+"common mail options so that you can start to use Claws Mail in less than "

 "five minutes."
 msgstr ""
 "five minutes."
 msgstr ""

-"欢迎使用Sylpheed-Claws 设置想到\n"
+"欢迎使用Claws Mail 设置想到\n"

 "\n"
 "\n"

-"看来这是你第一次使用Sylpheed-Claws。所以我们需要先确定一下关于你和你的邮箱的"
-"一些基本信息，你可以在五分钟之内开始使用Sylpheed-Claws。"
+"看来这是你第一次使用Claws Mail。所以我们需要先确定一下关于你和你的邮箱的一些"
+"基本信息，你可以在五分钟之内开始使用Claws Mail。"

 
 

-#: src/wizard.c:1301
+#: src/wizard.c:1400

 msgid "About You"
 msgstr "关于你"
 
 msgid "About You"
 msgstr "关于你"
 

-#: src/wizard.c:1303 src/wizard.c:1312 src/wizard.c:1321 src/wizard.c:1331
-#: src/wizard.c:1341
+#: src/wizard.c:1402 src/wizard.c:1411 src/wizard.c:1420 src/wizard.c:1430

 msgid "Bold fields must be completed"
 msgstr "粗体字段必须填写"
 
 msgid "Bold fields must be completed"
 msgstr "粗体字段必须填写"
 

-#: src/wizard.c:1310
+#: src/wizard.c:1409

 msgid "Receiving mail"
 msgstr "接收邮件"
 
 msgid "Receiving mail"
 msgstr "接收邮件"
 

-#: src/wizard.c:1319
+#: src/wizard.c:1418

 msgid "Sending mail"
 msgstr "发送邮件"
 
 msgid "Sending mail"
 msgstr "发送邮件"
 

-#: src/wizard.c:1329
+#: src/wizard.c:1428

 msgid "Saving mail on disk"
 msgstr "将邮件保存到磁盘"
 
 msgid "Saving mail on disk"
 msgstr "将邮件保存到磁盘"
 

-#: src/wizard.c:1339
-msgid "Security"
-msgstr "安全"
-
-#: src/wizard.c:1349
+#: src/wizard.c:1438

 msgid "Configuration finished"
 msgstr "设置完成"
 
 msgid "Configuration finished"
 msgstr "设置完成"
 

-#: src/wizard.c:1357
+#: src/wizard.c:1446

 msgid ""
 msgid ""

-"Sylpheed-Claws is now ready.\n"
+"Claws Mail is now ready.\n"

 "\n"
 "Click Save to start."
 msgstr ""
 "\n"
 "Click Save to start."
 msgstr ""

-"Sylpheed-Claws配置完成。\n"
+"Claws Mail配置完成。\n"

 "\n"
 "点击[保存]开始使用。"
 
 "\n"
 "点击[保存]开始使用。"
 

+#~ msgid "not initialized\n"
+#~ msgstr "未初始化\n"
+
+#~ msgid "selecting folder '%s'\n"
+#~ msgstr "选择文件夹: '%s'\n"
+
+#~ msgid "selecting message %d\n"
+#~ msgstr "选择邮件 %d\n"