updated po files.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1428 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2006-12-14 07:28:15 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2006-12-14 07:28:15 +0000
commit: 685bead59896a1d0a95d7f638157b92a5da560d5 (patch)
tree: 48c0b6284de529ce0bd2f567ffac99804de02a37 /po
parent: d1366c278bf05e587db7073315c75b192a91be7c (diff)
29 files changed, 1131 insertions, 1131 deletions
diff --git a/po/bg.po b/po/bg.po
index cd05f831..52b37a6a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -974,7 +974,7 @@ msgstr "Име:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -990,16 +990,16 @@ msgid "Lookup"
 msgstr "Справка"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "До:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1181,7 +1181,7 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Забележка"
 
@@ -1735,7 +1735,7 @@ msgstr "/_Инструменти/_Действия"
 msgid "PGP Encrypt"
 msgstr "/_Съобщение/_Криптиране"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME тип"
 
@@ -1815,36 +1815,36 @@ msgstr "Свиванен на редовете"
 msgid "Wrap all long lines"
 msgstr "Свиване на всички дълги редове"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Невалиден MIME тип"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Файлът не съществува или е празен"
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Име на файл"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командния ред за външен редактор е невалиден: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1854,48 +1854,48 @@ msgstr ""
 "Желаете ли принудително прекратяване на процеса?\n"
 "process group id: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Не може да се нареди съобщението на опашката."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Избор на файл"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Избор на файл"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Изпращане на съобщение"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Съобщението беше променено. Изоставяне?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желаете ли да приложите шаблонът `%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Прилагане на шаблон"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Заменяне"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Вмъкване"
@@ -2518,7 +2518,7 @@ msgstr "Изтриване на новинарски акаунт"
 msgid "Newsgroups:"
 msgstr "Новинарски групи:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тема:"
 
@@ -4595,7 +4595,7 @@ msgstr "Нагоре"
 msgid "Down"
 msgstr "Надолу"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Нов)"
 
@@ -5916,7 +5916,7 @@ msgstr "Прилагане към подпапки"
 msgid "use also on reply"
 msgstr "използване и при отговор"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
@@ -6010,43 +6010,43 @@ msgstr "Показани атрибути"
 msgid " Revert to default "
 msgstr "Връщане към подразбиращите се"
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Име на шаблон"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Регистриране"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr "Замяна"
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Символи "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Регистрирани шаблони"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Шаблони"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Грешка във формата на шаблона."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Изтриване на шаблона"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Желаете ли да изтриете шаблонът?"
 
@@ -6796,7 +6796,7 @@ msgstr ""
 msgid "No."
 msgstr "No."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "файл %s вече съществува\n"
diff --git a/po/cs.po b/po/cs.po
index d32eab8c..843e9c91 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -977,7 +977,7 @@ msgstr "Jméno:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Smazat"
 
@@ -993,16 +993,16 @@ msgid "Lookup"
 msgstr "Hledat"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Komu:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slepá kopie:"
 
@@ -1182,7 +1182,7 @@ msgstr "Společná adresa"
 msgid "Personal address"
 msgstr "Osobní adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Poznámka"
 
@@ -1736,7 +1736,7 @@ msgstr "/_Nástroje/_Akce"
 msgid "PGP Encrypt"
 msgstr "/_Zpráva/Zaši_frovat"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME typ"
 
@@ -1816,36 +1816,36 @@ msgstr "Zarovnání"
 msgid "Wrap all long lines"
 msgstr "Zarovnání dlouhých řádků"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Soubor neexistuje nebo je prázdný."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta k souboru"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Špatný příkaz v externím editoru: '%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1855,48 +1855,48 @@ msgstr ""
 "Mám přerušit proces?\n"
 "číslo procesu: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Zprávu nelze zařadit."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Odešle zprávu"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah zprávy se změnil. Chcete ji stornovat?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Opravdu chcete použít šablonu '%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Přidat šablonu"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradit"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložit"
@@ -2521,7 +2521,7 @@ msgstr "Smazat účet pro diskuzní skupinu"
 msgid "Newsgroups:"
 msgstr "Diskusní skupiny:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Předmět:"
 
@@ -4597,7 +4597,7 @@ msgstr "Nahoru"
 msgid "Down"
 msgstr "Dolů"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nový)"
 
@@ -5919,7 +5919,7 @@ msgstr "Zahrnout podsložky"
 msgid "use also on reply"
 msgstr "použít také při odpovědi"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Odpovědět komu:"
 
@@ -6012,43 +6012,43 @@ msgstr "Zobrazené položky"
 msgid " Revert to default "
 msgstr " Návrat k výchozí "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Název šablony"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Registrovat"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Nahradit "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Symboly "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registrované šablony"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Šablona"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Chyba formátu v šabloně."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Smazat šablonu"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Opravdu chcete smazat tuto šablonu?"
 
@@ -6802,7 +6802,7 @@ msgstr "Zpráva %d už byla v mezipaměti.\n"
 msgid "No."
 msgstr "Čís."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "soubor '%s' už existuje\n"
diff --git a/po/da.po b/po/da.po
index 24daf379..ed648507 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -978,7 +978,7 @@ msgstr "Navn:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Slet"
 
@@ -994,16 +994,16 @@ msgid "Lookup"
 msgstr "Overblik"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Til:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1179,7 +1179,7 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Note"
 
@@ -1733,7 +1733,7 @@ msgstr "/_Funktioner/_Handlinger"
 msgid "PGP Encrypt"
 msgstr "/_Meddelelse/_Kryptere"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME type"
 
@@ -1813,36 +1813,36 @@ msgstr "Linie deling"
 msgid "Wrap all long lines"
 msgstr "/_Redigér/Formater _alle lange linier"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Ugyldig MIME type"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Fil eksisterer ikke eller er tom."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Fil navn"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Sti til ekstern editor er ugyldig: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1852,48 +1852,48 @@ msgstr ""
 "Afbryde?\n"
 "ID: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Meddelelse kan ikke lægges i kø."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Vælg fil"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Vælg fil"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Sende meddelelse"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Denne meddelelse er ændret. Slet?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vil du benytte skabelon `%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Benyt skabelon"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Erstat"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Indæst"
@@ -2517,7 +2517,7 @@ msgstr "Slet nyheds konto"
 msgid "Newsgroups:"
 msgstr "Nyhedsgrupper:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Emne:"
 
@@ -4595,7 +4595,7 @@ msgstr "Op"
 msgid "Down"
 msgstr "Ned"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nye)"
 
@@ -5914,7 +5914,7 @@ msgstr "Benyt til undermapper"
 msgid "use also on reply"
 msgstr "benyt også ved svar"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Svar til:"
 
@@ -6007,43 +6007,43 @@ msgstr "Viste oplysninger"
 msgid " Revert to default "
 msgstr " Standard indstilling "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Skabelon navn"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Registrere"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Erstat "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Symbol "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registrerede skabloner"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Skabeloner"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Skabelon"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Skabelon format fejl."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Slet Skabelon"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Vil du virkelig slette denne Skabelon?"
 
@@ -6802,7 +6802,7 @@ msgstr "meddelelse %d er allerede gemt.\n"
 msgid "No."
 msgstr "Nr."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "filen %s eksisterer allerede\n"
diff --git a/po/de.po b/po/de.po
index 29718fcf..f5f97819 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-12-09 08:22+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -977,7 +977,7 @@ msgstr "Name:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Löschen"
 
@@ -993,16 +993,16 @@ msgid "Lookup"
 msgstr "Vorschau"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "An:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1183,7 +1183,7 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Notiz"
 
@@ -1704,7 +1704,7 @@ msgstr "PGP Unterschreiben"
 msgid "PGP Encrypt"
 msgstr "PGP Verschlüsseln"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME-Typ"
 
@@ -1783,36 +1783,36 @@ msgstr "Zeilenumbruch"
 msgid "Wrap all long lines"
 msgstr "Alle langen Zeilen umbrechen"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Ungültiger MIME Typ"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Datei existiert nicht oder ist leer."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Kommandozeile für den externen Editor ist ungültig: '%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1821,44 +1821,44 @@ msgstr ""
 "Der externe Editor arbeitet noch.\n"
 "Prozess terminieren (pid: %d)?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Wähle Datei(en)"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Wähle Datei"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Speichern der Nachricht"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Diese Nachricht wurde geändert. Speichern als Entwurf?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Schließen _ohne Speichern"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Schablone '%s' übernehmen ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Schablone übernehmen"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "E_rsetzen"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Einfügen"
 
@@ -2474,7 +2474,7 @@ msgstr "News-Account löschen"
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Betreff:"
 
