new setup dialog which improves usability.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2384 ee746299-78ed-0310-b773-934348b2243d

30 files changed, 6917 insertions, 5843 deletions

diff --git a/po/be.po b/po/be.po
index 44185157..ac841960 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2008-05-21 21:16+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -981,7 +981,7 @@ msgstr "/_Капіраваць"
 msgid "/_Paste"
 msgstr "/_Уставіць"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адрасная кніга"
 
@@ -1173,7 +1173,7 @@ msgstr "Памылка канверсіі Адраснай кнігі"
 msgid "Address Book Conversion"
 msgstr "Канверсія Адраснай кнігі"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Інтэрфейс"
 
@@ -1808,7 +1808,7 @@ msgstr "Файл не існуе ці пусты."
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Кадаванне"
 
@@ -2055,7 +2055,7 @@ msgstr "Змяніць запіс JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2356,18 +2356,18 @@ msgstr "/Выдаліць групу навін"
 msgid "Creating folder view...\n"
 msgstr "Стварэнне прагляду каталогу...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Новы"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Нечытаны"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Агулам"
 
@@ -2379,12 +2379,12 @@ msgstr "Устанаўленне інфармацыі па каталогу...\n
 msgid "Setting folder info..."
 msgstr "Устанаўленне інфармацыі па каталогу..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Прагляд каталога %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканаванне каталога %s ..."
@@ -2409,7 +2409,7 @@ msgstr "Перазборка дрэва каталогаў схібіла."
 msgid "Checking for new messages in all folders..."
 msgstr "Праверка новых паведамленняў ва ўсіх каталогах..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Спам"
 