@@ -4521,7 +4521,7 @@ msgstr "Auf"
 msgid "Down"
 msgstr "Ab"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Neue)"
 
@@ -5786,7 +5786,7 @@ msgstr "Auf Unterablagen anwenden"
 msgid "use also on reply"
 msgstr "auch bei Antwort benutzen"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
@@ -5878,43 +5878,43 @@ msgstr "Angezeigte Einträge"
 msgid " Revert to default "
 msgstr " Standardeinstellung"
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Schablonenname"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Ersetzen "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Symbole "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registrierte Schablonen"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Schablonen"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Schablone"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Schablonen-Format-Fehler."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Schablone löschen"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Wollen Sie diese Schablone wirklich löschen?"
 
@@ -6661,7 +6661,7 @@ msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 msgid "No."
 msgstr "Nr."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "Datei %s existiert bereits\n"
diff --git a/po/el.po b/po/el.po
index c2ab2946..13158215 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -987,7 +987,7 @@ msgstr "Όνομα:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -1003,16 +1003,16 @@ msgid "Lookup"
 msgstr "Αναζήτηση"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Προς:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr ""
 
@@ -1189,7 +1189,7 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -1754,7 +1754,7 @@ msgstr "/Εκτέλεση"
 msgid "PGP Encrypt"
 msgstr "/Μήνυμα/Κρυπτογράφηση"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "τύπος MIME"
 
@@ -1839,37 +1839,37 @@ msgstr ""
 msgid "Wrap all long lines"
 msgstr "Αναδίπλωση γραμμών"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Μη έγκυρος τύπος MIME"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Το αρχείο δεν υπάρχει, ή είναι άδειο."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 #, fuzzy
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διάδρομος"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Η εντολή για το εξωτερικό πρόγραμμα δεν είναι έγκυρη: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1879,49 +1879,49 @@ msgstr ""
 "Να επιβάλλω τερματισμό της διεργασίας;\n"
 "process group id:  %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Δεν μπορώ να βάλω στην ουρά το μήνυμα."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Επιλογή αρχείου"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Αυτό το μήνυμα έχει τροποποιηθεί, να απορριφθεί;"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, fuzzy
 msgid "Apply template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Απάντηση"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Εισαγωγή"
@@ -2563,7 +2563,7 @@ msgstr "Διαγραφή λογαριασμού news"
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Θέμα:"
 
@@ -4729,7 +4729,7 @@ msgstr "Πάνω"
 msgid "Down"
 msgstr "Κάτω"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Νέο)"
 
@@ -6057,7 +6057,7 @@ msgstr ""
 msgid "use also on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Απάντηση σε"
@@ -6155,47 +6155,47 @@ msgstr "Εμφανισθείσες κεφαλίδες"
 msgid " Revert to default "
 msgstr " Θέσε ως σύνηθη λογαριασμό "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 #, fuzzy
 msgid "Template name"
 msgstr "Όνομα κεφαλίδας"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Καταχώρηση"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Αντικατάσταση"
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr ""
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 #, fuzzy
 msgid "Registered templates"
 msgstr "Ορισμένοι κανόνες"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr ""
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr ""
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 #, fuzzy
 msgid "Template format error."
 msgstr "Όνομα κεφαλίδας"
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 #, fuzzy
 msgid "Delete template"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 #, fuzzy
 msgid "Do you really want to delete this template?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
@@ -6973,7 +6973,7 @@ msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 msgid "No."
 msgstr "Αρ."
 
-#: src/template.c:168
+#: src/template.c:174
 #, fuzzy, c-format
 msgid "file %s already exists\n"
 msgstr "το %s υπάρχει ήδη"
diff --git a/po/es.po b/po/es.po
index 91766351..b93aae72 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-12-02 13:12+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -975,7 +975,7 @@ msgstr "Nombre:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Borrar"
 
@@ -991,16 +991,16 @@ msgid "Lookup"
 msgstr "Buscar"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1180,7 +1180,7 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1698,7 +1698,7 @@ msgstr "Firmar con PGP"
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "Tipo MIME"
 
@@ -1777,36 +1777,36 @@ msgstr "Recortar"
 msgid "Wrap all long lines"
 msgstr "Recortar todas las líneas largas"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "El fichero no existe o está vacío."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Nombre de fichero"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La orden del editor externo es inválida: «%s»\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1815,44 +1815,44 @@ msgstr ""
 "El editor externo aún esta activo.\n"
 "¿Forzar la finalización del proceso (pid: %d)?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Seleccionar ficheros"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Seleccionar fichero"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Guardar mensaje"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Este mensaje ha sido modificado. ¿Guardarlo en la carpeta Borradores?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Cerrar _sin guardar"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla «%s»?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Insertar"
 
@@ -2470,7 +2470,7 @@ msgstr "Borrar cuenta de noticias"
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -4519,7 +4519,7 @@ msgstr "Arriba"
 msgid "Down"
 msgstr "Abajo"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nueva)"
 
@@ -5774,7 +5774,7 @@ msgstr "Aplicar en subcarpetas"
 msgid "use also on reply"
 msgstr "utilizar también al responder"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
@@ -5864,43 +5864,43 @@ msgstr "Elementos visibles"
 msgid " Revert to default "
 msgstr " Valores por defecto "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Nombre de plantilla"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Registrar"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Sustituir "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Símbolos "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Plantillas registradas"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Error de formato en la plantilla."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
@@ -6636,7 +6636,7 @@ msgstr "se ha(n) filtrado %d mensaje(s)."
 msgid "No."
 msgstr "No."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "el fichero %s ya existe\n"
diff --git a/po/et.po b/po/et.po
index 64b61d11..996ce6fc 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -980,7 +980,7 @@ msgstr "Nimi:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -996,16 +996,16 @@ msgid "Lookup"
 msgstr "Otsi"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Kellele:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
@@ -1186,7 +1186,7 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Märkus"
 
@@ -1741,7 +1741,7 @@ msgstr "/_Tööriist/Tegevused"
 msgid "PGP Encrypt"
 msgstr "/_Kiri/Krüpteeri"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME tüüp"
 
@@ -1821,37 +1821,37 @@ msgstr "Reaäär"
 msgid "Wrap all long lines"
 msgstr "Murra kõik pikad read"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Vale MIME tüüp."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Faili ei eksisteeri või on see tühi."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 #, fuzzy
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Failinimi"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Välise redaktori käsurida on vale: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1861,48 +1861,48 @@ msgstr ""
 "Kas hävitame protsessi?\n"
 "protsessi grupi id: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Kirja ei õnnestunud järjekorda asetada."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Määra fail"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Määra fail"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Saada kiri"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Seda kirja on muudetud. kas kaotame selle?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Kas te tahate seda malli lisada '%s'-e ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Lisa mall"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Asenda"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Lisa"
@@ -2529,7 +2529,7 @@ msgstr "Kustuta uudistegrupp"
 msgid "Newsgroups:"
 msgstr "Uudistegrupid:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Pealkiri:"
 
@@ -4599,7 +4599,7 @@ msgstr "Üles"
 msgid "Down"
 msgstr "Alla"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Uus)"
 
@@ -5919,7 +5919,7 @@ msgstr ""
 msgid "use also on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Vastus saata"
@@ -6013,43 +6013,43 @@ msgstr "Näidatud elemendid"
 msgid " Revert to default "
 msgstr " Vaikimisi tagasi "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Malli nimi"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Registreeri"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr "Lisa"
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Sümbolid "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registreeritud mallid"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Vormid"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Vorm"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Malli formaadi viga."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Kustuta mall"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Kas te tõesti tahate seda vormi kustutada?"
 
@@ -6803,7 +6803,7 @@ msgstr "kiri %d on juba salvestatud.\n"
 msgid "No."
 msgstr "Ei."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "fail %s on juba olemas\n"
diff --git a/po/fr.po b/po/fr.po
index 9a6933bc..28903202 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-02-23 00:32+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -987,7 +987,7 @@ msgstr "Nom :"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1003,16 +1003,16 @@ msgid "Lookup"
 msgstr "Rechercher"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "À :"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
@@ -1194,7 +1194,7 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Information"
 
@@ -1712,7 +1712,7 @@ msgstr "Signature PGP"
 msgid "PGP Encrypt"
 msgstr "Chiffrement PGP"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "Type MIME"
 
@@ -1791,36 +1791,36 @@ msgstr "Justifier"
 msgid "Wrap all long lines"
 msgstr "Justifier tout le message"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Type MIME invalide."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Le fichier n'existe pas ou est vide."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La ligne de commande pour l'éditeur externe est invalide : `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1829,46 +1829,46 @@ msgstr ""
 "L'éditeur externe est encore ouvert.\n"
 "Forcer sa fermeture (id de traitement de groupe : %d)?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Impossible de mettre ce message dans la file d'attente."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Sélection de fichier"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Choisissez un fichier"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Enregistrer le message"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr ""
 "Ce message a été modifié. Voulez-vous l'enregistrer dans le dossier des "
 "brouillons ?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Fermer _sans enregistrer"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Voulez-vous appliquer le modèle `%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Appliquer un modèle"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Insérer"
 
@@ -2486,7 +2486,7 @@ msgstr "Suppression du compte des groupes de discussion"
 msgid "Newsgroups:"
 msgstr "Groupe de discussion :"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Sujet :"
 
@@ -4547,7 +4547,7 @@ msgstr "Plus haut"
 msgid "Down"
 msgstr "Plus bas"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nouveau)"
 
@@ -5807,7 +5807,7 @@ msgstr "Appliquer aux sous-dossiers"
 msgid "use also on reply"
 msgstr "utiliser également pour les réponses"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Répondre à :"
 
@@ -5898,43 +5898,43 @@ msgstr "Éléments affichés"
 msgid " Revert to default "
 msgstr " Revenir aux valeurs par défaut "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Enregistrer"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Remplacer "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Symboles "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Modèles enregistrés"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Modèle"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Erreur de format dans le modèle."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Supprimer le modèle"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment détruire ce modèle ?"
 
@@ -6674,7 +6674,7 @@ msgstr "%d message(s) ont été filtré(s)."
 msgid "No."
 msgstr "N°"
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "le fichier %s existe déjà\n"
diff --git a/po/gl.po b/po/gl.po
index 6b4a2469..2f8dc764 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -978,7 +978,7 @@ msgstr "Nome:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Borrar"
 
@@ -994,16 +994,16 @@ msgid "Lookup"
 msgstr "Buscar"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1185,7 +1185,7 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Notificación"
 
@@ -1740,7 +1740,7 @@ msgstr "/_Ferramentas/Acció_ns"
 msgid "PGP Encrypt"
 msgstr "/_Mensaxe/_Encriptar"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "Tipo MIME"
 
@@ -1820,36 +1820,36 @@ msgstr "Recortar"
 msgid "Wrap all long lines"
 msgstr "Cortar todas as líneas longas"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "O ficheiro non existe ou está valeiro."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "o comando do editor externo non e válido: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1859,48 +1859,48 @@ msgstr ""
 "¿Desea terminar o proceso?\n"
 "Id. de proceso: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "O mensaxe non se pode poñer na cola."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Seleccionar ficheiro"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Enviar Mensaxe"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensaxe foi modificado. ¿Desea descartala?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quere aplicar a plantilla `%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Substituír"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Inserir"
@@ -2525,7 +2525,7 @@ msgstr "Borrar conta de novas"
 msgid "Newsgroups:"
 msgstr "Grupos de novas:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -4597,7 +4597,7 @@ msgstr "Arriba"
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nova)"
 
@@ -5918,7 +5918,7 @@ msgstr "Aplicar en subcarpetas"
 msgid "use also on reply"
 msgstr "utilizar tamén ó respostar"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Respostar-A:"
 
@@ -6011,43 +6011,43 @@ msgstr "Elementos visibles"
 msgid " Revert to default "
 msgstr " Valores por defecto "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Nome de plantilla"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Rexistrar"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Substituír "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Símbolos "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Plantilas rexistradas"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Plantilas"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Error de formato na plantilla."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "¿Quere borrar realmente esta plantilla?"
 
@@ -6800,7 +6800,7 @@ msgstr "o mensaxe %d xa esta en caché.\n"
 msgid "No."
 msgstr "Non."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "o ficheiro %s xa existe\n"
diff --git a/po/hr.po b/po/hr.po
index a585f71f..f0c7017c 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -983,7 +983,7 @@ msgstr "Ime:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Obriši"
 
@@ -999,16 +999,16 @@ msgid "Lookup"
 msgstr "Potraži"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1183,7 +1183,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Obavijest"
 
@@ -1748,7 +1748,7 @@ msgstr "/_Izvrši"
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Kriptiraj"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME tip"
 
@@ -1829,37 +1829,37 @@ msgstr "Sažimanje"
 msgid "Wrap all long lines"
 msgstr "/_Uredi/Sažmi sve duge _linije"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 #, fuzzy
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za vanjski uređivač je pogrešna: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1869,49 +1869,49 @@ msgstr ""
 "Ugasiti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promijenjena, odbaciti?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, fuzzy, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 #, fuzzy
 msgid "Apply template"
 msgstr "Briši obrazac"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Obrazac"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2543,7 +2543,7 @@ msgstr "Obriši news račun"
 msgid "Newsgroups:"
 msgstr "News grupe:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -4695,7 +4695,7 @@ msgstr "Gore"
 msgid "Down"
 msgstr "Dolje"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -6015,7 +6015,7 @@ msgstr ""
 msgid "use also on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Odvovori-Na"
@@ -6109,43 +6109,43 @@ msgstr "Prikazane pojedinosti"
 msgid " Revert to default "
 msgstr " Vrati na uobičajeno "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Ime obrasca"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Unesi"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Zamjeni "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registrirani obrasci"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Obrasci"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Obrazac"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Greška formata obrasca."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Briši obrazac"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
@@ -6916,7 +6916,7 @@ msgstr "poruka %d već je prihvaćena.\n"
 msgid "No."
 msgstr "Ne."
 
-#: src/template.c:168
+#: src/template.c:174
 #, fuzzy, c-format
 msgid "file %s already exists\n"
 msgstr "datoteka %s već postoji\n"
diff --git a/po/hu.po b/po/hu.po
index e06e0729..41e45251 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-07-15 17:27+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -980,7 +980,7 @@ msgstr "Név:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Törlés"
 
@@ -996,16 +996,16 @@ msgid "Lookup"
 msgstr "Előnézet"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Címzett:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Titkos másolat:"
 
@@ -1181,7 +1181,7 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Megjegyzés"
 
@@ -1699,7 +1699,7 @@ msgstr "PGP Aláírás"
 msgid "PGP Encrypt"
 msgstr "PGP Titkosítás"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME típus"
 
@@ -1778,36 +1778,36 @@ msgstr "Sortörés"
 msgid "Wrap all long lines"
 msgstr "Az összes hosszú sor törése"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Érvénytelen MIME típus."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "A fájl nem létezik vagy üres."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1816,44 +1816,44 @@ msgstr ""
 "A külső szerkesztő még dolgozik.\n"
 "A processz kényszerített kilövése (pid: %d)?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Az üzenetet nem sikerült a Várakozó sorba rakni"
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Fájlok választása"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Fájl választás"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Üzenet mentése"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Az üzenet megváltozott. Menti a Vázlatok mappába?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Tényleg alkalmazni szeretné a(z) `%s' sablont?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Sablon alkalmazása"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "_Helyettesít"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Beszúrás"
 
@@ -2470,7 +2470,7 @@ msgstr "Hírhozzáférés törlése"
 msgid "Newsgroups:"
 msgstr "Hírcsoportok:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tárgy:"
 
@@ -4522,7 +4522,7 @@ msgstr "Fel"
 msgid "Down"
 msgstr "Le"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Új)"
 
@@ -5784,7 +5784,7 @@ msgstr "Alkalmazás almappákra"
 msgid "use also on reply"
 msgstr "válasznál is használja"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Válaszcím:"
 
@@ -5874,43 +5874,43 @@ msgstr "Megjelenített elemek"
 msgid " Revert to default "
 msgstr " Alapértelmezettre visszaállít"
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Sablon név"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Helyettesít "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Szimbólumok "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Regisztrált sablonok"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Sablonok"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Sablon"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Sablon formátumhiba."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Sablon törlése"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Tényleg törölni szeretné ezt a sablont?"
 
@@ -6648,7 +6648,7 @@ msgstr "%d üzenet szűrése elvégezve."
 msgid "No."
 msgstr "Db"
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "%s fájl már létezik\n"
diff --git a/po/it.po b/po/it.po
index 61dd94de..7c225e3a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-10-14 11:32+0200\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -978,7 +978,7 @@ msgstr "Nome:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Elimina"
 
@@ -994,16 +994,16 @@ msgid "Lookup"
 msgstr "Cerca"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "A:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1184,7 +1184,7 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1709,7 +1709,7 @@ msgstr "Firma PGP"
 msgid "PGP Encrypt"
 msgstr "Cifratura PGP"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "Tipo MIME"
 