@@ -3841,16 +3841,16 @@ msgstr ""
 "Калі указана існуючая скрыня, яна будзе\n"
 "прасканіравана аўтаматычна."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скрыня `%s' ужо існуе."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Скрыня"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4283,7 +4283,7 @@ msgstr "Прыватнасць"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Адмысловыя"
 
@@ -4407,7 +4407,7 @@ msgid "Authentication method"
 msgstr "Метад аўтэнтыфікацыі"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
@@ -4451,8 +4451,8 @@ msgstr "Генераваць Message-ID"
 msgid "Add user-defined header"
 msgstr "Дадаць загаловак, заданы карыстальнікам"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Рэдагаваць..."
 
@@ -4829,8 +4829,8 @@ msgstr "Аднаўляць усе лакальныя каталогі пасля
 msgid "Execute command when new messages arrived"
 msgstr "Выконваць загад па прыбыцці новых паведамленняў"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Загад"
 
@@ -4943,7 +4943,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Захоўваць папярэднія адрасы пры адказе на свае паведамленні"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Рэдактар"
@@ -5028,53 +5028,53 @@ msgstr "Паказваць лік нечытаных лістоў побач з
 msgid "Displaying message number columns in the folder view:"
 msgstr "Паказваць слупкі ліку лістоў у праглядзе каталогаў"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Скарачаць назвы груп даўжэй за "
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "літар"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Выгляд Зводкі"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Паказваць адрасатаў ў слупку `Ад', калі адпраўнік - вы"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Разгортваць ніткі"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Фармат даты"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Наставіць від запісаў зводкі... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Паведамленне"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Тыповы знаказбор"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Ужываецца пры паказе паведамленняў, у якіх не пазначаны знаказбор."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Зыходзячы знаказбор"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5082,11 +5082,11 @@ msgstr ""
 "Калі выбрана `Аўтаматычна', аптымальнае для бягучай лакалі кадаванне будзе "
 "ужытае."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Дазволіць афарбоўку паведамлення"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5094,83 +5094,83 @@ msgstr ""
 "Паказваць шматбайтны алфавіт і лічбы\n"
 "як сімвалы ASCII (толькі японскія)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Паказваць стужку загалоўкаў па-над праглядам паведамлення"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Паказваць кароткія загалоўкі ў праглядзе ліста"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Адлюстроўваць HTML-паведамленні як тэкст"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "Трактаваць паведамленні з аднаго HTML як дадатак"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Паказваць курсор у праглядзе паведамлення"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Прастора між радкоў"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "піксел(аў)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Пракрутка"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Палова старонкі"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Гладкая пракрутка"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Крок"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Рысункі"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Падганяць памер вялікіх далучаных рысункаў да памеру вакна"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Паказваць рысункі побач з тэкстам"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Задзейнічаць кіраванне СПАМам"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Загад вучэння:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Выберыце набор)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Не-спам"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Загад класіфікацыі"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5178,228 +5178,228 @@ msgstr ""
 "Каб класіфікаваць спам аўтаматычна, і спам і не-спам лісты павінны быць "
 "вывучаны самастойна да пэўнага моманту."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Каталог спаму"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Паведамленні, пазначаныя як спам, будуць пераносіцца у гэты каталог."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Фільтраваць лісты, класіфікаваныя як спам, падчас атрымання"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Фільтраваць спам перад звычайным фільтрам"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Выдаляць спам з сервера падчас атрымання"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Пазначаць лісты, класіфікаваныя як спам, прачытанымі"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Аўтаматычна правяраць подпісы"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Паказваць вынік праверкі подпісу ва ўсплываючым вакне"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Часова захоўваць парафразу ў памяці"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Спыніць дзеянне пасля"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "мінут(а) "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Выстаўленне ў '0' мусіць захоўваць парафразу на ўвесь час сеансу."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Захопліваць увод падчас уводу парафразы"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Паказваць папярэджанне пры старце, калі GnuPG не працуе"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Заўжды адкрываць паведамленні ў зводцы па выбары"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Адкрываць першае нечытанае паведамленне па адкрыцці каталога"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Памятаваць апошняе вылучанае паведамленне"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Пазначаць паведамленне чытаным толькі пры адкрыцці ў новым акне"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Адкрываць Атрыманыя пасля атрымання новай пошты"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Адкрываць Атрыманыя пры запуску"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Неадкладнае выкананне па пераносу ці выдаленню паведамлення"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Калі гэта опцыя выключаная, паведамлення застаецца пазначаным да выканання."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Зрабіць парадак кнопак у адпаведнасці з GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Паказваць іконку ў трэі"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Мінімізаваць у іконку ў трэі"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Пераключаць вакно па кліку на іконцы ў трэі"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Наставіць звязкі клавішаў... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Іншае"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Вонкавыя загады"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Дата"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Дыялог атрымання"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Паказваць дыялог атрымання"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Заўсёды"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Толькі пры ручным запуску"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Ніколі"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Не паказваць вакно памылкі атрымання"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Закрываць дыялог атрымання па заканчэнні"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Дадаць адрас да прызначэння па двайным кліку"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Пры выхадзе"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Пацвердзіць выхад"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Чысціць сметніцы пры выхадзе"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Спытаць перад ачысткай"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Папярэджваць, калі есць паведамленні ў чарзе"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Вонкавыя загады  (%s будзе замененае на назву файла / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Веб-браўзер"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Тыповы браўзер)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Ужываць знешнюю праграму для друку"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Ужываць знешнюю праграму для атрымання пошты"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Ужываць знешнюю праграму для адпраўкі"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Ужываць Праверку правапісу"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Уключыць строгі кантроль цэласнасці кэшу зводкі"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5409,275 +5409,275 @@ msgstr ""
 "праграмамі.\n"
 "Гэта опцыя зніжае хуткасць адлюстравання зводкі."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Таймаут сокета I/O:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "секунд(ы)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Аўтавыбар (Рэкамендуецца)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-бітны ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Юнікод (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Заходнееўрапейскі (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Заходнееўрапейскі (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Заходнееўрапейскі (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Цэнтральнаеўрапейскі (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтыйскі (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтыйскі (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Балтыйскі (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Грэцкі (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Арабскі (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Арабскі (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Яўрэйскі (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Яўрэйскі (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турэцкі (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кірыліца (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кірыліца (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кірыліца (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кірыліца (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японскі (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Японскі (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Японскі (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Спрошчаны кітайскі (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Спрошчаны кітайскі (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Традыцыйны кітайскі (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традыцыйны кітайскі (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Кітайскі (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Карэйскі (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Тайскі (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Тайскі (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "скарочаная поўная назва дня тыдня"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "поўная назва дня тыдня"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "скарочаная назва месяца"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "поўная назва месяца"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "пераважныя дата i час для бягучай лакалі"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "нумар веку (год/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "дзень месяца як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "гадзіна як лічба дзесятковая ужываючы 24-гадзінны фармат"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "гадзіна як лічба дзесятковая ужываючы 12-гадзінны фармат"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "дзень году як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "месяц як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "мінута як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "альбо AM альбо PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "секунда як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "дзень тыдня як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "пераважная дата для бягучай лакалі"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "апошнія дзве лічбы году"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "год як лічба дзесятковая"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "часавы пояс - назва ці скарот"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Вызначальнік"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Апісанне"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Прыклад"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Наставіць колеры паведамлення"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Колеры"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Цытаваны тэкст - узровень першы"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Цытаваны тэкст - узровень другі"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Цытаваны тэкст - узровень трэці"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Спасылка URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Паўтор колераў цытавання"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Выберыце колер для першага узроўню цытавання"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Выберыце колер для другога узроўню цытавання"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Выберыце колер для трэцяга узроўню цытавання"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Выберыце колер для URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Апісанне сімвалаў"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5701,11 +5701,11 @@ msgstr ""
 "Групы навін\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Паказваць expr калі заданы x"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5719,7 +5719,7 @@ msgstr ""
 "Цела цытаванага паведамлення без подпісу\n"
 "Літэрал %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5731,19 +5731,19 @@ msgstr ""
 "Літэрал дужка фігурная адкрываючая\n"
 "Літэрал дужка фігурная закрываючая"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Звязкі клавішаў"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Выберыце набор звязак клавішаў."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Тыповыя"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Стары Сілфід"
 
@@ -6766,17 +6766,48 @@ msgstr "Нельга злучыцца з серверам SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Нельга злучыцца з серверам SMTP: %s:%d"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Настаўленне скрыні"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Выканаць наступныя дзеянні:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Задайце месцазнаходжанне скрыні.\n"
-"Калі не ўпэўненыя, проста цісніце OK."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Скасаванае"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Скрыня `%s' ужо існуе."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7453,6 +7484,13 @@ msgstr "другі экземпляр Сілфід ужо выконваецца
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Задайце месцазнаходжанне скрыні.\n"
+#~ "Калі не ўпэўненыя, проста цісніце OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Пошук"
 
diff --git a/po/bg.po b/po/bg.po
index 1c53fc18..bfa8bed3 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -987,7 +987,7 @@ msgstr "/_Копиране..."
 msgid "/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1191,7 +1191,7 @@ msgstr "Грешка при конвертиране на адресната к�
 msgid "Address Book Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -1867,7 +1867,7 @@ msgstr "Файлът не съществува или е празен"
 msgid "Properties"
 msgstr "Аксесоари"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Кодиране"
 
@@ -2122,7 +2122,7 @@ msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2430,18 +2430,18 @@ msgstr "/_Премахване на новинарска група"
 msgid "Creating folder view...\n"
 msgstr "Създаване на изглед на папка...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Нови"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Непрочетени"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2453,12 +2453,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -2483,7 +2483,7 @@ msgstr "Възобновяване на дървото на папката пр�
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3965,16 +3965,16 @@ msgstr ""
 "Ако е указана съществуваща кутия, тя ще бъде\n"
 "сканирана автоматично."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4395,7 +4395,7 @@ msgstr "Неприкосновеност"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Напреднал"
 
@@ -4523,7 +4523,7 @@ msgid "Authentication method"
 msgstr "Метод на удостоверяване"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -4573,8 +4573,8 @@ msgstr "Генериране на Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавяне на заглавна част от потребителя"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Редактиране... "
 
@@ -4959,8 +4959,8 @@ msgstr "Обновяване на всички локални папки сле�
 msgid "Execute command when new messages arrived"
 msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Команда"
 
@@ -5073,7 +5073,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Редактор"
@@ -5163,55 +5163,55 @@ msgstr "Показване на броя на непрочетените до и
 msgid "Displaying message number columns in the folder view:"
 msgstr "Показване на броя на непрочетените до името на папката"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Съкращаване на новинарски групи по дълги от"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "букви"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Изглед на извадката"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показване на получателя в `От' колоната, ако изпращача сте вие"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Развиване на нишките..."
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Формат на датата"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr "Определяне на атрибути на извадката"
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Съобщение"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Изглед/_Сортиране/Низходящо"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5220,11 +5220,11 @@ msgstr ""
 "Ако е избрано `Автоматично', ще бъде избрано\n"
 "оптималното за текущия локал кодиране."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Позволяване на оцветяване на съобщение"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5232,618 +5232,618 @@ msgstr ""
 "Показване на multi-byte азбука и цифри като\n"
 "ASCII знаци (само за Японски)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Панел със заглавна част над изгледа на съобщението"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Показване на кратки заглавни части в изгледа на съобщението"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Съобщение/Пр_епращане като притурка"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Показване на кратки заглавни части в изгледа на съобщението"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Разстояние м/у редовете"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "пиксел(а)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Превъртане"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Половин страница"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Плавно превъртане"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Стъпка"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Разпъване на прикрепени изображения"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Настройка на показваните заглавки части"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "Изпълняване"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Изберете ключове"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "Изпълняване"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "Папка"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Нефилтрираните съобщения ще бъдат съхранявани в тази папка)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Филтриране на съобщенията при получаване"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Изтриване на папка"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Изтриване на папка"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Автоматична проверка на подписите"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Показване в отделен прозорец на резултата от проверка на подписа"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Временно съхраняване на паролата в паметта"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Невалидно след"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "минута(и)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Установяване на `0' ще съхранява паролата\n"
 "през цялата сесия)"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Прехващане на входа при въвеждане на парола"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Показване на предупреждение при стартиране, ако GnuPG не работи"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Отваряне винаги на съобщенията избрани в извадката"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Отваряне на първото непрочетено съобщение при влизане в папка"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Маркиране като прочетено само на съобщение отворено в нов прозорец"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Влизане във входящата кутия след получаване на нови съобщения"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Проверка за нова поща при стартиране"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Незабавно изпълнение при местене или изтриване на съобщения"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Съобщенията ще бъдат маркирани до изпълнението\n"
 "ако това е изключено)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Екранно Име"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr "Определяне на клавишни комбинации"
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Други"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Изпълняване"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Дата"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Диалог при получаване"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Показване на диалог при получаване"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Винаги"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Само при ръчно получаване"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Никога"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Без повдигане на диалог за грешка при грешка при получаване"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Затваряне на диалога при получаване когато завърши"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Добавяне на адреса в назначението при двойно щракване"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "При излизане"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Потвърждение при излизане"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Изчистване на Кошчето на излизане"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Питане преди изчистване"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Предупреждение ако има съобщения в опашката"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Външни команди (%s ще бъде заменен с име на файл / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Уеб браузър"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Входяща кутия"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Използване на външна програма за изпращане"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Използване на външна програма за приемане"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Използване на външна програма за изпращане"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Просрочка на В/И порт:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "секунда(и)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Автоматично (Препоръчително)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Уникод (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Западно европейски (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Западно европейски (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Западно европейски (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Централно европейски (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтийски (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтийски (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Гръцки (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Балтийски (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Гръцки (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турски (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилица (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилица (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилица (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японски (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Японски (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Японски (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Опростен китайски (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционен китайски (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционен китайски (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайски (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Корейски (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Тайландски (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Тайландски (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "напълно съкратеното име на делника"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "пълното име на делника"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "съкратеното име на месеца"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "пълното име на месеца"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "предпочитаната дата и час за текущия локал"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "век (годинa/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "денят от месеца като десетично число"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "часа като десетично число ползвайки 24-часов часовник"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "часа като десетично число ползвайки 12-часов часовник"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "деня от годината като десетично число"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "месеца като десетично число"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "минутата като десетично число"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "или AM или PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "секундата като десетично число"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "деня от седмицата като десетично число"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "предпочитаната дата за текущия локал"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "последните две цифри от годината"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "годината като десетично число"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "времевата зона или име или съкращение"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Идентификатор"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Определяне на цветове на съобщението"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Цитиран Текст - Първо Ниво"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Цитиран Текст - Второ Ниво"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Цитиран Текст - Трето Ниво"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI връзка"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Преизползване на цветовете за цитат"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Изберете цвят за цитат първо ниво"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Изберете цвят за цитат второ ниво"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Изберете цвят за цитат трето ниво"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Изберете цвят за URL"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Описание на символите"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5867,11 +5867,11 @@ msgstr ""
 "Новинарски групи\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Ако x е установен, показва expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5885,7 +5885,7 @@ msgstr ""
 "Цитирано тяло на съобщение без подпис\n"
 "Символ %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5897,20 +5897,20 @@ msgstr ""
 "Символ отваряща къдрава скоба\n"
 "Символ затваряща къдрава скоба"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Клавишни комбинации"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Определяне на клавишни комбинации"
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "По подразбиране"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Стар Sylpheed"
 
@@ -6987,19 +6987,46 @@ msgstr "Не може да се установи връзка с NNTP сървъ
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Не може да се установи връзка с NNTP сървър: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Настройки на пощенската кутия"
 
-#: src/setup.c:44
-#, fuzzy
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr ""
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Въведете местоположението на пощенска кутия.\n"
-"Ако е указана съществуваща кутия, тя ще бъде\n"
-"сканирана автоматично."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "Отказ"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Вече съществува пощенска кутия `%s'."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7668,6 +7695,15 @@ msgstr "друг Sylpheed е стартиран вече.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Въведете местоположението на пощенска кутия.\n"
+#~ "Ако е указана съществуваща кутия, тя ще бъде\n"
+#~ "сканирана автоматично."
+
 #~ msgid "Lookup"
 #~ msgstr "Справка"
 
@@ -8012,9 +8048,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "ОК"
 
-#~ msgid "Cancel"
-#~ msgstr "Отказ"
-
 #~ msgid "Refresh"
 #~ msgstr "Опресняване"
 
diff --git a/po/cs.po b/po/cs.po
index 8483769b..86ea36b7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2009-08-29 02:23+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -989,7 +989,7 @@ msgstr "/_Kopírovat"
 msgid "/_Paste"
 msgstr "/_Vložit"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresář"
 
@@ -1177,7 +1177,7 @@ msgstr "Chyba při konverzi adresáře"
 msgid "Address Book Conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Rozhraní"
 
@@ -1812,7 +1812,7 @@ msgstr "Soubor neexistuje nebo je prázdný."
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Kódování"
 
@@ -2060,7 +2060,7 @@ msgstr "Upravit záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2351,18 +2351,18 @@ msgstr "/Odstranit d_iskusní skupinu"
 msgid "Creating folder view...\n"
 msgstr "Vytváří se strom složek...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nové"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Celkem"
 
@@ -2374,12 +2374,12 @@ msgstr "Nastavování informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavování informace o složce..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledává se složka %s%c%s..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledává se složka %s..."
@@ -2404,7 +2404,7 @@ msgstr "Obnova stromu složek se nezdařila."
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťují se nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Nevyžádaná"
 
@@ -3823,16 +3823,16 @@ msgstr ""
 "V případě zadání již existující bude tato\n"
 "automaticky prohledána."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka \"%s\" již existuje."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4262,7 +4262,7 @@ msgstr "Soukromí"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Rozšířené"
 
@@ -4386,7 +4386,7 @@ msgid "Authentication method"
 msgstr "Metoda autentizace"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automaticky rozpoznat"
 
@@ -4430,8 +4430,8 @@ msgstr "Generovat ID zprávy"
 msgid "Add user-defined header"
 msgstr "Přidávat uživatelsky definované záhlaví"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Upravit... "
 
@@ -4808,8 +4808,8 @@ msgstr "Po přijmutí aktualizovat všechny místní složky"
 msgid "Execute command when new messages arrived"
 msgstr "Vykonávat příkaz ihned při přijmutí nových zpráv"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Příkaz"
 
@@ -4922,7 +4922,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Dědit příjemce u odpovědi na vlastní zprávy"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5007,54 +5007,54 @@ msgstr "Zobrazovat počet nepřečtených zpráv za názvem složky"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Zobrazovat sloupce s počtem zpráv ve stromu složek"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Zkracovat názvy diskusních skupin delší než"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "znaků"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Souhrn zpráv"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Zobrazovat příjemce ve sloupci \"Odesílatel\", jestliže jste odesílatelem"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Rozbalovat vlákna"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Formát data"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Nastavení zobrazovaných položek v souhrnu... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Zpráva"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Výchozí znaková sada"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Použije se při zobrazení zpráv bez určené znakové sady."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Znaková sada při odesílání"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5062,11 +5062,11 @@ msgstr ""
 "Pokud je zvoleno \"Automatická\", bude použita nejvhodnější znaková sada pro "
 "lokalizaci libc."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Povolit obarvení textu ve zprávách"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5074,83 +5074,83 @@ msgstr ""
 "Zobrazovat vícebajtovou abecedu a číslice\n"
 "jako znaky ASCII (pouze pro japonštinu)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Zobrazovat pole se záhlavím nad zprávou"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Zobrazovat krátké záhlaví při zobrazení zprávy"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Zobrazovat HTML jako prostý text"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "Považovat zprávy obsahující pouze HTML za přílohu"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Ukazovat kurzor při zobrazení zpráv"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Prázdná řádka"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixelů"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Posun"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Polovina stránky"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Jemný posun"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Obrázky"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Měnit velikost přiložených obrázků tak, aby se vešly do okna"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Zobrazovat obrázky v těle zprávy"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Zapnout kontrolu nevyžádané pošty"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Učit se příkazem:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Vybrat předvolby)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Vyžádaná pošta"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Příkaz k třídění"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5158,225 +5158,225 @@ msgstr ""
 "Aby mohla být nevyžádaná pošta automaticky rozpoznána, je nutné v určitém "
 "rozsahu ručně zpracovat zprávy nevyžádané i vyžádané."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Složka nevyžádané pošty"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Zprávy označené jako nevyžádaná pošta budou přesunuty do této složky."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrovat zprávy vyhodnocené jako nevyžádané při přijmutí"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtrovat nevyžádanou poštu před běžným filtrováním"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Vymazávat nevyžádanou poštu ze serveru při příjmu"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Označovat rozpoznanou nevyžádanou poštu jako přečtenou"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Automaticky kontrolovat podpis"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Zobrazovat výsledek kontroly podpisu ve zvláštním okně"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Ukládat heslo dočasně v paměti"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Vyprší za"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minut "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Nastavení na \"0\" uloží heslo během celé relace."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Blokovat vstup při zadávání hesla"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zobrazovat varování, pokud GnuPG není funkční"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Vybrané zprávy vždy otevírat v souhrnu"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Při vstupu do složky otevírat první nepřečtenou zprávu"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Pamatovat si poslední vybranou zprávu"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Označovat zprávu jako přečtenou pouze při otevření v novém okně"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Po přijetí nových zpráv přejít na doručenou poštu"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Otevírat doručenou poštu při spuštění"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Vykonávat ihned při přesunu nebo mazání zpráv"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Pokud je tato volba vypnuta, zprávy budou označeny až do vykonání."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Pořadí tlačítek vyhovující GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Zobrazovat ikonu v oznamovací oblasti"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Minimalizovat do oznamovací oblasti"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Vyvolávat okno kliknutím na ikonu v oznamovací oblasti"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Nastavit klávesové zkratky... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Ostatní"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Externí příkazy"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 msgid "Update"
 msgstr "Aktualizace"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Dialog o příjmu"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Zobrazovat dialog o příjmu"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Pouze při ručním příjmu"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Při chybě v příjmu nezobrazovat dialog o chybě"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Zavírat dialog o příjmu po dokončení"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Přidávat adresu do cíle dvojitým kliknutím"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Při ukončení"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Potvrzovat ukončení"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Vyprazdňovat koš"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Ptát se před vyprázdněním"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Varovat, pokud jsou některé zprávy pozdržené"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externí příkaz (\"%s\" bude nahrazeno názvem souboru nebo URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Výchozí prohlížeč)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Používat externí program při tisku"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Používat externí program při začleňování"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Používat externí program při odesílání"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr "Kontrola aktualizací vyžaduje příkaz \"curl\"."
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr "Zapnout automatickou kontrolu aktualizací"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr "Používat HTTP proxy"
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr "Počítač HTTP proxy (hostitel:port):"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Zapnout striktní kontrolu integrity vyrovnávací paměti souhrnu"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5386,275 +5386,275 @@ msgstr ""
 "složek.\n"
 "Tato volba sníží rychlost zobrazování souhrnu."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Časový limit V/V operací se socketem:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "sekund"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatická (doporučeno)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bitový ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Západoevropské jazyky (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Západoevropské jazyky (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Západoevropské jazyky (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Středoevropské jazyky (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltské jazyky (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltské jazyky (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Pobaltské jazyky (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Řečtina (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabština (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arabština (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrejština (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrejština (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turečtina (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilice (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilice (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilice (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilice (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonština (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japonština (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonština (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradiční čínština (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradiční čínština (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korejština (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thajština (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thajština (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "zkratka dne v týdnu"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "plný název dne v týdnu"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "zkratka měsíce"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "plný název měsíce"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "datum a čas preferovaný aktuální lokalizací libc"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "století (rok/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "den v měsíci jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "hodina jako desítkové číslo s 24hodinovým cyklem"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "hodina jako desítkové číslo s 12hodinovým cyklem"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "den v roce jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "měsíc jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minuta jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "dopoledne nebo odpoledne"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekunda jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "den v týdnu jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "datum preferované aktuální lokalizací libc"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "poslední dvě číslice z roku"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "rok jako desítkové číslo"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, název nebo zkratka"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Specifikátor"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Příklad"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Nastavení barev ve zprávách"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - první úroveň"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - druhá úroveň"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - třetí úroveň"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Odkaz URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Rotovat barvy citací"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Vybrat barvu první úrovně citace"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Vybrat barvu druhé úrovně citace"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Vybrat barvu třetí úrovně citace"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Vybrat barvu URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Popis symbolů"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5678,11 +5678,11 @@ msgstr ""
 "Diskusní skupiny\n"
 "ID zprávy"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Pokud je zadáno \"x\", zobrazí se \"expr\""
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5696,7 +5696,7 @@ msgstr ""
 "Citované tělo zprávy bez podpisu\n"
 "Znak procento"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5708,19 +5708,19 @@ msgstr ""
 "Znak levá složená závorka\n"
 "Znak pravá složená závorka"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Klávesové zkratky"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Vyberte prosím předvolby klávesových zkratek."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Starý Sylpheed"
 
@@ -6736,17 +6736,48 @@ msgstr "Nelze se spojit se serverem SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nelze se spojit se serverem SMTP: %s:%d"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Nastavení poštovní schránky"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Provést následující akce:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Zadejte prosím umístění poštovní schránky.\n"
-"Pokud si nejste jisti, jednoduše zvolte \"Budiž\"."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Zrušeno"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Poštovní schránka \"%s\" již existuje."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7404,6 +7435,13 @@ msgstr "Nejnovější verze aplikace Sylpheed je již nainstalována."
 msgid "Couldn't get the version information."
 msgstr "Nezdařilo se získání informace o verzi."
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Zadejte prosím umístění poštovní schránky.\n"
+#~ "Pokud si nejste jisti, jednoduše zvolte \"Budiž\"."
+
 #~ msgid "Lookup"
 #~ msgstr "Vyhledat"
 
diff --git a/po/da.po b/po/da.po
index 71c487fa..bafecbab 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -991,7 +991,7 @@ msgstr "/_Kopier..."
 msgid "/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressebog"
 
@@ -1189,7 +1189,7 @@ msgstr "Adressebog konverterings fejl"
 msgid "Address Book Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Brugerflade"
 
@@ -1865,7 +1865,7 @@ msgstr "Fil eksisterer ikke eller er tom."
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
@@ -2120,7 +2120,7 @@ msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2428,18 +2428,18 @@ msgstr "/_Slet nyhedsgruppe"
 msgid "Creating folder view...\n"
 msgstr "Opretter mappe træ...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Ny"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Ulæst"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2451,12 +2451,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -2482,7 +2482,7 @@ msgstr "Gendanner mappe træ..."
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3967,16 +3967,16 @@ msgstr ""
 "Hvis den eksisterende mailbox angives, vil den blive\n"
 "gennemsøgt automatisk."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4397,7 +4397,7 @@ msgstr "Privat"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Avanceret"
 
@@ -4525,7 +4525,7 @@ msgid "Authentication method"
 msgstr "Godkendelses metode"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -4572,8 +4572,8 @@ msgstr "Opret meddelelses ID"
 msgid "Add user-defined header"
 msgstr "Tilføj bruger defineret hoved"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Redigér... "
 
@@ -4958,8 +4958,8 @@ msgstr "Opdater alle mapper efter modtagelse"
 msgid "Execute command when new messages arrived"
 msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Kommando"
 
@@ -5072,7 +5072,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5162,55 +5162,55 @@ msgstr "Vis antal ulæste ved siden af mappe navn"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Vis antal ulæste ved siden af mappe navn"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Forkort nyhedsgruppe længere end"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "bogstaver"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Meddelelses visning"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Vis modtager i `Fra' hvis du er afsender"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Åbn tråde"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Dato format"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Vælg oplysninger i oversigt... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Meddelelse"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Vis/_Sortere/Faldende"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5219,11 +5219,11 @@ msgstr ""
 "Hvis `Automatisk' er valgt benyttes det optimale\n"
 "tegnsæt for den valgte locale."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Benyt farver i meddelelser"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5231,616 +5231,616 @@ msgstr ""
 "Vis 2-byte alfabet og tal som ASCII\n"
 "tegn (kun japansk)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Vis hoved linier over meddelelses vindue"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Vis korte hoved linier i meddelelses vindue"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Meddelelse/Videresend som _vedhæftet"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Vis korte hoved linier i meddelelses vindue"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Linie afstand"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "punkter"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Scrol"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Halv side"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Blød scroll"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Skrift"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Ændre størrelse på vedhæftede billeder"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Hoved opsæt"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "Udfør"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Vælg nøgle"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "Udfør"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "Mappe"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Ufiltrerede meddelelser gemmes i denne mappe)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrere meddelelse ved modtagelse"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Slet mappe"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Slet mappe"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Check signatur automatisk"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Vis signatur check resultat i separat vindue"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Gem  adgangssætning midlertidigt i hukommelsen"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Udløb efter"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Sæt til '0' vil gemme adgangssætningen\n"
 " for hele sessionen)"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Overtag indtastning mens adgangssætning indtastes"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Advarsel ved start hvis GnuPG ikke virker"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Åbn altid besked i oversigtsbilledet hvis valgt"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Åbn første ulæste meddelelse ved indgang til mappe"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Markér kun meddelelser som læst hvis åbnet i nyt vindue"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Gå til Indbakke efter modtagelse af ny post"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Hent e-post ved programstart"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Udfør straks ved flyt eller slet af meddelelse(r)"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "(Ellers markéres meddelelese indtil der vælges 'Udfør')"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Vis navn"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Vælg tast bindinger... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Anden"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Udfør"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Dato"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Vis modtag billede"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Altid"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Vis ikke fejlmeddelelse ved fejl"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Luk modtag vindue efter overførsel"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Tilføj adresse til 'Til' ved dobbeltklik"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Ved afslut"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Spørg ved afslut"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Tøm Slettet ved afslut"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Spørg før tømning"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Advar ved meddelelser i kø"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Ekstern editor (%s erstattes af filnavn / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Web browser"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Standard indbakke"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Benyt eksternt program for afsendelse"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Benyt eksternt program til modtagelse af e-post"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Benyt eksternt program for afsendelse"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Skriver oversigt (%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "sekund(er)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Anbefalet)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "kort ugedags navn"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "Ugedags navn"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "kort måneds navn"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "måneds navn"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "århundrede (år/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "dag i måned som tal"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "time som tal (24 timers visning)"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "time som tal (12 timers visning)"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "århundrede som tal"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "måned som tal"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minut som tal"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "enten AM eller PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekund som tal"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "ugedag som tal"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "ønsket dato format for nuværende locale"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "de sidste to cifre i året"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "året som tal"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "tidszone som navn eller forkortelse"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Vælger"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Eksempel"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Angiv meddelelses farve"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Farve"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Citeret tekst - 1. niveau"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Citeret tekst - 2. niveau"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Citeret tekst - 3. nivaur"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Genbrug citat farver"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Vælg farve for nivau 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Vælg farve for nivau 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Vælg farve for nivau 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Vælg farve for URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Beskrivelse af symboler"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5864,11 +5864,11 @@ msgstr ""
 "Nyhedsgrupper\n"
 "Meddelelses ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Hvis x er valgt vises expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5882,7 +5882,7 @@ msgstr ""
 "Citeret meddelelses krop uden signatur\n"
 "%"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5894,20 +5894,20 @@ msgstr ""
 "{\n"
 "}"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Tast bindinger"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Vælg tast bindinger... "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Gl. Sylpheed"
 
@@ -6987,19 +6987,46 @@ msgstr "Ingen forbindelse til SMTP server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ingen forbindelse til SMTP server: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Mailbox opsætning"
 
-#: src/setup.c:44
-#, fuzzy
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr ""
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Indtast sti til mailbox.\n"
-"Hvis den eksisterende mailbox angives, vil den blive\n"
-"gennemsøgt automatisk."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "Afbryd"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Mailbox `%s' eksisterer allerede."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7673,6 +7700,15 @@ msgstr "sylpheed kører allerede.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Indtast sti til mailbox.\n"
+#~ "Hvis den eksisterende mailbox angives, vil den blive\n"
+#~ "gennemsøgt automatisk."
+
 #~ msgid "Lookup"
 #~ msgstr "Overblik"
 
@@ -8022,9 +8058,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "OK"
 
-#~ msgid "Cancel"
-#~ msgstr "Afbryd"
-
 #~ msgid "Refresh"
 #~ msgstr "Genopfrisk"
 
diff --git a/po/de.po b/po/de.po
index 19a97e8c..a273a087 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -986,7 +986,7 @@ msgstr "/_Kopieren"
 msgid "/_Paste"
 msgstr "/_Einfügen"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbuch"
 
@@ -1181,7 +1181,7 @@ msgstr "Adressbuch-Konvertierungsfehler"
 msgid "Address Book Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
@@ -1821,7 +1821,7 @@ msgstr "Datei existiert nicht oder ist leer."
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
@@ -2068,7 +2068,7 @@ msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2369,18 +2369,18 @@ msgstr "/Newsgroup _entfernen"
 msgid "Creating folder view...\n"
 msgstr "Erstelle Ablageansicht...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Neu"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Gesamt"
 
@@ -2392,12 +2392,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -2422,7 +2422,7 @@ msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Spam"
 
@@ -3860,16 +3860,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wurde, wird\n"
 "sie automatisch durchsucht."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4302,7 +4302,7 @@ msgstr "Privat"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Speziell"
 
@@ -4427,7 +4427,7 @@ msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -4472,8 +4472,8 @@ msgstr "Erzeuge Nachrichten-ID"
 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Bearbeiten... "
 
@@ -4849,8 +4849,8 @@ msgid "Execute command when new messages arrived"
 msgstr ""
 "Ausführen des folgenden Befehls, wenn neue Nachrichten empfangen wurden"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Befehl"
 
@@ -4963,7 +4963,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Übernehme Empfänger bei Nachrichten an mich selbst"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5048,53 +5048,53 @@ msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Zeige Nachrichtenanzahl in der Ordneransicht"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Kürze Newsgroups länger als"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "Zeichen"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Ablageninhaltsansicht"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zeige Empfänger in `Von'-Spalte, wenn Sie selbst der Sender sind"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Threads entfalten"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Datumsformat"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Setze Ablageninhalt-Einträge... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Standard-Zeichensatz"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Dies wird für Nachrichten mit fehlender Zeichenkodierung verwendet."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Standard-Zeichensatz beim Versenden"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5102,11 +5102,11 @@ msgstr ""
 "Wenn 'Automatisch' gewählt ist, wird der optimale Zeichensatz für die "
 "aktuelle Locale-Einstellung benutzt."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Benutze Farben für Nachrichten"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5114,84 +5114,84 @@ msgstr ""
 "Stelle Mehr-byte Alphabet und Zahlen als\n"
 "ASCII-Zeichen dar (nur Japanisch)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Zeige Kopfzeilenleiste über Nachrichtenansicht"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Wandle HTML Nachrichten um in Nur-Text"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Wandle HTML Nachrichten um in Nur-Text"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Zeige Cursor in der Nachrichtenansicht an"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Zeilenabstand"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "Pixel"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Rollen"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Halbe Seite"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Fließendes Scrollen"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Schritt"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Bilder"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Große angehängte Bilder in das Fenster einpassen"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Zeige Bilder eingebettet an"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Aktiviere Spam-Mail Kontrolle"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Befehle zum Lernen:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Wähle Voreinstellung)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Kein Spam"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Klassifizier-Befehl"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5199,239 +5199,239 @@ msgstr ""
 "Um Spam-Mails automatisch zu klassifizieren, müssen sowohl Spam- als auch "
 "Nicht-Spam-Mails eine Wile manuell gelernt werden."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Spam-Mail Ablage"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Nachrichten, die als Spam-Mails markiert wurden, werden in diese Ablage "
 "verschoben."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr ""
 "Nachrichten beim Empfang ausfiltern, wenn sie als Spam-Mails erkannt wurden"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Spam-Mails vor dem eigentlichen Filtern aussortieren"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Spam-Mails während des Empfangens entfernen"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Markiere gefilterte Spam-Mails als gelesen"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Überprüfe digitale Unterschriften automatisch"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr ""
 "Zeige das Ergebnis der Überprüfung der digitalen Unterschrift in einem POPUP-"
 "Fenster an"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantra zeitweise speichern"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Läuft aus nach"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "Minute(n)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "('0' speichert das Mantra für die gesamte\n"
 "Sitzung)"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Nachrichten immer in der Zusammenfassung öffnen, wenn ausgewählt"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr ""
 "Öffne erste ungelesene Nachricht anzeigen beim Öffnen eines Verzeichnis"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Letzte geöffnete Nachricht merken"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Nachrichten als gelesen markieren, wenn sie in einem neuen Fenster geöffnet "
 "werden"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Posteingang nach dem Empfang neuer E-Mail öffnen"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Öffne Posteingang beim Programmstart"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Sofort Ausführen beim Bewegen oder Löschen von Nachrichten"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Nachricht wird markiert bis zur Ausführung,\n"
 " wenn dies ausgeschaltet ist)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Ordnen der Buttons kompatibel zu GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Systemablagesymbol (Tray-Icon) anzeigen "
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Sylpheed zu einem Symbol in der Systemleiste minimieren"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Fenster bei Trayicon-Klick wechseln"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Tastenkombinationen wählen... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Weiteres"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Externe Befehle"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Datum"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Empfangen-Dialog"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Zeige Empfangen-Dialog"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Immer"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Nur bei manuellem Empfang"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nie"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Keinen Fehler-Dialog bei Empfangsfehlern erscheinen lassen"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Empfangen-Dialog schließen nach Beendigung"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Adresse bei Doppel-Klick ins Ziel einfügen"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Beim Beenden"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Nachfragen beim Beenden"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Leere Papierkorb beim Beenden"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Fragen vor dem Leeren"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Warnen, wenn wartende Nachrichten vorhanden"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe Befehle (%s wird durch Dateinamen / URI ersetzt)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Internet-Browser"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Standardbrowser)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Benutze externes Programm zum Drucken"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Benutze externes Programm, um E-Mails zu empfangen"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Benutze externes Programm zum Senden"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Rechtschreibprüfung aktivieren"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Aktiviere strengen Integritätstest des Summen-Zwischenspeichers"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5441,275 +5441,275 @@ msgstr ""
 "Inhalt von Ablagen verändern könnten.\n"
 "Diese Option verringert die Performance der Summen-Anzeige."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O timeout:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "Sekunde(n)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (Empfohlen)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Western European (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Baltisch (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisch (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisch (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebräisch (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebräiisch (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Einfaches Chinesisch (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "gekürzter Wochentagsname"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "Wochentagsname"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "gekürzter Monatsname"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "Monatsname"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "bevorzugtes Datums- und Zeitformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "Jahrhundert (Jahr/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "Tag des Monats als Zahl"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "Stunde als Zahl (24h Anzeige)"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "Stunde als Zahl (12h Anzeige)"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "Tag des Jahres als Zahl"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "Monat als Zahl"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "Minute als Zahl"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "Sekunde als Zahl"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "Wochentag als Zahl"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "bevorzugtes Datumsformat für die aktuelle Locale-Einstellung"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "letzten beiden Stellen des Jahres"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "Jahr als Zahl"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "Zeitzone oder Name oder Abkürzung"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Steuerzeichen"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Beispiel"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Setze Nachrichtenfarbe"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Farben"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Zitierter Text - Erste Ebene"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Zitierter Text - Zweite Ebene"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Zitierter Text - Dritte Ebene"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI-Link"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Stelle Zitatfarben wiederher"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Wähle Farbe für Zitatebene 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Wähle Farbe für Zitatebene 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Wähle Farbe für Zitatebene 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Wähle Farbe für URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5733,11 +5733,11 @@ msgstr ""
 "News-Gruppen\n"
 "Nachrichten-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Wenn x gesetzt ist, zeige expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5751,7 +5751,7 @@ msgstr ""
 "Zitierter Nachrichteninhalt ohne Unterschrift\n"
 "Wörtlich %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5763,19 +5763,19 @@ msgstr ""
 "öffnende Klammer\n"
 "schließende Klammer"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Tastenkombinationen"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Voreingestellte Tastenkombinationen wählen."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 
@@ -6802,17 +6802,48 @@ msgstr "keine Verbindung mit NNTP-Server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "keine Verbindung mit NNTP-Server: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Setze Mailbox"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Die folgenden Aktionen ausführen:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
+msgstr ""
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Abgebrochen"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
 msgstr ""
-"Geben Sie den Ort der Mailbox an.\n"
-"Wenn Sie unsicher sind, klicken Sie einfach OK."
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Die Mailbox `%s' existiert bereits."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7488,6 +7519,13 @@ msgstr "Ein anderes Sylpheed läuft schon.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Geben Sie den Ort der Mailbox an.\n"
+#~ "Wenn Sie unsicher sind, klicken Sie einfach OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Vorschau"
 
diff --git a/po/el.po b/po/el.po
index 04b6d570..3d9cc2fc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -1000,7 +1000,7 @@ msgstr "/_Αντιγραφή"
 msgid "/_Paste"
 msgstr "/Ε_πικόλληση"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
@@ -1206,7 +1206,7 @@ msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίο�
 msgid "Address Book Conversion"
 msgstr "Μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Διεπαφή"
 
@@ -1855,7 +1855,7 @@ msgstr "Το αρχείο δεν υπάρχει ή είναι άδειο."
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
@@ -2108,7 +2108,7 @@ msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2414,18 +2414,18 @@ msgstr "Συνδρομές νέων:"
 msgid "Creating folder view...\n"
 msgstr "Δημιουργία προβολής φακέλων...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Νέα"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Σύνολο"
 
@@ -2437,12 +2437,12 @@ msgstr "Ορισμός πληροφοριών φακέλου...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες φακέλων..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση φακέλων %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση φακέλου %s ..."
@@ -2467,7 +2467,7 @@ msgstr "Η επαναδημιουργία της λίστας φακέλων α�
 msgid "Checking for new messages in all folders..."
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Ανεπιθύμητη αλληλογραφία"
 
@@ -3922,16 +3922,16 @@ msgstr ""
 "Αν οριστεί το υπάρχον γραμματοκιβώτιο, θα\n"
 "σαρωθεί αυτόματα."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Το γραμματοκιβώτιο '%s' υπάρχει ήδη."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Γραμματοκιβώτιο"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4369,7 +4369,7 @@ msgstr "Απόρρητο"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Προχωρημένες"
 
@@ -4493,7 +4493,7 @@ msgid "Authentication method"
 msgstr "Μέθοδος πιστοποίησης"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Αυτόματη"
 
@@ -4539,8 +4539,8 @@ msgstr "Δημιουργία Message-ID"
 msgid "Add user-defined header"
 msgstr "Προσθήκη κεφαλίδας ορισμένης από τον χρήστη"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Επεξεργασία... "
 
@@ -4918,8 +4918,8 @@ msgstr "Ανανέωση όλων των τοπικών φακέλων μετά
 msgid "Execute command when new messages arrived"
 msgstr "Εκτέλεση εντολής στη λήψη νέων μηνυμάτων"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Εντολή"
 
@@ -5028,7 +5028,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Διαδοχή παραληπτών στην απάντηση των δικών σας μηνυμάτων"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Επεξεργαστής κειμένου"
@@ -5113,55 +5113,55 @@ msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο �
 msgid "Displaying message number columns in the folder view:"
 msgstr "Εμφάνιση αριθμού αδιάβαστων δίπλα στο όνομα του φακέλου"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 #, fuzzy
 msgid "Abbreviate newsgroups longer than"
 msgstr "Σύντμηση ονομάτων ομάδων συζητήσεων που είναι μακρύτερα από"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "χαρακτήρες"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Προβολή περιλήψεων"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Εμφάνιση παραλήπτη στη στήλη 'Από' αν αποστολέας είστε εσείς"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Επέκταση νημάτων"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Μορφοποίηση ημερομηνίας"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 #, fuzzy
 msgid " Set display item of summary... "
 msgstr "Ορισμός εικονιδίου για προβολή"
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Προεπιλεγμένη κωδικοποίηση χαρακτήρων"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Χρησιμοποιείται όταν προβάλλονται μηνύματα που δεν έχουν κωδικοποίηση."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Κωδικοποίηση χαρακτήρων εξερχομένων"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5169,95 +5169,95 @@ msgstr ""
 "Αν επιλεγεί 'Αυτόματη', θα χρησιμοποιηθεί η βέλτιστη κωδικοποίηση για την "
 "τρέχουσα τοπική ρύθμιση"
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Ενεργοποίηση χρωματισμού των μηνυμάτων"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Εμφάνιση τμήματος με την κεφαλίδα πάνω από την προβολή μηνύματος"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Εμφάνιση βραχείας κεφαλίδας στην απεικόνιση μηνύματος"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Απεικόνιση των HTML μηνυμάτων σαν κείμενο"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Απεικόνιση των HTML μηνυμάτων σαν κείμενο"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Εμφάνιση περιεχομένων φακέλου ως εικονίδια"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Διάστημα γραμμών"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "εικονοστοιχείο(α)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Κύλιση"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Μισή σελίδα"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Ομαλή κύλιση"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Κατά βήματα"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Εικόνες"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Αυτόματη προσαρμογή των συνημμένων εικόνων"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Εμφάνιση εικόνων μέσα στο μήνυμα."
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Ενεργοποίηση ελέγχου ανεπιθύμητης αλληλογραφίας"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Εντολή εκμάθησης:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(επιλογή πρότυπου)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Επιθυμητή αλληλογραφία"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Εντολή ταξινόμησης"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5265,514 +5265,514 @@ msgstr ""
 "Για να γίνει δυνατή η αυτόματη αναγνώριση της ανεπιθύμητης αλληλογραφίας, θα "
 "πρέπει να γίνει χειροκίνητη εκμάθηση ως ένα σημείο."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Φάκελος ανεπιθύμητης αλληλογραφίας"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Τα μηνύματα που έχουν σημειωθεί ως ανεπιθύμητη αλληλογραφία θα μετακινηθούν "
 "σε αυτό το φάκελο."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Φιλτράρισμα ανεπιθύμητης αλληλογραφίας πριν τα κανονικά φίλτρα"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Φιλτράρισμα μηνυμάτων κατά την λήψη"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Σημείωση των φιλτραρισμένων ανεπιθύμητων μηνυμάτων ως αναγνωσμένα"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Αυτόματος έλεγχος υπογραφών"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Εμφάνιση του ελέγχου υπογραφής σε αναδυόμενο παράθυρο"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Προσωρινή αποθήκευση της φράσης πρόσβασης στη μνήμη"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Έληξε μετά"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "λεπτά"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "Ορίζοντας το σε '0' η φράση πρόσβασης θα αποθηκεύεται για όλη τη σύνοδο"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Εμφάνιση ειδοποίησης κατά την εκκίνηση αν το GnuPG δεν λειτουργεί"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Άνοιγμα επιλεγμένου μηνύματος όταν επιλεγεί"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Τα μη φιλτραρισμένα μηνύματα θα αποθηκεύονται σε αυτό τον φάκελο"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "/_Εργαλεία/Φιλτράρισμα ε_πιλεγμένων μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Σημείωση ενός μηνύματος ως αναγνωσμένου μόνο όταν ανοιχθεί σε νέο παράθυρο"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Άνοιγμα των εισερχομένων μετά τη λήψη νέων μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Άνοιγμα των εισερχομένων στην αρχή"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Αυτόματη εκτέλεση για τη μεταφορά και διαγραφή μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Τα μηνύματα θα σημειωθούν μέχρι την εκτέλεση αν αυτό είναι αποεπιλεγμένο"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Συμμόρφωση της σειράς των κουμπιών με το GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Προβολή εικονιδίου συρταριού"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Ελαχιστοποίηση στο εικονίδιο συρταριού"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Ορισμός συντομεύσεων πληκτρολογίου... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Άλλα"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Εξωτερικές εντολές"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Ημερομηνία"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Διάλογος λήψης"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Προβολή διαλόγου λήψης"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Πάντα"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Μόνο στη χειροκίνητη λήψη"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Ποτέ"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Να μην εμφανίζεται διάλογος στα σφάλματα λήψης"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Κλείσιμο του διαλόγου λήψης όταν ολοκληρωθεί"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Προσθήκη διεύθυνσης στον προορισμό σε διπλό κλικ"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Κατά την έξοδο"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Επιβεβαίωση εξόδου"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Άδειασμα των διαγραμμένων στην έξοδο"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Επιβεβαίωση πριν το άδειασμα"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Προειδοποίηση αν υπάρχουν μηνύματα στην ουρά"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Εξωτερικές εντολές (το %s θα αντικατασταθεί με το όνομα αρχείου / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Περιηγητής ιστοσελίδων"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Προεπιλεγμένος περιηγητής)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Χρήση εξωτερικού προγράμματος για εκτύπωση"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 #, fuzzy
 msgid "Use external program for incorporation"
 msgstr "Χρήση εξωτερικού προγράμματος για λήψη μηνυμάτων"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Χρήση εξωτερικού προγράμματος για αποστολή"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Ενεργοποίηση ορθογράφου"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 #, fuzzy
 msgid "Socket I/O timeout:"
 msgstr "Λήξη ορίου χρόνου εγγραφής"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "δευτερόλεπτα"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Αυτόματη (Προτεινόμενο)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Δυτικής Ευρώπης (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Δυτικής Ευρώπης (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Κεντρικήs Ευρώπης (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Βαλτικής (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Βαλτικής (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Βαλτικής (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Ελληνική (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Αραβική (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Αραβική (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Εβραϊκή (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Εβραϊκή (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Τουρκική (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Κυριλλική (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Κυριλλική (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Κυριλλική (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Κυριλλική (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Ιαπωνέζικη (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Ιαπωνέζικη (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Ιαπωνέζικη (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Απλοποιημένη Κινεζική (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Απλοποιημένη Κινέζικη (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Παραδοσιακή Κινεζική (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Παραδοσιακή Κινεζική (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Κινεζική (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Κορεατική (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Ταϊλανδέζικη (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Ταϊλανδέζικη (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "το συντομευμένο όνομα της ημέρας"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "το πλήρες όνομα της ημέρας"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "το συντομευμένο όνομα του μήνα"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "το πλήρες όνομα του μήνα"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "η προτιμητέα ημερομηνία και ώρα για την τρέχουσα ρύθμιση τοπικότητας"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "ο αιώνας (έτος/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "η μέρα του μήνα ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός σε 24ωρο ρολόι"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "η ώρα ως δεκαδικός αριθμός σε 12ωρο ρολόι"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "η μέρα του χρόνου ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "ο μήνας ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "το λεπτό ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "είτε ΠΜ ή ΜΜ"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "το δευτερόλεπτο ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "η μέρα της εβδομάδας ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "η προτιμώμενη ημερομηνία για το τρέχον locale"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "τα δύο τελευταία ψηφία του έτους"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "το έτος ως δεκαδικός αριθμός"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "η ζώνη ώρας ως όνομα ή σύντμηση"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Προσδιοριστής"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Παράδειγμα"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Ορισμός χρωμάτων μηνύματος"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Παράθεση - Πρώτο επίπεδο"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Παράθεση - Δεύτερο επίπεδο"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Παράθεση - Τρίτο επίπεδο"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Σύνδεσμος URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Ανακύκλωση χρωμάτων παράθεσης"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Χρώμα πρώτου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Χρώμα δεύτερου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Χρώμα τρίτου επιπέδου παράθεσης"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Επιλογή χρώματος για συνδέσμους"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Περιγραφή των συμβόλων"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5796,11 +5796,11 @@ msgstr ""
 "Ομάδες νέων\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Αν έχει οριστεί το x, εμφανίζει expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5814,7 +5814,7 @@ msgstr ""
 "Σώμα παράθεσης μηνύματος χωρίς υπογραφή\n"
 "Κυριολεκτικό %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5822,20 +5822,20 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Συντομεύσεις πληκτρολογίου"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Παρακαλώ επιλέξτε ένα κλειδί για το '%s'"
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Προεπιλεγμένο"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Παλιό Sylpheed"
 
@@ -6868,17 +6868,48 @@ msgstr "Δεν μπορώ να συνδεθώ στον NNTP server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Δεν μπορώ να συνδεθώ στον NNTP server: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Ρυθμίσεις γραμματοκιβωτίου"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Εκτέλεση ακόλουθων ενεργειών:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Ορίστε την τοποθεσία του γραμματοκιβωτίου.\n"
-"Αν δεν είστε σίγουροι, απλά επιλέξτε ΟΚ."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Ακυρώθηκε"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Το γραμματοκιβώτιο '%s' υπάρχει ήδη."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7539,6 +7570,13 @@ msgstr "Τρέχει ήδη ένα Sylpheed.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Ορίστε την τοποθεσία του γραμματοκιβωτίου.\n"
+#~ "Αν δεν είστε σίγουροι, απλά επιλέξτε ΟΚ."
+
 #~ msgid "Lookup"
 #~ msgstr "Αναζήτηση"
 
diff --git a/po/es.po b/po/es.po
index c1892883..4aa59270 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2007-06-09 16:20+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -984,7 +984,7 @@ msgstr "/_Copiar"
 msgid "/_Paste"
 msgstr "/_Pegar"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
@@ -1178,7 +1178,7 @@ msgstr "Error en la conversión de la agenda"
 msgid "Address Book Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -1814,7 +1814,7 @@ msgstr "El fichero no existe o está vacío."
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Codificación"
 
@@ -2061,7 +2061,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2364,18 +2364,18 @@ msgstr "/_Eliminar grupo"
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Total"
 
@@ -2387,12 +2387,12 @@ msgstr "Estableciendo la información de la carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2417,7 +2417,7 @@ msgstr "Fallo al reconstruir el árbol de carpetas."
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Basura"
 
@@ -3850,16 +3850,16 @@ msgstr ""
 "Si el buzón especificado ya existe entonces será\n"
 "escaneado automáticamente."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4294,7 +4294,7 @@ msgstr "Privacidad"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Avanzadas"
 
@@ -4418,7 +4418,7 @@ msgid "Authentication method"
 msgstr "Método de autentificación"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automática"
 
@@ -4462,8 +4462,8 @@ msgstr "Generar ID-Mensaje"
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4840,8 +4840,8 @@ msgstr "Actualizar todos las carpetas locales después de incorporar"
 msgid "Execute command when new messages arrived"
 msgstr "Ejecutar orden cuando lleguen nuevos mensajes"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Orden"
 
@@ -4954,7 +4954,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Heredar la lista de destinatarios al responder a mensajes propios"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5039,54 +5039,54 @@ msgstr "Ver el número de no leídos junto al nombre de la carpeta"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Mostrar las columnas de número de mensajes en la vista de carpetas"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nombres de grupos con más de"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Vista resumen"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario en la columna «Desde» si el remitente es usted mismo"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Expandir hilos"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Formato de fecha"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Elementos visibles en cabecera... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Codificación de caracteres por omisión"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Esto se usa al mostrar mensajes que no indican codificación de caracteres."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Codificación de caracteres para enviar"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5094,11 +5094,11 @@ msgstr ""
 "Si se selecciona «Automática» se utilizará la codificación óptima para la "
 "localización actual."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Permitir colores en el mensaje"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5106,83 +5106,83 @@ msgstr ""
 "Mostrar alfabéticos y numéricos de múltiples bytes\n"
 "como caracteres ASCII (sólo para Japonés)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceras sobre el mensaje"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Cabeceras breves en la vista del mensaje"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Mostrar los mensajes HTML como texto"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "Tratar los mensajes que contengan sólo HTML como adjuntos"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Mostrar el cursor en la vista del mensaje"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Desplazamiento"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Media página"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Imágenes"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar las imágenes adjuntas para adecuarlas a la ventana"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Mostrar las imágenes en el texto"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Activar el control del correo basura"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Orden para aprender:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Escoger preselección)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "No basura"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Orden de clasificación"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5190,227 +5190,227 @@ msgstr ""
 "Para clasificar los correos basura automáticamente, se debe aprender hasta "
 "cierto punto tanto de los correos basura como de los que no lo son."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Carpeta basura"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Los mensajes que se marquen como basura se moverán a esta carpeta."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrar mensajes clasificados como basura al recibir"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtrar el correo basura antes del filtrado normal"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Borrar correos basura del servidor al recibir"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Marcar los correos basura filtrados como leídos"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Comprobar las firmas automáticamente"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de firma"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantener contraseña en memoria temporalmente"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Expirar después de"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Poniendo «0» mantendrá la contraseña durante toda la sesión."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada mientras se introducen contraseñas"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Abrir siempre los mensajes del resumen al seleccionarlos"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Abrir el primer mensaje no leído al abrir una carpeta"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Recordar el último mensaje seleccionado"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaje como leído sólo al abrirlo en una ventana nueva"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Abrir Entrada después de recibir correo nuevo"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Abrir Entrada al inicio"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Los mensajes se marcarán hasta la ejecución si está desactivado."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Ordena los botones según la Guía de Interfaz de Usuario de GNOME"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Mostrar icono en bandeja"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Minimizar al icono en bandeja"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Conmutar ventana con el icono en bandeja"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Establecer atajos de teclado... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Otras"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Órdenes externas"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Fecha"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Siempre"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Sólo al recibir manualmente"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diálogo de error si hay errores de recepción"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción al finalizar"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Añadir dirección al destino con doble clic"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Al salir"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Vaciar papelera al salir"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Preguntar antes de vaciar"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Órdenes externas (%s se sustituirá con el nombre de fichero / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Navegador web por omisión)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Usar programa externo para imprimir"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Activar comprobación ortográfica"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Activar la comprobación estricta de la integridad de la caché resumen"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5420,275 +5420,275 @@ msgstr ""
 "modificados por otras aplicaciones.\n"
 "Esta opción degradará el rendimiento al mostrar el resumen."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Tiempo de espera agotado E/S socket:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Europeo Occidental (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Báltico (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arábigo (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arábigo (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreo (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreo (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Chino simplificado (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "el día de la semana abreviado"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "el día de la semana completo"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "el día del mes como número decimal"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "el día del año como número decimal"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "el día de la semana como número decimal"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Ejemplo"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Colores del mensaje"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Colores"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Reutilizar colores de citación"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Elejir color para el nivel de citado 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Elejir color para el nivel de citado 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Elejir color para el nivel de citado 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Elejir color para URIs"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5712,11 +5712,11 @@ msgstr ""
 "Grupos de noticias\n"
 "ID-Mensaje"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Si x está, muestra expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5730,7 +5730,7 @@ msgstr ""
 "Cuerpo del mensaje citado sin firma\n"
 "El carácter %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5742,19 +5742,19 @@ msgstr ""
 "Carácter llave abierta\n"
 "Carácter llave cerrada"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Atajos de teclado"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Escoger la configuración de atajos de teclado."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Por omisión"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Antiguos de Sylpheed"
 
@@ -6777,17 +6777,48 @@ msgstr "No se puede conectar con el servidor SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "No se puede conectar con el servidor SMTP: %s:%d"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Configurar buzón"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Realizar las acciones siguientes:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Introduzca la localización del buzón.\n"
-"Si no esta seguro seleccione «Aceptar»."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Cancelado"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "El buzón «%s» ya existe."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7447,6 +7478,13 @@ msgstr "ya hay otro Sylpheed en ejecución.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Introduzca la localización del buzón.\n"
+#~ "Si no esta seguro seleccione «Aceptar»."
+
 #~ msgid "Lookup"
 #~ msgstr "Buscar"
 
diff --git a/po/et.po b/po/et.po
index 0b1971a6..0af12743 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -993,7 +993,7 @@ msgstr "/Kopeeri..."
 msgid "/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Aadressiraamat"
 
@@ -1196,7 +1196,7 @@ msgstr "Aadressiraamatu uuendamise viga"
 msgid "Address Book Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Kasutajaliides"
 
@@ -1874,7 +1874,7 @@ msgstr "Faili ei eksisteeri või on see tühi."
 msgid "Properties"
 msgstr "Omadus"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Kodeerimine"
 
@@ -2129,7 +2129,7 @@ msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2438,18 +2438,18 @@ msgstr "/Eemalda uudisteg_rupp"
 msgid "Creating folder view...\n"
 msgstr "Loon kausta vaate...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Uus"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Pole loetud"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2461,12 +2461,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -2494,7 +2494,7 @@ msgstr "Uuendan kasuta puu..."
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3971,16 +3971,16 @@ msgstr ""
 "Sisesta kirjakasti asukoht.\n"
 "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4401,7 +4401,7 @@ msgstr "Privaatsus"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Spetsiaalne"
 
@@ -4529,7 +4529,7 @@ msgid "Authentication method"
 msgstr "Autoriseerimise meetod"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automaatne"
 
@@ -4578,8 +4578,8 @@ msgstr "Loo Kirja-ID"
 msgid "Add user-defined header"
 msgstr "Lisa kasutaja defineeritud päis"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Redigeeri... "
 
@@ -4962,8 +4962,8 @@ msgstr "Uuenda kõik lokaalsed kaustad peale kirjade võtmist"
 msgid "Execute command when new messages arrived"
 msgstr "Eemalda kohe peale liigutamist või kustutamist"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Käsklus"
 
@@ -5074,7 +5074,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Redaktor"
@@ -5164,55 +5164,55 @@ msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Näita arvu, mitu kirja pole loetud, kausta nime järel"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "lühenda uudistegruppe, mis on pikemad kui"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "tähte"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Kirjaloendi vaade"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Näita kirja saajat 'Kellelt' tulbas, kui saatja olen mina ise"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Paisuta teemad"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Kuupäeva formaat"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Määra kirjaloendis näidatavad elemendid... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Kiri"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/Vaade/_Sorteeri/Kahanevas järjekorras"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5221,630 +5221,630 @@ msgstr ""
 "Kui on märgitud 'Automaatne', siis kasutatakse praeguse\n"
 "lokaali jaoks optimaalset kodeeringut."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Kirja värvimine lubatud"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Näita 2-baidiliste sümbolitega teksti 1-baidiliste sümbolitega"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Näita kirja päist ülalpool kirja vaadet"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Näita päiseid lühidalt"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Kiri/Saada edasi _manusena"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Näita päiseid lühidalt"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Reavahe"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pinkti"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Kerimine"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Pool lehte"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Sujuv kerimine"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Samm"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Päise näitamine"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "Käivita"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Vali võtmed"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "Käivita"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "Kaust"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Filtreerimata kirjad salvestatakse sellesse kausta)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtreeri saabuvaid kirju"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Kustuta kaust"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Kustuta kaust"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Automaatselt kontrolli allkirju"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Näita allkirja kontrolli tulemusi ajutises aknas"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Säilita parooli ajutiselt mälus"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Aegub pärast"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minuteid"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Kui seada '0'-ks, siis parool salvesatakse\n"
 "kogu sessiooniks)"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "*Krahma sisendit senikaua kuni parooli sisestatakse"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Näita stardi ajal hoiatust kui GnuPG ei tööta"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Teate faili ei ole valitud."
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Kausta sisenedes ava esimene lugemata kiri"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Kiri tuleb uues aknas avades märkida kui loetu"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Ava Sisendkaust peale uute kirjade vastuvõtmist"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Võta uued kirjad töö alguses"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Eemalda kohe peale liigutamist või kustutamist"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Kirjad lihtsalt märgitakse enne täitmit\n"
 " kui see on välja lülitatud)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Ekraani nimi"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Määra klahvi seosed... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Muud asjad"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Käivita"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Kuupäev"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Näita vastuvõtmise dialoogi"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Alati"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Mitte iial"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Ära tekita vea teadet vastuvõtmise vea korral"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Sulge vastuvõtmise dialoog kui lõpetatud"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Lisa aadress sihtlahtrisse kui topeltklõpsutan"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Programmist väljumisel"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Kontrolli väljumist"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Tühjenda prügikast"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Küsi enne tühjendamist"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Hoiata mind, kui järjekorras on kirju"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Välised käsklused (%s asendatakse faili / URI nimega)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Weebi sirvur"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Vaikimisi sisendkast"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Kasuta saatmisel välist programmi"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Kasuta välist programmi kirjade võtmiseks"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Kasuta saatmisel välist programmi"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automaatne (Soovitatav)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitine ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unikood (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Lääne-Euroopa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Lääne-Euroopa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Lääne-Euroopa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Kesk Euroopa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Kreeka (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Balti (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Kreeka (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türgi (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirillits (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirillits (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirillits (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kirillits (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Jaapani (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Jaapani (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Jaapani (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Lihtsustatud Hiina (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditsionaalne Hiina (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditsionaalne Hiina (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hiina (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Tai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Tai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "nädalapäeva esitähed"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "täielik nädalapäeva nimi"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "lühendatud kuu nimetus"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "täispikk kuu nimetus"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "eelistatud kuupäev ja aeg kasutusel lokaali jaoks"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "sajandi number (aasta/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "Kuupäev kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "tund kümnendnumbrina kasutades 24-tunnilist kella"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "tund kümnendnumbrina kasutades 12-tunnilist kella"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "päev aastas kui kümnendnumber"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "kuu kui kümnendnumber"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minutid kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "kas EL või PL"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekundin kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "nädalapäev kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "eelistatud kuupäev"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "viimased kaks aasta numbrit"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "aasta kümnendnumbrina"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "ajatsoon või nimi või lühend"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "*Määraja"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Seletus"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Näide"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Säti kirja värvid"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Värvid"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Tsiteeritud tekst - Aste 1"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Tsiteeritud tekst - Aste 2"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Tsiteeritud tekst - Aste 3"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI viide"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Tsitaadi värvid ringelvad"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Vali astme 1 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Vali astme 2 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Vali astme 3 tsitaadile värv"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Vali URI-le värv"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Sümbolite kirjeldus"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5868,11 +5868,11 @@ msgstr ""
 "Uudistegrupp\n"
 "Kirja-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Kui x on seatud, näitab väljendit"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5886,7 +5886,7 @@ msgstr ""
 "Tsiteeritud teate keha allkirjata\n"
 "Literaal %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5898,20 +5898,20 @@ msgstr ""
 "Täht avanev loogeline sulg\n"
 "Täht sulgev loogeline sulg"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Klahvi seosed"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Määra klahvi seosed... "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Vana Sylpheed"
 
@@ -6989,18 +6989,46 @@ msgstr "Ei saa ühendust SMTP serveriga: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ei saa ühendust SMTP serveriga: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Kirjakasti seaded"
 
-#: src/setup.c:44
-#, fuzzy
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr ""
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Sisesta kirjakasti asukoht.\n"
-"Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse automaatselt."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "Loobu"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Kirjakast %s on juba olemas."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7672,6 +7700,15 @@ msgstr "üks teine Sylpheed juba töötab.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Sisesta kirjakasti asukoht.\n"
+#~ "Kui määrate juba olemasoleva kirjakasti, siis seeskaneeritakse "
+#~ "automaatselt."
+
 #~ msgid "Lookup"
 #~ msgstr "Otsi"
 
@@ -8010,9 +8047,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "OLGU"
 
-#~ msgid "Cancel"
-#~ msgstr "Loobu"
-
 #~ msgid "Refresh"
 #~ msgstr "Uuenda"
 
diff --git a/po/fr.po b/po/fr.po
index 47e796ae..f6420ae2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2008-12-04 00:06+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -998,7 +998,7 @@ msgstr "/_Copier"
 msgid "/_Paste"
 msgstr "/Co_ller"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
@@ -1194,7 +1194,7 @@ msgstr "Erreur de conversion du carnet d'adresses"
 msgid "Address Book Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Interface"
 
@@ -1830,7 +1830,7 @@ msgstr "Le fichier n'existe pas ou est vide."
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Encodage"
 
@@ -2081,7 +2081,7 @@ msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2384,18 +2384,18 @@ msgstr "/_Supprimer le groupe de discussion"
 msgid "Creating folder view...\n"
 msgstr "Création de la vue des dossiers...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Total"
 
@@ -2407,12 +2407,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -2437,7 +2437,7 @@ msgstr "La reconstruction de l'arborescence a échoué."
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Indésirable"
 
@@ -3886,16 +3886,16 @@ msgstr ""
 "Saisissez l'emplacement de la nouvelle boîte aux lettres. Si elle\n"
 "existe déjà, elle sera automatiquement analysée."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4330,7 +4330,7 @@ msgstr "Confidentialité"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Avancée"
 
@@ -4456,7 +4456,7 @@ msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatique"
 
@@ -4500,8 +4500,8 @@ msgstr "Génération d'un Message-ID"
 msgid "Add user-defined header"
 msgstr "Ajouter des en-têtes supplémentaires"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Modifier... "
 
@@ -4879,8 +4879,8 @@ msgstr "Mettre à jour tous les dossiers locaux après incorporation"
 msgid "Execute command when new messages arrived"
 msgstr "Exécuter la commande lors de l'arrivée de nouveaux messages"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Commande"
 
@@ -4997,7 +4997,7 @@ msgstr ""
 "êtes l'auteur"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Éditeur de texte"
@@ -5083,56 +5083,56 @@ msgid "Displaying message number columns in the folder view:"
 msgstr ""
 "Afficher les statistiques sur les messages dans la fenêtre des dossiers"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abréger les noms des groupes de discussion de plus de"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "lettres"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Résumé des messages"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Afficher le destinataire dans la colonne « Expéditeur » si vous êtes "
 "l'expéditeur du message"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Déployer les fils de conversation"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Format de la date"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Éléments affichés dans le résumé... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Message"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Jeu de caractères par défaut"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Ceci est utilisé pour l'affichage de messages sans jeu de caractères associé."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Jeu de caractères pour l'envoi"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5140,11 +5140,11 @@ msgstr ""
 "Si « Automatique » est sélectionné, le jeu de caractères optimal pour la "
 "langue utilisée sera choisi automatiquement."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Coloration des messages"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5152,83 +5152,83 @@ msgstr ""
 "Afficher l'alphabet et les nombres multi-octets\n"
 "comme des caractères ASCII (Japonais seulement)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Afficher un panneau d'en-têtes au dessus du message"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Afficher des en-têtes courts dans la fenêtre des messages"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Afficher les messages HTML comme du texte"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "Considérer les messages en HTML pure comme une pièce jointe"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Afficher le curseur dans la fenêtre des messages"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Espacement des lignes"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Défilement"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Demi-page"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Défilement continu"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "par pas de"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Images"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Adapter les images aux dimensions de la fenêtre des messages"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Afficher les images directement dans le message"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Activer la gestion des messages indésirables"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Commande d'apprentissage :"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Sélectionnez le pré-réglage)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Acceptable"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Commande de détection"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5236,234 +5236,234 @@ msgstr ""
 "Une certaine période de temps d'apprentissage est nécessaire pour pouvoir "
 "faire automatiquement le tri entre courriers acceptables et indésirables."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Dossier des indésirables"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Les messages marqués comme indésirables seront déplacés dans ce dossier."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Tri des messages détectés comme indésirables à la réception"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Tri des messages indésirables avant application des filtres"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Effacer les courriers indésirables du serveur lors de la réception"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Marquer les courriers indésirables comme lus"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Vérifier automatiquement les signatures"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Afficher le résultat de la vérification dans une fenêtre"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Mémoriser temporairement la phrase secrète"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Expiration après"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minute(s) "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "Mettre 0 pour mémoriser la phrase secrète pendant toute la durée de la "
 "session."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Monopoliser le clavier pendant la saisie de la phrase secrète"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Afficher un avertissement si GnuPG ne fonctionne pas"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Ouvrir automatiquement les messages sélectionnés dans le résumé"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Ouvrir le premier message non lu en ouvrant un dossier"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Se souvenir du dernier message sélectionné"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Marquer un message comme lu uniquement si ouvert dans une nouvelle fenêtre"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Aller dans la boîte de réception lors de l'arrivée de nouveau courrier"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Aller dans la boîte de réception au démarrage"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Exécuter immédiatement la suppression ou le déplacement de messages"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Si désactivé, les messages resteront marqués jusqu'à exécution."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 "Mettre les boutons en conformité avec le guide de l'interface humanisée de "
 "Gnome (GNOME HIG)"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Afficher une icône dans la zone de notification"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Minimiser dans la zone de notification"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 "Afficher ou minimiser en cliquant sur l'icône dans la zone de notification"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Choisir les raccourcis clavier... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Autres"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Commande externes"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Date"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Message de réception"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Afficher une fenêtre lors de la réception :"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Toujours"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Seulement lors d'une relève manuelle du courrier"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Jamais"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne pas afficher de fenêtre d'erreur lors d'une erreur de réception"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Fermer la fenêtre de réception à la fin"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Un double-clic sur une adresse l'ajoute à la liste des destinataires"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "En quittant"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Confirmer en quittant"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Vider la corbeille en quittant"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Demander avant de vider"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Avertir s'il y a des messages à envoyer en file d'attente"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Commandes externes (%s sera remplacé par le nom du fichier ou l'URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Navigateur web"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Navigateur Web par défaut)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Utiliser un programme externe pour l'impression"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Utiliser un programme externe pour l'incorporation"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Utiliser un programme externe pour l'envoi"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Activer le vérificateur d'orthographe"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Activer la vérification stricte de l'intégrité des caches d'index"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5473,275 +5473,275 @@ msgstr ""
 "programmes.\n"
 "Cette option réduira les performances d'affichage du résumé des messages."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Dépassement du délai de réponse (timeout) des E/S du socket :"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "seconde(s)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatique (recommandé)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII 7 bits (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Europe occidentale (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Europe occidentale (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Europe occidentale (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Europe centrale (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balte (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balte (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Balte (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Grec (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabe (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arabe (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hébreu (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hébreu (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turc (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillique (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillique (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillique (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillique (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonais (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japonais (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonais (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinois simplifié (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinois simplifié (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinois traditionnel (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinois traditionnel (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinois (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Coréen (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thaï (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thaï (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "nom du jour de la semaine (abrégé)"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "nom du jour de la semaine"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "nom du mois (abrégé)"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "nom du mois"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "le format par défaut de la date et de l'heure"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "le 'siècle' (année/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "le jour du mois"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'heure en tant que nombre (0-23)"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'heure en tant que nombre (1-12)"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "le jour de l'année en tant que nombre"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "le mois en tant que nombre"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "les minutes en tant que nombre"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM (matin) ou PM (après-midi)"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "les secondes en tant que nombre"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "le jour de la semaine en tant que nombre"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "le format par défaut de la date"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "les deux derniers chiffres de l'année"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "l'année"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "le fuseau horaire, son nom ou abréviation"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Code"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Description"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Exemple"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Paramétrer les couleurs de message"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Texte cité - 1er niveau"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Texte cité - 2e niveau"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Texte cité - 3e niveau"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Lien URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Réutiliser les couleurs"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Choix de la couleur de la citation niveau 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Choix de la couleur de la citation niveau 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Choix de la couleur de la citation niveau 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Choix de la couleur pour les liens URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Description des symboles"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5765,11 +5765,11 @@ msgstr ""
 "Groupes de discussions\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Si x est défini, afficher expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5783,7 +5783,7 @@ msgstr ""
 "Corps du message sans signature en tant que citation\n"
 "Caractère pourcent « % »"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5795,19 +5795,19 @@ msgstr ""
 "Caractère « { »\n"
 "Caractère « } »"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Raccourcis clavier"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Choisissez les raccourcis clavier."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Par défaut"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Ancien Sylpheed"
 
@@ -6825,17 +6825,48 @@ msgstr "Impossible de se connecter au serveur SMTP "
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Impossible de se connecter au serveur SMTP : %s:%d"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Paramètres de la boîte aux lettres"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Effectuer les actions suivantes :"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
+msgstr ""
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Annulé"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
 msgstr ""
-"Saisissez le nom de la boîte aux lettres. Si vous\n"
-"ne savez pas quoi mettre, appuyez directement sur OK."
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "La boîte aux lettres « %s » existe déjà."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7498,6 +7529,13 @@ msgstr "une autre session de Sylpheed existe.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Saisissez le nom de la boîte aux lettres. Si vous\n"
+#~ "ne savez pas quoi mettre, appuyez directement sur OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Rechercher"
 
diff --git a/po/gl.po b/po/gl.po
index ed6a1d70..d8239bef 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -991,7 +991,7 @@ msgstr "/_Copiar..."
 msgid "/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
@@ -1195,7 +1195,7 @@ msgstr "Erro na conversión da axenda"
 msgid "Address Book Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Interfaz"
 
@@ -1872,7 +1872,7 @@ msgstr "O ficheiro non existe ou está valeiro."
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Codificación"
 
@@ -2127,7 +2127,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2436,18 +2436,18 @@ msgstr "/_Eliminar grupo"
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Novos"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Non leídos"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2459,12 +2459,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -2490,7 +2490,7 @@ msgstr "Reconstruindo a arbre de carpetas..."
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3972,16 +3972,16 @@ msgstr ""
 "Si xa existe será\n"
 "examinado automáticamente."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4403,7 +4403,7 @@ msgstr "Privacidad"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Avanzadas"
 
@@ -4531,7 +4531,7 @@ msgid "Authentication method"
 msgstr "Método de autenticación"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automática"
 
@@ -4580,8 +4580,8 @@ msgstr "Xenerar ID-Mensaxe"
 msgid "Add user-defined header"
 msgstr "Engadir cabeceira de usuario"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4961,8 +4961,8 @@ msgstr "Actualizar todas as carpetas locales despois de incorporar"
 msgid "Execute command when new messages arrived"
 msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Comando"
 
@@ -5075,7 +5075,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5165,55 +5165,55 @@ msgstr "Ver o número de non leídas xunto ó nome da carpeta"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Ver o número de non leídas xunto ó nome da carpeta"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar nomes de grupos con mais de"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Vista resumo"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Ver destinatario na columna `Dende' si o remitente é vostede mismo"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Expandir fíos"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Elementos visibles no resumo... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Mensaxe"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Ver/_Ordear/Descendente"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5222,11 +5222,11 @@ msgstr ""
 "Si se selecciona `Automático' utilizarase a\n"
 "codificación óptima para a localización actual."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensaxe"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5234,618 +5234,618 @@ msgstr ""
 "Mostrar alfabéticos e numéricos multi-byte como\n"
 "caracteres ASCII (só para Xaponés)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceiras sobre a mensaxe"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "cabeceiras breves na vista da mensaxe"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Mensaxe/Reen_viar como adxunto"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "cabeceiras breves na vista da mensaxe"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Interlineado"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Desplazamento"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Media páxina"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Paso"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar as imáxes adxuntas"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Ver propiedades de cabeceiras"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "Executar"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Seleccione teclas"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "Executar"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "Carpeta"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(As mensaxes sen filtrar gardaránse nesta carpeta)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrar mensaxes ó recibir"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Borrar carpeta"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Borrar carpeta"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Comprobar as sinaturas automáticamente"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Mostrar diálogo de comprobación de sinatura"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Manter contrasinal en memoria temporalmente"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Expirar despois de"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minuto(s) "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Poniendo '0' mantendrá a contraseña\n"
 " durante toda a sesión)"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar a entrada mentras se introducen contrasinais"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso no inicio si non funciona GnuPG"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Abrir sempre as mensaxes no sumario cando se seleccionan"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Abrir a primeira mensaxe non leída ó abrir unha carpeta"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaxe como leída só ó abrila nunha fiestra nova"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Abrir entrada despois de recibir correo novo"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Comproba correo novo ó inicio"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar inmediatamente movimentos ou borrados de mensaxes"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Os mensaxes marcaránse hasta a execución\n"
 " si está desactivado)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Nome mostrado"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Outras"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Executar"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrar diálogo de erro si hai erros de recepción"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Mostrar diálogo de recepción ó finalizar"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Engadir dirección ó destino con doble click"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Ó sair"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Confirmar ó sair"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Baleirar papeleira ó sair"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Preguntar antes de baleirar"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensaxes na cola"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s se sustituirá con o nome de ficheiro / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Navegador web"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Caixa de correo por defecto"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Xaponés (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Xaponés (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Xaponés (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Chines simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Chines tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chines tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chines (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "o dia da semana abreviado"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "o dia da semana completo"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "o nome do mes abreviado"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "o nome do mes completo"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "a data e hora preferida para a localización actual"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "o número de século (año/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mes como número decimal"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como número usando o reloxo de 24 horas"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como número usando o reloxo de 12 horas"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como número decimal"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "o mes como número decimal"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "o minuto como número decimal"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "o segundo como número decimal"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como número decimal"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para a localización actual"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "os dous últimos díxitos do ano"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "o ano como número decimal"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria ou nome ou abreviatura"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Descripción"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Cores do mensaxe"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Enlace URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Reutilizar cores de citación"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Escoller cor para o nivel de citado 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Escoller cor para o nivel de citado 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Escoller cor para o nivel de citado 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Escoller cor para URIs"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5869,11 +5869,11 @@ msgstr ""
 "Grupos de novas\n"
 "ID-Mensaxe"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Si x está, mostra expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5887,7 +5887,7 @@ msgstr ""
 "Corpo da mensaxe citado sen sinatura\n"
 "o carácter %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5899,20 +5899,20 @@ msgstr ""
 "Carácter chave aberta\n"
 "Carácter chave pechada"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Atallos de teclado"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Establecer atallos de teclado... "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Por defecto"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Antigos de Sylpheed"
 
@@ -6988,19 +6988,46 @@ msgstr "Non se pode conectar con o servidor SMTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Non se pode conectar con o servidor SMTP: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Configurar caixa de correo"
 
-#: src/setup.c:44
-#, fuzzy
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr ""
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Introduzca a localización da caixa de correo.\n"
-"Si xa existe será\n"
-"examinado automáticamente."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "a caixa de correo `%s' xa existe."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7672,6 +7699,15 @@ msgstr "xa hai outro Sylpheed executándose.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Introduzca a localización da caixa de correo.\n"
+#~ "Si xa existe será\n"
+#~ "examinado automáticamente."
+
 #~ msgid "Lookup"
 #~ msgstr "Buscar"
 
@@ -8009,9 +8045,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "Aceptar"
 
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
 #~ msgid "Refresh"
 #~ msgstr "Refrescar"
 
diff --git a/po/hr.po b/po/hr.po
index f001205f..b849a8e4 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -996,7 +996,7 @@ msgstr "/_Kopiraj..."
 msgid "/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1192,7 +1192,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Sučelje"
 
@@ -1879,7 +1879,7 @@ msgstr "Datoteka ne postoji ili je prazna."
 msgid "Properties"
 msgstr "Postavke"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Kodiranje"
 
@@ -2135,7 +2135,7 @@ msgstr "Uredite JPilot unos"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2447,18 +2447,18 @@ msgstr "/Ukloni news _grupu"
 msgid "Creating folder view...\n"
 msgstr "Stvaram spisni pregled...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2470,12 +2470,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -2504,7 +2504,7 @@ msgstr "Osvježavam stablo spisa..."
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -4062,16 +4062,16 @@ msgstr ""
 "Ako je unešen postojeći sandučić, biti će\n"
 "automatski pretražen."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4496,7 +4496,7 @@ msgstr "Privatnost"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -4627,7 +4627,7 @@ msgid "Authentication method"
 msgstr "Autorizacija"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr ""
 
@@ -4677,8 +4677,8 @@ msgstr "Generiraj ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodatna zaglavlja"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -5051,8 +5051,8 @@ msgstr "Osvježi sve spise poslije prihvaćanja"
 msgid "Execute command when new messages arrived"
 msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Naredba"
 
@@ -5164,7 +5164,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Uređivač"
@@ -5255,56 +5255,56 @@ msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Prikaži broj nepročitanih poruka kraj imena spisa"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 #, fuzzy
 msgid "letters"
 msgstr "Obriši"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primatelja na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Postavi pojedinosti prikaza... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Pošta"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5313,633 +5313,633 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišten."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prikaži 2-byte abecedu i brojeve s 1-byte znakovima"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Pošta/Proslijedi _kao prilog"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz postavki zaglavlja"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Odaberite ključeve"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "Spis"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrirane poruke biti će spremljene u ovaj spis)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Obriši spis"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Obriši spis"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Automatski provjeri potpis"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 #, fuzzy
 msgid "Expired after"
 msgstr "Pošalji kasnije"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 #, fuzzy
 msgid "minute(s) "
 msgstr "minuta"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "poruka neće biti primljena\n"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u spis"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Nema više label poruka"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 #, fuzzy
 msgid "Only mark message as read when opened in new window"
 msgstr "/_Pošta/O_tvori u novom prozoru"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Idi u sandučić nakon primanja pošte"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Provjeri poštu prilikom starta"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premještanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Poruke će samo biti označene do izvršenja\n"
 " ako je ovo isključeno)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Prikaz imena"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 #, fuzzy
 msgid " Set key bindings... "
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Drugo"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Datum"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Uvijek"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 #, fuzzy
 msgid "Close receive dialog when finished"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u destinaciju kada se dva put klikne"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Pitaj prije pražnjenja"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, fuzzy, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Vanjski uređivač (%s predstavlja ime datoteke)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Koristi vanjski program za slanje"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Koristi vanjski program za prihvat"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Koristi vanjski program za slanje"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 #, fuzzy
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Zapadno-Europski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Europski (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Čirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Čirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Čirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime tjedna"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "puno ime tjedna"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "skraćeno ime mjeseca"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "puno ime mjeseca"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vrijeme za trenutni locale"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "broj stoljeća (godina/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "dan u mjesecu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vrijeme"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vrijeme"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "mjesec kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minute kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AP ili PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "dan u tjednu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "posljednje dvije znamenke godine"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Označitelj"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Primjer"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Postavi boje poruka"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi stupanj"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi stupanj"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći stupanj"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI poveznice"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Ciklički mijenjaj boje citata"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stupnja"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stupnja"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. stupnja"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5963,11 +5963,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5976,7 +5976,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5984,22 +5984,22 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 #, fuzzy
 msgid "Key bindings"
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr "Šaljem"
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 #, fuzzy
 msgid "Default"
 msgstr "Uobičajeni sandučić"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr ""
 
@@ -7081,19 +7081,46 @@ msgstr "Ne mogu se povezati na SMTP poslužitelj: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ne mogu se povezati na SMTP poslužitelj: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Postavke sandučića"
 
-#: src/setup.c:44
-#, fuzzy
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr ""
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Unesite lokaciju sandučića.\n"
-"Ako je unešen postojeći sandučić, biti će\n"
-"automatski pretražen."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "Odustani"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Sandučić `%s' već postoji."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7777,6 +7804,15 @@ msgstr "drugi Sylpheed već radi.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Unesite lokaciju sandučića.\n"
+#~ "Ako je unešen postojeći sandučić, biti će\n"
+#~ "automatski pretražen."
+
 #~ msgid "Lookup"
 #~ msgstr "Potraži"
 
@@ -8064,9 +8100,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "U redu"
 
-#~ msgid "Cancel"
-#~ msgstr "Odustani"
-
 #~ msgid "Refresh"
 #~ msgstr "Osvježi"
 
diff --git a/po/hu.po b/po/hu.po
index 8b74c57e..977a4882 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2009-08-15 13:25+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -989,7 +989,7 @@ msgstr "/_Másolás"
 msgid "/_Paste"
 msgstr "/_Beillesztés"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Címjegyzék"
 
@@ -1179,7 +1179,7 @@ msgstr "Címjegyzék konvertálási hiba"
 msgid "Address Book Conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Illesztő"
 
@@ -1816,7 +1816,7 @@ msgstr "A fájl nem létezik vagy üres."
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Kódolás"
 
@@ -2063,7 +2063,7 @@ msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2354,18 +2354,18 @@ msgstr "/Hírcsoport e_ltávolítása"
 msgid "Creating folder view...\n"
 msgstr "Mappa nézet létrehozása...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Új"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Összes"
 
@@ -2377,12 +2377,12 @@ msgstr "Mappa információ beállítása...\n"
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -2407,7 +2407,7 @@ msgstr "Mappafa újraépítése sikertelen."
 msgid "Checking for new messages in all folders..."
 msgstr "Új levelek keresése minden mappában..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Levélszemét"
 
@@ -3823,16 +3823,16 @@ msgstr ""
 "Ha létező postaládát ad meg, akkor\n"
 "automatikusan átvizsgálom."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A(z) `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4263,7 +4263,7 @@ msgstr "Magánszféra"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Haladó"
 
@@ -4387,7 +4387,7 @@ msgid "Authentication method"
 msgstr "Azonosítási módszer"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatikus"
 
@@ -4431,8 +4431,8 @@ msgstr "Message-ID generálása"
 msgid "Add user-defined header"
 msgstr "Felhasználó által definiált fejléc hozzáadása"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Szerkesztés... "
 
@@ -4810,8 +4810,8 @@ msgstr "Fogadás után minden helyi mappa frissítése"
 msgid "Execute command when new messages arrived"
 msgstr "Parancs végrehajtása, ha új levél érkezett"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Parancs"
 
@@ -4925,7 +4925,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "A saját levélre válaszkor öröklött címzettek"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Szerkesztő"
@@ -5010,55 +5010,55 @@ msgstr "Mappanév mellett az olvasatlan levelek számának kijelzése"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Mappanézetben jelenítse meg a levelek számának oszlopát"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Hírcsoportok rövidítése, ha hosszabb mint"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "levél"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Összefoglaló nézet"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Címzett mutatása a `Feladó' oszlopban, ha önmagának küldte"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Folyam kifejtése"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Dátum formátuma"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Összefoglalás kijelzésének beállítása... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Levél"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Alapértelmezett karakterkódolás"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Ezt használja a program olyan levelek megjelenítéséhez, amiben nincs megadva "
 "'character encoding' sor."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Kimenő levelek karakterkódolása"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5066,11 +5066,11 @@ msgstr ""
 "Ha az `Automatikus' be van kapcsolva, akkor az optimális kódolást használja "
 "a helyi nyelvi beállításoknak megfelelően."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Színek használata a levelekhez"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5078,83 +5078,83 @@ msgstr ""
 "Több-bájtos karakterek és számok megjelenítése\n"
 "ASCII karakterekkel (csak japán esetén)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Fejlécmező megjelenítése a levél fölött"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Rövid fejlécek a levélnézetben"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "HTML levél értelmezése szövegként"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "HTML levél kezelése csatolmányként"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Kurzor megjelenítése levélnézetben"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Sortávolság"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "Képpont"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Görgetés"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Fél oldal"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Finom görgetés"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Lépés"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Képek"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "A nagy méretű csatolt képek ablakméretre igazítása"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Képek megjelenítése egyvonalban"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Levélszemét szabályozás engedélyezése"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Tanítás parancs:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Beállítás választás)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Nem levélszemét"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Osztályozó parancs"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5162,228 +5162,228 @@ msgstr ""
 "A levélszemét automatikus osztályozásánál, egy bizonyos mértékig kézzel kell "
 "tanítani a levélszemét és a levél válogatását."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Levélszemét mappa"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Azon levelek, melyek levélszemétként lettek beállítva törlődni fognak ebből "
 "a mappából."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "A fogadáskor megszűrt levelek levélszemétként osztályozva"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Levélszemét szűrése a normális szűrés előtt"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Levélszemét törlése a szerverről fogadáskor"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Szűrt jelölés a levélszemétre olvasáskor"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Digitális aláírás automatikus ellenőrzése"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Aláírásellenőrzés eredménye felbukkanó ablakban"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Jelmondat ideiglenes tárolása a memóriában"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Lejár ennyi után"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "perc"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "'0'-ra állítva tárolja a jelmondatot a teljes menet alatt."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Bevitel elkapása egy jelmondat beadásakor"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Figyelmeztetés induláskor, ha a GnuPG nem működik"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "A levelek mindig összefoglalva jelennek meg, ha ez kiválasztott"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Az első olvasatlan levél megnyitása, ha egy mappa nyitott"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Emlékezzen a legutóbb kiválasztott levélre"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Csak az új ablakban megnyitott leveleket jelölje olvasottként"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Fogadás után a bejövő mappa megnyitása"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Bejövő mappa megnyitás induláskor"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Azonnali végrehajtás a levél mozgatásakor vagy törlésekor"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "A levelek kijelölten láthatók a feldolgozás alatt, ha ez ki van kapcsolva."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "A gombrendszer elkészítése a GNOME HIG szerint"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Tálcaikon megjelenítése"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Minimalizálás tálcaikonként"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Az ablak elrejtése/megjelenítése a tálcaikonra kattintáskor"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Billentyű hozzárendelések... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Egyéb"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Külső parancsok"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 msgid "Update"
 msgstr "Frissítés"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Fogadó ablak"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Fogadó ablak mutatása"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Mindig"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Csak kézi fogadáskor"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Soha"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne dobjon fel hibaablakot fogadási hiba esetén"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Fogadó ablak bezárása ha végzett"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Dupla-klikk esetén cím a célmezőbe"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Kilépéskor"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Kilépéskor rákérdez"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Kuka ürítése kilépéskor"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Ürítés előtt rákérdez"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Elküldetlen levelek esetén figyelmeztet"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Külső parancsok (%s helyére a fájlnév / URI kerül)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Web böngésző"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Alapértelmezett böngésző)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Külső program használata nyomtatáshoz"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Külső program használata email fogadáshoz"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Külső program használata küldéshez"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr "Az ellenőrzéshez a 'curl' parancs szükséges."
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr "Új verzió automata ellenőrzése"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr "HTTP proxy hesználata"
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr "HTTP proxy gép (gépnév:port):"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Összefoglaló gyorstár sértetlenségének pontos ellenőrzése"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5393,275 +5393,275 @@ msgstr ""
 "alkalmazás módosíthatja.\n"
 "Ez az opció lassítja az összefoglalás megjelenésének idejét."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Hálózati adatátvitel időtúllépés:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "másodperc"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatikus (Ajánlott)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bites ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Nyugat Európai (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Nyugat Európai (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Nyugat Európai (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Közép Európai (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltikumi (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltikumi (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Baltikumi (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Görög (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arab (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arab (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Héber (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Héber (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Török (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirill (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirill (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirill (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirill (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japán (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japán (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japán (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Egyszerűsített Kínai (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Egyszerűsített Kínai (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionális Kínai (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionális Kínai (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kínai (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Koreai (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "rövidített nap név"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "teljes nap név"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "rövidített hónapnév"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "a teljes hónapnév"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "ajánlott dátum- és időformátum a jelenlegi nyelvi beállításhoz"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "évszázad (év/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "hónap napja számként"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "óra számként (24 órás kijelzés)"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "óra számként (12 órás kijelzés)"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "Az év napja számként"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "hónap számként"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "perc számként"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "DE vagy DU"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "másodperc számként"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "hét napja számként"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "ajánlott dátum az aktuális nyelvi beállításhoz"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "az évszám utolsó két számjegye"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "év számként"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "időzóna vagy név vagy rövidítés"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Vezérlőjel"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Leírás"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Példa"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Levélszínek beállítása"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Színek"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Idézett szöveg - első szint"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Idézett szöveg - második szint"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Idézett szöveg - harmadik szint"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI hivatkozás"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Idézet színeinek újrahasznosítása"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "1. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "2. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "3. szintű idézet színe"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "URI színe"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Szimbólumok leírása"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5685,11 +5685,11 @@ msgstr ""
 "Hírcsoportok\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Ha x beállítva, akkor kifejezés megjelenítése"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5703,7 +5703,7 @@ msgstr ""
 "Idézett levéltörzs aláírás nélkül\n"
 "Szó szerint %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5715,19 +5715,19 @@ msgstr ""
 "Nyitó kapcsos zárójel\n"
 "Záró kapcsos zárójel"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Billentyű hozzárendelések"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Válasszon a beállított billentyű hozzárendelésekből."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Alapértelmezés"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Régi Sylpheed"
 
@@ -6743,17 +6743,48 @@ msgstr "Nem lehet csatlakozni az SMTP szerverhez."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nem lehet csatlakozni az SMTP szerverhez: %s:%d"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Postaláda beállítások"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "A következő műveletek teljesítése:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Kérem adja meg a postaláda helyét!\n"
-"Ha bizonytalan, csak válassza az OK-ot."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Megszakítva"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "A(z) `%s' postaláda már létezik."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7410,6 +7441,13 @@ msgstr "A Sylpheed jelenleg a legújabb verziójú."
 msgid "Couldn't get the version information."
 msgstr "A verzió adatok nem szerezhetők meg."
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Kérem adja meg a postaláda helyét!\n"
+#~ "Ha bizonytalan, csak válassza az OK-ot."
+
 #~ msgid "Lookup"
 #~ msgstr "Előnézet"
 
diff --git a/po/it.po b/po/it.po
index 57dc189b..a7f7aa60 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -986,7 +986,7 @@ msgstr "/_Copia"
 msgid "/_Paste"
 msgstr "/_Incolla"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Rubrica"
 
@@ -1181,7 +1181,7 @@ msgstr "Errore di conversione della rubrica"
 msgid "Address Book Conversion"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Interfaccia"
 
@@ -1825,7 +1825,7 @@ msgstr "Il file non esiste o è vuoto."
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Codifica"
 
@@ -2073,7 +2073,7 @@ msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2375,18 +2375,18 @@ msgstr "/_Rimuovi newsgroup..."
 msgid "Creating folder view...\n"
 msgstr "Creazione della vista della cartella...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nuovi"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Non letti"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Totale"
 
@@ -2398,12 +2398,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -2428,7 +2428,7 @@ msgstr "La ricostruzione delll'albero della cartella è fallita."
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Spazzatura"
 
@@ -3867,16 +3867,16 @@ msgstr ""
 "Se è specificata una casella postale esistente, sarà\n"
 "esaminata automaticamente."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4311,7 +4311,7 @@ msgstr "Privacy"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Avanzato"
 
@@ -4436,7 +4436,7 @@ msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatico"
 
@@ -4480,8 +4480,8 @@ msgstr "Genera ID messaggio"
 msgid "Add user-defined header"
 msgstr "Aggiungi un'intestazione definita dall'utente"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Modifica... "
 
@@ -4859,8 +4859,8 @@ msgstr "Aggiorna tutte le cartelle locali dopo l'incorporazione"
 msgid "Execute command when new messages arrived"
 msgstr "Esegui il comando quando arrivano nuovi messaggi"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Comando"
 
@@ -4972,7 +4972,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Eredita i destinatari in risposta agli auto messaggi"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5057,55 +5057,55 @@ msgstr "Mostra il numero dei messaggi non letti vicino al nome della cartella"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Mostra le colonne del numero dei messaggi nella vista cartella"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Accorcia i newsgroup più lunghi di"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "lettere"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Vista sommario"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostra il destinatario nella colonna «Da» se il mittente sei tu stesso"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Espandi i thread"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Formato della data"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Imposta le voci visibili nel sommario... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Codifica caratteri predefinita"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Viene usato quando si visualizzano messaggi con la codifica caratteri "
 "mancante."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Codifica caratteri in uscita"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5113,11 +5113,11 @@ msgstr ""
 "Selezionando «Automatico» verrà usata la codifica ottimale per la località "
 "attuale."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Abilita la colorazione del messaggio"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5125,84 +5125,84 @@ msgstr ""
 "Mostra l'alfabeto e il numero multy-byte come\n"
 "carattere ASCII (solo Giapponese)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Mostra il riquadro intestazione sopra la vista messaggio"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Mostra le intestazioni abbreviate nella vista messaggio"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Trasforma i messaggi HTML come testo."
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Trasforma i messaggi HTML come testo."
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Mostra il cursore nella vista messaggio"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Spazio tra le righe"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Scorrimento"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Mezza pagina"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Scorrimento uniforme"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Immagini"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Ridimensiona le immagini allegate per adattarle nella finestra"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Mostra immagini in linea"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Abilita il controllo della mail spazzatura"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Comando di apprendimento:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(seleziona predefinito)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Normale"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Comando di classificazione"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5211,232 +5211,232 @@ msgstr ""
 "spazzatura e non spazzatura devono essere apprese manualmente per un certo "
 "periodo."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Cartella spazzatura"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "I messaggi impostati come mail spazzatura saranno spostati in questa "
 "cartella."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtra in ricezione i messaggi classificati come spazzatura"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtra le mail spazzatura prima del filtraggio normale"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Elimina le mail spazzatura dal server in ricezione"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Segna le mail spazzatura filtrate come lette"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Controlla automaticamente le firme"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Mostra il risultato del controllo della firma in una finestra di popup"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Conserva temporaneamente in memoria la phassphrase"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Scade dopo"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minuto(i)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Impostando a «0» si conserverà la passphrase per l'intera sessione"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Nascondi l'input durante l'inserimento della passphrase"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostra un avvertimento alla partenza se GnuPG non è attivo"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Apri sempre i messaggi nel sommario quando selezionati"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Apri il primo messaggio non letto quando viene aperta una cartella"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Ricorda l'ultimo messaggio selezionato"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Segna il messaggio come letto solo quando è aperto in una nuova finestra"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Vai a «In entrata» dopo la ricezione di nuova posta"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Vai a «In entrata» all'avvio"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Esegui immediatamente quando sposti o elimini dei messaggi"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "I messaggi verranno solo segnati fino all'esecuzione se questa è inattiva."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Disposizione dei pulsanti conforme con lo GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Mostra l'icona nella tray"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Minimizza nell'icona della tray"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Mostra/nascondi la finestra con un click sull'icona nella tray"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Impostazione delle associazioni dei tasti... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Altro"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Comandi esterni"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Finestra di ricezione"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Mostra la finestra di ricezione"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Solo in ricezione manuale"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Mai"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Non mostrare la finestra di popup alla ricezione di un errore"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Chiudi la finestra di ricezione quando finito"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Aggiungi l'indirizzo di destinazione con un doppio click"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "In uscita"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Chiedi la conferma all'uscita"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Svuota il cestino all'uscita"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Chiedi prima di svuotare"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Avverti se ci sono messaggi accodati"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr ""
 "Comandi esterni (gli %s verranno sostituiti con il nome del file / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Browser web"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Browser predefinito)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Usa un programma esterno per la stampa"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Usa un programma esterno per incorporare la posta"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Usa un programma esterno per l'invio"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Abilita controllo ortografico"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Abilita il controllo stretto dell'integrità delle cache del sommario"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5446,275 +5446,275 @@ msgstr ""
 "modificati da altre applicazioni.\n"
 "Questa opzione degraderà le prestazioni della visualizzazione del sommario."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Timeout del socket I/O:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "secondo(i)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatica (Raccomandata)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII a 7 bit (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Occidentale (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Occidentale (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Europa Occidentale (Windows 1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Centrale (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltico (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Baltico (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Greco (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabo (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arabo (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Ebreo (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Ebreo (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirillico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirillico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirillico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirillico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Giapponese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Giapponese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Giapponese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Cinese semplificato (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Cinese semplificato (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Cinese tradizionale (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Cinese tradizionale (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Cinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Tailandese (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Tailandese (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "il nome abbreviato del giorno della settimana"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "il nome completo del giorno della settimana"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "il nome abbreviato del mese"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "il nome completo del mese"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "la data e l'ora preferite per la località attuale"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "il numero del secolo (anno/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "il giorno del mese come numero decimale"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 24 ore"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "l'ora come numero decimale con l'orologio di 12 ore"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "il giorno dell'anno come numero decimale"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "il mese come numero decimale"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "i minuti come numero decimale"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM o PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "i secondi come numero decimale"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "il giorno della settimana come numero decimale"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "la data preferita per la località attuale"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "le ultime due cifre dell'anno"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "l'anno come numero decimale"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "il fuso orario o l'abbreviazione"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Specificatore"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Esempio"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Impostazione dei colori del messaggio"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Colori"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Testo citato - Primo livello"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Testo citato - Secondo livello"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Testo citato - Terzo livello"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Link URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Ricicla i colori di citazione"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Scelta del colore per la citazione di livello 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Scelta del colore per la citazione di livello 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Scelta del colore per la citazione di livello 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Scelta del colore per l'URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Descrizione dei simboli"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5738,11 +5738,11 @@ msgstr ""
 "Newsgroups\n"
 "ID-Messaggio"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Se è impostato x, mostra expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5756,7 +5756,7 @@ msgstr ""
 "Corpo del messaggio citato senza firma\n"
 "Percentuale"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5768,19 +5768,19 @@ msgstr ""
 "Parentesi graffa aperta\n"
 "Parentesi graffa chiusa"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Associazioni dei tasti"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Impostazione delle associazioni dei tasti."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Predefinita"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Vecchio sylpheed"
 
@@ -6805,17 +6805,48 @@ msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Impossibile connettersi al server NNTP: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Impostazione della casella postale"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Eseguire le seguenti azioni:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Specificare la posizione della casella di posta.\n"
-"Se non siete sicuri, selezionare semplicemente OK."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Cancellato"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "La casella postale «%s» esiste già."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7480,6 +7511,13 @@ msgstr "un altro Sylpheed è già in esecuzione.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Specificare la posizione della casella di posta.\n"
+#~ "Se non siete sicuri, selezionare semplicemente OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Cerca"
 
diff --git a/po/ja.po b/po/ja.po
index 4e093a06..ee6f2680 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -981,7 +981,7 @@ msgstr "/コピー(_C)"
 msgid "/_Paste"
 msgstr "/ペースト(_P)"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "アドレス帳"
 
@@ -1176,7 +1176,7 @@ msgstr "アドレス帳変換エラー"
 msgid "Address Book Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "インタフェース"
 
@@ -1810,7 +1810,7 @@ msgstr "ファイルが存在しないかまたは空です。"
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "エンコーディング"
 
@@ -2057,7 +2057,7 @@ msgstr "JPilotエントリを編集"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2348,18 +2348,18 @@ msgstr "/ニュースグループを削除(_R)"
 msgid "Creating folder view...\n"
 msgstr "フォルダビューを作成中...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "新着"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "未読"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "総数"
 
@@ -2371,12 +2371,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -2401,7 +2401,7 @@ msgstr "フォルダツリーの再構築に失敗しました。"
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "迷惑メール"
 
@@ -3818,16 +3818,16 @@ msgstr ""
 "メールボックスの場所を入力してください。\n"
 "既存のメールボックスを指定するとその内容を自動的にスキャンします。"
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4256,7 +4256,7 @@ msgstr "個人情報"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "高度な設定"
 
@@ -4380,7 +4380,7 @@ msgid "Authentication method"
 msgstr "認証方式"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "自動"
 
@@ -4424,8 +4424,8 @@ msgstr "メッセージIDを生成する"
 msgid "Add user-defined header"
 msgstr "ユーザ定義のヘッダを追加する"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " 編集... "
 
@@ -4801,8 +4801,8 @@ msgstr "受信後にすべてのローカルフォルダを更新する"
 msgid "Execute command when new messages arrived"
 msgstr "新着メッセージが到着したらコマンドを実行する"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "コマンド"
 
@@ -4914,7 +4914,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "自分が出したメッセージに返信した場合は宛先を引き継ぐ"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "エディタ"
@@ -4998,54 +4998,54 @@ msgstr "フォルダ名の横に未読数を表示する"
 msgid "Displaying message number columns in the folder view:"
 msgstr "フォルダビューに表示するメッセージ数のカラム:"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "文字数が"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "字より長いニュースグループ名を簡略表示"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "サマリビュー"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "差出人が自分の場合は `差出人' カラムに宛先を表示する"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "スレッドを展開する"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "日付の書式"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " サマリの表示項目を設定... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "既定の文字エンコーディング"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "これはエンコーディングが未指定のメッセージを表示するときに使用されます。"
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "送信文字エンコーディング"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5053,93 +5053,93 @@ msgstr ""
 "「自動設定」を選択した場合は、現在の言語設定に最適なエンコーディングが使用さ"
 "れます。"
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "メッセージの色を有効にする"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "マルチバイト英数字を ASCII 文字で表示する (日本語のみ)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "メッセージビューの上部にヘッダペインを表示する"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "メッセージビューに簡略ヘッダを表示する"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "HTML メッセージを解釈してテキスト表示する"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "HTML のみのメッセージを添付として扱う"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "メッセージビューにカーソルを表示する"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "行間を空ける"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "ピクセル"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "スクロール"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "半ページ単位"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "スムーズスクロール"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "間隔"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "画像"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "大きな添付画像をウィンドウにあわせてリサイズする"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "画像をインラインで表示する"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "迷惑メール対策を有効にする"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "学習コマンド:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(プリセットを選択)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "非迷惑メール"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "判定コマンド"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5147,226 +5147,226 @@ msgstr ""
 "迷惑メールを自動的に判定するには、迷惑メールと非迷惑メールの両方をある程度ま"
 "で手動で学習させる必要があります。"
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "迷惑メールフォルダ"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "迷惑メールに指定したメッセージをこのフォルダに移動します。"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "受信時に迷惑メールと判定されたメッセージを振り分ける"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "通常の振り分けの前に迷惑メールを振り分ける"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "受信時に迷惑メールをサーバから削除する"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "振り分けた迷惑メールを既読にする"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "署名を自動的に検証する"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "署名の検証結果をポップアップウィンドウで表示する"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "パスフレーズをメモリ上に一時的に記憶する"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "有効期間"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "分"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "'0' に設定するとセッションの間中パスフレーズを記憶します。"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "パスフレーズの入力時に入力を捕捉する"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG が動作しない場合起動時に警告を表示する"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "サマリでメッセージを選択したとき常に開く"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "フォルダを開いたときに最初の未読メッセージを開く"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "最後に選択したメッセージを記憶する"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "新規ウィンドウで開いたときのみメッセージを既読としてマーク"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "新着メールを受信した後受信箱を開く"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "起動時に受信箱を開く"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "メッセージを移動または削除したら即座に実行する"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "これを無効にすると、メッセージは実行されるまでマークされた状態になります。"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "ボタンの配置をGNOME HIGに準拠"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "トレイアイコンを表示する"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "最小化したときにトレイアイコンに格納する"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "トレイアイコンのクリックでウィンドウの表示を交互に切り替える"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " キーバインドを設定... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "その他"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "外部コマンド"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 msgid "Update"
 msgstr "アップデート"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "受信ダイアログ"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "受信ダイアログを"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "常に表示"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "手動で受信した場合のみ表示"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "表示しない"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "受信エラー時にエラーダイアログをポップアップしない"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "完了時に受信ダイアログを閉じる"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "ダブルクリックしたときにアドレスを宛先に追加する"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "終了時"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "終了時に確認する"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "終了時にごみ箱を空にする"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "空にする前に尋ねる"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "送信待機中のメッセージがあれば警告する"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部コマンド (%s はファイル名・URIで置き換えられます)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Webブラウザ"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(既定のブラウザ)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "印刷に外部プログラムを使用する"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "メールの受信に外部プログラムを使用する"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "メールの送信に外部プログラムを使用する"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr "アップデートチェックには curl コマンドが必要です。"
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr "自動アップデートチェックを有効にする"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr "HTTP プロキシを使用する"
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr "HTTP プロキシホスト (ホスト名:ポート):"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "サマリキャッシュの整合性を厳密にチェックする"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5376,275 +5376,275 @@ msgstr ""
 "にしてください。\n"
 "このオプションはサマリ表示の性能を低下させます。"
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "ソケット I/O のタイムアウト:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "自動設定 (推奨)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "欧米 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "欧米 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "欧米 (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "バルト諸国 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "バルト諸国 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "バルト諸国 (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "ギリシャ語 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "アラビア語 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "アラビア語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "ヘブライ語 (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "ヘブライ語 (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "トルコ語 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "キリル文字 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "キリル文字 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "キリル文字 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "キリル文字 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日本語 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "日本語 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "日本語 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡体字中国語 (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "簡体字中国語 (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体字中国語 (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体字中国語 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中国語 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "韓国語 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "タイ語 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "タイ語 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "曜日の省略名"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "曜日の完全な名前"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "月の省略名"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "月の完全な名前"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "現在の地域における一般的な日付と時刻の表記"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "世紀(西暦年の上2桁)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "日(10進数表記)"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24時間時計での時"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12時間時計での時"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "年の初めから通算の日数(10進数表記)"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "月(10進数表記)"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "分(10進数表記)"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "午前または午後"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "秒(10進数表記)"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "週の何番目の日か(10進数表記)"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "現在の地域における一般的な日付表記"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "西暦の下2桁(世紀部分を含まない年)"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "(4桁の)西暦年"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "タイムゾーンまたはゾーン名または省略名"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "指定子"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "説明"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "例"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "メッセージの色を指定"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "色"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "引用文 - 1段階"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "引用文 - 2段階"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "引用文 - 3段階"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI リンク"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "引用色を循環"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "引用レベル1の色を選択"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "引用レベル2の色を選択"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "引用レベル3の色を選択"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "URI の色を選択"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "記号の説明"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5668,11 +5668,11 @@ msgstr ""
 "ニュースグループ\n"
 "メッセージID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "xが指定されていればexprを表示"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5686,7 +5686,7 @@ msgstr ""
 "引用符付きメッセージ本文(署名なし)\n"
 "文字 %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5698,19 +5698,19 @@ msgstr ""
 "文字 開き中括弧\n"
 "文字 閉じ中括弧"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "キーバインド"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr " キーバインドのプリセットを選択してください。"
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "標準"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "旧Sylpheed"
 
@@ -6725,17 +6725,50 @@ msgstr "SMTPサーバに接続できません。"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "SMTPサーバ: %s:%d に接続できません。"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "メールボックスの設定"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr "このダイアログではメールボックスの初期設定を行います。"
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr "メールボックスを以下の標準の場所に作成する:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"メールボックスの場所を指定してください。\n"
-"よく分からない場合はそのままOKを選択してください。"
+"メールボックスを以下の場所に作成する:\n"
+"(フォルダ名または完全なフォルダのパスを入力してください)"
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+"後から別の場所にメールボックスを追加したい場合は、メニューの「ファイル - メー"
+"ルボックス - メールボックスを追加...」を選択してください。"
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr "メールボックスを作成せずに続行しますか?"
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr "フォルダ名または完全なフォルダのパスを入力してください。"
+
+#: src/setup.c:223
+#, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "メールボックス '%s' はすでに存在します。"
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
diff --git a/po/ko.po b/po/ko.po
index 2428148a..8b1140ee 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -982,7 +982,7 @@ msgstr "/복사(_C)..."
 msgid "/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "주소록"
 
@@ -1179,7 +1179,7 @@ msgstr "주소록 변환 에러"
 msgid "Address Book Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "인터페이스"
 
@@ -1856,7 +1856,7 @@ msgstr "파일이 없거나 비여있습니다."
 msgid "Properties"
 msgstr "특성"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "인코딩"
 
@@ -2111,7 +2111,7 @@ msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2419,18 +2419,18 @@ msgstr "/뉴스그룹 삭제(_R)"
 msgid "Creating folder view...\n"
 msgstr "폴더 뷰를 생성합니다...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "새것"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "안읽음"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2442,12 +2442,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -2473,7 +2473,7 @@ msgstr "폴더 트리를 갱신합니다..."
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3947,16 +3947,16 @@ msgstr ""
 "기존의 메일 박스가 지정되면 자동으로\n"
 "스캔될것입니다."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4376,7 +4376,7 @@ msgstr "프라이버시"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "고급"
 
@@ -4506,7 +4506,7 @@ msgid "Authentication method"
 msgstr "인증 방법"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "자동"
 
@@ -4555,8 +4555,8 @@ msgstr "Message-ID 생성"
 msgid "Add user-defined header"
 msgstr "사용자 정의된 헤더 추가"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " 편집..."
 
@@ -4920,8 +4920,8 @@ msgstr "병합 후에 모든 지역 폴더 갱신"
 msgid "Execute command when new messages arrived"
 msgstr "메시지를 이동하거나 지울때 즉시 실행"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "명령어"
 
@@ -5032,7 +5032,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "편집기"
@@ -5123,56 +5123,56 @@ msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
 msgid "Displaying message number columns in the folder view:"
 msgstr "폴더이름옆에 읽지않을 메시지 수를 표시"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 #, fuzzy
 msgid "letters"
 msgstr "삭제"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "요약 보기"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "보낸 사람이 본인인 경우 보낸 사람 칸에 받는 사람을 표시"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "쓰레드 펴기"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "날짜 형식"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr "요약에 표시될 항목 설정... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "본문"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/보기(_V)/정렬(_S)/내림차순"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5181,11 +5181,11 @@ msgstr ""
 "`자동'이 선택되면, 현재 로케일에 맞는 최적의\n"
 "인코딩 방식이 사용됩니다."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "메시지에 색을 이용하여 보여주기"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5193,619 +5193,619 @@ msgstr ""
 "다중바이트 알파벳과 숫자를 ASCII 문자로\n"
 "표시 (일본어인 경우에만)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "메시지 보기 위에 헤더 창 표시"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "메시지를 볼때 간단한 헤더만 표시"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/메시지(_M)/첨부파일로 전달(_w)"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "메시지를 볼때 간단한 헤더만 표시"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "줄 간격"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "픽셀"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "스크롤"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "반 페이지"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "부드러운 스크롤"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "첨부된 이미지 크기 조정"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "표시될 헤더 설정"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "실행"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "키 선택"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "실행"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "폴더"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(필터링 되지 않은 메시지는 이 폴더에 저장될 것입니다)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "받을때 메시지를 필터링"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "폴더 삭제"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "폴더 삭제"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "자동으로 서명 확인"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "팝업 창에 서명 확인 결과 보이기"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "비밀번호를 메모리에 임시 보관"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 #, fuzzy
 msgid "Expired after"
 msgstr "나중에 보내기"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "분 "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "passphrase를 입력할때 Grab input"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG가 동작하지 않을 경우 시작시 경고 표시"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "어떤 메시지 파일도 선택되지 않았습니다."
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "폴더에 들어가면 첫번째 안읽은 메시지 열기"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "새 창에서 열렸을 경우에만 메시지를 읽은 것으로 표시"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "새 편지를 받은 후 받은 편지함으로 가기"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "시작할 때 새 편지를 검사"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "메시지를 이동하거나 지울때 즉시 실행"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(이것이 꺼져있는 경우 메시지는 실행때까지\n"
 "단지 표시만 될 것입니다)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "표시 명"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " 키 바인딩 설정... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "기타"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "실행"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "날짜"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "받기 대화상자"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "받기 대화상자 보기"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "항상"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "보이지 않음"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "받기 에러 발생시 에러 상자 보이지 않음"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "끝났을 때 받기 대화상자 닫기"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "더블클릭시에 대상에 주소 추가"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "끝낼때"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "끝냈때 확인"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "끝낼때 지운 편지함 비우기"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "지운 편지함 비울때 확인하기"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "큐에 메시지가 있을 때 경고"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "외부 명령 (%s는 파일 이름 / URI로 대체됩니다)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "웹 탐색기"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "기본 우편함"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "발송을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "합체을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "발송을 위해 외부 프로그램을 사용"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "자동 (추천)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit 아스키 (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "유니코드 (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "서부 유럽(ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "서부 유럽(ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "서부 유럽(ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "중부 유럽(ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "그리스 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "그리스 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "터키 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "일본 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "일본 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "일본 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "중국 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "한국 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "년도 (년/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 #, fuzzy
 msgid "the preferred date for the current locale"
 msgstr "현재 로케일에 적당한 날짜와 시간"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 #, fuzzy
 msgid "Specifier"
 msgstr "파일 선택"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "설명"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "예제"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "메시지 색 설정"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "색"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "인용문 - 첫번째 단계"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "인용문 - 두번째 단계"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "인용문 - 세번째 단계"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI 링크"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "인용 색 반복"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "첫번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "두번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "세번째 단계 인용문 색 선택"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "URI 색 선택"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "부호 설명"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5829,11 +5829,11 @@ msgstr ""
 "뉴스그룹\n"
 "메시지-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5842,7 +5842,7 @@ msgid ""
 "Literal %"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5850,20 +5850,20 @@ msgid ""
 "Literal closing curly brace"
 msgstr ""
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "키 바인딩"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 키 바인딩 설정... "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "기본"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "예전 Sylpheed"
 
@@ -6930,19 +6930,46 @@ msgstr "%s:%d SMPT 서버에 연결할 수가 없습니다\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "%s:%d SMPT 서버에 연결할 수가 없습니다\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "메일박스 설정"
 
-#: src/setup.c:44
-#, fuzzy
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr ""
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"메일 박스의 위치를 입력하세요.\n"
-"기존의 메일 박스가 지정되면 자동으로\n"
-"스캔될것입니다."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "취소"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "메일 박스 `%s'가 이미 존재합니다."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7613,6 +7640,15 @@ msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "메일 박스의 위치를 입력하세요.\n"
+#~ "기존의 메일 박스가 지정되면 자동으로\n"
+#~ "스캔될것입니다."
+
 #~ msgid "Lookup"
 #~ msgstr "찾기"
 
@@ -7897,9 +7933,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "확인"
 
-#~ msgid "Cancel"
-#~ msgstr "취소"
-
 #~ msgid "Refresh"
 #~ msgstr "갱신"
 
diff --git a/po/lt.po b/po/lt.po
index 3fb637d2..b5c8bef8 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -983,7 +983,7 @@ msgstr "/_Kopijuoti"
 msgid "/_Paste"
 msgstr "/Į_dėti"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresų knyga"
 
@@ -1173,7 +1173,7 @@ msgstr "Adresų knygos konvertavimo klaida"
 msgid "Address Book Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Sąsaja"
 
@@ -1808,7 +1808,7 @@ msgstr "Failas neegzistuoja arba yra tuščias."
 msgid "Properties"
 msgstr "Savybės"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Koduotė"
 
@@ -2055,7 +2055,7 @@ msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2356,18 +2356,18 @@ msgstr "/Paša_linti naujienų grupę"
 msgid "Creating folder view...\n"
 msgstr "Sukuriama katalogų peržiūra...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nauji"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Neskaityti"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2379,12 +2379,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -2409,7 +2409,7 @@ msgstr "Katalogų medžio perkūrimas nepavyko."
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinami nauji laiškai visuose kataloguose..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Nepageidautinas"
 
@@ -3842,16 +3842,16 @@ msgstr ""
 "Jeigu ji egzistuoja, ji bus\n"
 "nuskaityta automatiškai."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4284,7 +4284,7 @@ msgstr "Privatumas"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Papildomi"
 
@@ -4408,7 +4408,7 @@ msgid "Authentication method"
 msgstr "Autentiškumo patikrinimo metodas"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatinis"
 
@@ -4452,8 +4452,8 @@ msgstr "Generuoti „Message-ID“"
 msgid "Add user-defined header"
 msgstr "Pridėti vartotojo nustatytas antraštes"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Redaguoti... "
 
@@ -4830,8 +4830,8 @@ msgstr "Atnaujinti visus vietinius katalogus po prijungimo"
 msgid "Execute command when new messages arrived"
 msgstr "Vykdyti komandą kai gauti nauji laiškai"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Komanda"
 
@@ -4942,7 +4942,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Redaktorius"
@@ -5027,53 +5027,53 @@ msgstr "Rodyti neskaitytų laiškų skaičių šalia katalogo pavadinimo"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Rodyti laiškų skaičių stulpelius katalogų peržiūroje"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Sutrumpinti naujienų grupes ilgesnes nei"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "raidės"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Santrauka"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Rodyti gavėją lauke „Siuntėjas“, jei siuntėjas esate Jūs"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Išskleisti gijas"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Datos formatas"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Nustatyti santraukoje rodomus laukus... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Laiškas"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Numatytoji simbolių koduotė"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Naudojama kai koduotė nenurodyta laiške."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Siunčiamų laiškų koduotė"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5081,11 +5081,11 @@ msgstr ""
 "Jei pažymėta „Automatiškai“, bus naudojama optimali koduotė pagal esamą "
 "lokalę."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Spalvinti laiškus"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5093,84 +5093,84 @@ msgstr ""
 "Rodyti kelių baitų abėcėlę kaip ASCII simbolius\n"
 "(tik Japonų)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Rodyti antraščių langelį virš laiško"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Rodyti sutrumpintas antraštes"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Rodyti HTML laiškus kaip tekstą"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Rodyti HTML laiškus kaip tekstą"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Rodyti kursorių laiško peržiūroje"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Tarpas tarp eilučių:"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "taškas(-ai)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Slinkti"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Pusė puslapio"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Lygus slinkimas"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Žingsnis"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Paveikslėliai"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Keisti prisegtų paveikslėlių dydį, kad tilptų į langą"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Rodyti paveikslėlius laiške"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Įjungti nepageidautino pašto kontrolę"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Mokymosi komanda"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Pasirinkite nuostatas)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Pageidautinas"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Klasifikavimo komanda"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5178,227 +5178,227 @@ msgstr ""
 "Norėdami automatiškai klasifikuoti nepageidautiną paštą, turite išmokyti "
 "filtrą su pageidautinais ir nepageidautinais laiškais."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Nepageidautini"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Laiškai, pažymėti kaip nepageidautini, bus perkelti į šį katalogą."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Gaunant filtruoti laiškus, klasifikuotus kaip nepageidautinus"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtruoti nepageidautinus laiškus prieš įprastą filtravimą"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Ištrinti nepageidautinus laiškus iš serverio"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Pažymėti nepageidautinus laiškus kaip skaitytus"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Automatiškai tikrinti parašą"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Rodyti parašo tikrinimo rezultatą naujame lange"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Laikinai saugoti slaptą frazę atmintyje"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Galiojimas"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minutė(s)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Nustatymas „0“ saugos slaptą frazę atmintyje visos sesijos metu."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Perimti įvesti, kai įvedama slapta frazė"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Rodyti perspėjimą startuojant, jei GnuPG neveikia"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Visuomet atidaryti santraukoje pasirinktus laiškus"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Atidaryti pirmą neskaitytą laišką einant į katalogą"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Prisiminti paskutinę pasirinktą žinutę"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Pažymėti laišką skaitytu tik jei ji atidaroma naujame lange"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Eiti į gaunamų laiškų katalogą po pašto gavimo"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Pradžioje atverti gaunamų laiškų katalogą"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Nedelsiant vykdyti laiškų perkėlimą ar trinimą"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Jei išjungta, laiškai bus pažymėti iki vykdymo."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Išdėstyti mygtukus pagal GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Rodyti piktogramą dėklėje"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Klavišų susiejimai... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Kiti"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Išorinės komandos"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Gavimo langas"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Rodyti gavimo langą"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Visuomet"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Tik kai gaunama rankiniu būdu"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Niekada"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Nerodyti klaidos lango po nesėkmingo gavimo"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Užverti langą baigus gavimą"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Įdėti adresus į paskirties katalogą dukart spragtelėjus"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Išeinant"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Patvirtinti išėjimą"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Išvalyti šiukšlinę išeinant"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Paklausti prieš išvalant"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Perspėti jei yra laiškų eilėje"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Išorinė komanda (%s bus pakeista failo vardu / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Naršyklė"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Numatytoji naršyklė)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Naudoti išorinę programą spausdinimui"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Naudoti išorinę programą sujungimui"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Naudoti išorinę programą siuntimui"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Įjungti rašybos tikrinimą"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Įjungti griežtą santraukos laikinosios atminties vientisumo tikrinimą"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5407,275 +5407,275 @@ msgstr ""
 "Įjunkite, jei katalogų turinys gali būti modifikuotas kitų programų.\n"
 "Šis pasirinkimas sumažins santraukos rodymo greitį."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Prisijungimo skirtasis laikas"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "sekundė(s)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatiškai (Rekomenduojama)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unikodas (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Vakarų Europos (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Vakarų Europos (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Vakarų Europos (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Centrinės Europos (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltų (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltų (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Baltų (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Graikų (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabų (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arabų (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrajų (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrajų (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkų (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonų (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japonų (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonų (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Supaprastinta Kinų (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Supaprastinta Kinų (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicinė Kinų (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicinė Kinų (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinų (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korėjiečių (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Tailandiečių (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Tailandiečių (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "sutrumpinta savaitės diena"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "pilna savaitės diena"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "sutrumpintas mėnuo"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "pilnas mėnuo"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "pageidaujama data ir laikas esamai lokalei"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "amžius (metai/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "mėnesio diena"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "valanda (24)"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "valanda (12)"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "metų diena"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "mėnesio numeris"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minutės"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM / PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekundės"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "savaitės dienos numeris"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "pageidaujama data esamai lokalei"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "paskutiniai du metų skaitmenys"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "metai"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "laiko zona"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Simbolis"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Aprašymas"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Pavyzdys"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Nustatyti laiško spalvas"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Spalvos"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Cituojams tekstas - Pirmas lygis"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Cituojams tekstas - Antras lygis"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Cituojams tekstas - Trečias lygis"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Nuoroda"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Atkurti citatos spalvas"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Pasirinkite spalvą pirmam citatos lygiui"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Pasirinkite spalvą antram citatos lygiui"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Pasirinkite spalvą trečiam citatos lygiui"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Pasirinkite nuorodos spalvą"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Simbolių apibūdinimas"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5699,11 +5699,11 @@ msgstr ""
 "Naujienų grupė\n"
 "Laiško ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Jei egzistuoja „x“, rodo „expr“"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5717,7 +5717,7 @@ msgstr ""
 "Cituojamas tekstas be parašo\n"
 "Simbolis %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5729,19 +5729,19 @@ msgstr ""
 "Atidarantys riestiniai skliaustai\n"
 "Uždarantys riestiniai skliaustai"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Klavišų susiejimai"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Pasirinkite klavišų susiejimų nuostatas."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Įprastas"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Senas „Sylpheed“"
 
@@ -6766,17 +6766,48 @@ msgstr "Negaliu prisijungti prie NNTP serverio: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Negaliu prisijungti prie NNTP serverio: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Dėžutės nustatymai"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Atlikti veiksmus:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Įveskite dėžutės vietą.\n"
-"Jei nesate tikras, pasirinkite OK."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Nutraukta"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Dėžutė „%s“ egzistuoja."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7429,6 +7460,13 @@ msgstr "Sylpheed jau paleistas.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Įveskite dėžutės vietą.\n"
+#~ "Jei nesate tikras, pasirinkite OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Ieškoti"
 
diff --git a/po/nl.po b/po/nl.po
index 75d3a354..5e590629 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -996,7 +996,7 @@ msgstr "/_Kopieer..."
 msgid "/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresboek"
 
@@ -1196,7 +1196,7 @@ msgstr "Adresboek omzetprobleem"
 msgid "Address Book Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Interface"
 
@@ -1835,7 +1835,7 @@ msgstr "Bestand bestaat niet of is leeg."
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Codering"
 
@@ -2085,7 +2085,7 @@ msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr "Bladeren..."
 
@@ -2389,18 +2389,18 @@ msgstr "/Nieuws_groep verwijderen"
 msgid "Creating folder view...\n"
 msgstr "Mapoverzicht wordt gemaakt...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nieuw"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2412,12 +2412,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -2442,7 +2442,7 @@ msgstr "Opnieuw opbouwen van de mappenboom mislukt."
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Troep"
 
@@ -3897,16 +3897,16 @@ msgstr ""
 "Als een bestaande postbus wordt ingevuld,\n"
 "dan wordt hij automatisch ingelezen."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4350,7 +4350,7 @@ msgstr "Privacy"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Geavanceerd"
 
@@ -4475,7 +4475,7 @@ msgid "Authentication method"
 msgstr "Identificatiemethode"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatisch"
 
@@ -4520,8 +4520,8 @@ msgstr "Bericht-ID aanmaken"
 msgid "Add user-defined header"
 msgstr "Voeg een door de gebruiker gespecificeerde header toe"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr "Bewerken"
 
@@ -4900,8 +4900,8 @@ msgstr "Lokale mappen verversen na de verwerking"
 msgid "Execute command when new messages arrived"
 msgstr "Opdracht uitvoeren wanneer nieuwe e-mail binnenkomt"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Opdracht"
 
@@ -5012,7 +5012,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5097,56 +5097,56 @@ msgstr "Aantal ongelezen berichten weergeven naast mapnaam"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Aantal berichten weergeven in mappenlijst"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Nieuwsgroepen inkorten die langer zijn dan"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "brieven"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Berichtenlijst"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Ontvanger weergeven in 'Afzender' kolom wanneer u zelf de afzender bent"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Discussies uitklappen"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Datumopmaak"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr "Kies kolommen voor berichtenlijst..."
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Bericht"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Standaard tekstcodering"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Dit wordt gebruikt voor het weergeven van berichten zonder meegestuurde "
 "tekencodering."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Uitgaande tekstcodering"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5154,11 +5154,11 @@ msgstr ""
 "Als 'Automatisch' is geselecteerd, wordt de meest optimale codering voor de "
 "huidige locale gebruikt."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Kleurmarkering in berichten aanzetten"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5166,84 +5166,84 @@ msgstr ""
 "Multi-byte tekens weergeven als ASCII tekens\n"
 "(alleen Japans)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Headerinformatie weergeven boven bericht"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Korte headerinformatie weergeven boven bericht"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "HTML als tekst weergeven"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "HTML als tekst weergeven"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Cursor weergeven in berichtveld"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Regelafstand"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Schuiven"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Halve pagina"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Vloeiend schuiven"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Stap"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Bijgevoegde afbeeldingen schalen naar venstergrootte"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Afbeeldingen in bericht weergeven"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Troep-beheer inschakelen"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Leeropdracht:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(kies instelling)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Geen troep"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Klassificatie-opdracht"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5251,238 +5251,238 @@ msgstr ""
 "Om troep automatisch te herkennen, moet het filter eerst getraind worden met "
 "zowel normale berichten als troep."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Troepmap"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "Berichten die zijn aangemerkt als troep zullen hierheen verplaatst worden."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Troep filteren bij ophalen van berichten"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Troep van server verwijderen bij ophalen"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Troep van server verwijderen bij ophalen"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Gefilterde troep als gelezen markeren"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Controleer identificatiehandtekeningen automatisch"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Geef het resultaat van de controle weer in een popupvenster"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Wachtwoord tijdelijk in geheugen opslaan"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Verloopt na"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minuten"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "Instellen op '0' zal het wachtwoord tot het  einde van de sessie opslaan."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Toetsenbord vasthouden tijdens het intikken van het wachtwoord"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Waarschuw mij wanneer GnuPG bij het opstarten niet werkt"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Berichten altijd openen in samenvattingsvenster wanneer geselecteerd"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Het eerste ongelezen e-mailtje openen wanneer een map geopend wordt"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Bericht alleen als gelezen markeren wanneer het geopend is in een nieuw "
 "venster"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Ga naar de inbox na het ophalen van nieuwe e-mail"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Bij opstarten kijken of er nieuwe e-mail is"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Meteen uitvoeren wanneer een bericht verplaatst of verwijderd wordt"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Berichten worden gemarkeerd voor deze acties wanneer dit uitgeschakeld is."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Volg de GNOME HIG met knoppenvolgorde"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Pictogram in mededelingengebied weergeven"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Sneltoetsen instellen..."
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Diversen"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Externe opdrachten"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Datum"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Ontvangstvenster"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Ontvangstvenster weergeven"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Altijd"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Alleen bij handmatig ontvangen"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nooit"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Geen foutmelding geven bij ontvangstfout"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Ontvangstvenster sluiten wanneer het klaar is."
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Adres toevoegen aan 'Geadresseerden' bij dubbelklikken"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Afsluiten"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Bevestigen bij het afsluiten"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Prullenbak leegmaken bij het afsluiten"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Bevestigen bij het legen"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Waarschuw wanneer er berichten in de wachtrij staan"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externe opdrachten (%s is het bestand / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Webbrowser"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "Standaard webbrowser"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Extern programma gebruiken voor het verzenden"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Extern programma gebruiken voor verwerking van de e-mail"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Extern programma gebruiken voor het verzenden"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Spellingscontrole gebruiken"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Nauwkeurige integriteitscontrole gebruiken bij samenvattingsbuffers"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5492,276 +5492,276 @@ msgstr ""
 "andere programma's.\n"
 "Deze optie zal prestatievermindering tot gevolg hebben."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O time-out:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "seconde(n)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (aanbevolen)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Westeuropees (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Westeuropees (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Westeuropees (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraaleuropees (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Arabisch (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Grieks (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisch (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arabisch (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreeuws (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreeuws (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turks (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillisch (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillisch (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillisch (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillisch (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japans (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japans (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japans (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereenvoudigd Chinees (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Vereenvoudigd Chinees (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneel Chinees (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneel Chinees (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinees (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Koreaans (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thais (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thais (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "afgekorte dag van de week"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "volledige dag van de week"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "afgekorte naam van de maand"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "volledig naam van de maand"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "de voorkeurs datum en tijd voor de huidige locale"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "eeuwnummer (jaar/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "dag van de maand als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "het uur als decimaal nummer op een 24 uurs klok"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "het uur als decimaal nummer op een 12-uurs klok"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "dag van het jaar als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "de maand als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "de minuut als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM of PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "de seconde als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "de dag van de week als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "de voorkeursdatum voor de huidige locale"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "de laatste twee cijfers van het jaartal"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "het jaartal als decimaal nummer"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "de tijdzone of naam of afkorting"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Selecteer"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Berichtkleuren instellen"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Geciteerde tekst - eerste niveau"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Geciteerde tekst - tweede niveau"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Geciteerde tekst - derde niveau"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Gebruikte kleuren opnieuw gebruiken"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Selecteer kleur voor niveau 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Selecteer kleur voor niveau 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Selecteer kleur voor niveau 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Selecteer kleur voor URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5785,11 +5785,11 @@ msgstr ""
 "Nieuwsgroepen\n"
 "Bericht-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Als x ingesteld is, expr weergeven"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5803,7 +5803,7 @@ msgstr ""
 "Geciteerde berichtinhoud zonder handtekening\n"
 "Letterlijk %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5815,19 +5815,19 @@ msgstr ""
 "Letterlijk haakje openen\n"
 "Letterlijk haakje sluiten"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Sneltoetsen"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr " Sneltoetsen instellen."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Standaard"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Oude Sylpheed"
 
@@ -6870,17 +6870,48 @@ msgstr "Kan niet verbinden met de NNTP-server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Kan niet verbinden met de NNTP-server: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Mailboxinstellingen"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "De volgende acties uitvoeren:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
+msgstr ""
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Afgebroken"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
 msgstr ""
-"Geef de locatie van de postbus.\n"
-"Als u het niet zeker weet, klik dan gewoon op OK."
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "De mailbox '%s' bestaat al."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7537,6 +7568,13 @@ msgstr "er draait al een Sylpheed.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Geef de locatie van de postbus.\n"
+#~ "Als u het niet zeker weet, klik dan gewoon op OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Zoeken"
 
diff --git a/po/pl.po b/po/pl.po
index 7f0f7125..770f7db0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2008-06-17 22:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -977,7 +977,7 @@ msgstr "/_Kopiuj"
 msgid "/_Paste"
 msgstr "/_Wklej"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Książka adresowa"
 
@@ -1174,7 +1174,7 @@ msgstr "Błąd konwersji książki adresowej"
 msgid "Address Book Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Interfejs"
 
@@ -1808,7 +1808,7 @@ msgstr "Brak pliku lub pusty plik."
 msgid "Properties"
 msgstr "Właściwości"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Kodowanie"
 
@@ -2055,7 +2055,7 @@ msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2356,18 +2356,18 @@ msgstr "/Usuń g_rupę news"
 msgid "Creating folder view...\n"
 msgstr "Tworzenie widoku katalogów...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nowy"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Razem"
 
@@ -2379,12 +2379,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -2409,7 +2409,7 @@ msgstr "Błąd podczas odbudowywania drzewa katalogów."
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Niechciane"
 
@@ -3842,16 +3842,16 @@ msgstr ""
 "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
 "automatycznie skanowana."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4271,7 +4271,7 @@ msgstr "Prywatność"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Zaawansowane"
 
@@ -4398,7 +4398,7 @@ msgid "Authentication method"
 msgstr "Sposób uwierzytelniania"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatycznie"
 
@@ -4448,8 +4448,8 @@ msgstr "Generowanie identyrikatora wiadomości"
 msgid "Add user-defined header"
 msgstr "Dodawanie nagłówka zdefiniowanego przez użytkownika"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr "Edycja..."
 
@@ -4832,8 +4832,8 @@ msgstr "Aktualizacja wszystkich lokalnych katalogów po odebraniu"
 msgid "Execute command when new messages arrived"
 msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Polecenie"
 
@@ -4949,7 +4949,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Edytor"
@@ -5039,57 +5039,57 @@ msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Wyświetlanie ilości nieprzeczytanych przy nazwie katalogu"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skracanie nazwy grup dłuższych niż "
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "liter"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Widok listy wiadomości"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Wyświetlanie odbiorcy w kolumnie \"Od\" gdy użytkownik jest nadawcą"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Rozwijanie wątków"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Format daty"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Ustaw element wyświetlania podsumowania... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Powyższy zestaw znaków jest używany do wyświetlania wiadomości, które nie "
 "zawierają informacji o kodowaniu."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Widok/Kodowani_e znaków"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5097,95 +5097,95 @@ msgstr ""
 "Jeśli wybrano `Automatyczne', zostanie użyte kodowanie optymalne dla "
 "bieżących ustawień lokalnych."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Włączenie kolorowania wiadomości"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Wyświetlanie znaków wielobajtowych jako ASCII (tylko japoński)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Wyświetlanie panelu nagłówków ponad oknem wiadomości"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Wyświetlanie krótkich nagłówków w widoku wiadomości"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Wyświetlanie wiadomości HTML jako teskt"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Wyświetlanie wiadomości HTML jako teskt"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Pokaż kursor w widoku wiadomości"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Odstęp międzywierszowy"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "piksel(e)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Pół strony"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Wygładzone przewijanie"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Krok"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Obrazy"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Dopasuj rozmiar załączonych obrazków do rozmiaru okna"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Pokaż grafikę w treści"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Włącz filtr niechcianej poczty"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Polecenie uczenia:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Wybierz klucze"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Pożądana"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Polecenie rozpoznające"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 #, fuzzy
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
@@ -5194,244 +5194,244 @@ msgstr ""
 "Aby rozpoznawać niechciane wiadomości automatycznie, należy do pewnego "
 "stopnia nauczyć filtr, które wiadomości są pożądane a które nie."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Katalog niechcianej poczty:"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 "(Wiadomości rozpoznane jako niechciane zostaną zachowane w tym katalogu)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrowanie wiadomości podczas odbierania"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Usuń z serwera"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Usuń z serwera"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Oznacz odfiltrowane niechciane wiadomości jako przeczytane"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Automatyczne sprawdzanie podpisów"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Wyświetlanie wyniku sprawdzania podpisu w oknie komunikatów"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Tymczasowe zapamiętywanie hasła w pamięci"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Wygasa po"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minuta(y)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Wartość '0' ustawi zapamiętywanie hasła na czas całej sesji."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Przechwytywanie wejścia podczas wprowadzania hasła"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Wyświetlanie ostrzeżenia przy uruchamianiu gdy nie działa GnuPG"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Zawsze otwieraj wiadomości gdy wybrano widok podsumowania."
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr ""
 "Otwieranie pierwszej nieprzeczytanej wiadomości przy wchodzeniu do katalogu"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Zaznaczanie wiadomości jako odczytanych tylko po otwarciu w nowym oknie"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Przechodzenie do Poczty przychodzącej po odbiorze poczty"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Sprawdzanie poczty przy uruchamianiu programu"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Natychmiastowe wykonywanie przy przenoszeniu lub kasowaniu wiadomości"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Gdy opcja ta jest wyłączona, wiadomości pozostaną zaznaczone do aż do "
 "momentu wykonania."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Kolejność przycisków zgodna z GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Wyświetlana nazwa"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Minimalizuj do obszaru powiadomień"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Pokaż/ukryj okno przy kliknięciu na ikonę w obszarze powiadomień"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Ustaw dowiązania klawiszy... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Inne"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Wykonaj polecenie"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Okno dialogowe odbierania"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Wyświetlanie okna dialogowego odbierania"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Zawsze"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Tylko przy ręcznym odbieraniu"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Okno błędu pobierania wiadomości nie jest wyświetlane"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Zamykanie okna dialogowego odbierania po zakończeniu"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Dodawanie adresu do docelowego po dwukrotnym kliknięciu"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Podczas wyjścia"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Potwierdzanie zamykania programu"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Opróżnianie śmietnika przy zamykaniu programu"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Wyświetlanie pytania przed opróżnieniem"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Ostrzeganie jeśli są wiadomości w kolejce"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Polecenia zewnętrzne  (%s zostanie zastąpione nazwą pliku / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Domyślny inbox"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Używanie zewnętrznego programu do wysyłania"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Użycie zewnętrznego programu do odbierania poczty"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Używanie zewnętrznego programu do wysyłania"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Włącz sprawdzanie pisowni"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5441,279 +5441,279 @@ msgstr ""
 "inne aplikacje.\n"
 "Uruchomienie tej opcji spowoduje spadek wydajności wyświetlania podsumowania."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Limit czasu gniazda I/O:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "sekund(y)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatyczne (Zalecane)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-bitowe ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unikod (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Zachodnia (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa Śodkowa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Bałtyckie (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Bałtyckie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cyrylica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Greckie (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Bałtyckie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cyrylica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrajskie (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrajskie (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Tureckie (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrylica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrylica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrylica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrylica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japońskie (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japońskie (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japońskie (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Uproszczone Chińskie (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Uproszczone Chińskie (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradycyjne Chińskie (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradycyjne Chińskie (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chińskie (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Koreańskie (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Tajskie (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Tajskie (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "skrócona nazwa dnia tygodnia"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "pełna nazwa dnia tygodnia"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "skrócona nazwa miesiąca"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "pełna nazwa miesiąca"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "preferowana data i czas dla ustawień lokalnych"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "numer roku (rok/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "dzień miesiąca jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 24-ro godzinnego"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "godzina jako liczba dziesiętna z użyciem czasu 12-to godzinnego"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "dzień roku jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "miesiąc jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekunda jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "dzień tygodnia jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "preferowana data dla ustawień lokalnych"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "ostatnie dwie cyfry roku"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "rok jako liczba dziesiętna"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasowa jako nazwa lub skrót"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Wyszczególniacz"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Przykład"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Ustaw kolory wiadomości"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Cytowany tekst - poziom pierwszy"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Cytowany tekst - poziom drugi"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Cytowany tekst - poziom trzeci"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Łącze URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Powtarzanie kolorów cytowania"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Wybierz kolor dla drugiego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Wybierz kolor dla URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Opis symboli"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5737,11 +5737,11 @@ msgstr ""
 "Grupy news\n"
 "ID wiadomości"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Wyświetla expr jeśli ustawiono x"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5755,7 +5755,7 @@ msgstr ""
 "Ciało cytowanej wiadomości bez sygnatury\n"
 "Literalny %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5767,20 +5767,20 @@ msgstr ""
 "Literalny nawias klamrowy otwierający\n"
 "Literalny nawias klamrowy zamykający"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Dowiązania klawiszy"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Ustaw dowiązania klawiszy... "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Domyślny"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Dawny Sylpheed"
 
@@ -6835,19 +6835,48 @@ msgstr "Nie można połączyć się z serwerem NNTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nie można połączyć się z serwerem NNTP: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Ustawienia skrzynki"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
 #, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Podejmij działania:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Wprowadź położenie skrzynki.\n"
-"Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
-"automatycznie skanowana."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Anulowano"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Skrzynka \"%s\" już istnieje."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7549,6 +7578,15 @@ msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Wprowadź położenie skrzynki.\n"
+#~ "Jeśli zostanie podana istniejąca skrzynka, będzie ona\n"
+#~ "automatycznie skanowana."
+
 #~ msgid "Lookup"
 #~ msgstr "Wyszukaj"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2aacd87e..ffb46e54 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2009-07-14 12:28-0400\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -991,7 +991,7 @@ msgstr "/_Copiar"
 msgid "/_Paste"
 msgstr "/Co_lar"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
@@ -1186,7 +1186,7 @@ msgstr "Erro na conversão do catálogo de endereços"
 msgid "Address Book Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Interface"
 
@@ -1821,7 +1821,7 @@ msgstr "O arquivo não existe ou está vazio."
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Codificação"
 
@@ -2069,7 +2069,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2371,18 +2371,18 @@ msgstr "/_Eliminar grupo de notícias"
 msgid "Creating folder view...\n"
 msgstr "Criando visualizador de pasta...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Não lido"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Total"
 
@@ -2394,12 +2394,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -2424,7 +2424,7 @@ msgstr "Falha ao tentar reconstruir a árvore de pastas."
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Spam"
 
@@ -3856,16 +3856,16 @@ msgstr ""
 "Se uma caixa de correio existente for especificada, ela será\n"
 "analisada automaticamente."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4295,7 +4295,7 @@ msgstr "Privacidade"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Avançadas"
 
@@ -4419,7 +4419,7 @@ msgid "Authentication method"
 msgstr "Método de Autenticação"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automático"
 
@@ -4463,8 +4463,8 @@ msgstr "Gerar Message-ID"
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho do usuário"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Editar... "
 
@@ -4841,8 +4841,8 @@ msgstr "Atualizar todas as pastas locais ao incorporar"
 msgid "Execute command when new messages arrived"
 msgstr "Executar comando quando chegarem novas mensagens"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Comando"
 
@@ -4957,7 +4957,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Herdar destinatários ao responder mensagens próprias"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5042,54 +5042,54 @@ msgstr "Exibir número de não lidas próximas ao nome da pasta"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Exibir colunas com o número de mensagens na visualização de pastas"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviar newsgroups maiores que"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "letras"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Visão de Sumário "
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Expandir threads"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Formato de data"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Elementos visíveis no cabeçalho... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Codificação padrão de caracteres"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Isto é usado ao exibir mensagens que não indicam a codificação de caracteres."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Codificação de caracteres para envio"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5097,11 +5097,11 @@ msgstr ""
 "Se `Automático' for selecionado, a melhor codificação para o locale atual "
 "será usada."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Permitir cores na mensagem"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5109,83 +5109,83 @@ msgstr ""
 "Exibir alfabetos de 2-bytes e numéricos com \n"
 "caracteres ASCII (1-byte)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Exibir cabeçalho acima da visão da mensagem"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Cabeçalhos pequenos na visualização da mensagem"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Renderizar mensagens HTML como texto"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "Tratar mensagens contendo apenas HTML como anexo"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Exibir cursor na área de visualização da mensagem"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Linha de espaço"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Rolagem"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Meia página"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Rolagem silenciosa"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Passo"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Imagens"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionar imagens em anexo para que caibam na janela"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Dispor as imagens em seqüência"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Habilitar controle de spam"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Comando de aprendizado:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Selecionar pré-definido)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Não spam"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Comando de classificação"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5193,226 +5193,226 @@ msgstr ""
 "Para classificar SPAM automaticamente, deve-se treinar manualmente o "
 "classificador com uma quantidade razoável de SPAM e não-SPAM."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Pasta de spam"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "As mensagens classificadas como spam serão movidas para esta pasta."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrar mensagens classificadas como spam ao receber"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtrar SPAM antes da filtragem normal"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Apagar SPAMs do servidor ao receber"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Marcar SPAM filtrado como lido"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Automaticamente checar assinatura"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Exibir resultado de checagem de assinatura em uma janela popup"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Armazenar senha temporariamente na memória"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Expirado depois"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minuto(s)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Definindo para '0' guardará a senha para toda a sessão."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Obter entrada quando informando uma passphrase"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Exibir aviso na inicialização se o GnuPG não funciona"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Sempre abrir mensagens no sumário quando selecionado"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Abrir a primeira mensagem não lida ao abrir uma pasta"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Lembrar última mensagem selecionada"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Somente marcar a mensagem como lida quando aberta em uma nova janela"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Abrir a caixa de entrada após receber novas mensagens"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Abrir caixa de entrada ao iniciar"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Executar imediatamente enquanto movendo ou apagando mensagens"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Mensagens permanecerão marcadas até a execução se isto estiver desativado."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Ordenar os botões de acordo com o GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Exibir ícone de bandeja"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Minimizar para ícone de bandeja"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Alternar exibição da janela ao clicar no ícone da bandeja"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Definir atalhos de teclado... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Outros"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Comandos externos"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Diálogo de recepção"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Exibir diálogo de recepção"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Sempre"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Apenas no recebimento manual"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nunca"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Não mostrar diálogo de erro no caso de erros ao receber"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Fechar diálogo de recepção quando terminar"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Adicionar endereço para o destino quando clicado duas vezes"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Ao sair"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Confirmar ao sair"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Esvaziar lixeira ao sair"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Pergunte antes de esvaziar"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Avise se existirem mensagens na fila"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comandos externos (%s será sustituido pelo nome do arquivo)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Navegador Web"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Navegador padrão)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Usar programa externo para imprimir"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Usar um programa externo para obter mensagens"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Usar programa externo para enviar"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr "Verificação de atualizações requer o comando 'curl'."
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr "Habilitar verificação de atualizações automáticas"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr "Proxy HTTP (servidor:porta):"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Habilitar verificação rigorosa da integridade dos caches do sumário"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5423,275 +5423,275 @@ msgstr ""
 "Esta opção reduzirá o desempenho de exibição do sumário."
 
 # tradução boa para socket?
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Tempo limite de E/S no socket:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeu Ocidental (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeu Ocidental (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Europeu Ocidental (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Europeu Central (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Báltico (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Grego (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arábico (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arábico (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreu (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreu (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonês (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japonês (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonês (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chinês simplificado (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Chinês simplificado (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Chinês tradicional (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chinês tradicional (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinês (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "o nome completo do mês abreviado"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "o nome completo do dia da semana"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "o nome do mês abreviado"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "o nome completo do mês"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "a data é hora preferida para a localização atual"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "o número do século (ano/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "o dia do mês como um número decimal"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 24 horas"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "a hora como um número decimal usando um relógio de 12 horas"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "o dia do ano como um número decimal"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "o mês como um número decimal"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "o minuto como um número decimal"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "ou AM ou PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "o segundo como um número decimal"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "o dia da semana como um número decimal"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "a data preferida para localização atual"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "os últimos dois dígitos de um ano"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "o ano como um número decimal"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "o zona de tempo ou nome ou abreviação"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Especificador"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Descrição"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Exemplo"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Defina as cores de mensagens"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Cores"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Texto Quotado - Primeiro Nível"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Texto Quotado - Segundo Nível"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Texto Quotado - Terceiro Nível"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Ligação URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Reaproveitar cores de quote"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Escolher cor para quotação nível 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Escolher cor para quotação nível 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Escolher cor para quotação nível 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Escolher cor para URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Descrição dos símbolos"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5716,11 +5716,11 @@ msgstr ""
 "Message-ID\n"
 "%"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Se x estiver definido, mostra expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5734,7 +5734,7 @@ msgstr ""
 "Corpo da mensagem citada sem assinatura\n"
 "%% literal"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5746,19 +5746,19 @@ msgstr ""
 "Abre-chave literal\n"
 "Fecha-chave literal"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Atalhos de teclado"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Selecione o conjunto pré-definido de mapeamento de teclas."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Padrão"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
@@ -6774,17 +6774,48 @@ msgstr "Não foi possível conectar ao SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Não foi possível conectar ao servidor SMTP: %s:%d"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Configuração da caixa de correio"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Efetuar as seguintes ações:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Informe a localização da caixa de correio.\n"
-"Se você não souber, apenas selecione OK."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Cancelado"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "A caixa de correio `%s' já existe."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7442,6 +7473,13 @@ msgstr "Sylpheed está devidamente atualizado."
 msgid "Couldn't get the version information."
 msgstr "Não foi possível obter a informação sobre versão."
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Informe a localização da caixa de correio.\n"
+#~ "Se você não souber, apenas selecione OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Procurar"
 
diff --git a/po/ro.po b/po/ro.po
index a607a245..c9034567 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2009-12-01 16:54+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
@@ -1009,7 +1009,7 @@ msgid "/_Paste"
 msgstr "/Li_pește"
 
 # tooltip peste butonul Agendă
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agendă"
 
@@ -1203,7 +1203,7 @@ msgstr "Eroare de conversie a agendei"
 msgid "Address Book Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Interfață"
 
@@ -1846,7 +1846,7 @@ msgstr "Fișierul nu există sau este gol."
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Codare"
 
@@ -2095,7 +2095,7 @@ msgstr "Editare înregistrare JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2390,19 +2390,19 @@ msgstr "/Ște_rge grupul de știri"
 msgid "Creating folder view...\n"
 msgstr "Creare vizualizare dosar...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nou"
 
 # comun și când search și în dropdown-ul din fereastra principală
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Necitit"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Total"
 
@@ -2414,12 +2414,12 @@ msgstr "Setare informații dosar...\n"
 msgid "Setting folder info..."
 msgstr "Setare informații dosar..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare dosar %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare dosar %s ..."
@@ -2450,7 +2450,7 @@ msgstr "Reconstruirea arborelui de dosare a eșuat."
 msgid "Checking for new messages in all folders..."
 msgstr "Verifică pentru mesaje noi în toate dosarele..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Spam"
 
@@ -3892,16 +3892,16 @@ msgstr ""
 "Dacă este specificată căsuța poștală existentă,\n"
 "aceasta va fi scanată automat."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Căsuța poștală „%s” există deja."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Căsuță poștală"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4334,7 +4334,7 @@ msgstr "Confidențialitate"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Avansat"
 
@@ -4458,7 +4458,7 @@ msgid "Authentication method"
 msgstr "Metodă de autentificare"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automat"
 
@@ -4505,8 +4505,8 @@ msgstr "Generează câmpul „Message-ID”"
 msgid "Add user-defined header"
 msgstr "Adaugă un antet definit de utilizator"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Editare... "
 
@@ -4886,8 +4886,8 @@ msgstr "Actualizează toate dosarele locale după încorporare"
 msgid "Execute command when new messages arrived"
 msgstr "Execută o comandă la primirea de noi mesaje"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Comandă"
 
@@ -5005,7 +5005,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Păstrează destinatarii inițiali când se răspunde la mesaje proprii"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5091,58 +5091,58 @@ msgstr "Afișează numărul de mesaje necitite lângă numele dosarului"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Afișează coloanele cu numerele de mesaje"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Abreviază grupurile de știri mai lungi decât"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "litere"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Vizualizare sumară"
 
 # hm ? sensul original poate fi incorect în anumite situații; ar trebui ceva de genul dacă expeditorul este totuna cu proprietarul contului
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr ""
 "Afișează destinatarul în coloana „Expeditor”, dacă expeditorul sunteți "
 "dumneavoastră"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Desfășoară firul discuțiilor"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Format dată"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Alegere elemente afișate ale sumarului... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Mesaj"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Codare implicită de caractere"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Se utilizează la afișarea mesajelor cărora la lipsește informația de codare "
 "a caracterelor."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Codare de caractere la trimitere"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5150,11 +5150,11 @@ msgstr ""
 "Dacă este selectat „Automat”, se va utiliza codarea optimă pentru localele "
 "curente."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Activează colorarea mesajelor"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5162,83 +5162,83 @@ msgstr ""
 "Afișează alafbetul și numerele de tip octet multiplu\n"
 "ca caractere ASCII (numai japoneză)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Afișează panou de antet deasupra ferestrei de vizualizare a mesajului"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Afișează antet scurt în fereastra de vizualizare a mesajului"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Randează mesajele HTML ca text"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "Tratează mesajele doar HTML ca atașament"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Afișează cursorul în vizualizarea mesajului"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Spațiere linii"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel(i)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Derulare"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Jumătate de pagină"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Derulare lină"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Pas"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Imagini"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Redimensionează imaginile atașate pentru a încăpea în fereastră"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Afișează imaginile intercalat"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Activează controlul mesajelor spam"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Învățare comandă:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Selectează predefinit)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Nu e spam"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Comandă de clasificare"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5246,229 +5246,229 @@ msgstr ""
 "Pentru a clasifica mesajele ca spam în mod automat, și mesajele spam și "
 "mesajele utile trebuie învățate manual într-o anumită măsură."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Dosar de spam"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Mesajele care sunt marcate ca spam vor fi mutate în acest dosar."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrează la primire mesajele clasificate ca spam"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Filtrează mesajele spam înaintea filtrării normale"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Șterge mesajele spam de pe server la primire"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Marchează mesajele spam filtrate ca fiind citite"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Verifică semnăturile automat"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Arată rezultatul verificării semnăturii într-o fereastră de tip popup"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Stochează temporar fraza secretă în memorie"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Expiră după"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minut(e)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "Selectarea valorii „0” determină memorarea frazei secrete pentru întreaga "
 "sesiune."
 
 # hm ?
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Ascunde intrarea în timp ce se introduce fraza secretă"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Avertizează la pornire dacă GnuPG nu funcționează"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Deschide totdeauna mesajele în mod sumar când sunt selectate"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Deschide primul mesaj necitit la deschiderea unui dosar"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Ține minte ultimul mesaj selectat"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Marchează mesajul ca fiind citit doar când este deschis în fereastră nouă"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Deschide dosarul „Primite (Inbox)” după primirea de mesaje noi"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Deschide dosarul „Primite (Inbox)” la pornirea programului"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Execută imediat când se mută sau se șterg mesajele"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Dacă opțiunea este deselectată, mesajele vor fi mai întâi marcate."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Determină ordinea butoanelor să fie în concordanță cu GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Afișează iconiță în zona de notificare"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Minimizează pe iconița din zona de notificare"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Comută fereastra la clic pe iconița din zona de notificare"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Alegere temă de combinații de taste... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Altele"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Comenzi externe"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 msgid "Update"
 msgstr "Actualizare"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Dialog de primire"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Arată dialogul de primire"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Întotdeauna"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Numai la primire manuală"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Niciodată"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Nu deschide dialog de eroare de tip popup în caz de eroare la primire"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Închide dialogul de primire la terminarea operației"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Adaugă adresa la destinație atunci când se face dublu clic pe ea"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "La ieșire"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Cere confirmare de închidere a programului"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Golește gunoiul la ieșire"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Cere confirmare înainte de golire"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Avertizează dacă sunt mesaje la coadă"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Comenzi externe (%s va fi înlocuit de nume fișier / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Navigator Web"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Navigator implicit)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Folosește un program extern pentru tipărire"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Folosește un program extern pentru încorporare"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Folosește un program extern pentru trimitere"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr "Căutarea eventualelor actualizări necesită comanda „curl”."
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr "Activează actualizarea automată"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr "Folosește proxy HTTP"
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr "Gazdă proxy HTTP (numegazdă:port):"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Activează verificarea strictă a integrității cache-ului sumarului"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5478,275 +5478,275 @@ msgstr ""
 "modificat de alte aplicații.\n"
 "Această opțiune va degrada performanța de afișare a sumarului."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Timpul Socket I/O a expirat:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "secundă(e)"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automat (recomandat)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Western European (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Western European (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Central European (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Baltic (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabic (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Arabic (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrew (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebrew (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkish (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanese (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japanese (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanese (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Simplified Chinese (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Simplified Chinese (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditional Chinese (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditional Chinese (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinese (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korean (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "numele abreviat al zilei săptămânii"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "numele complet al zilei săptămânii"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "numele abreviat al lunii"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "numele complet al lunii"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "data și timpul preferat pentru localele curente"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "numărul secolului (an/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "ziua săptămânii ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ora ca număr zecimal utilizând formatul de 24 ore"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ora ca număr zecimal utilizând formatul de 12 ore"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "ziua anului ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "luna ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minutul ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "indiferent AM sau PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "secunda ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "ziua săptămânii ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "data preferată pentru localele curente"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "ultimii doi digiți ai numărului anului"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "anul ca număr zecimal"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "timpul zonal sau numele sau abrevierea"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Specificator"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Descriere"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Exemplu"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Stabilire culori mesaj"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Culori"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Citat - primul nivel"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Citat - nivelul al doilea"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Citat - nivelul al treilea"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Legătură URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Reciclează culori citat"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Alege culoarea pentru citatul de nivel 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Alege culoarea pentru citatul de nivel 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Alege culoarea pentru citatul de nivel 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Alege culoarea pentru URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Descriere simboluri"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5771,11 +5771,11 @@ msgstr ""
 "ID-mesaj"
 
 # ???
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Dacă x este setat, afișează expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5790,7 +5790,7 @@ msgstr ""
 "Caracterul %"
 
 # sau linie ?
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5802,19 +5802,19 @@ msgstr ""
 "Caracterul {\n"
 "Caracterul }"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Combinații de taste"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Selectați tema predefinită pentru combinațiile de taste."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Implicit"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Sylpheed vechi"
 
@@ -6845,17 +6845,48 @@ msgstr "Nu se poate efectua conexiunea la serverul SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nu se poate efectua conexiunea la serverul SMTP: %s:%d"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Setări căsuță poștală"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Execută următoarele acțiuni:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Specificați locația căsuței poștale.\n"
-"Dacă sunteți nesigur, selectați doar OK."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Anulat"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Căsuța poștală „%s” există deja."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7514,6 +7545,13 @@ msgstr "Versiunea Sylpheed este deja cea mai recentă."
 msgid "Couldn't get the version information."
 msgstr "Nu s-a putut obține informația despre versiune."
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Specificați locația căsuței poștale.\n"
+#~ "Dacă sunteți nesigur, selectați doar OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Căutare"
 
diff --git a/po/ru.po b/po/ru.po
index 97f64ce4..60c1479d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2009-08-10 17:45+0400\n"
 "Last-Translator: Ilya Ponetayev <instenet@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -991,7 +991,7 @@ msgstr "/Копировать"
 msgid "/_Paste"
 msgstr "/Вставить"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -1184,7 +1184,7 @@ msgstr "Ошибка преобразования адресной книги"
 msgid "Address Book Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Интерфейс"
 
@@ -1817,7 +1817,7 @@ msgstr "Файл не существует или пуст."
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Кодировка"
 
@@ -2065,7 +2065,7 @@ msgstr "Редактирование записи JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2366,18 +2366,18 @@ msgstr "/Удалить группу новостей"
 msgid "Creating folder view...\n"
 msgstr "Создание области просмотра папок...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Новые"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Не прочитано"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Всего"
 
@@ -2389,12 +2389,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -2419,7 +2419,7 @@ msgstr "Ошибка при перестройке дерева папок."
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Спам"
 
@@ -3848,16 +3848,16 @@ msgstr ""
 "Если будет указан существующий ящик, то он\n"
 "будет автоматически прочитан."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик \"%s\" уже существует."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4288,7 +4288,7 @@ msgstr "Защита"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Дополнительно"
 
@@ -4412,7 +4412,7 @@ msgid "Authentication method"
 msgstr "Метод аутентификации"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -4456,8 +4456,8 @@ msgstr "Создавать Message-ID"
 msgid "Add user-defined header"
 msgstr "Добавить дополнительные заголовки"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Определить... "
 
@@ -4833,8 +4833,8 @@ msgstr "Обновить все локальные папки после при�
 msgid "Execute command when new messages arrived"
 msgstr "Выполнять команду, когда поступили новые сообщения"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Команда"
 
@@ -4949,7 +4949,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Включить получателей при ответе нв письмо себе"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Редактор"
@@ -5034,55 +5034,55 @@ msgstr "Показывать число непрочитанных сообще�
 msgid "Displaying message number columns in the folder view:"
 msgstr "Отображать столбцы с числом сообщений в дереве папок"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Сокращать названия групп новостей длиннее"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "букв"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Список сообщений"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показывать получателя в колонке \"От\", если отправитель - вы"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Разворачивать обсуждения"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Формат даты"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr "Установить отображаемые поля..."
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Сообщение"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Кодировка по умолчанию"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 "Эта кодировка используется для отображения сообщений, в которых отсутствует "
 "явное указание кодировки."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Кодировка для отправляемых сообщений"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5090,11 +5090,11 @@ msgstr ""
 "При выборе варианта \"Автоматически\" будет использована оптимальная "
 "кодировка для текущего языка и страны."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Разрешить раскраску сообщений"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5102,83 +5102,83 @@ msgstr ""
 "Отображать многобайтовые алфавитно-цифровые символы\n"
 "как ASCII (только для японских кодировок)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Показывать панель заголовков над областью просмотра сообщений"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Показывать сокращённые заголовки при просмотре сообщений"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Отображать сообщения в формате HTML как текст"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "Отображать сообщения в формате HTML как текст"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Отображать курсор в области просмотра сообщения"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Расстояние между строками"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "пикселей"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Половина страницы"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Плавная прокрутка"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Шаг"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Изображения"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабировать присоединённые изображения по размеру окна"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Показывать изображения в тексте сообщения"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Включить автоматическую фильтрацию спама"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Команды для обучения:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Выберите стандартную настройку)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Не спам"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Команда классификации"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5187,227 +5187,227 @@ msgstr ""
 "отметить вручную некоторое количество сообщений, как являющихся, так и не "
 "являющихся спамом."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Папка для спама"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Сообщения, помеченные как спам, будут перемещены в эту папку."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Проверять сообщения на спам при приёме"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Удалять обнаруженный спам перед фильтрацией сообщений"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Удалять обнаруженный спам с сервера при приёме"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Помечать отфильтрованный спам как прочитанный"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Автоматически проверять подписи"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Показывать результат проверки подписи в отдельном окне"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Сохранять парольную фразу в памяти"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Удалять через"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "минут"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "При установке в 0 парольная фраза будет храниться в течение всего сеанса."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Захватить ввод при запросе пароля"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Выводить предупреждение при запуске, если GnuPG не работает"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Всегда открывать сообщение для просмотра при выделении в списке"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Открыть первое непрочитанное сообщение при входе в папку"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Запомнить последнее выбранное сообщени"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Помечать сообщение как прочитанное только после открытия в новом окне"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Перейти в папку \"Входящие\" после приёма новых сообщений"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Открыть папку новых сообщений при запуске"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Немедленно выполнять перемещение и удаление сообщений"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Сообщения будут просто помечены до выполнения, если эта опция не включена."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Размещать кнопки в окнах в соответствии с правилами GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Отображать значок на панели"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Свернуть в панель задач"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Развернуть окно по щелчку на иконке"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Установить клавиатурные команды... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Другое"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Внешние команды"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 msgid "Update"
 msgstr "Обновление"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Окно приёма сообщений"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Показывать окно приёма сообщений"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Всегда"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Только при запуске приема сообщений вручную"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Никогда"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Не отображать сообщение об ошибке при получении сообщений"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Закрывать окно приёма сообщений после завершения"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Добавлять адрес в список адресатов по двойному щелчку"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "При выходе"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Запрашивать подтверждение при выходе"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Очищать корзину при выходе"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Спрашивать перед очисткой"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Предупреждать о наличии сообщений в очереди"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Внешние команды (%s будет заменено на имя файла/URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Браузер по умолчанию)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Использовать внешнюю программу для печати"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Использовать внешнюю программу для приёма почты"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Использовать внешнюю программу для отправки почты"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr "Проверка обновлений требует наличия команды 'curl'."
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr "Включить автоматическую проверку обновлений"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr "Использовать HTTP-прокси"
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr "HTTP-прокси сервер (адрес:порт):"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Проверять целостность кеша списка сообщений"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5417,275 +5417,275 @@ msgstr ""
 "программами.\n"
 "Включение проверки замедляет отображение списков сообщений."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Время ожидания ответа из сети:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Автоматически (Рекомендуется)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 бит ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Западноевропейская (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Западноевропейская (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Западноевропейская (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Центральноевропейская (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Прибалтийская (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Прибалтийская (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Балтика (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Греческая (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Арабская (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Арабская (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Иврит (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Иврит (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецкая (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кириллица (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кириллица (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кириллица/Украина (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кириллица (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японская (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Японская (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Японская (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Китайская упрощённая (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Китайская упрощённая (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Китайская традиционная (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Китайская традиционная (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайская (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Корейская (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Тайская (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Тайская (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "сокращённое название дня недели"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "полное название дня недели"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "сокращённое название месяца"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "полное название месяца"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "предпочтительный формат даты и времени для выбранной страны"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "век (год/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "день месяца"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час, 24-часовое представление"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час, 12-часовое представление"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "день года"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "номер месяца"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "минута"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM или PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "секунда"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "номер дня недели"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "предпочтительный формат даты для выбранной страны"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "последние две цифры года"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "год полностью"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "имя или сокращение временной зоны"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Элемент формата"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Описание"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Пример"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Настройка цветов сообщений"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Цитата - Первый уровень"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Цитата - Второй уровень"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Цитата - Третий уровень"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Ссылка (URI)"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Циклически использовать цвета цитат"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Выберите цвет для цитат уровня 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Выберите цвет для цитат уровня 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Выберите цвет для цитат уровня 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Выберите цвет для ссылок (URI)"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Описание символов"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5709,11 +5709,11 @@ msgstr ""
 "Группы новостей\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Если x установлено, отображает expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5727,7 +5727,7 @@ msgstr ""
 "Содержимое сообщения без подписи со знаком цитаты\n"
 "Символ \"%\""
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5739,19 +5739,19 @@ msgstr ""
 "Символ \"{\"\n"
 "Символ \"}\""
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Клавиатурные команды"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Выберите вариант настройки клавиатурных команд."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Старые версии Sylpheed"
 
@@ -6767,17 +6767,48 @@ msgstr "Ошибка соединения с сервером NNTP: %s:%d"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ошибка соединения с сервером NNTP: %s:%d"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Установки почтового ящика"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Выполнить следующие действия:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Задайте путь к почтовому ящику.\n"
-"Если вы не знаете, какой путь использовать, просто нажмите OK."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Отменена"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Почтовый ящик \"%s\" уже существует."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7434,6 +7465,13 @@ msgstr "Используется последняя версия Sylpheed."
 msgid "Couldn't get the version information."
 msgstr "Невозможно получить информацию о версии."
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Задайте путь к почтовому ящику.\n"
+#~ "Если вы не знаете, какой путь использовать, просто нажмите OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Найти"
 
diff --git a/po/sk.po b/po/sk.po
index 5f15f525..0873e94e 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -989,7 +989,7 @@ msgstr "/_Kopírovať..."
 msgid "/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
@@ -1193,7 +1193,7 @@ msgstr "Chyba pri konverzii adresára"
 msgid "Address Book Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Ovládanie"
 
@@ -1869,7 +1869,7 @@ msgstr "Súbor neexistuje alebo je prázdny."
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Kódová stránka"
 
@@ -2125,7 +2125,7 @@ msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2434,18 +2434,18 @@ msgstr "/Odstrániť _diskusnú skupinu"
 msgid "Creating folder view...\n"
 msgstr "Vytváram náhľad pre priečinok...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nový"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2457,12 +2457,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -2487,7 +2487,7 @@ msgstr "Obnova stromu priečinku sa nepodarila."
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3964,16 +3964,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4395,7 +4395,7 @@ msgstr "Súkromie"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Rozšírené"
 
@@ -4523,7 +4523,7 @@ msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatická"
 
@@ -4573,8 +4573,8 @@ msgstr "Generovať Message-ID"
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Upresniť... "
 
@@ -4959,8 +4959,8 @@ msgstr "Aktualizovať všetky miestne priečinky po prijatí pošty"
 msgid "Execute command when new messages arrived"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Príkaz"
 
@@ -5073,7 +5073,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5163,55 +5163,55 @@ msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "písmen"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Zoznam správ"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Zobraziť príjemcu v stĺpci 'Od' ak ste odosielateľ vy"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Rozbaliť vlákna"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Formát dátumu"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Nastavenie zobrazovaných položiek v zozname správ... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Správa"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5220,628 +5220,628 @@ msgstr ""
 "Po zvolení 'Automatické' bude zvolené optimálne kódovanie\n"
 "pre súčasnú lokalizáciu."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Povoliť farby v správe"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Zobraziť viacbajtovú abecedu a čísla ako ASCII znaky (len Japonsko)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Zobraziť panel s hlavičkami nad správou"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/Sp_ráva/Poslať ako p_rílohu"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel(ov)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Posúvanie"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Pol stránky"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Plynulé posúvanie"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Posun"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Prispôsobiť veľkosť priložených obrázkov"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Zobrazované hlavičky"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "Vykonať"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Zvoľte kľúče"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "Vykonať"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "Priečinok"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Odstrániť priečinok"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Odstrániť priečinok"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Automaticky overovať podpisy"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Zobraziť výsledok overenia ako upozornenie"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Uložiť heslo dočasne v pamäti"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Vymazať z pamäte za"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minút "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavte na '0', ak chcete uložiť heslo do pamäte\n"
 " až do ukončenia)"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Zachytiť vstup počas zadávania hesla"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Pri spustení zobraziť varovanie v prípade, že sa GnuPG nedá použiť."
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Otvoriť správu hneď pri zvolení v zozname"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Pri vstupe do priečinka otvoriť prvú neprečítanú správu"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Žiadne zafarbené správy"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Po prijatí novej pošty sa presunúť do priečinka prijatých správ"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Zistiť novú poštu pri spustení"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Správy budú označené až do vykonania,\n"
 " ak je táto možnosť vypnutá)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Zobraziť meno"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Nastaviť klávesové skratky... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Ostatné"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Vykonať"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Dátum"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Okno prijímania"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Vždy"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nikdy"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Pridať adresu k príjemcom pri dvojkliknutí"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Pri ukončení"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Potvrdiť ukončenie"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Vyprázdniť kôš pri ukončení"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Opýtať sa pred vyprázdnením"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Upozorniť, ak sú správy vo fronte"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externé príkazy (%s bude nahradené názvom súboru / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Webový prehliadač"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Východzí inbox"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Pre odosielanie použiť externý program"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Použiť externý program pre prijímanie lokálnej pošty"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Pre odosielanie použiť externý program"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Časový limit spojení:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "sekúnd"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatické (doporučené)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Západná Európa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Západná Európa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Stredná Európa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltie (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Pobaltie (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grécko (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilika (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Zjednodušená čínština (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "názov mesiaca"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hodinového času"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hodinového času"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minúty"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekundy"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "rok"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Popis"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Príklad"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Nastaviť farby správy"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Farby"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - Prvá úroveň"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Tretia úroveň"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI odkaz"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Opakovať farby"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Vyberte farbu pre 1. úroveň citácie"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Vyberte farbu pre 2. úroveň citácie"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Vyberte farbu pre 3. úroveň citácie"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Vyberte farbu pre URI odkazy"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Popis symbolov"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5865,11 +5865,11 @@ msgstr ""
 "Diskusné skupiny\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Ak je x zadané, zobrazí expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5883,7 +5883,7 @@ msgstr ""
 "Telo citovanej správy bez podpisu\n"
 "Znak %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5895,20 +5895,20 @@ msgstr ""
 "Ľavá zložená zátvorka\n"
 "Pravá zložená zátvorka"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Klávesové skratky"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastaviť klávesové skratky... "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Štandardné"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 
@@ -6985,19 +6985,46 @@ msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Nedá sa pripojiŤ k serveru NNTP: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Nastavenie mailboxu"
 
-#: src/setup.c:44
-#, fuzzy
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr ""
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Zadajte umiestnenie mailboxu.\n"
-"Ak zadáte existujúci mailbox, bude\n"
-"automaticky prehľadaný."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "Storno"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Mailbox '%s' už existuje."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7667,6 +7694,15 @@ msgstr "už beží iná kópia Sylpheedu.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Zadajte umiestnenie mailboxu.\n"
+#~ "Ak zadáte existujúci mailbox, bude\n"
+#~ "automaticky prehľadaný."
+
 #~ msgid "Lookup"
 #~ msgstr "Vyhľadať"
 
@@ -8018,9 +8054,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "OK"
 
-#~ msgid "Cancel"
-#~ msgstr "Storno"
-
 #~ msgid "Refresh"
 #~ msgstr "Obnoviť"
 
diff --git a/po/sl.po b/po/sl.po
index 8a5c7bb6..9095e764 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -995,7 +995,7 @@ msgstr "/Prepiš_i..."
 msgid "/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -1198,7 +1198,7 @@ msgstr "Napaka pri pretvorbi imenika naslovov"
 msgid "Address Book Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Vmesnik"
 
@@ -1875,7 +1875,7 @@ msgstr "Datoteka ne obstaja ali pa je prazna."
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Nabor znakov"
 
@@ -2130,7 +2130,7 @@ msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2438,18 +2438,18 @@ msgstr "/_Odstrani skupino novic"
 msgid "Creating folder view...\n"
 msgstr "Delam mapo View...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2461,12 +2461,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -2492,7 +2492,7 @@ msgstr "Ponovno gradim drevo map..."
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3968,16 +3968,16 @@ msgstr ""
 "Če je določen obstoječi poštni predal,\n"
 "bo pregledan samodejno."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4398,7 +4398,7 @@ msgstr "Zasebnost"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -4526,7 +4526,7 @@ msgid "Authentication method"
 msgstr "Overovitvena metoda"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Samodejno"
 
@@ -4575,8 +4575,8 @@ msgstr "Generiran ID sporočila"
 msgid "Add user-defined header"
 msgstr "Dodaj uporabniško definirano zaglavje"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Uredi... "
 
@@ -4959,8 +4959,8 @@ msgstr "Posodobi vse lokalne mape po pripojitvi"
 msgid "Execute command when new messages arrived"
 msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Ukaz"
 
@@ -5071,7 +5071,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Urejevalnik"
@@ -5161,55 +5161,55 @@ msgstr "Prikaži število neprebranih poleg imena mape"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Prikaži število neprebranih poleg imena mape"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrajšaj novičarske skupine daljše od"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "Izbriši"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Ogled povzetka"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži naslovnika v stolpcu `Od', če ste pošiljatelj vi"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Razširi niti"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Oblika datuma"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr "Nastavi del za prikaz povzetka..."
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Sporočila"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5218,11 +5218,11 @@ msgstr ""
 "Če je izbrano `Samodejno', bo uporabljeno\n"
 "optimalno kodiranje za trenutni locale."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Omogoči barvanje sporočila"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5230,619 +5230,619 @@ msgstr ""
 "Prikaži večzložno abecedo in števila kot\n"
 "znake ASCII (samo japonščina)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavje nad ogledom sporočila"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Sporočilo/Posreduj kot prilo_go"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Prikaži kratko zaglavje ob ogledu sporočila"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Prostor za vrstico"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "točk(e)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Drsenje"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Polovica strani"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Nadzor gladkosti"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 #, fuzzy
 msgid "Resize attached large images to fit in the window"
 msgstr "Spremeni velikost pripetim slikam"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Nastavitev prikaza zaglavja"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "Izvedi"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Izberite ključ"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "Izvedi"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "Mapa"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrirana sporočila bodo shranjena v tej mapi)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtriranje sporočil ob sprejemu"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Izbriši mapo"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Izbriši mapo"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Samodejno preveri podpise"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži rezultat preverjanja podpisa v novem oknu"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Začasno shrani prepustno frazo v pomnilnik"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Poteče po"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minut(e) "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Nastavitev na '0' bo shranila prepustno frazo\n"
 " za celotno sejo)"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Zagrabi vnos med vnašanjem gesla"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži opozorilo ob zagonu, če GnuPG ne deluje"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nobena datoteka s sporočilom ni izbrana."
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Odpri prvo neprebrano sporočilo ob vstopu v mapo"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Ni več sporočil z oznako"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Označi sporočilo kot prebrano samo, ko je odprto v novem oknu"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Ob prejemu novih sporočil pojdi v mapo Prejeto"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Preveri novo pošto ob zagonu"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "IZvrši takoj, ko prestavljaš ali brišeš sporočilo"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Sporočila bodo označena do izvršitve,\n"
 "če je to izklopljeno)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Prikaži ime"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Ostalo"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Izvedi"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Datum"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Dialog za sprejem"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Prikaži pogovorno okno za sprejem"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Vedno"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nikoli"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Ob napaki pri sprejemanju ne prikaži okna z napako"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Na koncu zapri pogovorno okno za sprejemanje"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Ob dvojnem kliku dodaj naslov na cilj"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Ob izhodu"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Potrdi ob izhodu"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Izprazni smetnjak ob izhodu"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Vprašaj pred izpranjenjem"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Opozori, če so čakajoča sporočila"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Zunanji ukazi (%s bo zamenjan z imenom datoteke / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Privzeta mapa za prejeto pošto"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Uporabi zunanji program za pošiljanje"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Uporabi zunanji program za vključitev"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Uporabi zunanji program za pošiljanje"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Samodejno (priporočeno)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7-bitni ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Zahodnoevropski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Zahodnoevropski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Zahodnoevropski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednjeevropski (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltski (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltski (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Grški (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltski (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grški (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turški (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japonski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Poenostavljena kitajščina (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalna kitajščina (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalna kitajščina (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kitajski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Tajski (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Tajski (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "polno okrajšano ime dneva v tednu"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "polno ime dneva v tednu"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "okrajšano ime meseca"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "polno ime meseca"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "najustreznejša oblika datuma in časa za trenutni locale"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "številka stoletja (leto/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "dan v mesecu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ura kot desetiško število s 24-urnim prikazom"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ura kot desteiško število z 12-urnim prikazom"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "dan v letu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "mesec kot desetiško število"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minute kot desetiško število"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM oz. PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekunde kot desetiško število"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "dan v tednu kot desetiško število"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "najustreznejši datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "zadnji dve števki leta"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "leto kot desetiško število"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "časovni pas ali ime ali okrajšava"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Določevalec"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Nastavi barve sporočila"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Barve"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Citirano besedilo - prvi nivo"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Citirano besedilo - drugi nivo"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Citirano besedilo - tretji nivo"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "povezava URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Obnovi barve za citiranje"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Izberite barvo za citiranje na prvem nivoju"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Izberite barvo za citiranje na drugem nivoju"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Izberite barvo za citiranje na tretjem nivoju"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Izberite barvo za URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Opis simbolov"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5866,11 +5866,11 @@ msgstr ""
 "Novičarske skupine\n"
 "ID sporočila"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Če je x nastavljen, prikaži expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5884,7 +5884,7 @@ msgstr ""
 "Telo citiranega sporočila brez podpisa\n"
 "Dobesedno %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5896,20 +5896,20 @@ msgstr ""
 "Dobesedni zaviti oklepaj\n"
 "Dobesedni zaviti zaklepaj"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Povezave na tipke"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Nastavi povezave na tipke... "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Privzeto"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -6984,19 +6984,46 @@ msgstr "Ne morem se povezati s strežnikom SMTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ne morem se povezati s strežnikom SMTP: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Nastavitev poštnega predala"
 
-#: src/setup.c:44
-#, fuzzy
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr ""
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Vnesite položaj poštnega predala.\n"
-"Če je določen obstoječi poštni predal,\n"
-"bo pregledan samodejno."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Poštni predal `%s' že obstaja."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7669,6 +7696,15 @@ msgstr "Sylpheed že teče.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Vnesite položaj poštnega predala.\n"
+#~ "Če je določen obstoječi poštni predal,\n"
+#~ "bo pregledan samodejno."
+
 #~ msgid "Lookup"
 #~ msgstr "Poišči"
 
@@ -8006,9 +8042,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "V redu"
 
-#~ msgid "Cancel"
-#~ msgstr "Prekliči"
-
 #~ msgid "Refresh"
 #~ msgstr "Osveži"
 
diff --git a/po/sr.po b/po/sr.po
index 086136b7..c605500f 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -995,7 +995,7 @@ msgstr "/_Kopiranje..."
 msgid "/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
@@ -1192,7 +1192,7 @@ msgstr "Greška pri unosu adresara"
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Izgled programa"
 
@@ -1870,7 +1870,7 @@ msgstr "Datoteka ne postoji ili je prazna."
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Kodiranje"
 
@@ -2125,7 +2125,7 @@ msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2433,18 +2433,18 @@ msgstr "/Skloni news _grupu"
 msgid "Creating folder view...\n"
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2456,12 +2456,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -2487,7 +2487,7 @@ msgstr "Osvežavam stablo direktorijuma..."
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3963,16 +3963,16 @@ msgstr ""
 "Ako je unešen postojeće sanduče, automatski\n"
 "će biti pretražen."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4393,7 +4393,7 @@ msgstr "Privatnost"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Napredno"
 
@@ -4521,7 +4521,7 @@ msgid "Authentication method"
 msgstr "Način provere identieta"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatski"
 
@@ -4570,8 +4570,8 @@ msgstr "Generiši ID poruke"
 msgid "Add user-defined header"
 msgstr "Dodaj zaglavlje korisnika"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Izmeni... "
 
@@ -4954,8 +4954,8 @@ msgstr "Osveži sve direktorijume posle prihvatanja"
 msgid "Execute command when new messages arrived"
 msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Naredba"
 
@@ -5066,7 +5066,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Editor"
@@ -5156,55 +5156,55 @@ msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Prikaži broj nepročitanih poruka pored imena direktorijuma"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Skrati news grupe duže od"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "slova"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Pregled održavanja"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Prikaži primaoca na `Od' ukoliko ste Vi autor"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Raširi stablo"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Format datuma"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Postavljanje pojedinosti prikaza... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Poruka"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Pregled/_Složi/Opadajuće"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5213,630 +5213,630 @@ msgstr ""
 "Ako je `Automatski' odabrano, optimalni charset\n"
 "za locale će biti korišćen."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Omogući poruke u boji"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 #, fuzzy
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "Prikaži 2-byte abecedu i brojeve sa 1-byte znakovima"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Prikaži zaglavlje iznad poruke"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/_Poruka/P_rosledi kao spajalicu"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Prikaži kratko zaglavlje na pregledu poruka"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Razmak linija"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel(a)"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Pola stranice"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Miran scroll"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Korak"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Prikaz podešavanje zaglavlja"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Odaberite ključeve"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "Direktorijum"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Nefiltrirane poruke biti će stavljene u ovaj direktorijum)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtriraj poruke pri primanju"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Obriši direktorijum"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Obriši direktorijum"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Automatski proveri potpis"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Prikaži potpis u popup prozoru"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Smesti lozinku privremeno u memoriju"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Ističe posle"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minut(a)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Postavljanje na '0' će smestiti loyinku\n"
 "u toku cele sesije)"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Uhvati unos pri upisivanju lozinke"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Prikaži upozorenje na startu ako GnuPG ne radi"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 #, fuzzy
 msgid "Always open messages in summary when selected"
 msgstr "Nijedna datoteka poruke nije odabrana."
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Otvori prvu nepročitanu poruku pri ulasku u direktorijum"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Nema više obeleženih poruka"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Samo označi poruke kao pročitane pri otvaranju novog prozora"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Idi u sanduče posle primanja pošte"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Proveri poštu prilikom starta"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Izvrši odmah pri premeštanju ili brisanju poruka"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Poruke će samo biti označene do izvršenja\n"
 " ako je ovo isključeno)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Prikaz imena"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Podešavanje prečica na tastaturi..."
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Drugo"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Izvrši"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Datum"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 #, fuzzy
 msgid "Receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Prikaži dijalog primanja"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Uvek"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Nikada"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Ne izbacuj prozor sa porukom o grešci u primanju"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Zatvori dijalog primanja kada se završi"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Dodaj adresu u odredište kada se dva put klikne"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Na izlazu"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Potvrdi izlaz"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Isprazni smeće pri izlazu"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Pitaj pre pražnjenja"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Upozori ako ima odloženih poruka"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Spoljašnje naredbe (%s će biti zamenjeno imenom datoteke / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Web čitač"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Uobičajeno sanduče"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Koristi spoljni program za slanje"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Koristi spoljni program za prihvatanje"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Koristi spoljni program za slanje"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatsko (preporučeno)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Zapadno-Evropski (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Zapadno-Europski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Zapadno-Europski (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Srednje-Evropski (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Blatički (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Blatički (ISO'8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Grčki (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turski (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ćirilica (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Ćirilica (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Ćirilica (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ćirilica (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanski (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japanski (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanski (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Pojednostavljeni Kineski (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradicionalni Kineski (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradicionalni Kineski (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kineski (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korejski (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "pojednostavljeno ime dana u nedelji"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "puno ime dana u nedelji"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "skraćeno ime meseca"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "puno ime meseca"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "željeni datum i vreme za trenutni locale"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "broj veka (godina/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "dan u mesecu kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "sat kao decimalni broj koristeći 24 satno vreme"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "sat kao decimalni broj koristeći 12 satno vreme"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "dan u godini kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "mesec kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minuti kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM ili PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekunde kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "dan u nedelji kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "željeni datum za trenutni locale"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "posljednje dve cifre godine"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "godina kao decimalni broj"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "vremenska zona ili ime ili skraćenica"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Specifier"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Opis"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Primer"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Podesi boje poruka"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Boje"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Citirani tekst - prvi nivo"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Citirani tekst - drugi nivo"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Citirani tekst - treći nivo"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Ciklično menjaj boje citata"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Odaberite boju za citat 1. stepena"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Odaberite boju za citat 2. stepena"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Odaberite boju za citat 3. tepena"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Odaberite boju za URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Obajšnjenje znakova"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5860,11 +5860,11 @@ msgstr ""
 "News grupe\n"
 "ID poruke"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Ako je x odabrano, prikazuje expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5878,7 +5878,7 @@ msgstr ""
 "Citirano telo poruke sa potpisom\n"
 "Literal %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5890,20 +5890,20 @@ msgstr ""
 "Literal početna zagrada\n"
 "Literal završna zagrada"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Prečice sa tastature"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Podešavanje prečica na tastaturi..."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Stari Sylpheed"
 
@@ -6980,19 +6980,46 @@ msgstr "Ne mogu se povezati na SMTP server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Ne mogu se povezati na SMTP server: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Podešavanje sandučeta"
 
-#: src/setup.c:44
-#, fuzzy
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+msgid "Create mailbox at the following default location:"
+msgstr ""
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Unesite lokaciju sandučeta.\n"
-"Ako je unešen postojeće sanduče, automatski\n"
-"će biti pretražen."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "Odustani"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Sanduče`%s' već postoji."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7664,6 +7691,15 @@ msgstr "drugi Sylpheed već radi.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Unesite lokaciju sandučeta.\n"
+#~ "Ako je unešen postojeće sanduče, automatski\n"
+#~ "će biti pretražen."
+
 #~ msgid "Lookup"
 #~ msgstr "Potraži"
 
@@ -8001,9 +8037,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "U redu"
 
-#~ msgid "Cancel"
-#~ msgstr "Odustani"
-
 #~ msgid "Refresh"
 #~ msgstr "Osveži"
 
diff --git a/po/sv.po b/po/sv.po
index 24e88d07..e414b420 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -992,7 +992,7 @@ msgstr "/_Kopiera..."
 msgid "/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbok"
 
@@ -1189,7 +1189,7 @@ msgstr "Fel vid konvertering av adressbok"
 msgid "Address Book Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Gränssnitt"
 
@@ -1834,7 +1834,7 @@ msgstr "Filen finns inte eller är tom."
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Kodning"
 
@@ -2084,7 +2084,7 @@ msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2388,18 +2388,18 @@ msgstr "/T_a bort diskussionsgrupp"
 msgid "Creating folder view...\n"
 msgstr "Skapar mappvy...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Nya"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Olästa"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2411,12 +2411,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -2441,7 +2441,7 @@ msgstr "Uppdatering av mappträdet misslyckades."
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Skräp"
 
@@ -3898,16 +3898,16 @@ msgstr ""
 "Om den existerande brevlådan specificeras, kommer den\n"
 "att sökas igenom automatiskt."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4324,7 +4324,7 @@ msgstr "Integritet"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Avancerat"
 
@@ -4450,7 +4450,7 @@ msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -4496,8 +4496,8 @@ msgstr "Skapa Meddelande-ID"
 msgid "Add user-defined header"
 msgstr "Lägg till användardefinierat brevhuvud"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr "Redigera..."
 
@@ -4878,8 +4878,8 @@ msgstr "Uppdatera alla lokala mappar efter att ny post hämtats"
 msgid "Execute command when new messages arrived"
 msgstr "Kör kommando när nytt meddelande anländer"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Kommando"
 
@@ -4990,7 +4990,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Redigerare"
@@ -5079,55 +5079,55 @@ msgstr "Visa antal olästa bredvid mappnamn"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Visa meddelandeantalkolumner i mappvyn"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Förkorta diskussionsgrupper längre än"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "bokstäver"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Summeringsvy"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Visa mottagare i \"Från\"-kolumnen om du själv är avsändaren"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Expandera trådar"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Datumformat"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Ställ in fält att visa i summeringen... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Visa/_Teckenkodning"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5135,11 +5135,11 @@ msgstr ""
 "Om \"Automatisk\" är vald, kommer den optimala\n"
 "kodningen för det nuvarande språket att användas."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Aktivera färgläggning av meddelande"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5147,321 +5147,321 @@ msgstr ""
 "Visa multi-byte-alfabet och -siffror som\n"
 "ASCII-tecken (endast Japanska)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Visa brevhuvudspanel ovanför meddelandevy"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Visa korta brevhuvuden i meddelandevy"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Rendera HTML meddelanden som text"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Rendera HTML meddelanden som text"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Visa markören i meddelandevy"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Radavstånd"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "bildpunkter"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Rulla"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Halvsida"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Mjuk rullning"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Steg"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Bilder"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Ändra storlek på bifogade stora bilder så att de ryms i fönstret"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Visa bilder som inline"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Använd Skräppostkontroll"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Lärande kommando:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Välj nycklar"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Inte Skräp"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Klassificerande kommando"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Skräpmapp"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Meddelanden som är markerade som skräppost flyttas till denna mapp"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Filtrera meddelanden klassificerade som skräp vid mottagning"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Ta bort från server"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Ta bort från server"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Undersök signaturer automatiskt"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Visa resultat av signaturundersökning i ett extrafönster"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Lagra lösenfras temporärt i minnet"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Utgår efter"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "minut(er)"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Om 0 angivits kommer lösenfrasen att lagras hela sessionen."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Håll fokus under inskrivning av lösenfas"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Visa varning vid start om GnuPG inte fungerar"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Öppna alltid meddelanden i summering, när de valts"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Öppna första olästa meddelande vid öppning av mapp"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Markera endast meddelande som läst, när det öppnats i nytt fönster"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Gå till inkorgen efter att ny post kommit"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Hämta ny post vid uppstart"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Utför omedelbart vid flyttning eller borttagande av meddelanden"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "Meddelanden kommer endast vara markerade tills exekvering om detta är "
 "avstängt)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Gör ordningen på knapparna enligt GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Visat namn"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr "Ställ in tangentbindningar..."
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Övrigt"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Kör kommando"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Datum"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Mottagningsdialog"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Visa mottagningsdialog"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Alltid"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Bara vid manuell mottagning"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Visa inte feldialog vid hämtningsfel"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Stäng mottagningsdialog efteråt"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Lägg till adress till destination vid dubbelklick"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Vid avslut"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Bekräfta avslut"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Töm papperskorg vid avslut"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Fråga innan tömning"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Varna om det finns köade meddelanden"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Externa kommandon (%s kommer att ersättas med filnamn / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Webbläsare"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Förvald webbläsare)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Skicka med externt program"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Använd externt program för hämtning"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Skicka med externt program"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Använd strikt kontroll av integriteten för summeringscache"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5471,279 +5471,279 @@ msgstr ""
 "applikationer.\n"
 "Detta val kommer att försämra kapaciteten för visa summering."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Väntetid för uttags-I/O (socket I/O):"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "sekunder"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Automatisk (Rekommenderad)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitars ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Västeuropeisk (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Västeuropeisk (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Västeuropeisk (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Centraleuropeisk (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Grekisk (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreisk (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Hebreisk (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turkisk (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisk (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisk (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisk (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japansk (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japansk (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japansk (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Förenklad kinesisk (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Förenklad kinesisk (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditionell kinesisk (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditionell kinesisk (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Kinesisk (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Koreansk (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thai (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thai (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "förkortat veckodagsnamn"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "fullständigt veckodagsnamn"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "förkortat månadsnamn"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "fullständigt månadsnamn"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "datum och tid gällande lokalt"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "århundradetal (årtal/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "dagen i månaden som decimaltal"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "timmen som decimaltal enligt 24-timmarsräkning"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "timmen som decimaltal enligt 12-timmarsräkning"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "dagen på året som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "månaden som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "minuten som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "antingen AM eller PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "sekunden som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "veckodagen som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "datum gällande lokalt"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "de sista två siffrorna av ett årtal"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "årtalet som ett decimaltal"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "tidszon eller namn eller förkortning"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Symbol"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Exempel"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Ställ in meddelandefärger"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Färger"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Citerad text - Första nivån"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Citerad text - Andra nivån"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Citerad text - Tredje nivån"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI-länk"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Återanvänd citeringsfärger"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Välj färg för citeringsnivå 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Välj färg för citeringsnivå 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Välj färg för citeringsnivå 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Välj färg för URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Beskrivning av symboler"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5767,11 +5767,11 @@ msgstr ""
 "Diskussionsgrupper\n"
 "Meddelande-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Om x är inställd, visas expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5785,7 +5785,7 @@ msgstr ""
 "Citerad meddelandetext utan signatur\n"
 "Bokstavligt %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5797,19 +5797,19 @@ msgstr ""
 "Bokstavlig öppnande klammerparentes\n"
 "Bokstavlig avslutande klammerparentes"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Tangentbindningar"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Välj förvalda tangentbindningar..."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Standard"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Gamla Sylpheed"
 
@@ -6862,17 +6862,47 @@ msgstr "Kan inte ansluta till NNTP-server: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Kan inte ansluta till NNTP-server: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Brevlådeinställning"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Utför följande åtgärder:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Skriv in brevlådans plats.\n"
-"Om du är osäker, välj bara OK."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Brevlådan \"%s\" finns redan."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7534,6 +7564,13 @@ msgstr "en annan instans av Sylpheed är redan igång.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Skriv in brevlådans plats.\n"
+#~ "Om du är osäker, välj bara OK."
+
 #~ msgid "Lookup"
 #~ msgstr "Slå upp"
 
@@ -7883,9 +7920,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "OK"
 
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
 #~ msgid "Refresh"
 #~ msgstr "Uppdatera"
 
diff --git a/po/tr.po b/po/tr.po
index 380dbe49..9ff1797d 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -992,7 +992,7 @@ msgstr "/_Kopyala..."
 msgid "/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adres defteri"
 
@@ -1194,7 +1194,7 @@ msgstr "Adres Defteri Çevrim Hatası"
 msgid "Address Book Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Arayüz"
 
@@ -1862,7 +1862,7 @@ msgstr "Dosya yok, ya da boş."
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Kodlama"
 
@@ -2118,7 +2118,7 @@ msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2424,18 +2424,18 @@ msgstr "/H_aber grubunu sil"
 msgid "Creating folder view...\n"
 msgstr "Dizin görüntüsü oluşturuluyor...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Yeni"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Okunmamış"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2447,12 +2447,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -2477,7 +2477,7 @@ msgstr "Dizin ağacı yeniden oluşturulamadı."
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3940,16 +3940,16 @@ msgstr ""
 "Eğer varolan potsa kutusu verilirse, otomatik\n"
 "olarak taranacaktır."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4367,7 +4367,7 @@ msgstr "Gizlilik"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Gelişmiş"
 
@@ -4494,7 +4494,7 @@ msgid "Authentication method"
 msgstr "Kimlik denetim yöntemi"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Otomatik"
 
@@ -4544,8 +4544,8 @@ msgstr "İleti Numarası Oluştur"
 msgid "Add user-defined header"
 msgstr "Kullanıcı tanımlı başlık ekle"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Düzenle... "
 
@@ -4931,8 +4931,8 @@ msgstr "Dağıtımdan sonra tüm yerel dizinleri güncelle"
 msgid "Execute command when new messages arrived"
 msgstr "Postayı silerken ve taşırken çalıştır"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Komut"
 
@@ -5045,7 +5045,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Düzenleyici"
@@ -5135,55 +5135,55 @@ msgstr "Dizin adının yanında kaç tane okunmamış posta olduğunu göster"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Dizin adının yanında kaç tane okunmamış posta olduğunu göster"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Belirtilenden daha uzun olan haber gruplarını kısalt"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "posta"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Özet Görünüm"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Eğer gönderen kendimsem 'Kimden' satırında alıcıyı göster"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Dizileri Genişlet"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Tarih biçimi"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Özetin görüntü nesnesini belirt"
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "İleti"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/_Görünüm/_Sırala/Azalan sırala"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 #, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
@@ -5192,11 +5192,11 @@ msgstr ""
 "Eğer 'Otomatik' seçili ise yerelde kullanılan kod\n"
 "kümesi kullanılacaktır."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "İletileri renklendir"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5204,617 +5204,617 @@ msgstr ""
 "Çok bytelı alfabe veya numaraları \n"
 "ASCII karakter olarak göster(Sadece Japonca)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Postaları gösterirken üst kısımda başlıkları göster"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Postaları gösterirken kısa başlıkları göster"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "/İ_leti/E_k olarak yönlendir"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "Postaları gösterirken kısa başlıkları göster"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Satır boşluğu"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "benek"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Kaydır"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Yarım sayfa"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Yumuşak kaydır"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Adım"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Pencereye uyması için eklenmiş büyük resimleri yenşden boyutlandır"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 #, fuzzy
 msgid "Display images as inline"
 msgstr "Görüntü başlığı ayarları"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "dizin:"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "Komut çalıştır"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "Anahtarları Seçin"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "Komut çalıştır"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "dizin:"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(Filtrelenmemiş iletiler bu kutuda bekleyecektir)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "İletileri alırken filtrele"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Sunucudan sil"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "Sunucudan sil"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "İmzaları otomatik denetle"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "İmza kontrol sonuçlarını ek pencerede göster"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Parolayı geçici olarak hafızada sakla"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Belirtilen süre sonra geçerliliğini yitir"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr " dakikada"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 #, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
 "(Bu değere '0' atayarak parolanın\n"
 "tüm oturuum süresince saklanmasını sağlayabilirsiniz.)"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Parolayı girerken girdiyi yakala"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "GnuPG çalışmazsa başlangıçta uyarı mesajı göster"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Mesajlar seçildiğinde her zaman özet halinda göster"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Bir dizine girildiğinde ilk okunmamış iletiyi aç"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Posta sadece yeni pencerede okunduğunda okunmuş olarak işaretle"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "İleti geldiğinde gelen kutusuna git"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Açılışta yeni e-postaları denetle"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Postayı silerken ve taşırken çalıştır"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 #, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
 "(Eğer bu özellik kapalı ise işlem bitinceye kadar\n"
 "postalar işaretlenecektir.)"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "Görüntülenecek İsim"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Tuş kombinasyonları..."
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Diğer"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "Komut çalıştır"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Tarih"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Alma penceresi"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Alma penceresini göster"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Her zaman"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Sadece kullanıcı kendi aldığında"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Hiç bir zaman"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Alma sırasında bir hata oluşursa ek pencerede gösterme"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "İşlemler tamamlandığında alma penceresini kapat"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Çift tıklandığında adresi hedefe ekle"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Çıkışta"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Çıkışta sor"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Çıkışta çöpü boşalt"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Boşaltmadan önce sor"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Kuyrukta ileti varsa uyar"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Harici düzenleyici (%s, dosya adı/URL ile yer değiştirecektir)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Tarayıcı"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "Öntanımlı gelen kutusu"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Göndermek için harici program kullan"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Dağıtım için harici program kullan"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Göndermek için harici program kullan"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Soket I/O zaman aşımı:"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "saniye"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Otomatik (Önerilen)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Batı Avrupa (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Batı Avrupa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "Batı Avrupa (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Orta Avrupa (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltık (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltık (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Yunanca (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "Baltık (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Yunanca (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türkçe (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kiril (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kiril (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kiril (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kiril (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonca (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Japonca (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonca (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "Basitleştirilmiş Çince (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Geleneksel Çince (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Geleneksel Çince (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Çince (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Korece (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Tayca (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Tayca (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "kısa hafta adı"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "tam hafta adı"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "kısa ay adı"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "tam ay adı"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "güncel yerel bilgisi için tercih edilen gün ve saat"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "yüzyıl numarası (yıl/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "sayı değerinde ayın günü"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24 saatlik format kullanılarak saat"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12 saatlik format kullanılarak saat"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "yılın gününün sayı değeri"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "ay sayı değerinde"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "dakika"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM veya PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "saniye"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "haftanın günü"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "tercih edilen yerek saat"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "yılın son iki rakamı"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "yıl"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "Zaman dilimi veya adı"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Belirtici"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Tanım"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Örnek"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Posta renklerini belirt"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Birinci derecen alıntı metin"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "İkinci dereceden alıntı metin"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Üçüncü dereceden alıntı metin"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URL bağlantısı"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Alıntı renklerini dönüştür"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Birinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "İkinci dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Üçüncü dereceden alıntı rengini seçiniz"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "URL için renk seçiniz"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "sembollerin açıklamaları"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5837,11 +5837,11 @@ msgstr ""
 "Habergrubu\n"
 "Mesaj Nosu"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Eğer x belirtilmişse expr göster"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5855,7 +5855,7 @@ msgstr ""
 "İmzasız alıntı yapılan metin\n"
 "Tam %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5867,20 +5867,20 @@ msgstr ""
 "Tam <\n"
 "Tam >"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Tuş bağıntıları"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " Tuş kombinasyonları..."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Eski Sylpheed"
 
@@ -6930,19 +6930,47 @@ msgstr "NNTP sunucuya bağlantı yapılamadı: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "NNTP sunucuya bağlantı yapılamadı: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Posta kutusu ayarları"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
 #, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Aşağıdaki eylemleri gerçekleştir:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Posta kutusunun konumunu giriniz.\n"
-"Eğer varolan potsa kutusu verilirse, otomatik\n"
-"olarak taranacaktır."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "İptal"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "`%s' posta kutusu zaten var."
 
 #: src/sigstatus.c:116
 #, fuzzy
@@ -7618,6 +7646,15 @@ msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Posta kutusunun konumunu giriniz.\n"
+#~ "Eğer varolan potsa kutusu verilirse, otomatik\n"
+#~ "olarak taranacaktır."
+
 #~ msgid "Lookup"
 #~ msgstr "Ara"
 
@@ -7961,9 +7998,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "Tamam"
 
-#~ msgid "Cancel"
-#~ msgstr "İptal"
-
 #~ msgid "Refresh"
 #~ msgstr "Yenile"
 
diff --git a/po/uk.po b/po/uk.po
index 3777569a..4193340b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0svn2362\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+0900\n"
 "PO-Revision-Date: 2009-12-03 21:15+0300\n"
 "Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -988,7 +988,7 @@ msgstr "/Копіювати"
 msgid "/_Paste"
 msgstr "/Вставити"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
@@ -1178,7 +1178,7 @@ msgstr "Помилка при конвертуванні адресної кни
 msgid "Address Book Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Інтерфейс"
 
@@ -1812,7 +1812,7 @@ msgstr "Файл не існує або порожній."
 msgid "Properties"
 msgstr "Властивості"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Кодування"
 
@@ -2059,7 +2059,7 @@ msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2350,18 +2350,18 @@ msgstr "/Видалити конференцію"
 msgid "Creating folder view...\n"
 msgstr "Створення області перегляду папок...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Нові"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Непрочитані"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr "Загалом"
 
@@ -2373,12 +2373,12 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
@@ -2403,7 +2403,7 @@ msgstr "Не вдалось перебудувати дерево папок."
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Мотлох"
 
@@ -3818,16 +3818,16 @@ msgstr ""
 "Якщо вона вже існує, її буде перечитано\n"
 "автоматично."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4257,7 +4257,7 @@ msgstr "Privacy"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Advanced"
 
@@ -4381,7 +4381,7 @@ msgid "Authentication method"
 msgstr "Метод аутентифікації"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Автоматично"
 
@@ -4425,8 +4425,8 @@ msgstr "Генерувати Message-ID"
 msgid "Add user-defined header"
 msgstr "Вживати заголовок, визначений користувачем"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Редагувати... "
 
@@ -4803,8 +4803,8 @@ msgstr "Оновлювати всі локальні папки після пр�
 msgid "Execute command when new messages arrived"
 msgstr "Виконувати команду після прибуття нових листів"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Команда"
 
@@ -4917,7 +4917,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr "Успадковувати отримувачів при відповідях собі"
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Редактор"
@@ -5001,53 +5001,53 @@ msgstr "Показувати кількість непрочитаного пі�
 msgid "Displaying message number columns in the folder view:"
 msgstr "Показувати колонки кількості листів при відображенні папок:"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Скорочувати назви конференцій, довші ніж"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "літер"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Список повідомлень"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Показувати отримувача в колонці `Від', якщо відправник - Ви"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Розгортати обговорення"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Формат дати"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Показувати наступні поля... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Повідомлення"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Кодова таблиця за замовчуванням"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Вживається для показу листів без вказаного кодування."
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Кодова таблиця для вихідної пошти"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5055,11 +5055,11 @@ msgstr ""
 "Якщо включено `Автоматична', буде обрано оптимальне кодування для діючої "
 "locale."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Дозволити розфарбування листів"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5067,83 +5067,83 @@ msgstr ""
 "Відображати 2-байтний алфавіт і числа\n"
 "однобайтним символом (для японської мови)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Показувати панель заголовка над листом"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Показувати скорочені заголовки при перегляді листів"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Зображати HTML-листи як текст"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 msgid "Treat HTML only messages as attachment"
 msgstr "Поводитись з HTML-листами як з вкладеннями"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Показувати курсор при відображенні папок"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Міжрядковий інтервал"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "пікселів"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Півсторінки"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Плавна прокрутка"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Крок"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Зображення"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Масштабувати приєднані картинки відповідно до вікна"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Відображати зображення в тілі листа"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Ввімкнути контроль мотлоху"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Вивчення команди:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Обрати стандартне налаштування)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Не мотлох"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Класифікувати команду"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5151,225 +5151,225 @@ msgstr ""
 "Щоб автоматично класифікувати мотлох, доведеться навчати програму відрізняти "
 "його від нормальних листів. "
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Папка мотлоху"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Листи, позначені як мотлох, складаємо у цій папці."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Фільтрувати листи, класифіковані як мотлох, при отриманні"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 msgid "Filter junk mails before normal filtering"
 msgstr "Фільтрувати мотлох перед нормальним фільтруванням"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Видаляти мотлох з сервера після отримання"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Позначити відфільтрований мотлох як прочитане"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Автоматично перевіряти підписи"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Показувати результат перевірки підпису у спливаючому вікні"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Тимчасово зберігати пароль в пам'яті"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Недійсний після"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "хвилин "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Присвоєння '0' зберігає пароль протягом всієї сесії."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Захопити ввід при введенні паролю"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Попереджати при запуску, якщо GnuPG не працює"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Завжди відкривати листи у списку при виділенні"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 msgid "Open first unread message when a folder is opened"
 msgstr "Відкривати перший непрочитаний лист, входячи в папку"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 msgid "Remember last selected message"
 msgstr "Запам'ятати останній обраний лист"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Позначати як прочитаний тільки лист, відкритий у новому вікні"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 msgid "Open inbox after receiving new mail"
 msgstr "Відкривати папку `Вхідні', отримавши нову пошту"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 msgid "Open inbox on startup"
 msgstr "Відкривати папку `Вхідні' при запуску"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Виконувати негайно після видалення чи переміщення листів"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Листи буде позначено до виконання, якщо це вимкнути."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Узгоджувати порядок кнопок з GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Показати іконку панелі"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr "Мінімізувати до іконки трею"
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr "Перемикати вікно при клацанні на іконці трею"
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Встановити гарячі клавіші... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Інше"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Зовнішні команди"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 msgid "Update"
 msgstr "Оновлення"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Діалог отримання"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Показувати діалог отримання"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Завжди"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Тільки при ручному отриманні"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Ніколи"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Не видавати діалог при помилці отримання"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Закрити діалог отримання після завершення"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Додати адресу до призначення, коли клацнути двічі"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "При виході"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Підтвердити при виході"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "При виході очищати кошик"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Питати перед очищенням"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Попереджати, якщо є листи в черзі"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Зовнішні команди (%s буде замінено на ім'я файлу / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Web-браузер"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Браузер за замовчуванням)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 msgid "Use external program for printing"
 msgstr "Вживати зовнішню програму для друку"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Вживати зовнішню програму для прийому"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Вживати зовнішню програму для відсилання"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr "Перевірка оновлень потребує команди 'curl'."
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr "Ввімкнути автоматичну перевірку оновлень"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr "Вживати HTTP-проксі"
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr "адреса HTTP-проксі (hostname:port)"
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "Ввімкнути строгу перевірку цілісності кешів"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5378,275 +5378,275 @@ msgstr ""
 "Ввімкнути, якщо вміст папок може змінюватись іншими програмами.\n"
 "Ця опція погіршить відображення списка повідомлень."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Таймаут сокета вводу/виводу"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "секунд"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Автоматична (рекомендовано)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Західноєвропейська (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Західноєвропейська (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Західноєвропейська (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Цнтральноєвропейська (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтійська (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтійська (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 msgid "Baltic (Windows-1257)"
 msgstr "Балтійська (Windows-1257)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Грецька (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "Арабська (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "Арабська (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Єврейська (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Єврейська (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турецька (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Кирилиця (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Кирилиця (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Кирилиця (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Кирилиця (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Японська (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Японська (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Японська (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Спрощена китайська (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Спрощена китайська (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиційна китайська (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиційна китайська (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Китайська (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Корейська (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Тайська (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Тайська (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "повна скорочена назва дня тижня"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "повна назва дня тижня"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "скорочена назва місяця"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "повна назва місяця"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "бажана дата і час для поточної locale"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "номер сторіччя (рік/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "день місяця як десяткове число"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "година як десяткове число за 24-годинним циферблатом"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "година як десяткове число за 12-годинним циферблатом"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "день року як десяткове число"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "місяць як десяткове число"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "хвилини як десяткове число"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM чи PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "секунди як десяткове число"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "день тижня як десяткове число"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "бажана дата для поточної locale"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "останні дві цифри року"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "рік як десяткове число"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "часова зона або ім'я або скорочення"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Специфікатор"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Опис"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Приклад"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Встановити кольори листа"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Цитований текст - перший рівень"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Цитований текст - другий рівень"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Цитований текст - третій рівень"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI link"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Повторно використати кольори цитування"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Обрати колір для цитування рівня 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Обрати колір для цитування рівня 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Обрати колір для цитування рівня 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Обрати колір для URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Опис символів"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5670,11 +5670,11 @@ msgstr ""
 "Newsgroups\n"
 "Message-ID"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "якщо встановлено x, показує expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5688,7 +5688,7 @@ msgstr ""
 "Тіло цитованого повідомлення без підпису\n"
 "Буквально %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5700,19 +5700,19 @@ msgstr ""
 "Буквальна відкриваюча фігурна дужка\n"
 "Буквальна закриваюча фігурна дужка"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Гарячі клавіші"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr " Обрати попередньо означені гарячі клавіші."
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "За замовчуванням"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Старий Sylpheed"
 
@@ -6728,17 +6728,48 @@ msgstr "Не вдалось з'єднатись з сервером SMTP."
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Не вдалось з'єднатись з сервером SMTP: %s:%d"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Налаштування скриньки"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Виконати такі дії:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"Введіть розташування скриньки.\n"
-"Якщо не впевнені, просто оберіть ОК."
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Скасовано"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Скринька `%s' вже існує."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7387,6 +7418,13 @@ msgstr "Sylpheed вже останньої версії."
 msgid "Couldn't get the version information."
 msgstr "Не вдалось отримати інформацію про версію."
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "Введіть розташування скриньки.\n"
+#~ "Якщо не впевнені, просто оберіть ОК."
+
 #~ msgid "Lookup"
 #~ msgstr "Пошук"
 
diff --git a/po/vi.po b/po/vi.po
index 368b1731..fe317e2b 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -973,7 +973,7 @@ msgstr "/_Sao chép"
 msgid "/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
@@ -1171,7 +1171,7 @@ msgstr "Lỗi chuyển đổi sổ địa chỉ"
 msgid "Address Book Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "Giao diện"
 
@@ -1810,7 +1810,7 @@ msgstr "Tập tin không tồn tại hoặc rỗng."
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "Mã hoá"
 
@@ -2059,7 +2059,7 @@ msgstr "Soạn mục JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2362,18 +2362,18 @@ msgstr "/_Xoá nhóm tin"
 msgid "Creating folder view...\n"
 msgstr "Đang tạo khung thư mục...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "Mới"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "Chưa đọc"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2385,12 +2385,12 @@ msgstr "Thiết lập thông tin thư mục...\n"
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
@@ -2415,7 +2415,7 @@ msgstr "Việc làm lại cây thư mục thất bại."
 msgid "Checking for new messages in all folders..."
 msgstr "Kiểm tra thư mới trong mọi thư mục..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "Rác"
 
@@ -3864,16 +3864,16 @@ msgstr ""
 "Nếu hộp thư có trước được chỉ định, nó sẽ được\n"
 "tự động quét."
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4313,7 +4313,7 @@ msgstr "Riêng tư"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "Nâng cao"
 
@@ -4438,7 +4438,7 @@ msgid "Authentication method"
 msgstr "Phương thức xác thực"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "Tự động"
 
@@ -4483,8 +4483,8 @@ msgstr "Tạo ID của thư"
 msgid "Add user-defined header"
 msgstr "Thêm header theo định nghĩa người dùng"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " Soạn... "
 
@@ -4862,8 +4862,8 @@ msgstr "Cập nhập mọi thư mục cục bộ sau khi sáp nhập"
 msgid "Execute command when new messages arrived"
 msgstr "Chạy lệnh khi có thư mới"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "Lệnh"
 
@@ -4972,7 +4972,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "Trình soạn thảo"
@@ -5057,53 +5057,53 @@ msgstr "Hiển thị số thư chưa đọc ngay sau tên thư mục"
 msgid "Displaying message number columns in the folder view:"
 msgstr "Hiển thị cột số thư chưa đọc trên khung thư mục"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "Viết tắt khi tên nhóm tin dài hơn"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "chữ cái"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "Khung xem tóm tắt"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "Hiện người nhận trên cột `Người gửi' nếu người gửi là bạn"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "Mở rộng các luồng thư"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "Định dạng thời gian"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " Đặt các mục hiển thị trên bảng tóm tắt... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "Thư"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 msgid "Default character encoding"
 msgstr "Mã kí tự mặc định"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Phần này được dùng khi hiển thị thư bị mất thông tin về mã kí tự"
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 msgid "Outgoing character encoding"
 msgstr "Mã kí tự đầu ra"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5111,11 +5111,11 @@ msgstr ""
 "Nếu chọn `Tự động', mã kí tự tối ưu cho thiết lập bản địa hiện tại sẽ được "
 "dùng."
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "Cho phép màu sắc trong thư"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5123,84 +5123,84 @@ msgstr ""
 "Hiển thị bảng chữ cái và chữ số đa byte\n"
 "ở dạng kí tự ASCII (chỉ tiếng Nhật)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "Hiện ô header phía trên khung xem thư"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "Hiện header dạng ngắn gọn trên khung xem thư"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "Hiển thị HTML ở dạng văn bản thuần tuý"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "Hiển thị HTML ở dạng văn bản thuần tuý"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "Hiển thị con trỏ trong khung xem thư"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "Khoản cách dòng"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "pixel"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "Cuộn"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "Nửa trang"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "Cuộn trơn"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "Bước"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "Hình ảnh"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "Đổi kích thước ảnh to cho vừa với cửa sổ"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "Hiện hình ảnh ngay trên dòng"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "Cho phép điều khiển thư rác"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "Lệnh thu thập:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 msgid "(Select preset)"
 msgstr "(Chọn kiểu)"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "Không phải thư rác"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "Lệnh phân loại"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
@@ -5208,234 +5208,234 @@ msgstr ""
 "Để tự động phân loại thư rác, chương trình phải được học phân biệt thư rác "
 "và thư bình thường ở một mức nhất định."
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "Thư mục thư rác"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "Các thư bị đánh dấu là thư rác sẽ được chuyển tới thư mục này."
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "Lọc thư được phân loại là thư rác lúc nhận"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "Xoá thư rác khỏi máy chủ khi nhận"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 msgid "Delete junk mails from server on receiving"
 msgstr "Xoá thư rác khỏi máy chủ khi nhận"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr "Đánh dấu là đã đọc các thư rác đã lọc"
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "Tự động kiểm tra chữ kí"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "Hiện kết quả kiểm tra chữ kí trong cửa sổ popup"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "Lưu tạm mật khẩu vào bộ nhớ"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "Hết hạn sau"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "phút "
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "Đặt là '0' để lưu mật khẩu trong suốt phiên làm việc."
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "Bắt (grab) đầu vào khi nhập mật khẩu"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Hiển thị cảnh báo lúc khởi động nếu GnuPG không hoạt động"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "Luôn mở thư trong phần tóm tắt khi được chọn"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "Mở thư chưa đọc đầu tiên khi vào một thư mục"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "Không có thêm thư được đánh dấu nào"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "Chỉ đánh dấu thư là đã đọc khi mở trong cửa sổ mới"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "Đi đến hộp nhận sau khi nhận thư mới"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "Kiểm tra thư mới khi chạy chương trình"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Thực thi ngay lập tức khi di chuyển hoặc xoá thư"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "Thư sẽ được đánh dấu đến khi thực thi nếu không dùng tuỳ chọn này."
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "Sắp xếp thứ tự các nút tương ứng với GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 msgid "Display tray icon"
 msgstr "Hiển thị biểu tượng trên khay"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " Đặt phím tắt... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "Khác"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 msgid "External commands"
 msgstr "Lệnh ngoài"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "Thời gian"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "Hộp thoại nhận thư"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "Hiện hộp thoại nhận thư"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "Luôn luôn"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "Chỉ khi nhận theo kiểu thủ công"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "Không hiện hộp thoại báo lỗi kiểu popup khi gặp lỗi"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "Đóng hộp thoại nhận thư khi hoàn thành"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "Thêm địa chỉ vào đích đến khi nhấn đúp"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "Lúc thoát"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "Xác nhận khi thoát"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "Đổ rác khi thoát"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "Hỏi trước khi đổ rác"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "Cảnh báo nếu có thư chờ được gửi"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "Lệnh ngoài (%s sẽ được thay thế bằng tên tập tin / URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "Trình duyệt"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(Trình duyệt mặc định)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "Dùng chương trình ngoài để gửi"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "Dùng chương trình ngoài để sáp nhập"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "Dùng chương trình ngoài để gửi"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 #, fuzzy
 msgid "Enable auto update check"
 msgstr "Cho phép kiểm tra chính tả"
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr ""
 "Cho phép kiểm tra nghiêm ngặt về tính toàn vẹn của bộ đệm của bảng tóm tắt"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5445,276 +5445,276 @@ msgstr ""
 "đổi.\n"
 "Tuỳ chọn này sẽ suy giảm hiệu năng của việc hiển thị bảng tóm tắt."
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "Hết hạn I/O socket"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "giây"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "Tự động (Khuyến cáo)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "Đông Âu (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "Tây Âu (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 msgid "Western European (Windows-1252)"
 msgstr "Tây Âu (Windows-1252)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "Trung Âu (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "A-rập (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "Hi Lạp (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 msgid "Arabic (ISO-8859-6)"
 msgstr "A-rập (ISO-8859-6)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 msgid "Arabic (Windows-1256)"
 msgstr "A-rập (Windows-1256)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Do Thái (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "Do Thái (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "Thổ Nhĩ Kì(ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrillic (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrillic (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrillic (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrillic (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Nhật Bản (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "Nhật Bản (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "Nhật Bản (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "Hán giản thể (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "Hán giản thể (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "Hán phồn thể (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Hán phồn thể (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Hán (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "Triều Tiên (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "Thái (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "Thái (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "dạng viết tắt của ngày trong tuần (thứ)"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "dạng đầy đủ tên ngày trong tuần (thứ)"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "dạng viết tắt của tên tháng"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "dạng đầy đủ của tên tháng"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "định dạng thời gian cho locale hiện tại"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "thế kỉ (năm/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "ngày trong tháng ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "giờ ở dạng số thập phân, dùng dạng 24 giờ"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "giờ ở dạng số thập phân, dùng dạng 12 giờ"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "ngày trong năm ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "tháng ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "phút ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "hoặc là AM hoặc là PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "giây ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "ngày trong tuần ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "định dạng ưu tiên cho ngày tháng của locale hiện tại"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "hai số cuối của năm"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "năm ở dạng số thập phân"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "múi giờ hoặc tên hoặc dạng viết tắt"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "Kí hiệu"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "Miêu tả"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "Ví dụ"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "Đặt màu cho thư"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "Màu sắc"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "Nội dung trích dẫn - Cấp 1"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "Nội dung trích dẫn - Cấp 2"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "Nội dung trích dẫn - Cấp 3"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "Liên kết URI"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "Lặp lại theo vòng"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "Chọn màu cho phần trích dẫn cấp 1"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "Chọn màu cho phần trích dẫn cấp 2"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "Chọn màu cho phần trích dẫn cấp 3"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "Chọn màu cho URI"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "Miêu tả về biểu tượng"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5738,11 +5738,11 @@ msgstr ""
 "Nhóm tin\n"
 "ID của thư"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "Nếu x đã được đặt, hiển thị expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5756,7 +5756,7 @@ msgstr ""
 "Nội dung thư được trích dẫn không gồm chữ kí\n"
 "Literal %"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5768,19 +5768,19 @@ msgstr ""
 "Dấu ngoặc nhọn mở\n"
 "Dấu ngoặc nhọn đóng"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "Phím tắt"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "Chọn kiểu phím tắt. "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "Mặc định"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "Sylpheed cũ"
 
@@ -6819,16 +6819,49 @@ msgstr "Không kết nối được với máy chủ NNTP: %s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "Không kết nối được với máy chủ NNTP: %s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "Thiết lập hộp thư"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "Thực hiện các thao tác sau:"
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
+msgstr ""
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
 msgstr ""
 
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "Đã bị huỷ bỏ"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "Hộp thư `%s' đã có trước."
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Kết quả kiểm tra chữ kí"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 71688715..04b3bc99 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -986,7 +986,7 @@ msgstr "/复制(_C)..."
 msgid "/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "地址簿"
 
@@ -1180,7 +1180,7 @@ msgstr "地址簿转换错误"
 msgid "Address Book Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "界面"
 
@@ -1826,7 +1826,7 @@ msgstr "文件不存在或为空。"
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "编码方式"
 
@@ -2080,7 +2080,7 @@ msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2386,18 +2386,18 @@ msgstr "/删除新闻组(_R)"
 msgid "Creating folder view...\n"
 msgstr "正在创建文件夹视图...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "新建"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "未读"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2409,12 +2409,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -2439,7 +2439,7 @@ msgstr "重建文件夹树失败。"
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3892,16 +3892,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4316,7 +4316,7 @@ msgstr "隐私"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "高级"
 
@@ -4443,7 +4443,7 @@ msgid "Authentication method"
 msgstr "验证方法"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "自动"
 
@@ -4493,8 +4493,8 @@ msgstr "生成邮件标识"
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " 编辑... "
 
@@ -4875,8 +4875,8 @@ msgstr "合并邮件后更新所有的本地文件夹"
 msgid "Execute command when new messages arrived"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "命令"
 
@@ -4986,7 +4986,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "编辑器"
@@ -5076,65 +5076,65 @@ msgstr "在文件夹名后显示未读邮件的数量"
 msgid "Displaying message number columns in the folder view:"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "缩写新闻组长于"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "信件"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "摘要视图"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " 设置摘要中显示的项... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "邮件"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr "如果选择“自动”，将使用最适合当前区域设置的编码方式。"
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "启用邮件的颜色表示"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5142,610 +5142,610 @@ msgstr ""
 "用单字节字符显示多字节字母和数字\n"
 "(仅适用于日语)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "在邮件视图之上显示邮件头面板"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "邮件内容行间距"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "个像素"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "半页滚动"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "平滑滚动"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "每次滚动"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "图像"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "将附件中的图像缩放至适合窗口大小"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "嵌入显示图像"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "选择密钥"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "从服务器上删除"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "从服务器上删除"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "自动检查签名"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "在弹出窗口中显示签名检查结果"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "将口令串临时存放在内存中"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "过期时间"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "分钟后"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "设置为“0”将在整个会话过程中储存口令串"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "输入口令串时捕获输入(更安全)"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "如果 GnuPG 无法工作，在启动时显示警告"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "在摘要窗口中选择邮件时打开邮件"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "进入文件夹时打开第一个未读的邮件"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "仅在新窗口中打开邮件时标记邮件为已读"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "收到新邮件时转到收件箱"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "启动时检查新邮件"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "如果该选项关闭，标记邮件直到完成执行。"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "显示姓名"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "其它"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "日期"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "收对话框"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "总是"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "从不"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "在接收错误时不弹出错误对话框"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "完成后关闭接收对话框"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加为收件人"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "退出程序时"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "退出时进行确认"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "退出时清空废件箱"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "在清空前询问"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "如果队列中有邮件就发出警告"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部命令 (%s 将被替换为文件名或URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "默认收件箱"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "使用外部程序合并邮件"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "套接字 I/O 超时："
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "自动 (建议使用)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位 ASCII (US-ASCII) "
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间格式"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "世纪(年份/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期格式"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5769,11 +5769,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5787,7 +5787,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5799,20 +5799,20 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"
 
@@ -6866,18 +6866,47 @@ msgstr "无法连接SMTP服务器：%s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "无法连接SMTP服务器：%s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "信箱设置"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
 #, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "执行下列动作："
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"输入邮箱位置。\n"
-"如果指定了已存在的邮箱，它将被自动扫描。"
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "取消"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "邮箱“%s”已经存在。"
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7546,6 +7575,14 @@ msgstr "另外一个 Sylpheed 正在运行。\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "输入邮箱位置。\n"
+#~ "如果指定了已存在的邮箱，它将被自动扫描。"
+
 #~ msgid "Lookup"
 #~ msgstr "查找"
 
@@ -7892,9 +7929,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "确定"
 
-#~ msgid "Cancel"
-#~ msgstr "取消"
-
 #~ msgid "Refresh"
 #~ msgstr "刷新"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c6eaad04..1366734f 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -989,7 +989,7 @@ msgstr "/複製(_C)..."
 msgid "/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "通訊錄"
 
@@ -1185,7 +1185,7 @@ msgstr "轉換通訊錄格式時發生錯誤"
 msgid "Address Book Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "介面"
 
@@ -1828,7 +1828,7 @@ msgstr "檔案不存在或者是空的。"
 msgid "Properties"
 msgstr "內容"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "編碼"
 
@@ -2078,7 +2078,7 @@ msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr "..."
 
@@ -2382,18 +2382,18 @@ msgstr "/移除新聞群組(_R)"
 msgid "Creating folder view...\n"
 msgstr "產生資料夾檢視...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "新的"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "未讀的"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2405,12 +2405,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -2435,7 +2435,7 @@ msgstr "重建資料夾結構失敗。"
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr "垃圾郵件"
 
@@ -3882,16 +3882,16 @@ msgstr ""
 "並請注意不要輸入已存在的信箱名稱，\n"
 "系統會自動判別是否它已存在。"
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4307,7 +4307,7 @@ msgstr "私人資料"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "進階設定"
 
@@ -4433,7 +4433,7 @@ msgid "Authentication method"
 msgstr "認證方法"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "自動"
 
@@ -4479,8 +4479,8 @@ msgstr "產生郵件識別碼"
 msgid "Add user-defined header"
 msgstr "加入使用者定義的標頭"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " 編輯... "
 
@@ -4855,8 +4855,8 @@ msgstr "收信後更新所有資料夾"
 msgid "Execute command when new messages arrived"
 msgstr "收到新郵件時立即執行"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "命令列"
 
@@ -4965,7 +4965,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "編輯器"
@@ -5054,55 +5054,55 @@ msgstr "若有未讀郵件，就顯示在資料夾名稱後面"
 msgid "Displaying message number columns in the folder view:"
 msgstr "在資料夾檢視中顯示郵件編號欄"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "新聞群組縮寫長度大於"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "個字母"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "郵件列表"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "若發信人是你自己，就在郵件列表的來源中顯示收信人"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "自動展開郵件串列"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr "設定郵件列表選項..."
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "郵件"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/檢視(_V)/字元編碼(_E)"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
@@ -5110,329 +5110,329 @@ msgstr ""
 "若是選用「自動選擇」，系統將自動為您判斷而使用最\n"
 "適合的語區設定。"
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "郵件中的引言與超連結顯示變色"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
 msgstr "將全形英文與數字以半形來顯示 (只適用日文)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "在顯示郵件欄上方加入標頭資訊"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "在郵件預覽中顯示郵件標頭"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "將 HTML 郵件轉為純文字"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "將 HTML 郵件轉為純文字"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 msgid "Display cursor in message view"
 msgstr "在郵件預覽中顯示游標"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "列間距"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "像素"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "捲軸"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "一次半頁"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "平滑捲動"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "每次捲動"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "圖片"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "調整附加圖片大小以適合視窗"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "在列間顯示圖片"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 msgid "Enable Junk mail control"
 msgstr "啟用垃圾郵件控制"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 msgid "Learning command:"
 msgstr "正在學習命令:"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "選擇金鑰"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr "不是垃圾郵件"
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 msgid "Classifying command"
 msgstr "正在歸類命令"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 msgid "Junk folder"
 msgstr "垃圾郵件資料夾"
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "被歸類為垃圾郵件者將會被移到這個資料夾。"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 msgid "Filter messages classified as junk on receiving"
 msgstr "接收郵件時對歸類為垃圾郵件者進行過濾"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "自伺服器上刪除"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "自伺服器上刪除"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "自動檢查數位簽章"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "將數位簽章檢查結果顯示在另一視窗"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "將密碼片語暫時存在記憶體中"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "期限："
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "分鐘"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "若設定為「0」則表示儲存密碼片語以供整個工作階段使用。"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "輸入密碼片語時擷取輸入"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "若 GnuPG 無法運作，則在啟動時發出警告"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "在郵件列表選擇郵件時開啟郵件"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "進入資料夾時直接跳到第一封未讀郵件"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "只在開啟新郵件時標示為未讀"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "接收完新郵件後直接進入收件夾中"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "開啟時檢查新郵件"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "移動或刪除郵件時立即執行"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "若此選項關閉，則必須按下「執行」才會執行移動或刪除。"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr "讓按鈕的順序相容於 GNOME HIG"
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "顯示名稱"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr "設定熱鍵..."
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "其他"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "執行命令"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "日期"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "接收進度對話框"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "顯示接收郵件的進度對話框"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "一律顯示"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "只在手動收取郵件時顯示"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "不顯示"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "接收錯誤時不要開啟錯誤視窗。"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "完成時關閉接收郵件的進度對話框"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "在通訊錄中，可利用雙擊直接將該電子郵件加入收信人中"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "離開設定"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "離開時確認"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "離開時清空刪除的郵件"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "清除時確認"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "離開時若有尚未送出之郵件即發出警告"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部指令（%s 將會被置換成檔名或 URI）"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "瀏覽器"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 msgid "(Default browser)"
 msgstr "(預設的瀏覽器)"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "用其他外部程式來送信"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "用其他外部程式來收信"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "用其他外部程式來送信"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "啟用對於郵件列表快取整合性的嚴格檢查"
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
@@ -5441,279 +5441,279 @@ msgstr ""
 "如果資料夾的內容有被其他應用軟體更動過的可能，就開啟它。\n"
 "此一選項將會降低郵件列表的顯示效能。"
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "插槽 I/O 等待時間："
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "自動選擇（推薦使用）"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "七位元 ASCII (US-ASCII)"
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "統一碼 (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "西歐語系 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "西歐語系 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "西歐語系 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "中歐語系 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "斯拉夫語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "希臘語 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "斯拉夫語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯來語 (ISO-8859-8)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 msgid "Hebrew (Windows-1255)"
 msgstr "希伯來語 (Windows-1255)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其語 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫語 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫語 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫語 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫語 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日文 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "日文 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "日文 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡體中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 msgid "Simplified Chinese (GBK)"
 msgstr "簡體中文 (GBK)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "繁體中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁體中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "週一、週二、..."
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "一月、二月、..."
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "目前語區設定所偏好的日期與時間"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "世紀 (年/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "今天是幾號 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "現在幾點鐘 (廿四時制，以數字表示)"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "現在幾點鐘 (十二時制，以數字表示)"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第幾天 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "現在是幾月 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "現在是幾分 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "上午或下午"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "現在是幾秒 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "現在是一週的第幾天 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "目前語區設定所偏好的日期"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "公元年份的後兩位數字"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "公元年份 (以數字表示)"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "時區名稱或縮寫"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "特殊符號"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "範例"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "設定顏色"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "顏色"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "引言內容 - 第一層"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "引言內容 - 第二層"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "引言內容 - 第三層"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "超連結"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "三層以上引言則重複使用指定的顏色"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "選擇第一層引言的顏色"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "選擇第二層引言的顏色"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "選擇第三層引言的顏色"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "選擇超連結的顏色"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "特殊符號代表的意義"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5737,11 +5737,11 @@ msgstr ""
 "新聞群組\n"
 "郵件識別碼"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "若 x 已設定則顯示正規表示式"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5755,7 +5755,7 @@ msgstr ""
 "引言（不含簽章）\n"
 "% 符號"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5767,19 +5767,19 @@ msgstr ""
 "左大括弧\n"
 "右大括弧"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "熱鍵設定"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 msgid "Select the preset of key bindings."
 msgstr "選擇事先設定的按鍵組合。"
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "預設值"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "舊設定"
 
@@ -6831,17 +6831,48 @@ msgstr "無法連線到新聞伺服器：%s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "無法連線到新聞伺服器：%s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "信箱設定"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
+#, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "執行下列動作："
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
+msgstr ""
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+#, fuzzy
+msgid "Cancel"
+msgstr "取消"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
 msgstr ""
-"請輸入信箱的地址。\n"
-"如果您不確定，就只要選擇「確定」。"
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "信箱「%s」已存在。"
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7502,6 +7533,13 @@ msgstr "已經有 Sylpheed 程式正在執行中。\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "請輸入信箱的地址。\n"
+#~ "如果您不確定，就只要選擇「確定」。"
+
 #~ msgid "Lookup"
 #~ msgstr "尋找"