@@ -1788,36 +1788,36 @@ msgstr "A capo riga"
 msgid "Wrap all long lines"
 msgstr "Manda a capo tutte le righe lunghe"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Tipo MIME non valido."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Il file non esiste o è vuoto."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "La riga di comando per l'editor esterno non è valida: «%s»\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1826,44 +1826,44 @@ msgstr ""
 "L'editor esterno è ancora attivo.\n"
 "Forzare la conclusione del processo (pid:%d)?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Impossibile accodare il messaggio."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Seleziona i file"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Selezione del file"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Salva il messaggio"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Questo messaggio è stato modificato. Salvarlo nella cartella bozze?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Chiudi sen_za salvare"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Applicare il modello «%s» ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Applica il modello"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -2482,7 +2482,7 @@ msgstr "Elimino l'account delle news"
 msgid "Newsgroups:"
 msgstr "Newsgroup:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Oggetto:"
 
@@ -4533,7 +4533,7 @@ msgstr "Su"
 msgid "Down"
 msgstr "Giù"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nuovo)"
 
@@ -5796,7 +5796,7 @@ msgstr "Applica alle sottocartelle"
 msgid "use also on reply"
 msgstr "usa anche nella risposta"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Rispondi a:"
 
@@ -5887,43 +5887,43 @@ msgstr "Voci visualizzate"
 msgid " Revert to default "
 msgstr " Ritorna al predefinito "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Nome del modello"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr " Registra "
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Sostituisci "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Modelli registrati"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Modelli"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Modello"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Errore nel formato del modello."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Elimina il modello"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Eliminare questo modello?"
 
@@ -6661,7 +6661,7 @@ msgstr "sono stati filtrati %d messaggi(o)."
 msgid "No."
 msgstr "No."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "il file %s esiste già\n"
diff --git a/po/ja.po b/po/ja.po
index be60efcd..bab38f9b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -975,7 +975,7 @@ msgstr "名前:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "削除"
 
@@ -991,16 +991,16 @@ msgid "Lookup"
 msgstr "検索"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "宛先:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1178,7 +1178,7 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "注意"
 
@@ -1699,7 +1699,7 @@ msgstr "PGP署名"
 msgid "PGP Encrypt"
 msgstr "PGP暗号化"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME タイプ"
 
@@ -1778,36 +1778,36 @@ msgstr "整形"
 msgid "Wrap all long lines"
 msgstr "すべての長い行を折り返す"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "無効な MIME タイプです。"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "ファイルが存在しないかまたは空です。"
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部エディタのコマンドラインが無効です: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1816,44 +1816,44 @@ msgstr ""
 "外部エディタが動作中です。\n"
 "プロセスを強制終了しますか(pid: %d)?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "メッセージを送信待機できません。"
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "ファイルの選択"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "メッセージの保存"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "このメッセージは変更されています。草稿に保存しますか?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "保存せずに閉じる(_W)"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "テンプレート `%s' を適用しますか?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "テンプレートの適用"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "挿入(_I)"
 
@@ -2469,7 +2469,7 @@ msgstr "ニュースアカウントの削除"
 msgid "Newsgroups:"
 msgstr "ニュースグループ:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "件名:"
 
@@ -4511,7 +4511,7 @@ msgstr "  ↑  "
 msgid "Down"
 msgstr "  ↓  "
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(新規)"
 
@@ -5760,7 +5760,7 @@ msgstr "サブフォルダにも適用する"
 msgid "use also on reply"
 msgstr "返信時にも使用"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
@@ -5850,43 +5850,43 @@ msgstr "表示する項目"
 msgid " Revert to default "
 msgstr " 初期設定に戻す "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "テンプレート名"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "登録"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr "  置換  "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " 記号 "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "登録済みテンプレート"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "テンプレート"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "テンプレート"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "テンプレートの書式が不正です。"
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "テンプレートの削除"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "本当にこのテンプレートを削除してもいいですか?"
 
@@ -6630,7 +6630,7 @@ msgstr "%d 通のメッセージが振り分けられました。"
 msgid "No."
 msgstr "番号"
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "ファイル %s はすでに存在します\n"
diff --git a/po/ko.po b/po/ko.po
index c7119eed..1090dee9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -969,7 +969,7 @@ msgstr "이름:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "삭제"
 
@@ -985,16 +985,16 @@ msgid "Lookup"
 msgstr "찾기"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "받는 사람:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
@@ -1169,7 +1169,7 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "알림"
 
@@ -1723,7 +1723,7 @@ msgstr "/도구(_T)/동작(_n)"
 msgid "PGP Encrypt"
 msgstr "/메시지(_M)/암호화(_E)"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "마임 타입"
 
@@ -1803,37 +1803,37 @@ msgstr "줄바꿈"
 msgid "Wrap all long lines"
 msgstr "긴 줄에대해 자동 줄바꿈을 합니다"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "올바르지않은 마임 타입."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "파일이 없거나 비여있습니다."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 #, fuzzy
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "외부 편집기 명령어가 올바르지않습니다: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1843,48 +1843,48 @@ msgstr ""
 "이 프로세스를 강제로 종료시킬까요?\n"
 "프로세스 그룹 아이디: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "메시지를 임시 보관함에 넣을수가 없습니다."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "파일 선택"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "파일 선택"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "메시지 보내기"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "이 메시지는 수정되었습니다. 변경사항을 버릴까요?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "`%s' 템플릿을 적용할까요?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "템플릿을 적용합니다."
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "대체"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "삽입"
@@ -2508,7 +2508,7 @@ msgstr "뉴스그룹 계정 삭제"
 msgid "Newsgroups:"
 msgstr "뉴스그룹:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "제목:"
 
@@ -4554,7 +4554,7 @@ msgstr "위로"
 msgid "Down"
 msgstr "아래로"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(새 규칙)"
 
@@ -5868,7 +5868,7 @@ msgstr "하위 폴더에 적용"
 msgid "use also on reply"
 msgstr "회신시에도 사용"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "회신주소:"
 
@@ -5959,43 +5959,43 @@ msgstr "표시될 항목"
 msgid " Revert to default "
 msgstr " 기본값으로 원상복구 "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "템플릿 이름"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "등록"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " 치환"
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " 심볼 "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "등록된 템플릿"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "템플릿"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "템플릿"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "템플릿 형식 에러."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "템플릿을 지웁니다"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "정말로 이 템플릿을 삭제하시겠습니까?"
 
@@ -6745,7 +6745,7 @@ msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 msgid "No."
 msgstr "번호"
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "%s 파일이 이미 존재합니다\n"
diff --git a/po/lt.po b/po/lt.po
index 2110101f..6def55ad 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -975,7 +975,7 @@ msgstr "Vardas:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Ištrinti"
 
@@ -991,16 +991,16 @@ msgid "Lookup"
 msgstr "Ieškoti"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Kam:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
@@ -1176,7 +1176,7 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Pranešimas"
 
@@ -1693,7 +1693,7 @@ msgstr "PGP parašas"
 msgid "PGP Encrypt"
 msgstr "PGP šifravimas"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME tipas"
 
@@ -1772,36 +1772,36 @@ msgstr "Eilučių laužymas"
 msgid "Wrap all long lines"
 msgstr "Laužyti ilgas eilutes"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Neteisingas MIME tipas."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Failas neegzistuoja arba yra tuščias."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Failo vardas"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neteisinga išorinio redaktoriaus komanda: „%s“\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1810,44 +1810,44 @@ msgstr ""
 "Išorinis redaktorius vis dar veikia.\n"
 "Nutraukti procesą? (pid: %d)\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Negaliu įdėti laiško į eilę."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Žymėti failus"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Žymėti failą"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Išsaugoti laišką"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Laiškas buvo redaguotas. Saugoti „Juodraščiuose“?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Uždaryti _neišsaugant"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ar norite naudoti šabloną „%s“?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Naudoti šabloną"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "Įterpt_i"
 
@@ -2463,7 +2463,7 @@ msgstr "Pašalinti naujienų sąskaitą"
 msgid "Newsgroups:"
 msgstr "Naujienų grupės"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -4510,7 +4510,7 @@ msgstr "Aukštyn"
 msgid "Down"
 msgstr "Žemyn"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Naujas)"
 
@@ -5765,7 +5765,7 @@ msgstr "Pritaikyti ir pakatalogiams"
 msgid "use also on reply"
 msgstr "naudoti ir atsakant"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Atsakyti kam:"
 
@@ -5855,43 +5855,43 @@ msgstr "Rodomi laukai"
 msgid " Revert to default "
 msgstr " Atkurti į įprastą "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Šablono pavadinimas"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Registruoti"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Pakeisti "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Simboliai "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registruoti šablonai"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Šablonai"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Šablonas"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Šablono formato klaida."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Ištrinti šabloną"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Ar tikrai norite ištrinti šį šabloną?"
 
@@ -6629,7 +6629,7 @@ msgstr "Filtruota laiškų: %d"
 msgid "No."
 msgstr "Nr."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "failas %s jau egzistuoja\n"
diff --git a/po/nl.po b/po/nl.po
index 8210328a..f336fd69 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -983,7 +983,7 @@ msgstr "Naam:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -999,16 +999,16 @@ msgid "Lookup"
 msgstr "Zoeken"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Aan:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1187,7 +1187,7 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Bericht"
 
@@ -1704,7 +1704,7 @@ msgstr "Ondertekenen met PGP"
 msgid "PGP Encrypt"
 msgstr "Coderen met PGP"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME-type"
 
@@ -1783,36 +1783,36 @@ msgstr "Terugloop"
 msgid "Wrap all long lines"
 msgstr "Lange regels op meerdere regels zetten"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Ongeldig MIME type."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Bestand bestaat niet of is leeg."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "De ingegeven opdracht voor de externe editor is onjuist: '%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1821,44 +1821,44 @@ msgstr ""
 "Het andere programma is nog steeds actief.\n"
 "Zal ik het programma afbreken (pid: %d?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Kan bericht niet in de wachtrij plaatsen."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Selecteer bestanden"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Selecteer bestand"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Bericht opslaan"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Dit bericht is aangepast. Opslaan als Klad?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Sluiten _zonder opslaan"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wilt u het sjabloon '%s' toepassen?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Invoegen"
 
@@ -2477,7 +2477,7 @@ msgstr "Verwijder nieuwsaccount"
 msgid "Newsgroups:"
 msgstr "Nieuwsgroepen:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Onderwerp:"
 
@@ -4533,7 +4533,7 @@ msgstr "Omhoog"
 msgid "Down"
 msgstr "Omlaag"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(nieuw)"
 
@@ -5800,7 +5800,7 @@ msgstr "Toepassen op submappen"
 msgid "use also on reply"
 msgstr "ook gebruiken bij beantwoorden"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Antwoord-Aan:"
 
@@ -5891,43 +5891,43 @@ msgstr "Weergegeven items"
 msgid " Revert to default "
 msgstr " Standaard herstellen"
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Sjabloonnaam:"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Toevoegen"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Vervangen"
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Gebruikte sjablonen"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Sjabloonbeheer"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Sjabloon"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Sjabloon opmaakfout."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Verwijder sjabloon"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Wil je dit sjabloon werkelijk verwijderen?"
 
@@ -6666,7 +6666,7 @@ msgstr "Er zijn %d berichten gefilterd."
 msgid "No."
 msgstr "Nr."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "bestand %s bestaat al\n"
diff --git a/po/pl.po b/po/pl.po
index cefe3b4b..38152134 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -974,7 +974,7 @@ msgstr "Nazwa:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Usuń"
 
@@ -990,16 +990,16 @@ msgid "Lookup"
 msgstr "Wyszukaj"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Do:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
@@ -1182,7 +1182,7 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Notatka"
 
@@ -1702,7 +1702,7 @@ msgstr "Podpis PGP"
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "typ MIME"
 
@@ -1782,36 +1782,36 @@ msgstr "Zawijanie linii"
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie długie linie"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Niepoprawny typ MIME."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Brak pliku lub pusty plik."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Niepoprawna linia wywołania zewnętrznego edytora: \"%s\"\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1821,47 +1821,47 @@ msgstr ""
 "Czy wymusić zakończenie procesu?\n"
 "identyfikator grupy procesów: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Nie można wstawić wiadomości do kolejki."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Wybierz pliki"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Wybierz plik"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Wyślij wiadomość"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Wiadomość została zmieniona, czy porzucić ją?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz zastosować szablon \"%s\"?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Zastosuj szablon"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamień"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Wstaw"
@@ -2482,7 +2482,7 @@ msgstr "Usuń konto grup dyskusyjnych"
 msgid "Newsgroups:"
 msgstr "Grupy dyskusyjne:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Temat:"
 
@@ -4520,7 +4520,7 @@ msgstr "W górę"
 msgid "Down"
 msgstr "W dół"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nowy)"
 
@@ -5801,7 +5801,7 @@ msgstr "Stosowane także do podkatalogów"
 msgid "use also on reply"
 msgstr "użycie także przy odpowiadaniu"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Adres zwrotny:"
 
@@ -5894,43 +5894,43 @@ msgstr "Wyświetlone elementy"
 msgid " Revert to default "
 msgstr " Przywróć domyślne "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Nazwa szablonu"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Zastąp "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Symbole "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Zarejestrowane szablony"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Szablony"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Szablon"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Błąd formatu szablonu."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Usuń szablon"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Czy naprawdę chcesz usunąć ten szablon?"
 
@@ -6698,7 +6698,7 @@ msgstr "%d wiadomość(i) przefiltrowano."
 msgid "No."
 msgstr "Nr"
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "plik %s już istnieje\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d99bf182..d5f40182 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-12-07 14:14-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -982,7 +982,7 @@ msgstr "Nome:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Apagar"
 
@@ -998,16 +998,16 @@ msgid "Lookup"
 msgstr "Procurar"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Para:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Cco:"
 
@@ -1187,7 +1187,7 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Notificação"
 
@@ -1709,7 +1709,7 @@ msgstr "Assinar (PGP)"
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "Tipo MIME"
 
@@ -1788,36 +1788,36 @@ msgstr "Quebra de linha"
 msgid "Wrap all long lines"
 msgstr "Quebrar todas as linhas compridas"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Tipo MIME inválido."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "O arquivo não existe ou está vazio."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Nome do arquivo"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linha de comando do editor externo inválida: '%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1826,44 +1826,44 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Selecionar arquivos"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Selecionar arquivo"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Salvar mensagem"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Esta mensagem foi modificada. Salvá-la na pasta de rascunhos?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "_Fechar sem salvar"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Quer aplicar o modelo `%s'?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Aplicar Modelo"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Inserir"
 
@@ -2482,7 +2482,7 @@ msgstr "Apagar conta de grupo de notícias"
 msgid "Newsgroups:"
 msgstr "Grupos de notícias:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Assunto:"
 
@@ -4530,7 +4530,7 @@ msgstr "Acima"
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -5785,7 +5785,7 @@ msgstr "Aplicar nas subpastas"
 msgid "use also on reply"
 msgstr "Usar também ao responder"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Responder para:"
 
@@ -5876,43 +5876,43 @@ msgstr "Itens mostrados"
 msgid " Revert to default "
 msgstr " Voltar ao padrão "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Nome do Modelo"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Registrar"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Sustituir "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Símbolos "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Modelos registrados"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Modelo"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Erro no formato do modelo"
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Apagar modelo"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Quer realmente apagar este modelo?"
 
@@ -6648,7 +6648,7 @@ msgstr "%d mensagem(ns) foram filtradas."
 msgid "No."
 msgstr "Nº"
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "arquivo %s já existe\n"
diff --git a/po/ro.po b/po/ro.po
index 820e6037..05627b6d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-12-13 02:22+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -997,7 +997,7 @@ msgstr " Nume:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Șterge"
 
@@ -1013,16 +1013,16 @@ msgid "Lookup"
 msgstr "Căutare"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Către:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1202,7 +1202,7 @@ msgstr "Adrese comune:"
 msgid "Personal address"
 msgstr "Adrese personale:"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Notificare"
 
@@ -1728,7 +1728,7 @@ msgstr "Semnătură PGP"
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "Tip MIME"
 
@@ -1809,36 +1809,36 @@ msgstr "Desparte liniile"
 msgid "Wrap all long lines"
 msgstr "Desparte toate liniile lungi"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Tip MIME invalid."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Fișierul nu există sau este gol."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Nume fișier"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Linia de comandă este invalidă: '%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1847,44 +1847,44 @@ msgstr ""
 "Editorul extern este încă în funcțiune.\n"
 "Forțați terminarea procesului (pid: %d) ?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Nu se poate pune mesajul în coada de așteptare."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Selectează fișiere"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Selectează fișier"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Salvează mesaj"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Acest mesaj a fost modificat. Îl salvați în folderul ciorne ?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Închide _fără salvare"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Doriți să aplicați șablonul '%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Aplică șablon"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "Înl_ocuiește"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Inserează"
 
@@ -2508,7 +2508,7 @@ msgstr "Șterge cont de știri"
 msgid "Newsgroups:"
 msgstr "Newsgroup-uri:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Subiect:"
 
@@ -4593,7 +4593,7 @@ msgstr "Sus"
 msgid "Down"
 msgstr "Jos"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nou)"
 
@@ -5864,7 +5864,7 @@ msgstr "Aplică și la subdirectoare"
 msgid "use also on reply"
 msgstr "folosește și pentru răspuns"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Răspuns către:"
 
@@ -5956,43 +5956,43 @@ msgstr "Elemente afișate"
 msgid " Revert to default "
 msgstr " Revino la predefinit "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Nume șablon"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Înregistrare"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Substituire "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Simboluri "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Șabloane înregistrate"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Șabloane"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Șablon"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Eroare format șablon."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Șterge șablon"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Sigur doriți să ștergeți acest șablon ?"
 
@@ -6735,7 +6735,7 @@ msgstr "%d messaj(e) au fost filtrate."
 msgid "No."
 msgstr "Nu."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "fișierul %s există deja\n"
diff --git a/po/ru.po b/po/ru.po
index 75cc4319..1aabc474 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-06-09 14:30+0400\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -980,7 +980,7 @@ msgstr "Имя:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Удалить"
 
@@ -996,16 +996,16 @@ msgid "Lookup"
 msgstr "Найти"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Скрытно:"
 
@@ -1184,7 +1184,7 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Уведомление"
 
@@ -1701,7 +1701,7 @@ msgstr "Подписать PGP"
 msgid "PGP Encrypt"
 msgstr "Шифровать PGP"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "Тип MIME"
 
@@ -1780,36 +1780,36 @@ msgstr "Перенос строк"
 msgid "Wrap all long lines"
 msgstr "Отформатировать всё сообщение"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Неверный тип MIME."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Файл не существует или пуст."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Неверная команда вызова внешнего редактора: \"%s\"\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1819,44 +1819,44 @@ msgstr ""
 "Завершить процесс принудительно?\n"
 "Идентификатор группы процессов: %d\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Ошибка постановки в очередь."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Выбор файлов"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Выбор файла"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Это сообщение изменено. Сохранить его в папке черновиков?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Закрыть без сохранения"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Применить шаблон \"%s\"?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Применить шаблон"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "Заменить"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "Вставить"
 
@@ -2474,7 +2474,7 @@ msgstr "Удалить учётную запись новостей"
 msgid "Newsgroups:"
 msgstr "Группы новостей:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тема:"
 
@@ -4524,7 +4524,7 @@ msgstr "Вверх"
 msgid "Down"
 msgstr "Вниз"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Новое)"
 
@@ -5786,7 +5786,7 @@ msgstr "Применять к вложенным папкам"
 msgid "use also on reply"
 msgstr "также использовать при ответе"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Адрес для ответов:"
 
@@ -5877,43 +5877,43 @@ msgstr "Отображаемые элементы"
 msgid " Revert to default "
 msgstr " Вернуть стандартные настройки "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Название шаблона"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Добавить"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr "Заменить"
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Символы "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Зарегистрированные шаблоны"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Неверный формат шаблона."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Удалить шаблон"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Удалить этот шаблон?"
 
@@ -6651,7 +6651,7 @@ msgstr "%d сообщений отфильтровано."
 msgid "No."
 msgstr "Номер"
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "файл %s уже существует\n"
diff --git a/po/sk.po b/po/sk.po
index d1bc5c7f..482cb0be 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -976,7 +976,7 @@ msgstr "Meno:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Zmazať"
 
@@ -992,16 +992,16 @@ msgid "Lookup"
 msgstr "Vyhľadať"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Komu:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
@@ -1183,7 +1183,7 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Upozornenie"
 
@@ -1737,7 +1737,7 @@ msgstr "/_Nástroje/A_kcie"
 msgid "PGP Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME typ"
 
@@ -1817,36 +1817,36 @@ msgstr "Riadkovanie"
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Neplatný MIME typ."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Súbor neexistuje alebo je prázdny."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Neplatný príkaz pre externý editor: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1856,48 +1856,48 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Vybrať súbor"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Odoslať správu"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Použiť šablónu"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Nahradiť"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Vložiť"
@@ -2522,7 +2522,7 @@ msgstr "Odstrániť news konto"
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Predmet:"
 
@@ -4594,7 +4594,7 @@ msgstr "Nahor"
 msgid "Down"
 msgstr "Nadol"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nové)"
 
@@ -5913,7 +5913,7 @@ msgstr "Platí aj pre podpriečinky"
 msgid "use also on reply"
 msgstr "použiť aj pri odpovedaní"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
@@ -6007,43 +6007,43 @@ msgstr "Zobrazené položky"
 msgid " Revert to default "
 msgstr " Vrátiť na východzie "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Názov šablóny"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Registrovať"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Nahradiť "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Symboly "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registrované šablóny"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Šablóna"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Chyba formátu šablóny."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Zmazať šablónu"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 
@@ -6794,7 +6794,7 @@ msgstr ""
 msgid "No."
 msgstr "Č."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "súbor %s už existuje\n"
diff --git a/po/sl.po b/po/sl.po
index ac3c5569..840cc70b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -982,7 +982,7 @@ msgstr "Ime:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -998,16 +998,16 @@ msgid "Lookup"
 msgstr "Poišči"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Skp:"
 
@@ -1188,7 +1188,7 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Opomba"
 
@@ -1742,7 +1742,7 @@ msgstr "/_Orodja/Deja_nja"
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "Tip MIME"
 
@@ -1822,37 +1822,37 @@ msgstr "Prelom vrstic"
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1862,48 +1862,48 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Zamenjaj"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Vstavi"
@@ -2527,7 +2527,7 @@ msgstr "Izbriši novičarski račun"
 msgid "Newsgroups:"
 msgstr "Novičarske skupine:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Zadeva:"
 
@@ -4595,7 +4595,7 @@ msgstr "Gor"
 msgid "Down"
 msgstr "Dol"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Nov)"
 
@@ -5916,7 +5916,7 @@ msgstr "Udejani na podmapah"
 msgid "use also on reply"
 msgstr "uporabi tudi ob odgovoru"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Odgovor za:"
 
@@ -6009,43 +6009,43 @@ msgstr "Prikazani kosi"
 msgid " Revert to default "
 msgstr "Povrni privzeto"
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Ime predloge"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "_Pogledriraj"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Zamenjaj "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registrirane predloge"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Predloge"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Predloga"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Napaka pri oblikovanju predloge."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Izbriši predlogo"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Ali res želite izbrisati to predlogo?"
 
@@ -6797,7 +6797,7 @@ msgstr "sporočilo %d je že v predpomnilniku.\n"
 msgid "No."
 msgstr "Ne."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "Datoteka %s že obstaja\n"
diff --git a/po/sr.po b/po/sr.po
index f596f512..81a363fe 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -982,7 +982,7 @@ msgstr "Ime:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Obriši"
 
@@ -998,16 +998,16 @@ msgid "Lookup"
 msgstr "Potraži"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1182,7 +1182,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1737,7 +1737,7 @@ msgstr "/_Alat/Akci_je"
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME tip"
 
@@ -1817,37 +1817,37 @@ msgstr "Sažimanje"
 msgid "Wrap all long lines"
 msgstr "Sažmi sve duge linije"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1857,48 +1857,48 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2522,7 +2522,7 @@ msgstr "Obriši news nalog"
 msgid "Newsgroups:"
 msgstr "News grupe:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -4591,7 +4591,7 @@ msgstr "Gore"
 msgid "Down"
 msgstr "Dole"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -5911,7 +5911,7 @@ msgstr "Primeni na poddirektorijume"
 msgid "use also on reply"
 msgstr "koristi i prilikom odovora"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Odvovori-Na:"
 
@@ -6004,43 +6004,43 @@ msgstr "Prikazane pojedinosti"
 msgid " Revert to default "
 msgstr " Vrati na uobičajeno "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Ime šablona"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Unesi"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Zameni "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registrovani šabloni"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Šabloni"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Šablon"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Greška formata šablona."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Briši šablon"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Zaista želite obrisati ovaj šablon?"
 
@@ -6795,7 +6795,7 @@ msgstr "poruka %d već je prihvaćena.\n"
 msgid "No."
 msgstr "Ne."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "datoteka %s već postoji\n"
diff --git a/po/sv.po b/po/sv.po
index 928d10fc..c1638381 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -979,7 +979,7 @@ msgstr "Namn:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -995,16 +995,16 @@ msgid "Lookup"
 msgstr "Slå upp"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Till:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
@@ -1179,7 +1179,7 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Notera"
 
@@ -1702,7 +1702,7 @@ msgstr "PGP Tecken"
 msgid "PGP Encrypt"
 msgstr "PGP Kryptera"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME-typ"
 
@@ -1782,36 +1782,36 @@ msgstr "Radbrytning"
 msgid "Wrap all long lines"
 msgstr "Radbryt långa rader"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Ogiltig MIME-typ"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Filen finns inte eller är tom."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ogiltig kommandorad för extern redigerare: \"%s\"\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1821,44 +1821,44 @@ msgstr ""
 "Framtvinga avslutning av processen?\n"
 "processgrupps-id: %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Kan inte lägga meddelandet i kö."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Välj filer"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Välj fil"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Spara meddelande"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Detta meddelande har ändrats. Spara det till utkastmappen?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Stäng _utan att spara"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Vill du använda mallen \"%s\" ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Använd mall"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -2477,7 +2477,7 @@ msgstr "Ta bort diskussionsgruppskonto"
 msgid "Newsgroups:"
 msgstr "Diskussionsgrupper:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Ämne:"
 
@@ -4514,7 +4514,7 @@ msgstr "Upp"
 msgid "Down"
 msgstr "Ner"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Ny)"
 
@@ -5786,7 +5786,7 @@ msgstr "Gäller även undermappar"
 msgid "use also on reply"
 msgstr "använd också vid svar"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Svara till:"
 
@@ -5879,43 +5879,43 @@ msgstr "Visade poster"
 msgid " Revert to default "
 msgstr " Återgå till standardinställning "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Mallnamn"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Registrera"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Byt ut "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Symboler "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Registrerade mallar"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Mallar"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Mall"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Mallformatfel"
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Ta bort mall"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Vill du verkligen ta bort denna mall?"
 
@@ -6661,7 +6661,7 @@ msgstr "%d meddelande(n) har filtrerats."
 msgid "No."
 msgstr "Nr."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "filen %s finns redan\n"
diff --git a/po/tr.po b/po/tr.po
index fa1a23f5..9262fd41 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -979,7 +979,7 @@ msgstr "İsim:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Sil"
 
@@ -995,16 +995,16 @@ msgid "Lookup"
 msgstr "Ara"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Kime:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1184,7 +1184,7 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Not"
 
@@ -1730,7 +1730,7 @@ msgstr "/A_raçlar/PGP İ_mza"
 msgid "PGP Encrypt"
 msgstr "/A_raçlar/PGP ile Ş_ifrele"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME türü"
 
@@ -1810,36 +1810,36 @@ msgstr "Satır kaydır"
 msgid "Wrap all long lines"
 msgstr "Tüm uzun satırları kaydır"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Geçersiz MIME türü."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Dosya yok, ya da boş."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Harici düzenleyici komut satırı geçersiz: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1849,48 +1849,48 @@ msgstr ""
 "Bu süreci sonlandırayım mı?\n"
 "Programın grup numarası (GID): %d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "İleti kuyruğa gönderilemedi."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 #, fuzzy
 msgid "Select files"
 msgstr "Dosya seç"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Dosya seç"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "İletiyi gönder"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Bu ileti değiştirildi. Silinsin mi?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "%s şablonunu uygulamak istiyor musunuz?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Şablonu uygula"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "Değiştir"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "İçer"
@@ -2512,7 +2512,7 @@ msgstr "Haber grubu hesabını sil"
 msgid "Newsgroups:"
 msgstr "Haber grupları:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Konu:"
 
@@ -4566,7 +4566,7 @@ msgstr "Yukarı"
 msgid "Down"
 msgstr "Aşağı"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Yeni)"
 
@@ -5861,7 +5861,7 @@ msgstr "Alt dizinlere uygula"
 msgid "use also on reply"
 msgstr "ayrıca yanıtlarken kullan"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Yanıtla:"
 
@@ -5953,43 +5953,43 @@ msgstr "Görüntülenen öğeler"
 msgid " Revert to default "
 msgstr " Öntanımlıya geçiş yap "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Şablon adı"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Kaydol"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Değiştir "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Semboller "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Kayıtlı şablonlar"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Şablon"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Şablon biçim hatası."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Şablonu sil"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Gerçekten bu şablonu silmek istiyor musunuz?"
 
@@ -6743,7 +6743,7 @@ msgstr "%d mesaj filtrelenedi."
 msgid "No."
 msgstr "Hayır."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "%s dosyası zaten var\n"
diff --git a/po/uk.po b/po/uk.po
index 61f07f7c..eca2ee50 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-04-13 00:34+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -983,7 +983,7 @@ msgstr "Ім'я:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Видалити"
 
@@ -999,16 +999,16 @@ msgid "Lookup"
 msgstr "Пошук"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Кому:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Приховано:"
 
@@ -1181,7 +1181,7 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Примітка"
 
@@ -1698,7 +1698,7 @@ msgstr "Підпис PGP"
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "тип MIME"
 
@@ -1777,36 +1777,36 @@ msgstr "Згортання рядків"
 msgid "Wrap all long lines"
 msgstr "Згорнути всі довгі рядки"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Неправильний тип MIME."
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Файл не існує або порожній."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Ім'я файлу"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Командний рядок зовнішнього редактора неправильний: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1815,44 +1815,44 @@ msgstr ""
 "Зовнішній редактор досі працює.\n"
 "Примусово обірвати процес (pid: %d)?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Не вдалось поставити лист в чергу."
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Обрати файли"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Обрати файл"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Зберегти лист"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Цей лист було змінено. Зберегти в папці чернеток?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "Закрити без збереження"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Чи бажаєте Ви застосувати шаблон `%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Застосувати шаблон"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "Замінити"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "Вставити"
 
@@ -2469,7 +2469,7 @@ msgstr "Видалити обліковий запис конференції"
 msgid "Newsgroups:"
 msgstr "Конференції:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Тема:"
 
@@ -4516,7 +4516,7 @@ msgstr "Вгору"
 msgid "Down"
 msgstr "Вниз"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(Новий)"
 
@@ -5771,7 +5771,7 @@ msgstr "Застосувати до підпапок"
 msgid "use also on reply"
 msgstr "вживати і при відповіді"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Зворотня:"
 
@@ -5861,43 +5861,43 @@ msgstr "Показані поля"
 msgid " Revert to default "
 msgstr " Повернутись до стандартних "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Назва шаблону"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Реєструвати"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Підставити "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Символи "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Зареєстровані шаблони"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Шаблони"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Помилка формату шаблону."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Видалити шаблон"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Справді видалити цей шаблон?"
 
@@ -6635,7 +6635,7 @@ msgstr "%d листів відфільтровано."
 msgid "No."
 msgstr "Номер"
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "файл %s вже існує\n"
diff --git a/po/vi.po b/po/vi.po
index 6718387d..e842cb72 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -960,7 +960,7 @@ msgstr "Tên:"
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "Xoá"
 
@@ -976,16 +976,16 @@ msgid "Lookup"
 msgstr "Tra cứu"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "Người nhận:"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1162,7 +1162,7 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "Chú ý"
 
@@ -1679,7 +1679,7 @@ msgstr "Chữ kí PGP"
 msgid "PGP Encrypt"
 msgstr "Mã hoá PGP"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "Kiểu MIME"
 
@@ -1758,36 +1758,36 @@ msgstr "Khuôn dòng"
 msgid "Wrap all long lines"
 msgstr "Khuôn mọi dòng dài"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "Kiểu MIME không hợp lệ"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "Tập tin không tồn tại hoặc rỗng."
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "Tên tập tin"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Dòng lệnh cho trình soạn thảo ngoài không hợp lệ: `%s'\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1796,44 +1796,44 @@ msgstr ""
 "Trình soạn thảo ngoài vẫn đang hoạt động.\n"
 "Bắt buộc dừng tiến trình (pid: %d)?\n"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "Không thể xếp hàng thông điệp"
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "Lưu thư"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Nội dung đã được thay đổi. Lưu vào thư mục nháp?"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "_Không lưu"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Bạn có muốn dùng mẫu `%s' ?"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "Dùng mẫu"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -2450,7 +2450,7 @@ msgstr "Xoá tài khoản tin tức"
 msgid "Newsgroups:"
 msgstr "Nhóm tin:"
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tiêu đề:"
 
@@ -4495,7 +4495,7 @@ msgstr "Lên"
 msgid "Down"
 msgstr "Xuống"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "Mới"
 
@@ -5749,7 +5749,7 @@ msgstr "Áp dụng cho thư mục con"
 msgid "use also on reply"
 msgstr "dùng cho cả lúc hồi âm"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
@@ -5839,43 +5839,43 @@ msgstr "Các mục đã hiển thị"
 msgid " Revert to default "
 msgstr " Dùng dạng mặc định "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "Tên mẫu"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "Đăng kí"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " Thay thế "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " Biểu tượng "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "Các mẫu đã đăng kí"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "Mẫu"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "Mẫu"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "Lỗi định dạng mẫu."
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "Xoá mẫu"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "Bạn có thực sự muốn xoá mẫu này không?"
 
@@ -6611,7 +6611,7 @@ msgstr "%d thư đã được lọc."
 msgid "No."
 msgstr "Số "
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "tập tin %s đã có trước\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b7d9cd58..54ec234d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -973,7 +973,7 @@ msgstr "姓名："
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "删除"
 
@@ -989,16 +989,16 @@ msgid "Lookup"
 msgstr "查找"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人："
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件抄送："
 
@@ -1170,7 +1170,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "注意"
 
@@ -1694,7 +1694,7 @@ msgstr "/工具(_T)/PGP 签名(_G)"
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME 类型"
 
@@ -1774,36 +1774,36 @@ msgstr "换行"
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1813,47 +1813,47 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2474,7 +2474,7 @@ msgstr "删除新闻组帐号"
 msgid "Newsgroups:"
 msgstr "新闻组："
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "标题："
 
@@ -4511,7 +4511,7 @@ msgstr "上移"
 msgid "Down"
 msgstr "下移"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "(新建)"
 
@@ -5794,7 +5794,7 @@ msgstr "应用到子文件夹"
 msgid "use also on reply"
 msgstr "回复时也使用"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "回复至："
 
@@ -5886,43 +5886,43 @@ msgstr "显示的项目"
 msgid " Revert to default "
 msgstr " 还原为默认值 "
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "模板名"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "注册"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " 替换 "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " 符号 "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "已注册的模板"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "模板"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "模板"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "模板格式错误。"
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "删除模板"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "您确实要删除该模板吗？"
 
@@ -6673,7 +6673,7 @@ msgstr "已经过滤 %d 个邮件。"
 msgid "No."
 msgstr "No."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "文件 %s 已经存在。\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d97b845c..abbcf450 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-13 18:14+0900\n"
+"POT-Creation-Date: 2006-12-14 12:39+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -976,7 +976,7 @@ msgstr "姓名："
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2445 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:233
+#: src/prefs_template.c:239
 msgid "Delete"
 msgstr "刪除"
 
@@ -992,16 +992,16 @@ msgid "Lookup"
 msgstr "尋找"
 
 #: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
-#: src/prefs_template.c:176
+#: src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人"
 
 #: src/addressbook.c:658 src/headerview.c:56 src/prefs_folder_item.c:356
-#: src/prefs_template.c:178
+#: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:662 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件副本"
 
@@ -1175,7 +1175,7 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:5666 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5672 src/main.c:638
 msgid "Notice"
 msgstr "注意"
 
@@ -1696,7 +1696,7 @@ msgstr "PGP 簽章"
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-#: src/compose.c:4416 src/compose.c:5500
+#: src/compose.c:4416 src/compose.c:5506
 msgid "MIME type"
 msgstr "MIME 型態"
 
@@ -1776,36 +1776,36 @@ msgstr "折列"
 msgid "Wrap all long lines"
 msgstr "折換所有過長的文字列"
 
-#: src/compose.c:5396
+#: src/compose.c:5402
 msgid "Invalid MIME type."
 msgstr "不合法的 MIME 型態。"
 
-#: src/compose.c:5414
+#: src/compose.c:5420
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或者是空的。"
 
-#: src/compose.c:5482
+#: src/compose.c:5488
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:5502 src/prefs_common_dialog.c:1500
+#: src/compose.c:5508 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5525 src/prefs_folder_item.c:202
+#: src/compose.c:5531 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:5526
+#: src/compose.c:5532
 msgid "File name"
 msgstr "檔名"
 
-#: src/compose.c:5615
+#: src/compose.c:5621
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部編輯器的命令是錯誤的：「%s」\n"
 
-#: src/compose.c:5663
+#: src/compose.c:5669
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1815,44 +1815,44 @@ msgstr ""
 "要強迫結束該行程嗎？\n"
 "行程的群組代碼是：%d"
 
-#: src/compose.c:6039 src/compose.c:6044 src/compose.c:6050
+#: src/compose.c:6045 src/compose.c:6050 src/compose.c:6056
 msgid "Can't queue the message."
 msgstr "無法放進暫存資料夾。"
 
-#: src/compose.c:6141
+#: src/compose.c:6147
 msgid "Select files"
 msgstr "選擇檔案"
 
-#: src/compose.c:6164
+#: src/compose.c:6170
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:6199
+#: src/compose.c:6205
 msgid "Save message"
 msgstr "儲存郵件"
 
-#: src/compose.c:6200
+#: src/compose.c:6206
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "郵件已被修改過。將它儲存到草稿資料夾嗎？"
 
-#: src/compose.c:6202
+#: src/compose.c:6208
 msgid "Close _without saving"
 msgstr "關閉但不儲存(_W)"
 
-#: src/compose.c:6244
+#: src/compose.c:6250
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您確定要套用「%s」這個郵件樣板嗎？"
 
-#: src/compose.c:6246
+#: src/compose.c:6252
 msgid "Apply template"
 msgstr "套用郵件樣板"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/compose.c:6247
+#: src/compose.c:6253
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -2471,7 +2471,7 @@ msgstr "刪除帳號"
 msgid "Newsgroups:"
 msgstr "新聞群組："
 
-#: src/headerview.c:58 src/prefs_template.c:180
+#: src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "主旨："
 
@@ -4490,7 +4490,7 @@ msgstr "向上"
 msgid "Down"
 msgstr "向下"
 
-#: src/prefs_actions.c:422 src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:325
 msgid "(New)"
 msgstr "（新）"
 
@@ -5755,7 +5755,7 @@ msgstr "套用到子資料夾"
 msgid "use also on reply"
 msgstr "回覆郵件時也使用"
 
-#: src/prefs_folder_item.c:378
+#: src/prefs_folder_item.c:378 src/prefs_template.c:185
 msgid "Reply-To:"
 msgstr "回信地址："
 
@@ -5847,43 +5847,43 @@ msgstr "指定顯示項目"
 msgid " Revert to default "
 msgstr "還原預設值"
 
-#: src/prefs_template.c:161
+#: src/prefs_template.c:164
 msgid "Template name"
 msgstr "郵件樣板名稱"
 
-#: src/prefs_template.c:221
+#: src/prefs_template.c:227
 msgid "Register"
 msgstr "加入"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:233
 msgid " Substitute "
 msgstr " 替換 "
 
-#: src/prefs_template.c:239
+#: src/prefs_template.c:245
 msgid " Symbols "
 msgstr " 符號 "
 
-#: src/prefs_template.c:253
+#: src/prefs_template.c:259
 msgid "Registered templates"
 msgstr "已紀錄之郵件樣板符號"
 
-#: src/prefs_template.c:274
+#: src/prefs_template.c:280
 msgid "Templates"
 msgstr "郵件樣板設定"
 
-#: src/prefs_template.c:393
+#: src/prefs_template.c:401
 msgid "Template"
 msgstr "郵件樣板"
 
-#: src/prefs_template.c:462
+#: src/prefs_template.c:478
 msgid "Template format error."
 msgstr "郵件樣板格式錯誤。"
 
-#: src/prefs_template.c:538
+#: src/prefs_template.c:564
 msgid "Delete template"
 msgstr "刪除郵件樣板"
 
-#: src/prefs_template.c:539
+#: src/prefs_template.c:565
 msgid "Do you really want to delete this template?"
 msgstr "您確定要刪除這個郵件樣板嗎？"
 
@@ -6630,7 +6630,7 @@ msgstr "已過濾 %d 封郵件"
 msgid "No."
 msgstr "No."
 
-#: src/template.c:168
+#: src/template.c:174
 #, c-format
 msgid "file %s already exists\n"
 msgstr "檔案 %s 已存在。\n"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2006-12-14 07:28:15 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2006-12-14 07:28:15 +0000
commit	685bead59896a1d0a95d7f638157b92a5da560d5 (patch)
tree	48c0b6284de529ce0bd2f567ffac99804de02a37 /po
parent	d1366c278bf05e587db7073315c75b192a91be7c (diff)