Cleanse po/* directory a bit

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/po/bg.po b/po/bg.po
index 2281294..7595e0b 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,46 +4,46 @@
 #
 # todo: remailer, debugging, pipe, mailing list, clear & continue, subparts, captitalize,
 # todo: overflow, certfile
-# todo: matching - "ñúâïàäàùè" èëè "îòãîâàðÿùè íà"?
+# todo: matching - "съвпадащи" или "отговарящи на"?
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-08-12 01:40+0200\n"
 "Last-Translator: \n"
 "Language-Team: mutt-dev <mutt-dev@mutt.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CP1251\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Îáùè êëàâèøíè êîìáèíàöèè:\n"
+"Общи клавишни комбинации:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"Ôóíêöèè, áåç êëàâèøíà êîìáèíàöèÿ:\n"
+"Функции, без клавишна комбинация:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Êðàé íà ïîäïèñàíèòå äàííè --]\n"
+"[-- Край на подписаните данни --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -69,56 +69,56 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"Ñòàðòèðàíå: mutt [ -nRyzZ ] [ -e <êîìàíäà> ] [ -F <ôàéë> ] [ -m <òèï> ] [ -f "
-"<ôàéë> ]\n"
-"       mutt [ -nR ] [ -e <êîìàíäà> ] [ -F <ôàéë> ] -Q <çàïèòâàíå> [ -Q "
-"<çàïèòâàíå> ] [...]\n"
-"       mutt [ -nR ] [ -e <êîìàíäà> ] [ -F <ôàéë> ] -A <ïñåâäîíèì> [ -A "
-"<ïñåâäîíèì> ] [...]\n"
-"       mutt [ -nx ] [ -e <êîìàíäà> ] [ -a <ôàéë> ] [ -F <ôàéë> ] [ -H "
-"<ôàéë> ] [ -i <ôàéë> ] [ -s <òåìà> ] [ -b <àäðåñ> ] [ -c <àäðåñ> ] <àäðåñ> "
+"Стартиране: mutt [ -nRyzZ ] [ -e <команда> ] [ -F <файл> ] [ -m <тип> ] [ -f "
+"<файл> ]\n"
+"       mutt [ -nR ] [ -e <команда> ] [ -F <файл> ] -Q <запитване> [ -Q "
+"<запитване> ] [...]\n"
+"       mutt [ -nR ] [ -e <команда> ] [ -F <файл> ] -A <псевдоним> [ -A "
+"<псевдоним> ] [...]\n"
+"       mutt [ -nx ] [ -e <команда> ] [ -a <файл> ] [ -F <файл> ] [ -H "
+"<файл> ] [ -i <файл> ] [ -s <тема> ] [ -b <адрес> ] [ -c <адрес> ] <адрес> "
 "[ ... ]\n"
-"       mutt [ -n ] [ -e <êîìàíäà> ] [ -F <ôàéë> ] -p\n"
+"       mutt [ -n ] [ -e <команда> ] [ -F <файл> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
-"Ïàðàìåòðè:\n"
-"  -A <ïñåâäîíèì>\tðàçãðúùà óêàçàíèÿ ïñåâäîíèì\n"
-"  -a <èìå íà ôàéë>\tïðèëàãà ôàéë êúì ïèñìîòî\n"
-"  -b <àäðåñ>\tèçïðàùà ñëÿïî êîïèå (BCC) êúì òîçè àäðåñ\n"
-"  -c <àäðåñ>\tèçïðàùà êîïèå (CC) êúì òîçè àäðåñ\n"
-"  -e <êîìàíäà>\têîìàíäà, êîÿòî äà áúäå èçïúëíåíà ñëåä èíèöèàëèçàöèÿ\n"
-"  -f <èìå íà ôàéë>\tïîùåíñêà êóòèÿ, êîÿòî äà áúäå çàðåäåíà\n"
-"  -F <èìå íà ôàéë>\tàëòåðíàòèâåí muttrc ôàéë\n"
-"  -H <èìå íà ôàéë>\tôàéë ñúñ çàãëàâíà èíôîðìàöèÿ\n"
-"  -i <èìå íà ôàéë>\tôàéë, êîéòî äà áúäå âêëþ÷åí â îòãîâîðà\n"
-"  -m <òèï>\tòèï íà ïîùåíñêàòà êóòèÿ ïî ïîäðàçáèðàíå\n"
-"  -n\t\tèãíîðèðà ñèñòåìíèÿ Muttrc\n"
-"  -p\t\tðåäàêòèðà ÷åðíîâà\n"
-"  -Q <variable>\tçàïèòâàíå çà êîíôèãóðàöèîííà ïðîìåíëèâà\n"
-"  -R\t\tîòâàðÿ ïîùåíñêàòà êóòèÿ ñàìî çà ÷åòåíå\n"
-"  -s <òåìà>\tòåìà íà ïèñìîòî (òðÿáâà äà å â êàâè÷êè, àêî ñúäúðæà èíòåðâàëè)\n"
-"  -v\t\tïîêàçâà âåðñèÿòà è äåôèíèöèèòå, èçïîëçâàíè ïðè êîìïèëàöèÿ\n"
-"  -x\t\tñèìóëèðà mailx èçïðàùàíå\n"
-"  -y\t\tèçáîð íà ôàéë îò ëèñòà `mailboxes'\n"
-"  -z\t\tíåçàáàâåí èçõîä îò ïðîãðàìàòà, àêî â ïîùåíñêàòà êóòèÿ íÿìà ïèñìà\n"
-"  -Z\t\tîòâàðÿíå íà ïúðâàòà ïîùåíñêà êóòèÿ ñ íîâè ïèñìà èëè íåçàáàâåí èçõîä "
-"îò ïðîãðàìàòà àêî íÿìà òàêàâà\n"
-"  -h\t\tïîêàçâà òîçè òåêñò"
-
-#: compose.c:152 compose.c:156
+"Параметри:\n"
+"  -A <псевдоним>\tразгръща указания псевдоним\n"
+"  -a <име на файл>\tприлага файл към писмото\n"
+"  -b <адрес>\tизпраща сляпо копие (BCC) към този адрес\n"
+"  -c <адрес>\tизпраща копие (CC) към този адрес\n"
+"  -e <команда>\tкоманда, която да бъде изпълнена след инициализация\n"
+"  -f <име на файл>\tпощенска кутия, която да бъде заредена\n"
+"  -F <име на файл>\tалтернативен muttrc файл\n"
+"  -H <име на файл>\tфайл със заглавна информация\n"
+"  -i <име на файл>\tфайл, който да бъде включен в отговора\n"
+"  -m <тип>\tтип на пощенската кутия по подразбиране\n"
+"  -n\t\tигнорира системния Muttrc\n"
+"  -p\t\tредактира чернова\n"
+"  -Q <variable>\tзапитване за конфигурационна променлива\n"
+"  -R\t\tотваря пощенската кутия само за четене\n"
+"  -s <тема>\tтема на писмото (трябва да е в кавички, ако съдържа интервали)\n"
+"  -v\t\tпоказва версията и дефинициите, използвани при компилация\n"
+"  -x\t\tсимулира mailx изпращане\n"
+"  -y\t\tизбор на файл от листа `mailboxes'\n"
+"  -z\t\tнезабавен изход от програмата, ако в пощенската кутия няма писма\n"
+"  -Z\t\tотваряне на първата пощенска кутия с нови писма или незабавен изход "
+"от програмата ако няма такава\n"
+"  -h\t\tпоказва този текст"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " ïîäïèñ êàòî: "
+msgstr " подпис като: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
-msgstr "    äî %s"
+msgstr "    до %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
-msgstr "   îò %s"
+msgstr "   от %s"
 
 #: main.c:106
 msgid ""
@@ -158,140 +158,140 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr " (èçïîëçâàéòå'?' çà èçáîð îò ñïèñúê): "
+msgstr " (използвайте'?' за избор от списък): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
-msgstr "(ïî-íàòàòúê)\n"
+msgstr "(по-нататък)\n"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr "Íàòèñíåòå '%s' çà âêëþ÷âàíå/èçêëþ÷âàíå íà ðåæèìà çà çàïèñ"
+msgstr "Натиснете '%s' за включване/изключване на режима за запис"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " â òîçè îãðàíè÷åí èçãëåä"
+msgstr " в този ограничен изглед"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " ìàðêèðàí"
+msgstr " маркиран"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: íåâàëèäíà êîìàíäà"
+msgstr "%c: невалидна команда"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: íå ñå ïîääúðæà â òîçè ðåæèì"
+msgstr "%c: не се поддържа в този режим"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "çàïàçåíè: %d; èçòðèòè: %d"
+msgstr "запазени: %d; изтрити: %d"
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "çàïàçåíè: %d; ïðåìåñòåíè: %d; èçòðèòè: %d"
+msgstr "запазени: %d; преместени: %d; изтрити: %d"
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Äåéñòâèòåëíî ëè èñêàòå äà èçïîëçâàòå òîçè êëþ÷?"
+msgstr "%s Действително ли искате да използвате този ключ?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] å ïðîìåíåíî. Æåëàåòå ëè äà îïðåñíèòå êîäèðàíåòî?"
+msgstr "%s [#%d] е променено. Желаете ли да опресните кодирането?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] âå÷å íå ñúùåñòâóâà!"
+msgstr "%s [#%d] вече не съществува!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d îò %d ïèñìà ñà ïðî÷åòåíè]"
+msgstr "%s [%d от %d писма са прочетени]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s íå ñúùåñòâóâà. Äà áúäå ëè ñúçäàäåí?"
+msgstr "%s не съществува. Да бъде ли създаден?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s íå å âàëèäíà IMAP ïúòåêà"
+msgstr "%s не е валидна IMAP пътека"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s íå å âàëèäíà POP ïúòåêà"
+msgstr "%s не е валидна POP пътека"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s íå å âàëèäíà POP ïúòåêà"
+msgstr "%s не е валидна POP пътека"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s íå å âàëèäíà POP ïúòåêà"
+msgstr "%s не е валидна POP пътека"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s íå å äèðåêòîðèÿ."
+msgstr "%s не е директория."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s íå å ïîùåíñêà êóòèÿ!"
+msgstr "%s не е пощенска кутия!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s íå å ïîùåíñêà êóòèÿ."
+msgstr "%s не е пощенска кутия."
 
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s íå å îáèêíîâåí ôàéë."
+msgstr "%s не е обикновен файл."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s âå÷å íå ñúùåñòâóâà!"
+msgstr "%s вече не съществува!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -305,142 +305,142 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
-msgstr "%s: Íåïîçíàò òèï."
+msgstr "%s: Непознат тип."
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: òåðìèíàëúò íå ïîääúðæà öâåòîâå"
+msgstr "%s: терминалът не поддържа цветове"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: êîìàíäàòà å âàëèäíà ñàìî çà èíäåêñåí îáåêò"
+msgstr "%s: командата е валидна само за индексен обект"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: íÿìà òàêúâ àòðèáóò"
+msgstr "%s: няма такъв атрибут"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: íÿìà òàêúâ öâÿò"
+msgstr "%s: няма такъв цвят"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
-msgstr "%s: íÿìà òàêàâà ôóíêöèÿ"
+msgstr "%s: няма такава функция"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: íåïîçíàòà ôóíêöèÿ"
+msgstr "%s: непозната функция"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s:  íÿìà òàêîâà ìåíþ"
+msgstr "%s:  няма такова меню"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s: íÿìà òàêúâ îáåêò"
+msgstr "%s: няма такъв обект"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: íåäîñòàòú÷íî àðãóìåíòè"
+msgstr "%s: недостатъчно аргументи"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: ãðåøêà ïðè ïðèëàãàíåòî íà ôàéë"
+msgstr "%s: грешка при прилагането на файл"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: ãðåøêà ïðè ïðèëàãàíå íà ôàéëà.\n"
+msgstr "%s: грешка при прилагане на файла.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: íåïîçíàòà êîìàíäà"
+msgstr "%s: непозната команда"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: íåïîçíàò òèï"
+msgstr "%s: непознат тип"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: íåïîçíàòà ïðîìåíëèâà"
+msgstr "%s: непозната променлива"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s íå å âàëèäíà POP ïúòåêà"
+msgstr "%s не е валидна POP пътека"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s íå å âàëèäíà POP ïúòåêà"
+msgstr "%s не е валидна POP пътека"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "('view-attachments' íÿìà êëàâèøíà êîìáèíàöèÿ!)"
+msgstr "('view-attachments' няма клавишна комбинация!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(íÿìà ïîùåíñêà êóòèÿ)"
+msgstr "(няма пощенска кутия)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "îòõâúðëÿíå(r), åäíîêðàòíî ïðèåìàíå(o)"
+msgstr "отхвърляне(r), еднократно приемане(o)"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "îòõâúðëÿíå(r), åäíîêðàòíî ïðèåìàíå(o), ïðèåìàíå âèíàãè(a)"
+msgstr "отхвърляне(r), еднократно приемане(o), приемане винаги(a)"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(ðàçìåð %s áàéòà) "
+msgstr "(размер %s байта) "
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr " (èçïîëçâàéòå'%s' çà äà âèäèòå òàçè ÷àñò)"
+msgstr " (използвайте'%s' за да видите тази част)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- Ïðèëîæåíèÿ"
+msgstr "-- Приложения"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<ÍÅÈÇÂÅÑÒÍÀ>"
+msgstr "<НЕИЗВЕСТНА>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<ïî ïîäðàçáèðàíå>"
+msgstr "<по подразбиране>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -452,122 +452,114 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "Íåóñïåøíà APOP èäåíòèôèêàöèÿ."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Îòêàç"
+msgstr "Неуспешна APOP идентификация."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Æåëàåòå ëè äà èçòðèåòå íåïðîìåíåíîòî ïèñìî?"
+msgstr "Желаете ли да изтриете непромененото писмо?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Íåïðîìåíåíîòî ïèñìî å èçòðèòî."
+msgstr "Непромененото писмо е изтрито."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "Àäðåñ:"
+msgstr "Адрес:"
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Ïñåâäîíèìúò å äîáàâåí."
+msgstr "Псевдонимът е добавен."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Ïñåâäîíèì çà àäðåñíàòà êíèãà:"
+msgstr "Псевдоним за адресната книга:"
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "Ïñåâäîíèìè"
+msgstr "Псевдоними"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Âñè÷êè ïîäõîäÿùè êëþ÷îâå ñà îñòàðåëè, àíóëèðàíè èëè äåàêòèâèðàíè."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Äîáàâÿíå"
+msgstr "Всички подходящи ключове са остарели, анулирани или деактивирани."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Æåëàåòå ëè äà äîáàâèòå ïèñìàòà êúì %s?"
+msgstr "Желаете ли да добавите писмата към %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Àðãóìåíòúò òðÿáâà äà áúäå íîìåð íà ïèñìî."
+msgstr "Аргументът трябва да бъде номер на писмо."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "Ïðèëîæåíèåòî å çàïèñàíî íà äèñêà."
+msgstr "Приложението е записано на диска."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "Ïðèëàãàíå íà ôàéë"
+msgstr "Прилагане на файл"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "Ïðèëàãàíå íà èçáðàíèòå ôàéëîâå..."
+msgstr "Прилагане на избраните файлове..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "Ïðèëîæåíèåòî å ôèëòðèðàíî."
+msgstr "Приложението е филтрирано."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "Ïðèëîæåíèåòî å çàïèñàíî íà äèñêà."
+msgstr "Приложението е записано на диска."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "Ïðèëîæåíèÿ"
+msgstr "Приложения"
 
 #: imap/auth.c:83
 #, c-format
 msgid "Authenticating (%s)..."
-msgstr "Èäåíòèôèöèðàíå (%s)..."
+msgstr "Идентифициране (%s)..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "Èäåíòèôèöèðàíå (APOP)..."
+msgstr "Идентифициране (APOP)..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "Èäåíòèôèöèðàíå (SASL)..."
+msgstr "Идентифициране (SASL)..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "Èäåíòèôèöèðàíå (SASL)..."
+msgstr "Идентифициране (SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -576,56 +568,56 @@ msgstr ""
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "Ëîø IDN \"%s\"."
+msgstr "Лош IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "Ëîø IDN %s äîêàòî ôîðìàòà çà ïîâòîðíî èçïðàùàíå áåøå ïîäãîòâÿíà."
+msgstr "Лош IDN %s докато формата за повторно изпращане беше подготвяна."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "Ëîø IDN â \"%s\": '%s'"
+msgstr "Лош IDN в \"%s\": '%s'"
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "Ëîø IDN: '%s'"
+msgstr "Лош IDN: '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "Íåâàëèäíî èìå íà ïîùåíñêàòà êóòèÿ"
+msgstr "Невалидно име на пощенската кутия"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "Òîâà å êðàÿò íà ïèñìîòî."
+msgstr "Това е краят на писмото."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Ïðåïðàùàíå íà ïèñìîòî êúì %s"
+msgstr "Препращане на писмото към %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Ïðåïðàùàíå íà ïèñìîòî êúì: "
+msgstr "Препращане на писмото към: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Ïðåïðàùàíå íà ïèñìîòî êúì %s"
+msgstr "Препращане на писмото към %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Ïðåïðàùàíå íà ìàðêèðàíèòå ïèñìà êúì: "
+msgstr "Препращане на маркираните писма към: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "Íåóñïåøåí CLOSE"
+msgstr "Неуспешен CLOSE"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -634,66 +626,66 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Ãðåøêà ïðè äîáàâÿíåòî íà ïèñìî êúì ïîùåíñêàòà êóòèÿ: %s"
+msgstr "Грешка при добавянето на писмо към пощенската кутия: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Íå ìîæå äà ïðèëàãàòå äèðåêòîðèÿ!"
+msgstr "Не може да прилагате директория!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "Ãðåøêà ïðè ñúçäàâàíå íà %s: %s."
+msgstr "Грешка при създаване на %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ôàéëà %s"
+msgstr "Грешка при създаване на файла %s"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Ãðåøêà ïðè ñúçäàâàíåòî íà ôèëòúð"
+msgstr "Грешка при създаването на филтър"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "Ãðåøêà ïðè ñúçäàâàíåòî íà ôèëòúð"
+msgstr "Грешка при създаването на филтър"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Ãðåøêà ïðè ñúçäàâàíå íà âðåìåíåí ôàéë"
+msgstr "Грешка при създаване на временен файл"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Äåêîäèðàíåòî íà âñè÷êè ìàðêèðàíè ïðèëîæåíèÿ å íåâúçìîæíî. Æåëàåòå ëè äà "
-"êàïñóëèðàòå ñ MIME îñòàíàëèòå?"
+"Декодирането на всички маркирани приложения е невъзможно. Желаете ли да "
+"капсулирате с MIME останалите?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Äåêîäèðàíåòî íà âñè÷êè ìàðêèðàíè ïðèëîæåíèÿ å íåâúçìîæíî. Æåëàåòå ëè äà "
-"ïðåïðàòèòå ñ MIME îñòàíàëèòå?"
+"Декодирането на всички маркирани приложения е невъзможно. Желаете ли да "
+"препратите с MIME останалите?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "Ãðåøêà ïðè äåøèôðèðàíåòî íà øèôðîâàíî ïèñìî!"
+msgstr "Грешка при дешифрирането на шифровано писмо!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "Ãðåøêà ïðè èçòðèâàíåòî íà ïðèëîæåíèå îò POP ñúðâúðà."
+msgstr "Грешка при изтриването на приложение от POP сървъра."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "Ãðåøêà ïðè èçòðèâàíåòî íà ïðèëîæåíèå îò POP ñúðâúðà."
+msgstr "Грешка при изтриването на приложение от POP сървъра."
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Íåâúçìîæíî dot-çàêëþ÷âàíå çà %s.\n"
+msgstr "Невъзможно dot-заключване за %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -701,307 +693,291 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Íÿìà ìàðêèðàíè ïèñìà."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Íåâúçìîæíî ïîëó÷àâàíåòî íà mixmaster \"type2.list\"!"
+msgstr "Няма маркирани писма."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Íÿìà øàáëîí ñ òîâà èìå. Æåëàåòå ëè äà ïðîäúëæèòå?"
+msgstr "Няма шаблон с това име. Желаете ли да продължите?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà: %s"
+msgstr "Грешка при отваряне на файла: %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Ãðåøêà ïðè äîáàâÿíåòî íà ïèñìî êúì ïîùåíñêàòà êóòèÿ: %s"
+msgstr "Грешка при добавянето на писмо към пощенската кутия: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Âðúçêàòà ñ %s å çàòâîðåíà"
+msgstr "Връзката с %s е затворена"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Çàòâàðÿíå íà âðúçêàòà êúì POP ñúðâúð..."
+msgstr "Затваряне на връзката към POP сървър..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà %s: %s"
+msgstr "Грешка при отваряне на %s: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "Ãðåøêà ïðè ñúçäàâàíå íà %s: %s."
+msgstr "Грешка при създаване на %s: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Çàïèñ íà ïèñìî íà POP ñúðâúð íå å âúçìîæíî."
+msgstr "Запис на писмо на POP сървър не е възможно."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Ðåäàêòèðàíåòî íà ïèñìî íà POP ñúðâúð íå å âúçìîæíî."
+msgstr "РедакÑ\82иÑ\80анеÑ\82о на пиÑ\81мо на POP Ñ\81Ñ\8aÑ\80вÑ\8aÑ\80 не е вÑ\8aзможно."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà %s: %s"
+msgstr "Грешка при отваряне на %s: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Äèðåêòîðèÿòà íå ìîæå äà áúäå ïîêàçàíà"
+msgstr "Директорията не може да бъде показана"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "Ãðåøêà ïðè ñúçäàâàíå íà %s."
+msgstr "Грешка при създаване на %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Ãðåøêà ïðè çàïèñ íà çàãëàâíàòà ÷àñò íà ïèñìîòî âúâ âðåìåíåí ôàéë"
+msgstr "Грешка при запис на заглавната част на писмото във временен файл"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Íåâúçìîæåí çàïèñ íà ïèñìî"
+msgstr "Невъзможен запис на писмо"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Ãðåøêà ïðè çàïèñ íà ïèñìîòî âúâ âðåìåíåí ôàéë"
+msgstr "Грешка при запис на писмото във временен файл"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Ôèëòúðúò íå ìîæå äà áúäå ñúçäàäåí"
+msgstr "Филтърът не може да бъде създаден"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Ôèëòúðúò íå ìîæå äà áúäå ñúçäàäåí"
+msgstr "Филтърът не може да бъде създаден"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr ""
-"Ðåæèìúò íà çàùèòåíàòà îò çàïèñ ïîùåíñêà êóòèÿ íå ìîæå äà áúäå ïðîìåíåí!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+"Режимът на защитената от запис пощенска кутия не може да бъде променен!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "Ïîëó÷åí ñèãíàë %s... Èçõîä îò ïðîãðàìàòà.\n"
+msgstr "Получен сигнал %s... Изход от програмата.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "Ñåðòèôèêàòúò íà ñúðâúðà âñå îùå íå å âàëèäåí"
+msgstr "Сертификатът на сървъра все още не е валиден"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "Ñåðòèôèêàòúò å çàïèñàí"
+msgstr "Сертификатът е записан"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Ïðîìåíèòå â òàçè ïîùåíñêà êóòèÿ ùå áúäàò çàïèñàíè ïðè íàïóñêàíåòî é."
+msgstr "Промените в тази пощенска кутия ще бъдат записани при напускането й."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Ïðîìåíèòå â òàçè ïîùåíñêà êóòèÿ íÿìà äà áúäàò çàïèñàíè."
+msgstr "Промените в тази пощенска кутия няма да бъдат записани."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr "Ñèìâîë = %s, Îñìè÷íî = %o, Äåñåòè÷íî = %d"
+msgstr "Символ = %s, Осмично = %o, Десетично = %d"
 
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Êîäîâàòà òàáëèöà å ïðîìåíåíà íà %s; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Äèðåêòîðèÿ"
+msgstr "Кодовата таблица е променена на %s; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "Ñìÿíà íà äèðåêòîðèÿòà: "
+msgstr "Смяна на директорията: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "Ïðîâåðêà çà íîâè ïèñìà..."
-
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Ïðîâåðêà íà êëþ÷  "
+msgstr "Проверка за нови писма..."
 
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "Ïðîâåðêà çà íîâè ïèñìà..."
+msgstr "Проверка за нови писма..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "Ïðîâåðêà çà íîâè ïèñìà..."
+msgstr "Проверка за нови писма..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "Îáèêíîâåí òåêñò"
+msgstr "Обикновен текст"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Èçòðèâàíå íà ìàðêèðîâêà"
+msgstr "Изтриване на маркировка"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Çàòâàðÿíå íà âðúçêàòà êúì %s..."
+msgstr "Затваряне на връзката към %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "Çàòâàðÿíå íà âðúçêàòà êúì POP ñúðâúð..."
+msgstr "Затваряне на връзката към POP сървър..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "Ñâúðçâàíå ñ %s..."
+msgstr "Свързване с %s..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Ñúðâúðúò íå ïîääúðæà êîìàíäàòà TOP."
+msgstr "Сървърът не поддържа командата TOP."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Ñúðâúðúò íå ïîääúðæà êîìàíäàòà UIDL."
+msgstr "Сървърът не поддържа командата UIDL."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "Ñúõðàíÿâàíå íà ïðîìåíèòå..."
+msgstr "Съхраняване на промените..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Îïöèè ïðè êîìïèëàöèÿ:"
+"Опции при компилация:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Êîìïèëèðàíå íà øàáëîíà çà òúðñåíå..."
+msgstr "Компилиране на шаблона за търсене..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "Ñúçäàâàíå íà êîïèå â %s..."
+msgstr "Създаване на копие в %s..."
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "Ñúçäàâàíå íà êîïèå â %s..."
+msgstr "Създаване на копие в %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "Ñâúðçâàíå ñ %s..."
+msgstr "Свързване с %s..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "Ñâúðçâàíå ñ %s..."
+msgstr "Свързване с %s..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "Ñâúðçâàíå ñ %s..."
+msgstr "Свързване с %s..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Âðúçêàòà ïðîïàäíà. Æåëàåòå ëè äà ñå âêëþ÷èòå îòíîâî êúì POP ñúðâúðà?"
+msgstr "Връзката пропадна. Желаете ли да се включите отново към POP сървъра?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Âðúçêàòà ïðîïàäíà. Æåëàåòå ëè äà ñå âêëþ÷èòå îòíîâî êúì POP ñúðâúðà?"
+msgstr "Връзката пропадна. Желаете ли да се включите отново към POP сървъра?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "Âðúçêàòà ñ %s å çàòâîðåíà"
+msgstr "Връзката с %s е затворена"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Âðúçêàòà ñ %s å çàòâîðåíà"
+msgstr "Връзката с %s е затворена"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Content-Type å ïðîìåíåí íà %s."
+msgstr "Content-Type е променен на %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Ïîëåòî Content-Type èìà ôîðìàòà áàçîâ-òèï/ïîäòèï"
+msgstr "Полето Content-Type има формата базов-тип/подтип"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "Æåëàåòå ëè äà ïðîäúëæèòå?"
+msgstr "Желаете ли да продължите?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "Æåëàåòå ëè äà ãî êîíâåðòèðàòå äî %s ïðè èçïðàùàíå?"
+msgstr "Желаете ли да го конвертирате до %s при изпращане?"
 
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "Êîïèðàíå íà%s â ïîùåíñêà êóòèÿ"
+msgstr "Копиране на%s в пощенска кутия"
 
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "Êîïèðàíå íà %d ñúîáùåíèÿ â %s..."
+msgstr "Копиране на %d съобщения в %s..."
 
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "Êîïèðàíå íà %d-òî ñúîáùåíèå â %s..."
+msgstr "Копиране на %d-то съобщение в %s..."
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "Ñúçäàâàíå íà êîïèå â %s..."
+msgstr "Създаване на копие в %s..."
 
 #: main.c:63
 msgid ""
@@ -1017,715 +993,655 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Ãðåøêà ïðè ñâúðçâàíå ñ %s (%s)"
+msgstr "Грешка при свързване с %s (%s)"
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "Ïèñìîòî íå ìîæå äà áúäå êîïèðàíî."
+msgstr "Писмото не може да бъде копирано."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Íåâúçìîæíî ñúçäàâàíåòî íà âðåìåíåí ôàéë!"
+msgstr "Невъзможно създаването на временен файл!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Íåâúçìîæíî ñúçäàâàíåòî íà âðåìåíåí ôàéë!"
+msgstr "Невъзможно създаването на временен файл!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
 msgstr ""
-"Íå ìîæå äà áúäå íàìåðåíà ôóíêöèÿ çà ïîäðåæäàíå! (Ìîëÿ, ñúîáùåòå çà òàçè "
-"ãðåøêà)"
+"Не може да бъде намерена функция за подреждане! (Моля, съобщете за тази "
+"грешка)"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Õîñòúò \"%s\" íå ìîæå äà áúäå íàìåðåí."
+msgstr "Хостът \"%s\" не може да бъде намерен."
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Íå âñè÷êè ïîèñêàíè ïèñìà ìîãàò äà áúäàò ïðèêà÷åíè!"
+msgstr "Не всички поискани писма могат да бъдат прикачени!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "Íå ìîæå äà áúäå óñòàíîâåíà TSL âðúçêà"
+msgstr "Не може да бъде установена TSL връзка"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà %s"
+msgstr "Грешка при отваряне на %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Ãðåøêà ïðè ïîâòîðíîòî îòâàðÿíå íà ïîùåíñêàòà êóòèÿ!"
+msgstr "Грешка при повторното отваряне на пощенската кутия!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Ïèñìîòî íå ìîæå äà áúäå èçïðàòåíî."
+msgstr "Писмото не може да бъде изпратено."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Íåâúçìîæíî çàêëþ÷âàíå íà %s\n"
+msgstr "Невъзможно заключване на %s\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "Æåëàåòå ëè äà ñúçäàäåòå %s?"
+msgstr "Желаете ли да създадете %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Ñàìî IMAP ïîùåíñêè êóòèè ìîãàò äà áúäàò ñúçäàâàíè"
+msgstr "Само IMAP пощенски кутии могат да бъдат създавани"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Ñúçäàâàíå íà ïîùåíñêà êóòèÿ: "
+msgstr "Създаване на пощенска кутия: "
 
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "Äåêîäèðàíå è êîïèðàíå íà%s â ïîùåíñêà êóòèÿ"
+msgstr "Декодиране и копиране на%s в пощенска кутия"
 
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "Äåêîäèðàíå è çàïèñ íà%s â ïîùåíñêà êóòèÿ"
+msgstr "Декодиране и запис на%s в пощенска кутия"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "Èçáèðàíå íà %s..."
+msgstr "Избиране на %s..."
 
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Äåøèôðèðàíå è çàïèñ íà%s â ïîùåíñêà êóòèÿ"
+msgstr "Дешифриране и запис на%s в пощенска кутия"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "Äåøèôðèðàíå è çàïèñ íà%s â ïîùåíñêà êóòèÿ"
+msgstr "Дешифриране и запис на%s в пощенска кутия"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
-msgstr "Èçòåãëÿíå íà ïèñìî..."
+msgstr "Изтегляне на писмо..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Íåóñïåøíî ðàçøèôðîâàíå."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Èçòð."
+msgstr "Неуспешно разшифроване."
 
-#: remailer.c:433
-msgid "Delete"
-msgstr "Èçòðèâàíå"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Ñàìî IMAP ïîùåíñêè êóòèè ìîãàò äà áúäàò èçòðèâàíè"
+msgstr "Само IMAP пощенски кутии могат да бъдат изтривани"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "Æåëàåòå ëè äà èçòðèåòå ïèñìàòà íà ñúðâúðà?"
+msgstr "Желаете ли да изтриете писмата на сървъра?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "Èçòðèâàíå íà ïèñìà ïî øàáëîí: "
+msgstr "Изтриване на писма по шаблон: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "Èçòðèâàíå"
+msgstr "Изтриване"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Èçòðèâàíåòî íà ïðèëîæåíèÿ îò øèôðîâàíè ïèñìà íå ñå ïîääúðæà."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Îïèñàíèå"
+msgstr "Изтриването на приложения от шифровани писма не се поддържа."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "Èäåíòèôèêàòîðúò %s íå å ïðîâåðåí. Æåëàåòå ëè äà ãî èçïîëçâàòå çà %s ?"
+msgstr "Идентификаторът %s не е проверен. Желаете ли да го използвате за %s ?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s íå ñúùåñòâóâà. Äà áúäå ëè ñúçäàäåí?"
+msgstr "%s не съществува. Да бъде ли създаден?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Äèðåêòîðèÿ [%s], Ôàéëîâà ìàñêà: %s"
+msgstr "Директория [%s], Файлова маска: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "ÃÐÅØÊÀ: ìîëÿ, ñúîáùåòå íè çà òàçè ãðåøêà"
+msgstr "ГРЕШКА: моля, съобщете ни за тази грешка"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "Æåëàåòå ëè äà ðåäàêòèðàòå ïèñìîòî ïðåäè ïðåïðàùàíå?"
+msgstr "Желаете ли да редактирате писмото преди препращане?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "ãðåøêà â èçðàçà"
+msgstr "грешка в израза"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Øèôðîâàíå"
+msgstr "Шифроване"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "Øèôðîâàíå c: "
+msgstr "Шифроване c: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "Âúâåäåòå êëþ÷îâ èäåíòèôèêàòîð: "
+msgstr "Въведете ключов идентификатор: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "Âúâåäåòå êëþ÷îâ èäåíòèôèêàòîð çà %s: "
+msgstr "Въведете ключов идентификатор за %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "Âúâåäåòå êëþ÷îâå (^G çà ïðåêúñâàíå): "
+msgstr "Въведете ключове (^G за прекъсване): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "Ãðåøêà ïðè ïðåïðàùàíå íà ïèñìîòî!"
+msgstr "Грешка при препращане на писмото!"
 
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "Ãðåøêà ïðè ïðåïðàùàíå íà ïèñìàòà!"
+msgstr "Грешка при препращане на писмата!"
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "Ãðåøêà ïðè èçïðàùàíå íà ïèñìîòî."
+msgstr "Грешка при изпращане на писмото."
 
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "Ãðåøêà ïðè ñâúðçâàíå ñúñ ñúðâúðà: %s"
+msgstr "Грешка при свързване със сървъра: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Ãðåøêà ïðè ñâúðçâàíå ñúñ ñúðâúðà: %s"
+msgstr "Грешка при свързване със сървъра: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "Ãðåøêà â %s, ðåä %d: %s"
+msgstr "Грешка в %s, ред %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Ãðåøêà â êîìàíäíèÿ ðåä: %s\n"
+msgstr "Грешка в командния ред: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "Ãðåøêà â èçðàçà: %s"
+msgstr "Грешка в израза: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "Ãðåøêà ïðè èíèöèàëèçàöèÿ íà òåðìèíàëà."
+msgstr "Грешка при инициализация на терминала."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "Ãðåøêà ïðè èíèöèàëèçàöèÿ íà òåðìèíàëà."
+msgstr "Грешка при инициализация на терминала."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà ïîùåíñêàòà êóòèÿ!"
+msgstr "Грешка при отваряне на пощенската кутия!"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "Ãðåøêà ïðè ðàç÷èòàíå íà àäðåñúò!"
+msgstr "Грешка при разчитане на адресът!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Ãðåøêà ïðè èçïúëíåíèåòî íà \"%s\"!"
+msgstr "Грешка при изпълнението на \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Ãðåøêà ïðè ÷åòåíå íà äèðåêòîðèÿòà."
+msgstr "Грешка при четене на директорията."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Ãðåøêà %d (%s) ïðè èçïðàùàíå íà ïèñìîòî."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Ãðåøêà (%d) ïðè èçïðàùàíå íà ïèñìîòî.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Ãðåøêà ïðè èçïðàùàíå íà ïèñìîòî."
+msgstr "Грешка %d (%s) при изпращане на писмото."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "Ãðåøêà â êîìóíèêàöèÿòà ñ %s (%s)"
+msgstr "Грешка в комуникацията с %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "Ãðåøêà ïðè ïîêàçâàíåòî íà ôàéëà"
+msgstr "Грешка при показването на файла"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "Ãðåøêà ïðè çàïèñâàíå íà ïîùåíñêàòà êóòèÿ!"
+msgstr "Грешка при записване на пощенската кутия!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Ãðåøêà. Çàïàçâàíå íà âðåìåííèÿ ôàéë: %s"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Ãðåøêà: %s íå ìîæå äà ñå èçïîëçâà êàòî ïîñëåäåí remailer âúâ âåðèãàòà."
+msgstr "Грешка. Запазване на временния файл: %s"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "Ãðåøêà: '%s' å íåâàëèäåí IDN."
+msgstr "Грешка: '%s' е невалиден IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "Ãðåøêà: multipart/encrypted áåç protocol ïàðàìåòúð."
+msgstr "Грешка: multipart/encrypted без protocol параметър."
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "Ãðåøêà: multipart/signed áåç protocol ïàðàìåòúð."
+msgstr "Грешка: multipart/signed без protocol параметър."
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Ãðåøêà â êîìàíäíèÿ ðåä: %s\n"
+msgstr "Грешка в командния ред: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Èçòåãëÿíå íà çàãëàâíèòå ÷àñòè... [%d/%d]"
+msgstr "Изтегляне на заглавните части... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Èçïúëíÿâàíå íà êîìàíäà âúðõó ïèñìàòà..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Èçõîä"
+msgstr "Изпълняване на команда върху писмата..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Èçõîä"
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Æåëàåòå ëè äà íàïóñíåòå Mutt áåç äà çàïèøåòå ïðîìåíèòå?"
+msgstr "Желаете ли да напуснете Mutt без да запишете промените?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Æåëàåòå ëè äà íàïóñíåòå mutt?"
+msgstr "Желаете ли да напуснете mutt?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "Íåóñïåøíî ïðåìàõâàíå"
+msgstr "Неуспешно премахване"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Ïðåìàõâàíå íà ñúîáùåíèÿòà îò ñúðâúðà..."
+msgstr "Премахване на съобщенията от сървъра..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà ïðî÷èò íà çàãëàâíàòà èíôîðìàöèÿ."
+msgstr "Грешка при отваряне на файла за прочит на заглавната информация."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà èçòðèâàíå íà çàãëàâíà èíôîðìàöèÿ."
+msgstr "Грешка при отваряне на файла за изтриване на заглавна информация."
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà ïðî÷èò íà çàãëàâíàòà èíôîðìàöèÿ."
+msgstr "Грешка при отваряне на файла за прочит на заглавната информация."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr ""
-"Íåïîïðàâèìà ãðåøêà! Ãðåøêà ïðè ïîâòîðíîòî îòâàðÿíå íà ïîùåíñêàòà êóòèÿ!"
+"Непоправима грешка! Грешка при повторното отваряне на пощенската кутия!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Íåïîïðàâèìà ãðåøêà. Ðàçëè÷åí áðîé íà ñúîáùåíèÿòà!"
+msgstr "Непоправима грешка. Различен брой на съобщенията!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "Ïðåìàõâàíå íà ñúîáùåíèÿòà îò ñúðâúðà..."
+msgstr "Премахване на съобщенията от сървъра..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "Èçòåãëÿíå íà ïèñìî..."
+msgstr "Изтегляне на писмо..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Èçòåãëÿíå íà ñïèñúê ñ ïèñìàòà..."
+msgstr "Изтегляне на списък с писмата..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "Èçòåãëÿíå íà ñïèñúê ñ ïèñìàòà..."
+msgstr "Изтегляне на списък с писмата..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Èçòåãëÿíå íà çàãëàâíèòå ÷àñòè... [%d/%d]"
+msgstr "Изтегляне на заглавните части... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Èçòåãëÿíå íà çàãëàâíèòå ÷àñòè... [%d/%d]"
+msgstr "Изтегляне на заглавните части... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "Èçòåãëÿíå íà ïèñìî..."
+msgstr "Изтегляне на писмо..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Ôàéëîâà ìàñêà: "
+msgstr "Файлова маска: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Ôàéëúò ñúùåñòâóâà. Ïðåçàïèñ(o), äîáàâÿíå(a) èëè îòêàç(c)?"
+msgstr "Файлът съществува. Презапис(o), добавяне(a) или отказ(c)?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Ôàéëúò å äèðåêòîðèÿ. Æåëàåòå ëè äà çàïèøåòå â íåÿ?"
+msgstr "Файлът е директория. Желаете ли да запишете в нея?"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr ""
-"Ôàéëúò å äèðåêòîðèÿ. Æåëàåòå ëè äà çàïèøåòå â íåÿ? [(y) äà, (n) íå, (a) "
-"âñè÷êè]"
+"Файлът е директория. Желаете ли да запишете в нея? [(y) да, (n) не, (a) "
+"всички]"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "Ôàéë â òàçè äèðåêòîðèÿ: "
+msgstr "Файл в тази директория: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "Ôèëòðèðàíå ïðåç: "
+msgstr "Филтриране през: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
-msgstr "Ïðúñòîâ îòïå÷àòúê: %s"
+msgstr "Пръстов отпечатък: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "çàïèñâà ïèñìîòî êàòî ÷åðíîâà çà ïî-êúñíî èçïðàùàíå"
+msgstr "записва писмото като чернова за по-късно изпращане"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "Æåëàåòå ëè äà ïðîñëåäèòå äî %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Æåëàåòå ëè äà ïðîñëåäèòå äî %s%s?"
+msgstr "Желаете ли да проследите до %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Æåëàåòå ëè äà êàïñóëèðàòå ñ MIME ïðåäè ïðåïðàùàíå?"
+msgstr "Желаете ли да капсулирате с MIME преди препращане?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "Æåëàåòå ëè äà ãî ïðåïðàòèòå êàòî ïðèëîæåíèå?"
+msgstr "Желаете ли да го препратите като приложение?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "Æåëàåòå ëè äà ãè ïðåïðàòèòå êàòî ïðèëîæåíèÿ?"
+msgstr "Желаете ли да ги препратите като приложения?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Òàçè ôóíêöèÿ íå ìîæå äà ñå èçïúëíè ïðè ïðèëàãàíå íà ïèñìà."
+msgstr "Тази функция не може да се изпълни при прилагане на писма."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "Çàïèòâàíå çà ñïèñúêà îò ïîùåíñêè êóòèè..."
+msgstr "Запитване за списъка от пощенски кутии..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "Çàïèòâàíå çà namespaces..."
+msgstr "Запитване за namespaces..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Ãðóï. îòã."
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Ïîìîù"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "Ïîìîù çà %s"
+msgstr "Помощ за %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "Ïîìîùòà âå÷å å ïîêàçàíà."
+msgstr "Помощта вече е показана."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Íåâúçìîæíî îòïå÷àòâàíå!"
+msgstr "Невъзможно отпечатване!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Íå å äåôèíèðàíà êîìàíäà çà îòïå÷àòâàíå íà %s ïðèëîæåíèÿ!"
+msgstr "Не е дефинирана команда за отпечатване на %s приложения!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "Òîçè èäåíòèôèêàòîð å ñ íåäåôèíèðàíà âàëèäíîñò."
+msgstr "Този идентификатор е с недефинирана валидност."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "Òîçè èäåíòèôèêàòîð å îñòàðÿë, äåàêòèâèðàí èëè àíóëèðàí."
+msgstr "Този идентификатор е остарял, деактивиран или анулиран."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "Òîçè èäåíòèôèêàòîð íå íå å âàëèäåí."
+msgstr "Този идентификатор не не е валиден."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "Òîçè èäåíòèôèêàòîð å ñ îãðàíè÷åíà âàëèäíîñò."
+msgstr "Този идентификатор е с ограничена валидност."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Íåâàëèäíà PGP çàãëàâíà ÷àñò"
+msgstr "Невалидна PGP заглавна част"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "Íåâàëèäíà S/MIME çàãëàâíà ÷àñò"
+msgstr "Невалидна S/MIME заглавна част"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Íåâàëèäíî ôîðìàòèðàíî âïèñâàíå çà òèïà %s â \"%s\" íà ðåä %d"
+msgstr "Невалидно форматирано вписване за типа %s в \"%s\" на ред %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Æåëàåòå ëè äà ïðèêà÷èòå ïèñìîòî êúì îòãîâîðà?"
+msgstr "Желаете ли да прикачите писмото към отговора?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "Ïðèêà÷âàíå íà öèòèðàíî ïèñìî..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "Âìúêâàíå"
+msgstr "Прикачване на цитирано писмо..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Íåâàëèäåí äåí îò ìåñåöà: %s"
+msgstr "Невалиден ден от месеца: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Èçáðàíî å íåâàëèäíî êîäèðàíå."
+msgstr "Избрано е невалидно кодиране."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Íåâàëèäåí íîìåð íà èíäåêñ."
+msgstr "Невалиден номер на индекс."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Ãðåøåí íîìåð íà ïèñìî."
+msgstr "Грешен номер на писмо."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Íåâàëèäåí ìåñåö: %s"
+msgstr "Невалиден месец: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "Íåâàëèäíà äàòà: %s"
+msgstr "Невалидна дата: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "Ñòàðòèðàíå íà PGP..."
+msgstr "Стартиране на PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "Ñòàðòèðàíå íà PGP..."
+msgstr "Стартиране на PGP..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Àâòîìàòè÷íî ïîêàçâàíå ïîñðåäñòâîì: %s"
+msgstr "Автоматично показване посредством: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Ñêîê êúì ïèñìî íîìåð: "
+msgstr "Скок към писмо номер: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Ñêîê êúì: "
+msgstr "Скок към: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Ñêîêîâåòå íå ñà èìïëåìåíòèðàíè çà äèàëîçè."
+msgstr "Скоковете не са имплементирани за диалози."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "Êëþ÷îâ èäåíòèôèêàòîð: 0x%s"
+msgstr "Ключов идентификатор: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Íåäåôèíèðàíà êëàâèøíà êîìáèíàöèÿ."
+msgstr "Недефинирана клавишна комбинация."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Íåäåôèíèðàíà êëàâèøíà êîìáèíàöèÿ. Èçïîëçâàéòå '%s' çà ïîìîù."
+msgstr "Недефинирана клавишна комбинация. Използвайте '%s' за помощ."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Îãðàíè÷àâàíå äî ïèñìàòà, îòãîâàðÿùè íà: "
+msgstr "Ограничаване до писмата, отговарящи на: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "Îãðàíè÷àâàíå: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Ограничаване: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "Âêëþ÷âàíå..."
+msgstr "Включване..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1734,750 +1650,672 @@ msgstr ""
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr ""
-"Ïðåìèíàò å äîïóñòèìèÿò áðîé çàêëþ÷âàíèÿ. Æåëàåòå ëè äà ïðåìàõíåòå "
-"çàêëþ÷âàíåòî çà %s?"
+"Преминат е допустимият брой заключвания. Желаете ли да премахнете "
+"заключването за %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "Âêëþ÷âàíå..."
+msgstr "Включване..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "Íåóñïåøíî âêëþ÷âàíå."
+msgstr "Неуспешно включване."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Òúðñåíå íà êëþ÷îâå, îòãîâàðÿùè íà \"%s\"..."
+msgstr "Търсене на ключове, отговарящи на \"%s\"..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "Òúðñåíå íà %s..."
+msgstr "Търсене на %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "Ïðúñòîâ îòïå÷àòúê: %s"
+msgstr "Пръстов отпечатък: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "Íåäåôèíèðàí MIME òèï. Ïðèëîæåíèåòî íå ìîæå äà áúäå ïîêàçàíî."
+msgstr "Недефиниран MIME тип. Приложението не може да бъде показано."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Îòêðèò å öèêúë îò ìàêðîñè."
+msgstr "Открит е цикъл от макроси."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Íîâî"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "Ïèñìîòî íå å èçïðàòåíî."
+msgstr "Писмото не е изпратено."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "Ïèñìîòî å èçïðàòåío."
+msgstr "Писмото е изпратенo."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "Ïîùåíñêàòà êóòèÿ å îòáåëÿçàíà."
+msgstr "Пощенската кутия е отбелязана."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Ïîùåíñêàòà êóòèÿ å çàòâîðåíà."
+msgstr "Пощенската кутия е затворена."
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Ïîùåíñêàòà êóòèÿ å ñúçäàäåíà."
+msgstr "Пощенската кутия е създадена."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Ïîùåíñêàòà êóòèÿ å èçòðèòà."
+msgstr "Пощенската кутия е изтрита."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "Ïîùåíñêàòà êóòèÿ å ïðàçíà."
+msgstr "Пощенската кутия е празна."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "Ïîùåíñêàòà êóòèÿ å ñàìî çà ÷åòåíå. %s"
+msgstr "Пощенската кутия е само за четене. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "Òàçè ïîùåíñêà êóòèÿ å ñàìî çà ÷åòåíå."
+msgstr "Тази пощенска кутия е само за четене."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Ïîùåíñêàòà êóòèÿ å íåïðîìåíåíà."
+msgstr "Пощенската кутия е непроменена."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "Ïîùåíñêàòà êóòèÿ òðÿáâà äà èìà èìå."
+msgstr "Пощенската кутия трябва да има име."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Ïîùåíñêàòà êóòèÿ íå å èçòðèòà."
+msgstr "Пощенската кутия не е изтрита."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Ïîùåíñêàòà êóòèÿ å ñúçäàäåíà."
+msgstr "Пощенската кутия е създадена."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Ïîùåíñêàòà êóòèÿ å ïîâðåäåíà!"
+msgstr "Пощенската кутия е повредена!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Ïîùåíñêàòà êóòèÿ å ïðîìåíåíà îò äðóãà ïðîãðàìà."
+msgstr "Пощенската кутия е променена от друга програма."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
-"Ïîùåíñêàòà êóòèÿ å ïðîìåíåíà îò äðóãà ïðîãðàìà. Ìàðêèðîâêèòå ìîæå äà ñà "
-"îñòàðåëè."
+"Пощенската кутия е променена от друга програма. Маркировките може да са "
+"остарели."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Ïîùåíñêè êóòèè [%d]"
+msgstr "Пощенски кутии [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Çàïèñúò \"edit\" â mailcap èçèñêâà %%s"
+msgstr "Записът \"edit\" в mailcap изисква %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Çàïèñúò \"compose\" â mailcap èçèñêâà %%s"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Ñúçäàâàíå íà ïñåâäîíèì"
+msgstr "Записът \"compose\" в mailcap изисква %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Ìàðêèðàíå íà %d ñúîáùåíèÿ çà èçòðèâàíå..."
+msgstr "Маркиране на %d съобщения за изтриване..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Ìàñêà"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Ïèñìîòî å ïðåïðàòåíî."
+msgstr "Писмото е препратено."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "Ïèñìîòî íå å îòïå÷àòàíî"
+msgstr "Писмото не е отпечатано"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "Ôàéëúò ñ ïèñìîòî å ïðàçåí!"
+msgstr "Файлът с писмото е празен!"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "Ïèñìîòî íå å ïðåïðàòåíî."
+msgstr "Писмото не е препратено."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Ïèñìîòî å íåïðîìåíåíî!"
+msgstr "Писмото е непроменено!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Ðîäèòåëñêîòî ïèñìî íå å âèäèìî â òîçè îãðàíè÷åí èçãëåä"
+msgstr "РодиÑ\82елÑ\81коÑ\82о пиÑ\81мо не е видимо в Ñ\82ози огÑ\80аниÑ\87ен изглед"
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Ïèñìîòî å çàïèñàíî êàòî ÷åðíîâà."
+msgstr "Писмото е записано като чернова."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "Ïèñìîòî å îòïå÷àòàíî"
+msgstr "Писмото е отпечатано"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "Ïèñìîòî å çàïèñàíî."
+msgstr "Писмото е записано."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Ïèñìàòà ñà ïðåïðàòåíè."
+msgstr "Писмата са препратени."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "Ïèñìàòà íå ñà îòïå÷àòàíè"
+msgstr "Писмата не са отпечатани"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "Ïèñìàòà íå ñà ïðåïðàòåíè."
+msgstr "Писмата не са препратени."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Ïèñìàòà ñà îòïå÷àòàíè"
+msgstr "Писмата са отпечатани"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Ëèïñâàùè àðãóìåíòè."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "mixmaster âåðèãèòå ñà îãðàíè÷åíè äî %d åëåìåíòà."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "mixmaster íå ïðèåìà Cc èëè Bcc çàãëàâíè ïîëåòà."
+msgstr "Липсващи аргументи."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Æåëàåòå ëè äà ïðåìåñòèòå ïðî÷åòåíèòå ïèñìà â %s?"
+msgstr "Желаете ли да преместите прочетените писма в %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Ïðåìåñòâàíå íà ïðî÷åòåíèòå ïèñìà â %s..."
+msgstr "Преместване на прочетените писма в %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Íîâî çàïèòâàíå"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "Íîâî èìå çà ôàéëà: "
+msgstr "Ново име за файла: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "Íîâ ôàéë: "
+msgstr "Нов файл: "
 
 #: buffy.cpkg:330
 msgid "New mail in "
-msgstr "Íîâè ïèñìà â "
+msgstr "Нови писма в "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Íîâè ïèñìà â òàçè ïîùåíñêà êóòèÿ."
+msgstr "Нови писма в тази пощенска кутия."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Ñëåäâàùî"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "Ñëåäâ. ñòð."
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "Íÿìà íàëè÷íè èäåíòèôèêàòîðè."
+msgstr "Няма налични идентификатори."
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Íå å íàìåðåí \"boundary\" ïàðàìåòúð! [ìîëÿ, ñúîáùåòå çà òàçè ãðåøêà]"
+msgstr "Не е намерен \"boundary\" параметър! [моля, съобщете за тази грешка]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "Íÿìà âïèñâàíèÿ."
+msgstr "Няма вписвания."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "Íÿìà ôàéëîâå, îòãîâàðÿùè íà ìàñêàòà"
+msgstr "Няма файлове, отговарящи на маската"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Íå ñà äåôèíèðàíè âõîäíè ïîùåíñêè êóòèè."
+msgstr "Не са дефинирани входни пощенски кутии."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Íÿìà àêòèâåí îãðàíè÷èòåëåí øàáëîí."
+msgstr "Няма активен ограничителен шаблон."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Íÿìà îòâîðåíà ïîùåíñêà êóòèÿ."
+msgstr "Няма отворена пощенска кутия."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Íÿìà ïîùåíñêà êóòèÿ ñ íîâè ïèñìà."
+msgstr "Няма пощенска кутия с нови писма."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "Â mailcap ëèïñâà çàïèñ \"compose\" çà %s. Ñúçäàâàíå íà ïðàçåí ôàéë."
+msgstr "В mailcap липсва запис \"compose\" за %s. Създаване на празен файл."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "Â mailcap ëèïñâà çàïèñ \"edit\" çà %s"
+msgstr "В mailcap липсва запис \"edit\" за %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "Íÿìà mailing list-îâå!"
+msgstr "Няма mailing list-ове!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr ""
-"Íå å íàìåðåíî ïîäõîäÿùî mailcap âïèñâàíå. Ïðèëîæåíèåòî å ïîêàçàíî êàòî òåêñò."
+"Не е намерено подходящо mailcap вписване. Приложението е показано като текст."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Â òàçè êóòèÿ íÿìà ïèñìà."
+msgstr "В тази кутия няма писма."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "Íÿìà ïèñìà, îòãîâàðÿùè íà òîçè êðèòåðèé."
+msgstr "Няма писма, отговарящи на този критерий."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "Íÿìà ïîâå÷å öèòèðàí òåêñò."
+msgstr "Няма повече цитиран текст."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Íÿìà ïîâå÷å íèøêè."
+msgstr "Няма повече нишки."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Íÿìà ïîâå÷å íåöèòèðàí òåêñò ñëåä öèòèðàíèÿ."
+msgstr "Няма повече нецитиран текст след цитирания."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Íÿìà íîâè ïèñìà â òàçè POP ïîùåíñêà êóòèÿ."
+msgstr "Няма нови писма в тази POP пощенска кутия."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "Íÿìà íîâè ïèñìà."
+msgstr "Няма нови писма."
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Ëèïñâà òåìà."
+msgstr "Липсва тема."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "Íÿìà ôàéëîâå, îòãîâàðÿùè íà ìàñêàòà"
+msgstr "Няма файлове, отговарящи на маската"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Íÿìà ïîùåíñêà êóòèÿ ñ íîâè ïèñìà."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "Íÿìà çàïàçåíè ÷åðíîâè."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Íÿìà ïîùåíñêà êóòèÿ ñ íîâè ïèñìà."
+msgstr "Няма запазени чернови."
 
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Íå å äåôèíèðàíà êîìàíäà çà îòïå÷àòâàíå"
+msgstr "Не е дефинирана команда за отпечатване"
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Íå ñà óêàçàíè ïîëó÷àòåëè!"
+msgstr "Не са указани получатели!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Íå ñà óêàçàíè ïîëó÷àòåëè.\n"
+msgstr "Не са указани получатели.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Íå ñà óêàçàíè ïîëó÷àòåëè."
+msgstr "Не са указани получатели."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Íå å äåôèíèðàí øàáëîí çà òúðñåíå."
+msgstr "Не е дефиниран шаблон за търсене."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Ëèïñâà òåìà."
+msgstr "Липсва тема."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Ëèïñâà òåìà íà ïèñìîòî. Æåëàåòå ëè äà ïðåêúñíåòå èçïðàùàíåòî?"
+msgstr "Липсва тема на писмото. Желаете ли да прекъснете изпращането?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Ïèñìîòî íÿìà òåìà, æåëàåòå ëè äà ïðåêúñíåòå èçïðàùàíåòî?"
+msgstr "Писмото няма тема, желаете ли да прекъснете изпращането?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "Ïðåêúñâàíå ïîðàäè ëèïñà íà òåìà."
+msgstr "Прекъсване поради липса на тема."
 
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "Íÿìà òàêàâà ïàïêà"
+msgstr "Няма такава папка"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "Íÿìà ìàðêèðàíè çàïèñè."
+msgstr "Няма маркирани записи."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Íèêîå îò ìàðêèðàíèòå ïèñìà íå å âèäèìî!"
+msgstr "Никое от маркираните писма не е видимо!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Íÿìà ìàðêèðàíè ïèñìà."
+msgstr "Няма маркирани писма."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Íÿìà âúçñòàíîâåíè ïèñìà."
+msgstr "Няма възстановени писма."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Íÿìà íåïðî÷åòåíè ïèñìà"
+msgstr "Няма непрочетени писма"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "Íÿìà âèäèìè ïèñìà."
+msgstr "Няма видими писма."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Ôóíêöèÿòà íå å äîñòúïíà îò òîâà ìåíþ."
+msgstr "Функцията не е достъпна от това меню."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "Íÿìà ðåçóëòàòè îò òúðñåíåòî."
+msgstr "Няма резултати от търсенето."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
-msgstr "Íÿìà êàêâî äà ñå ïðàâè."
-
-#: remailer.c:435
-msgid "OK"
-msgstr "ÎÊ"
+msgstr "Няма какво да се прави."
 
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Ïîääúðæà ñå ñàìî èçòðèâàíå íà ïðèëîæåíèÿ îò ñúñòàâíè ïèñìà."
+msgstr "Поддържа се само изтриване на приложения от съставни писма."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Îòâàðÿíå íà ïîùåíñêà êóòèÿ"
+msgstr "Отваряне на пощенска кутия"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Îòâàðÿíå íà ïîùåíñêàòà êóòèÿ ñàìî çà ÷åòåíå"
+msgstr "Отваряне на пощенската кутия само за четене"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Îòâàðÿíå íà ïîùåíñêà êóòèÿ, îò êîÿòî äà áúäå ïðèëîæåíî ïèñìî"
+msgstr "Отваряне на пощенска кутия, от която да бъде приложено писмо"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Îòâàðÿíå íà ïîùåíñêàòà êóòèÿ ñàìî çà ÷åòåíå"
+msgstr "Отваряне на пощенската кутия само за четене"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Îòâàðÿíå íà ïîùåíñêà êóòèÿ, îò êîÿòî äà áúäå ïðèëîæåíî ïèñìî"
+msgstr "Отваряне на пощенска кутия, от която да бъде приложено писмо"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Èçïðàùàù ïðîöåñ:"
+msgstr "Изпращащ процес:"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
-"PGP øèôðîâàíå(e), ïîäïèñ(s), ïîäïèñ êàòî(a), è äâåòå(b) èëè áåç òÿõ(f)?"
+"PGP шифроване(e), подпис(s), подпис като(a), и двете(b) или без тях(f)?"
 
-#: compose.c:1228
+#: compose.c:1158
 #, fuzzy
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP-øèôðîâàíå âå÷å å èçáðàíî. Clear & continue? "
+msgstr "PGP-шифроване вече е избрано. Clear & continue? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP êëþ÷îâå, ñúâïàäàùè ñ <%s>."
+msgstr "PGP ключове, съвпадащи с <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "PGP êëþ÷îâå, ñúâïàäàùè ñ <%s>."
+msgstr "PGP ключове, съвпадащи с <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP-ïîäïèñúò ÍÅ å ïîòâúðäåí óñïåøíî."
+msgstr "PGP-подписът НЕ е потвърден успешно."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP-ïîäïèñúò å ïîòâúðäåí óñïåøíî."
+msgstr "PGP-подписът е потвърден успешно."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "POP õîñòúò íå å äåôèíèðàí."
+msgstr "POP хостът не е дефиниран."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Ðîäèòåëñêîòî ïèñìî íå å íàëè÷íî."
+msgstr "РодиÑ\82елÑ\81коÑ\82о пиÑ\81мо не е налиÑ\87но."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Ðîäèòåëñêîòî ïèñìî íå å âèäèìî â òîçè îãðàíè÷åí èçãëåä"
+msgstr "РодиÑ\82елÑ\81коÑ\82о пиÑ\81мо не е видимо в Ñ\82ози огÑ\80аниÑ\87ен изглед"
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "Ïàðîëà çà %s@%s: "
+msgstr "Парола за %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "Èìå:"
-
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Pipe"
+msgstr "Име:"
 
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Èçïðàùàíå êúì êîìàíäà (pipe): "
+msgstr "Изпращане към команда (pipe): "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Ïðåäàâàíå íà (pipe): "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Ìîëÿ, ïîñòàâåòå âàëèäíà ñòîéíîñò â ïðîìåíëèâàòà \"hostname\" êîãàòî "
-"èçïîëçâàòå mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "Предаване на (pipe): "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Æåëàåòå ëè äà çàïèøåòå ÷åðíîâàòà?"
+msgstr "Желаете ли да запишете черновата?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "×åðíîâè"
+msgstr "Чернови"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "Ãðåøêà ïðè èçïúëíåíèå íà êîìàíäàòà \"preconnect\""
+msgstr "Грешка при изпълнение на командата \"preconnect\""
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Ïîäãîòîâêà çà ïðåïðàùàíå..."
+msgstr "Подготовка за препращане..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Íàòèñíåòå íÿêîé êëàâèø..."
+msgstr "Натиснете някой клавиш..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "Ïðåä. ñòð."
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Îòïå÷àòâàíå"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Æåëàåòå ëè äà îòïå÷àòàòå ïðèëîæåíèåòî?"
+msgstr "Желаете ли да отпечатате приложението?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "Æåëàåòå ëè äà îòïå÷àòàòå ïèñìîòî?"
+msgstr "Желаете ли да отпечатате писмото?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Æåëàåòå ëè äà îòïå÷àòàòå ìàðêèðàíèòå ïðèëîæåíèÿ?"
+msgstr "Желаете ли да отпечатате маркираните приложения?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Æåëàåòå ëè äà îòïå÷àòàòå ìàðêèðàíèòå ïèñìà?"
+msgstr "Желаете ли да отпечатате маркираните писма?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Æåëàåòå ëè äà èçòðèåòå %d-òî îòáåëÿçàíî çà èçòðèâàíå ïèñìî?"
+msgstr "Желаете ли да изтриете %d-то отбелязано за изтриване писмо?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Æåëàåòå ëè äà èçòðèåòå  %d îòáåëÿçàíè çà èçòðèâàíå ïèñìà?"
+msgstr "Желаете ли да изтриете  %d отбелязани за изтриване писма?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Çàïèòâàíå"
+msgstr "Запитване"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "Çàïèòâàíå '%s'"
+msgstr "Запитване '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Êîìàíäà çà çàïèòâàíå íå å äåôèíèðàíà."
+msgstr "Команда за запитване не е дефинирана."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Çàïèòâàíå: "
+msgstr "Запитване: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Èçõîä"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Æåëàåòå ëè äà íàïóñíåòå mutt?"
+msgstr "Желаете ли да напуснете mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "Çàïèòâàíå çà namespaces..."
+msgstr "Запитване за namespaces..."
 
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "Çàðåæäàíå íà %s..."
+msgstr "Зареждане на %s..."
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "Çàðåæäàíå íà %s... %d"
+msgstr "Зареждане на %s... %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "Çàðåæäàíå íà %s... %d (%d%%)"
+msgstr "Зареждане на %s... %d (%d%%)"
 
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "Çàðåæäàíå íà íîâèòå ïèñìà (%d áàéòà)..."
+msgstr "Зареждане на новите писма (%d байта)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Äåéñòâèòåëíî ëè æåëàåòå äà èçòðèåòå ïîùåíñêàòà êóòèÿ \"%s\"?"
+msgstr "Действително ли желаете да изтриете пощенската кутия \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Æåëàåòå ëè äà ðåäàêòèðàòå ÷åðíîâà?"
+msgstr "Желаете ли да редактирате чернова?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Ïðîìÿíàòà íà êîäèðàíåòî çàñÿãà ñàìî òåêñòîâèòå ïðèëîæåíèÿ."
+msgstr "Промяната на кодирането засяга само текстовите приложения."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
-msgstr "Íåóñïåøåí SSL: %s"
+msgstr "Неуспешен SSL: %s"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Ñàìî IMAP ïîùåíñêè êóòèè ìîãàò äà áúäàò ñúçäàâàíè"
+msgstr "Само IMAP пощенски кутии могат да бъдат създавани"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Ñúçäàâàíå íà ïîùåíñêà êóòèÿ: "
+msgstr "Създаване на пощенска кутия: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "Ïðåèìåíóâàíå â: "
+msgstr "Преименуване в: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Ïîâòîðíî îòâàðÿíå íà ïîùåíñêàòà êóòèÿ..."
-
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Îòãîâîð"
+msgstr "Повторно отваряне на пощенската кутия..."
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "Æåëàåòå ëè äà îòãîâîðèòå íà %s%s?"
+msgstr "Желаете ли да отговорите на %s%s?"
 
 #: commands.c:403
 #, fuzzy
@@ -2485,198 +2323,174 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Îáðàòíî ïîäðåæäàíå ïî: äàòà íà èçïðàùàíå(d)/îò(f)/äàòà íà ïîëó÷àâàíå(r)/òåìà"
-"(s)/ïîëó÷àòåë(o)/íèøêà(t)/áåç ïîäðåæäàíå(u)/ðàçìåð(z)/âàæíîñò(c)?: "
+"Обратно подреждане по: дата на изпращане(d)/от(f)/дата на получаване(r)/тема"
+"(s)/получател(o)/нишка(t)/без подреждане(u)/размер(z)/важност(c)?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Îáðàòíî òúðñåíå: "
+msgstr "Обратно търсене: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Îáðàòíî òúðñåíå: "
+msgstr "Обратно търсене: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
-"Îáðàòíî ïîäðåæäàíå ïî äàòà(d), àçáó÷åí ðåä(a), ðàçìåð(z) èëè áåç ïîäðåæäàíå"
+"Обратно подреждане по дата(d), азбучен ред(a), размер(z) или без подреждане"
 "(n)?"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
-"PGP øèôðîâàíå(e), ïîäïèñ(s), ïîäïèñ êàòî(a), è äâåòå(b) èëè áåç òÿõ(f)?"
+"PGP шифроване(e), подпис(s), подпис като(a), и двете(b) или без тях(f)?"
 
-#: compose.c:1214
+#: compose.c:1144
 #, fuzzy
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME-øèôðîâàíå âå÷å å èçáðàíî. Clear & continue? "
+msgstr "S/MIME-шифроване вече е избрано. Clear & continue? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "Ïðèòåæàòåëÿò íà S/MIME ñåðòèôèêàòà íå ñúâïàäà ñ ïîäàòåëÿ íà ïèñìîòî."
+msgstr "Притежателят на S/MIME сертификата не съвпада с подателя на писмото."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
-msgstr "S/MIME ñåðòèôèêàòè, ñúâïàäàùè ñ \"%s\"."
+msgstr "S/MIME сертификати, съвпадащи с \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "S/MIME ïèñìà áåç óêàçàíèå çà ñúäúðæàíèåòî èì íå ñå ïîääúðæàò."
+msgstr "S/MIME писма без указание за съдържанието им не се поддържат."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME-ïîäïèñúò ÍÅ å ïîòâúðäåí óñïåøíî."
+msgstr "S/MIME-подписът НЕ е потвърден успешно."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "S/MIME-ïîäïèñúò å ïîòâúðäåí óñïåøíî."
+msgstr "S/MIME-подписът е потвърден успешно."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "Íåóñïåøíà SASL èäåíòèôèêàöèÿ."
+msgstr "Неуспешна SASL идентификация."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "Ïðúñòîâ îòïå÷àòúê: %s"
+msgstr "Пръстов отпечатък: %s"
 
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "SSL âðúçêà, èçïîëçâàùà %s (%s)"
+msgstr "SSL връзка, използваща %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Çàïèñ"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "Æåëàåòå ëè äà çàïàçèòå êîïèå îò òîâà ïèñìî?"
+msgstr "Желаете ли да запазите копие от това писмо?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "Çàïèñ âúâ ôàéë:"
+msgstr "Запис във файл:"
 
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "Çàïèñ íà%s â ïîùåíñêà êóòèÿ"
+msgstr "Запис на%s в пощенска кутия"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "Çàïèñ íà ìàðêèðîâêèòå íà ïèñìîòî... [%d/%d]"
+msgstr "Запис на маркировките на писмото... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "Çàïèñâàíå..."
-
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Òúðñåíå"
+msgstr "Записване..."
 
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "Òúðñåíå: "
+msgstr "Търсене: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Òúðñåíåòî äîñòèãíà äî êðàÿ, áåç äà áúäå íàìåðåíî ñúâïàäåíèå"
+msgstr "Търсенето достигна до края, без да бъде намерено съвпадение"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Òúðñåíåòî äîñòèãíà äî íà÷àëîòî, áåç äà áúäå íàìåðåíî ñúâïàäåíèå"
+msgstr "Търсенето достигна до началото, без да бъде намерено съвпадение"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Òúðñåíåòî å ïðåêúñíàòî."
+msgstr "Търсенето е прекъснато."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Çà òîâà ìåíþ íå å èìïëåìåíòèðàíî òúðñåíå."
+msgstr "За това меню не е имплементирано търсене."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Òúðñåíåòî å çàïî÷íàòî îòäîëó."
+msgstr "Търсенето е започнато отдолу."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Òúðñåíåòî å çàïî÷íàòî îòãîðå."
+msgstr "Търсенето е започнато отгоре."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "Òúðñåíå: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Èçáîð"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Èçáîð "
+msgstr "Търсене: "
 
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Èçáîð íà remailer âåðèãà."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "Èçáèðàíå íà %s..."
-
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Èçïðàùàíå"
+msgstr "Избиране на %s..."
 
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "Èçïðàùàíå íà çàäåí ôîí."
+msgstr "Изпращане на заден фон."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "Èçïðàùàíå íà ïèñìîòî..."
+msgstr "Изпращане на писмото..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Ñúðâúðúò çàòâîðè âðúçêàòà!"
+msgstr "Сървърът затвори връзката!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Ïîñòàâÿíå íà ìàðêèðîâêà"
+msgstr "Поставяне на маркировка"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "Øåë êîìàíäà: "
+msgstr "Шел команда: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "Ïîäïèñ"
+msgstr "Подпис"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "Ïîäïèñ êàòî: "
+msgstr "Подпис като: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Ïîäïèñ, Øèôðîâàíå"
+msgstr "Подпис, Шифроване"
 
 #: commands.c:406
 #, fuzzy
@@ -2684,175 +2498,171 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Ïîäðåæäàíå ïî: äàòà íà èçïðàùàíå(d)/îò(f)/äàòà íà ïîëó÷àâàíå(r)/òåìà(s)/"
-"ïîëó÷àòåë(o)/íèøêà(t)/áåç ïîäðåæäàíå(u)/ðàçìåð(z)/âàæíîñò(c)?: "
+"Подреждане по: дата на изпращане(d)/от(f)/дата на получаване(r)/тема(s)/"
+"получател(o)/нишка(t)/без подреждане(u)/размер(z)/важност(c)?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
-"Ïîäðåæäàíå ïî äàòà(d), àçáó÷åí ðåä(a), ðàçìåð(z) èëè áåç ïîäðåæäàíå(n)?"
+"Подреждане по дата(d), азбучен ред(a), размер(z) или без подреждане(n)?"
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Ïîäðåæäàíå íà ïîùåíñêàòà êóòèÿ..."
+msgstr "Подреждане на пощенската кутия..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "Êëþ÷îâ èäåíòèôèêàòîð: 0x%s"
+msgstr "Ключов идентификатор: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Àáîíèðàí [%s], Ôàéëîâà ìàñêà: %s"
+msgstr "Абониран [%s], Файлова маска: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "Àáîíèðàíå çà %s..."
+msgstr "Абониране за %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "Ïðîâåðêà íà SSL ñåðòèôèêàò"
+msgstr "Проверка на SSL сертификат"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Ìàðêèðàíå íà ïèñìàòà, îòãîâàðÿùè íà: "
+msgstr "Маркиране на писмата, отговарящи на: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Ìàðêèðàéòå ïèñìàòà, êîèòî èñêàòå äà ïðèëîæèòå!"
+msgstr "Маркирайте писмата, които искате да приложите!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Ìàðêèðàíåòî íå ñå ïîääúðæà."
+msgstr "Маркирането не се поддържа."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Òîâà ïèñìî íå å âèäèìî."
+msgstr "Това писмо не е видимо."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL íå å íà ðàçïîëîæåíèå."
+msgstr "SSL не е на разположение."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "Òîâà ïðèëîæåíèå ùå áúäå ïðåêîäèðàíî."
+msgstr "Това приложение ще бъде прекодирано."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "Òîâà ïðèëîæåíèå íÿìà äà áúäå ïðåêîäèðàíî."
+msgstr "Това приложение няма да бъде прекодирано."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
-"Íåâàëèäåí èíäåêñ íà ïèñìî. Îïèòàéòå äà îòâîðèòå îòíîâî ïîùåíñêàòà êóòèÿ."
+"Невалиден индекс на писмо. Опитайте да отворите отново пощенската кутия."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "remailer âåðèãàòà âå÷å å ïðàçíà."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "Íÿìà ïðèëîæåíèÿ."
+msgstr "Няма приложения."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "Íÿìà ïèñìà."
+msgstr "Няма писма."
 
-#: recvattach.c:918
+#: recvattach.c:906
 #, fuzzy
 msgid "There are no subparts to show!"
-msgstr "Íÿìà ïîä÷àñòè, êîèòî äà áúäàò ïîêàçàíè!."
+msgstr "Няма подчасти, които да бъдат показани!."
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Òîçè IMAP-ñúðâúð å îñòàðÿë. Mutt íÿìà äà ðàáîòè ñ íåãî."
+msgstr "Този IMAP-сървър е остарял. Mutt няма да работи с него."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Òîçè ñåðòèôèêàò ïðèíàäëåæè íà:"
+msgstr "Този сертификат принадлежи на:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Òîçè ñåðòèôèêàò å âàëèäåí"
+msgstr "Този сертификат е валиден"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Òîçè ñåðòèôèêàò å èçäàäåí îò:"
+msgstr "Този сертификат е издаден от:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr ""
-"Òîçè êëþ÷ íå ìîæå äà áúäå èçïîëçâàí, çàùîòî å îñòàðÿë, äåàêòèâèðàí èëè "
-"àíóëèðàí."
+"Този ключ не може да бъде използван, защото е остарял, деактивиран или "
+"анулиран."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Íèøêàòà ñúäúðæà íåïðî÷åòåíè ïèñìà."
+msgstr "Нишката съдържа непрочетени писма."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Ïîêàçâàíåòî íà íèøêè íå å âêëþ÷åíî."
+msgstr "Показването на нишки не е включено."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "fcntl çàêëþ÷âàíå íå å ïîëó÷åíî â îïðåäåëåíîòî âðåìå (timeout)!"
+msgstr "fcntl заключване не е получено в определеното време (timeout)!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "flock çàêëþ÷âàíå íå å ïîëó÷åíî â îïðåäåëåíîòî âðåìå (timeout)!"
+msgstr "flock заключване не е получено в определеното време (timeout)!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Òîâà å íà÷àëîòî íà ïèñìîòî."
+msgstr "Това е началото на писмото."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "Îïèò çà èçâëè÷àíå íà PGP êëþ÷îâå...\n"
+msgstr "Опит за извличане на PGP ключове...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "Îïèò çà èçâëè÷àíå íà S/MIME ñåðòèôèêàòè...\n"
+msgstr "Опит за извличане на S/MIME сертификати...\n"
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "Ãðåøêà â êîìóíèêàöèÿòà ñ %s (%s)"
+msgstr "Грешка в комуникацията с %s (%s)"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2862,141 +2672,124 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "Íåóñïåøíà SASL èäåíòèôèêàöèÿ."
+msgstr "Неуспешна SASL идентификация."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "Ïðèëàãàíåòî íà %s å íåâúçìîæíî!"
+msgstr "Прилагането на %s е невъзможно!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "Ïðèëàãàíåòî å íåâúçìîæíî!"
+msgstr "Прилагането е невъзможно!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
-"Ãðåøêà ïðè ïîëó÷àâàíå íà çàãëàâíèòå ÷àñòè îò òàçè âåðñèÿ íà IMAP-ñúðâúðà."
+"Грешка при получаване на заглавните части от тази версия на IMAP-сървъра."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "Îò ñúðâúðà íå ìîæå äà áúäå ïîëó÷åí ñåðòèôèêàò"
+msgstr "От сървъра не може да бъде получен сертификат"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Îñòàâÿíåòî íà ïèñìàòà íà ñúðâúðà å íåâúçìîæíî."
+msgstr "Оставянето на писмата на сървъра е невъзможно."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "Ïðèëàãàíåòî íà %s å íåâúçìîæíî!"
+msgstr "Прилагането на %s е невъзможно!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Ãðåøêà ïðè çàêëþ÷âàíå íà ïîùåíñêàòà êóòèÿ!"
+msgstr "Грешка при заключване на пощенската кутия!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà âðåìåííèÿ ôàéë!"
+msgstr "Грешка при отваряне на временния файл!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà âðåìåííèÿ ôàéë!"
+msgstr "Грешка при отваряне на временния файл!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Ãðåøêà ïðè îòâàðÿíå íà âðåìåííèÿ ôàéë!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Âúçñò."
+msgstr "Грешка при отваряне на временния файл!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Âúçñòàíîâÿâàíå íà ïèñìàòà, îòãîâàðÿùè íà: "
+msgstr "Възстановяване на писмата, отговарящи на: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "Âúçñò."
+msgstr "Възст."
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "Íåïîçíàò Content-Type %s"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Îòïèñâàíå îò %s..."
+msgstr "Непознат Content-Type %s"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "Îòïèñâàíå îò %s..."
+msgstr "Отписване от %s..."
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "Îòïèñâàíå îò %s..."
+msgstr "Отписване от %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Ïðåìàõâàíå íà ìàðêèðîâêàòà îò ïèñìàòà, îòãîâàðÿùè íà: "
+msgstr "Премахване на маркировката от писмата, отговарящи на: "
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "Çàðåæäàíå íà ïèñìî íà ñúðâúðà ..."
+msgstr "Зареждане на писмо на сървъра ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "Èçïîëçâàéòå 'toggle-write' çà ðåàêòèâèðàíå íà ðåæèìà çà çàïèñ!"
+msgstr "Използвайте 'toggle-write' за реактивиране на режима за запис!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Æåëàåòå ëè èçïîëçâàòå êëþ÷îâèÿ èäåíòèôèêàòîð \"%s\" çà %s?"
+msgstr "Желаете ли използвате ключовия идентификатор \"%s\" за %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "Ïîòðåáèòåëñêî èìå íà %s: "
+msgstr "Потребителско име на %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Íåâàëèäåí ìåñåö: %s"
+msgstr "Невалиден месец: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Íåâàëèäåí ìåñåö: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Невалиден месец: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Æåëàåòå ëè äà ïîòâúðäèòå èñòèííîñòòà íà PGP-ïîäïèñà?"
+msgstr "Желаете ли да потвърдите истинността на PGP-подписа?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Ïîòâúðæäàâàíå èíäåêñèòå íà ïèñìàòà..."
+msgstr "Потвърждаване индексите на писмата..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Ïðèëîæåíèÿ"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ! Íà ïúò ñòå äà ïðåçàïèøåòå %s, íàèñòèíà ëè?"
+msgstr "ПРЕДУПРЕЖДЕНИЕ! На път сте да презапишете %s, наистина ли?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -3004,29 +2797,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "Ñåðòèôèêàòúò íà ñúðâúðà å èçòåêúë"
+msgstr "Сертификатът на сървъра е изтекъл"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "Ñåðòèôèêàòúò íà ñúðâúðà å èçòåêúë"
+msgstr "Сертификатът на сървъра е изтекъл"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "Ñåðòèôèêàòúò íà ñúðâúðà âñå îùå íå å âàëèäåí"
+msgstr "Сертификатът на сървъра все още не е валиден"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "Ñåðòèôèêàòúò íà ñúðâúðà âñå îùå íå å âàëèäåí"
+msgstr "Сертификатът на сървъра все още не е валиден"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3041,35 +2834,35 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "×àêàíå çà fcntl çàêëþ÷âàíå... %d"
+msgstr "Чакане за fcntl заключване... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "×àêàíå çà flock çàêëþ÷âàíå... %d"
+msgstr "Чакане за flock заключване... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "×àêàíå íà îòãîâîð..."
+msgstr "Чакане на отговор..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "Ïðåäóïðåæäåíèå: '%s' å íåâàëèäåí IDN."
+msgstr "Предупреждение: '%s' е невалиден IDN."
 
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Ñåðòèôèêàòúò íà ñúðâúðà å èçòåêúë"
+msgstr "Сертификатът на сървъра е изтекъл"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "Ïðåäóïðåæäåíèå: Ëîø IDN '%s' â ïñåâäîíèìà '%s'.\n"
+msgstr "Предупреждение: Лош IDN '%s' в псевдонима '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "Ïðåäóïðåæäåíèå: Ñåðòèôèêàòúò íå ìîæå äà áúäå çàïàçåí"
+msgstr "Предупреждение: Сертификатът не може да бъде запазен"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
@@ -3087,470 +2880,628 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ïðèëîæåíèåòî"
+msgstr "Грешка при създаване на приложението"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Ãðåøêà ïðè çàïèñ! Ïîùåíñêàòà êóòèÿ å çàïèñàíà ÷àñòè÷íî â %s"
+msgstr "Грешка при запис! Пощенската кутия е записана частично в %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "Ãðåøêà ïðè çàïèñ!"
+msgstr "Грешка при запис!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Çàïèñ íà ïèñìîòî â ïîùåíñêà êóòèÿ"
+msgstr "Запис на писмото в пощенска кутия"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "Çàïèñ íà %s..."
+msgstr "Запис на %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "Çàïèñâàíå íà ïèñìîòî â %s ..."
+msgstr "Записване на писмото в %s ..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "Çàïèñâàíå íà ïèñìàòà... %d (%d%%)"
+msgstr "Записване на писмата... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Ãðåøêà â êîìàíäíèÿ ðåä: %s\n"
+msgstr "Грешка в командния ред: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Âå÷å èìà çàïèñ çà òîçè ïñåâäîíèì!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Ïúðâèÿò åëåìåíò îò âåðèãàòà å âå÷å èçáðàí."
+msgstr "Вече има запис за този псевдоним!"
 
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Ïîñëåäíèÿò åëåìåíò îò âåðèãàòà å âå÷å èçáðàí."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Òîâà å ïúðâèÿò çàïèñ."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Òîâà å ïúðâàòà ñòðàíèöà."
+msgstr "Това е първият запис."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Òîâà å ïúðâîòî ïèñìî."
+msgstr "Това е първото писмо."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Òîâà å ïúðâàòà ñòðàíèöà."
+msgstr "Това е първата страница."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Òîâà å ïúðâàòà íèøêà."
+msgstr "Това е първата нишка."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Òîâà å ïîñëåäíèÿò çàïèñ."
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Òîâà å ïîñëåäíàòà ñòðàíèöà."
+msgstr "Това е последният запис."
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Òîâà å ïîñëåäíîòî ïèñìî."
+msgstr "Това е последното писмо."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Òîâà å ïîñëåäíàòà ñòðàíèöà."
+msgstr "Това е последната страница."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Íå ìîæå äà ïðåâúðòàòå íàäîëó ïîâå÷å."
+msgstr "Не може да превъртате надолу повече."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Íå ìîæå äà ïðåâúðòàòå íàãîðå ïîâå÷å."
+msgstr "Не може да превъртате нагоре повече."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Â àäðåñíàòà êíèãà íÿìà çàïèñè!"
+msgstr "В адресната книга няма записи!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Íå ìîæå äà èçòðèåòå åäèíñòâåíàòà ÷àñò íà ïèñìîòî."
+msgstr "Не може да изтриете единствената част на писмото."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Ìîæå äà èçïðàùàòå îòíîâî ñàìî message/rfc822 ÷àñòè."
+msgstr "Може да изпращате отново само message/rfc822 части."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] Çàïèñ?"
+msgstr "[%s = %s] Запис?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s íå ñå ïîääúðæà"
+msgstr "[-- %s/%s не се поддържа"
 
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- Ïðèëîæåíèå: #%d"
+msgstr "[-- Приложение: #%d"
 
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Ãðåøêè îò %s --]\n"
+msgstr "[-- Грешки от %s --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Àâòîìàòè÷íî ïîêàçâàíå ïîñðåäñòâîì %s --]\n"
+msgstr "[-- Автоматично показване посредством %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÈÑÌÎ --]\n"
+"[-- НАЧАЛО НА PGP-ПИСМО --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ÍÀ×ÀËÎ ÍÀ ÁËÎÊ Ñ ÏÓÁËÈ×ÅÍ PGP-ÊËÞ× --]\n"
+msgstr "[-- НАЧАЛО НА БЛОК С ПУБЛИЧЕН PGP-КЛЮЧ --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎ ÏÈÑÌÎ --]\n"
+"[-- НАЧАЛО НА PGP-ПОДПИСАНО ПИСМО --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- Ãðåøêà ïðè ñòàðòèðàíå íà %s. --]\n"
+msgstr "[-- Грешка при стартиране на %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- ÊÐÀÉ ÍÀ PGP-ÏÈÑÌÎÒÎ --]\n"
+msgstr "[-- КРАЙ НА PGP-ПИСМОТО --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ÊÐÀÉ ÍÀ ÁËÎÊÀ Ñ ÏÓÁËÈ×ÍÈß PGP-ÊËÞ× --]\n"
+msgstr "[-- КРАЙ НА БЛОКА С ПУБЛИЧНИЯ PGP-КЛЮЧ --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- ÊÐÀÉ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]\n"
+msgstr "[-- КРАЙ НА PGP-ПОДПИСАНОТО ПИСМО --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Êðàé íà øèôðîâàíèòå ñ PGP/MIME äàííè --]\n"
+msgstr "[-- Край на шифрованите с PGP/MIME данни --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- Êðàé íà øèôðîâàíèòå ñ PGP/MIME äàííè --]\n"
+msgstr "[-- Край на шифрованите с PGP/MIME данни --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Êðàé íà øèôðîâàíèòå ñúñ S/MIME äàííè --]\n"
+"[-- Край на шифрованите със S/MIME данни --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- Êðàé íà ïîäïèñàíèòå ñúñ S/MIME äàííè --]\n"
+"[-- Край на подписаните със S/MIME данни --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Êðàé íà ïîäïèñàíèòå äàííè --]\n"
+"[-- Край на подписаните данни --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- Ãðåøêà: Íåâúçìîæíî å ïîêàçâàíåòî íà êîÿòî è äà å îò àëòåðíàòèâíèòå ÷àñòè "
-"íà ïèñìîòî --]\n"
+"[-- Грешка: Невъзможно е показването на която и да е от алтернативните части "
+"на писмото --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- Ãðåøêà: Ïðîòèâîðå÷èâà multipart/signed ñòðóêòóðà! --]\n"
+"[-- Грешка: Противоречива multipart/signed структура! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- Ãðåøêà: Íåïîçíàò multipart/signed ïðîòîêîë %s! --]\n"
+"[-- Грешка: Непознат multipart/signed протокол %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Ãðåøêà: íå ìîæå äà áúäå ñúçäàäåí âðåìåíåí ôàéë! --]\n"
+msgstr "[-- Грешка: не може да бъде създаден временен файл! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Ãðåøêà: íà÷àëîòî íà PGP-ïèñìîòî íå ìîæå äà áúäå íàìåðåíî! --]\n"
+"[-- Грешка: началото на PGP-писмото не може да бъде намерено! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- Ãðåøêà: íå ìîæå äà áúäå ñúçäàäåí âðåìåíåí ôàéë! --]\n"
+msgstr "[-- Грешка: не може да бъде създаден временен файл! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- Ãðåøêà: íåïðàâèëíî ïîñòðîåíî PGP/MIME ñúîáùåíèå! --]\n"
+"[-- Грешка: неправилно построено PGP/MIME съобщение! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- Ãðåøêà: message/external-body íÿìà ïàðàìåòðè çà ìåòîä íà äîñòúï --]\n"
+"[-- Грешка: message/external-body няма параметри за метод на достъп --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñ PGP/MIME --]\n"
+"[-- Следните данни са шифровани с PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñ PGP/MIME --]\n"
+"[-- Следните данни са шифровани с PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
-msgstr "[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñúñ S/MIME --]\n"
+msgstr "[-- Следните данни са шифровани със S/MIME --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
-msgstr "[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè ñúñ S/MIME --]\n"
+msgstr "[-- Следните данни са подписани със S/MIME --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè --]\n"
+"[-- Следните данни са подписани --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- Òîâà %s/%s ïðèëîæåíèå "
+msgstr "[-- Това %s/%s приложение "
 
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- Òîâà %s/%s ïðèëîæåíèå íå å âêëþ÷åíî â ïèñìîòî, --]\n"
+msgstr "[-- Това %s/%s приложение не е включено в писмото, --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Òèï: %s/%s, Êîäèðàíå: %s, Ðàçìåð: %s --]\n"
+msgstr "[-- Тип: %s/%s, Кодиране: %s, Размер: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Ïðåäóïðåæäåíèå: íå ìîãàò äà áúäàò íàìåðåíè ïîäïèñè. --]\n"
+"[-- Предупреждение: не могат да бъдат намерени подписи. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Ïðåäóïðåæäåíèå: %s/%s-ïîäïèñè íå ìîãàò äà áúäàò ïðîâåðÿâàíè. --]\n"
+"[-- Предупреждение: %s/%s-подписи не могат да бъдат проверявани. --]\n"
 "\n"
 
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- à óêàçàíèÿò ìåòîä íà äîñòúï %s íå ñå ïîäúðæà. --]\n"
+msgstr "[-- а указаният метод на достъп %s не се подържа. --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
-msgstr "[-- à ôàéëúò, îïðåäåëåí çà ïðèêà÷âàíå âå÷å íå ñúùåñòâóâà. --]\n"
+msgstr "[-- а файлът, определен за прикачване вече не съществува. --]\n"
 
 #: handler.c:1201
 #, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- èìå: %s --]\n"
+msgstr "[-- име: %s --]\n"
 
 #: handler.c:1197
 #, c-format
 msgid "[-- on %s --]\n"
-msgstr "[-- íà %s --]\n"
+msgstr "[-- на %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Èçòåêúë   "
+msgstr "Изтекъл   "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Íåâàëèäåí   "
+msgstr "Невалиден   "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
-msgstr "Àíóëèðàí   "
+msgstr "Анулиран   "
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[íåâàëèäíà äàòà]"
+msgstr "[невалидна дата]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[ãðåøêà ïðè ïðåñìÿòàíå]"
+msgstr "[грешка при пресмятане]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "alias: íÿìà àäðåñ"
+msgstr "alias: няма адрес"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Няма маркирани писма."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Няма маркирани писма."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Желаете ли да запазите копие от това писмо?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "ïðîìåíÿ îïèñàíèåòî íà ïðèëîæåíèåòî"
+msgstr "променя описанието на приложението"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "ïðîìåíÿ îïèñàíèåòî íà ïðèëîæåíèåòî"
+msgstr "променя описанието на приложението"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: òâúðäå ìíîãî àðãóìåíòè"
+msgstr "bind: твърде много аргументи"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Грешка при четене на директорията."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Няма пощенска кутия с нови писма."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: íåäîñòàòú÷íî àðãóìåíòè"
+msgstr "color: недостатъчно аргументи"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Няма нови писма."
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
-msgstr "êîíâåðòèðàíî"
+msgstr "конвертирано"
+
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Запис на писмото в пощенска кутия"
 
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "ãðåøêà ïðè ñúçäàâàíå íà âðåìåííà ïîùåíñêà êóòèÿ: %s"
+msgstr "грешка при създаване на временна пощенска кутия: %s"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "ãðåøêà ïðè ñúêðàùàâàíåòî íà âðåìåííàòà ïîùåíñêà êóòèÿ: %s"
+msgstr "грешка при съкращаването на временната пощенска кутия: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "ãðåøêà ïðè çàïèñ âúâ âðåìåííàòà ïîùåíñêà êóòèÿ: %s"
+msgstr "грешка при запис във временната пощенска кутия: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
 
-#: browser.c:1206
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Не са дефинирани входни пощенски кутии."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dazn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "ñòàíäàðòíèòå öâåòîâå íå ñå ïîääúðæàò"
+msgstr "стандартните цветове не се поддържат"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Желаете ли да изтриете писмата на сървъра?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Възстановяване на писмата, отговарящи на: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Възстановяване на писмата, отговарящи на: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Желаете ли да редактирате писмото преди препращане?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3559,36 +3510,123 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "Ñúçäàâàíå íà êîïèå â %s..."
+msgstr "Създаване на копие в %s..."
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "Èçáèðàíå íà %s..."
+msgstr "Избиране на %s..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Това приложение няма да бъде прекодирано."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "променя описанието на приложението"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Невъзможен запис на писмо"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Изтегляне на заглавните части... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Желаете ли да редактирате писмото преди препращане?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Желаете ли да запазите копие от това писмо?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "ïðàçåí øàáëîí"
+msgstr "празен шаблон"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "Øèôðîâàíå"
+msgstr "Шифроване"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Желаете ли да запазите копие от това писмо?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3603,36 +3641,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "ãðåøêà â èçðàçà"
+msgstr "грешка в израза"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3642,26 +3680,82 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "ãðåøêà â øàáëîíà ïðè: %s"
+msgstr "грешка в шаблона при: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "ãðåøêà: íåïîçíàò îïåðàòîð %d (ìîëÿ, ñúîáùåòå çà òàçè ãðåøêà)."
+msgstr "грешка: непознат оператор %d (моля, съобщете за тази грешка)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "esabf"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "esabf"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
-msgstr "exec: ëèïñâàò àðãóìåíòè"
+msgstr "exec: липсват аргументи"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Желаете ли да проследите до %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Желаете ли да ги препратите като приложения?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Проверка за нови писма..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Това е първото писмо."
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -3683,136 +3777,626 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Това е последната страница."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Няма пощенска кутия с нови писма."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Грешка при отваряне на пощенската кутия!"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Няма пощенска кутия с нови писма."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "áå èçòðèòî --]\n"
+msgstr "бе изтрито --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbo: íåóñïåøåí EXPUNGE"
+msgstr "imap_sync_mailbo: неуспешен EXPUNGE"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "íåâàëèäíî çàãëàâíî ïîëå"
+msgstr "невалидно заглавно поле"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:108
 #, fuzzy
-msgid "keys matching"
-msgstr "PGP êëþ÷îâå, ñúâïàäàùè ñ <%s>."
+msgid "jump to an index number"
+msgstr "Невалиден номер на индекс."
 
-#: keymap.c:789
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Скок към писмо номер: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Скок към писмо номер: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Нишката съдържа непрочетени писма."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Това е първата нишка."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Няма непрочетени писма"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Няма непрочетени писма"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Желаете ли да запазите копие от това писмо?"
+
+#: crypt.cpkg:3108
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP ключове, съвпадащи с <%s>."
+
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Препращане на маркираните писма към: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Няма пощенска кутия с нови писма."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: ïðàçíà ïîñëåäîâàòåëíîñò îò êëàâèøè"
+msgstr "macro: празна последователност от клавиши"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: òâúðäå ìíîãî àðãóìåíòè"
+msgstr "macro: твърде много аргументи"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "íå å íàìåðåíî mailcap-âïèñâàíå çà òèïà %s"
+msgstr "не е намерено mailcap-вписване за типа %s"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
-"maildir_commit_message(): ãðåøêà ïðè ïîñòàâÿíåòî íà ìàðêà çà âðåìå íà ôàéëà"
+"maildir_commit_message(): грешка при поставянето на марка за време на файла"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "Ïèñìàòà íå ñà ïðåïðàòåíè."
+msgstr "Писмата не са препратени."
 
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "íåïîäõîäÿùî ïîñòàâåíè ñêîáè: %s"
+msgstr "неподходящо поставени скоби: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "ëèïñâà ïàðàìåòúð"
+msgstr "липсва параметър"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: íåäîñòàòú÷íî àðãóìåíòè"
+msgstr "mono: недостатъчно аргументи"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Това е първият запис."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Това е първото писмо."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Това е последният запис."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Това е последното писмо."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Това е последният запис."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Това е последната страница."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Няма възстановени писма."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Това е първият запис."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Това е първата страница."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Няма възстановени писма."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Това е първата страница."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "ñúñòàâíîòî ïèñìî íÿìà \"boundary\" ïàðàìåòúð!"
+msgstr "съставното писмо няма \"boundary\" параметър!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "no"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(íÿìà ïîùåíñêà êóòèÿ)"
+msgstr "(няма пощенска кутия)"
 
 #: commands.c:788
 msgid "not converting"
-msgstr "íå å êîíâåðòèðàíî"
+msgstr "не е конвертирано"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "ïðàçíà ïîñëåäîâàòåëíîñò îò êëàâèøè"
+msgstr "празна последователност от клавиши"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "oac"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Отваряне на пощенската кутия само за четене"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Отваряне на пощенската кутия само за четене"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Повторно отваряне на пощенската кутия..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Препращане на писмото към %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "òîçè ïðåôèêñ íå å âàëèäåí ñ \"reset\""
+msgstr "този префикс не е валиден с \"reset\""
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Това е първият запис."
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: òâúðäå ìíîãî àðãóìåíòè"
+msgstr "push: твърде много аргументи"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Желаете ли да редактирате чернова?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Нишката съдържа непрочетени писма."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Редактирането на писмо на POP сървър не е възможно."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: грешка при прилагането на файл"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Скок към писмо номер: "
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Желаете ли да изтриете писмата на сървъра?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ro"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "roa"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Запис на%s в пощенска кутия"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Запис на%s в пощенска кутия"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Редактирането на писмо на POP сървър не е възможно."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "грешка в израза"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Търсене: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Писмото не може да бъде изпратено."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Желаете ли да ги препратите като приложения?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Ограничаване до писмата, отговарящи на: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Няма повече цитиран текст."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Желаете ли да отпечатате писмото?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "В тази кутия няма писма."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source: ãðåøêà ïðè %s"
+msgstr "source: грешка при %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
-msgstr "source: ãðåøêè â %s"
+msgstr "source: грешки в %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: âìúêâàíåòî å ïðåêúñíàòî ïîðàäè òâúðäå ìíîãî ãðåøêè â %s"
+msgstr "source: вмъкването е прекъснато поради твърде много грешки в %s"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Няма файлове, отговарящи на маската"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: ïîùåíñêàòà êóòèÿ å ïðîìåíåíà, íî íÿìà ïðîìåíåíè ïèñìà! (ìîëÿ, ñúîáùåòå "
-"çà òàçè ãðåøêà)"
+"sync: пощенската кутия е променена, но няма променени писма! (моля, съобщете "
+"за тази грешка)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Премахване на маркировката от писмата, отговарящи на: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Това е първата нишка."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3824,41 +4408,130 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Няма повече цитиран текст."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Промяната на кодирането засяга само текстовите приложения."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Не е дефиниран шаблон за търсене."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Няма непрочетени писма"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "íåäîñòàòú÷íî àðãóìåíòè"
+msgstr "недостатъчно аргументи"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "òâúðäå ìíîãî àðãóìåíòè"
+msgstr "твърде много аргументи"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "ïðîìåíÿ îïèñàíèåòî íà ïðèëîæåíèåòî"
+msgstr "променя описанието на приложението"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Възстановяване на писмата, отговарящи на: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Възстановяване на писмата, отговарящи на: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Възстановяване на писмата, отговарящи на: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: Íå ìîæå äà èçòðèåòå %s îò %s."
+msgstr "unhook: Не може да изтриете %s от %s."
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: Íå ìîæå äà èçâúðøèòå unhook * îò hook."
+msgstr "unhook: Не може да извършите unhook * от hook."
 
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: íåïîçíàò hook òèï: %s"
+msgstr "unhook: непознат hook тип: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "íåïîçíàòà ãðåøêà"
+msgstr "непозната грешка"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Премахване на маркировката от писмата, отговарящи на: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "променя описанието на приложението"
 
 #: main.c:82
 msgid ""
@@ -3871,15 +4544,50 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "òàçè ñòîéíîñò íå å âàëèäíà ñ \"reset\""
+msgstr "тази стойност не е валидна с \"reset\""
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Приложението е записано на диска."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Нов файл: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Запис на писмото в пощенска кутия"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "yes"
 
 #: muttlib.c:227
 msgid "yna"
 msgstr "yna"
+
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/ca.po b/po/ca.po
index b0eb68f..920bfe7 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.5.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-02-13 10:57+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -30,7 +30,7 @@ msgstr ""
 "Vincles genèrics:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -40,7 +40,7 @@ msgstr ""
 "Funcions no vinculades:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -111,17 +111,17 @@ msgstr ""
 
 # ivb (2001/11/19)
 # ivb  L'espai de principi és per alinear, però no hi ha res a fer...
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr "  signa com a: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     fins a %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   des de %s"
@@ -164,15 +164,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " («?» llista): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr " (en línia)"
 
@@ -183,11 +183,11 @@ msgstr " (en línia)"
 msgid " Press '%s' to toggle write"
 msgstr "Premeu «%s» per habilitar l'escriptura."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr " en aquesta vista limitada."
 
@@ -215,24 +215,24 @@ msgstr "%d mantinguts, %d esborrats."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d mantinguts, %d moguts, %d esborrats."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
 # ivb (2001/12/08)
 # ivb  Davant d'açò pot anar una de les quatre anteriors.
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s  Voleu realment usar la clau?"
@@ -240,12 +240,12 @@ msgstr "%s  Voleu realment usar la clau?"
 # ivb (2001/11/19)
 # ivb  ABREUJAR!
 # S'ha modificat «%s» [#%d].  Voleu actualitzar-ne la codificació?
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "Modificat «%s» [#%d]. Actualitzar codificació?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "«%s» [#%d] ja no existeix!"
@@ -257,7 +257,7 @@ msgstr "%s [llegits %d de %d missatges]"
 
 # ivb (2001/11/27)
 # ivb  Es refereix al directori «Maildir» -> masculí.
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "«%s» no existeix. Voleu crear-lo?"
@@ -272,17 +272,17 @@ msgstr "«%s» no és un camí IMAP vàlid."
 msgid "%s is an invalid POP path"
 msgstr "«%s» no és un camí POP vàlid."
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr "«%s» no és un camí POP vàlid."
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr "«%s» no és un camí POP vàlid."
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "«%s» no és un directori."
@@ -292,7 +292,7 @@ msgstr "«%s» no és un directori."
 msgid "%s is not a mailbox!"
 msgstr "«%s» no és una bústia!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "«%s» no és una bústia."
@@ -319,54 +319,54 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: El tipus no és conegut."
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s: El terminal no suporta aquest color."
 
 # ivb (2001/11/18)
 # ivb  «index» és una paraula clau.
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s: L'ordre només és vàlida per un objecte «index»."
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: L'atribut no existeix."
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: El color no existeix."
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: La funció no existeix."
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: La funció no es troba en el mapa."
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: El menú no existeix."
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: L'objecte no existeix."
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: Manquen arguments."
@@ -376,37 +376,37 @@ msgstr "%s: Manquen arguments."
 msgid "%s: unable to attach file"
 msgstr "%s: No s'ha pogut adjuntar el fitxer."
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: No s'ha pogut adjuntar el fitxer.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: L'ordre no és coneguda."
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: El tipus no és conegut."
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: La variable no és coneguda."
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
 msgstr "«%s» no és un camí POP vàlid."
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr "«%s» no és un camí POP vàlid."
@@ -415,15 +415,15 @@ msgstr "«%s» no és un camí POP vàlid."
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(vinculeu «view-attachents» a una tecla!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(cap bústia)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ebutja, accepta (u)na sola volta"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ebutja, accepta (u)na sola volta, accepta (s)empre"
 
@@ -441,22 +441,22 @@ msgstr "(useu «%s» per veure aquesta part)"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Fitxers adjunts"
 
 # ivb (2001/12/07)
 # ivb  Es refereix a un menú -> masculí.
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<DESCONEGUT>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<per defecte>"
 
@@ -472,35 +472,31 @@ msgstr ""
 msgid "APOP authentication failed."
 msgstr "L'autenticació APOP ha fallat."
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Avorta"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
 msgstr "Voleu avortar el missatge no modificat?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
 msgstr "S'avorta el missatge no modificat."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adreça: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "S'ha afegit l'àlies."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Nou àlies: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Àlies"
 
@@ -508,65 +504,61 @@ msgstr "Àlies"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr ""
 "Totes les claus concordants han expirat o estan revocades o inhabilitades."
 
-#: remailer.c:431
-msgid "Append"
-msgstr "Afig"
-
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Voleu afegir els missatges a «%s»?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
 msgstr "L'argument ha de ser un número de missatge."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "S'ha desat el fitxer adjunt."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Ajunta fitxer"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "S'estan adjuntant els fitxers seleccionats..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "S'ha filtrat el fitxer adjunt."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "S'ha desat el fitxer adjunt."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Fitxers adjunts"
 
@@ -597,13 +589,13 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr "L'IDN no és vàlid: «%s»"
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "L'IDN «%s» no és vàlid, en preparar «Resent-From»."
 
 # El primer camp és una capçalera de correu.  ivb
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "L'IDN de «%s» no és vàlid: «%s»"
@@ -617,7 +609,7 @@ msgstr "L'IDN no és vàlid: «%s»"
 msgid "Bad mailbox name"
 msgstr "El nom de la bústia no és vàlid."
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "El final del missatge ja és visible."
 
@@ -643,7 +635,7 @@ msgstr "Voleu redirigir els missatges a %s"
 msgid "Bounce tagged messages to: "
 msgstr "Redirigeix els missatges marcats a: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -660,16 +652,16 @@ msgstr ""
 msgid "Can't append to folder: %s"
 msgstr "No s'ha pogut afegir a la carpeta: %s."
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "No es pot adjuntar un directori!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "No s'ha pogut crear «%s»: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "No s'ha pogut crear el fitxer «%s»."
@@ -682,10 +674,10 @@ msgstr "No s'ha pogut crear el filtre."
 msgid "Can't create filter process"
 msgstr "No s'ha pogut crear el procés filtre."
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "No s'ha pogut crear un fitxer temporal."
 
@@ -703,15 +695,15 @@ msgstr "Encapsular amb MIME fitxers adjunts marcats no descodificables?"
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "Reenviar amb MIME fitxers adjunts marcats no descodificables?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
 msgstr "No s'ha pogut desxifrar el missatge xifrat!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "No es poden esborrar els fitxers adjunts en un servidor POP."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "No es poden esborrar els fitxers adjunts en un servidor POP."
@@ -731,12 +723,6 @@ msgstr ""
 msgid "Can't find any tagged messages."
 msgstr "No s'ha trobat cap missatge marcat."
 
-# ivb (2001/12/07)
-# ivb  En aquest cas «mixmaster» és un programa.
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "No s'ha pogut obtenir «type2.list» de «mixmaster»!"
-
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  El nom de fitxer no concorda amb cap «nametemplate»; voleu continuar?
@@ -754,17 +740,17 @@ msgstr "No s'ha pogut obrir el fitxer missatge: %s."
 msgid "Can't open trash folder"
 msgstr "No s'ha pogut afegir a la carpeta: %s."
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "S'ha tancat la connexió amb «%s»."
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "S'està tancant la connexió amb el servidor POP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
@@ -772,12 +758,12 @@ msgstr ""
 # ivb (2001/11/19)
 # ivb  Cuidadín: en «compose» la cadena és el nom de fitxer i en
 # ivb  «editmsg» i «sendlib» és la cadena d'error.
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Ha fallat stat() sobre «%s»: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "No s'ha pogut crear «%s»: %s."
@@ -794,7 +780,7 @@ msgstr "No es pot editar un missatge en un servidor POP."
 # ivb (2001/11/19)
 # ivb  Cuidadín: en «compose» la cadena és el nom de fitxer i en
 # ivb  «editmsg» i «sendlib» és la cadena d'error.
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ha fallat stat() sobre «%s»: %s"
@@ -803,11 +789,11 @@ msgstr "Ha fallat stat() sobre «%s»: %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "No es pot veure un directori."
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "No s'ha pogut crear «%s»."
@@ -832,42 +818,38 @@ msgstr "No s'ha pogut crear el filtre de visualització."
 msgid "Cannot create filter"
 msgstr "No s'ha pogut crear el filtre."
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "No es pot establir si una bústia de només lectura pot ser modificada."
 
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
-
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "S'ha rebut «%s»... Eixint.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "El certificat del servidor encara no és vàlid."
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "S'ha desat el certificat."
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
 msgstr "S'escriuran els canvis a la carpeta en abandonar-la."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
 msgstr "No s'escriuran els canvis a la carpeta."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Caràcter = %s, Octal = %o, Decimal = %d"
@@ -877,28 +859,20 @@ msgstr "Caràcter = %s, Octal = %o, Decimal = %d"
 msgid "Character set changed to %s; %s."
 msgstr "S'ha canviat el joc de caràcters a «%s»; %s."
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "Canvia directori"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Canvia al directori: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "S'està comprovant si hi ha missatges nous..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Comprova clau  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "S'està comprovant si hi ha missatges nous..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "S'està comprovant si hi ha missatges nous..."
@@ -907,7 +881,7 @@ msgstr "S'està comprovant si hi ha missatges nous..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "En clar"
 
@@ -917,7 +891,7 @@ msgstr "En clar"
 msgid "Clear flag"
 msgstr "Quin senyalador voleu desactivar"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "S'està tancant la connexió amb «%s»..."
@@ -926,7 +900,7 @@ msgstr "S'està tancant la connexió amb «%s»..."
 msgid "Closing connection to POP server..."
 msgstr "S'està tancant la connexió amb el servidor POP..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "S'està connectant amb «%s»..."
@@ -945,7 +919,7 @@ msgstr "El servidor no suporta l'ordre «UIDL»."
 msgid "Committing changes..."
 msgstr "S'estan realitzant els canvis..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -966,12 +940,12 @@ msgstr "S'està copiant en «%s»..."
 msgid "Compressing %s..."
 msgstr "S'està copiant en «%s»..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "S'està connectant amb «%s»..."
@@ -1006,7 +980,7 @@ msgstr "S'ha perdut la connexió. Reconnectar amb el servidor POP?"
 msgid "Connection to %s closed"
 msgstr "S'ha tancat la connexió amb «%s»."
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "S'ha tancat la connexió amb «%s»."
@@ -1016,7 +990,7 @@ msgstr "S'ha tancat la connexió amb «%s»."
 msgid "Content-Type changed to %s."
 msgstr "S'ha canviat «Content-Type» a «%s»."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "«Content-Type» ha de tenir la forma «base/sub»."
 
@@ -1069,9 +1043,9 @@ msgstr "No s'ha pogut connectar amb «%s» (%s)."
 msgid "Could not copy message"
 msgstr "No s'ha pogut copiar el missatge."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
 msgstr "No s'ha pogut crear un fitxer temporal!"
@@ -1089,7 +1063,7 @@ msgstr "No s'ha pogut trobar la funció d'ordenació! (informeu d'aquest error)"
 msgid "Could not find the host \"%s\""
 msgstr "No s'ha pogut trobar l'estació «%s»."
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
 msgstr "No s'han pogut incloure tots els missatges soŀlicitats!"
 
@@ -1106,7 +1080,7 @@ msgstr "No s'ha pogut obrir «%s»."
 msgid "Could not reopen mailbox!"
 msgstr "No s'ha pogut reobrir la bústia!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "No s'ha pogut enviar el missatge."
 
@@ -1120,7 +1094,7 @@ msgstr "No s'ha pogut blocar «%s».\n"
 msgid "Create %s?"
 msgstr "Voleu crear «%s»?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Només es poden crear bústies IMAP."
 
@@ -1153,26 +1127,15 @@ msgstr "Desxifra i còpia%s en la bústia"
 msgid "Decrypt-save%s to mailbox"
 msgstr "Desxifra i desa%s en la bústia"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
 msgstr "S'està desxifrant el missatge..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
 msgstr "El desxifratge ha fallat."
 
-# ivb (2001/12/08)
-# ivb  Menú superpoblat: mantenir _molt_ curt!
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Esbrr"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Esborra"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Només es poden esborrar bústies IMAP."
 
@@ -1183,24 +1146,20 @@ msgstr "Només es poden esborrar bústies IMAP."
 msgid "Delete messages from server?"
 msgstr "Voleu eliminar els missatges del servidor?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Esborra els missatges que concorden amb: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Esborra"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "No es poden esborrar els fitxers adjunts en un missatge xifrat."
 
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Descriu"
-
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
@@ -1213,20 +1172,20 @@ msgstr "L'ID «%s» no ha estat verificat. Voleu usar-lo per %s?"
 msgid "Directory %s not exist. Create it?"
 msgstr "«%s» no existeix. Voleu crear-lo?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Directori [%s], màscara de fitxers: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "ERROR: Per favor, informeu d'aquest error."
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
 msgstr "Voleu editar el missatge a reenviar?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1235,11 +1194,11 @@ msgstr ""
 msgid "Empty expression"
 msgstr "Error en l'expressió."
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Xifra"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
 msgstr "Xifra amb: "
 
@@ -1247,17 +1206,17 @@ msgstr "Xifra amb: "
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Entreu l'ID de clau: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Entreu l'ID de clau per %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
 msgstr "Premeu les tecles (^G avorta): "
 
@@ -1284,7 +1243,7 @@ msgstr "Error en connectar amb el servidor: %s"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Error en connectar amb el servidor: %s"
@@ -1293,12 +1252,12 @@ msgstr "Error en connectar amb el servidor: %s"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Error en «%s», línia %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Error en la línia d'ordres: %s\n"
@@ -1308,12 +1267,12 @@ msgstr "Error en la línia d'ordres: %s\n"
 msgid "Error in expression: %s"
 msgstr "Error en l'expressió: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Error en inicialitzar el terminal."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Error en inicialitzar el terminal."
 
@@ -1325,42 +1284,33 @@ msgstr "Error en obrir la bústia."
 msgid "Error parsing address!"
 msgstr "Error en interpretar l'adreça!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Error en executar «%s»!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "Error en llegir el directori."
 
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  Error en enviar el missatge, el procés fill ha exit amb codi %d (%s).
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Error en enviament, el fill isqué amb codi %d (%s)."
 
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Error en enviar el missatge, el procés fill ha eixit amb codi %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Error en enviar el missatge."
-
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Error en parlar amb «%s» (%s)."
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Error en intentar veure el fitxer."
 
@@ -1373,25 +1323,20 @@ msgstr "Error en escriure en la bústia!"
 msgid "Error. Preserving temporary file: %s"
 msgstr "Error.  Es manté el fitxer temporal: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Error: No es pot usar «%s» com a redistribuïdor final d'una cadena."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Error: «%s» no és un IDN vàlid."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1408,7 +1353,7 @@ msgstr "Error: La part «multipart/signed» no té paràmetre «protocol»!"
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Error en la línia d'ordres: %s\n"
@@ -1422,21 +1367,12 @@ msgstr "S'està avaluant la memòria cau... [%d/%d]"
 msgid "Executing command on matching messages..."
 msgstr "S'està executant l'ordre sobre els missatges concordants..."
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Ix"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Ix  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
 msgstr "Voleu abandonar Mutt sense desar els canvis?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
 msgstr "Voleu abandonar Mutt?"
@@ -1470,17 +1406,17 @@ msgstr "Error fatal!  No s'ha pogut reobrir la bústia!"
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Error fatal. El recompte de missatges no es troba sincronitzat!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "S'estan eliminant missatges del servidor..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "S'està recollint el missatge..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "S'està recollint la llista de missatges..."
@@ -1489,7 +1425,7 @@ msgstr "S'està recollint la llista de missatges..."
 msgid "Fetching list of messages..."
 msgstr "S'està recollint la llista de missatges..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "S'estan recollint les capçaleres dels missatges... [%d/%d]"
@@ -1499,11 +1435,11 @@ msgstr "S'estan recollint les capçaleres dels missatges... [%d/%d]"
 msgid "Fetching message headers... [%d/%d]"
 msgstr "S'estan recollint les capçaleres dels missatges... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "S'està recollint el missatge..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "Màscara de fitxers: "
 
@@ -1523,43 +1459,36 @@ msgstr "El fitxer és un directori; voleu desar-hi a sota? [(s)í, (n)o, (t)ots]
 msgid "File under directory: "
 msgstr "Fitxer a sota del directori: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filtra amb: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Empremta digital: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "desa aquest missatge per enviar-lo més endavant"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
 # ivb (2001/12/07)
 # ivb  El primer «%s» és una adreça de correu i el segon potser «,...».
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Voleu escriure un seguiment a %s%s?"
 
-# ivb (2001/12/07)
-# ivb  El primer «%s» és una adreça de correu i el segon potser «,...».
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Voleu escriure un seguiment a %s%s?"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "Voleu reenviar amb encapsulament MIME?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Voleu reenviar com a fitxer adjunt?"
 
@@ -1567,7 +1496,7 @@ msgstr "Voleu reenviar com a fitxer adjunt?"
 msgid "Forward as attachments?"
 msgstr "Voleu reenviar com a fitxers adjunts?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
 msgstr "No es permet aquesta funció en el mode d'adjuntar missatges."
 
@@ -1583,30 +1512,19 @@ msgstr "S'estan obtenint els espais de noms..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Grup"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Ajuda"
-
 # ivb (2001/12/08)
 # ivb  El noms dels menús no estan traduïts.
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Ajuda de «%s»"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
 msgstr "Ja s'està mostrant l'ajuda."
 
@@ -1614,7 +1532,7 @@ msgstr "Ja s'està mostrant l'ajuda."
 msgid "I don't know how to print that!"
 msgstr "No sé com imprimir això!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "No sé com imprimir els fitxers adjunts de tipus «%s»!"
@@ -1622,40 +1540,40 @@ msgstr "No sé com imprimir els fitxers adjunts de tipus «%s»!"
 # ivb (2002/02/02)
 # ivb  ABREUJAT! (Hei!  Hui és 2/2/2!)
 # ivb  Aquest ID té una validesa indefinida.
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr "L'ID té una validesa indefinida."
 
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  Aquest ID es troba expirat, inhabilitat o revocat.
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
 msgstr "ID expirat/inhabilitat/revocat."
 
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  Aquest ID no és vàlid.
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
 msgstr "L'ID no és vàlid."
 
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  Aquest ID només és lleugerament vàlid.
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
 msgstr "L'ID és lleugerament vàlid."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
 msgstr "La capçalera PGP no és permesa."
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
 msgstr "La capçalera S/MIME no és permesa."
 
@@ -1667,39 +1585,35 @@ msgstr "La capçalera S/MIME no és permesa."
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "Entrada de tipus «%s» en «%s», línia %d: format no vàlid."
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr "Voleu incloure el missatge en la resposta?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "S'està incloent el missatge citat..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Insereix"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "El dia del mes no és vàlid: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "La codificació no és vàlida."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "El número d'índex no és vàlid."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
 msgstr "El número de missatge no és vàlid."
 
@@ -1713,11 +1627,11 @@ msgstr "El mes no és vàlid: %s"
 msgid "Invalid relative date: %s"
 msgstr "La data relativa no és vàlida: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "S'està invocant PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "S'està invocant PGP..."
@@ -1730,78 +1644,74 @@ msgstr "S'està invocant PGP..."
 msgid "Invoking autoview command: %s"
 msgstr "Ordre de visualització automàtica: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Salta al missatge: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Salta a: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
 msgstr "No es pot saltar en un diàleg."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "ID de la clau: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
 msgstr "La tecla no està vinculada."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "La tecla no està vinculada. Premeu «%s» per obtenir ajuda."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "Limita als missatges que concorden amb: "
 
 # ivb (2001/12/08)
 # ivb  Nooop!  Només mostra el límit actual.
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Límit: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "S'està entrant..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1814,15 +1724,15 @@ msgstr ""
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "Voleu eliminar un forrellat sobrant de «%s»?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "S'està entrant..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "L'entrada ha fallat."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "S'estan cercant les claus que concorden amb «%s»..."
@@ -1832,7 +1742,7 @@ msgstr "S'estan cercant les claus que concorden amb «%s»..."
 msgid "Looking up %s..."
 msgstr "S'està cercant «%s»..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Empremta digital: %s"
@@ -1841,23 +1751,19 @@ msgstr "Empremta digital: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "No s'ha definit el tipus MIME. No es pot veure el fitxer adjunt."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "S'ha detectat un bucle entre macros."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Nou correu"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "No s'ha enviat el missatge."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "S'ha enviat el missatge."
 
@@ -1873,11 +1779,11 @@ msgstr "S'ha tancat la bústia."
 msgid "Mailbox created."
 msgstr "S'ha creat la bústia."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr "S'ha esborrat la bústia."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
 msgstr "La bústia és buida."
 
@@ -1888,7 +1794,7 @@ msgstr "La bústia és buida."
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Bústia en estat de només lectura. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
 msgstr "La bústia és de només lectura."
 
@@ -1900,7 +1806,7 @@ msgstr "No s'ha modificat la bústia."
 msgid "Mailbox must have a name."
 msgstr "La bústia ha de tenir un nom."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
 msgstr "No s'ha esborrat la bústia."
 
@@ -1913,18 +1819,18 @@ msgstr "S'ha creat la bústia."
 msgid "Mailbox was corrupted!"
 msgstr "La bústia ha estat corrompuda!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
 msgstr "S'ha modificat la bústia des de fora."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "S'ha modificat la bústia des de fora. Els senyaladors poden ser incorrectes."
 
 # ivb (2001/12/07)
 # ivb  Es refereix a les definides en «mailboxes».
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Bústies d'entrada [%d]"
@@ -1939,11 +1845,7 @@ msgstr "Cal que l'entrada «edit» de «mailcap» continga «%%s»."
 msgid "Mailcap compose entry requires %%s"
 msgstr "Cal que l'entrada «compose» de «mailcap» continga «%%s»."
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Crea àlies"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1952,19 +1854,15 @@ msgstr ""
 msgid "Marking %d messages deleted..."
 msgstr "S'estan marcant %d missatges com a esborrats..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Màscara"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "S'ha redirigit el missatge."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1984,12 +1882,12 @@ msgstr "No s'ha redirigit el missatge."
 msgid "Message not modified!"
 msgstr "El missatge no ha estat modificat!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
 msgstr "El missatge pare no és visible en aquesta vista limitada."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "S'ha posposat el missatge."
 
@@ -1997,7 +1895,7 @@ msgstr "S'ha posposat el missatge."
 msgid "Message printed"
 msgstr "S'ha imprés el missatge."
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "S'ha escrit el missatge."
 
@@ -2017,19 +1915,10 @@ msgstr "No s'han redirigit els missatges."
 msgid "Messages printed"
 msgstr "S'han imprés els missatges."
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Manquen arguments."
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Les cadenes de Mixmaster estan limitades a %d elements."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "No es poden usar les capçaleres «Cc» i «Bcc» amb Mixmaster."
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
@@ -2040,19 +1929,15 @@ msgstr "Voleu moure els missatges a «%s»?"
 msgid "Moving read messages to %s..."
 msgstr "S'estan movent els missatges llegits a «%s»..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nova consulta"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nom del nou fitxer: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Nou fitxer: "
 
@@ -2061,45 +1946,33 @@ msgstr "Nou fitxer: "
 msgid "New mail in "
 msgstr "Hi ha correu nou en "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr "Hi ha correu nou en aquesta bústia."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-# ivb (2001/12/08)
-# ivb  Menú superpoblat: mantenir _molt_ curt!
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Segnt"
-
-# ivb (2001/12/08)
-# ivb  Menú superpoblat: mantenir _molt_ curt!
-#: pager.c:1304
-msgid "NextPg"
-msgstr "AvPàg"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2111,30 +1984,30 @@ msgstr "No hi ha cap autenticador disponible."
 msgid "No boundary parameter found! [report this error]"
 msgstr "No s'ha trobat el paràmetre «boundary»! (informeu d'aquest error)"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "No hi ha cap entrada."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "No hi ha cap fitxer que concorde amb la màscara de fitxers."
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
 msgstr "No s'ha definit cap bústia d'entrada."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
 msgstr "No hi ha cap patró limitant en efecte."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
 msgstr "No hi ha cap bústia oberta."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr "No hi ha cap bústia amb correu nou."
 
@@ -2151,7 +2024,7 @@ msgstr "«%s» no té entrada «compose» en «mailcap»: cree fitxer buit."
 msgid "No mailcap edit entry for %s"
 msgstr "No hi ha cap entrada «edit» de «%s» en «mailcap»."
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "No s'ha trobat cap llista de correu!"
 
@@ -2159,7 +2032,7 @@ msgstr "No s'ha trobat cap llista de correu!"
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "No hi ha cap entrada adequada en «mailcap». Es visualitza com a text."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "La carpeta no conté missatges."
 
@@ -2167,15 +2040,15 @@ msgstr "La carpeta no conté missatges."
 msgid "No messages matched criteria."
 msgstr "No hi ha cap missatge que concorde amb el criteri."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "No hi ha més text citat."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "No hi ha més fils."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "No hi ha més text sense citar després del text citat."
 
@@ -2185,71 +2058,61 @@ msgstr "No hi ha correu nou en la bústia POP."
 
 # ivb (2001/12/08)
 # ivb  Ací no hi ha forma de posar el punt final de segur :(
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "No hi ha cap missatge nou"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "No s'ha indicat l'assumpte."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "No hi ha cap fitxer que concorde amb la màscara de fitxers."
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "No hi ha cap bústia amb correu nou."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "No hi ha cap missatge posposat."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "No hi ha cap bústia amb correu nou."
-
 #: commands.c:378
 msgid "No printing command has been defined."
 msgstr "No s'ha definit cap ordre d'impressió."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
 msgstr "No s'ha indicat cap destinatari."
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr "No s'ha indicat cap destinatari.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
 msgstr "No s'ha indicat cap destinatari."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "No s'ha indicat cap patró de recerca."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "No s'ha indicat l'assumpte."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "No hi ha assumpte; voleu avortar l'enviament?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "No hi ha assumpte; voleu avortar el missatge?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "S'avorta el missatge sense assumpte."
 
@@ -2257,103 +2120,99 @@ msgstr "S'avorta el missatge sense assumpte."
 msgid "No such folder"
 msgstr "La carpeta no existeix."
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "No hi ha cap entrada marcada."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
 msgstr "Cap dels missatges marcats és visible!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "No hi ha cap missatge marcat."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr "No hi ha cap missatge no esborrat."
 
 # ivb (2001/12/08)
 # ivb  Ací no hi ha forma de posar el punt final de segur :(
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "No hi ha cap missatge no llegit"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "No hi ha cap missatge visible."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
 msgstr "No es troba disponible en aquest menú."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "No s'ha trobat."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
 msgstr "No hi ha res a fer."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "Accepta"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
 msgstr ""
 "Només es poden esborrar els fitxers adjunts dels missatges «multipart»."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
 msgstr "Obri la bústia"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
 msgstr "Obri en mode de només lectura la bústia"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
 msgstr "Bústia a obrir per adjuntar-ne missatges"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "Obri en mode de només lectura la bústia"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "Bústia a obrir per adjuntar-ne missatges"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Eixida del procés de repartiment"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o en (c)lar? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr "El missatge ja usa PGP. Voleu posar-lo en clar i continuar? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "Claus PGP que concorden amb <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "Claus PGP que concorden amb <%s>."
@@ -2370,11 +2229,11 @@ msgstr "S'ha pogut verificar amb èxit la signatura PGP."
 msgid "POP host is not defined."
 msgstr "No s'ha definit el servidor POP (pop_host)."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
 msgstr "El missatge pare no es troba disponible."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
 msgstr "El missatge pare no és visible en aquesta vista limitada."
 
@@ -2383,41 +2242,27 @@ msgstr "El missatge pare no és visible en aquesta vista limitada."
 msgid "Password for %s@%s: "
 msgstr "Contrasenya per %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Nom personal: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Redirigeix"
-
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "Redirigeix a l'ordre: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Redirigeix a: "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Per favor, establiu un valor adequat per «hostname» quan useu Mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr "Voleu posposar aquest missatge?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Missatges posposats"
 
@@ -2425,25 +2270,15 @@ msgstr "Missatges posposats"
 msgid "Preconnect command failed."
 msgstr "L'ordre de preconnexió (preconnect) ha fallat."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "S'està preparant el missatge a reenviar..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr "Premeu qualsevol tecla per continuar..."
 
-# ivb (2001/12/08)
-# ivb  Menú superpoblat: mantenir _molt_ curt!
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "RePàg"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Imprimeix"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "Voleu imprimir el fitxer adjunt?"
 
@@ -2451,7 +2286,7 @@ msgstr "Voleu imprimir el fitxer adjunt?"
 msgid "Print message?"
 msgstr "Voleu imprimir el missatge?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
 msgstr "Voleu imprimir els fitxers adjunts seleccionats?"
 
@@ -2471,34 +2306,30 @@ msgstr "Voleu eliminar %d missatge esborrat?"
 msgid "Purge %d deleted messages?"
 msgstr "Voleu eliminar %d missatges esborrats?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Consulta"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Consulta de «%s»"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
 msgstr "No s'ha definit cap ordre de consulta."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Consulta: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Ix"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "Voleu abandonar Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "S'estan obtenint els espais de noms..."
@@ -2523,16 +2354,16 @@ msgstr "S'està llegint «%s»... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "S'estan llegint els missatges nous (%d octets)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Voleu realment esborrar la bústia «%s»?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
 msgstr "Voleu recuperar un missatge posposat?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr "La recodificació només afecta els fitxers adjunts de tipus text."
 
@@ -2541,7 +2372,7 @@ msgstr "La recodificació només afecta els fitxers adjunts de tipus text."
 msgid "Rename failed: %s"
 msgstr "La negociació d'SSL ha fallat: %s."
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Només es poden crear bústies IMAP."
@@ -2551,7 +2382,7 @@ msgstr "Només es poden crear bústies IMAP."
 msgid "Rename mailbox %s to: "
 msgstr "Crea la bústia: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Reanomena a: "
 
@@ -2559,19 +2390,13 @@ msgstr "Reanomena a: "
 msgid "Reopening mailbox..."
 msgstr "S'està reobrint la bústia..."
 
-# ivb (2001/12/08)
-# ivb  Menú superpoblat: mantenir _molt_ curt!
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Respon"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
 # ivb (2001/12/07)
 # ivb  El primer «%s» és una adreça de correu i el segon potser «,...».
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Voleu escriure una resposta a %s%s?"
@@ -2584,24 +2409,24 @@ msgstr ""
 "Dscnd (d)ata/(o)rig/(r)ebut/(t)ema/de(s)t/(f)il/(c)ap/(m)ida/(p)unts/sp(a)"
 "m?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr "Cerca cap enrere: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
 msgstr "Cerca cap enrere: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordena inversament per (d)ata, (a)lfabet, (m)ida, o (n)o ordenar? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o en (c)lar? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "El missatge ja usa S/MIME. Voleu posar-lo en clar i continuar? "
 
@@ -2609,7 +2434,7 @@ msgstr "El missatge ja usa S/MIME. Voleu posar-lo en clar i continuar? "
 msgid "S/MIME certificate owner does not match sender."
 msgstr "El propietari del certificat S/MIME no concorda amb el o la remitent."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "Certificats S/MIME que concorden amb «%s»."
@@ -2630,7 +2455,7 @@ msgstr "S'ha pogut verificar amb èxit la signatura S/MIME."
 msgid "SASL authentication failed."
 msgstr "L'autenticació SASL ha fallat."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Empremta digital: %s"
@@ -2640,20 +2465,16 @@ msgstr "Empremta digital: %s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "La connexió SSL usa «%s» (%s)."
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Desa"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "Voleu guardar una còpia d'aquest missatge?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Guarda en el fitxer: "
 
@@ -2667,15 +2488,11 @@ msgstr "Desa%s en la bústia"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "S'estan guardant els senyaladors d'estat dels missatges... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "S'està desant..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Cerca"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Cerca: "
 
@@ -2691,62 +2508,46 @@ msgstr "La recerca ha arribat a l'inici sense trobar cap concordança."
 msgid "Search interrupted."
 msgstr "S'ha interromput la recerca."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
 msgstr "No es pot cercar en aquest menú."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
 msgstr "La recerca ha tornat al final."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
 msgstr "La recerca ha tornat al principi."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Cerca: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Selecciona"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Selecciona  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Seleccioneu una cadena de redistribuïdors."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "S'està seleccionant la bústia «%s»..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Envia"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "S'està enviant en segon pla."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "S'està enviant el missatge..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
 msgstr "El servidor ha tancat la connexió!"
 
@@ -2760,15 +2561,15 @@ msgstr "Quin senyalador voleu activar"
 msgid "Shell command: "
 msgstr "Ordre per l'intèrpret: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Signa"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Signa com a: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Signa i xifra"
 
@@ -2780,7 +2581,7 @@ msgstr ""
 "Ascnd (d)ata/(o)rig/(r)ebut/(t)ema/de(s)t/(f)il/(c)ap/(m)ida/(p)unts/sp(a)"
 "m?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordena per (d)ata, (a)lfabet, (m)ida, o (n)o ordenar? "
 
@@ -2788,26 +2589,22 @@ msgstr "Ordena per (d)ata, (a)lfabet, (m)ida, o (n)o ordenar? "
 msgid "Sorting mailbox..."
 msgstr "S'està ordenant la bústia."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "ID de la clau: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Subscrites [%s], màscara de fitxers: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2816,24 +2613,24 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "S'està subscrivint a «%s»..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "Comprovació del certificat SSL"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr "Marca els missatges que concorden amb: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
 msgstr "Marqueu els missatges que voleu adjuntar!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
 msgstr "No es pot marcar."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr "Aqueix missatge no és visible."
 
@@ -2842,11 +2639,11 @@ msgstr "Aqueix missatge no és visible."
 msgid "The CRL is not available\n"
 msgstr "SSL no es troba disponible."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr "Es convertirà el fitxer adjunt actual."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr "No es convertirà el fitxer adjunt actual."
 
@@ -2854,19 +2651,15 @@ msgstr "No es convertirà el fitxer adjunt actual."
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "L'índex del missatge no és correcte. Proveu de reobrir la bústia."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "La cadena de redistribuïdors ja és buida."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "No hi ha cap fitxer adjunt."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "No hi ha cap missatge."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "No hi ha cap subpart a mostrar!"
 
@@ -2874,41 +2667,41 @@ msgstr "No hi ha cap subpart a mostrar!"
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Aquest servidor IMAP és antic. Mutt no pot funcionar amb ell."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr "Aquest certificat pertany a:"
 
 # ivb (2001/12/08)
 # ivb  A continuació ve el rang de validesa.
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr "Aquest certificat té validesa"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr "Aquest certificat ha estat lliurat per:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr ""
 "No es pot usar aquesta clau: es troba expirada, inhabilitada o revocada."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
 msgstr "El fil conté missatges no llegits."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
 msgstr "No s'ha habilitat l'ús de fils."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
@@ -2920,23 +2713,27 @@ msgstr "S'ha excedit el temps d'espera en intentar blocar amb fcntl()!"
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "S'ha excedit el temps d'espera en intentar blocar amb flock()!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
 msgstr "L'inici del missatge ja és visible."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr "S'està provant a extreure les claus PGP...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "S'està provant a extreure els certificats S/MIME...\n"
 
@@ -2955,12 +2752,12 @@ msgstr ""
 msgid "USER authentication failed."
 msgstr "L'autenticació SASL ha fallat."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "No s'ha pogut adjuntar «%s»!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "No s'ha pogut adjuntar!"
 
@@ -2969,7 +2766,7 @@ msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
 "No s'han pogut recollir les capçaleres d'aquesta versió de servidor IMAP."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "No s'ha pogut obtenir el certificat del servidor."
 
@@ -2977,7 +2774,7 @@ msgstr "No s'ha pogut obtenir el certificat del servidor."
 msgid "Unable to leave messages on server."
 msgstr "No s'han pogut deixar els missatges en el servidor."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "No s'ha pogut adjuntar «%s»!"
@@ -2987,12 +2784,12 @@ msgstr "No s'ha pogut adjuntar «%s»!"
 msgid "Unable to lock mailbox!"
 msgstr "No s'ha pogut blocar la bústia!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
 msgstr "No s'ha pogut obrir el fitxer temporal!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
 msgstr "No s'ha pogut obrir el fitxer temporal!"
@@ -3001,31 +2798,22 @@ msgstr "No s'ha pogut obrir el fitxer temporal!"
 msgid "Unable to open temporary file!"
 msgstr "No s'ha pogut obrir el fitxer temporal!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Recupera"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "Restaura els missatges que concorden amb: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Recupera"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "El valor de «Content-Type» «%s» no és conegut."
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "S'està dessubscrivint de «%s»..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "S'està dessubscrivint de «%s»..."
@@ -3035,7 +2823,7 @@ msgstr "S'està dessubscrivint de «%s»..."
 msgid "Unsubscribing to %s..."
 msgstr "S'està dessubscrivint de «%s»..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "Desmarca els missatges que concorden amb: "
 
@@ -3050,7 +2838,7 @@ msgstr "S'està penjant el missatge..."
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Habiliteu l'escriptura amb «toggle-write»!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Voleu usar l'ID de clau «%s» per %s?"
@@ -3060,20 +2848,16 @@ msgstr "Voleu usar l'ID de clau «%s» per %s?"
 msgid "Username at %s: "
 msgstr "Nom d'usuari en «%s»: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "El mes no és vàlid: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "El mes no és vàlid: %s"
 
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
-
 #: commands.c:89
 msgid "Verify PGP signature?"
 msgstr "Voleu verificar la signatura PGP?"
@@ -3082,16 +2866,10 @@ msgstr "Voleu verificar la signatura PGP?"
 msgid "Verifying message indexes..."
 msgstr "S'estan verificant els índexs dels missatges..."
 
-# ivb (2001/12/08)
-# ivb  Menú superpoblat: mantenir _molt_ curt!
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "VeuAdjnt"
-
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  AVÍS!  Esteu a punt de sobreescriure «%s»; voleu continuar?
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "AVÍS!  Aneu a sobreescriure «%s»; voleu continuar?"
@@ -3102,26 +2880,26 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "El certificat del servidor ha expirat."
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "El certificat del servidor ha expirat."
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "El certificat del servidor encara no és vàlid."
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "El certificat del servidor encara no és vàlid."
@@ -3146,11 +2924,11 @@ msgstr "S'està esperant el blocatge amb fcntl()... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "S'està esperant el blocatge amb flock()... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "S'està esperant una resposta..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "Avís: «%s» no és un IDN vàlid."
@@ -3160,12 +2938,12 @@ msgstr "Avís: «%s» no és un IDN vàlid."
 msgid "Warning: At least one certification key has expired\n"
 msgstr "El certificat del servidor ha expirat."
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Avís: L'IDN «%s» de l'àlies «%s» no és vàlid.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Avís: No s'ha pogut desar el certificat."
 
@@ -3186,19 +2964,19 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
 # ivb (2001/11/20)
 # ivb  Curiosa forma d'emetre un error...
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
 msgstr "El que ocorre ací és que no s'ha pogut adjuntar un fitxer."
 
@@ -3214,7 +2992,7 @@ msgstr "L'escriptura fallà!  Es desa la bústia parcial en «%s»."
 msgid "Write fault!"
 msgstr "Error d'escriptura!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Escriu el missatge en la bústia"
 
@@ -3223,7 +3001,7 @@ msgstr "Escriu el missatge en la bústia"
 msgid "Writing %s..."
 msgstr "S'està escrivint «%s»..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "S'està escrivint el missatge en «%s»..."
@@ -3233,74 +3011,56 @@ msgstr "S'està escrivint el missatge en «%s»..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "S'estan escrivint els missatges... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Error en la línia d'ordres: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
 msgstr "Ja heu definit un àlies amb aquest nom!"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Vos trobeu en el primer element de la cadena."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Vos trobeu en l'últim element de la cadena."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr "Vos trobeu en la primera entrada."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Vos trobeu en la primera pàgina."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr "Vos trobeu sobre el primer missatge."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr "Vos trobeu en la primera pàgina."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
 msgstr "Vos trobeu en el primer fil."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr "Vos trobeu en l'última entrada."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Vos trobeu en l'última pàgina."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "Vos trobeu sobre l'últim missatge."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr "Vos trobeu en l'última pàgina."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
 msgstr "No podeu baixar més."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
 msgstr "No podeu pujar més."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
 msgstr "No teniu cap àlies!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
 msgstr "No es pot esborrar l'únic fitxer adjunt."
 
@@ -3308,7 +3068,7 @@ msgstr "No es pot esborrar l'únic fitxer adjunt."
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Només es poden redirigir parts de tipus «message/rfc822»."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Voleu acceptar?"
@@ -3337,7 +3097,7 @@ msgstr ""
 "[-- Eixida de l'ordre de visualització automàtica --]\n"
 "[-- «%s» --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3345,11 +3105,11 @@ msgstr ""
 "[-- COMENÇA EL MISSATGE PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- COMENÇA EL BLOC DE CLAU PÚBLICA PGP --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3357,7 +3117,7 @@ msgstr ""
 "[-- COMENÇA EL MISSATGE PGP SIGNAT --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3366,42 +3126,42 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- No s'ha pogut executar «%s». --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- TERMINA EL MISSATGE PGP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- TERMINA EL BLOC DE CLAU PÚBLICA PGP --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- TERMINA EL MISSATGE PGP SIGNAT --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- Final de les dades xifrades amb PGP/MIME. --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- Final de les dades xifrades amb PGP/MIME. --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Final de les dades xifrades amb S/MIME. --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Final de les dades signades amb S/MIME. --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3415,7 +3175,7 @@ msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Error: No s'ha pogut mostrar cap part del «multipart/alternative»! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3423,7 +3183,7 @@ msgstr ""
 "[-- Error: L'estructura «multipart/signed» no és consistent! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3433,11 +3193,11 @@ msgstr ""
 "[-- no és conegut! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Error: No s'ha pogut crear un fitxer temporal! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3445,14 +3205,14 @@ msgstr ""
 "[-- Error: No s'ha trobat l'inici del missatge PGP! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- Error: No s'ha pogut crear un fitxer temporal! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3466,7 +3226,7 @@ msgstr ""
 "[-- Error: La part «message/external-body» --]\n"
 "[-- no té paràmetre «access-type». --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -3474,7 +3234,7 @@ msgstr ""
 "[-- Les dades següents es troben xifrades amb PGP/MIME: --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
@@ -3483,21 +3243,21 @@ msgstr ""
 "[-- Les dades següents es troben xifrades amb PGP/MIME: --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr "[-- Les dades següents es troben xifrades amb S/MIME: --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr "[-- Les dades següents es troben signades amb S/MIME: --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -3522,7 +3282,7 @@ msgstr "[-- Aquest fitxer adjunt de tipus «%s/%s» no s'inclou, --]\n"
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tipus: %s/%s, Codificació: %s, Mida: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -3530,7 +3290,7 @@ msgstr ""
 "[-- Avís: No s'ha trobat cap signatura. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3562,33 +3322,33 @@ msgstr "[-- nom: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- amb data %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
 msgstr "Expirat     "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
 msgstr "No vàlid    "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
 msgstr "Revocat     "
@@ -3602,16 +3362,43 @@ msgstr "[la data no és vàlida]"
 msgid "[unable to calculate]"
 msgstr "[no s'ha pogut calcular]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: No s'ha indicat cap adreça."
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "No s'ha trobat cap missatge marcat."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "No s'ha trobat cap missatge marcat."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Voleu guardar una còpia d'aquest missatge?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "edita la descripció d'un fitxer adjunt"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "edita la descripció d'un fitxer adjunt"
@@ -3620,22 +3407,92 @@ msgstr "edita la descripció d'un fitxer adjunt"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: Sobren arguments."
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Error en llegir el directori."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "No hi ha cap bústia amb correu nou."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
 msgstr "color: Manquen arguments."
 
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+# ivb (2001/12/08)
+# ivb  Ací no hi ha forma de posar el punt final de segur :(
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "No hi ha cap missatge nou"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
+
 #: commands.c:788
 msgid "converting"
 msgstr "no es farà conversió"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Escriu el missatge en la bústia"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
@@ -3651,24 +3508,108 @@ msgstr "No s'ha pogut truncar una carpeta temporal: %s."
 msgid "could not write temporary mail folder: %s"
 msgstr "No s'ha pogut escriure en una carpeta temporal: %s."
 
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "No s'ha definit cap bústia d'entrada."
+
 # ivb (2004/03/20)
 # ivb  (d)ata, (a)lfabet, (m)ida, (n)o
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "damn"
 
 # ivb (2001/12/08)
 # ivb  També apareix com a error aïllat.
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
 msgstr "Els colors per defecte no estan suportats."
 
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+# ivb (2001/11/30)
+# ivb  Use «eliminar» pq en portar els missatges s'eliminen completament
+# ivb  del servidor POP.
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Voleu eliminar els missatges del servidor?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Restaura els missatges que concorden amb: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Restaura els missatges que concorden amb: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
+
 # ivb (2004/08/16)
 # ivb  (d)ata/(o)rig/(r)ebut/(t)ema/de(s)t/(f)il/(c)ap/(m)ida/(p)unt/sp(a)m
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "dortsfcmpa"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Voleu editar el missatge a reenviar?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3684,57 +3625,144 @@ msgstr "S'està copiant en «%s»..."
 msgid "echo Decompressing %s..."
 msgstr "S'està seleccionant la bústia «%s»..."
 
-#: pattern.c:777
-msgid "empty pattern"
-msgstr "El patró és buit."
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "No es convertirà el fitxer adjunt actual."
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: keymap_defs.h:29
 #, fuzzy
-msgid "encryption"
-msgstr "Xifra"
+msgid "edit attachment description"
+msgstr "edita la descripció d'un fitxer adjunt"
 
-#: crypt.cpkg:570
-#, fuzzy, c-format
-msgid "error adding recipient `%.*s': %s\n"
-msgstr "Error en el patró en: %s"
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
-#, fuzzy, c-format
-msgid "error allocating data object: %s\n"
-msgstr "Error en el patró en: %s"
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
 
-#: crypt.cpkg:328
-#, fuzzy, c-format
-msgid "error creating gpgme context: %s\n"
-msgstr "Error en el patró en: %s"
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
 
-#: crypt.cpkg:354
-#, c-format
-msgid "error creating gpgme data object: %s\n"
+#: keymap_defs.h:28
+msgid "edit the CC list"
 msgstr ""
 
-#: crypt.cpkg:338
-#, c-format
-msgid "error enabling CMS protocol: %s\n"
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
 msgstr ""
 
-#: crypt.cpkg:655
-#, fuzzy, c-format
-msgid "error encrypting data: %s\n"
-msgstr "Error en el patró en: %s"
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
 
-#: crypt.cpkg:604
-#, fuzzy, c-format
-msgid "error getting secret key `%s': %s\n"
-msgstr "Error en el patró en: %s"
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
 
-#: crypt.cpkg:3657
-#, fuzzy, c-format
-msgid "error importing gpg data: %s\n"
-msgstr "Error en el patró en: %s"
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
 
-#: pattern.c:499
-msgid "error in expression"
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "No s'ha pogut escriure el missatge."
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "S'estan recollint les capçaleres dels missatges... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Voleu editar el missatge a reenviar?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Voleu guardar una còpia d'aquest missatge?"
+
+#: pattern.c:777
+msgid "empty pattern"
+msgstr "El patró és buit."
+
+#: crypt.cpkg:2718 crypt.cpkg:2841
+#, fuzzy
+msgid "encryption"
+msgstr "Xifra"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Voleu guardar una còpia d'aquest missatge?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
+#: crypt.cpkg:570
+#, fuzzy, c-format
+msgid "error adding recipient `%.*s': %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt.cpkg:328
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt.cpkg:354
+#, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr ""
+
+#: crypt.cpkg:338
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
+
+#: crypt.cpkg:655
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt.cpkg:604
+#, fuzzy, c-format
+msgid "error getting secret key `%s': %s\n"
+msgstr "Error en el patró en: %s"
+
+#: crypt.cpkg:3643
+#, fuzzy, c-format
+msgid "error importing gpg data: %s\n"
+msgstr "Error en el patró en: %s"
+
+#: pattern.c:499
+msgid "error in expression"
 msgstr "Error en l'expressió."
 
 #: pattern.c:667 pattern.c:771
@@ -3770,7 +3798,7 @@ msgstr "error: L'operació %d és desconeguda. (informeu d'aquest error)"
 # ivb (2004/08/16)
 # ivb  (x)ifra, (s)igna, si(g)na com a, (a)mbdós, {PGP/M(i)ME|en lín(i)a}, o en (c)lar
 # La «f» i la «c» originals s'agafen en el mateix cas en el codi.  ivb
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "xsgaic"
@@ -3778,15 +3806,73 @@ msgstr "xsgaic"
 # ivb (2004/08/16)
 # ivb  (x)ifra, (s)igna, si(g)na com a, (a)mbdós, {PGP/M(i)ME|en lín(i)a}, o en (c)lar
 # La «f» i la «c» originals s'agafen en el mateix cas en el codi.  ivb
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "xsgaic"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec: Manquen arguments."
 
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+# ivb (2001/12/07)
+# ivb  El primer «%s» és una adreça de correu i el segon potser «,...».
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Voleu escriure un seguiment a %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Voleu reenviar com a fitxers adjunts?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "S'està comprovant si hi ha missatges nous..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Vos trobeu sobre el primer missatge."
+
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
 msgid "gnutls_certificate_allocate_credentials: %s"
@@ -3807,12 +3893,32 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Vos trobeu en l'última pàgina."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "No hi ha cap bústia amb correu nou."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Error en obrir la bústia."
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "No hi ha cap bústia amb correu nou."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
@@ -3825,23 +3931,121 @@ msgstr "ha estat esborrat --]\n"
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: Ha fallat «EXPUNGE»."
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
 msgstr "El camp de capçalera no és vàlid."
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "El número d'índex no és vàlid."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Salta al missatge: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Salta al missatge: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "El fil conté missatges no llegits."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Vos trobeu en el primer fil."
+
+# ivb (2001/12/08)
+# ivb  Ací no hi ha forma de posar el punt final de segur :(
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "No hi ha cap missatge no llegit"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+# ivb (2001/12/08)
+# ivb  Ací no hi ha forma de posar el punt final de segur :(
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "No hi ha cap missatge no llegit"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Voleu guardar una còpia d'aquest missatge?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "Claus PGP que concorden amb <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Redirigeix els missatges marcats a: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "No hi ha cap bústia amb correu nou."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: La seqüència de tecles és buida."
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro: Sobren arguments."
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
@@ -3851,6 +4055,38 @@ msgstr "No s'ha trobat cap entrada pel tipus «%s» en «mailcap»"
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): No s'ha pogut canviar la data del fitxer."
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
@@ -3866,19 +4102,110 @@ msgstr "Els parèntesis no estan aparellats: %s"
 msgid "missing parameter"
 msgstr "Manca un paràmetre."
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
 msgstr "mono: Manquen arguments."
 
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Vos trobeu en la primera entrada."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Vos trobeu sobre el primer missatge."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Vos trobeu en l'última entrada."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Vos trobeu sobre l'últim missatge."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Vos trobeu en l'última entrada."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Vos trobeu en l'última pàgina."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "No hi ha cap missatge no esborrat."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Vos trobeu en la primera entrada."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Vos trobeu en la primera pàgina."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "No hi ha cap missatge no esborrat."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Vos trobeu en la primera pàgina."
+
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
 msgstr "El missatge «multipart» no té paràmetre «boundary»!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "no"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "(cap bústia)"
@@ -3887,47 +4214,274 @@ msgstr "(cap bústia)"
 msgid "not converting"
 msgstr "es farà conversió"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "La seqüència de tecles és nuŀla."
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 # ivb (2001/11/27)
 # ivb  (s)obreescriu, (a)fig, (c)anceŀla
 #: muttlib.c:260
 msgid "oac"
 msgstr "sac"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Obri en mode de només lectura la bústia"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Obri en mode de només lectura la bústia"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "S'està reobrint la bústia..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+# ivb (2001/12/02)
+# ivb  El programa posa l'interrogant.
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Voleu redirigir el missatge a %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "El prefix usat en «reset» no és permés."
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Vos trobeu en la primera entrada."
+
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push: Sobren arguments."
 
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Voleu recuperar un missatge posposat?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "El fil conté missatges no llegits."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "No es pot editar un missatge en un servidor POP."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: No s'ha pogut adjuntar el fitxer."
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Salta al missatge: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+# ivb (2001/11/30)
+# ivb  Use «eliminar» pq en portar els missatges s'eliminen completament
+# ivb  del servidor POP.
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Voleu eliminar els missatges del servidor?"
+
 # ivb (2001/11/27)
 # ivb  (r)ebutja, accepta (u)na sola volta
-#: lib-sys/mutt_ssl.cpkg:788
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ru"
 
 # ivb (2001/11/27)
 # ivb  (r)ebutja, accepta (u)na sola volta, accepta (s)empre
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "rus"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Desa%s en la bústia"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Desa%s en la bústia"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "No es pot editar un missatge en un servidor POP."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "Error en l'expressió."
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Cerca: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "No s'ha pogut enviar el missatge."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Voleu reenviar com a fitxers adjunts?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Limita als missatges que concorden amb: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "No hi ha més text citat."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Voleu imprimir el missatge?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "La carpeta no conté missatges."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: Error en «%s»."
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: Hi ha errors en «%s»."
@@ -3935,11 +4489,20 @@ msgstr "source: Hi ha errors en «%s»."
 # ivb (2001/12/08)
 # ivb  ABREUJAT!
 # ivb  source: S'avorta la lectura de «%s» perquè conté massa errors.
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: «%s» conté massa errors: s'avorta la lectura."
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "No hi ha cap fitxer que concorde amb la màscara de fitxers."
+
 # ivb (2001/11/27)
 # ivb  Cal mantenir el missatge curt.
 # ivb  ABREUJAT!
@@ -3948,6 +4511,28 @@ msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: La bústia és modificada però els missatges no! (informeu de l'error)"
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Desmarca els missatges que concorden amb: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Vos trobeu en el primer fil."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3958,27 +4543,100 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "No hi ha més text citat."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "La recodificació només afecta els fitxers adjunts de tipus text."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "No s'ha indicat cap patró de recerca."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+# ivb (2001/12/08)
+# ivb  Ací no hi ha forma de posar el punt final de segur :(
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "No hi ha cap missatge no llegit"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
 # ivb (2001/12/08)
 # ivb  També apareix com a error aïllat.
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
 msgstr "Manquen arguments."
 
 # ivb (2001/12/08)
 # ivb  També apareix com a error aïllat.
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "Sobren arguments."
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "edita la descripció d'un fitxer adjunt"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Restaura els missatges que concorden amb: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Restaura els missatges que concorden amb: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Restaura els missatges que concorden amb: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
@@ -3997,10 +4655,28 @@ msgstr "unhook: El tipus de «hook» no és conegut: %s"
 # ivb (2001/12/08)
 # ivb  Apareix amb més coses al darrere (curs_lib) o entre parèntesis
 # ivb  (mutt_socket) -> sense punt.
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "Error desconegut"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Desmarca els missatges que concorden amb: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "edita la descripció d'un fitxer adjunt"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -4012,12 +4688,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
 msgstr "El valor usat en «reset» no és permés."
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "S'ha desat el fitxer adjunt."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Nou fitxer: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Escriu el missatge en la bústia"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "sí"
 
@@ -4026,3 +4733,6 @@ msgstr "sí"
 msgid "yna"
 msgstr "snt"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/cs.po b/po/cs.po
index 3059f5f..4be096e 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,45 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2004-08-21 20:20+0200\n"
 "Last-Translator: Dan Ohnesorg <dan@ohnesorg.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
 #
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Obecnì platné:\n"
+"Obecně platné:\n"
 "\n"
 
 #
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"Nesvázané funkce:\n"
+"Nesvázané funkce:\n"
 "\n"
 
 #
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Konec podepsaných dat --]\n"
+"[-- Konec podepsaných dat --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -71,55 +71,55 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"Pou¾ití: mutt [ -nRyzZ ] [ -e <pøíkaz> ] [ -F <soubor> ] [ -m <typ> ] [ -f "
+"Použití: mutt [ -nRyzZ ] [ -e <příkaz> ] [ -F <soubor> ] [ -m <typ> ] [ -f "
 "<soubor> ]\n"
-"       mutt [ -nR ] [ -e <pøíkaz> ] [ -F <soubor> ] -Q <dotaz> [ -Q "
+"       mutt [ -nR ] [ -e <příkaz> ] [ -F <soubor> ] -Q <dotaz> [ -Q "
 "<dotaz> ] [...]\n"
-"       mutt [ -nR ] [ -e <pøíkaz> ] [ -F <soubor> ] -A <alias> [ -A "
+"       mutt [ -nR ] [ -e <příkaz> ] [ -F <soubor> ] -A <alias> [ -A "
 "<alias> ] [...]\n"
-"       mutt [ -nx ] [ -e <pøíkaz> ] [ -a <soubor> ] [ -F <soubor> ] [ -H "
-"<soubor> ][ -i <soubor> ] [ -s <vìc> ] [ -b <adr> ] [ -c <adr> ]  <adr>  \n"
+"       mutt [ -nx ] [ -e <příkaz> ] [ -a <soubor> ] [ -F <soubor> ] [ -H "
+"<soubor> ][ -i <soubor> ] [ -s <věc> ] [ -b <adr> ] [ -c <adr> ]  <adr>  \n"
 "[ ... ]\n"
-"       mutt [ -n ] [ -e <pøíkaz> ] [ -F <soubor> ] -p\n"
+"       mutt [ -n ] [ -e <příkaz> ] [ -F <soubor> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
-"pøepínaèe:\n"
-"  -A <alias>\texpanduje zadaný alias\n"
-"  -a <soubor>\tpøipojí soubor ke zprávì\n"
+"přepínače:\n"
+"  -A <alias>\texpanduje zadaný alias\n"
+"  -a <soubor>\tpřipojí soubor ke zprávě\n"
 "  -b <adresa>\tspecifikuje adresu pro utajenou kopii (BCC)\n"
 "  -c <adresa>\tspecifikuje adresu pro kopii (CC)\n"
-"  -e <pøíkaz>\tpøíkaz bude vykonán po inicializaci\n"
-"  -f <soubor>\tète z této schránky\n"
-"  -F <soubor>\talternativní soubor muttrc\n"
-"  -H <soubor>\tz tohoto souboru budou naèteny vzory hlavièek\n"
-"  -i <soubor>\ttento soubor Mutt vlo¾í do odpovìdi\n"
-"  -m <typ>\timplicitní typ schránky\n"
-"  -n\t\tMutt nebude èíst systémový soubor Muttrc\n"
-"  -p\t\tvrátí se k odlo¾ené zprávì\n"
-"  -Q <promìná>\tdotá¾e se na konfiguraèní promìnnou\n"
-"  -R\t\totevøe schránku pouze pro ètení\n"
-"  -s <vìc>\tspecifikuje vìc (pokud obsahuje mezery,\n"
-"              \ttak musí být v uvozovkách)\n"
-"  -v\t\tzobrazí oznaèení verze a parametry zadané pøi pøekladu\n"
-"  -x\t\tnapodobí odesílací re¾im programu mailx\n"
-"  -y\t\tzvolí schránku uvedenou v seznamu `mailboxes'\n"
-"  -z\t\tpokud ve schránce není po¹ta, pak okam¾itì skonèí\n"
-"  -Z\t\totevøe první slo¾ku s novou po¹tou; pokud není ¾ádná nová po¹ta,\n"
-"    \t\ttak okam¾itì skonèí\n"
-"  -h\t\tvypí¹e tuto nápovìdu"
-
-#
-#: compose.c:152 compose.c:156
+"  -e <příkaz>\tpříkaz bude vykonán po inicializaci\n"
+"  -f <soubor>\tčte z této schránky\n"
+"  -F <soubor>\talternativní soubor muttrc\n"
+"  -H <soubor>\tz tohoto souboru budou načteny vzory hlaviček\n"
+"  -i <soubor>\ttento soubor Mutt vloží do odpovědi\n"
+"  -m <typ>\timplicitní typ schránky\n"
+"  -n\t\tMutt nebude číst systémový soubor Muttrc\n"
+"  -p\t\tvrátí se k odložené zprávě\n"
+"  -Q <proměná>\tdotáže se na konfigurační proměnnou\n"
+"  -R\t\totevře schránku pouze pro čtení\n"
+"  -s <věc>\tspecifikuje věc (pokud obsahuje mezery,\n"
+"              \ttak musí být v uvozovkách)\n"
+"  -v\t\tzobrazí označení verze a parametry zadané při překladu\n"
+"  -x\t\tnapodobí odesílací režim programu mailx\n"
+"  -y\t\tzvolí schránku uvedenou v seznamu `mailboxes'\n"
+"  -z\t\tpokud ve schránce není pošta, pak okamžitě skončí\n"
+"  -Z\t\totevře první složku s novou poštou; pokud není žádná nová pošta,\n"
+"    \t\ttak okamžitě skončí\n"
+"  -h\t\tvypíše tuto nápovědu"
+
+#
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " podepsat jako: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     pro %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   od %s"
@@ -163,16 +163,16 @@ msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
 #
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' pro seznam): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
 #
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr " (inline)"
 
@@ -180,139 +180,139 @@ msgstr " (inline)"
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Stisknìte `%s' pro zapnutí zápisu"
+msgstr " Stiskněte `%s' pro zapnutí zápisu"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " v tomto omezeném zobrazení"
+msgstr " v tomto omezeném zobrazení"
 
 #
 #: commands.c:601
 msgid " tagged"
-msgstr " oznaèené"
+msgstr " označené"
 
 #
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "pøíkaz %c je nesprávný"
+msgstr "příkaz %c je nesprávný"
 
 #
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "V tomto re¾imu není %c podporováno."
+msgstr "V tomto režimu není %c podporováno."
 
 #
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "ponecháno: %d, smazáno: %d"
+msgstr "ponecháno: %d, smazáno: %d"
 
 #
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "ponecháno: %d, pøesunuto: %d, smazáno: %d"
+msgstr "ponecháno: %d, přesunuto: %d, smazáno: %d"
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s [%s]\n"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s [%s]\n"
 
 #
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Opravdu chcete tento klíè pou¾ít?"
+msgstr "%s Opravdu chcete tento klíč použít?"
 
 #
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "Zmìna v %s [#%d]. Zmìnit kódování?"
+msgstr "Změna v %s [#%d]. Změnit kódování?"
 
 #
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] ji¾ neexistuje!"
+msgstr "%s [#%d] již neexistuje!"
 
 #
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [poèet pøeètených zpráv: %d/%d]"
+msgstr "%s [počet přečtených zpráv: %d/%d]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s neexistuje. Mám ho vytvoøit?"
+msgstr "%s neexistuje. Mám ho vytvořit?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s není platná IMAP cesta"
+msgstr "%s není platná IMAP cesta"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s není platná POP cesta"
+msgstr "%s není platná POP cesta"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s není platná POP cesta"
+msgstr "%s není platná POP cesta"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s není platná POP cesta"
+msgstr "%s není platná POP cesta"
 
 #
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s není adresáøem."
+msgstr "%s není adresářem."
 
 #
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s není schránkou!"
+msgstr "%s není schránkou!"
 
 #
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s není schránkou."
+msgstr "%s není schránkou."
 
 #
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s není øádným souborem."
+msgstr "%s není řádným souborem."
 
 #
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s ji¾ neexistuje!"
+msgstr "%s již neexistuje!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -327,127 +327,127 @@ msgid ""
 msgstr ""
 
 #
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
-msgstr "neznámý typ %s"
+msgstr "neznámý typ %s"
 
 #
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "Barvu %s terminál nepodporuje."
+msgstr "Barvu %s terminál nepodporuje."
 
 #
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "Pøíkaz %s je definován pouze pro objekt typu index."
+msgstr "Příkaz %s je definován pouze pro objekt typu index."
 
 #
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "Atribut %s není definován."
+msgstr "Atribut %s není definován."
 
 #
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "Barva %s není definována."
+msgstr "Barva %s není definována."
 
 #
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
-msgstr "funkce %s není známa"
+msgstr "funkce %s není známa"
 
 #
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "funkce %s není v mapì"
+msgstr "funkce %s není v mapě"
 
 #
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr "menu %s neexistuje"
 
 #
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "Objekt %s není definován"
+msgstr "Objekt %s není definován"
 
 #
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "pøíli¹ málo argumentù pro %s"
+msgstr "příliš málo argumentů pro %s"
 
 #
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "soubor %s nelze pøipojit"
+msgstr "soubor %s nelze připojit"
 
 #
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "Soubor %s nelze pøipojit.\n"
+msgstr "Soubor %s nelze připojit.\n"
 
 #
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "Pøíkaz %s není znám."
+msgstr "Příkaz %s není znám."
 
 #
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "neznámý typ %s"
+msgstr "neznámý typ %s"
 
 #
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "Promìnná %s není známa."
+msgstr "Proměnná %s není známa."
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s není platná POP cesta"
+msgstr "%s není platná POP cesta"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s není platná POP cesta"
+msgstr "%s není platná POP cesta"
 
 #
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(je tøeba svázat funkci 'view-attachments' s nìjakou klávesou!)"
+msgstr "(je třeba svázat funkci 'view-attachments' s nějakou klávesou!)"
 
 #
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(¾ádná schránka)"
+msgstr "(žádná schránka)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(o)dmítnout, akceptovat pouze (t)eï "
+msgstr "(o)dmítnout, akceptovat pouze (t)eď "
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(o)dmítnout, akceptovat pouze (t)eï, akceptovat (v)¾dy "
+msgstr "(o)dmítnout, akceptovat pouze (t)eÄ\8f, akceptovat (v)ždy "
 
 #
 #: handler.c:1191
@@ -459,31 +459,31 @@ msgstr "(o velikosti v bajtech: %s) "
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(pro zobrazení této èásti pou¾ijte '%s')"
+msgstr "(pro zobrazení této Ä\8dásti použijte '%s')"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
 #
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- Pøílohy"
+msgstr "-- Přílohy"
 
 #
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<NEZNÁMÝ>"
+msgstr "<NEZNÁMÝ>"
 
 #
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<implicitní>"
+msgstr "<implicitní>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -495,138 +495,128 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "APOP ovìøení se nezdaøilo."
-
-#
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Zru¹it"
+msgstr "APOP ověření se nezdařilo."
 
 #
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Zahodit nezmìnìnou zprávu?"
+msgstr "Zahodit nezměněnou zprávu?"
 
 #
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Nezmìnìná zpráva byla zahozena."
+msgstr "Nezměněná zpráva byla zahozena."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
 #
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adresa: "
 
 #
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Pøezdívka zavedena."
+msgstr "Přezdívka zavedena."
 
 #
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Pøezdívat jako: "
+msgstr "Přezdívat jako: "
 
 #
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "Pøezdívky"
+msgstr "Přezdívky"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr ""
-"V¹em vyhovujícím klíèùm vypr¹ela platnost, byly zneplatnìny nebo zakázány."
-
-#
-#: remailer.c:431
-msgid "Append"
-msgstr "Pøipojit"
+"Všem vyhovujícím klíčům vypršela platnost, byly zneplatněny nebo zakázány."
 
 #
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Pøipojit zprávy do %s?"
+msgstr "Připojit zprávy do %s?"
 
 #
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Argumentem musí být èíslo zprávy."
+msgstr "Argumentem musí být číslo zprávy."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
 #
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "Pøíloha ulo¾ena."
+msgstr "PÅ\99íloha uložena."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
 #
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "Pøilo¾it soubor"
+msgstr "PÅ\99iložit soubor"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "Pøipojuji zvolené soubory..."
+msgstr "Připojuji zvolené soubory..."
 
 #
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "Pøíloha byla filtrována."
+msgstr "Příloha byla filtrována."
 
 #
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "Pøíloha ulo¾ena."
+msgstr "PÅ\99íloha uložena."
 
 #
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "Pøílohy"
+msgstr "Přílohy"
 
 #: imap/auth.c:83
 #, c-format
 msgid "Authenticating (%s)..."
-msgstr "Pøihla¹uji (%s)..."
+msgstr "Přihlašuji (%s)..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "Ovìøuji (APOP)..."
+msgstr "Ověřuji (APOP)..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "Ovìøuji (SASL)..."
+msgstr "Ověřuji (SASL)..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "Ovìøuji (SASL)..."
+msgstr "Ověřuji (SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -635,63 +625,63 @@ msgstr ""
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "Chybné IDN \"%s\"."
+msgstr "Chybné IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "Chybné IDN %s pøi generování resent-from."
+msgstr "Chybné IDN %s při generování resent-from."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "Neplatné IDN v \"%s\": '%s'"
+msgstr "Neplatné IDN v \"%s\": '%s'"
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "Chybné IDN: '%s'"
+msgstr "Chybné IDN: '%s'"
 
 #
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "Chybný název schránky"
+msgstr "Chybný název schránky"
 
 #
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "Konec zprávy je zobrazen."
+msgstr "Konec zprávy je zobrazen."
 
 #
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Zaslat kopii zprávy na %s"
+msgstr "Zaslat kopii zprávy na %s"
 
 #
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Zaslat kopii zprávy na: "
+msgstr "Zaslat kopii zprávy na: "
 
 #
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Zaslat kopii zpráv na %s"
+msgstr "Zaslat kopii zpráv na %s"
 
 #
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Zaslat kopii oznaèených zpráv na: "
+msgstr "Zaslat kopii označených zpráv na: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "Pøíkaz CLOSE se nezdaøil."
+msgstr "Příkaz CLOSE se nezdařil."
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -701,67 +691,67 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Ke slo¾ce nelze pøipojit: %s"
+msgstr "Ke složce nelze připojit: %s"
 
 #
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Adresáø nelze pøipojit!"
+msgstr "Adresář nelze připojit!"
 
 #
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "%s nelze vytvoøit: %s"
+msgstr "%s nelze vytvořit: %s"
 
 #
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "Soubor %s nelze vytvoøit."
+msgstr "Soubor %s nelze vytvořit."
 
 #
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Filtr nelze vytvoøit"
+msgstr "Filtr nelze vytvořit"
 
 #
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "Filtrovací proces nelze vytvoøit"
+msgstr "Filtrovací proces nelze vytvořit"
 
 #
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Doèasný soubor nelze vytvoøit."
+msgstr "Dočasný soubor nelze vytvořit."
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"V¹echny oznaèené pøílohy nelze dekódovat. Zapouzdøit je do MIME formátu?"
+"Všechny označené přílohy nelze dekódovat. Zapouzdřit je do MIME formátu?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr "V¹echny oznaèené pøílohy nelze dekódovat. Pøeposlat je v MIME formátu?"
+msgstr "Všechny označené přílohy nelze dekódovat. Přeposlat je v MIME formátu?"
 
 #
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "Nemohu de¹ifrovat za¹ifrovanou zprávu!"
+msgstr "Nemohu dešifrovat zašifrovanou zprávu!"
 
 #
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "Z POP serveru nelze mazat pøílohy."
+msgstr "Z POP serveru nelze mazat přílohy."
 
 #
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "Z POP serveru nelze mazat pøílohy."
+msgstr "Z POP serveru nelze mazat přílohy."
 
 #
 #: lib-mx/mx.c:103
@@ -776,155 +766,147 @@ msgstr ""
 #
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "®ádná zpráva není oznaèena."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "'type2.list' pro mixmaster nelze získat."
+msgstr "Žádná zpráva není označena."
 
 #
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Shodu pro jmenný vzor nelze nalézt, pokraèovat?"
+msgstr "Shodu pro jmenný vzor nelze nalézt, pokračovat?"
 
 #
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Soubor se zprávou nelze otevøít: %s"
+msgstr "Soubor se zprávou nelze otevřít: %s"
 
 #
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Ke slo¾ce nelze pøipojit: %s"
+msgstr "Ke složce nelze připojit: %s"
 
 #
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Spojení s %s uzavøeno"
+msgstr "Spojení s %s uzavřeno"
 
 #
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Konèím spojení s POP serverem..."
+msgstr "Končím spojení s POP serverem..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
 #
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "Chyba pøi volání funkce stat pro %s"
+msgstr "Chyba při volání funkce stat pro %s"
 
 #
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "%s nelze vytvoøit: %s"
+msgstr "%s nelze vytvořit: %s"
 
 #
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Do POP schránek nelze ukládat zprávy."
+msgstr "Do POP schránek nelze ukládat zprávy."
 
 #
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Na POP serveru nelze zprávy editovat."
+msgstr "Na POP serveru nelze zprávy editovat."
 
 #
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "Chyba pøi volání funkce stat pro %s: %s"
+msgstr "Chyba při volání funkce stat pro %s: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
 #
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Adresáø nelze zobrazit"
+msgstr "Adresář nelze zobrazit"
 
 #
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "Soubor %s nelze vytvoøit."
+msgstr "Soubor %s nelze vytvořit."
 
 #
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Nelze zapsat hlavièku do doèasného souboru!"
+msgstr "Nelze zapsat hlavičku do dočasného souboru!"
 
 #
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Zprávu nelze ulo¾it"
+msgstr "Zprávu nelze uložit"
 
 #
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Nelze zapsat zprávu do doèasného souboru!"
+msgstr "Nelze zapsat zprávu do dočasného souboru!"
 
 #
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Nelze vytvoøit zobrazovací filtr"
+msgstr "Nelze vytvořit zobrazovací filtr"
 
 #
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Nelze vytvoøit filtr"
+msgstr "Nelze vytvořit filtr"
 
 #
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Schránka je urèena pouze pro ètení, zápis nelze zapnout!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Schránka je určena pouze pro čtení, zápis nelze zapnout!"
 
 #
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "Zachycen %s... Konèím.\n"
+msgstr "Zachycen %s... Končím.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "Certifikát serveru není zatím platný."
+msgstr "Certifikát serveru není zatím platný."
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "Certifikát ulo¾en"
+msgstr "Certifikát uložen"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Zmìny obsahu slo¾ky budou ulo¾eny po jejím uzavøení."
+msgstr "Změny obsahu složky budou uloženy po jejím uzavření."
 
 #
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Zmìny obsahu slo¾ky nebudou ulo¾eny."
+msgstr "ZmÄ\9bny obsahu složky nebudou uloženy."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Char = %s, Octal = %o, Decimal = %d"
@@ -932,203 +914,193 @@ msgstr "Char = %s, Octal = %o, Decimal = %d"
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Znaková sada zmìnìna na %s; %s."
-
-#
-#: browser.c:35
-msgid "Chdir"
-msgstr "Zmìnit adresáø"
+msgstr "Znaková sada změněna na %s; %s."
 
 #
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "Nastavit pracovní adresáø na: "
+msgstr "Nastavit pracovní adresář na: "
 
 #
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "Hledám nové zprávy..."
+msgstr "Hledám nové zprávy..."
 
 #
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Kontrolovat klíè  "
-
-#
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "Hledám nové zprávy..."
+msgstr "Hledám nové zprávy..."
 
 #
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "Hledám nové zprávy..."
+msgstr "Hledám nové zprávy..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
 #
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "Nepodepsat/ne¹ifrovat"
+msgstr "Nepodepsat/nešifrovat"
 
 #
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Vypnout pøíznak"
+msgstr "Vypnout příznak"
 
 #
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Konèím spojení s %s..."
+msgstr "Končím spojení s %s..."
 
 #
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "Konèím spojení s POP serverem..."
+msgstr "Končím spojení s POP serverem..."
 
 #
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "Pøipojuji se k %s..."
+msgstr "Připojuji se k %s..."
 
 #
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Server nepodporuje pøíkaz TOP."
+msgstr "Server nepodporuje příkaz TOP."
 
 #
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Server nepodporuje pøíkaz UIDL."
+msgstr "Server nepodporuje příkaz UIDL."
 
 #
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "Provádím zmìny..."
+msgstr "Provádím změny..."
 
 #
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Pøelo¾eno s volbami:"
+"PÅ\99eloženo s volbami:"
 
 #
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Pøekládám vzor k vyhledání..."
+msgstr "Překládám vzor k vyhledání..."
 
 #
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "Kopíruji do %s..."
+msgstr "Kopíruji do %s..."
 
 #
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "Kopíruji do %s..."
+msgstr "Kopíruji do %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
 #
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "Pøipojuji se k %s..."
+msgstr "Připojuji se k %s..."
 
 #
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "Pøipojuji se k %s..."
+msgstr "Připojuji se k %s..."
 
 #
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "Pøipojuji se k %s..."
+msgstr "Připojuji se k %s..."
 
 #
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Spojení ztraceno. Navázat znovu spojení s POP serverem."
+msgstr "Spojení ztraceno. Navázat znovu spojení s POP serverem."
 
 #
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Spojení ztraceno. Navázat znovu spojení s POP serverem."
+msgstr "Spojení ztraceno. Navázat znovu spojení s POP serverem."
 
 #
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "Spojení s %s uzavøeno"
+msgstr "Spojení s %s uzavřeno"
 
 #
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Spojení s %s uzavøeno"
+msgstr "Spojení s %s uzavřeno"
 
 #
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Polo¾ka Content-Type zmìnìna na %s."
+msgstr "Položka Content-Type změněna na %s."
 
 #
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Polo¾ka 'Content-Type' je tvaru tøída/podtøída"
+msgstr "Položka 'Content-Type' je tvaru třída/podtřída"
 
 #
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "Pokraèovat?"
+msgstr "Pokračovat?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "Pøevést pøi odesílání na %s?"
+msgstr "Převést při odesílání na %s?"
 
 #
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "Zkopírovat %s do schránky"
+msgstr "Zkopírovat %s do schránky"
 
 #
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "Kopíruji zprávy (%d) do %s..."
+msgstr "Kopíruji zprávy (%d) do %s..."
 
 #
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "Kopíruji zprávu %d do %s..."
+msgstr "Kopíruji zprávu %d do %s..."
 
 #
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "Kopíruji do %s..."
+msgstr "Kopíruji do %s..."
 
 #: main.c:63
 msgid ""
@@ -1145,61 +1117,61 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Spojení s %s nelze navázat (%s)."
+msgstr "Spojení s %s nelze navázat (%s)."
 
 #
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "Nelze kopírovat zprávu."
+msgstr "Nelze kopírovat zprávu."
 
 #
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Doèasný soubor nelze vytvoøit!"
+msgstr "Dočasný soubor nelze vytvořit!"
 
 #
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Doèasný soubor nelze vytvoøit!"
+msgstr "Dočasný soubor nelze vytvořit!"
 
 #
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Øadící funkci nelze nalézt! [ohlaste tuto chybu]"
+msgstr "Řadící funkci nelze nalézt! [ohlaste tuto chybu]"
 
 #
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Poèítaè \"%s\" nelze nalézt."
+msgstr "Počítač \"%s\" nelze nalézt."
 
 #
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "V¹echny po¾adované zprávy nelze vlo¾it!"
+msgstr "Všechny požadované zprávy nelze vložit!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "Nelze navázat TLS spojení"
+msgstr "Nelze navázat TLS spojení"
 
 #
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "%s nelze otevøít"
+msgstr "%s nelze otevřít"
 
 #
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Schránku nelze znovu otevøít!"
+msgstr "Schránku nelze znovu otevřít!"
 
 #
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Zprávu nelze odeslat."
+msgstr "Zprávu nelze odeslat."
 
 #
 #: lib-mx/mx.c:407
@@ -1211,128 +1183,112 @@ msgstr "%s nelze zamknout.\n"
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "Vytvoøit %s?"
+msgstr "Vytvořit %s?"
 
 #
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Vytváøení funguje pouze u IMAP schránek."
+msgstr "Vytváření funguje pouze u IMAP schránek."
 
 #
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Vytvoøit schránku: "
+msgstr "Vytvořit schránku: "
 
 #
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "Dekódovat - zkopírovat %s do schránky"
+msgstr "Dekódovat - zkopírovat %s do schránky"
 
 #
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "Dekódovat - ulo¾it %s do schránky"
+msgstr "Dekódovat - uložit %s do schránky"
 
 #
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "Volím %s..."
+msgstr "Volím %s..."
 
 #
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "De¹ifrovat - zkopírovat %s do schránky"
+msgstr "Dešifrovat - zkopírovat %s do schránky"
 
 #
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "De¹ifrovat - ulo¾it %s do schránky"
+msgstr "Dešifrovat - uložit %s do schránky"
 
 #
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
-msgstr "De¹ifruji zprávu..."
+msgstr "Dešifruji zprávu..."
 
 #
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "De¹ifrování se nezdaøilo."
-
-#
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Smazat"
+msgstr "Dešifrování se nezdařilo."
 
 #
-#: remailer.c:433
-msgid "Delete"
-msgstr "Smazat"
-
-#
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Mazání funguje pouze u IMAP schránek."
+msgstr "Mazání funguje pouze u IMAP schránek."
 
 #
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "Odstranit zprávy ze serveru..."
+msgstr "Odstranit zprávy ze serveru..."
 
 #
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "Smazat zprávy shodující se s: "
+msgstr "Smazat zprávy shodující se s: "
 
 #
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Smazat"
 
 #
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Mazání pøíloh ze za¹ifrovaných zpráv není podporováno."
-
-#
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Popis"
+msgstr "Mazání příloh ze zašifrovaných zpráv není podporováno."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "ID %s není verifikováno, chcete jej pou¾ít pro %s?"
+msgstr "ID %s není verifikováno, chcete jej použít pro %s?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s neexistuje. Mám ho vytvoøit?"
+msgstr "%s neexistuje. Mám ho vytvořit?"
 
 #
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Adresáø [%s], Souborová maska: %s"
+msgstr "Adresář [%s], Souborová maska: %s"
 
 #
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "CHYBA: ohlaste, prosím, tuto chybu"
+msgstr "CHYBA: ohlaste, prosím, tuto chybu"
 
 #
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "Upravit pøeposílanou zprávu?"
+msgstr "Upravit přeposílanou zprávu?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1340,60 +1296,60 @@ msgstr ""
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "chyba ve výrazu"
+msgstr "chyba ve výrazu"
 
 #
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Za¹ifrovat"
+msgstr "Zašifrovat"
 
 #
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "Za¹ifrovat pomocí: "
+msgstr "Zašifrovat pomocí: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "Zadejte ID klíèe: "
+msgstr "Zadejte ID klíče: "
 
 #
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "Zadejte ID klíèe pro %s: "
+msgstr "Zadejte ID klíče pro %s: "
 
 #
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "Vyberte klíè (nebo stisknìte ^G pro zru¹ení): "
+msgstr "Vyberte klíč (nebo stiskněte ^G pro zrušení): "
 
 #
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "Chyba pøi pøeposílání zprávy."
+msgstr "Chyba při přeposílání zprávy."
 
 #
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "Chyba pøi pøeposílání zpráv."
+msgstr "Chyba při přeposílání zpráv."
 
 #
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "Chyba pøi zasílání zprávy."
+msgstr "Chyba při zasílání zprávy."
 
 #
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "Chyba pøi pøipojováno k serveru: %s"
+msgstr "Chyba při připojováno k serveru: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
@@ -1401,127 +1357,111 @@ msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
 #
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Chyba pøi pøipojováno k serveru: %s"
+msgstr "Chyba při připojováno k serveru: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
 #
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "Chyba v %s na øádku %d: %s"
+msgstr "Chyba v %s na řádku %d: %s"
 
 #
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Chyba %s na pøíkazovém øádku\n"
+msgstr "Chyba %s na příkazovém řádku\n"
 
 #
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "Výraz %s je chybný."
+msgstr "Výraz %s je chybný."
 
 #
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "Chyba pøi inicializaci terminálu."
+msgstr "Chyba při inicializaci terminálu."
 
 #
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "Chyba pøi inicializaci terminálu."
+msgstr "Chyba při inicializaci terminálu."
 
 #
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "Chyba pøi otevírání schránky"
+msgstr "Chyba při otevírání schránky"
 
 #
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "Chyba pøi zpracování adresy!"
+msgstr "Chyba při zpracování adresy!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
 #
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Chyba pøi bìhu programu \"%s\"!"
+msgstr "Chyba při běhu programu \"%s\"!"
 
 #
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Chyba pøi naèítání adresáøe."
+msgstr "Chyba při načítání adresáře."
 
 #
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Chyba pøi zasílání zprávy, potomek ukonèen %d (%s)."
-
-#
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Chyba pøi zasílání zprávy, potomek ukonèen %d.\n"
-
-#
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Chyba pøi zasílání zprávy."
+msgstr "Chyba při zasílání zprávy, potomek ukončen %d (%s)."
 
 #
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "Chyba pøi komunikaci s %s (%s)"
+msgstr "Chyba při komunikaci s %s (%s)"
 
 #
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "Chyba pøi zobrazování souboru"
+msgstr "Chyba při zobrazování souboru"
 
 #
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "Chyba pøi zápisu do schránky!"
+msgstr "Chyba při zápisu do schránky!"
 
 #
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Chyba. Zachovávám doèasný soubor %s."
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Chyba: %s nelze pou¾ít jako poslední èlánek øetìzu remailerù."
+msgstr "Chyba. Zachovávám dočasný soubor %s."
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "Chyba: '%s' není platné IDN."
+msgstr "Chyba: '%s' není platné IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1541,304 +1481,270 @@ msgid "Error: no TLS socket open"
 msgstr ""
 
 #
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Chyba %s na pøíkazovém øádku\n"
+msgstr "Chyba %s na příkazovém řádku\n"
 
 #
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Stahuji hlavièky zpráv... [%d/%d]"
+msgstr "Stahuji hlavičky zpráv... [%d/%d]"
 
 #
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Spou¹tím pøíkaz pro shodující se zprávy... "
+msgstr "Spouštím příkaz pro shodující se zprávy... "
 
 #
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Konec"
-
-#
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Ukonèit  "
-
-#
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Ukonèit Mutt bez ulo¾ení zmìn?"
+msgstr "Ukončit Mutt bez uložení změn?"
 
 #
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Ukonèit Mutt?"
+msgstr "Ukončit Mutt?"
 
 #
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "Pøíkaz EXPUNGE se nezdaøil."
+msgstr "Příkaz EXPUNGE se nezdařil."
 
 #
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Odstraòuji zprávy ze serveru..."
+msgstr "Odstraňuji zprávy ze serveru..."
 
 #
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Soubor nutný pro zpracování hlavièek se nepodaøilo otevøít."
+msgstr "Soubor nutný pro zpracování hlaviček se nepodařilo otevřít."
 
 #
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Soubor nutný pro odstranìní hlavièek se nepodaøilo otevøít."
+msgstr "Soubor nutný pro odstranění hlaviček se nepodařilo otevřít."
 
 #
 #: attach.c:151
 msgid "Failure to rename file."
-msgstr "Soubor se nepodaøilo pøejmenovat."
+msgstr "Soubor se nepodařilo přejmenovat."
 
 #
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Kritická chyba! Schránku nelze znovu otevøít!"
+msgstr "Kritická chyba! Schránku nelze znovu otevřít!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Osudová chyba. Aktuální poèet zpráv nesouhlasí s pøedchozím údajem!"
+msgstr "Osudová chyba. Aktuální počet zpráv nesouhlasí s předchozím údajem!"
 
 #
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "Odstraòuji zprávy ze serveru..."
+msgstr "Odstraňuji zprávy ze serveru..."
 
 #
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "Stahuji zprávu..."
+msgstr "Stahuji zprávu..."
 
 #
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Stahuji zprávu seznam zpráv..."
+msgstr "Stahuji zprávu seznam zpráv..."
 
 #
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "Stahuji zprávu seznam zpráv..."
+msgstr "Stahuji zprávu seznam zpráv..."
 
 #
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Stahuji hlavièky zpráv... [%d/%d]"
+msgstr "Stahuji hlavičky zpráv... [%d/%d]"
 
 #
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Stahuji hlavièky zpráv... [%d/%d]"
+msgstr "Stahuji hlavičky zpráv... [%d/%d]"
 
 #
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "Stahuji zprávu..."
+msgstr "Stahuji zprávu..."
 
 #
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Souborová maska: "
+msgstr "Souborová maska: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Soubor ji¾ existuje: (p)øepsat, pø(i)pojit èi (z)ru¹it?"
+msgstr "Soubor již existuje: (p)řepsat, př(i)pojit či (z)rušit?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Soubor je adresáøem. Ulo¾it do nìj?"
+msgstr "Soubor je adresářem. Uložit do něj?"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Soubor je adresáøem. Ulo¾it do nìj? [(a)no, (n)e, (v)¹echny]"
+msgstr "Soubor je adresářem. Uložit do něj? [(a)no, (n)e, (v)šechny]"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "Zadejte jméno souboru: "
+msgstr "Zadejte jméno souboru: "
 
 #
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "Filtrovat pøes: "
+msgstr "Filtrovat přes: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
-msgstr "Otisk klíèe: %s"
+msgstr "Otisk klíče: %s"
 
 #
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "odlo¾it zprávu pro pozdìj¹í pou¾ití"
+msgstr "odložit zprávu pro pozdější použití"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
 #
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Odepsat %s%s?"
 
-#
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Odepsat %s%s?"
-
 #
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Pøeposlat zprávu zapouzdøenou do MIME formátu?"
+msgstr "Přeposlat zprávu zapouzdřenou do MIME formátu?"
 
 #
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "Pøeposlat jako pøílohu?"
+msgstr "Přeposlat jako přílohu?"
 
 #
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "Pøeposlat jako pøílohy?"
+msgstr "Přeposlat jako přílohy?"
 
 #
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "V re¾imu pøikládání zpráv není tato funkce povolena."
+msgstr "V režimu přikládání zpráv není tato funkce povolena."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "Stahuji seznam schránek..."
+msgstr "Stahuji seznam schránek..."
 
 #
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "Stahuji jmenný prostor..."
+msgstr "Stahuji jmenný prostor..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Skupinì"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
 #
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Nápovìda"
-
-#
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "Nápovìda pro %s"
+msgstr "Nápověda pro %s"
 
 #
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "Nápovìda je právì zobrazena."
+msgstr "Nápověda je právě zobrazena."
 
 #
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Nevím, jak mám toto vytisknout!"
+msgstr "Nevím, jak mám toto vytisknout!"
 
 #
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Nevím, jak vytisknout pøílohy typu %s!."
+msgstr "Nevím, jak vytisknout přílohy typu %s!."
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "ID nemá definovanou dùvìryhodnost"
+msgstr "ID nemá definovanou důvěryhodnost"
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "Tomuto ID vypr¹ela platnost, nebo bylo zakázáno èi sta¾eno."
+msgstr "Tomuto ID vyprÅ¡ela platnost, nebo bylo zakázáno Ä\8di staženo."
 
 #
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "Toto ID není dùvìryhodné."
+msgstr "Toto ID není důvěryhodné."
 
 #
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "Dùvìryhodnost tohoto ID je pouze èásteèná."
+msgstr "Důvěryhodnost tohoto ID je pouze částečná."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
 #
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Nekorektní PGP hlavièka"
+msgstr "Nekorektní PGP hlavička"
 
 #
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "Nekorektní S/MIME hlavièka"
+msgstr "Nekorektní S/MIME hlavička"
 
 #
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Nesprávný formát polo¾ky pro typ %s v \"%s\" na øádku %d"
+msgstr "Nesprávný formát položky pro typ %s v \"%s\" na řádku %d"
 
 #
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Vlo¾it zprávu do odpovìdi?"
+msgstr "Vložit zprávu do odpovědi?"
 
 #
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "Vkládám zakomentovanou zprávu..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "Vlo¾it"
+msgstr "Vkládám zakomentovanou zprávu..."
 
 #
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Nesprávné datum dne (%s)."
+msgstr "Nesprávné datum dne (%s)."
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
@@ -1846,128 +1752,124 @@ msgid ""
 msgstr ""
 
 #
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Nesprávné kódování."
+msgstr "Nesprávné kódování."
 
 #
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Nesprávné indexové èíslo."
+msgstr "Nesprávné indexové číslo."
 
 #
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Èíslo zprávy není správné."
+msgstr "Číslo zprávy není správné."
 
 #
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Mìsíc %s není správný."
+msgstr "Měsíc %s není správný."
 
 #
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "Chybné relativní datum: %s"
+msgstr "Chybné relativní datum: %s"
 
 #
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "Spou¹tím PGP..."
+msgstr "Spouštím PGP..."
 
 #
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "Spou¹tím PGP..."
+msgstr "Spouštím PGP..."
 
 #
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Vyvolávám pøíkaz %s pro automatické zobrazování"
+msgstr "Vyvolávám příkaz %s pro automatické zobrazování"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Pøejít na zprávu: "
+msgstr "Přejít na zprávu: "
 
 #
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Pøeskoèit na: "
+msgstr "Přeskočit na: "
 
 #
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "V dialozích není pøeskakování implementováno."
+msgstr "V dialozích není přeskakování implementováno."
 
 #
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "ID klíèe: 0x%s"
+msgstr "ID klíče: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
 #
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Klávesa není svázána s ¾ádnou funkcí."
+msgstr "Klávesa není svázána s žádnou funkcí."
 
 #
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Klávesa není svázána. Stisknìte '%s' pro nápovìdu."
+msgstr "Klávesa není svázána. Stiskněte '%s' pro nápovědu."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Omezit na zprávy shodující se s: "
+msgstr "Omezit na zprávy shodující se s: "
 
 #
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "Omezení: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Omezení: %s"
 
 #
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "Probíhá pøihla¹ování..."
+msgstr "Probíhá přihlašování..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1976,159 +1878,149 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Zámek stále existuje, odemknout %s?"
+msgstr "Zámek stále existuje, odemknout %s?"
 
 #
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "Probíhá pøihla¹ování..."
+msgstr "Probíhá přihlašování..."
 
 #
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "Pøihlá¹ení se nezdaøilo."
+msgstr "Přihlášení se nezdařilo."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Hledám klíèe vyhovující \"%s\"..."
+msgstr "Hledám klíče vyhovující \"%s\"..."
 
 #
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "Vyhledávám %s..."
+msgstr "Vyhledávám %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "Otisk klíèe: %s"
+msgstr "Otisk klíče: %s"
 
 #
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "MIME typ není definován, nelze zobrazit pøílohu."
+msgstr "MIME typ není definován, nelze zobrazit přílohu."
 
 #
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Detekována smyèka v makru."
+msgstr "Detekována smyčka v makru."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Psát"
-
-#
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "Zpráva nebyla odeslána."
+msgstr "Zpráva nebyla odeslána."
 
 #
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "Zpráva odeslána."
+msgstr "Zpráva odeslána."
 
 #
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "Do schránky byla vlo¾ena kontrolní znaèka."
+msgstr "Do schránky byla vložena kontrolní značka."
 
 #
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Schránka uzavøena."
+msgstr "Schránka uzavřena."
 
 #
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Schránka vytvoøena."
+msgstr "Schránka vytvořena."
 
 #
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Schránka byla smazána."
+msgstr "Schránka byla smazána."
 
 #
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "Schránka je prázdná."
+msgstr "Schránka je prázdná."
 
 #
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "Schránka má vypnut zápis. %s"
+msgstr "Schránka má vypnut zápis. %s"
 
 #
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "Ze schránky je mo¾né pouze èíst."
+msgstr "Ze schránky je možné pouze číst."
 
 #
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Obsah schránky nebyl zmìnìn."
+msgstr "Obsah schránky nebyl změněn."
 
 #
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "Schránka musí mít jméno."
+msgstr "Schránka musí mít jméno."
 
 #
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Schránka nebyla smazána."
+msgstr "Schránka nebyla smazána."
 
 #
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Schránka vytvoøena."
+msgstr "Schránka vytvořena."
 
 #
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Schránka byla po¹kozena!"
+msgstr "Schránka byla poškozena!"
 
 #
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Obsah schránky byl zmìnìn zvenèí."
+msgstr "Obsah schránky byl změněn zvenčí."
 
 #
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Obsah schránky byl zmìnìn zvenèí. Atributy mohou být nesprávné."
+msgstr "Obsah schránky byl změněn zvenčí. Atributy mohou být nesprávné."
 
 #
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Schránky [%d]"
+msgstr "Schránky [%d]"
 
 #
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Polo¾ka mailcapu 'edit' vy¾aduje %%s."
+msgstr "Položka mailcapu 'edit' vyžaduje %%s."
 
 #
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Polo¾ka mailcapu 'compose' vy¾aduje %%s."
-
-#
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Vytvoøit pøezdívku"
+msgstr "Položka mailcapu 'compose' vyžaduje %%s."
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -2136,181 +2028,152 @@ msgstr ""
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Ma¾u zprávy (poèet: %d)..."
+msgstr "Mažu zprávy (počet: %d)..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Maska"
-
 #
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Kopie zprávy byla odeslána."
+msgstr "Kopie zprávy byla odeslána."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "Zprávu nelze vytisknout"
+msgstr "Zprávu nelze vytisknout"
 
 #
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "Soubor se zprávou je prázdný!"
+msgstr "Soubor se zprávou je prázdný!"
 
 #
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "Kopie zprávy nebyla odeslána."
+msgstr "Kopie zprávy nebyla odeslána."
 
 #
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Zpráva nebyla zmìnìna!"
+msgstr "Zpráva nebyla změněna!"
 
 #
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Rodièovská zpráva není v omezeném zobrazení viditelná.."
+msgstr "Rodičovská zpráva není v omezeném zobrazení viditelná.."
 
 #
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Zpráva byla odlo¾ena."
+msgstr "Zpráva byla odložena."
 
 #
 #: commands.c:390
 msgid "Message printed"
-msgstr "Zpráva byla vytisknuta"
+msgstr "Zpráva byla vytisknuta"
 
 #
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "Zpráva ulo¾ena."
+msgstr "Zpráva uložena."
 
 #
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Kopie zpráv byly odeslány."
+msgstr "Kopie zpráv byly odeslány."
 
 #
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "Zprávy nelze vytisknout"
+msgstr "Zprávy nelze vytisknout"
 
 #
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "Kopie zpráv nebyly odeslány."
+msgstr "Kopie zpráv nebyly odeslány."
 
 #
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Zprávy byly vytisknuty"
+msgstr "Zprávy byly vytisknuty"
 
 #
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Chybí argumenty."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Maximální poèet èlánkù øetìzu remailerù typu mixmaster je %d."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster nepovoluje Cc a Bcc hlavièky."
+msgstr "Chybí argumenty."
 
 #
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Pøesunout pøeètené zprávy do %s?"
+msgstr "Přesunout přečtené zprávy do %s?"
 
 #
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Pøesunuji pøeètené zprávy do %s..."
+msgstr "Přesunuji přečtené zprávy do %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
 #
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nový dotaz"
-
-#
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "Nové jméno souboru: "
+msgstr "Nové jméno souboru: "
 
 #
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "Nový soubor: "
+msgstr "Nový soubor: "
 
 #
 #: buffy.cpkg:330
 msgid "New mail in "
-msgstr "Nová po¹ta.ve slo¾ce "
+msgstr "Nová pošta.ve složce "
 
 #
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "V této schránce je nová po¹ta."
+msgstr "V této schránce je nová pošta."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Dal¹í"
-
-#
-#: pager.c:1304
-msgid "NextPg"
-msgstr "Dlstr"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "Nejsou k dispozici ¾ádné autentikaèní metody"
+msgstr "Nejsou k dispozici žádné autentikační metody"
 
 #
 #: sendlib.c:347
@@ -2318,316 +2181,300 @@ msgid "No boundary parameter found! [report this error]"
 msgstr "Nebyl nalezen 'boundary' parametr! [ohlaste tuto chybu]"
 
 #
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "®ádné polo¾ky."
+msgstr "Žádné položky."
 
 #
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "Souborové masce nevyhovuje ¾ádný soubor."
+msgstr "Souborové masce nevyhovuje žádný soubor."
 
 #
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Není definována ¾ádná schránka pøijímající novou po¹tu."
+msgstr "Není definována žádná schránka přijímající novou poštu."
 
 #
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "®ádné omezení není zavedeno."
+msgstr "Žádné omezení není zavedeno."
 
 #
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "®ádná schránka není otevøena."
+msgstr "Žádná schránka není otevřena."
 
 #
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "V ¾ádné schránce není nová po¹ta."
+msgstr "V žádné schránce není nová pošta."
 
 #
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "Pro %s neexistuje polo¾ka mailcapu 'compose', vytváøím prázdný soubor."
+msgstr "Pro %s neexistuje položka mailcapu 'compose', vytvářím prázdný soubor."
 
 #
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "Pro %s neexistuje polo¾ka mailcapu 'edit'."
+msgstr "Pro %s neexistuje položka mailcapu 'edit'."
 
 #
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "®ádné po¹tovní konference nebyly nalezeny!"
+msgstr "Žádné poštovní konference nebyly nalezeny!"
 
 #
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "Odpovídající polo¾ka v mailcapu nebyla nalezena. Zobrazuji jako text."
+msgstr "Odpovídající položka v mailcapu nebyla nalezena. Zobrazuji jako text."
 
 #
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "V této slo¾ce nejsou ¾ádné zprávy."
+msgstr "V této složce nejsou žádné zprávy."
 
 #
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "®ádná ze zpráv nesplòuje daná kritéria."
+msgstr "Žádná ze zpráv nesplňuje daná kritéria."
 
 #
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "®ádný dal¹í citovaný text."
+msgstr "Žádný další citovaný text."
 
 #
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Nejsou dal¹í vlákna."
+msgstr "Nejsou další vlákna."
 
 #
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Za citovaným textem ji¾ nenásleduje ¾ádný bì¾ný text."
+msgstr "Za citovaným textem již nenásleduje žádný běžný text."
 
 #
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Ve schránce na POP serveru nejsou nové zprávy."
+msgstr "Ve schránce na POP serveru nejsou nové zprávy."
 
 #
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "Nejsou ¾ádné nové zprávy"
+msgstr "Nejsou žádné nové zprávy"
 
 #
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Vìc nebyla zadána."
+msgstr "Věc nebyla zadána."
 
 #
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "Souborové masce nevyhovuje ¾ádný soubor."
+msgstr "Souborové masce nevyhovuje žádný soubor."
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
 #
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "V ¾ádné schránce není nová po¹ta."
-
-#
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "®ádné zprávy nejsou odlo¾eny."
-
-#
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "V ¾ádné schránce není nová po¹ta."
+msgstr "Žádné zprávy nejsou odloženy."
 
 #
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Není definován ¾ádný pøíkaz pro tisk."
+msgstr "Není definován žádný příkaz pro tisk."
 
 #
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Nejsou zadáni pøíjemci!"
+msgstr "Nejsou zadáni příjemci!"
 
 #
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Nejsou specifikováni ¾ádní pøíjemci.\n"
+msgstr "Nejsou specifikováni žádní příjemci.\n"
 
 #
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Nebyli zadání pøíjemci."
+msgstr "Nebyli zadání příjemci."
 
 #
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Není ¾ádný vzor k vyhledání."
+msgstr "Není žádný vzor k vyhledání."
 
 #
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Vìc nebyla zadána."
+msgstr "Věc nebyla zadána."
 
 #
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "®ádná vìc, zru¹it odeslání?"
+msgstr "Žádná věc, zrušit odeslání?"
 
 #
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Vìc není specifikována, zru¹it?"
+msgstr "Věc není specifikována, zrušit?"
 
 #
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "Vìc není specifikována, zru¹eno."
+msgstr "Věc není specifikována, zrušeno."
 
 #
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "Slo¾ka nenalezena"
+msgstr "Složka nenalezena"
 
 #
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "®ádné polo¾ky nejsou oznaèeny."
+msgstr "Žádné položky nejsou označeny."
 
 #
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "®ádná oznaèená zpráva není viditelná!"
+msgstr "Žádná označená zpráva není viditelná!"
 
 #
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "®ádné zprávy nejsou oznaèeny."
+msgstr "Žádné zprávy nejsou označeny."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Nejsou ¾ádné obnovené zprávy."
+msgstr "Nejsou žádné obnovené zprávy."
 
 #
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Nejsou ¾ádné nepøeètené zprávy"
+msgstr "Nejsou žádné nepřečtené zprávy"
 
 #
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "®ádné viditelné zprávy"
+msgstr "Žádné viditelné zprávy"
 
 #
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "V tomto menu není tato funkce dostupná."
+msgstr "V tomto menu není tato funkce dostupná."
 
 #
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Nenalezeno."
 
 #
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
-msgstr "Není co dìlat"
-
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
+msgstr "Není co dělat"
 
 #
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Podporováno je pouze mazání pøíloh o více èástech."
+msgstr "Podporováno je pouze mazání příloh o více částech."
 
 #
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Otevøít schránku"
+msgstr "Otevřít schránku"
 
 #
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Otevøít schránku pouze pro ètení"
+msgstr "Otevřít schránku pouze pro čtení"
 
 #
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Otevøít schránku, z ní¾ se pøipojí zpráva"
+msgstr "Otevřít schránku, z níž se připojí zpráva"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Otevøít schránku pouze pro ètení"
+msgstr "Otevřít schránku pouze pro čtení"
 
 #
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Otevøít schránku, z ní¾ se pøipojí zpráva"
+msgstr "Otevřít schránku, z níž se připojí zpráva"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Výstup doruèovacího programu"
+msgstr "Výstup doručovacího programu"
 
 #
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "PGP - ¹i(f)rovat, (p)odepsat, podepsat (j)ako, (o)bojí, %s, èi (n)ic?"
+msgstr "PGP - ši(f)rovat, (p)odepsat, podepsat (j)ako, (o)bojí, %s, či (n)ic?"
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "Je aktivní PGP, zru¹it jej a pokraèovat?"
+msgstr "Je aktivní PGP, zrušit jej a pokračovat?"
 
 #
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "klíèe PGP vyhovující <%s>."
+msgstr "klíče PGP vyhovující <%s>."
 
 #
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "klíèe PGP vyhovující <%s>."
+msgstr "klíče PGP vyhovující <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP podpis NELZE ovìøit."
+msgstr "PGP podpis NELZE ověřit."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP podpis byl úspì¹nì ovìøen."
+msgstr "PGP podpis byl úspěšně ověřen."
 
 #
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "POP server není definován."
+msgstr "POP server není definován."
 
 #
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Rodièovská zpráva není dostupná."
+msgstr "Rodičovská zpráva není dostupná."
 
 #
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Rodièovská zpráva není v omezeném zobrazení viditelná.."
+msgstr "Rodičovská zpráva není v omezeném zobrazení viditelná.."
 
 #
 #: account.c:184
@@ -2636,181 +2483,151 @@ msgid "Password for %s@%s: "
 msgstr "Heslo pro %s@%s: "
 
 #
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "Vlastní jméno: "
-
-#
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Poslat rourou"
+msgstr "Vlastní jméno: "
 
 #
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Poslat rourou do pøíkazu: "
+msgstr "Poslat rourou do příkazu: "
 
 #
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Poslat rourou do: "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Pokud pou¾íváte mixmaster, je tøeba správnì nastavit promìnnou \"hostname\"."
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
 #
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Odlo¾it tuto zprávu?"
+msgstr "Odložit tuto zprávu?"
 
 #
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "¾ádné odlo¾ené zprávy"
+msgstr "žádné odložené zprávy"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "pøíkaz pøed spojením selhal"
+msgstr "příkaz před spojením selhal"
 
 #
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Pøipravuji pøeposílanou zprávu..."
+msgstr "Připravuji přeposílanou zprávu..."
 
 #
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Stisknìte libovolnou klávesu..."
-
-#
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "Pøstr"
+msgstr "Stiskněte libovolnou klávesu..."
 
 #
-#: recvattach.c:34
-msgid "Print"
-msgstr "Tisk"
-
-#
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Vytisknout pøílohu?"
+msgstr "Vytisknout přílohu?"
 
 #
 #: commands.c:383
 msgid "Print message?"
-msgstr "Vytisknout zprávu?"
+msgstr "Vytisknout zprávu?"
 
 #
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Vytisknout oznaèené pøílohy?"
+msgstr "Vytisknout označené přílohy?"
 
 #
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Vytisknout oznaèené zprávy?"
+msgstr "Vytisknout označené zprávy?"
 
 #
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Zahodit smazané zprávy (%d)?"
+msgstr "Zahodit smazané zprávy (%d)?"
 
 #
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Zahodit smazané zprávy (%d)?"
+msgstr "Zahodit smazané zprávy (%d)?"
 
 #
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Dotaz"
 
 #
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Dotaz na `%s'"
 
 #
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Pøíkaz pro dotazy není definován."
+msgstr "Příkaz pro dotazy není definován."
 
 #
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Dotázat se na: "
-
-#
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Konec"
+msgstr "Dotázat se na: "
 
 #
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Ukonèit Mutt?"
+msgstr "Ukončit Mutt?"
 
 #
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "Stahuji jmenný prostor..."
+msgstr "Stahuji jmenný prostor..."
 
 #
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "Ètu %s..."
+msgstr "Čtu %s..."
 
 #
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "Ètu %s... %d"
+msgstr "Čtu %s... %d"
 
 #
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "Ètu %s... %d (%d%%)"
+msgstr "Čtu %s... %d (%d%%)"
 
 #
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "Naèítám nové zprávy (poèet bajtù: %d)..."
+msgstr "Načítám nové zprávy (počet bajtů: %d)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Skuteènì chcete smazat schránku \"%s\"?"
+msgstr "Skutečně chcete smazat schránku \"%s\"?"
 
 #
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Vrátit se k odlo¾eným zprávám?"
+msgstr "Vrátit se k odloženým zprávám?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Pøekódování se týká pouze textových pøíloh."
+msgstr "Překódování se týká pouze textových příloh."
 
 #
 #: imap/browse.c:300
@@ -2819,38 +2636,33 @@ msgid "Rename failed: %s"
 msgstr "Chyba SSL: %s"
 
 #
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Vytváøení funguje pouze u IMAP schránek."
+msgstr "Vytváření funguje pouze u IMAP schránek."
 
 #
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Vytvoøit schránku: "
+msgstr "Vytvořit schránku: "
 
 #
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "Pøejmenovat na: "
+msgstr "Přejmenovat na: "
 
 #
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Otevírám schránku znovu..."
+msgstr "Otevírám schránku znovu..."
 
-#
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Odepsat"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
 #
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Odepsat %s%s?"
@@ -2861,226 +2673,197 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Øadit opaènì (d)at/(o)d/pøí(j)/(v)ìc/(p)ro/v(l)ákno/(n)eseø/veli(k)/(s)kóre/"
+"Řadit opačně (d)at/(o)d/pří(j)/(v)ěc/(p)ro/v(l)ákno/(n)eseř/veli(k)/(s)kóre/"
 "sp(a)m?: "
 
 #
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Vyhledat obráceným smìrem: "
+msgstr "Vyhledat obráceným směrem: "
 
 #
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Hledat opaèným smìrem: "
+msgstr "Hledat opačným směrem: "
 
 #
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Obrácené øazení dle (d)ata, (p)ísmena, (v)elikosti èi (n)eøadit?"
+msgstr "Obrácené řazení dle (d)ata, (p)ísmena, (v)elikosti či (n)eřadit?"
 
 #
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "PGP - ¹i(f)rovat, (p)odepsat, podepsat (j)ako, (o)bojí, %s, èi (n)ic?"
+msgstr "PGP - ši(f)rovat, (p)odepsat, podepsat (j)ako, (o)bojí, %s, či (n)ic?"
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "Je aktivní S/MIME, zru¹it jej a pokraèovat?"
+msgstr "Je aktivní S/MIME, zrušit jej a pokračovat?"
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "Vlastník S/MIME certifikátu není toto¾ný s odesílatelem zprávy."
+msgstr "Vlastník S/MIME certifikátu není totožný s odesílatelem zprávy."
 
 #
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
-msgstr "S/MIME klíèe vyhovující \"%s\"."
+msgstr "S/MIME klíče vyhovující \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "S/MIME zprávy, které neobsahují hints on content nejsou podporovány."
+msgstr "S/MIME zprávy, které neobsahují hints on content nejsou podporovány."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME podpis NELZE ovìøit."
+msgstr "S/MIME podpis NELZE ověřit."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "S/MIME podpis byl úspì¹nì ovìøen."
+msgstr "S/MIME podpis byl úspěšně ověřen."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "SASL ovìøení se nezdaøilo."
+msgstr "SASL ověření se nezdařilo."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "Otisk klíèe: %s"
+msgstr "Otisk klíče: %s"
 
 #
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "SSL spojení pomocí %s (%s)"
-
-#
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Ulo¾it"
+msgstr "SSL spojení pomocí %s (%s)"
 
 #
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "Ulo¾it kopii této zprávy?"
+msgstr "Uložit kopii této zprávy?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
 #
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "Ulo¾it jako: "
+msgstr "Uložit jako: "
 
 #
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "Ulo¾it %s do schránky"
+msgstr "Uložit %s do schránky"
 
 #
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "Ukládám pøíznaky stavu zprávy... [%d/%d]"
+msgstr "Ukládám příznaky stavu zprávy... [%d/%d]"
 
 #
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "Ukládám..."
+msgstr "Ukládám..."
 
 #
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Hledat"
-
-#
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Vyhledat: "
 
 #
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Pøi vyhledávání bylo dosa¾eno konce bez nalezení shody."
+msgstr "Při vyhledávání bylo dosaženo konce bez nalezení shody."
 
 #
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Pøi vyhledávání bylo dosa¾eno zaèátku bez nalezení shody."
+msgstr "Při vyhledávání bylo dosaženo začátku bez nalezení shody."
 
 #
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Hledání bylo pøeru¹eno."
+msgstr "Hledání bylo přerušeno."
 
 #
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "V tomto menu není hledání pøístupné."
+msgstr "V tomto menu není hledání přístupné."
 
 #
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Hledání pokraèuje od konce."
+msgstr "Hledání pokračuje od konce."
 
 #
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Hledání pokraèuje od zaèátku."
+msgstr "Hledání pokračuje od začátku."
 
 #
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Hledat: "
 
 #
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Volba"
-
-#
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Zvolit "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Vyberte øetìz remailerù"
-
-#
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "Volím %s..."
-
-#
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Odeslat"
+msgstr "Volím %s..."
 
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "Zasílám na pozadí."
+msgstr "Zasílám na pozadí."
 
 #
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "Posílám zprávu..."
+msgstr "Posílám zprávu..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
 #
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Server uzavøel spojení!"
+msgstr "Server uzavřel spojení!"
 
 #
 #: flags.c:335
 msgid "Set flag"
-msgstr "Nastavit pøíznak"
+msgstr "Nastavit příznak"
 
 #
 #: commands.c:463
 msgid "Shell command: "
-msgstr "Pøíkaz pro shell: "
+msgstr "Příkaz pro shell: "
 
 #
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Podepsat"
 
 #
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Podepsat jako: "
 
 #
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Podepsat, za¹ifrovat"
+msgstr "Podepsat, zašifrovat"
 
 #
 #: commands.c:406
@@ -3088,41 +2871,37 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Øadit (d)at/(o)d/pøí(j)/(v)ìc/(p)ro/v(l)ákno/(n)eseø/veli(k)/(s)kóre/sp(a)"
+"Řadit (d)at/(o)d/pří(j)/(v)ěc/(p)ro/v(l)ákno/(n)eseř/veli(k)/(s)kóre/sp(a)"
 "m?: "
 
 #
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Øadit dle (d)ata, (p)ísmena, (v)elikosti èi (n)eøadit?"
+msgstr "Řadit dle (d)ata, (p)ísmena, (v)elikosti či (n)eřadit?"
 
 #
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Øadím schránku..."
+msgstr "Řadím schránku..."
 
 #
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "ID klíèe: 0x%s"
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
+msgstr "ID klíče: 0x%s"
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
 #
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Pøihlá¹ená schránka [%s], Souborová maska: %s"
+msgstr "Přihlášená schránka [%s], Souborová maska: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -3130,147 +2909,147 @@ msgstr ""
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "Pøihla¹uji %s..."
+msgstr "Přihlašuji %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "Kontrola SSL certifikátu"
+msgstr "Kontrola SSL certifikátu"
 
 #
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Oznaèit zprávy shodující se s: "
+msgstr "Označit zprávy shodující se s: "
 
 #
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Oznaète zprávy, které chcete pøipojit!"
+msgstr "Označte zprávy, které chcete připojit!"
 
 #
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Oznaèování není podporováno."
+msgstr "Označování není podporováno."
 
 #
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Tato zpráva není viditelná."
+msgstr "Tato zpráva není viditelná."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL není dostupné"
+msgstr "SSL není dostupné"
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "Aktuální pøíloha bude pøevedena."
+msgstr "Aktuální příloha bude převedena."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "Aktuální pøíloha nebude pøevedena."
+msgstr "Aktuální příloha nebude převedena."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "Index zpráv je chybný. Zkuste schránku znovu otevøít."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "Øetìz remailerù je ji¾ prázdný."
+msgstr "Index zpráv je chybný. Zkuste schránku znovu otevřít."
 
 #
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "Nejsou ¾ádné pøílohy."
+msgstr "Nejsou žádné přílohy."
 
 #
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "Nejsou ¾ádné zprávy."
+msgstr "Nejsou žádné zprávy."
 
 #
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "Nejsou ¾ádné podèásti pro zobrazení!"
+msgstr "Nejsou žádné podčásti pro zobrazení!"
 
 #
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Tento IMAP server je zastaralý. Mutt s ním nebude fungovat."
+msgstr "Tento IMAP server je zastaralý. Mutt s ním nebude fungovat."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Tento certifikát patøí:"
+msgstr "Tento certifikát patří:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Tento certifikát je platný."
+msgstr "Tento certifikát je platný."
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Tento certifikát vydal:"
+msgstr "Tento certifikát vydal:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Klíè nelze pou¾ít: vypr¹ela jeho platnost, nebo byl zakázán èi sta¾en."
+msgstr "KlíÄ\8d nelze použít: vyprÅ¡ela jeho platnost, nebo byl zakázán Ä\8di stažen."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Vlákno obsahuje nepøeètené zprávy."
+msgstr "Vlákno obsahuje nepřečtené zprávy."
 
 #
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Vlákna nejsou podporována."
+msgstr "Vlákna nejsou podporována."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Vypr¹el èas pro pokus o zamknutí pomocí funkce fcntl!"
+msgstr "Vypršel čas pro pokus o zamknutí pomocí funkce fcntl!"
 
 #
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Èas pro zamknutí pomocí funkce flock vypr¹el!"
+msgstr "Čas pro zamknutí pomocí funkce flock vypršel!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
 #
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Zaèátek zprávy je zobrazen."
+msgstr "Začátek zprávy je zobrazen."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "Zkou¹ím extrahovat PGP klíèe...\n"
+msgstr "Zkouším extrahovat PGP klíče...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "Zkou¹ím extrahovat S/MIME certifikáty...\n"
+msgstr "Zkouším extrahovat S/MIME certifikáty...\n"
 
 #
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "Chyba pøi komunikaci s %s (%s)"
+msgstr "Chyba při komunikaci s %s (%s)"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -3280,167 +3059,147 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "SASL ovìøení se nezdaøilo."
+msgstr "SASL ověření se nezdařilo."
 
 #
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "%s nelze pøipojit!"
+msgstr "%s nelze připojit!"
 
 #
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "Nelze pøipojit!"
+msgstr "Nelze připojit!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Z IMAP serveru této verze hlavièky nelze stahovat."
+msgstr "Z IMAP serveru této verze hlavičky nelze stahovat."
 
 #
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "Certifikát od serveru nelze získat"
+msgstr "Certifikát od serveru nelze získat"
 
 #
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Nelze ponechat zprávy na serveru."
+msgstr "Nelze ponechat zprávy na serveru."
 
 #
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "%s nelze pøipojit!"
+msgstr "%s nelze připojit!"
 
 #
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Schránku nelze zamknout!"
+msgstr "Schránku nelze zamknout!"
 
 #
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Doèasný soubor nelze otevøít!"
+msgstr "Dočasný soubor nelze otevřít!"
 
 #
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Doèasný soubor nelze otevøít!"
+msgstr "Dočasný soubor nelze otevřít!"
 
 #
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Doèasný soubor nelze otevøít!"
+msgstr "Dočasný soubor nelze otevřít!"
 
 #
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Obnovit"
-
-#
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Obnovit zprávy shodující se s: "
+msgstr "Obnovit zprávy shodující se s: "
 
 #
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Obnovit"
 
 #
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "Hodnota %s polo¾ky 'Content-Type' je neznámá."
-
-#
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Odhla¹uji %s..."
+msgstr "Hodnota %s položky 'Content-Type' je neznámá."
 
 #
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "Odhla¹uji %s..."
+msgstr "Odhlašuji %s..."
 
 #
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "Odhla¹uji %s..."
+msgstr "Odhlašuji %s..."
 
 #
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Odznaèit zprávy shodující se s: "
+msgstr "Odznačit zprávy shodující se s: "
 
 #
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "Posílám zprávu..."
+msgstr "Posílám zprávu..."
 
 #
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "Pou¾ijte 'toggle-write' pro zapnutí zápisu!"
+msgstr "Použijte 'toggle-write' pro zapnutí zápisu!"
 
 #
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Pou¾ít ID klíèe = \"%s\" pro %s?"
+msgstr "Použít ID klíče = \"%s\" pro %s?"
 
 #
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "U¾ivatelské jméno na %s: "
+msgstr "Uživatelské jméno na %s: "
 
 #
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Mìsíc %s není správný."
+msgstr "Měsíc %s není správný."
 
 #
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Mìsíc %s není správný."
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Měsíc %s není správný."
 
 #
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Ovìøit PGP podpis?"
+msgstr "Ověřit PGP podpis?"
 
 #
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Ukládám indexy zpráv..."
+msgstr "Ukládám indexy zpráv..."
 
 #
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Pøílohy"
-
-#
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "VAROVÁNÍ! Takto pøepí¹ete %s. Pokraèovat?"
+msgstr "VAROVÁNÍ! Takto přepíšete %s. Pokračovat?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -3448,29 +3207,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "Platnost certifikátu serveru vypr¹ela."
+msgstr "Platnost certifikátu serveru vypršela."
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "Platnost certifikátu serveru vypr¹ela."
+msgstr "Platnost certifikátu serveru vypršela."
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "Certifikát serveru není zatím platný."
+msgstr "Certifikát serveru není zatím platný."
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "Certifikát serveru není zatím platný."
+msgstr "Certifikát serveru není zatím platný."
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3486,46 +3245,46 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "Èekám na zamknutí pomocí funkce fcntl... %d"
+msgstr "Čekám na zamknutí pomocí funkce fcntl... %d"
 
 #
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "Èekám na pokus o zamknutí pomocí funkce flock... %d"
+msgstr "Čekám na pokus o zamknutí pomocí funkce flock... %d"
 
 #
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "Èekám na odpovìï..."
+msgstr "Čekám na odpověď..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "Pozor: '%s' není platné IDN."
+msgstr "Pozor: '%s' není platné IDN."
 
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Platnost certifikátu serveru vypr¹ela."
+msgstr "Platnost certifikátu serveru vypršela."
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "Pozor: Neplatné IDN '%s' v pøezdívce '%s'.\n"
+msgstr "Pozor: Neplatné IDN '%s' v přezdívce '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "Varování: Certifikát nelze ulo¾it"
+msgstr "Varování: Certifikát nelze uložit"
 
 #: crypt.cpkg:902
 #, fuzzy
 msgid "Warning: One of the keys has been revoked\n"
-msgstr "Pozor: Èást této zprávy nebyla podepsána."
+msgstr "Pozor: Část této zprávy nebyla podepsána."
 
 #: commands.c:141 commands.c:151
 msgid "Warning: Part of this message has not been signed."
-msgstr "Pozor: Èást této zprávy nebyla podepsána."
+msgstr "Pozor: Část této zprávy nebyla podepsána."
 
 #: crypt.cpkg:910
 msgid "Warning: The key used to create the signature expired at: "
@@ -3535,200 +3294,179 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
 #
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Vytvoøení pøílohy se nezdaøilo."
+msgstr "Vytvoření přílohy se nezdařilo."
 
 #
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Ulo¾ení se nezdaøilo! Èást schránky byla ulo¾ena do %s"
+msgstr "Uložení se nezdaÅ\99ilo! Ä\8cást schránky byla uložena do %s"
 
 #
 #: attach.c:731
 msgid "Write fault!"
-msgstr "Chyba pøi zápisu!"
+msgstr "Chyba při zápisu!"
 
 #
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Ulo¾it zprávu do schránky"
+msgstr "Uložit zprávu do schránky"
 
 #
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "Ukládám %s..."
+msgstr "Ukládám %s..."
 
 #
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "Ukládám zprávu do %s ..."
+msgstr "Ukládám zprávu do %s ..."
 
 #
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "Zapisuji zprávy... %d (%d%%)"
+msgstr "Zapisuji zprávy... %d (%d%%)"
 
 #
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Chyba %s na pøíkazovém øádku\n"
+msgstr "Chyba %s na příkazovém řádku\n"
 
 #
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Pro toto jméno je ji¾ pøezdívka definována!"
-
-#
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "První èlánek øetìzu jste ji¾ vybral."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Poslední èlánek øetìzu jste ji¾ vybral."
+msgstr "Pro toto jméno je již přezdívka definována!"
 
 #
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Jste na první polo¾ce."
-
-#
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Jste na první stránce."
+msgstr "Jste na první položce."
 
 #
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Jste na první zprávì."
+msgstr "Jste na první zprávě."
 
 #
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Jste na první stránce."
+msgstr "Jste na první stránce."
 
 #
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Jste na prvním vláknu."
+msgstr "Jste na prvním vláknu."
 
 #
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Jste na poslední polo¾ce."
+msgstr "Jste na poslední položce."
 
 #
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Jste na poslední stránce."
-
-#
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Jste na poslední zprávì."
+msgstr "Jste na poslední zprávě."
 
 #
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Jste na poslední stránce."
+msgstr "Jste na poslední stránce."
 
 #
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Dolù ji¾ rolovat nemù¾ete."
+msgstr "Dolů již rolovat nemůžete."
 
 #
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Nahoru ji¾ rolovat nemù¾ete."
+msgstr "Nahoru již rolovat nemůžete."
 
 #
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Nejsou definovány ¾ádné pøezdívky!"
+msgstr "Nejsou definovány žádné přezdívky!"
 
 #
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Nemù¾ete smazat jedinou pøílohu."
+msgstr "Nemůžete smazat jedinou přílohu."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Lze posílat pouze kopie èástí typu 'message/rfc822'."
+msgstr "Lze posílat pouze kopie částí typu 'message/rfc822'."
 
 #
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] Pøijmout?"
+msgstr "[%s = %s] Přijmout?"
 
 #
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- typ '%s/%s' není podporován "
+msgstr "[-- typ '%s/%s' není podporován "
 
 #
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- Pøíloha #%d"
+msgstr "[-- Příloha #%d"
 
 #
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Automaticky zobrazuji standardní chybový výstup %s --]\n"
+msgstr "[-- Automaticky zobrazuji standardní chybový výstup %s --]\n"
 
 #
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Zobrazuji automaticky pomocí %s --]\n"
+msgstr "[-- Zobrazuji automaticky pomocí %s --]\n"
 
 #
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ZAÈÁTEK PGP ZPRÁVY --]\n"
+"[-- ZAČÁTEK PGP ZPRÁVY --]\n"
 "\n"
 
 #
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[--ZAÈÁTEK VEØEJNÉHO KLÍÈE PGP --]\n"
+msgstr "[--ZAČÁTEK VEŘEJNÉHO KLÍČE PGP --]\n"
 
 #
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ZAÈÁTEK PODEPSANÉ PGP ZPRÁVY --]\n"
+"[-- ZAČÁTEK PODEPSANÉ PGP ZPRÁVY --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3739,194 +3477,194 @@ msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s nelze spustit --]\n"
 
 #
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- KONEC PGP ZPRÁVY --]\n"
+msgstr "[-- KONEC PGP ZPRÁVY --]\n"
 
 #
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- KONEC VEØEJNÉHO KLÍÈE PGP --]\n"
+msgstr "[-- KONEC VEŘEJNÉHO KLÍČE PGP --]\n"
 
 #
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- KONEC PODEPSANÉ PGP ZPRÁVY --]\n"
+msgstr "[-- KONEC PODEPSANÉ PGP ZPRÁVY --]\n"
 
 #
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Konec dat za¹ifrovaných ve formátu PGP/MIME --]\n"
+msgstr "[-- Konec dat zašifrovaných ve formátu PGP/MIME --]\n"
 
 #
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- Konec dat za¹ifrovaných ve formátu PGP/MIME --]\n"
+msgstr "[-- Konec dat zašifrovaných ve formátu PGP/MIME --]\n"
 
 #
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Konec dat za¹ifrovaných ve formátu S/MIME --]\n"
+"[-- Konec dat zašifrovaných ve formátu S/MIME --]\n"
 
 #
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- Konec dat podepsaných pomocí S/MIME --]\n"
+"[-- Konec dat podepsaných pomocí S/MIME --]\n"
 
 #
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Konec podepsaných dat --]\n"
+"[-- Konec podepsaných dat --]\n"
 
 #
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- Chyba: ®ádnou z èástí 'Multipart/Alternative' nelze zobrazit! --]\n"
+"[-- Chyba: Žádnou z částí 'Multipart/Alternative' nelze zobrazit! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- Chyba: Chybná struktura zprávy typu multipart/signed! --]\n"
+"[-- Chyba: Chybná struktura zprávy typu multipart/signed! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- Chyba: 'multipart/signed' protokol %s není znám! --]\n"
+"[-- Chyba: 'multipart/signed' protokol %s není znám! --]\n"
 "\n"
 
 #
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Chyba: doèasný soubor nelze vytvoøit! --]\n"
+msgstr "[-- Chyba: dočasný soubor nelze vytvořit! --]\n"
 
 #
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Chyba: nelze najít zaèátek PGP zprávy! --]\n"
+"[-- Chyba: nelze najít začátek PGP zprávy! --]\n"
 "\n"
 
 #
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- Chyba: doèasný soubor nelze vytvoøit! --]\n"
+msgstr "[-- Chyba: dočasný soubor nelze vytvořit! --]\n"
 
 #
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- Chyba: zpráva ve formátu PGP/MIME je poru¹ena! --]\n"
+"[-- Chyba: zpráva ve formátu PGP/MIME je porušena! --]\n"
 "\n"
 
 #
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- Chyba: typ 'message/external-body' nemá parametr 'access-type' --]\n"
+"[-- Chyba: typ 'message/external-body' nemá parametr 'access-type' --]\n"
 
 #
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Následující data jsou za¹ifrována ve formátu PGP/MIME --]\n"
+"[-- Následující data jsou zašifrována ve formátu PGP/MIME --]\n"
 "\n"
 
 #
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Následující data jsou za¹ifrována ve formátu PGP/MIME --]\n"
+"[-- Následující data jsou zašifrována ve formátu PGP/MIME --]\n"
 "\n"
 
 #
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
-msgstr "[-- Následující data jsou za¹ifrována pomocí S/MIME --]\n"
+msgstr "[-- Následující data jsou zašifrována pomocí S/MIME --]\n"
 
 #
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
-msgstr "[-- Následují data podepsaná pomocí S/MIME --]\n"
+msgstr "[-- Následují data podepsaná pomocí S/MIME --]\n"
 
 #
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Následují podepsaná data --]\n"
+"[-- Následují podepsaná data --]\n"
 "\n"
 
 #
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- Tato pøíloha typu '%s/%s' "
+msgstr "[-- Tato příloha typu '%s/%s' "
 
 #
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- Tato pøíloha typu '%s/%s' není pøítomna, --]\n"
+msgstr "[-- Tato příloha typu '%s/%s' není přítomna, --]\n"
 
 #
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Typ: %s/%s, Kódování: %s, Velikost: %s --]\n"
+msgstr "[-- Typ: %s/%s, Kódování: %s, Velikost: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Varování: Nemohu nalézt ¾ádný podpis. --]\n"
+"[-- Varování: Nemohu nalézt žádný podpis. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Varování: Podpisy typu %s/%s nelze ovìøit. --]\n"
+"[-- Varování: Podpisy typu %s/%s nelze ověřit. --]\n"
 "\n"
 
 #
@@ -3934,21 +3672,21 @@ msgstr ""
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
-"[-- a udaná hodnota parametru 'access-type %s' --]\n"
-"[-- není podporována --]\n"
+"[-- a udaná hodnota parametru 'access-type %s' --]\n"
+"[-- není podporována --]\n"
 
 #
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
-msgstr "[-- a udaný externí zdroj ji¾ není platný --]\n"
+msgstr "[-- a udaný externí zdroj již není platný --]\n"
 
 #
 #: handler.c:1201
 #, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- jméno: %s --]\n"
+msgstr "[-- jméno: %s --]\n"
 
 #
 #: handler.c:1197
@@ -3956,122 +3694,310 @@ msgstr "[-- jm
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
 #
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Platnost vypr¹ela   "
+msgstr "Platnost vypršela   "
 
 #
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Není platný   "
+msgstr "Není platný   "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
-msgstr "Odvolaný   "
+msgstr "Odvolaný   "
 
 #
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[chybné datum]"
+msgstr "[chybné datum]"
 
 #
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[nelze spoèítat]"
+msgstr "[nelze spočítat]"
 
 #
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "pøezdívka: ¾ádná adresa"
+msgstr "přezdívka: žádná adresa"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Žádná zpráva není označena."
+
+#
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Žádná zpráva není označena."
+
+#
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Uložit kopii této zprávy?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
 
 #
-#: init.c:654
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "editovat popis pøílohy"
+msgstr "editovat popis přílohy"
 
 #
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "editovat popis pøílohy"
+msgstr "editovat popis přílohy"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
 #
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: pøíli¹ mnoho argumentù"
+msgstr "bind: příliš mnoho argumentů"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
 #
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Chyba při načítání adresáře."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "V žádné schránce není nová pošta."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: pøíli¹ málo argumentù"
+msgstr "color: příliš málo argumentů"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Nejsou žádné nové zprávy"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
-msgstr "pøevádím"
+msgstr "převádím"
+
+#
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Uložit zprávu do schránky"
 
 #
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "Doèasnou slo¾ku nelze vytvoøit: %s"
+msgstr "Dočasnou složku nelze vytvořit: %s"
 
 #
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "nemohu zkrátit doèasnou po¹tovní slo¾ku: %s"
+msgstr "nemohu zkrátit doÄ\8dasnou poÅ¡tovní složku: %s"
 
 #
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Doèasnou po¹tovní slo¾ku nelze vytvoøit: %s"
+msgstr "Dočasnou poštovní složku nelze vytvořit: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Není definována žádná schránka přijímající novou poštu."
 
 #
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "dpvn"
 
 #
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "implicitní barvy nejsou podporovány"
+msgstr "implicitní barvy nejsou podporovány"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Odstranit zprávy ze serveru..."
+
+#
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Obnovit zprávy shodující se s: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Obnovit zprávy shodující se s: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "dojvplnksa"
 
+#
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Upravit přeposílanou zprávu?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -4081,45 +4007,138 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "Kopíruji do %s..."
+msgstr "Kopíruji do %s..."
 
 #
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "Volím %s..."
+msgstr "Volím %s..."
 
-#
-#: pattern.c:777
-msgid "empty pattern"
-msgstr "prázdný vzor"
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Aktuální příloha nebude převedena."
 
 #
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: keymap_defs.h:29
 #, fuzzy
-msgid "encryption"
-msgstr "Za¹ifrovat"
+msgid "edit attachment description"
+msgstr "editovat popis přílohy"
 
-#
-#: crypt.cpkg:570
-#, fuzzy, c-format
-msgid "error adding recipient `%.*s': %s\n"
-msgstr "chyba ve vzoru na: %s"
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
 
-#
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
-#, fuzzy, c-format
-msgid "error allocating data object: %s\n"
-msgstr "chyba ve vzoru na: %s"
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
 
-#
-#: crypt.cpkg:328
-#, fuzzy, c-format
-msgid "error creating gpgme context: %s\n"
-msgstr "chyba ve vzoru na: %s"
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
 
-#: crypt.cpkg:354
-#, c-format
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Zprávu nelze uložit"
+
+#
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Stahuji hlavičky zpráv... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Upravit přeposílanou zprávu?"
+
+#
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Uložit kopii této zprávy?"
+
+#
+#: pattern.c:777
+msgid "empty pattern"
+msgstr "prázdný vzor"
+
+#
+#: crypt.cpkg:2718 crypt.cpkg:2841
+#, fuzzy
+msgid "encryption"
+msgstr "Zašifrovat"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Uložit kopii této zprávy?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
+#
+#: crypt.cpkg:570
+#, fuzzy, c-format
+msgid "error adding recipient `%.*s': %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#
+#: crypt.cpkg:328
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "chyba ve vzoru na: %s"
+
+#: crypt.cpkg:354
+#, c-format
 msgid "error creating gpgme data object: %s\n"
 msgstr ""
 
@@ -4141,7 +4160,7 @@ msgid "error getting secret key `%s': %s\n"
 msgstr "chyba ve vzoru na: %s"
 
 #
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "chyba ve vzoru na: %s"
@@ -4149,7 +4168,7 @@ msgstr "chyba ve vzoru na: %s"
 #
 #: pattern.c:499
 msgid "error in expression"
-msgstr "chyba ve výrazu"
+msgstr "chyba ve výrazu"
 
 #
 #: pattern.c:667 pattern.c:771
@@ -4184,24 +4203,84 @@ msgstr "chyba ve vzoru na: %s"
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "chyba: neznámý operand %d (ohlaste tuto chybu)."
+msgstr "chyba: neznámý operand %d (ohlaste tuto chybu)."
 
 #
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "fpjoin"
 
 #
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "fpjoin"
 
 #
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
-msgstr "exec: ¾ádné argumenty"
+msgstr "exec: žádné argumenty"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Odepsat %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Přeposlat jako přílohy?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Hledám nové zprávy..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Jste na první zprávě."
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -4223,12 +4302,36 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Jste na poslední stránce."
+
+#
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "V žádné schránce není nová pošta."
+
+#
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Chyba při otevírání schránky"
+
+#
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "V žádné schránce není nová pošta."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
@@ -4236,141 +4339,657 @@ msgstr ""
 #
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "byla smazána --]\n"
+msgstr "byla smazána --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "pøi volání imap_sync_mailbox: EXPUNGE selhalo"
+msgstr "při volání imap_sync_mailbox: EXPUNGE selhalo"
 
 #
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "neplatná hlavièka"
+msgstr "neplatná hlavička"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
 
 #
-#: crypt.cpkg:3122
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Nesprávné indexové číslo."
+
+#
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Přejít na zprávu: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Přejít na zprávu: "
+
+#
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Vlákno obsahuje nepřečtené zprávy."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Jste na prvním vláknu."
+
+#
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Nejsou žádné nepřečtené zprávy"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Nejsou žádné nepřečtené zprávy"
+
+#
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Uložit kopii této zprávy?"
+
+#
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
-msgstr "klíèe PGP vyhovující <%s>."
+msgstr "klíče PGP vyhovující <%s>."
 
 #
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Zaslat kopii označených zpráv na: "
+
+#
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "V žádné schránce není nová pošta."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: sled kláves je prázdný"
+msgstr "macro: sled kláves je prázdný"
 
 #
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: pøíli¹ mnoho argumentù"
+msgstr "macro: příliš mnoho argumentů"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "pro typ %s nebyla nalezena polo¾ka v mailcapu"
+msgstr "pro typ %s nebyla nalezena položka v mailcapu"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
-"pøi volání maildir_commit_message(): nemohu nastavit datum a èas u souboru"
+"při volání maildir_commit_message(): nemohu nastavit datum a čas u souboru"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "Kopie zpráv nebyly odeslány."
+msgstr "Kopie zpráv nebyly odeslány."
 
 #
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "neshodují se závorky: %s"
+msgstr "neshodují se závorky: %s"
 
 #
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "chybí parametr"
+msgstr "chybí parametr"
 
 #
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: pøíli¹ málo argumentù"
+msgstr "mono: příliš málo argumentů"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Jste na první položce."
+
+#
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Jste na první zprávě."
+
+#
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Jste na poslední položce."
+
+#
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Jste na poslední zprávě."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Jste na poslední položce."
+
+#
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Jste na poslední stránce."
+
+#
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Nejsou žádné obnovené zprávy."
+
+#
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Jste na první položce."
+
+#
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Jste na první stránce."
+
+#
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Nejsou žádné obnovené zprávy."
+
+#
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Jste na první stránce."
 
 #
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "Zpráva o více èástech nemá urèeny hranice!"
+msgstr "Zpráva o více částech nemá určeny hranice!"
 
 #
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "ne"
 
 #
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(¾ádná schránka)"
+msgstr "(žádná schránka)"
 
 #: commands.c:788
 msgid "not converting"
-msgstr "nepøevádím"
+msgstr "nepřevádím"
 
 #
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "prázdný sled kláves"
+msgstr "prázdný sled kláves"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "piz"
 
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Otevřít schránku pouze pro čtení"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Otevřít schránku pouze pro čtení"
+
+#
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Otevírám schránku znovu..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
 #
-#: init.c:1065
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Zaslat kopii zprávy na %s"
+
+#
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "Prefix není s 'reset' povolen."
+msgstr "Prefix není s 'reset' povolen."
 
 #
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Jste na první položce."
+
+#
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: pøíli¹ mnoho argumentù"
+msgstr "push: příliš mnoho argumentů"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Vrátit se k odloženým zprávám?"
+
+#
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Vlákno obsahuje nepřečtené zprávy."
+
+#
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Na POP serveru nelze zprávy editovat."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "soubor %s nelze připojit"
+
+#
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Přejít na zprávu: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Odstranit zprávy ze serveru..."
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ot"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "otv"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Uložit %s do schránky"
+
+#
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Uložit %s do schránky"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Na POP serveru nelze zprávy editovat."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "chyba ve výrazu"
+
+#
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Vyhledat: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Zprávu nelze odeslat."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Přeposlat jako přílohy?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Omezit na zprávy shodující se s: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
 #
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Žádný další citovaný text."
+
+#
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Vytisknout zprávu?"
+
+#
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "V této složce nejsou žádné zprávy."
+
+#
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: chyba na %s"
 
 #
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: chyby v %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: ètení pøeru¹eno kvùli velikému mno¾ství chyb v %s"
+msgstr "source: čtení přerušeno kvůli velikému množství chyb v %s"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Souborové masce nevyhovuje žádný soubor."
 
 #
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: mbox byl zmìnìn, ale nebyly zmìnìny ¾ádné zprávy! (ohlaste tuto chybu)"
+"sync: mbox byl změněn, ale nebyly změněny žádné zprávy! (ohlaste tuto chybu)"
+
+#
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Odznačit zprávy shodující se s: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Jste na prvním vláknu."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -4382,25 +5001,102 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Žádný další citovaný text."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Překódování se týká pouze textových příloh."
+
+#
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Není žádný vzor k vyhledání."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Nejsou žádné nepřečtené zprávy"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
 #
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "pøíli¹ málo argumentù"
+msgstr "příliš málo argumentů"
 
 #
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "pøíli¹ mnoho argumentù"
+msgstr "příliš mnoho argumentů"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
 #
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "editovat popis pøílohy"
+msgstr "editovat popis přílohy"
+
+#
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Obnovit zprávy shodující se s: "
+
+#
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Obnovit zprávy shodující se s: "
+
+#
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Obnovit zprávy shodující se s: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
@@ -4410,18 +5106,38 @@ msgstr "unhook: %s nelze z %s smazat"
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: unhook * nelze z jiného hooku provést"
+msgstr "unhook: unhook * nelze z jiného hooku provést"
 
 #
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: hook %s není znám"
+msgstr "unhook: hook %s není znám"
 
 #
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "neznámá chyba"
+msgstr "neznámá chyba"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Odznačit zprávy shodující se s: "
+
+#
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "editovat popis přílohy"
 
 #: main.c:82
 msgid ""
@@ -4434,14 +5150,48 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
 #
-#: init.c:1070
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "Hodnota není s 'reset' povolena."
+msgstr "Hodnota není s 'reset' povolena."
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
 
 #
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Příloha uložena."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Nový soubor: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Uložit zprávu do schránky"
+
+#
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "ano"
 
@@ -4449,3 +5199,6 @@ msgstr "ano"
 msgid "yna"
 msgstr "anv"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/da.po b/po/da.po
index 6475692..8e6b2ad 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -5,15 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.8i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-03-13 17:22+0100\n"
 "Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Almene tastetildelinger:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -33,13 +33,13 @@ msgstr ""
 "Funktioner uden tastetildelinger:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Slut på underskrevne data --]\n"
+"[-- Slut på underskrevne data --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -67,7 +67,7 @@ msgid ""
 msgstr ""
 "anvendelse: mutt [ -nRyzZ ] [ -e <kmd> ] [ -F <fil> ] [ -m <type> ] [ -f "
 "<fil> ]\n"
-"       mutt [ -nR ] [ -e <kmd> ] [ -F <fil> ] -Q <spørg> [ -Q <spørg> ] "
+"       mutt [ -nR ] [ -e <kmd> ] [ -F <fil> ] -Q <spørg> [ -Q <spørg> ] "
 "[...]\n"
 "       mutt [ -nR ] [ -e <kmd> ] [ -F <fil> ] -A <alias> [ -A <alias> ] "
 "\"[...]\n"
@@ -78,38 +78,38 @@ msgstr ""
 "\n"
 "tilvalg:\n"
 "  -A <alias>\tudfold alias\n"
-"  -a <fil>\tvedlæg fil ved brevet\n"
-"  -b <adresse>\tanfør en blind carbon-copy (BCC)-adresse\n"
-"  -c <adresse>\tanfør en carbon-copy (CC)-adresse\n"
-"  -e <kommando>\tanfør en Mutt-kommando til udførelse efter opstart\n"
-"  -f <fil>\tanfør hvilken brevbakke der skal indlæses\n"
-"  -F <fil>\tanfør en alternativ muttrc-fil\n"
-"  -H <fil>\tanfør en kladdefil hvorfra brevhovedet skal indlæses\n"
-"  -i <fil>\tanfør en fil som Mutt skal medtage i svaret\n"
-"  -m <type>\tanfør standardtype af brevbakke\n"
-"  -n\t\tgør at Mutt ikke læser systemets Muttrc\n"
-"  -p\t\tgenindlæs et tilbageholdt brev\n"
-"  -Q <variable>\tspørg på værdi for en opsætningsvariabel\n"
-"  -R\t\tåbn en brevbakke i skrivebeskyttet tilstand\n"
-"  -s <emne>\tanfør et emne (sættes i citationstegn, hvis der er blanktegn)\n"
-"  -v\t\tvis version og oversættelsesparametre\n"
-"  -x\t\tefterlign mailx' afsendelsesmåde\n"
-"  -y\t\tvælg en indbakke\n"
-"  -z\t\tafslut øjeblikkeligt, hvis brevbakken er tom\n"
-"  -Z\t\tåbn første brevbakke med nye breve, afslut straks hvis tom\n"
-"  -h\t\tdenne hjælpeskærm"
-
-#: compose.c:152 compose.c:156
+"  -a <fil>\tvedlæg fil ved brevet\n"
+"  -b <adresse>\tanfør en blind carbon-copy (BCC)-adresse\n"
+"  -c <adresse>\tanfør en carbon-copy (CC)-adresse\n"
+"  -e <kommando>\tanfør en Mutt-kommando til udførelse efter opstart\n"
+"  -f <fil>\tanfør hvilken brevbakke der skal indlæses\n"
+"  -F <fil>\tanfør en alternativ muttrc-fil\n"
+"  -H <fil>\tanfør en kladdefil hvorfra brevhovedet skal indlæses\n"
+"  -i <fil>\tanfør en fil som Mutt skal medtage i svaret\n"
+"  -m <type>\tanfør standardtype af brevbakke\n"
+"  -n\t\tgør at Mutt ikke læser systemets Muttrc\n"
+"  -p\t\tgenindlæs et tilbageholdt brev\n"
+"  -Q <variable>\tspørg på værdi for en opsætningsvariabel\n"
+"  -R\t\tåbn en brevbakke i skrivebeskyttet tilstand\n"
+"  -s <emne>\tanfør et emne (sættes i citationstegn, hvis der er blanktegn)\n"
+"  -v\t\tvis version og oversættelsesparametre\n"
+"  -x\t\tefterlign mailx' afsendelsesmåde\n"
+"  -y\t\tvælg en indbakke\n"
+"  -z\t\tafslut øjeblikkeligt, hvis brevbakken er tom\n"
+"  -Z\t\tåbn første brevbakke med nye breve, afslut straks hvis tom\n"
+"  -h\t\tdenne hjælpeskærm"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " underskriv som: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     til %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   fra %s"
@@ -152,15 +152,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' for en liste): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr " (integreret)"
 
@@ -169,13 +169,13 @@ msgstr " (integreret)"
 msgid " Press '%s' to toggle write"
 msgstr " Tast '%s' for at skifte til/fra skrivebeskyttet tilstand"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " i dette afgrænsede billede"
+msgstr " i dette afgrænsede billede"
 
 #: commands.c:601
 msgid " tagged"
@@ -189,7 +189,7 @@ msgstr "%c: Ugyldig Kommando"
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: er ikke understøttet i denne tilstand."
+msgstr "%c: er ikke understøttet i denne tilstand."
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
@@ -201,32 +201,32 @@ msgstr "%d beholdt, %d slettet."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d beholdt, %d flyttet, %d slettet."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Vil du virkelig anvende nøglen?"
+msgstr "%s Vil du virkelig anvende nøglen?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] blev ændret. Opdatér indkodning?"
+msgstr "%s [#%d] blev ændret. Opdatér indkodning?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] findes ikke mere!"
@@ -234,9 +234,9 @@ msgstr "%s [#%d] findes ikke mere!"
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d af %d breve læst]"
+msgstr "%s [%d af %d breve læst]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s findes ikke. Opret?"
@@ -251,17 +251,17 @@ msgstr "%s er en ugyldig IMAP-sti"
 msgid "%s is an invalid POP path"
 msgstr "%s er en ugyldig POP-sti"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr "%s er en ugyldig POP-sti"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr "%s er en ugyldig POP-sti"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s er ikke et filkatalog."
@@ -271,7 +271,7 @@ msgstr "%s er ikke et filkatalog."
 msgid "%s is not a mailbox!"
 msgstr "%s er ingen brevbakke"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s er ikke en brevbakke."
@@ -298,116 +298,116 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Ukendt type"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: farve er ikke understøttet af terminal."
+msgstr "%s: farve er ikke understøttet af terminal."
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: kommandoen kan kun bruges på et indeks-objekt."
+msgstr "%s: kommandoen kan kun bruges på et indeks-objekt."
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: ukendt attribut"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: ukendt farve."
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: ukendt funktion"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: ukendt funktion"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: ukendt menu."
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: ukendt objekt."
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: for få parametre."
+msgstr "%s: for få parametre."
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: kunne ikke vedlægge fil."
+msgstr "%s: kunne ikke vedlægge fil."
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: kan ikke vedlægge fil.\n"
+msgstr "%s: kan ikke vedlægge fil.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: Ukendt kommando"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: ukendt type"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: ukendt variabel."
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
 msgstr "%s er en ugyldig POP-sti"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr "%s er en ugyldig POP-sti"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "('view-attachments' må tildeles en tast!)"
+msgstr "('view-attachments' må tildeles en tast!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(ingen brevbakke)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(a)fvis, (g)odkend denne gang"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(a)fvis, (g)odkend denne gang, (v)arig godkendelse"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(på %s bytes) "
+msgstr "(på %s bytes) "
 
 #: handler.c:1448
 #, c-format
@@ -418,20 +418,20 @@ msgstr "(brug '%s' for vise denne brevdel)"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- MIME-dele"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<UKENDT>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<forvalgt>"
 
@@ -447,35 +447,31 @@ msgstr ""
 msgid "APOP authentication failed."
 msgstr "APOP-godkendelse slog fejl."
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Afbryd"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Annullér uændret brev?"
+msgstr "Annullér uændret brev?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Annullerede uændret brev."
+msgstr "Annullerede uændret brev."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adresse: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Adresse tilføjet."
+msgstr "Adresse tilføjet."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Vælg et alias: "
+msgstr "Vælg et alias: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Adressebog"
 
@@ -483,64 +479,60 @@ msgstr "Adressebog"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Alle matchende nøgler er sat ud af kraft, udløbet eller tilbagekaldt."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Tilføj"
+msgstr "Alle matchende nøgler er sat ud af kraft, udløbet eller tilbagekaldt."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Føj breve til %s?"
+msgstr "Føj breve til %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Parameter skal være nummeret på et brev."
+msgstr "Parameter skal være nummeret på et brev."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Bilag gemt."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "Vedlæg fil"
+msgstr "Vedlæg fil"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "Vedlægger valgte filer ..."
+msgstr "Vedlægger valgte filer ..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Brevdel filtreret."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Bilag gemt."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Brevdele"
 
@@ -571,12 +563,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr "Forkert IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Forkert IDN %s under forberedelse af af \"Resent-From\"-felt."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "Forkert IDN i \"%s\": '%s'"
@@ -588,9 +580,9 @@ msgstr "Forkert IDN: '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "Ugyldigt navn på brevbakke"
+msgstr "Ugyldigt navn på brevbakke"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "Bunden af brevet vises."
 
@@ -612,7 +604,7 @@ msgstr "Gensend breve til %s"
 msgid "Bounce tagged messages to: "
 msgstr "Gensend udvalgte breve til: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -627,18 +619,18 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Kan ikke føje til brevbakke: %s"
+msgstr "Kan ikke føje til brevbakke: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Kan ikke vedlægge et filkatalog!"
+msgstr "Kan ikke vedlægge et filkatalog!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan ikke oprette %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Kan ikke oprette filen %s."
@@ -651,30 +643,30 @@ msgstr "Kan ikke oprette filter"
 msgid "Can't create filter process"
 msgstr "Kan ikke oprette filterproces"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "Kan ikke oprette midlertidig fil"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
-msgstr "Kan ikke afkode alle udvalgte brevdele. MIME-indkapsl de øvrige?"
+msgstr "Kan ikke afkode alle udvalgte brevdele. MIME-indkapsl de øvrige?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr "Kan ikke afkode alle udvalgte brevdele. MIME-videresend de øvrige?"
+msgstr "Kan ikke afkode alle udvalgte brevdele. MIME-videresend de øvrige?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
 msgstr "Kan ikke dekryptere krypteret brev!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "Kan ikke slette bilag fra POP-server."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "Kan ikke slette bilag fra POP-server."
@@ -682,7 +674,7 @@ msgstr "Kan ikke slette bilag fra POP-server."
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Kan ikke låse %s.\n"
+msgstr "Kan ikke låse %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -692,45 +684,41 @@ msgstr ""
 msgid "Can't find any tagged messages."
 msgstr "Kan ikke finde nogen udvalgte breve."
 
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Kan ikke hente mixmasters type2.liste!"
-
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Kan ikke matche navneskabelon, fortsæt?"
+msgstr "Kan ikke matche navneskabelon, fortsæt?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Kan ikke åbne brev: %s."
+msgstr "Kan ikke åbne brev: %s."
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Kan ikke føje til brevbakke: %s"
+msgstr "Kan ikke føje til brevbakke: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "Forbindelse til %s er lukket."
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "Lukker forbindelsen til POP-server ..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Kan ikke finde filen %s: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "Kan ikke oprette %s: %s."
@@ -742,9 +730,9 @@ msgstr "Kan ikke gemme brev i POP-brevbakke."
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Kan ikke redigere brev på POP-server."
+msgstr "Kan ikke redigere brev på POP-server."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Kan ikke finde filen %s: %s"
@@ -753,11 +741,11 @@ msgstr "Kan ikke finde filen %s: %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "Filkataloger kan ikke vises."
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "Kan ikke oprette %s."
@@ -782,42 +770,38 @@ msgstr "Kan ikke oprette fremvisningsfilter."
 msgid "Cannot create filter"
 msgstr "Kan ikke oprette filter."
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Kan ikke skrive til en skrivebeskyttet brevbakke!"
 
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
-
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "Signal %s ... Afslutter.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "Server-certifikat er endnu ikke gyldigt"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Certifikat gemt"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Ændringer i brevbakken vil blive skrevet til disk, når den forlades."
+msgstr "Ændringer i brevbakken vil blive skrevet til disk, når den forlades."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Ændringer i brevbakken vil ikke blive skrevet til disk."
+msgstr "Ændringer i brevbakken vil ikke blive skrevet til disk."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Tegn = %s, oktalt = %o, decimalt = %d"
@@ -825,30 +809,22 @@ msgstr "Tegn = %s, oktalt = %o, decimalt = %d"
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Tegnsæt ændret til %s; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Skift filkatalog"
+msgstr "Tegnsæt ændret til %s; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Skift til filkatalog: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Kigger efter nye breve ..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Undersøg nøgle  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Kigger efter nye breve ..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Kigger efter nye breve ..."
@@ -857,7 +833,7 @@ msgstr "Kigger efter nye breve ..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Klartekst"
 
@@ -865,7 +841,7 @@ msgstr "Klartekst"
 msgid "Clear flag"
 msgstr "Fjern statusindikator"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Lukker forbindelsen til %s ..."
@@ -874,7 +850,7 @@ msgstr "Lukker forbindelsen til %s ..."
 msgid "Closing connection to POP server..."
 msgstr "Lukker forbindelsen til POP-server ..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Forbinder til %s ..."
@@ -882,27 +858,27 @@ msgstr "Forbinder til %s ..."
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Kommandoen TOP understøttes ikke af server."
+msgstr "Kommandoen TOP understøttes ikke af server."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Kommandoen UIDL er ikke understøttet af server."
+msgstr "Kommandoen UIDL er ikke understøttet af server."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "Udfører ændringer ..."
+msgstr "Udfører ændringer ..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Tilvalg ved oversættelsen:"
+"Tilvalg ved oversættelsen:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Klargør søgemønster ..."
+msgstr "Klargør søgemønster ..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
@@ -914,12 +890,12 @@ msgstr "Kopierer til %s ..."
 msgid "Compressing %s..."
 msgstr "Kopierer til %s ..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Forbinder til %s ..."
@@ -948,7 +924,7 @@ msgstr "Mistede forbindelsen. Opret ny forbindelse til POP-server?"
 msgid "Connection to %s closed"
 msgstr "Forbindelse til %s er lukket."
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "Forbindelse til %s er lukket."
@@ -956,15 +932,15 @@ msgstr "Forbindelse til %s er lukket."
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "\"Content-Type\" ændret til %s."
+msgstr "\"Content-Type\" ændret til %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "\"Content-Type\" er på formen grundtype/undertype."
+msgstr "\"Content-Type\" er på formen grundtype/undertype."
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "Fortsæt?"
+msgstr "Fortsæt?"
 
 #: commands.c:772
 #, c-format
@@ -974,7 +950,7 @@ msgstr "Omdan til %s ved afsendelse?"
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "Kopiér%s til brevbakke"
+msgstr "Kopiér%s til brevbakke"
 
 #: imap/message.c:681
 #, c-format
@@ -1011,9 +987,9 @@ msgstr "Kunne ikke forbinde til %s (%s)."
 msgid "Could not copy message"
 msgstr "Kunne ikke kopiere brevet."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
 msgstr "Kunne ikke oprette midlertidig fil!"
@@ -1024,47 +1000,47 @@ msgstr "Kunne ikke oprette midlertidig fil!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Kunne ikke finde sorteringsfunktion! [rapportér denne fejl]"
+msgstr "Kunne ikke finde sorteringsfunktion! [rapportér denne fejl]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Kunne ikke finde værten \"%s\""
+msgstr "Kunne ikke finde værten \"%s\""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Kunne ikke citere alle ønskede breve!"
+msgstr "Kunne ikke citere alle ønskede breve!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "Kunne ikke opnå TLS-forbindelse"
+msgstr "Kunne ikke opnå TLS-forbindelse"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "Kunne ikke åbne %s."
+msgstr "Kunne ikke åbne %s."
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Kunne ikke genåbne brevbakke!"
+msgstr "Kunne ikke genåbne brevbakke!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "Kunne ikke sende brevet."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Kunne ikke låse %s.\n"
+msgstr "Kunne ikke låse %s.\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
 msgstr "Opret %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Oprettelse er kun understøttet for IMAP-brevbakker"
+msgstr "Oprettelse er kun understøttet for IMAP-brevbakker"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
@@ -1073,7 +1049,7 @@ msgstr "Opret brevbakke: "
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "Afkod-kopiér%s til brevbakke"
+msgstr "Afkod-kopiér%s til brevbakke"
 
 #: commands.c:596
 #, c-format
@@ -1083,60 +1059,47 @@ msgstr "Afkod-gem%s i brevbakke"
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "Vælger %s ..."
+msgstr "Vælger %s ..."
 
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Dekryptér-kopiér%s til brevbakke"
+msgstr "Dekryptér-kopiér%s til brevbakke"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "Dekryptér-gem%s i brevbakke"
+msgstr "Dekryptér-gem%s i brevbakke"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
 msgstr "Dekrypterer brev ..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
 msgstr "Dekryptering slog fejl."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Slet"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Slet"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Sletning er kun understøttet for IMAP-brevbakker"
+msgstr "Sletning er kun understøttet for IMAP-brevbakker"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "Slet breve på server?"
+msgstr "Slet breve på server?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "Slet breve efter mønster: "
+msgstr "Slet breve efter mønster: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Slet"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Sletning af brevdele fra krypterede breve er ikke understøttet."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Beskr."
+msgstr "Sletning af brevdele fra krypterede breve er ikke understøttet."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
@@ -1148,20 +1111,20 @@ msgstr "ID %s er ikke kontrolleret. Vil du bruge den til %s ?"
 msgid "Directory %s not exist. Create it?"
 msgstr "%s findes ikke. Opret?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Filkatalog [%s], filmaske: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "FEJL: vær venlig at rapportere denne fejl"
+msgstr "FEJL: vær venlig at rapportere denne fejl"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "Redigér brev før videresendelse?"
+msgstr "Redigér brev før videresendelse?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1170,31 +1133,31 @@ msgstr ""
 msgid "Empty expression"
 msgstr "Fejl i udtryk."
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Kryptér"
+msgstr "Kryptér"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "Kryptér med: "
+msgstr "Kryptér med: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "Anfør nøgle-ID: "
+msgstr "Anfør nøgle-ID: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "Anfør nøgle-id for %s: "
+msgstr "Anfør nøgle-id for %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "Anfør nøgler (^G afbryder): "
+msgstr "Anfør nøgler (^G afbryder): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
@@ -1219,7 +1182,7 @@ msgstr "Fejl under forbindelse til server: %s"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Fejl under forbindelse til server: %s"
@@ -1228,12 +1191,12 @@ msgstr "Fejl under forbindelse til server: %s"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fejl i %s, linje %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fejl i kommandolinje: %s\n"
@@ -1243,56 +1206,47 @@ msgstr "Fejl i kommandolinje: %s\n"
 msgid "Error in expression: %s"
 msgstr "Fejl i udtryk: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "Kan ikke klargøre terminal."
+msgstr "Kan ikke klargøre terminal."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "Kan ikke klargøre terminal."
+msgstr "Kan ikke klargøre terminal."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "Fejl ved åbning af brevbakke"
+msgstr "Fejl ved åbning af brevbakke"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
 msgstr "Ugyldig adresse!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Fejl ved kørsel af \"%s\"!"
+msgstr "Fejl ved kørsel af \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Fejl ved indlæsning af filkatalog."
+msgstr "Fejl ved indlæsning af filkatalog."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fejl %d under afsendelse af brev (%s)."
 
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Fejl ved afsendelse af brev, afslutningskode fra barneproces: %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Fejl ved afsendelse af brev."
-
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Kommunikationsfejl med server %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Fejl ved visning af fil."
 
@@ -1305,25 +1259,20 @@ msgstr "Fejl ved skrivning til brevbakke!"
 msgid "Error. Preserving temporary file: %s"
 msgstr "Fejl. Bevarer midlertidig fil: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Fejl: %s kan ikke være sidste led i kæden."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Fejl: '%s' er et forkert IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1340,7 +1289,7 @@ msgstr "Fejl: \"multipart/signed\" har ingen \"protocol\"-parameter."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Fejl i kommandolinje: %s\n"
@@ -1352,26 +1301,17 @@ msgstr "Evaluerer cache ... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Udfører kommando på matchende breve ..."
+msgstr "Udfører kommando på matchende breve ..."
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Tilbage"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Afslut "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
 msgstr "Afslut Mutt uden at gemme?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Afslut Mutt øjeblikkeligt?"
+msgstr "Afslut Mutt øjeblikkeligt?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
@@ -1379,39 +1319,39 @@ msgstr "Sletning slog fejl"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Sletter breve på server ..."
+msgstr "Sletter breve på server ..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Kan ikke åbne fil for at analysere brevhovedet."
+msgstr "Kan ikke åbne fil for at analysere brevhovedet."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Kan ikke åbne fil for at fjerne brevhovedet."
+msgstr "Kan ikke åbne fil for at fjerne brevhovedet."
 
 #: attach.c:151
 msgid "Failure to rename file."
-msgstr "Omdøbning af fil slog fejl."
+msgstr "Omdøbning af fil slog fejl."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Kritisk fejl! Kunne ikke genåbne brevbakke!"
+msgstr "Kritisk fejl! Kunne ikke genåbne brevbakke!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Kritisk fejl. Antal breve er ikke som forventet!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "Sletter breve på server ..."
+msgstr "Sletter breve på server ..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "Henter brev ..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "Henter liste over breve ..."
@@ -1420,7 +1360,7 @@ msgstr "Henter liste over breve ..."
 msgid "Fetching list of messages..."
 msgstr "Henter liste over breve ..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "Henter brevhoveder ... [%d/%d]"
@@ -1430,17 +1370,17 @@ msgstr "Henter brevhoveder ... [%d/%d]"
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Henter brevhoveder ... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Henter brev ..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "Filmaske: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Filen eksisterer , (o)verskriv, (t)ilføj, (a)nnulér?"
+msgstr "Filen eksisterer , (o)verskriv, (t)ilføj, (a)nnulér?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
@@ -1454,39 +1394,34 @@ msgstr "Filen er et filkatalog, gem i det? [(j)a, (n)ej, (a)lle]"
 msgid "File under directory: "
 msgstr "Fil i dette filkatalog: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "Filtrér gennem: "
+msgstr "Filtrér gennem: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Fingeraftryk: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "gem dette brev til senere forsendelse"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "Opfølg til %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Opfølg til %s%s?"
+msgstr "Opfølg til %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "Videresend MIME-indkapslet?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Videresend som bilag?"
 
@@ -1494,9 +1429,9 @@ msgstr "Videresend som bilag?"
 msgid "Forward as attachments?"
 msgstr "Videresend som bilag?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Funktionen er ikke tilladt ved vedlægning af bilag."
+msgstr "Funktionen er ikke tilladt ved vedlægning af bilag."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
@@ -1510,65 +1445,54 @@ msgstr "Henter navnerum ..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Gruppe"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Hjælp"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "Hjælp for %s"
+msgstr "Hjælp for %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "Hjælpeskærm vises nu."
+msgstr "Hjælpeskærm vises nu."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
 msgstr "Jeg ved ikke hvordan man udskriver dette!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Kan ikke udskrive %s-brevdele."
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "Ægthed af id er ubestemt."
+msgstr "Ægthed af id er ubestemt."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "Id er udløbet/ugyldig/ophævet."
+msgstr "Id er udløbet/ugyldig/ophævet."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "Id er ikke bevist ægte."
+msgstr "Id er ikke bevist ægte."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "Id er kun bevist marginalt ægte."
+msgstr "Id er kun bevist marginalt ægte."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
 msgstr "Ugyldig PGP-header"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
 msgstr "Ugyldig S/MIME-header"
 
@@ -1577,57 +1501,53 @@ msgstr "Ugyldig S/MIME-header"
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "Ugyldig angivelse for type %s i \"%s\" linje %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Citér brevet i svar?"
+msgstr "Citér brevet i svar?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Inkluderer citeret brev ..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Indsæt"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Ugyldig dag: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "Ugyldig indkodning."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "Ugyldigt indeksnummer."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
 msgstr "Ugyldigt brevnummer."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Ugyldig måned: %s"
+msgstr "Ugyldig måned: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "Ugyldig relativ dato: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "Starter PGP ..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "Starter PGP ..."
@@ -1637,76 +1557,72 @@ msgstr "Starter PGP ..."
 msgid "Invoking autoview command: %s"
 msgstr "Starter autovisning kommando: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Hop til brev: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Hop til: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
 msgstr "Man kan ikke springe rundt i dialogerne"
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "Nøgle-id: 0x%s"
+msgstr "Nøgle-id: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
 msgstr "Tasten er ikke tillagt en funktion."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Tasten er ikke tillagt en funktion. Tast '%s' for hjælp."
+msgstr "Tasten er ikke tillagt en funktion. Tast '%s' for hjælp."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Afgræns til breve efter mønster: "
+msgstr "Afgræns til breve efter mønster: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "Afgrænsning: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Afgrænsning: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Logger ind ..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1714,27 +1630,27 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Fil blokeret af gammel lås. Fjern låsen på  %s?"
+msgstr "Fil blokeret af gammel lås. Fjern låsen på  %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Logger ind ..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Login slog fejl."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Leder efter nøgler, der matcher \"%s\"..."
+msgstr "Leder efter nøgler, der matcher \"%s\"..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "Opsøger %s ..."
+msgstr "Opsøger %s ..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Fingeraftryk: %s"
@@ -1743,23 +1659,19 @@ msgstr "Fingeraftryk: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME-typen er ikke defineret. Kan ikke vise bilag."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Macro-sløjfe opdaget!"
+msgstr "Macro-sløjfe opdaget!"
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Send"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "Brev ikke sendt."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Brev sendt."
 
@@ -1775,11 +1687,11 @@ msgstr "Brevbakke lukket"
 msgid "Mailbox created."
 msgstr "Brevbakke oprettet."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr "Brevbakke slettet."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
 msgstr "Brevbakken er tom."
 
@@ -1788,39 +1700,39 @@ msgstr "Brevbakken er tom."
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Brevbakken er skrivebeskyttet. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
 msgstr "Brevbakken er skrivebeskyttet."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Brevbakken er uændret."
+msgstr "Brevbakken er uændret."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
 msgstr "Brevbakken skal have et navn."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
 msgstr "Brevbakke ikke slettet."
 
 #: imap/browse.c:306
 msgid "Mailbox renamed."
-msgstr "Brevbakke omdøbt."
+msgstr "Brevbakke omdøbt."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Brevbakken blev ødelagt!"
+msgstr "Brevbakken blev ødelagt!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Brevbakke ændret udefra."
+msgstr "Brevbakke ændret udefra."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Brevbakke ændret udefra. Status-indikatorer kan være forkerte."
+msgstr "Brevbakke ændret udefra. Status-indikatorer kan være forkerte."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Indbakker [%d]"
@@ -1828,18 +1740,14 @@ msgstr "Indbakker [%d]"
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Brug af \"edit\" i mailcap-fil kræver %%s."
+msgstr "Brug af \"edit\" i mailcap-fil kræver %%s."
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Brug af \"compose\" i mailcap-fil kræver %%s."
+msgstr "Brug af \"compose\" i mailcap-fil kræver %%s."
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Opret alias"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1848,19 +1756,15 @@ msgstr ""
 msgid "Marking %d messages deleted..."
 msgstr "Markerer %d breve slettet ..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Maske"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Brevet er gensendt."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1878,14 +1782,14 @@ msgstr "Brevet er ikke gensendt."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Brevet er uændret!"
+msgstr "Brevet er uændret!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Forrige brev i tråden er ikke synligt i afgrænset visning"
+msgstr "Forrige brev i tråden er ikke synligt i afgrænset visning"
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "Brev tilbageholdt."
 
@@ -1893,7 +1797,7 @@ msgstr "Brev tilbageholdt."
 msgid "Message printed"
 msgstr "Brevet er udskrevet"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Brevet skrevet."
 
@@ -1913,42 +1817,29 @@ msgstr "Brevene er ikke gensendt."
 msgid "Messages printed"
 msgstr "Brevene er udskrevet"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Manglende parameter."
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Kæden må højst have %d led."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Breve sendt med Mixmaster må ikke have Cc- eller Bcc-felter."
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Flyt læste breve til %s?"
+msgstr "Flyt læste breve til %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Flytter læste breve til %s ..."
+msgstr "Flytter læste breve til %s ..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Ny forespørgsel"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nyt filnavn: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Ny fil: "
 
@@ -1956,41 +1847,33 @@ msgstr "Ny fil: "
 msgid "New mail in "
 msgstr "Ny post i "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr "Ny(e) brev(e) i denne brevbakke."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Næste"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "Side ned"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2000,32 +1883,32 @@ msgstr "Ingen godkendelsesmetode kan bruges."
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Fandt ingen \"boundary\"-parameter! [rapportér denne fejl]"
+msgstr "Fandt ingen \"boundary\"-parameter! [rapportér denne fejl]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Ingen listninger"
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Ingen filer passer til filmasken."
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
 msgstr "Ingen indbakker er defineret"
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Intet afgrænsningsmønster er i brug."
+msgstr "Intet afgrænsningsmønster er i brug."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Ingen brevbakke er åben."
+msgstr "Ingen brevbakke er åben."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr "Ingen brevbakke med nye breve."
 
@@ -2039,7 +1922,7 @@ msgstr "Ingen \"compose\"-regel for %s i mailcap-fil, opretter en tom fil."
 msgid "No mailcap edit entry for %s"
 msgstr "Ingen \"edit\"-regel for %s i mailcap-fil."
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "Ingen postlister fundet!"
 
@@ -2047,7 +1930,7 @@ msgstr "Ingen postlister fundet!"
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Ingen passende mailcap-regler fundet. Viser som tekst."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "Ingen breve i den brevbakke."
 
@@ -2055,87 +1938,77 @@ msgstr "Ingen breve i den brevbakke."
 msgid "No messages matched criteria."
 msgstr "Ingen breve opfylder kriterierne."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "Ikke mere citeret tekst."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Ikke flere tråde."
+msgstr "Ikke flere tråde."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "Ikke mere uciteret tekst efter citeret tekst."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Ingen nye breve på POP-serveren."
+msgstr "Ingen nye breve på POP-serveren."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Ingen nye breve"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Intet emne er angivet."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Ingen filer passer til filmasken."
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Ingen brevbakke med nye breve."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "Ingen tilbageholdte breve."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Ingen brevbakke med nye breve."
-
 #: commands.c:378
 msgid "No printing command has been defined."
 msgstr "Ingen udskrivningskommando er defineret"
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Ingen modtagere er anført!"
+msgstr "Ingen modtagere er anført!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr "Ingen angivelse af modtagere.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Ingen modtagere blev anført."
+msgstr "Ingen modtagere blev anført."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Intet søgemønster."
+msgstr "Intet søgemønster."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Intet emne er angivet."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "Intet emne, undlad at sende?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "Intet emne, afbryd?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Intet emne, afbryder."
 
@@ -2143,103 +2016,99 @@ msgstr "Intet emne, afbryder."
 msgid "No such folder"
 msgstr "Brevbakken findes ikke"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "Der er ingen udvalgte listninger."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
 msgstr "Ingen udvalgte breve er synlige!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "Ingen breve er udvalgt."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr "Alle breve har slette-markering."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Ingen ulæste breve"
+msgstr "Ingen ulæste breve"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "Ingen synlige breve."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Funktion er ikke tilgængelig i denne menu."
+msgstr "Funktion er ikke tilgængelig i denne menu."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Ikke fundet."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
-msgstr "Intet at gøre."
+msgstr "Intet at gøre."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "O.k."
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Sletning af brevdele fra udelte breve er ikke understøttet."
+msgstr "Sletning af brevdele fra udelte breve er ikke understøttet."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Åbn brevbakke"
+msgstr "Åbn brevbakke"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Åbn brevbakke i skrivebeskyttet tilstand"
+msgstr "Åbn brevbakke i skrivebeskyttet tilstand"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Åbn brevbakken med brevet som skal vedlægges"
+msgstr "Åbn brevbakken med brevet som skal vedlægges"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Åbn brevbakke i skrivebeskyttet tilstand"
+msgstr "Åbn brevbakke i skrivebeskyttet tilstand"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Åbn brevbakken med brevet som skal vedlægges"
+msgstr "Åbn brevbakken med brevet som skal vedlægges"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Uddata fra leveringsprocessen"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "PGP (k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, %s, in(g)en "
+msgstr "PGP (k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, %s, in(g)en "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP allerede valgt. Ryd og fortsæt ? "
+msgstr "PGP allerede valgt. Ryd og fortsæt ? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP-nøgler som matcher <%s>."
+msgstr "PGP-nøgler som matcher <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "PGP-nøgler som matcher <%s>."
+msgstr "PGP-nøgler som matcher <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
@@ -2253,53 +2122,40 @@ msgstr "PGP-underskrift er i orden."
 msgid "POP host is not defined."
 msgstr "Ingen POP-server er defineret."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Forrige brev i tråden er ikke tilgængeligt."
+msgstr "Forrige brev i tråden er ikke tilgængeligt."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Forrige brev i tråden er ikke synligt i afgrænset visning"
+msgstr "Forrige brev i tråden er ikke synligt i afgrænset visning"
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Adgangskode for %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Navn: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Overfør til program"
-
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Overfør til kommando: "
+msgstr "Overfør til kommando: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Overfør til kommando (pipe): "
+msgstr "Overfør til kommando (pipe): "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "Sæt hostname-variablen til en passende værdi ved brug af mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Udsæt afsendelse af dette brev?"
+msgstr "Udsæt afsendelse af dette brev?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Tilbageholdte breve"
 
@@ -2307,23 +2163,15 @@ msgstr "Tilbageholdte breve"
 msgid "Preconnect command failed."
 msgstr "\"preconnect\"-kommando slog fejl"
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "Forbereder brev til videresendelse ..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Tryk på en tast for at fortsætte ..."
+msgstr "Tryk på en tast for at fortsætte ..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "Side op"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Udskriv"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "Udskriv brevdel?"
 
@@ -2331,7 +2179,7 @@ msgstr "Udskriv brevdel?"
 msgid "Print message?"
 msgstr "Udskriv brev?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
 msgstr "Udskriv udvalgte brevdele"
 
@@ -2349,34 +2197,30 @@ msgstr "Fjern %d slettet brev?"
 msgid "Purge %d deleted messages?"
 msgstr "Fjern %d slettede breve?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Forespørgsel"
+msgstr "Forespørgsel"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "Forespørgsel: '%s'"
+msgstr "Forespørgsel: '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Ingen forespørgsels-kommando defineret."
+msgstr "Ingen forespørgsels-kommando defineret."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Forespørgsel: "
+msgstr "Forespørgsel: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Afslut"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "Afslut Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Henter navnerum ..."
@@ -2384,67 +2228,63 @@ msgstr "Henter navnerum ..."
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "Læser %s ..."
+msgstr "Læser %s ..."
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "Læser %s ... %d"
+msgstr "Læser %s ... %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "Læser %s ... %d (%d%%)"
+msgstr "Læser %s ... %d (%d%%)"
 
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "Indlæser nye breve (%d bytes) ..."
+msgstr "Indlæser nye breve (%d bytes) ..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Virkelig slette brevbakke \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Genindlæs tilbageholdt brev?"
+msgstr "Genindlæs tilbageholdt brev?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Omkodning berører kun tekstdele"
+msgstr "Omkodning berører kun tekstdele"
 
 #: imap/browse.c:300
 #, c-format
 msgid "Rename failed: %s"
-msgstr "Omdøbning slog fejl: %s"
+msgstr "Omdøbning slog fejl: %s"
 
-#: browser.c:1020
+#: browser.c:991
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Omdøbning er kun understøttet for IMAP-brevbakker"
+msgstr "Omdøbning er kun understøttet for IMAP-brevbakker"
 
 #: imap/browse.c:288
 #, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Omdøb brevbakke %s to: "
+msgstr "Omdøb brevbakke %s to: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "Omdøb til: "
+msgstr "Omdøb til: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Genåbner brevbakke ..."
-
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Svar"
+msgstr "Genåbner brevbakke ..."
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Svar til %s%s?"
@@ -2454,42 +2294,42 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Omv-sort. (d)ato/(f)ra/(a)nk./(e)mne/t(i)l/(t)råd/(u)sort/(s)tr./s(c)ore/s(p)"
+"Omv-sort. (d)ato/(f)ra/(a)nk./(e)mne/t(i)l/(t)råd/(u)sort/(s)tr./s(c)ore/s(p)"
 "am?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Søg baglæns efter: "
+msgstr "Søg baglæns efter: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Søg baglæns: "
+msgstr "Søg baglæns: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Omvendt sortering efter (d)ato, (a)lfabetisk, (s)tr. eller (i)ngen? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "PGP (k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, %s, in(g)en "
+msgstr "PGP (k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, %s, in(g)en "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME allerede valgt. Ryd og fortsæt ? "
+msgstr "S/MIME allerede valgt. Ryd og fortsæt ? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Der er ikke sammenfald mellem ejer af S/MIME-certifikat og afsender"
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME-certifikater som matcher \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "S/MIME-breve uden antydning om indhold er ikke understøttet."
+msgstr "S/MIME-breve uden antydning om indhold er ikke understøttet."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
@@ -2503,7 +2343,7 @@ msgstr "S/MIME-underskrift er i orden."
 msgid "SASL authentication failed."
 msgstr "SASL-godkendelse slog fejl."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Fingeraftryk: %s"
@@ -2513,20 +2353,16 @@ msgstr "Fingeraftryk: %s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "SSL-forbindelse bruger %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Gem"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "Gem en kopi af dette brev?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Gem i fil: "
 
@@ -2540,118 +2376,98 @@ msgstr "Gem%s i brevbakke"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Gemmer brevstatus-indikatorer ... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Gemmer ..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Søg"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "Søg efter: "
+msgstr "Søg efter: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Søgning er nået til bunden uden resultat."
+msgstr "Søgning er nået til bunden uden resultat."
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Søgning nåede toppen uden resultat."
+msgstr "Søgning nåede toppen uden resultat."
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Søgning afbrudt."
+msgstr "Søgning afbrudt."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Søgning kan ikke bruges i denne menu."
+msgstr "Søgning kan ikke bruges i denne menu."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Søgning fortsat fra bund."
+msgstr "Søgning fortsat fra bund."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Søgning fortsat fra top."
+msgstr "Søgning fortsat fra top."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "Søg: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Vælg"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Udvælg  "
+msgstr "Søg: "
 
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Vælg en genposterkæde"
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "Vælger %s ..."
-
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Send"
+msgstr "Vælger %s ..."
 
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Sender i baggrunden."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Sender brev ..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Serveren afbrød forbindelsen!"
+msgstr "Serveren afbrød forbindelsen!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Sæt status-indikator"
+msgstr "Sæt status-indikator"
 
 #: commands.c:463
 msgid "Shell command: "
 msgstr "Skalkommando: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Underskriv"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Underskriv som: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Underskriv og kryptér"
+msgstr "Underskriv og kryptér"
 
 #: commands.c:406
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Sortér (d)ato/(f)ra/(a)nk./(e)mne/t(i)l/(t)råd/(u)sort/(s)tr./s(c)ore/s(p)"
+"Sortér (d)ato/(f)ra/(a)nk./(e)mne/t(i)l/(t)råd/(u)sort/(s)tr./s(c)ore/s(p)"
 "am?:"
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortering efter (d)ato, (a)lfabetisk, (s)tr. eller (i)ngen? "
 
@@ -2659,154 +2475,150 @@ msgstr "Sortering efter (d)ato, (a)lfabetisk, (s)tr. eller (i)ngen? "
 msgid "Sorting mailbox..."
 msgstr "Sorterer brevbakke ..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "Nøgle-id: 0x%s"
+msgstr "Nøgle-id: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Abonnementer [%s], filmaske: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "Abonnerer på %s ..."
+msgstr "Abonnerer på %s ..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "Tjek af SSL-certifikat"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Udvælg breve efter mønster: "
+msgstr "Udvælg breve efter mønster: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Udvælg de breve som du vil vedlægge!"
+msgstr "Udvælg de breve som du vil vedlægge!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Udvælgelse er ikke understøttet."
+msgstr "Udvælgelse er ikke understøttet."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr "Brevet er ikke synligt."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL er ikke tilgængelig."
+msgstr "SSL er ikke tilgængelig."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr "Den aktuelle del vil blive konverteret"
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr "Den aktuelle del vil ikke blive konverteret"
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "Brevindekset er forkert. Prøv at genåbne brevbakken."
+msgstr "Brevindekset er forkert. Prøv at genåbne brevbakken."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "Genposterkæden er allerede tom."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "Der er ingen bilag."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Der er ingen breve."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "Der er ingen underdele at vise!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Forældet IMAP-server. Mutt kan ikke bruge den."
+msgstr "Forældet IMAP-server. Mutt kan ikke bruge den."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Dette certifikat tilhører:"
+msgstr "Dette certifikat tilhører:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr "Dette certifikat er gyldigt"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr "Dette certifikat er udstedt af:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Denne nøgle kan ikke bruges: udløbet/sat ud af kraft/tilbagekaldt."
+msgstr "Denne nøgle kan ikke bruges: udløbet/sat ud af kraft/tilbagekaldt."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Tråden indeholder ulæste breve."
+msgstr "Tråden indeholder ulæste breve."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Trådning er ikke i brug."
+msgstr "Trådning er ikke i brug."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Timeout overskredet under forsøg på at bruge fcntl-lås!."
+msgstr "Timeout overskredet under forsøg på at bruge fcntl-lås!."
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Timeout overskredet ved forsøg på brug af flock-lås!"
+msgstr "Timeout overskredet ved forsøg på brug af flock-lås!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
 msgstr "Toppen af brevet vises."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "Forsøger at udtrække PGP-nøgler ...\n"
+msgstr "Forsøger at udtrække PGP-nøgler ...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "Forsøger at udtrække S/MIME-certifikater ...\n"
+msgstr "Forsøger at udtrække S/MIME-certifikater ...\n"
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
@@ -2823,88 +2635,79 @@ msgstr ""
 msgid "USER authentication failed."
 msgstr "SASL-godkendelse slog fejl."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "Kan ikke vedlægge %s!"
+msgstr "Kan ikke vedlægge %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "Kan ikke vedlægge!"
+msgstr "Kan ikke vedlægge!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Kan ikke hente brevhoveder fra denne version IMAP-server."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "Ude af stand til at hente certifikat fra server"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Kunne ikke efterlade breve på server."
+msgstr "Kunne ikke efterlade breve på server."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "Kan ikke vedlægge %s!"
+msgstr "Kan ikke vedlægge %s!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Kan ikke låse brevbakke!"
+msgstr "Kan ikke låse brevbakke!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Kan ikke åbne midlertidig fil!"
+msgstr "Kan ikke åbne midlertidig fil!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Kan ikke åbne midlertidig fil!"
+msgstr "Kan ikke åbne midlertidig fil!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Kan ikke åbne midlertidig fil!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Behold"
+msgstr "Kan ikke åbne midlertidig fil!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Behold breve efter mønster: "
+msgstr "Behold breve efter mønster: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Behold"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Ukendt \"Content-Type\" %s."
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Afmelder abonnement på %s ..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "Afmelder abonnement på %s ..."
+msgstr "Afmelder abonnement på %s ..."
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "Afmelder abonnement på %s ..."
+msgstr "Afmelder abonnement på %s ..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Fjern valg efter mønster: "
+msgstr "Fjern valg efter mønster: "
 
 #: imap/message.c:546
 #, fuzzy
@@ -2913,45 +2716,37 @@ msgstr "Uploader brev ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "Brug 'toggle-write' for at muliggøre skrivning"
+msgstr "Brug 'toggle-write' for at muliggøre skrivning"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Anvend nøgle-id = \"%s\" for %s?"
+msgstr "Anvend nøgle-id = \"%s\" for %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "Brugernavn på %s: "
+msgstr "Brugernavn på %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Ugyldig måned: %s"
+msgstr "Ugyldig måned: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Ugyldig måned: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Ugyldig måned: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Kontrollér PGP-underskrift?"
+msgstr "Kontrollér PGP-underskrift?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
 msgstr "Efterkontrollerer brevfortegnelser ..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Vis brevdel"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "ADVARSEL! Fil %s findes, overskriv?"
@@ -2962,26 +2757,26 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "Server-certifikat er udløbet"
+msgstr "Server-certifikat er udløbet"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "Server-certifikat er udløbet"
+msgstr "Server-certifikat er udløbet"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "Server-certifikat er endnu ikke gyldigt"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "Server-certifikat er endnu ikke gyldigt"
@@ -2999,18 +2794,18 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "Venter på fcntl-lås ... %d"
+msgstr "Venter på fcntl-lås ... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "Venter på flock-lås ... %d"
+msgstr "Venter på flock-lås ... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "Venter på svar ..."
+msgstr "Venter på svar ..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "Advarsel: '%s' er et forkert IDN."
@@ -3018,14 +2813,14 @@ msgstr "Advarsel: '%s' er et forkert IDN."
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Server-certifikat er udløbet"
+msgstr "Server-certifikat er udløbet"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Advarsel: Forkert IDN '%s' i alias '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Advarsel: Kunne ikke gemme certifikat"
 
@@ -3046,17 +2841,17 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
 msgstr "Det er ikke muligt at lave et bilag."
 
@@ -3069,7 +2864,7 @@ msgstr "Kunne ikke skrive! Gemte en del af brevbakken i %s"
 msgid "Write fault!"
 msgstr "Skrivefejl!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Skriv brevet til brevbakke"
 
@@ -3078,7 +2873,7 @@ msgstr "Skriv brevet til brevbakke"
 msgid "Writing %s..."
 msgstr "Skriver %s ..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Skriver brevet til %s ..."
@@ -3088,74 +2883,56 @@ msgstr "Skriver brevet til %s ..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Skriver breve ... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Fejl i kommandolinje: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
 msgstr "Der er allerede et alias med det navn!"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Du har allerede valgt kædens første led."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Du har allerede valgt kædens sidste led."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Du er på første listning."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Du er på den første side."
+msgstr "Du er på første listning."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Du er ved første brev."
+msgstr "Du er ved første brev."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Du er på den første side."
+msgstr "Du er på den første side."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Du er ved den første tråd."
+msgstr "Du er ved den første tråd."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Du er på sidste listning."
+msgstr "Du er på sidste listning."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Du er på den sidste side."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "Du er ved sidste brev."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Du er på den sidste side."
+msgstr "Du er på den sidste side."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Du kan ikke komme længere ned."
+msgstr "Du kan ikke komme længere ned."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Du kan ikke komme længere op."
+msgstr "Du kan ikke komme længere op."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
 msgstr "Adressebogen er tom!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
 msgstr "Brevets eneste del kan ikke slettes."
 
@@ -3163,7 +2940,7 @@ msgstr "Brevets eneste del kan ikke slettes."
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Du kan kun gensende message/rfc822-brevdele."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] O.k.?"
@@ -3171,7 +2948,7 @@ msgstr "[%s = %s] O.k.?"
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s er ikke understøttet "
+msgstr "[-- %s/%s er ikke understøttet "
 
 #: handler.c:1000
 #, c-format
@@ -3188,7 +2965,7 @@ msgstr "[-- Fejl fra autovisning af %s --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autovisning ved brug af %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3196,11 +2973,11 @@ msgstr ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3208,65 +2985,65 @@ msgstr ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- Kan ikke køre %s --]\n"
+msgstr "[-- Kan ikke køre %s --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- END PGP MESSAGE --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- END PGP PUBLIC KEY BLOCK --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- END PGP SIGNED MESSAGE --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Slut på PGP/MIME-krypteret data --]\n"
+msgstr "[-- Slut på PGP/MIME-krypteret data --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- Slut på PGP/MIME-krypteret data --]\n"
+msgstr "[-- Slut på PGP/MIME-krypteret data --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Slut på S/MIME-krypteret data --]\n"
+"[-- Slut på S/MIME-krypteret data --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- Slut på S/MIME-underskrevne data --]\n"
+"[-- Slut på S/MIME-underskrevne data --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Slut på underskrevne data --]\n"
+"[-- Slut på underskrevne data --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Fejl: Kunne ikke vise nogen del af \"Multipart/Alternative\"! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3274,7 +3051,7 @@ msgstr ""
 "[-- Fejl: Inkonsistent \"multipart/signed\" struktur! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3283,26 +3060,26 @@ msgstr ""
 "[-- Fejl: Ukendt \"multipart/signed\" protokol %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Fejl: Kunne ikke oprette en midlertidig fil! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Fejl: kunne ikke finde begyndelse på PGP-meddelelsen! --]\n"
+"[-- Fejl: kunne ikke finde begyndelse på PGP-meddelelsen! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- Fejl: Kunne ikke oprette en midlertidig fil! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3315,43 +3092,43 @@ msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Fejl: \"message/external-body\" har ingen \"access-type\"-parameter --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Følgende data er PGP/MIME-krypteret --]\n"
+"[-- Følgende data er PGP/MIME-krypteret --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Følgende data er PGP/MIME-krypteret --]\n"
+"[-- Følgende data er PGP/MIME-krypteret --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
-msgstr "[-- Følgende data er S/MIME-krypteret --]\n"
+msgstr "[-- Følgende data er S/MIME-krypteret --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
-msgstr "[-- Følgende data er S/MIME-underskrevet --]\n"
+msgstr "[-- Følgende data er S/MIME-underskrevet --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Følgende data er underskrevet --]\n"
+"[-- Følgende data er underskrevet --]\n"
 "\n"
 
 #: handler.c:1185
@@ -3367,15 +3144,15 @@ msgstr "[-- Denne %s/%s-del er ikke medtaget, --]\n"
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Type: %s/%s, indkodning: %s, størrelse: %s --]\n"
+msgstr "[-- Type: %s/%s, indkodning: %s, størrelse: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr "[-- Advarsel: Kan ikke finde nogen underskrifter. --]\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3385,7 +3162,7 @@ msgstr "[-- Advarsel: %s/%s underskrifter kan ikke kontrolleres. --]\n"
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- og den angivne \"access-type\" %s er ikke understøttet --]\n"
+msgstr "[-- og den angivne \"access-type\" %s er ikke understøttet --]\n"
 
 #: handler.c:1214
 msgid ""
@@ -3403,33 +3180,33 @@ msgstr "[-- navn %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- den %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Udløbet   "
+msgstr "Udløbet   "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
 msgstr "Ugyldigt   "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
 msgstr "Tilbagekaldt   "
@@ -3443,16 +3220,43 @@ msgstr "[ugyldig dato]"
 msgid "[unable to calculate]"
 msgstr "[kan ikke beregne]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: Ingen adresse"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Kan ikke finde nogen udvalgte breve."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Kan ikke finde nogen udvalgte breve."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Gem en kopi af dette brev?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "ret brevdelens beskrivelse"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "ret brevdelens beskrivelse"
@@ -3461,22 +3265,90 @@ msgstr "ret brevdelens beskrivelse"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: for mange parametre"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Fejl ved indlæsning af filkatalog."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Ingen brevbakke med nye breve."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: for få parametre."
+msgstr "color: for få parametre."
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Ingen nye breve"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr "omdanner"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Skriv brevet til brevbakke"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
@@ -3492,18 +3364,99 @@ msgstr "Kunne ikke afkorte midlertidig brevbakke: %s"
 msgid "could not write temporary mail folder: %s"
 msgstr "Kunne ikke skrive til midlertidig brevbakke: %s"
 
-#: browser.c:1206
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Ingen indbakker er defineret"
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dasi"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "standard-farver er ikke understøttet."
+msgstr "standard-farver er ikke understøttet."
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Slet breve på server?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Behold breve efter mønster: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Behold breve efter mønster: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "dfaeituscp"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Redigér brev før videresendelse?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3517,31 +3470,118 @@ msgstr "Kopierer til %s ..."
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "Vælger %s ..."
+msgstr "Vælger %s ..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Den aktuelle del vil ikke blive konverteret"
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "ret brevdelens beskrivelse"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Kan ikke skrive brev"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Henter brevhoveder ... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Redigér brev før videresendelse?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Gem en kopi af dette brev?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "tomt mønster"
+msgstr "tomt mønster"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "Kryptér"
+msgstr "Kryptér"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Gem en kopi af dette brev?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3556,17 +3596,17 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
 #: pattern.c:499
 msgid "error in expression"
@@ -3575,17 +3615,17 @@ msgstr "Fejl i udtryk."
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3595,60 +3635,136 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "fejl i mønster ved: %s"
+msgstr "fejl i mønster ved: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "fejl: ukendt op %d (rapportér denne fejl)."
+msgstr "fejl: ukendt op %d (rapportér denne fejl)."
 
 # TJEK
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "kusbitg"
 
 # TJEK
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "kusbitg"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec: ingen parametre."
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Opfølg til %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
-#, c-format
-msgid "gpgme_op_keylist_start failed: %s"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
 msgstr ""
 
-#: handler.c:1193
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Videresend som bilag?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Kigger efter nye breve ..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Du er ved første brev."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Du er på den sidste side."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Ingen brevbakke med nye breve."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Fejl ved åbning af brevbakke"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Ingen brevbakke med nye breve."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: handler.c:1193
 msgid "has been deleted --]\n"
 msgstr "er blevet slettet --]\n"
 
@@ -3656,23 +3772,117 @@ msgstr "er blevet slettet --]\n"
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE slog fejl"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
 msgstr "ugyldig linje i brevhoved"
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Ugyldigt indeksnummer."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Hop til brev: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Hop til brev: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Tråden indeholder ulæste breve."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Du er ved den første tråd."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Ingen ulæste breve"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Ingen ulæste breve"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Gem en kopi af dette brev?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
-msgstr "PGP-nøgler som matcher <%s>."
+msgstr "PGP-nøgler som matcher <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Gensend udvalgte breve til: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Ingen brevbakke med nye breve."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: tom tastesekvens"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro: for mange parametre"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
@@ -3680,7 +3890,39 @@ msgstr "Ingen mailcap-angivelse for type %s."
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): kan ikke sætte tidsstempel på fil"
+msgstr "maildir_commit_message(): kan ikke sætte tidsstempel på fil"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
@@ -3697,19 +3939,110 @@ msgstr "parenteser matcher ikke: %s"
 msgid "missing parameter"
 msgstr "manglende parameter"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: for få parametre."
+msgstr "mono: for få parametre."
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Du er på første listning."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Du er ved første brev."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Du er på sidste listning."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Du er ved sidste brev."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Du er på sidste listning."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Du er på den sidste side."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Alle breve har slette-markering."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Du er på første listning."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Du er på den første side."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Alle breve har slette-markering."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Du er på den første side."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
 msgstr "brev med flere dele har ingen \"boundary\"-parameter!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "nej"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "(ingen brevbakke)"
@@ -3718,53 +4051,306 @@ msgstr "(ingen brevbakke)"
 msgid "not converting"
 msgstr "omdanner ikke"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "tom tastesekvens"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
 msgstr "ota"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Åbn brevbakke i skrivebeskyttet tilstand"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Åbn brevbakke i skrivebeskyttet tilstand"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Genåbner brevbakke ..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Gensend brev til %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "præfiks er ikke tilladt med reset"
+msgstr "præfiks er ikke tilladt med reset"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Du er på første listning."
+
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push: For mange parametre"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Genindlæs tilbageholdt brev?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Tråden indeholder ulæste breve."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Kan ikke redigere brev på POP-server."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: kunne ikke vedlægge fil."
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Hop til brev: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Slet breve på server?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ag"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "agv"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Gem%s i brevbakke"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Gem%s i brevbakke"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Kan ikke redigere brev på POP-server."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "Fejl i udtryk."
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Søg efter: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Kunne ikke sende brevet."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Videresend som bilag?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Afgræns til breve efter mønster: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Ikke mere citeret tekst."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Udskriv brev?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Ingen breve i den brevbakke."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: Fejl ved %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: Fejl i %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: læsning afbrudt pga. for mange fejl i %s"
+msgstr "source: læsning afbrudt pga. for mange fejl i %s"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Ingen filer passer til filmasken."
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "sync: mbox ændret, men ingen ændrede breve! (rapportér denne bug)"
+msgstr "sync: mbox ændret, men ingen ændrede breve! (rapportér denne bug)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Fjern valg efter mønster: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Du er ved den første tråd."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3776,23 +4362,94 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Ikke mere citeret tekst."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Omkodning berører kun tekstdele"
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Intet søgemønster."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Ingen ulæste breve"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "for få parametre."
+msgstr "for få parametre."
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "for mange parametre."
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "ret brevdelens beskrivelse"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Behold breve efter mønster: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Behold breve efter mønster: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Behold breve efter mønster: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
@@ -3808,10 +4465,28 @@ msgstr "unhook: Kan ikke foretage unhook * inde fra en hook."
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: ukendt hooktype: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "ukendt fejl"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Fjern valg efter mønster: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "ret brevdelens beskrivelse"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3823,12 +4498,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "værdi er ikke tilladt med reset"
+msgstr "værdi er ikke tilladt med reset"
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Bilag gemt."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Ny fil: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Skriv brevet til brevbakke"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "ja"
 
@@ -3836,3 +4542,6 @@ msgstr "ja"
 msgid "yna"
 msgstr "jna"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/de.po b/po/de.po
index 347a735..47be913 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -3,15 +3,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-03-20 14:03+0100\n"
 "Last-Translator: Nico Golde <nico@ngolde.de>\n"
 "Language-Team: German <mutt-po@mutt.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Allgemeine Tastenbelegungen:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Funktionen ohne Bindung an Taste:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -76,37 +76,37 @@ msgstr ""
 "\n"
 "options:\n"
 "  -A <alias>\tExpandiere den angegebenen Alias\n"
-"  -a <file>\tHängt Datei an die Message an\n"
-"  -b <address>\tEmpfänger einer unsichtbaren Kopie (Bcc:)\n"
-"  -c <address>\tEmpfänger einer Kopie (Cc:)\n"
-"  -e <command>\tMutt-Kommando, nach der Initialisierung ausführen\n"
+"  -a <file>\tHängt Datei an die Message an\n"
+"  -b <address>\tEmpfänger einer unsichtbaren Kopie (Bcc:)\n"
+"  -c <address>\tEmpfänger einer Kopie (Cc:)\n"
+"  -e <command>\tMutt-Kommando, nach der Initialisierung ausführen\n"
 "  -f <file>\tMailbox, die eingelesen werden soll\n"
 "  -F <file>\tAlternatives muttrc File.\n"
 "  -H <file>\tFile, aus dem Header und Body der Mail gelesen werden sollen\n"
 "  -i <file>\tFile, das in den Body der Message eingebunden werden soll\n"
 "  -m <type>\tDefault-Mailbox Typ\n"
 "  -n\t\tDas Muttrc des Systems ignorieren\n"
-"  -p\t\tEine zurückgestellte Nachricht zurückholen\n"
+"  -p\t\tEine zurückgestellte Nachricht zurückholen\n"
 "  -Q <variable>\tFrage die Variable aus der Konfiguration ab\n"
-"  -R\t\tMailbox nur zum Lesen öffnen\n"
-"  -s <subj>\tSubject der Mail (Leerzeichen in Anführungsstrichen)\n"
+"  -R\t\tMailbox nur zum Lesen öffnen\n"
+"  -s <subj>\tSubject der Mail (Leerzeichen in Anführungsstrichen)\n"
 "  -v\t\tVersion und Einstellungen beim Compilieren anzeigen\n"
 "  -x\t\tSimuliert mailx beim Verschicken von Mails\n"
 "  -y\t\tStarte Mutt mit einer Mailbox aus der `mailboxes' Liste\n"
 "  -z\t\tNur starten, wenn neue Nachrichten in der Mailbox liegen\n"
-"  -Z\t\tÖffne erste Mailbox mit neuen Nachrichten oder beenden\n"
+"  -Z\t\tÖffne erste Mailbox mit neuen Nachrichten oder beenden\n"
 "  -h\t\tDiese Hilfe"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 msgid "     sign as: "
 msgstr " signiere als: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     an %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "    von %s"
@@ -149,81 +149,81 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr " %s: Fehler beim Packen der Mailbox. Ungepackte beibehalten!\n"
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr " (für eine Liste '?' eingeben): "
+msgstr " (für eine Liste '?' eingeben): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr " (inline)"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Drücken Sie '%s', um Schreib-Modus ein-/auszuschalten"
+msgstr " Drücken Sie '%s', um Schreib-Modus ein-/auszuschalten"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr " in dieser begrenzten Ansicht."
 
 #: commands.c:601
 msgid " tagged"
-msgstr " ausgewählte"
+msgstr " ausgewählte"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: Ungültiges Kommando"
+msgstr "%c: Ungültiges Kommando"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: Wird in diesem Modus nicht unterstützt."
+msgstr "%c: Wird in diesem Modus nicht unterstützt."
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d behalten, %d gelöscht."
+msgstr "%d behalten, %d gelöscht."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d behalten, %d verschoben, %d gelöscht."
+msgstr "%d behalten, %d verschoben, %d gelöscht."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr "%s \"%s\"."
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
-msgstr "%s (ausgewählt: %d) %d"
+msgstr "%s (ausgewählt: %d) %d"
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr "%s [%s]."
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Wollen Sie den Schlüssel wirklich benutzen?"
+msgstr "%s Wollen Sie den Schlüssel wirklich benutzen?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] wurde verändert. Kodierung neu bestimmen?"
+msgstr "%s [#%d] wurde verändert. Kodierung neu bestimmen?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] existiert nicht mehr!"
@@ -233,7 +233,7 @@ msgstr "%s [#%d] existiert nicht mehr!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d von %d Nachrichten gelesen]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s existiert nicht. Neu anlegen?"
@@ -241,24 +241,24 @@ msgstr "%s existiert nicht. Neu anlegen?"
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s ist ein ungültiger IMAP Pfad"
+msgstr "%s ist ein ungültiger IMAP Pfad"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s ist ein ungültiger POP Pfad"
+msgstr "%s ist ein ungültiger POP Pfad"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s ist keine gültige Newsgruppen-Angabe!"
+msgstr "%s ist keine gültige Newsgruppen-Angabe!"
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s ist keine gültige Newsserver-Angabe!"
+msgstr "%s ist keine gültige Newsserver-Angabe!"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ist kein Verzeichnis."
@@ -268,7 +268,7 @@ msgstr "%s ist kein Verzeichnis."
 msgid "%s is not a mailbox!"
 msgstr "%s ist keine Mailbox!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ist keine Mailbox."
@@ -294,55 +294,55 @@ msgid ""
 "%s: Error compressing mailbox! Original mailbox deleted, uncompressed one "
 "kept!\n"
 msgstr ""
-"%s: Fehler beim Komprimieren der Mailbox! Original wurde gelöscht und "
+"%s: Fehler beim Komprimieren der Mailbox! Original wurde gelöscht und "
 "Entpackte beibehalten!\n"
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Unbekannter Typ."
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: color wird nicht vom Terminal unterstützt."
+msgstr "%s: color wird nicht vom Terminal unterstützt."
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: Kommando ist nur für Index-Objekt gültig."
+msgstr "%s: Kommando ist nur für Index-Objekt gültig."
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: Attribut unbekannt."
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: Farbe unbekannt."
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: Funktion unbekannt"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: Funktion unbekannt"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "Menü \"%s\" existiert nicht"
+msgstr "Menü \"%s\" existiert nicht"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: Objekt unbekannt."
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: Zu wenige Parameter."
@@ -350,63 +350,63 @@ msgstr "%s: Zu wenige Parameter."
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: Kann Datei nicht anhängen."
+msgstr "%s: Kann Datei nicht anhängen."
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: Kann Datei nicht anhängen.\n"
+msgstr "%s: Kann Datei nicht anhängen.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: Unbekanntes Kommando"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: Unbekannter Typ"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: Unbekannte Variable."
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "'%s' ist ungültig für $%s"
+msgstr "'%s' ist ungültig für $%s"
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "'%s' ist ungültig für $%s\n"
+msgstr "'%s' ist ungültig für $%s\n"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(Tastaturbindung für 'view-attachments' benötigt!)"
+msgstr "(Tastaturbindung für 'view-attachments' benötigt!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(keine Mailbox)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(z)urückweisen, (e)inmal akzeptieren"
+msgstr "(z)urückweisen, (e)inmal akzeptieren"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(z)urückweisen, (e)inmal akzeptieren, (i)mmer akzeptieren"
+msgstr "(z)urückweisen, (e)inmal akzeptieren, (i)mmer akzeptieren"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(Größe %s Byte) "
+msgstr "(Größe %s Byte) "
 
 #: handler.c:1448
 #, c-format
@@ -415,28 +415,28 @@ msgstr "(benutzen Sie '%s', um diesen Teil anzuzeigen)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
-msgstr "Ungültige Signatur angeblich von: "
+msgstr "Ungültige Signatur angeblich von: "
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- Anhänge"
+msgstr "-- Anhänge"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<unbekannt>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<Voreinstellung>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
-msgstr "Ein Bedingung wurde nicht erfüllt.\n"
+msgstr "Ein Bedingung wurde nicht erfüllt.\n"
 
 #: crypt.cpkg:958
 msgid "A system error occurred"
@@ -446,101 +446,93 @@ msgstr "Ein Systemfehler ist aufgetreten"
 msgid "APOP authentication failed."
 msgstr "APOP Authentifizierung fehlgeschlagen."
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Verwerfen"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Unveränderte Nachricht verwerfen?"
+msgstr "Unveränderte Nachricht verwerfen?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Unveränderte Nachricht verworfen."
+msgstr "Unveränderte Nachricht verworfen."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
-msgstr "Füge neue Newsgruppen hinzu..."
+msgstr "Füge neue Newsgruppen hinzu..."
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adresse: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Adresse eingetragen."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Kurzname für Adressbuch: "
+msgstr "Kurzname für Adressbuch: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Adressbuch"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
-msgstr "Alle verfügbaren Protokolle für TLS-/SSL-Verbindungen deaktiviert"
+msgstr "Alle verfügbaren Protokolle für TLS-/SSL-Verbindungen deaktiviert"
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 msgid "All matching keys are marked expired/revoked."
 msgstr ""
-"Alles passenden Schlüssel sind veraltet, zurückgezogen oder deaktiviert."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Anhängen"
+"Alles passenden Schlüssel sind veraltet, zurückgezogen oder deaktiviert."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Nachricht an %s anhängen?"
+msgstr "Nachricht an %s anhängen?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
 msgstr "Argument muss eine Nachrichtennummer sein."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr "Artikel %d auf Server nicht gefunden"
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr "Artikel %s auf Server nicht gefunden"
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
-msgstr "Artikel hat keinen Vorgänger!"
+msgstr "Artikel hat keinen Vorgänger!"
 
-#: send.c:1461
+#: send.c:1455
 msgid "Article not posted."
 msgstr "Anhang gespeichert."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr "Artikel gepostet."
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "Datei anhängen"
+msgstr "Datei anhängen"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "Hänge ausgewählte Dateien an..."
+msgstr "Hänge ausgewählte Dateien an..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Anhang gefiltert."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Anhang gespeichert."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "Anhänge"
+msgstr "Anhänge"
 
 #: imap/auth.c:83
 #, c-format
@@ -562,33 +554,33 @@ msgstr "Authentifiziere (SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
-msgstr "Verfügbare CRL ist zu alt.\n"
+msgstr "Verfügbare CRL ist zu alt.\n"
 
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "Ungültige IDN \"%s\"."
+msgstr "Ungültige IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "Ungültige IDN %s bei der Vorbereitung von Resent-From."
+msgstr "Ungültige IDN %s bei der Vorbereitung von Resent-From."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "Ungültige IDN in \"%s\": '%s'"
+msgstr "Ungültige IDN in \"%s\": '%s'"
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "Ungültige IDN: '%s'"
+msgstr "Ungültige IDN: '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "Unzulässiger Mailbox Name"
+msgstr "Unzulässiger Mailbox Name"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "Das Ende der Nachricht wird angezeigt."
 
@@ -610,7 +602,7 @@ msgstr "Nachrichten an %s weiterleiten"
 msgid "Bounce tagged messages to: "
 msgstr "Markierte Nachrichten weiterleiten an: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr "Eingebaute Standardeinstellungen:"
 
@@ -625,18 +617,18 @@ msgstr "Cache-Verzeichnis nicht angelegt!"
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Kann an Mailbox nicht anhängen: %s"
+msgstr "Kann an Mailbox nicht anhängen: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Verzeichnisse können nicht angehängt werden!"
+msgstr "Verzeichnisse können nicht angehängt werden!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kann %s nicht anlegen: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Kann Datei %s nicht anlegen."
@@ -649,34 +641,34 @@ msgstr "Kann Filter nicht erzeugen."
 msgid "Can't create filter process"
 msgstr "Kann Filterprozess nicht erzeugen"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Kann temporäre Datei nicht erzeugen"
+msgstr "Kann temporäre Datei nicht erzeugen"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Nicht alle markierten Anhänge dekodierbar. MIME für den Rest verwenden?"
+"Nicht alle markierten Anhänge dekodierbar. MIME für den Rest verwenden?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Nicht alle markierten Anhänge dekodierbar. MIME für den Rest verwenden? "
+"Nicht alle markierten Anhänge dekodierbar. MIME für den Rest verwenden? "
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "Kann verschlüsselte Nachricht nicht entschlüsseln!"
+msgstr "Kann verschlüsselte Nachricht nicht entschlüsseln!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "Kann Dateianhang nicht vom POP-Server löschen."
+msgstr "Kann Dateianhang nicht vom POP-Server löschen."
 
-#: recvattach.c:985
+#: recvattach.c:973
 msgid "Can't delete attachment from newsserver."
-msgstr "Kann Dateianhang nicht vom POP-Server löschen."
+msgstr "Kann Dateianhang nicht vom POP-Server löschen."
 
 #: lib-mx/mx.c:103
 #, c-format
@@ -691,10 +683,6 @@ msgstr "Kann Header nicht abholen: Nicht verbunden!"
 msgid "Can't find any tagged messages."
 msgstr "Es sind keine Nachrichten markiert."
 
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Kann die \"type2.list\" für Mixmaster nicht holen!"
-
 # ######################################################
 #                                                     #
 # Until here: line numbers checked                    #
@@ -702,37 +690,37 @@ msgstr "Kann die \"type2.list\" f
 # ######################################################
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Namensschema kann nicht erfüllt werden, fortfahren?"
+msgstr "Namensschema kann nicht erfüllt werden, fortfahren?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Kann Nachrichten-Datei nicht öffnen: %s"
+msgstr "Kann Nachrichten-Datei nicht öffnen: %s"
 
 #: lib-mx/mx.c:605
 msgid "Can't open trash folder"
-msgstr "Kann Papierkorb nicht öffnen"
+msgstr "Kann Papierkorb nicht öffnen"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "Kann Artikel nicht senden. Verbindung zu %s verloren."
 
-#: nntp.c:1952
+#: nntp.c:1954
 msgid "Can't post article. No connection to news server."
 msgstr "Kann Artikel nicht senden. Keine Verbindung zum Server."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
-msgstr "Kann Artikel nicht senden. Konnte %s nicht öffnen."
+msgstr "Kann Artikel nicht senden. Konnte %s nicht öffnen."
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, c-format
 msgid "Can't post article: %s"
 msgstr "Kann Artikel nicht senden: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, c-format
 msgid "Can't rename %s to %s"
 msgstr "Kann %s nicht in %s umbenennen."
@@ -745,27 +733,27 @@ msgstr "Kann Nachricht nicht in POP Mailbox schreiben."
 msgid "Can't save message to newsserver."
 msgstr "Kann Nachricht auf Newsserver nicht speichern."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "Kann Verzeichniseintrag für Datei %s nicht lesen: %s"
+msgstr "Kann Verzeichniseintrag für Datei %s nicht lesen: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
-msgstr "Konnte wegen fehlendem Schlüssel oder Zertifikat nicht verifizieren.\n"
+msgstr "Konnte wegen fehlendem Schlüssel oder Zertifikat nicht verifizieren.\n"
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Verzeichnisse können nicht angezeigt werden."
+msgstr "Verzeichnisse können nicht angezeigt werden."
 
-#: nntp.c:632
+#: nntp.c:634
 #, c-format
 msgid "Can't write %s"
 msgstr "Kann %s nicht schreiben."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Kann Header nicht in temporäre Datei schreiben!"
+msgstr "Kann Header nicht in temporäre Datei schreiben!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
@@ -773,7 +761,7 @@ msgstr "Kann Nachricht nicht schreiben"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Kann Nachricht nicht in temporäre Datei schreiben!"
+msgstr "Kann Nachricht nicht in temporäre Datei schreiben!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
@@ -783,41 +771,37 @@ msgstr "Kann Filter zum Anzeigen nicht erzeugen."
 msgid "Cannot create filter"
 msgstr "Kann Filter nicht erzeugen."
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Kann Mailbox im Nur-Lese-Modus nicht schreibbar machen!"
 
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr "Als gelesen markieren"
-
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "Signal %s... Abbruch.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 msgid "Certificate is not X.509"
 msgstr "Fehler: Zertifikat entspricht nicht X.509-Standard"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Zertifikat gespeichert"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr "Fehler bei Zertifikatsverifizierung (%s)"
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Änderungen an dieser Mailbox werden beim Verlassen geschrieben."
+msgstr "Änderungen an dieser Mailbox werden beim Verlassen geschrieben."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Änderungen an dieser Mailbox werden nicht geschrieben."
+msgstr "Änderungen an dieser Mailbox werden nicht geschrieben."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Char = %s, Oktal = %o, Dezimal = %d"
@@ -825,37 +809,29 @@ msgstr "Char = %s, Oktal = %o, Dezimal = %d"
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Zeichensatz in %s abgeändert; %s."
+msgstr "Zeichensatz in %s abgeändert; %s."
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "Verzeichnis"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Verzeichnis wechseln nach: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 msgid "Check for children of message..."
-msgstr "Prüfe auf untergeordnete Nachrichten..."
+msgstr "Prüfe auf untergeordnete Nachrichten..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Schlüssel prüfen  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "Prüfe auf neue Nachrichten..."
+msgstr "Prüfe auf neue Nachrichten..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 msgid "Checking for new newsgroups..."
-msgstr "Prüfe auf neue Newsgruppen..."
+msgstr "Prüfe auf neue Newsgruppen..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Klartext"
 
@@ -863,7 +839,7 @@ msgstr "Klartext"
 msgid "Clear flag"
 msgstr "Entferne Indikator"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Beende Verbindung zu %s..."
@@ -872,25 +848,25 @@ msgstr "Beende Verbindung zu %s..."
 msgid "Closing connection to POP server..."
 msgstr "Beende Verbindung zum POP-Server..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 msgid "Collecting data..."
 msgstr "Sammle Daten..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Das Kommando TOP wird vom Server nicht unterstützt."
+msgstr "Das Kommando TOP wird vom Server nicht unterstützt."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Kommando UIDL wird vom Server nicht unterstützt."
+msgstr "Kommando UIDL wird vom Server nicht unterstützt."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "Speichere Änderungen..."
+msgstr "Speichere Änderungen..."
 
-#: main.c:171
+#: main.c:169
 msgid "Compile Options:"
 msgstr "Compile-Optionen:"
 
@@ -908,12 +884,12 @@ msgstr "Kopiere nach %s..."
 msgid "Compressing %s..."
 msgstr "Komprimiere %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr "Verbunden mit %s. Posten nicht erlaubt."
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Verbunden mit %s. Posten erlaubt."
@@ -941,7 +917,7 @@ msgstr "Verbindung unterbrochen. Verbindung zum POP-Server wiederherstellen?"
 msgid "Connection to %s closed"
 msgstr "Verbindung zu %s beendet"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "Verbindung zu %s beendet. Wieder herstellen?"
@@ -949,9 +925,9 @@ msgstr "Verbindung zu %s beendet. Wieder herstellen?"
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Content-Type in %s abgeändert."
+msgstr "Content-Type in %s abgeändert."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type ist von der Form Basis/Untertyp."
 
@@ -1004,16 +980,16 @@ msgstr "Kann keine Verbindung zu %s aufbauen (%s)."
 msgid "Could not copy message"
 msgstr "Konnte Nachricht nicht kopieren."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Konnte keine Temporärdatei erzeugen!"
+msgstr "Konnte keine Temporärdatei erzeugen!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Konnte keine Temporärdatei erzeugen!"
+msgstr "Konnte keine Temporärdatei erzeugen!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
@@ -1024,9 +1000,9 @@ msgstr "Sortierfunktion nicht gefunden! (bitte Bug melden)"
 msgid "Could not find the host \"%s\""
 msgstr "Kann Host \"%s\" nicht finden"
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Konnte nicht alle gewünschten Nachrichten zitieren!"
+msgstr "Konnte nicht alle gewünschten Nachrichten zitieren!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
@@ -1035,13 +1011,13 @@ msgstr "Konnte keine TLS-Verbindung realisieren"
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "Konnte %s nicht öffnen."
+msgstr "Konnte %s nicht öffnen."
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Konnte Mailbox nicht erneut öffnen!"
+msgstr "Konnte Mailbox nicht erneut öffnen!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "Konnte Nachricht nicht verschicken."
 
@@ -1055,9 +1031,9 @@ msgstr "Kann %s nicht locken.\n"
 msgid "Create %s?"
 msgstr "%s erstellen?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Es können nur IMAP Mailboxen erzeugt werden"
+msgstr "Es können nur IMAP Mailboxen erzeugt werden"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
@@ -1081,79 +1057,66 @@ msgstr "Dekomprimiere %s..."
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Kopiere%s entschlüsselt in Mailbox"
+msgstr "Kopiere%s entschlüsselt in Mailbox"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "Speichere%s entschlüsselt in Mailbox"
+msgstr "Speichere%s entschlüsselt in Mailbox"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
-msgstr "Entschlüssle Nachricht..."
+msgstr "Entschlüssle Nachricht..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Entschlüsselung gescheitert."
+msgstr "Entschlüsselung gescheitert."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Lösch."
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Löschen"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Es können nur IMAP Mailboxen gelöscht werden"
+msgstr "Es können nur IMAP Mailboxen gelöscht werden"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "Lösche Nachrichten auf dem Server?"
+msgstr "Lösche Nachrichten auf dem Server?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "Lösche Nachrichten nach Muster: "
+msgstr "Lösche Nachrichten nach Muster: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 msgid "Deletion"
-msgstr "Löschen"
+msgstr "Löschen"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Kann Anhänge aus verschlüsselten Nachrichten nicht löschen."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Beschr."
+msgstr "Kann Anhänge aus verschlüsselten Nachrichten nicht löschen."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "ID %s ist ungeprüft. Möchten Sie sie für %s verwenden?"
+msgstr "ID %s ist ungeprüft. Möchten Sie sie für %s verwenden?"
 
 #: lib-lua/madmutt.cpkg:94
 #, c-format
 msgid "Directory %s not exist. Create it?"
 msgstr "%s existiert nicht. Neu anlegen?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Verzeichnis [%s], Dateimaske: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "ERROR: Bitte melden sie diesen Fehler"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
 msgstr "Weitergeleitete Nachricht editieren?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr "Bearbeiten"
 
@@ -1162,30 +1125,30 @@ msgstr "Bearbeiten"
 msgid "Empty expression"
 msgstr "Leerer Ausdruck"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Verschlüsseln"
+msgstr "Verschlüsseln"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "Verschlüsseln mit: "
+msgstr "Verschlüsseln mit: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 msgid "Enter Message-ID: "
 msgstr "Message-ID eingeben: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "KeyID für %s: "
+msgstr "KeyID für %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "Schlüssel eingeben (^G zum Abbrechen): "
+msgstr "Schlüssel eingeben (^G zum Abbrechen): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
@@ -1197,7 +1160,7 @@ msgstr "Fehler beim Weiterleiten der Nachrichten!"
 
 #: crypt.cpkg:1175
 msgid "Error checking signature"
-msgstr "Fehler beim Prüfen der Signatur"
+msgstr "Fehler beim Prüfen der Signatur"
 
 #: pop.c:142
 #, c-format
@@ -1207,23 +1170,23 @@ msgstr "Fehler beim Verbinden mit dem Server: %s"
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
-msgstr "Fehler beim Ausführen: %s: konnte Mailbox nicht öffnen!\n"
+msgstr "Fehler beim Ausführen: %s: konnte Mailbox nicht öffnen!\n"
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Fehler beim Suchen nach Ausgeber-Schlüssel: %s\n"
+msgstr "Fehler beim Suchen nach Ausgeber-Schlüssel: %s\n"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
-msgstr "Fehler beim Auslesen der Schlüsselinformationen: "
+msgstr "Fehler beim Auslesen der Schlüsselinformationen: "
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fehler in %s, Zeile %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fehler in Kommandozeile: %s\n"
@@ -1233,55 +1196,46 @@ msgstr "Fehler in Kommandozeile: %s\n"
 msgid "Error in expression: %s"
 msgstr "Fehler in Ausdruck: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 msgid "Error initialising gnutls certificate data"
 msgstr "Fehler: kann gnutls-Daten nicht initialisieren"
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Kann Terminal nicht initialisieren."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "Fehler beim Öffnen der Mailbox"
+msgstr "Fehler beim Öffnen der Mailbox"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "Unverständliche Adresse!"
+msgstr "Unverständliche Adresse!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr "Fehler beim Abarbeiten des Zertifikats"
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Fehler beim Ausführen von \"%s\"!"
+msgstr "Fehler beim Ausführen von \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "Fehler beim Einlesen des Verzeichnisses."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fehler %d beim Versand der Nachricht (%s)."
 
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Fehler %d beim Versand der Nachricht.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Fehler beim Versand der Nachricht."
-
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Fehler bei Verbindung mit %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Fehler bei der Anzeige einer Datei"
 
@@ -1292,31 +1246,25 @@ msgstr "Fehler beim Versuch, die Mailbox zu schreiben!"
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Fehler. Speichere temporäre Datei als %s ab."
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr ""
-"Fehler: %s kann nicht als letzter Remailer einer Kette verwendet werden."
+msgstr "Fehler. Speichere temporäre Datei als %s ab."
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Fehler: '%s' ist eine fehlerhafte IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr "Fehler: Zertifzierungskette zu lang - Abbruch\n"
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr "Fehler: Daten kopieren schlug fehl\n"
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
-msgstr "Fehler: Entschlüsselung/Verifizierung schlug fehl: %s\n"
+msgstr "Fehler: Entschlüsselung/Verifizierung schlug fehl: %s\n"
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
@@ -1330,7 +1278,7 @@ msgstr "Fehler: multipart/signed ohne \"protocol\"-Parameter."
 msgid "Error: no TLS socket open"
 msgstr "Fehler: keine TLS-Verbindung offen"
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Fehler: Verifizierung schlug fehl: %s\n"
@@ -1342,42 +1290,33 @@ msgstr "Werte Cache aus... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Führe Kommando aus..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Verlassen"
+msgstr "Führe Kommando aus..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Ende  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Mutt-ng verlassen, ohne Änderungen zu speichern?"
+msgstr "Mutt-ng verlassen, ohne Änderungen zu speichern?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
 msgstr "Mutt-ng verlassen?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "Löschen fehlgeschlagen"
+msgstr "Löschen fehlgeschlagen"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Lösche Nachrichten auf dem Server..."
+msgstr "Lösche Nachrichten auf dem Server..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen."
+msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu entfernen."
+msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu entfernen."
 
 #: attach.c:151
 msgid "Failure to rename file."
@@ -1385,22 +1324,22 @@ msgstr "Fehler beim Umbenennen der Datei."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
+msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Kritischer Fehler.  Nachrichtenzähler weicht ab!"
+msgstr "Kritischer Fehler.  Nachrichtenzähler weicht ab!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, c-format
 msgid "Fetching %s from server..."
 msgstr "Hole Nachricht %s vom Server..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 msgid "Fetching headers from cache..."
-msgstr "Hole Nachrichten-Köfpe aus Cache..."
+msgstr "Hole Nachrichten-Köfpe aus Cache..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 msgid "Fetching list of articles..."
 msgstr "Hole Liste der Nachrichten..."
 
@@ -1408,26 +1347,26 @@ msgstr "Hole Liste der Nachrichten..."
 msgid "Fetching list of messages..."
 msgstr "Hole Liste der Nachrichten..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 msgid "Fetching message headers..."
-msgstr "Hole Nachrichten-Köpfe..."
+msgstr "Hole Nachrichten-Köpfe..."
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Hole Nachrichten-Köpfe... [%d/%d]"
+msgstr "Hole Nachrichten-Köpfe... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Hole Nachricht..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "Dateimaske: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Datei existiert, (u)eberschreiben, (a)nhängen, a(b)brechen?"
+msgstr "Datei existiert, (u)eberschreiben, (a)nhängen, a(b)brechen?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
@@ -1441,46 +1380,42 @@ msgstr "Datei ist ein Verzeichnis, darin abspeichern? [(j)a, (n)ein, (a)lle]"
 msgid "File under directory: "
 msgstr "Datei in diesem Verzeichnis: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filtere durch: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 msgid "Fingerprint: "
 msgstr "Fingerabdruck: "
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 msgid "First, please tag a message to be linked here"
-msgstr "Stelle Nachricht zum späteren Versand zurück"
+msgstr "Stelle Nachricht zum späteren Versand zurück"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr "Wichtig-Markieren"
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Antworte an %s%s?"
 
-#: lib-ui/curs_main.c:372 pager.c:1318
-msgid "Followup"
-msgstr "Followup"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "Zum Weiterleiten in MIME-Anhang einpacken?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Als Anhang weiterleiten?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "Als Anhänge weiterleiten?"
+msgstr "Als Anhänge weiterleiten?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Funktion steht beim Anhängen von Nachrichten nicht zur Verfügung."
+msgstr "Funktion steht beim Anhängen von Nachrichten nicht zur Verfügung."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
@@ -1488,130 +1423,115 @@ msgstr "Hole Liste der Ordner..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "Hole Namensräume..."
+msgstr "Hole Namensräume..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
-msgstr "Gültige Signatur von: "
-
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Antw.alle"
+msgstr "Gültige Signatur von: "
 
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Hilfe"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "Hilfe für %s"
+msgstr "Hilfe für %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
 msgstr "Hilfe wird bereits angezeigt."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Ich weiß nicht, wie man dies druckt!"
+msgstr "Ich weiß nicht, wie man dies druckt!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Kann %s Anhänge nicht drucken!"
+msgstr "Kann %s Anhänge nicht drucken!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "Die Gültigkeit dieser ID ist undefiniert."
+msgstr "Die Gültigkeit dieser ID ist undefiniert."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "Diese ID ist veraltet/deaktiviert/zurückgezogen."
+msgstr "Diese ID ist veraltet/deaktiviert/zurückgezogen."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "Diese ID ist ungültig."
+msgstr "Diese ID ist ungültig."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "Diese Gültigkeit dieser ID ist begrenzt."
+msgstr "Diese Gültigkeit dieser ID ist begrenzt."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
-msgstr "Ignoriere $strip_was: Betreff würde leer sein."
+msgstr "Ignoriere $strip_was: Betreff würde leer sein."
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Unzulässiger PGP-Header"
+msgstr "Unzulässiger PGP-Header"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "Unzulässiger S/MIME Header"
+msgstr "Unzulässiger S/MIME Header"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Ungültiger Eintrag für Typ %s in \"%s\", Zeile %d."
+msgstr "Ungültiger Eintrag für Typ %s in \"%s\", Zeile %d."
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr "Nachricht in Antwort zitieren?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Binde zitierte Nachricht ein..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Einfügen"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Ungültiger Tag: %s"
+msgstr "Ungültiger Tag: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Ungültige Kodierung."
+msgstr "Ungültige Kodierung."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Ungültige Indexnummer."
+msgstr "Ungültige Indexnummer."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Ungültige Nachrichtennummer."
+msgstr "Ungültige Nachrichtennummer."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Ungültiger Monat: %s"
+msgstr "Ungültiger Monat: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "Ungültiges relatives Datum: %s"
+msgstr "Ungültiges relatives Datum: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "Rufe PGP auf..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 msgid "Invoking S/MIME..."
 msgstr "Rufe SMIME auf..."
 
@@ -1620,75 +1540,71 @@ msgstr "Rufe SMIME auf..."
 msgid "Invoking autoview command: %s"
 msgstr "Automatische Anzeige mittels: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Springe zu Nachricht: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Springe zu: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Springen in Dialogen ist nicht möglich."
+msgstr "Springen in Dialogen ist nicht möglich."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "Schlüssel ID: 0x%s"
+msgstr "Schlüssel ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
-msgstr "Schlüsseltyp: %s, %lu bit %s\n"
+msgstr "Schlüsseltyp: %s, %lu bit %s\n"
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
-msgstr "Schlüsselbenützung: "
+msgstr "Schlüsselbenützung: "
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
 msgstr "Taste ist nicht belegt."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Taste ist nicht belegt. Drücken Sie '%s' für Hilfe."
+msgstr "Taste ist nicht belegt. Drücken Sie '%s' für Hilfe."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr "LISTGROUP-Befehl schlug fehl: %s"
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "Begrenze auf Nachrichten nach Muster: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Begrenze: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr "Abonn."
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 msgid "Loading descriptions..."
 msgstr "Lade Newsgruppen-Beschreibungen..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr "Lade Liste aus Cache... %d"
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr "Lade Liste aller Newsgruppen auf Server %s..."
@@ -1696,27 +1612,27 @@ msgstr "Lade Liste aller Newsgruppen auf Server %s..."
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Lock-Datei für %s entfernen?"
+msgstr "Lock-Datei für %s entfernen?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Anmeldung..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Anmeldung gescheitert..."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Suche nach Schlüsseln, die auf \"%s\" passen..."
+msgstr "Suche nach Schlüsseln, die auf \"%s\" passen..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
 msgstr "Schlage %s nach..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "MD5-Fingerabdruck: %s"
@@ -1725,23 +1641,19 @@ msgstr "MD5-Fingerabdruck: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Undefinierter MIME-Typ. Kann Anhang nicht anzeigen."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "Makro-Schleife!"
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Senden"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "Nachricht nicht verschickt."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Nachricht verschickt."
 
@@ -1757,11 +1669,11 @@ msgstr "Mailbox geschlossen"
 msgid "Mailbox created."
 msgstr "Mailbox erzeugt."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Mailbox gelöscht."
+msgstr "Mailbox gelöscht."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
 msgstr "Mailbox ist leer."
 
@@ -1770,21 +1682,21 @@ msgstr "Mailbox ist leer."
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Mailbox ist als unschreibbar markiert. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
 msgstr "Mailbox kann nur gelesen, nicht geschrieben werden."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Mailbox unverändert."
+msgstr "Mailbox unverändert."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
 msgstr "Mailbox muss einen Namen haben."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Mailbox nicht gelöscht."
+msgstr "Mailbox nicht gelöscht."
 
 #: imap/browse.c:306
 msgid "Mailbox renamed."
@@ -1792,17 +1704,17 @@ msgstr "Mailbox umbenannt."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Mailbox wurde zerstört!"
+msgstr "Mailbox wurde zerstört!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Mailbox wurde von außen verändert."
+msgstr "Mailbox wurde von außen verändert."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Mailbox wurde verändert. Markierungen können veraltet sein."
+msgstr "Mailbox wurde verändert. Markierungen können veraltet sein."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Mailbox-Dateien [%d]"
@@ -1817,32 +1729,24 @@ msgstr "\"edit\"-Eintrag in Mailcap erfordert %%s."
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\"-Eintrag in der Mailcap-Datei erfordert %%s."
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Kurznamen erzeugen"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr "Alle Artikel als gelesen markieren?"
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Markiere %d Nachrichten zum Löschen..."
+msgstr "Markiere %d Nachrichten zum Löschen..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr "Gelesen-Markierung"
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Maske"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Nachricht weitergeleitet."
 
-#: send.c:505
+#: send.c:503
 #, fuzzy
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr "Nachricht kam von einer Mailingliste. Nur dem Autor antworten?"
@@ -1861,21 +1765,21 @@ msgstr "Nachricht nicht weitergeleitet."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Nachricht nicht verändert!"
+msgstr "Nachricht nicht verändert!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 msgid "Message not visible in limited view."
 msgstr "Bezugsnachricht ist in dieser begrenzten Sicht nicht sichtbar."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Nachricht zurückgestellt."
+msgstr "Nachricht zurückgestellt."
 
 #: commands.c:390
 msgid "Message printed"
 msgstr "Nachricht gedruckt"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Nachricht geschrieben."
 
@@ -1895,19 +1799,10 @@ msgstr "Nachrichten nicht weitergeleitet."
 msgid "Messages printed"
 msgstr "Nachrichten gedruckt"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Fehlende Parameter."
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Eine Mixmaster-Kette kann maximal %d Elemente enthalten."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster unterstützt weder Cc: noch Bcc:"
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
@@ -1918,19 +1813,15 @@ msgstr "Verschiebe gelesene Nachrichten nach %s?"
 msgid "Moving read messages to %s..."
 msgstr "Verschiebe gelesene Nachrichten nach %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr "Name ......: "
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Neue Abfrage"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Neuer Dateiname: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Neue Datei: "
 
@@ -1938,80 +1829,72 @@ msgstr "Neue Datei: "
 msgid "New mail in "
 msgstr "Neue Nachrichten in "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr "Neue Nachrichten in dieser Mailbox."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr "Newsgruppe %s auf Server %s nicht gefunden"
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr "Newsgruppen auf Server [%s]"
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Nächste Nachr."
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "S.vor"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
-msgstr "Keine Message-Id. Kann Aktion nicht ausführen"
+msgstr "Keine Message-Id. Kann Aktion nicht ausführen"
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
-msgstr "Keine Message-ID verfügbar um Diskussionsfäden zu verbinden"
+msgstr "Keine Message-ID verfügbar um Diskussionsfäden zu verbinden"
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
-"Keine Dateien angehängt, aber Hinweise darauf in Text gefunden. Senden "
+"Keine Dateien angehängt, aber Hinweise darauf in Text gefunden. Senden "
 "abgebrochen."
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
-"Keine Dateien angehängt, aber Hinweis darauf in Text gefunden. Senden "
+"Keine Dateien angehängt, aber Hinweis darauf in Text gefunden. Senden "
 "abbrechen?"
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "Keine Authentifizierung verfügbar"
+msgstr "Keine Authentifizierung verfügbar"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
 msgstr "Kein boundary-Parameter gefunden! (bitte Bug melden)"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "Keine Einträge"
+msgstr "Keine Einträge"
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Es gibt keine zur Maske passenden Dateien"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
 msgstr "Keine Eingangs-Mailboxen definiert."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
 msgstr "Zur Zeit ist kein Muster aktiv."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Keine Mailbox ist geöffnet."
+msgstr "Keine Mailbox ist geöffnet."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr "Keine Mailbox mit neuen Nachrichten."
 
@@ -2019,14 +1902,14 @@ msgstr "Keine Mailbox mit neuen Nachrichten."
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
-"Kein \"compose\"-Eintrag für %s in der Mailcap-Datei, erzeuge leere Datei."
+"Kein \"compose\"-Eintrag für %s in der Mailcap-Datei, erzeuge leere Datei."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "Kein \"edit\"-Eintrag für %s in Mailcap."
+msgstr "Kein \"edit\"-Eintrag für %s in Mailcap."
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "Keine Mailing-Listen gefunden!"
 
@@ -2034,23 +1917,23 @@ msgstr "Keine Mailing-Listen gefunden!"
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Es gibt keinen passenden Mailcap-Eintrag. Anzeige als Text."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "Keine Nachrichten in diesem Ordner."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "Keine Nachrichten haben Kriterium erfüllt."
+msgstr "Keine Nachrichten haben Kriterium erfüllt."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "Kein weiterer zitierter Text."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Keine weiteren Diskussionsfäden."
+msgstr "Keine weiteren Diskussionsfäden."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "Kein weiterer eigener Text nach zitiertem Text."
 
@@ -2058,69 +1941,59 @@ msgstr "Kein weiterer eigener Text nach zitiertem Text."
 msgid "No new mail in POP mailbox."
 msgstr "Keine neuen Nachrichten auf dem POP-Server."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Keine neuen Nachrichten"
 
-#: send.c:1544
+#: send.c:1538
 msgid "No newsgroup specified."
 msgstr "Kein Betreff."
 
-#: browser.c:1396
+#: browser.c:1367
 msgid "No newsgroups match the mask"
 msgstr "Es gibt keine zur Maske passenden Dateien"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr "Kein Newsserver fest gelegt!"
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Keine Mailbox mit neuen Nachrichten."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "Keine zurückgestellten Nachrichten."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Gehe zur vorherigen Mailbox mit neuen Nachrichten"
+msgstr "Keine zurückgestellten Nachrichten."
 
 #: commands.c:378
 msgid "No printing command has been defined."
 msgstr "Kein Druck-Kommando definiert."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Es wurden keine Empfänger angegeben!"
+msgstr "Es wurden keine Empfänger angegeben!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Keine Empfänger angegeben.\n"
+msgstr "Keine Empfänger angegeben.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Es wurden keine Empfänger angegeben!"
+msgstr "Es wurden keine Empfänger angegeben!"
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "Kein Suchmuster."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Kein Betreff."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "Kein Betreff, Versand abbrechen?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "Kein Betreff, abbrechen?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Kein Betreff, breche ab."
 
@@ -2128,183 +2001,157 @@ msgstr "Kein Betreff, breche ab."
 msgid "No such folder"
 msgstr "Ordner existiert nicht"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "Keine markierten Einträge."
+msgstr "Keine markierten Einträge."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
 msgstr "Keine markierten Nachrichten sichtbar!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "Keine markierten Nachrichten."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr "Kein Diskussionsfaden verbunden"
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Alle Nachrichten gelöscht."
+msgstr "Alle Nachrichten gelöscht."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "Keine ungelesenen Nachrichten"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "Keine sichtbaren Nachrichten."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Funktion ist in diesem Menü nicht verfügbar."
+msgstr "Funktion ist in diesem Menü nicht verfügbar."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Nicht gefunden."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
 msgstr "Nichts zu erledigen."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Kann nur aus mehrteiligen Anhängen löschen."
+msgstr "Kann nur aus mehrteiligen Anhängen löschen."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Öffne Mailbox"
+msgstr "Öffne Mailbox"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Öffne Mailbox im nur-Lesen-Modus"
+msgstr "Öffne Mailbox im nur-Lesen-Modus"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Mailbox, aus der angehängt werden soll"
+msgstr "Mailbox, aus der angehängt werden soll"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
-msgstr "Newsgruppe öffnen"
+msgstr "Newsgruppe öffnen"
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 msgid "Open newsgroup in read-only mode"
-msgstr "Öffne Mailbox im nur-Lesen-Modus"
+msgstr "Öffne Mailbox im nur-Lesen-Modus"
 
-#: compose.c:734
+#: compose.c:667
 msgid "Open newsgroup to attach message from"
-msgstr "Mailbox, aus der angehängt werden soll"
+msgstr "Mailbox, aus der angehängt werden soll"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Ausgabe des Auslieferungs-Prozesses"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, s/(m)ime, (k)ein PGP? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP bereits ausgewählt. Löschen und weiter?"
+msgstr "PGP bereits ausgewählt. Löschen und weiter?"
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 msgid "PGP and S/MIME keys matching"
-msgstr "Passende PGP- und S/MIME-Schlüssel"
+msgstr "Passende PGP- und S/MIME-Schlüssel"
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 msgid "PGP keys matching"
-msgstr "Passende PGP-Schlüssel"
+msgstr "Passende PGP-Schlüssel"
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP Unterschrift konnte NICHT überprüft werden."
+msgstr "PGP Unterschrift konnte NICHT überprüft werden."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP Unterschrift erfolgreich überprüft."
+msgstr "PGP Unterschrift erfolgreich überprüft."
 
 #: pop.c:1216
 msgid "POP host is not defined."
 msgstr "Es wurde kein POP-Server definiert."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Bezugsnachricht ist nicht verfügbar."
+msgstr "Bezugsnachricht ist nicht verfügbar."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
 msgstr "Bezugsnachricht ist in dieser begrenzten Sicht nicht sichtbar."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "Passwort für %s@%s: "
+msgstr "Passwort für %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Name: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Filtern"
-
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "In Kommando einspeisen: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Übergebe an (pipe): "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Setzen sie die Variable \"hostname\" richtig, wenn Sie Mixmaster verwenden!"
+msgstr "Übergebe an (pipe): "
 
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr "Posten"
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr "Posten in diese Gruppe ist nicht erlaubt, mglw. moderiert. Weiter?"
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Nachricht zurückstellen?"
+msgstr "Nachricht zurückstellen?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "Zurückgestelle Nachrichten"
+msgstr "Zurückgestelle Nachrichten"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
 msgstr "\"Preconnect\" Kommando fehlgeschlagen."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "Bereite Nachricht zum Weiterleiten vor..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Bitte drücken Sie eine Taste..."
-
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "S.zurück"
+msgstr "Bitte drücken Sie eine Taste..."
 
-#: recvattach.c:34
-msgid "Print"
-msgstr "Drucke"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "Drucke Anhang?"
 
@@ -2312,52 +2159,48 @@ msgstr "Drucke Anhang?"
 msgid "Print message?"
 msgstr "Nachricht drucken?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Drucke markierte Anhänge?"
+msgstr "Drucke markierte Anhänge?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Ausgewählte Nachrichten drucken?"
+msgstr "Ausgewählte Nachrichten drucken?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Entferne %d als gelöscht markierte Nachrichten?"
+msgstr "Entferne %d als gelöscht markierte Nachrichten?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Entferne %d als gelöscht markierte Nachrichten?"
+msgstr "Entferne %d als gelöscht markierte Nachrichten?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Abfrage"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Abfrage: '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
 msgstr "Kein Abfragekommando definiert."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Abfrage: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Ende"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "Mutt-ng beenden?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 msgid "Quitting newsgroup..."
 msgstr "Schliesse Newsgruppe..."
 
@@ -2381,50 +2224,46 @@ msgstr "Lese %s... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Lese neue Nachrichten (%d Bytes)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Mailbox \"%s\" wirklich löschen?"
+msgstr "Mailbox \"%s\" wirklich löschen?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Zurückgestellte Nachricht weiterbearbeiten?"
+msgstr "Zurückgestellte Nachricht weiterbearbeiten?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Ändern der Kodierung betrifft nur Textanhänge."
+msgstr "Ändern der Kodierung betrifft nur Textanhänge."
 
 #: imap/browse.c:300
 #, c-format
 msgid "Rename failed: %s"
 msgstr "Umbenennung fehlgeschlagen: %s"
 
-#: browser.c:1020
+#: browser.c:991
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Es können nur IMAP Mailboxen umbenannt werden"
+msgstr "Es können nur IMAP Mailboxen umbenannt werden"
 
 #: imap/browse.c:288
 #, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Benenne Mailbox %s um in: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Umbenennen in: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Öffne Mailbox erneut..."
+msgstr "Öffne Mailbox erneut..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Antw."
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr "Per Mail antworten wie Autor bevorzugt?"
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Antworte an %s%s?"
@@ -2434,57 +2273,57 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Umgekehrt (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)/S(p)"
+"Umgekehrt (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)/S(p)"
 "am?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Suche rückwärts nach: "
+msgstr "Suche rückwärts nach: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Suche rückwärts: "
+msgstr "Suche rückwärts: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
-"Sortiere umgekehrt nach (D)atum, (a)lphabetisch, (G)röße, oder (n)icht? "
+"Sortiere umgekehrt nach (D)atum, (a)lphabetisch, (G)röße, oder (n)icht? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
 "S/MIME (v)erschl., (s)ign., sign. (a)ls, (b)eides, (p)gp, (k)ein S/MIME? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME bereits ausgewählt. Löschen und weiter?"
+msgstr "S/MIME bereits ausgewählt. Löschen und weiter?"
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "S/MIME Zertifikat-Inhaber stimmt nicht mit Absender überein."
+msgstr "S/MIME Zertifikat-Inhaber stimmt nicht mit Absender überein."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 msgid "S/MIME keys matching"
 msgstr "Passende S/MIME-Zertifikate"
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
-"S/MIME Nachrichten ohne Hinweis auf den Inhalt werden nicht unterstützt."
+"S/MIME Nachrichten ohne Hinweis auf den Inhalt werden nicht unterstützt."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME Unterschrift konnte NICHT überprüft werden."
+msgstr "S/MIME Unterschrift konnte NICHT überprüft werden."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "S/MIME Unterschrift erfolgreich überprüft."
+msgstr "S/MIME Unterschrift erfolgreich überprüft."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
 msgstr "SASL Authentifizierung fehlgeschlagen."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "SHA1-Fingerabdruck: %s"
@@ -2494,20 +2333,16 @@ msgstr "SHA1-Fingerabdruck: %s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "SSL/TLS Verbindung unter Verwendung von %s (%s/%s/%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Speichern"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "Soll eine Kopie dieser Nachricht gespeichert werden?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
-msgstr "In Datei speichern ('#' für letzten verwendeten Ordner): "
+msgstr "In Datei speichern ('#' für letzten verwendeten Ordner): "
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Speichern in Datei: "
 
@@ -2521,15 +2356,11 @@ msgstr "Speichere%s in Mailbox"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Speichere Nachrichten-Status-Indikatoren... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Speichere..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Suchen"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Suche nach: "
 
@@ -2545,62 +2376,46 @@ msgstr "Suche hat Anfang erreicht, ohne Treffer zu erzielen."
 msgid "Search interrupted."
 msgstr "Suche unterbrochen."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "In diesem Menü kann nicht gesucht werden."
+msgstr "In diesem Menü kann nicht gesucht werden."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
 msgstr "Suche von hinten begonnen."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
 msgstr "Suche von vorne begonnen."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Suche: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Auswählen"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Auswahl  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Wähle eine Remailer Kette aus."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "Wähle %s aus..."
+msgstr "Wähle %s aus..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Absenden"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Verschicke im Hintergrund."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Verschicke Nachricht..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
-msgstr "Server %s unterstützt diese Operation nicht!"
+msgstr "Server %s unterstützt diese Operation nicht!"
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
 msgstr "Server hat Verbindung beendet!"
 
@@ -2612,54 +2427,50 @@ msgstr "Setze Indikator"
 msgid "Shell command: "
 msgstr "Shell-Kommando: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Signieren"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Signiere als: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Signieren, Verschlüsseln"
+msgstr "Signieren, Verschlüsseln"
 
 #: commands.c:406
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Sortieren (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)ert/S"
+"Sortieren (D)at/(A)bs/Ei(n)g/(B)etr/(E)mpf/(F)aden/(u)nsrt/(G)röße/Be(w)ert/S"
 "(p)am?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Sortiere nach (D)atum, (a)lphabetisch, (G)röße oder (n)icht?"
+msgstr "Sortiere nach (D)atum, (a)lphabetisch, (G)röße oder (n)icht?"
 
 #: sort.c:269
 msgid "Sorting mailbox..."
 msgstr "Sortiere Mailbox..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "Unterschlüssel: 0x%s"
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr "Abonniere"
+msgstr "Unterschlüssel: 0x%s"
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr "Abonnement-Muster: "
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Abonniert [%s], Dateimaske: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr "Abonnierte Newsgruppen"
 
@@ -2668,98 +2479,94 @@ msgstr "Abonnierte Newsgruppen"
 msgid "Subscribing to %s..."
 msgstr "Abonniere %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 msgid "TLS/SSL Certificate check"
-msgstr "TLS/SSL Zertifikat Überprüfung"
+msgstr "TLS/SSL Zertifikat Überprüfung"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr "Markiere Nachrichten nach Muster: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Bitte markieren Sie die Nachrichten, die Sie anhängen wollen!"
+msgstr "Bitte markieren Sie die Nachrichten, die Sie anhängen wollen!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Markieren wird nicht unterstützt."
+msgstr "Markieren wird nicht unterstützt."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr "Diese Nachricht ist nicht sichtbar."
 
 #: crypt.cpkg:940
 msgid "The CRL is not available\n"
-msgstr "Die CRL ist nicht verfügbar.\n"
+msgstr "Die CRL ist nicht verfügbar.\n"
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr "Der aktuelle Anhang wird konvertiert werden."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr "Der aktuelle Anhang wird nicht konvertiert werden."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
-"Der Nachrichtenindex ist fehlerhaft. Versuche die Mailbox neu zu öffnen."
+"Der Nachrichtenindex ist fehlerhaft. Versuche die Mailbox neu zu öffnen."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "Die Remailer-Kette ist bereits leer."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "Es sind keine Anhänge vorhanden."
+msgstr "Es sind keine Anhänge vorhanden."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Es sind keine Nachrichten vorhanden."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "Es sind keine Teile zur Anzeige vorhanden!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Dieser IMAP-Server ist veraltet und wird nicht von Mutt unterstützt."
+msgstr "Dieser IMAP-Server ist veraltet und wird nicht von Mutt unterstützt."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Dieses Zertifikat gehört zu:"
+msgstr "Dieses Zertifikat gehört zu:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Dieses Zertifikat ist gültig"
+msgstr "Dieses Zertifikat ist gültig"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr "Dieses Zertifikat wurde ausgegeben von:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr ""
-"Dieser Schlüssel ist nicht verwendbar: veraltet/deaktiviert/zurückgezogen."
+"Dieser Schlüssel ist nicht verwendbar: veraltet/deaktiviert/zurückgezogen."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr "Diskussionsfaden aufgebrochen"
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Diskussionsfaden enthält ungelesene Nachrichten."
+msgstr "Diskussionsfaden enthält ungelesene Nachrichten."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Darstellung von Diskussionsfäden ist nicht eingeschaltet."
+msgstr "Darstellung von Diskussionsfäden ist nicht eingeschaltet."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
-msgstr "Diskussionsfäden verbunden"
+msgstr "Diskussionsfäden verbunden"
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
@@ -2769,23 +2576,27 @@ msgstr "Konnte fcntl-Lock nicht innerhalb akzeptabler Zeit erhalten."
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "Konnte flock-Lock nicht innerhalb akzeptabler Zeit erhalten."
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr "Neu-Markieren"
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
 msgstr "Der Beginn der Nachricht wird angezeigt."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr "Versuche PGP Keys zu extrahieren...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Versuche S/MIME Zertifikate zu extrahieren...\n"
 
@@ -2797,28 +2608,28 @@ msgstr "Fehler bei Tunnerlverbindung mit %s: %s"
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
 msgid "Tunnel to %s returned error %d (%s)"
-msgstr "Tunnel zu %s gab Fehler %d zurück (%s)"
+msgstr "Tunnel zu %s gab Fehler %d zurück (%s)"
 
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
 msgstr "SASL Authentifizierung fehlgeschlagen."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "Kann %s nicht anhängen!"
+msgstr "Kann %s nicht anhängen!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "Kann nicht anhängen!"
+msgstr "Kann nicht anhängen!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
-"Kann von dieser Version des IMAP-Servers keine Nachrichtenköpfe erhalten."
+"Kann von dieser Version des IMAP-Servers keine Nachrichtenköpfe erhalten."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "Kann kein Zertifikat vom Server erhalten"
 
@@ -2826,7 +2637,7 @@ msgstr "Kann kein Zertifikat vom Server erhalten"
 msgid "Unable to leave messages on server."
 msgstr "Kann Nachrichten nicht auf dem Server belassen."
 
-#: nntp.c:554
+#: nntp.c:556
 #, c-format
 msgid "Unable to lock %s"
 msgstr "Kann %s nicht sperren!"
@@ -2834,55 +2645,47 @@ msgstr "Kann %s nicht sperren!"
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!"
+msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, c-format
 msgid "Unable to open %s for reading"
-msgstr "Konnte %s nicht zum Lesen öffnen"
+msgstr "Konnte %s nicht zum Lesen öffnen"
 
-#: nntp.c:567
+#: nntp.c:569
 #, c-format
 msgid "Unable to open %s for writing"
-msgstr "Konnte %s nicht zum Schreiben öffnen"
+msgstr "Konnte %s nicht zum Schreiben öffnen"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Konnte temporäre Datei nicht öffnen!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Behalten"
+msgstr "Konnte temporäre Datei nicht öffnen!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Entferne Löschmarkierung nach Muster: "
+msgstr "Entferne Löschmarkierung nach Muster: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 msgid "Undeletion"
 msgstr "Behalten"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Unbekannter Content-Type %s."
 
-#: browser.c:46
-msgid "Unsubscribe"
-msgstr "Beende Abonnement"
-
-#: browser.c:1379
+#: browser.c:1350
 #, c-format
 msgid "Unsubscribe pattern: "
-msgstr "Muster für Abonnement beenden: "
+msgstr "Muster für Abonnement beenden: "
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "Beende Abonnement von %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "Entferne Markierung nach Muster: "
 
@@ -2894,86 +2697,78 @@ msgstr "Lade Nachrichten auf den Server..."
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Benutzen Sie 'toggle-write', um Schreib-Modus zu reaktivieren"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Benutze KeyID = \"%s\" für %s?"
+msgstr "Benutze KeyID = \"%s\" für %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
 msgstr "Benutzername bei %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, c-format
 msgid "Valid From : %s\n"
-msgstr "Gültig ab: %s\n"
+msgstr "Gültig ab: %s\n"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Gültig bis : %s\n"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Gültig bis : %s\n"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "PGP-Signatur überprüfen?"
+msgstr "PGP-Signatur überprüfen?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Überprüfe Nachrichten-Indexe..."
+msgstr "Überprüfe Nachrichten-Indexe..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Anhänge betr."
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "WARNUNG!  Datei %s existiert, überschreiben?"
+msgstr "WARNUNG!  Datei %s existiert, überschreiben?"
 
 #: crypt.cpkg:1058
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
 msgstr ""
-"WARNUNG: Es ist nicht sicher, dass der Schlüssel der oben genannten Person "
-"gehört\n"
+"WARNUNG: Es ist nicht sicher, dass der Schlüssel der oben genannten Person "
+"gehört\n"
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 msgid "WARNING: Server certificate has been revoked"
 msgstr "WARNUNG: Zertifikat des Servers ist abgelaufen"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 msgid "WARNING: Server certificate has expired"
 msgstr "WARNUNG: Zertifikat des Servers ist abgelaufen"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "WARNUNG: Zertifikat des Servers ist noch nicht gültig"
+msgstr "WARNUNG: Zertifikat des Servers ist noch nicht gültig"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
-msgstr "WARNUNG: Servername stimmt nicht mit Angaben in Zertifikat überein"
+msgstr "WARNUNG: Servername stimmt nicht mit Angaben in Zertifikat überein"
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "WARNUNG: Austeller des Server-Zertifikats nicht authorisiert"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
-msgstr "WARNUNG: Der Schlüssel gehört nicht der oben genannten Person\n"
+msgstr "WARNUNG: Der Schlüssel gehört nicht der oben genannten Person\n"
 
 #: crypt.cpkg:1048
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr ""
-"WARNUNG: Es ist nicht sicher, dass der Schlüssel der oben genannten Person "
-"gehört\n"
+"WARNUNG: Es ist nicht sicher, dass der Schlüssel der oben genannten Person "
+"gehört\n"
 
 #: lib-mx/mx.c:190
 #, c-format
@@ -2985,31 +2780,31 @@ msgstr "Warte auf fcntl-Lock... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "Warte auf flock-Versuch... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Warte auf Antwort..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "Warnung: '%s' ist eine ungültige IDN."
+msgstr "Warnung: '%s' ist eine ungültige IDN."
 
 #: crypt.cpkg:916
 msgid "Warning: At least one certification key has expired\n"
 msgstr "Warnung: Mindestens ein Zertifikat ist abgelaufen.\n"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "Warnung: Ungültige IDN '%s' in Alias '%s'.\n"
+msgstr "Warnung: Ungültige IDN '%s' in Alias '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Warnung: Konnte Zertifikat nicht speichern"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
-msgstr "Warnung: Einer der Schlüssel wurde zurückgezogen\n"
+msgstr "Warnung: Einer der Schlüssel wurde zurückgezogen\n"
 
 #: commands.c:141 commands.c:151
 msgid "Warning: Part of this message has not been signed."
@@ -3017,23 +2812,23 @@ msgstr "Warnung: Ein Teil dieser Nachricht wurde nicht signiert."
 
 #: crypt.cpkg:910
 msgid "Warning: The key used to create the signature expired at: "
-msgstr "Warnung: Der Schlüssel der Signatur ist abgelaufen am: "
+msgstr "Warnung: Der Schlüssel der Signatur ist abgelaufen am: "
 
 #: crypt.cpkg:930
 msgid "Warning: The signature expired at: "
 msgstr "Warnung: Die Signatur ist abgelaufen am: "
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
 msgstr "Anhang kann nicht erzeugt werden."
 
@@ -3046,7 +2841,7 @@ msgstr "Konnte nicht schreiben! Speichere Teil-Mailbox in %s"
 msgid "Write fault!"
 msgstr "Schreibfehler!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Schreibe Nachricht in Mailbox"
 
@@ -3055,7 +2850,7 @@ msgstr "Schreibe Nachricht in Mailbox"
 msgid "Writing %s..."
 msgstr "Schreibe %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Schreibe Nachricht nach %s ..."
@@ -3065,83 +2860,65 @@ msgstr "Schreibe Nachricht nach %s ..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Schreibe Nachrichten... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, c-format
 msgid "XOVER command failed: %s"
 msgstr "XOVER-Befehl schlug fehl: %s"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
 msgstr ""
 "Sie haben bereits einen Adressbucheintrag mit diesem Kurznamen definiert."
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Sie haben bereits das erste Element der Kette ausgewählt."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Sie haben bereits das letzte Element der Kette ausgewählt."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr "Sie sind auf dem ersten Eintrag"
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Sie sind auf der ersten Seite."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr "Sie sind bereits auf der ersten Nachricht."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr "Sie sind auf der ersten Seite."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Sie haben bereits den ersten Diskussionsfaden ausgewählt."
+msgstr "Sie haben bereits den ersten Diskussionsfaden ausgewählt."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr "Sie sind auf dem letzten Eintrag."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Sie sind auf der letzten Seite."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "Sie sind bereits auf der letzten Nachricht."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr "Sie sind auf der letzten Seite."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Sie können nicht weiter nach unten gehen."
+msgstr "Sie können nicht weiter nach unten gehen."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Sie können nicht weiter nach oben gehen."
+msgstr "Sie können nicht weiter nach oben gehen."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Keine Einträge im Adressbuch!"
+msgstr "Keine Einträge im Adressbuch!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Der einzige Nachrichtenteil kann nicht gelöscht werden."
+msgstr "Der einzige Nachrichtenteil kann nicht gelöscht werden."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Sie können nur message/rfc822-Anhänge erneut versenden."
+msgstr "Sie können nur message/rfc822-Anhänge erneut versenden."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Eintragen?"
@@ -3149,7 +2926,7 @@ msgstr "[%s = %s] Eintragen?"
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s wird nicht unterstützt "
+msgstr "[-- %s/%s wird nicht unterstützt "
 
 #: handler.c:1000
 #, c-format
@@ -3166,7 +2943,7 @@ msgstr "[-- Fehlerausgabe von %s --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatische Anzeige mittels %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3174,11 +2951,11 @@ msgstr ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3186,44 +2963,44 @@ msgstr ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr "[-- Anfang der Signatur-Information --]\n"
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- Kann %s nicht ausführen. --]\n"
+msgstr "[-- Kann %s nicht ausführen. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- END PGP MESSAGE --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- END PGP PUBLIC KEY BLOCK --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- END PGP SIGNED MESSAGE --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n"
+msgstr "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n"
+msgstr "[-- Ende der PGP/MIME-verschlüsselten Daten --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 msgid "[-- End of S/MIME encrypted data --]\n"
-msgstr "[-- Ende der S/MIME-verschlüsselten Daten --]\n"
+msgstr "[-- Ende der S/MIME-verschlüsselten Daten --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr "[-- Ende der S/MIME signierten Daten --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 msgid ""
 "[-- End signature information --]\n"
 "\n"
@@ -3236,7 +3013,7 @@ msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Fehler: Konnte keinen der multipart/alternative-Teile anzeigen! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3244,7 +3021,7 @@ msgstr ""
 "[-- Fehler: Inkonsistente multipart/signed Struktur! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3253,11 +3030,11 @@ msgstr ""
 "[-- Fehler: Unbekanntes multipart/signed Protokoll %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Fehler: Konnte Temporärdatei nicht anlegen! --]\n"
+msgstr "[-- Fehler: Konnte Temporärdatei nicht anlegen! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3265,16 +3042,16 @@ msgstr ""
 "[-- Fehler: Konnte Anfang der PGP-Nachricht nicht finden! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr ""
-"[-- Fehler: Entschlüsselung schlug fehl: %s --]\n"
+"[-- Fehler: Entschlüsselung schlug fehl: %s --]\n"
 "\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3287,31 +3064,31 @@ msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Fehler: message/external-body hat keinen access-type Parameter --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Die folgenden Daten sind PGP/MIME-verschlüsselt --]\n"
+"[-- Die folgenden Daten sind PGP/MIME-verschlüsselt --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Die folgenden Daten sind PGP/MIME-verschlüsselt --]\n"
+"[-- Die folgenden Daten sind PGP/MIME-verschlüsselt --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Die folgenden Daten sind S/MIME-verschlüsselt --]\n"
+"[-- Die folgenden Daten sind S/MIME-verschlüsselt --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
@@ -3319,7 +3096,7 @@ msgstr ""
 "[-- Die folgenden Daten sind S/MIME signiert --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -3340,9 +3117,9 @@ msgstr "[-- Dieser %s/%s-Anhang ist nicht in der Nachricht enthalten, --]\n"
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Typ: %s/%s, Kodierung: %s, Größe: %s --]\n"
+msgstr "[-- Typ: %s/%s, Kodierung: %s, Größe: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -3350,26 +3127,26 @@ msgstr ""
 "[-- Warnung: Kann keine Unterschriften finden. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Warnung: %s/%s Unterschriften können nicht geprüft werden. --]\n"
+"[-- Warnung: %s/%s Unterschriften können nicht geprüft werden. --]\n"
 "\n"
 
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- und die angegebene Zugangsmethode %s wird nicht unterstützt --]\n"
+msgstr "[-- und die angegebene Zugangsmethode %s wird nicht unterstützt --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- und die zugehörige externe Quelle --]\n"
+"[-- und die zugehörige externe Quelle --]\n"
 "[-- existiert nicht mehr. --]\n"
 
 #: handler.c:1201
@@ -3382,53 +3159,80 @@ msgstr "[-- Name: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- am %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
-msgstr "[Kann Nutzer-ID nicht anzeigen (ungültige DN)]"
+msgstr "[Kann Nutzer-ID nicht anzeigen (ungültige DN)]"
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
-msgstr "[Kann Nutzer-ID nicht anzeigen (ungültige Kodierung)]"
+msgstr "[Kann Nutzer-ID nicht anzeigen (ungültige Kodierung)]"
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr "[Kann Nutzer-ID nicht anzeigen (unbekannte Kodierung)]"
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr "[Gesperrt]"
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 msgid "[Expired]"
 msgstr "[Abgelaufen]"
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 msgid "[Invalid]"
-msgstr "[Ungültig]"
+msgstr "[Ungültig]"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
-msgstr "[Zurückgez.]"
+msgstr "[Zurückgez.]"
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[ungültiges Datum]"
+msgstr "[ungültiges Datum]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[kann nicht berechnet werden]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: Keine Adresse"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Es sind keine Nachrichten markiert."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Es sind keine Nachrichten markiert."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Soll eine Kopie dieser Nachricht gespeichert werden?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "Editiere Beschreibung des Anhangs"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "Editiere Beschreibung des Anhangs"
@@ -3437,53 +3241,202 @@ msgstr "Editiere Beschreibung des Anhangs"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: Zu viele Argumente"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr "Zertifizierung"
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Fehler beim Einlesen des Verzeichnisses."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Keine Mailbox mit neuen Nachrichten."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
 msgstr "color: Zu wenige Parameter."
 
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Keine neuen Nachrichten"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
+
 #: commands.c:788
 msgid "converting"
 msgstr "konvertiert"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Schreibe Nachricht in Mailbox"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "Konnte temporäre Mailbox nicht erzeugen: %s"
+msgstr "Konnte temporäre Mailbox nicht erzeugen: %s"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "Konnte temporäre Mailbox nicht sutzen: %s"
+msgstr "Konnte temporäre Mailbox nicht sutzen: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Konnte nicht in temporäre Mailbox schreiben: %s"
+msgstr "Konnte nicht in temporäre Mailbox schreiben: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Keine Eingangs-Mailboxen definiert."
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "dagn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "Standard-Farben werden nicht unterstützt."
+msgstr "Standard-Farben werden nicht unterstützt."
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Lösche Nachrichten auf dem Server?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Entferne Löschmarkierung nach Muster: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Entferne Löschmarkierung nach Muster: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "danbefugwp"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Weitergeleitete Nachricht editieren?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
-msgstr "echo Anhängen an komprimierte Mailbox %s..."
+msgstr "echo Anhängen an komprimierte Mailbox %s..."
 
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, c-format
@@ -3495,20 +3448,108 @@ msgstr "Komprimiere %s..."
 msgid "echo Decompressing %s..."
 msgstr "Dekomprimiere %s ..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Der aktuelle Anhang wird nicht konvertiert werden."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "Editiere Beschreibung des Anhangs"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Kann Nachricht nicht schreiben"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Hole Nachrichten-Köpfe..."
+
+#: keymap_defs.h:37
+#, fuzzy
+msgid "edit the newsgroups list"
+msgstr "Füge neue Newsgruppen hinzu..."
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Weitergeleitete Nachricht editieren?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Soll eine Kopie dieser Nachricht gespeichert werden?"
+
 #: pattern.c:777
 msgid "empty pattern"
 msgstr "Leeres Muster"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 msgid "encryption"
-msgstr "Verschlüsseln"
+msgstr "Verschlüsseln"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Soll eine Kopie dieser Nachricht gespeichert werden?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "Fehler beim Anhängen des Empfängers `%s': %s\n"
+msgstr "Fehler beim Anhängen des Empfängers `%s': %s\n"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, c-format
 msgid "error allocating data object: %s\n"
 msgstr "Fehler beim Erstellen des Objektes: %s\n"
@@ -3531,14 +3572,14 @@ msgstr "Fehler bei Aktivierung des CMS Protokolls: %s\n"
 #: crypt.cpkg:655
 #, c-format
 msgid "error encrypting data: %s\n"
-msgstr "Fehler beim Verschlüsseln: %s\n"
+msgstr "Fehler beim Verschlüsseln: %s\n"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "Fehler bei Auswahl des geheimen Schlüssels '%s': %s\n"
+msgstr "Fehler bei Auswahl des geheimen Schlüssels '%s': %s\n"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "Fehler beim Signieren: %s\n"
@@ -3560,12 +3601,12 @@ msgstr "Fehler beim Lesen des Objektes: %s\n"
 #: crypt.cpkg:443
 #, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "Fehler beim Zurückspulen des Objektes: %s\n"
+msgstr "Fehler beim Zurückspulen des Objektes: %s\n"
 
 #: crypt.cpkg:613
 #, c-format
 msgid "error setting secret key `%s': %s\n"
-msgstr "Fehler bei Auswahl des geheimen Schlüssels '%s': %s\n"
+msgstr "Fehler bei Auswahl des geheimen Schlüssels '%s': %s\n"
 
 #: crypt.cpkg:739
 #, c-format
@@ -3577,86 +3618,290 @@ msgstr "Fehler beim Signieren: %s\n"
 msgid "error: unknown op %d (report this error)."
 msgstr "Fehler: Unbekannter Muster-Operator %d (Bitte Bug melden)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "vsabmkc"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "vsabpkc"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec: Keine Parameter"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
-msgstr "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
-msgstr "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
-msgstr "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
-msgstr "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Newsgruppe öffnen"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Als Anhänge weiterleiten?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Prüfe auf untergeordnete Nachrichten..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Sie sind bereits auf der ersten Nachricht."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr "gnutls_certificate_allocate_credentials: %s"
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr "gnutls_global_init: %s"
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr "gnutls_handshake: %s"
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr "gnutls_handshake: %s(%s)"
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Sie sind auf der letzten Seite."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Keine Mailbox mit neuen Nachrichten."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Fehler beim Öffnen der Mailbox"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Gehe zur vorherigen Mailbox mit neuen Nachrichten"
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
 msgstr "gpgme_op_keylist_next fehl geschlagen: %s"
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr "gpgme_op_keylist_start fehl geschlagen: %s"
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "wurde gelöscht --]\n"
+msgstr "wurde gelöscht --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE fehlgeschlagen"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "my_hdr: Ungültiges Kopf-Feld"
+msgstr "my_hdr: Ungültiges Kopf-Feld"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Ungültige Indexnummer."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Springe zu Nachricht: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Springe zu Nachricht: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Diskussionsfaden enthält ungelesene Nachrichten."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Sie haben bereits den ersten Diskussionsfaden ausgewählt."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Keine ungelesenen Nachrichten"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Keine ungelesenen Nachrichten"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Soll eine Kopie dieser Nachricht gespeichert werden?"
 
-#: crypt.cpkg:3122
+#: crypt.cpkg:3108
 msgid "keys matching"
-msgstr "Passende Schlüssel"
+msgstr "Passende Schlüssel"
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Markierte Nachrichten weiterleiten an: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Keine Mailbox mit neuen Nachrichten."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: Leere Tastenfolge"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro: Zu viele Parameter"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "Kann keinen Mailcap-Eintrag für %s finden."
+msgstr "Kann keinen Mailcap-Eintrag für %s finden."
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): kann Zeitstempel der Datei nicht setzen"
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+#, fuzzy
+msgid "mark all articles in newsgroup as read"
+msgstr "Alle Artikel als gelesen markieren?"
+
+#: keymap_defs.h:192
+#, fuzzy
+msgid "mark all articles in newsgroup as unread"
+msgstr "Alle Artikel als gelesen markieren?"
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 msgid "message(s) not deleted"
-msgstr "Nachricht(en) nicht gelöscht."
+msgstr "Nachricht(en) nicht gelöscht."
 
 #: pattern.c:746
 #, c-format
@@ -3668,19 +3913,110 @@ msgstr "Unpassende Klammern: %s"
 msgid "missing parameter"
 msgstr "Fehlender Parameter"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
 msgstr "mono: Zu wenige Parameter."
 
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Sie sind auf dem ersten Eintrag"
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Sie sind bereits auf der ersten Nachricht."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Sie sind auf dem letzten Eintrag."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Sie sind bereits auf der letzten Nachricht."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Sie sind auf dem letzten Eintrag."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Sie sind auf der letzten Seite."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Alle Nachrichten gelöscht."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Sie sind auf dem ersten Eintrag"
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Sie sind auf der ersten Seite."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Alle Nachrichten gelöscht."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Sie sind auf der ersten Seite."
+
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
 msgstr "Mehrteilige Nachricht hat keinen \"boundary\"-Parameter!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "nein"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 msgid "no mailbox"
 msgstr "(keine Mailbox)"
 
@@ -3688,54 +4024,308 @@ msgstr "(keine Mailbox)"
 msgid "not converting"
 msgstr "nicht konvertiert"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "Leere Tastenfolge"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
 msgstr "uab"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Öffne Mailbox im nur-Lesen-Modus"
+
+#: keymap_defs.h:117
+#, fuzzy
+msgid "open a different newsgroup"
+msgstr "Newsgruppe öffnen"
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Öffne Mailbox im nur-Lesen-Modus"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Öffne Mailbox erneut..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Nachricht an %s weiterleiten"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "Präfix ist bei \"reset\" nicht zulässig."
+msgstr "Präfix ist bei \"reset\" nicht zulässig."
+
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Sie sind auf dem ersten Eintrag"
 
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push: Zu viele Argumente"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Zurückgestellte Nachricht weiterbearbeiten?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Diskussionsfaden enthält ungelesene Nachrichten."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Kann Nachricht auf Newsserver nicht speichern."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: Kann Datei nicht anhängen."
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Springe zu Nachricht: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Lösche Nachrichten auf dem Server?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ze"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "zei"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Speichere%s in Mailbox"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Speichere%s in Mailbox"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Kann Nachricht auf Newsserver nicht speichern."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "Fehler in Ausdruck."
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Suche nach: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Konnte Nachricht nicht verschicken."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Als Anhänge weiterleiten?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Begrenze auf Nachrichten nach Muster: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr "Signieren"
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Kein weiterer zitierter Text."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Nachricht drucken?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Keine Nachrichten in diesem Ordner."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: Fehler bei %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: Fehler in %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: Lesevorgang abgebrochen, zu viele Fehler in %s"
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Abonnierte Newsgruppen"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: Mailbox verändert, aber Nachrichten unverändert! (bitte Bug melden)"
+"sync: Mailbox verändert, aber Nachrichten unverändert! (bitte Bug melden)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Entferne Markierung nach Muster: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Sie haben bereits den ersten Diskussionsfaden ausgewählt."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3747,27 +4337,98 @@ msgstr "tls_socket_read (%s)"
 msgid "tls_socket_write (%s)"
 msgstr "tls_socker_write (%s)"
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Kein weiterer zitierter Text."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Ändern der Kodierung betrifft nur Textanhänge."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Kein Suchmuster."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Keine ungelesenen Nachrichten"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
 msgstr "Zu wenige Parameter."
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "Zu viele Parameter."
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "Editiere Beschreibung des Anhangs"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Entferne Löschmarkierung nach Muster: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Entferne Löschmarkierung nach Muster: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Entferne Löschmarkierung nach Muster: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: Kann kein %s innerhalb von %s löschen."
+msgstr "unhook: Kann kein %s innerhalb von %s löschen."
 
 #: hook.c:204
 #, c-format
@@ -3779,10 +4440,28 @@ msgstr "unhook: Innerhalb eines hook kann kein unhook * aufgerufen werden."
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: Unbekannter hook-Typ: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "unbekannter Fehler"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Entferne Markierung nach Muster: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "Editiere Beschreibung des Anhangs"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3794,12 +4473,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "Wertzuweisung ist bei \"reset\" nicht zulässig."
+msgstr "Wertzuweisung ist bei \"reset\" nicht zulässig."
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Anhang gespeichert."
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Neue Datei: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Schreibe Nachricht in Mailbox"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "ja"
 
@@ -3807,3 +4517,6 @@ msgstr "ja"
 msgid "yna"
 msgstr "jna"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/el.po b/po/el.po
index a2f4108..bc79e6b 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -12,45 +12,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt-1.5.7i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-02-01 00:01GMT+2\n"
 "Last-Translator: Dokianakis Fanis <madf@hellug.gr>\n"
 "Language-Team: Greek <EL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-7\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"ÃåíéêÝò óõíäÝóåéò:\n"
+"Γενικές συνδέσεις:\n"
 "\n"
 
 #
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"Ìç óõíäåäåìÝíåò ëåéôïõñãßåò:\n"
+"Μη συνδεδεμένες λειτουργίες:\n"
 "\n"
 
 #
 # pgp.c:682
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- ÔÝëïò õðïãåãñáììÝíùí äåäïìÝíùí --]\n"
+"[-- Τέλος υπογεγραμμένων δεδομένων --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -77,57 +77,57 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"÷ñÞóç: mutt [ -nRyzZ ] [ -e <åíôïëÞ> ] [ -F <áñ÷åßï> ] [ -m <ôýðïò> ] [ -f "
-"<áñ÷åßï>]\n"
-"       mutt [ -nR ] [ -e <åíôïëÞ> ] [ -F <áñ÷åßï> ] -Q <åñþôçóç>[ -Q "
-"<åñþôçóç> ] [...]\n"
-"       mutt [ -nx ] [ -e <åíôïëÞ> ] [ -a <áñ÷åßï> ] [ -F <áñ÷åßï> ] [ -H "
-"<áñ÷åßï> ] [ -i <áñ÷åßï> ] [ -s <èÝìá> ] [ -b <äéåõè> ] [ -c <äéåõè> ] "
-"<äéåõè> [ ... ]\n"
-"       mutt [ -n ] [ -e <åíôïëÞ> ] [ -F <áñ÷åßï> ] -p\n"
+"χρήση: mutt [ -nRyzZ ] [ -e <εντολή> ] [ -F <αρχείο> ] [ -m <τύπος> ] [ -f "
+"<αρχείο>]\n"
+"       mutt [ -nR ] [ -e <εντολή> ] [ -F <αρχείο> ] -Q <ερώτηση>[ -Q "
+"<ερώτηση> ] [...]\n"
+"       mutt [ -nx ] [ -e <εντολή> ] [ -a <αρχείο> ] [ -F <αρχείο> ] [ -H "
+"<αρχείο> ] [ -i <αρχείο> ] [ -s <θέμα> ] [ -b <διευθ> ] [ -c <διευθ> ] "
+"<διευθ> [ ... ]\n"
+"       mutt [ -n ] [ -e <εντολή> ] [ -F <αρχείο> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
-"åðéëïãÝò:\n"
-"  -A <alias>\táðåéêüíéóç ôïõ óõãêåêñéìÝíïõ øåõäþíõìïõ\n"
-"  -a <áñ÷åßï>\tðñïóáñôÞóôå Ýíá áñ÷åßï óå áõôü ôï ìÞíõìá\n"
-"  -b <äéåõè>\têáèïñßóôå ìéá äéåýèõíóç ôõöëïý-ðéóôïý-áíôéãñÜöïõ (BCC)\n"
-"  -c <äéåõè>\têáèïñßóôå ìéá äéåýèõíóç ðéóôïý-áíôéãñÜöïõ (CC)\n"
-"  -e <åíôïëÞ>\têáèïñßóôå ìéá åíôïëÞ ãéá íá åêôåëåóôåß ìåôÜ ôçí åêêßíçóç\n"
-"  -f <áñ÷åßï>\têáèïñßóôå ðïéï ãñáììáôïêéâþôéï íá áíáãíùóôåß\n"
-"  -F <áñ÷åßï>\têáèïñßóôå Ýíá åíáëëáêôéêü áñ÷åßï muttrc\n"
-"  -H <áñ÷åßï>\têáèïñßóôå Ýíá ðñïó÷Ýäéï áðü ôï ïðïßï èá äéáâáóôåß ç "
-"åðéêåöáëßäá\n"
-"  -i <áñ÷åßï>\têáèïñßóôå Ýíá áñ÷åßï ðïõ ôï Mutt èá óõìðåñéëáìâÜíåé êáôÜ "
-"ôçí \n"
-"áðÜíôçóç\n"
-"  -m <ôýðïò>\têáèïñßóôå Ýíá ôýðï ðñïêáèïñéóìÝíïõ ãñáììáôïêéâùôßïõ\n"
-"  -n\t\têÜíåôå ôï Mutt íá ìçí äéáâÜóåé ôï Muttrc ôïõ óõóôÞìáôïò\n"
-"  -p\t\tåðáíáöÝñåôå Ýíá áíáâëçèÝí ìÞíõìá\n"
-"  -Q <ìåôáâëçôÞ>\tåñþôçóç(åìöÜíéóç ôéìÞò) ìéáò ìåôáâëçôÞò ôùí ñõèìßóåùí\n"
-"  -R\t\táíïßîôå ôï ãñáììáôïêéâþôéï óå êáôÜóôáóç ìüíï-áíÜãíùóçò\n"
-"  -s <èÝìá>\têáèïñßóôå Ýíá èÝìá (óå åéóáãùãéêÜ åÜí Ý÷åé êåíÜ)\n"
-"  -v\t\täåßîôå ôçí Ýêäïóç êáé ôïõò ïñéóìïýò êáôÜ ôç ìåôáãëþôôéóç\n"
-"  -x\t\tåîïìïéþóôå ôçí êáôÜóôáóç áðïóôïëÞò mailx\n"
-"  -y\t\täéáëÝîôå Ýíá ãñáììáôïêéâþôéï áðü ôçí ëßóôá `ãñáììáôïêéâùôßùí'\n"
-"  -z\t\tåãêáôÜëåéøç áìÝóùò åÜí äåí õðÜñ÷ïõí ìçíýìáôá óôï ãñáììáôïêéâþôéï\n"
-"  -Z\t\táíïßîôå ôïí ðñþôï öÜêåëï ìå íÝï ìÞíõìá, âãåßôå åÜí äåí õðÜñ÷ïõí\n"
-"  -h\t\táõôü ôï ìÞíõìá âïÞèåéáò"
-
-#
-#: compose.c:152 compose.c:156
+"επιλογές:\n"
+"  -A <alias>\tαπεικόνιση του συγκεκριμένου ψευδώνυμου\n"
+"  -a <αρχείο>\tπροσαρτήστε ένα αρχείο σε αυτό το μήνυμα\n"
+"  -b <διευθ>\tκαθορίστε μια διεύθυνση τυφλού-πιστού-αντιγράφου (BCC)\n"
+"  -c <διευθ>\tκαθορίστε μια διεύθυνση πιστού-αντιγράφου (CC)\n"
+"  -e <εντολή>\tκαθορίστε μια εντολή για να εκτελεστεί μετά την εκκίνηση\n"
+"  -f <αρχείο>\tκαθορίστε ποιο γραμματοκιβώτιο να αναγνωστεί\n"
+"  -F <αρχείο>\tκαθορίστε ένα εναλλακτικό αρχείο muttrc\n"
+"  -H <αρχείο>\tκαθορίστε ένα προσχέδιο από το οποίο θα διαβαστεί η "
+"επικεφαλίδα\n"
+"  -i <αρχείο>\tκαθορίστε ένα αρχείο που το Mutt θα συμπεριλαμβάνει κατά "
+"την \n"
+"απάντηση\n"
+"  -m <τύπος>\tκαθορίστε ένα τύπο προκαθορισμένου γραμματοκιβωτίου\n"
+"  -n\t\tκάνετε το Mutt να μην διαβάσει το Muttrc του συστήματος\n"
+"  -p\t\tεπαναφέρετε ένα αναβληθέν μήνυμα\n"
+"  -Q <μεταβλητή>\tερώτηση(εμφάνιση τιμής) μιας μεταβλητής των ρυθμίσεων\n"
+"  -R\t\tανοίξτε το γραμματοκιβώτιο σε κατάσταση μόνο-ανάγνωσης\n"
+"  -s <θέμα>\tκαθορίστε ένα θέμα (σε εισαγωγικά εάν έχει κενά)\n"
+"  -v\t\tδείξτε την έκδοση και τους ορισμούς κατά τη μεταγλώττιση\n"
+"  -x\t\tεξομοιώστε την κατάσταση αποστολής mailx\n"
+"  -y\t\tδιαλέξτε ένα γραμματοκιβώτιο από την λίστα `γραμματοκιβωτίων'\n"
+"  -z\t\tεγκατάλειψη αμέσως εάν δεν υπάρχουν μηνύματα στο γραμματοκιβώτιο\n"
+"  -Z\t\tανοίξτε τον πρώτο φάκελο με νέο μήνυμα, βγείτε εάν δεν υπάρχουν\n"
+"  -h\t\tαυτό το μήνυμα βοήθειας"
+
+#
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " õðïãñáöÞ ùò: "
+msgstr " υπογραφή ως: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
-msgstr "    ðñïò %s"
+msgstr "    προς %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
-msgstr "   áðü  %s"
+msgstr "   από  %s"
 
 #: main.c:106
 msgid ""
@@ -168,157 +168,157 @@ msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
 #
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr "('?' ãéá ëßóôá): "
+msgstr "('?' για λίστα): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
 #
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
-msgstr "(åóùôåñéêü êåßìåíï)"
+msgstr "(εσωτερικό κείμενο)"
 
 #
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr "ÐáôÞóôå '%s' ãéá íá åíåñãïðïéÞóåôå ôçí åããñáöÞ!"
+msgstr "Πατήστε '%s' για να ενεργοποιήσετε την εγγραφή!"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr "óå áõôÞ ôçí ðåñéïñéóìÝíç üøç"
+msgstr "σε αυτή την περιορισμένη όψη"
 
 #
 #: commands.c:601
 msgid " tagged"
-msgstr " óçìåéùìÝíï"
+msgstr " σημειωμένο"
 
 #
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: ìç Ýãêõñç åíôïëÞ"
+msgstr "%c: μη έγκυρη εντολή"
 
 #
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "Ôï %c: äåí õðïóôçñßæåôáé óå áõôÞ ôçí êáôÜóôáóç"
+msgstr "Το %c: δεν υποστηρίζεται σε αυτή την κατάσταση"
 
 #
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d êñáôÞèçêáí, %d äéáãñÜöçêáí."
+msgstr "%d κρατήθηκαν, %d διαγράφηκαν."
 
 #
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d êñáôÞèçêáí, %d ìåôáêéíÞèçêáí, %d äéáãñÜöçêáí."
+msgstr "%d κρατήθηκαν, %d μετακινήθηκαν, %d διαγράφηκαν."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
 #
 # pgpkey.c:262
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s ÈÝëåôå óßãïõñá íá ÷ñçóéìïðïéÞóåôå ôï êëåéäß;"
+msgstr "%s Θέλετε σίγουρα να χρησιμοποιήσετε το κλειδί;"
 
 #
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "Ôï %s [#%d] ìåôáâëÞèçêå. ÅíçìÝñùóç ôçò êùäéêïðïßçóçò;"
+msgstr "Το %s [#%d] μεταβλήθηκε. Ενημέρωση της κωδικοποίησης;"
 
 #
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "Ôï %s [#%d] äåí õðÜñ÷åé ðéá!"
+msgstr "Το %s [#%d] δεν υπάρχει πια!"
 
 #
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d áðü %d ìçíýìáôá äéáâÜóôçêáí]"
+msgstr "%s [%d από %d μηνύματα διαβάστηκαν]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "Ôï %s äåí õðÜñ÷åé. Äçìéïõñãßá;"
+msgstr "Το %s δεν υπάρχει. Δημιουργία;"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s åßíáé ìç Ýãêõñç äéáäñïìÞ IMAP"
+msgstr "%s είναι μη έγκυρη διαδρομή IMAP"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s åßíáé ìç Ýãêõñç POP äéáäñïìÞ"
+msgstr "%s είναι μη έγκυρη POP διαδρομή"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s åßíáé ìç Ýãêõñç POP äéáäñïìÞ"
+msgstr "%s είναι μη έγκυρη POP διαδρομή"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s åßíáé ìç Ýãêõñç POP äéáäñïìÞ"
+msgstr "%s είναι μη έγκυρη POP διαδρομή"
 
 #
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "Ôï %s äåí åßíáé êáôÜëïãïò."
+msgstr "Το %s δεν είναι κατάλογος."
 
 #
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï!"
+msgstr "Το %s δεν είναι γραμματοκιβώτιο!"
 
 #
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "Ôï %s äåí åßíáé ãñáììáôïêéâþôéï."
+msgstr "Το %s δεν είναι γραμματοκιβώτιο."
 
 #
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "Ôï %s äåí åßíáé êáíïíéêü áñ÷åßï."
+msgstr "Το %s δεν είναι κανονικό αρχείο."
 
 #
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "Ôï %s äåí õðÜñ÷åé ðéá!"
+msgstr "Το %s δεν υπάρχει πια!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -333,164 +333,164 @@ msgid ""
 msgstr ""
 
 #
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
-msgstr "%s: Üãíùóôïò ôýðïò."
+msgstr "%s: άγνωστος τύπος."
 
 #
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: ôï ôåñìáôéêü äåí õðïóôçñßæåé ÷ñþìá"
+msgstr "%s: το τερματικό δεν υποστηρίζει χρώμα"
 
 #
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: ç åíôïëÞ éó÷ýåé ìüíï ãéá ôï ÷áñáêôçñéóôéêü áíôéêåßìåíï"
+msgstr "%s: η εντολή ισχύει μόνο για το χαρακτηριστικό αντικείμενο"
 
 #
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: äåí õðÜñ÷åé ôÝôïéá éäéüôçôá"
+msgstr "%s: δεν υπάρχει τέτοια ιδιότητα"
 
 #
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: äåí õðÜñ÷åé ôÝôïéï ÷ñþìá"
+msgstr "%s: δεν υπάρχει τέτοιο χρώμα"
 
 #
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
-msgstr "%s: äåí õðÜñ÷åé ôÝôïéá ëåéôïõñãßá"
+msgstr "%s: δεν υπάρχει τέτοια λειτουργία"
 
 #
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: äåí Ý÷åé êáèïñéóôåß ôÝôïéá ëåéôïõñãßá"
+msgstr "%s: δεν έχει καθοριστεί τέτοια λειτουργία"
 
 #
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: äåí õðÜñ÷åé ôÝôïéï ìåíïý"
+msgstr "%s: δεν υπάρχει τέτοιο μενού"
 
 #
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s: äåí õðÜñ÷åé ôÝôïéï áíôéêåßìåíï"
+msgstr "%s: δεν υπάρχει τέτοιο αντικείμενο"
 
 #
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: ðïëý ëßãá ïñßóìáôá"
+msgstr "%s: πολύ λίγα ορίσματα"
 
 #
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: áäõíáìßá óôçí ðñïóÜñôçóç ôïõ áñ÷åßïõ"
+msgstr "%s: αδυναμία στην προσάρτηση του αρχείου"
 
 #
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: áäõíáìßá ðñïóÜñôçóçò ôïõ áñ÷åßïõ.\n"
+msgstr "%s: αδυναμία προσάρτησης του αρχείου.\n"
 
 #
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: Üãíùóôç åíôïëÞ"
+msgstr "%s: άγνωστη εντολή"
 
 #
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: Üãíùóôïò ôýðïò"
+msgstr "%s: άγνωστος τύπος"
 
 #
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: Üãíùóôç ìåôáâëçôÞ"
+msgstr "%s: άγνωστη μεταβλητή"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s åßíáé ìç Ýãêõñç POP äéáäñïìÞ"
+msgstr "%s είναι μη έγκυρη POP διαδρομή"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s åßíáé ìç Ýãêõñç POP äéáäñïìÞ"
+msgstr "%s είναι μη έγκυρη POP διαδρομή"
 
 #
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(áðáéôåßôáé ôï 'view-attachments' íá åßíáé óõíäåäåìÝíï ìå ðëÞêôñï!"
+msgstr "(απαιτείται το 'view-attachments' να είναι συνδεδεμένο με πλήκτρο!"
 
 #
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(êáíÝíá ãñáììáôïêéâþôéï)"
+msgstr "(κανένα γραμματοκιβώτιο)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(r)áðüññéøç, (o)áðïäï÷Þ ìéá öïñÜ"
+msgstr "(r)απόρριψη, (o)αποδοχή μια φορά"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(r)áðüññéøç, (o)áðïäï÷Þ ìéá öïñÜ, (a)áðïäï÷Þ ðÜíôá"
+msgstr "(r)απόρριψη, (o)αποδοχή μια φορά, (a)αποδοχή πάντα"
 
 #
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(ìÝãåèïò %s bytes) "
+msgstr "(μέγεθος %s bytes) "
 
 #
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(÷ñçóéìïðïéÞóôå ôï '%s' ãéá íá äåßôå áõôü ôï ìÝñïò)"
+msgstr "(χρησιμοποιήστε το '%s' για να δείτε αυτό το μέρος)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
 #
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- ÐñïóáñôÞóåéò"
+msgstr "-- Προσαρτήσεις"
 
 #
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<ÁÃÍÙÓÔÏ>"
+msgstr "<ΑΓΝΩΣΤΟ>"
 
 #
 # compose.c:116
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<åî'ïñéóìïý>"
+msgstr "<εξ'ορισμού>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -502,137 +502,127 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "Áõèåíôéêïðïßçóç APOP áðÝôõ÷å."
-
-#
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Áêýñùóç"
+msgstr "Αυθεντικοποίηση APOP απέτυχε."
 
 #
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Ìáôáßùóç áðïóôïëÞò ìç ôñïðïðïéçìÝíïõ ìçíýìáôïò;"
+msgstr "Ματαίωση αποστολής μη τροποποιημένου μηνύματος;"
 
 #
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Ìáôáßùóç áðïóôïëÞò ìç ôñïðïðïéçìÝíïõ ìçíýìáôïò."
+msgstr "Ματαίωση αποστολής μη τροποποιημένου μηνύματος."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
 #
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "Äéåýèõíóç: "
+msgstr "Διεύθυνση: "
 
 #
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Ôï øåõäþíõìï ðñïóôÝèçêå."
+msgstr "Το ψευδώνυμο προστέθηκε."
 
 #
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Øåõäþíõìï ùò: "
+msgstr "Ψευδώνυμο ως: "
 
 #
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "Øåõäþíõìá"
+msgstr "Ψευδώνυμα"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "¼ëá ôá êëåéäéÜ ðïõ ôáéñéÜæïõí åßíáé ëçãìÝíá, áêõñùìÝíá Þ áíåíåñãÜ."
-
-#
-#: remailer.c:431
-msgid "Append"
-msgstr "Ðñüóèåóç"
+msgstr "Όλα τα κλειδιά που ταιριάζουν είναι ληγμένα, ακυρωμένα ή ανενεργά."
 
 #
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Ðñüóèåóç ìçíõìÜôùí óôï %s;"
+msgstr "Πρόσθεση μηνυμάτων στο %s;"
 
 #
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Ç ðáñÜìåôñïò ðñÝðåé íá åßíáé áñéèìüò ìçíýìáôïò."
+msgstr "Η παράμετρος πρέπει να είναι αριθμός μηνύματος."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
 #
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "Ç ðñïóÜñôçóç áðïèçêåýèçêå."
+msgstr "Η προσάρτηση αποθηκεύθηκε."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
 #
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "ÐñïóáñôÞóôå áñ÷åßï"
+msgstr "Προσαρτήστε αρχείο"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "ÐñïóÜñôçóç åðéëåãìÝíùí áñ÷åßùí..."
+msgstr "Προσάρτηση επιλεγμένων αρχείων..."
 
 #
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "Ç ðñïóÜñôçóç Ý÷åé öéëôñáñéóôåß."
+msgstr "Η προσάρτηση έχει φιλτραριστεί."
 
 #
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "Ç ðñïóÜñôçóç áðïèçêåýèçêå."
+msgstr "Η προσάρτηση αποθηκεύθηκε."
 
 #
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "ÐñïóáñôÞóåéò"
+msgstr "Προσαρτήσεις"
 
 #: imap/auth.c:83
 #, c-format
 msgid "Authenticating (%s)..."
-msgstr "Áõèåíôéêïðïßçóç (%s)..."
+msgstr "Αυθεντικοποίηση (%s)..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "Áõèåíôéêïðïßçóç (APOP)..."
+msgstr "Αυθεντικοποίηση (APOP)..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "Áõèåíôéêïðïßçóç (SASL)..."
+msgstr "Αυθεντικοποίηση (SASL)..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "Áõèåíôéêïðïßçóç (SASL)..."
+msgstr "Αυθεντικοποίηση (SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -641,65 +631,65 @@ msgstr ""
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN \"%s\"."
+msgstr "Λανθασμένη διεθνής διεύθυνση IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
-"ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN %s êáôÜ ôçí äçìéïõñãßá ôïõ ðåäßïõ "
-"ÅðáíáðïóôïëÞ-Áðü."
+"Λανθασμένη διεθνής διεύθυνση IDN %s κατά την δημιουργία του πεδίου "
+"Επαναποστολή-Από."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN óôï \"%s\": '%s'"
+msgstr "Λανθασμένη διεθνής διεύθυνση IDN στο \"%s\": '%s'"
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN: '%s'"
+msgstr "Λανθασμένη διεθνής διεύθυνση IDN: '%s'"
 
 #
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "Êáêü üíïìá ãñáììáôïêéâùôßïõ"
+msgstr "Κακό όνομα γραμματοκιβωτίου"
 
 #
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "Åìöáíßæåôáé ç âÜóç ôïõ ìçíýìáôïò."
+msgstr "Εμφανίζεται η βάση του μηνύματος."
 
 #
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Äéáâßâáóç ìçíýìáôïò óôïí %s"
+msgstr "Διαβίβαση μηνύματος στον %s"
 
 #
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Äéáâßâáóç ìçíýìáôïò óôïí: "
+msgstr "Διαβίβαση μηνύματος στον: "
 
 #
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Äéáâßâáóç ìçíõìÜôùí óôïí %s"
+msgstr "Διαβίβαση μηνυμάτων στον %s"
 
 #
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Äéáâßâáóç óçìåéùìÝíùí ìçíõìÜôùí óôïí: "
+msgstr "Διαβίβαση σημειωμένων μηνυμάτων στον: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "CLOSE áðÝôõ÷å"
+msgstr "CLOSE απέτυχε"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -709,76 +699,76 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Áäõíáìßá ðñüóèåóçò óôï öÜêåëï: %s"
+msgstr "Αδυναμία πρόσθεσης στο φάκελο: %s"
 
 #
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Áäõíáìßá ðñïóÜñôçóçò åíüò êáôÜëïãïõ"
+msgstr "Αδυναμία προσάρτησης ενός κατάλογου"
 
 #
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "Áäõíáìßá äçìéïõñãßáò ôïõ %s: %s."
+msgstr "Αδυναμία δημιουργίας του %s: %s."
 
 #
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "Áäõíáìßá äçìéïõñãßáò áñ÷åßïõ %s"
+msgstr "Αδυναμία δημιουργίας αρχείου %s"
 
 #
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Áäõíáìßá äçìéïõñãßáò ößëôñïõ"
+msgstr "Αδυναμία δημιουργίας φίλτρου"
 
 #
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "Áäõíáìßá äçìéïõñãßáò äéåñãáóßáò ößëôñïõ"
+msgstr "Αδυναμία δημιουργίας διεργασίας φίλτρου"
 
 #
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ"
+msgstr "Αδυναμία δημιουργίας προσωρινού αρχείου"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Áäõíáìßá áðïêùäéêïðïßçóçò üëùí ôùí óçìåéùìÝíùí ðñïóáñôÞóåùí. MIME-"
-"encapsulate ôéò Üëëåò;"
+"Αδυναμία αποκωδικοποίησης όλων των σημειωμένων προσαρτήσεων. MIME-"
+"encapsulate τις άλλες;"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Áäõíáìßá áðïêùäéêïðïßçóçò üëùí ôùí óçìåéùìÝíùí ðñïóáñôÞóåùí. Ðñïþèçóç-MIME "
-"ôùí Üëëùí;"
+"Αδυναμία αποκωδικοποίησης όλων των σημειωμένων προσαρτήσεων. Προώθηση-MIME "
+"των άλλων;"
 
 #
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "Áäõíáìßá áðïêñõðôïãñÜöçóçò ôïõ êñõðôïãñáöçìÝíïõ ìçíýìáôïò!"
+msgstr "Αδυναμία αποκρυπτογράφησης του κρυπτογραφημένου μηνύματος!"
 
 #
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "Áäõíáìßá äéáãñáöÞò ðñïóÜñôçóçò áðü ôïí åîõðçñåôçôÞ POP."
+msgstr "Αδυναμία διαγραφής προσάρτησης από τον εξυπηρετητή POP."
 
 #
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "Áäõíáìßá äéáãñáöÞò ðñïóÜñôçóçò áðü ôïí åîõðçñåôçôÞ POP."
+msgstr "Αδυναμία διαγραφής προσάρτησης από τον εξυπηρετητή POP."
 
 #
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Áäõíáìßá dotlock ôïõ %s.\n"
+msgstr "Αδυναμία dotlock του %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -787,361 +777,342 @@ msgstr ""
 #
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Áäõíáìßá åýñåóçò óçìåéùìÝíùí ìçíõìÜôùí."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Áäõíáìßá ëÞøçò ôçò type2.list ôïõ mixmaster!"
+msgstr "Αδυναμία εύρεσης σημειωμένων μηνυμάτων."
 
 #
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Áäõíáìßá ôáéñéÜóìáôïò ôïõ nametemplate, óõíÝ÷åéá;"
+msgstr "Αδυναμία ταιριάσματος του nametemplate, συνέχεια;"
 
 #
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Áäõíáìßá ðñüóâáóçò óôï áñ÷åßï ìçíõìÜôùí: %s"
+msgstr "Αδυναμία πρόσβασης στο αρχείο μηνυμάτων: %s"
 
 #
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Áäõíáìßá ðñüóèåóçò óôï öÜêåëï: %s"
+msgstr "Αδυναμία πρόσθεσης στο φάκελο: %s"
 
 #
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "¸êëåéóå ç óýíäåóç óôï %s"
+msgstr "Έκλεισε η σύνδεση στο %s"
 
 #
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Êëåßóéìï óýíäåóçò óôïí åîõðçñåôçôÞ IMAP..."
+msgstr "Κλείσιμο σύνδεσης στον εξυπηρετητή IMAP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
 #
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "Áäõíáìßá ëÞøçò ôçò êáôÜóôáóçò ôïõ %s: %s"
+msgstr "Αδυναμία λήψης της κατάστασης του %s: %s"
 
 #
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "Áäõíáìßá äçìéïõñãßáò ôïõ %s: %s."
+msgstr "Αδυναμία δημιουργίας του %s: %s."
 
 #
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Áäõíáìßá åããñáöÞò ôïõ ìçíýìáôïò óôï POP ãñáììáôïêéâþôéï."
+msgstr "Αδυναμία εγγραφής του μηνύματος στο POP γραμματοκιβώτιο."
 
 #
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Áäõíáìßá åðåîåñãáóßáò ìçíýìáôïò óôï äéáêïìéóôÞ POP."
+msgstr "Αδυναμία επεξεργασίας μηνύματος στο διακομιστή POP."
 
 #
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "Áäõíáìßá ëÞøçò ôçò êáôÜóôáóçò ôïõ %s: %s"
+msgstr "Αδυναμία λήψης της κατάστασης του %s: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
 #
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Áäõíáìßá áíÜãíùóçò åíüò êáôÜëïãïõ"
+msgstr "Αδυναμία ανάγνωσης ενός κατάλογου"
 
 #
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "Áäõíáìßá äçìéïõñãßáò ôïõ %s."
+msgstr "Αδυναμία δημιουργίας του %s."
 
 #
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Áäõíáìßá åããñáöÞò åðéêåöáëßäáò óôï ðñïóùñéíü áñ÷åßï!"
+msgstr "Αδυναμία εγγραφής επικεφαλίδας στο προσωρινό αρχείο!"
 
 #
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Áäõíáìßá åããñáöÞò ôïõ ìçíýìáôïò"
+msgstr "Αδυναμία εγγραφής του μηνύματος"
 
 #
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Áäõíáìßá åããñáöÞò ìçíýìáôïò óôï ðñïóùñéíü áñ÷åßï!"
+msgstr "Αδυναμία εγγραφής μηνύματος στο προσωρινό αρχείο!"
 
 #
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Áäõíáìßá äçìéïõñãßáò ößëôñïõ áðåéêüíéóçò"
+msgstr "Αδυναμία δημιουργίας φίλτρου απεικόνισης"
 
 #
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Áäõíáìßá äçìéïõñãßáò ößëôñïõ"
+msgstr "Αδυναμία δημιουργίας φίλτρου"
 
 #
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr ""
-"Áäõíáìßá áëëáãÞò óå êáôÜóôáóç åããñáöÞò óå ãñáììáôïêéâþôéï ìüíï ãéá áíÜãíùóç!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+"Αδυναμία αλλαγής σε κατάσταση εγγραφής σε γραμματοκιβώτιο μόνο για ανάγνωση!"
 
 #
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "Åíôïðéóìüò ôïõ %s...  ÅãêáôÜëåéøç.\n"
+msgstr "Εντοπισμός του %s...  Εγκατάλειψη.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "Ç ðéóôïðïßçóç ôïõ äéáêïìéóôÞ äåí åßíáé áêüìá Ýãêõñç"
+msgstr "Η πιστοποίηση του διακομιστή δεν είναι ακόμα έγκυρη"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "Ôï ðéóôïðïéçôéêü áðïèçêåýôçêå"
+msgstr "Το πιστοποιητικό αποθηκεύτηκε"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Ïé áëëáãÝò óôï öÜêåëï èá ãñáöïýí êáôÜ ôç Ýîïäï áðü ôï öÜêåëï."
+msgstr "Οι αλλαγές στο φάκελο θα γραφούν κατά τη έξοδο από το φάκελο."
 
 #
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Ïé áëëáãÝò óôï öÜêåëï äåí èá ãñáöïýí."
+msgstr "Οι αλλαγές στο φάκελο δεν θα γραφούν."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr "×áñáêô = %s, Ïêôáäéêüò = %o, Äåêáäéêüò = %d"
+msgstr "Χαρακτ = %s, Οκταδικός = %o, Δεκαδικός = %d"
 
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Ôï óåô ÷áñáêôÞñùí Üëëáîå óå %s; %s."
-
-#
-#: browser.c:35
-msgid "Chdir"
-msgstr "ÁëëáãÞ êáôáëüãïõ"
+msgstr "Το σετ χαρακτήρων άλλαξε σε %s; %s."
 
 #
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "ÁëëáãÞ êáôáëüãïõ óå:"
+msgstr "Αλλαγή καταλόγου σε:"
 
 #
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "¸ëåã÷ïò ãéá íÝá ìçíýìáôá..."
+msgstr "Έλεγχος για νέα μηνύματα..."
 
 #
-# pgpkey.c:178
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "ÅëÝãîôå êëåéäß "
-
-#
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "¸ëåã÷ïò ãéá íÝá ìçíýìáôá..."
+msgstr "Έλεγχος για νέα μηνύματα..."
 
 #
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "¸ëåã÷ïò ãéá íÝá ìçíýìáôá..."
+msgstr "Έλεγχος για νέα μηνύματα..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
 #
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "ÁðåíåñãïðïéçìÝíï"
+msgstr "Απενεργοποιημένο"
 
 #
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Êáèáñßóôå óçìáßá"
+msgstr "Καθαρίστε σημαία"
 
 #
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Êëåßóéìï óýíäåóçò óôï óôï %s..."
+msgstr "Κλείσιμο σύνδεσης στο στο %s..."
 
 #
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "Êëåßóéìï óýíäåóçò óôïí åîõðçñåôçôÞ IMAP..."
+msgstr "Κλείσιμο σύνδεσης στον εξυπηρετητή IMAP..."
 
 #
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "Óýíäåóç óôï %s..."
+msgstr "Σύνδεση στο %s..."
 
 #
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Ç åíôïëÞ TOP äåí õðïóôçñßæåôå áðü ôï äéáêïìéóôÞ."
+msgstr "Η εντολή TOP δεν υποστηρίζετε από το διακομιστή."
 
 #
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Ç åíôïëÞ UIDL äåí õðïóôçñßæåôå áðü ôï äéáêïìéóôÞ."
+msgstr "Η εντολή UIDL δεν υποστηρίζετε από το διακομιστή."
 
 #
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "ÅöáñìïãÞ ôùí áëëáãþí..."
+msgstr "Εφαρμογή των αλλαγών..."
 
 #
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"ÐáñÜìåôñïé ìåôáãëþôôéóçò:"
+"Παράμετροι μεταγλώττισης:"
 
 #
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Óýíôáîç ìïíôÝëïõ áíáæÞôçóçò..."
+msgstr "Σύνταξη μοντέλου αναζήτησης..."
 
 #
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "ÁíôéãñáöÞ óôï %s..."
+msgstr "Αντιγραφή στο %s..."
 
 #
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "ÁíôéãñáöÞ óôï %s..."
+msgstr "Αντιγραφή στο %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
 #
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "Óýíäåóç óôï %s..."
+msgstr "Σύνδεση στο %s..."
 
 #
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "Óýíäåóç óôï %s..."
+msgstr "Σύνδεση στο %s..."
 
 #
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "Óýíäåóç óôï %s..."
+msgstr "Σύνδεση στο %s..."
 
 #
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Áðþëåéá óýíäåóçò. Åðáíáóýíäåóç óôï äéáêïìéóôÞ POP;"
+msgstr "Απώλεια σύνδεσης. Επανασύνδεση στο διακομιστή POP;"
 
 #
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Áðþëåéá óýíäåóçò. Åðáíáóýíäåóç óôï äéáêïìéóôÞ POP;"
+msgstr "Απώλεια σύνδεσης. Επανασύνδεση στο διακομιστή POP;"
 
 #
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "¸êëåéóå ç óýíäåóç óôï %s"
+msgstr "Έκλεισε η σύνδεση στο %s"
 
 #
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "¸êëåéóå ç óýíäåóç óôï %s"
+msgstr "Έκλεισε η σύνδεση στο %s"
 
 #
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Ôï Content-Type Üëëáîå óå %s."
+msgstr "Το Content-Type άλλαξε σε %s."
 
 #
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Ôï Content-Type åßíáé ôçò ìïñöÞò base/sub"
+msgstr "Το Content-Type είναι της μορφής base/sub"
 
 #
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "ÓõíÝ÷åéá;"
+msgstr "Συνέχεια;"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "ÌåôáôñïðÞ óå %s êáôÜ ôç ìåôáöïñÜ;"
+msgstr "Μετατροπή σε %s κατά τη μεταφορά;"
 
 #
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "ÁíôéãñáöÞ%s óôï ãñáììáôïêéâþôéï"
+msgstr "Αντιγραφή%s στο γραμματοκιβώτιο"
 
 #
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "ÁíôéãñáöÞ %d ìçíõìÜôùí óôï %s..."
+msgstr "Αντιγραφή %d μηνυμάτων στο %s..."
 
 #
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "ÁíôéãñáöÞ ìçíýìáôïò %d óôï %s ..."
+msgstr "Αντιγραφή μηνύματος %d στο %s ..."
 
 #
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "ÁíôéãñáöÞ óôï %s..."
+msgstr "Αντιγραφή στο %s..."
 
 #: main.c:63
 msgid ""
@@ -1158,198 +1129,182 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Áäõíáìßá óýíäåóçò óôï %s (%s)."
+msgstr "Αδυναμία σύνδεσης στο %s (%s)."
 
 #
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "Áäõíáìßá áíôéãñáöÞò ôïõ ìçíýìáôïò."
+msgstr "Αδυναμία αντιγραφής του μηνύματος."
 
 #
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ!"
+msgstr "Αδυναμία δημιουργίας προσωρινού αρχείου!"
 
 #
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ!"
+msgstr "Αδυναμία δημιουργίας προσωρινού αρχείου!"
 
 #
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
 msgstr ""
-"Áäõíáìßá åýñåóçò ôçò ëåéôïõñãßáò ôáîéíüìçóçò! [áíáöÝñáôå áõôü ôï óöÜëìá]"
+"Αδυναμία εύρεσης της λειτουργίας ταξινόμησης! [αναφέρατε αυτό το σφάλμα]"
 
 #
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Áäõíáìßá åýñåóçò ôïõ äéáêïìéóôÞ \"%s\""
+msgstr "Αδυναμία εύρεσης του διακομιστή \"%s\""
 
 #
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Áäõíáìßá óõìðåñßëçøçò üëùí ôùí ìçíõìÜôùí ðïõ æçôÞèçêáí!"
+msgstr "Αδυναμία συμπερίληψης όλων των μηνυμάτων που ζητήθηκαν!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "Áäõíáìßá äéáðñáãìÜôåõóçò óýíäåóçò TLS"
+msgstr "Αδυναμία διαπραγμάτευσης σύνδεσης TLS"
 
 #
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "Áäõíáìßá áíïßãìáôïò ôïõ %s"
+msgstr "Αδυναμία ανοίγματος του %s"
 
 #
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Áäõíáìßá åðáíáðñüóâáóçò ôïõ ãñáììáôïêéâùôßïõ!"
+msgstr "Αδυναμία επαναπρόσβασης του γραμματοκιβωτίου!"
 
 #
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Áäõíáìßá áðïóôïëÞò ôïõ ìçíýìáôïò."
+msgstr "Αδυναμία αποστολής του μηνύματος."
 
 #
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Áäõíáìßá êëåéäþìáôïò ôïõ %s\n"
+msgstr "Αδυναμία κλειδώματος του %s\n"
 
 #
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "Äçìéïõñãßá ôïõ %s;"
+msgstr "Δημιουργία του %s;"
 
 #
 # recvattach.c:1065
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Ç äçìéïõñãßá õðïóôçñßæåôáé ìüíï ãéá ôá ãñáììáôïêéâþôéá IMAP"
+msgstr "Η δημιουργία υποστηρίζεται μόνο για τα γραμματοκιβώτια IMAP"
 
 #
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Äçìéïõñãßá ãñáììáôïêéâùôßïõ: "
+msgstr "Δημιουργία γραμματοκιβωτίου: "
 
 #
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "Áðïêùäéêïðïßçóç-áíôéãñáöÞ%s óôï ãñáììáôïêéâþôéï"
+msgstr "Αποκωδικοποίηση-αντιγραφή%s στο γραμματοκιβώτιο"
 
 #
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "Áðïêùäéêïðïßçóç-áðïèÞêåõóç%s óôï ãñáììáôïêéâþôéï"
+msgstr "Αποκωδικοποίηση-αποθήκευση%s στο γραμματοκιβώτιο"
 
 #
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "ÅðéëïãÞ %s..."
+msgstr "Επιλογή %s..."
 
 #
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "ÁðïêñõðôïãñÜöçóç-áíôéãñáöÞ%s óôï ãñáììáôïêéâþôéï"
+msgstr "Αποκρυπτογράφηση-αντιγραφή%s στο γραμματοκιβώτιο"
 
 #
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "ÁðïêñõðôïãñÜöçóç-áðïèÞêåõóç%s óôï ãñáììáôïêéâþôéï"
+msgstr "Αποκρυπτογράφηση-αποθήκευση%s στο γραμματοκιβώτιο"
 
 #
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
-msgstr "ÁðïêñõðôïãñÜöçóç ìçíýìáôïò..."
+msgstr "Αποκρυπτογράφηση μηνύματος..."
 
 #
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Ç áðïêñõðôïãñÜöçóç áðÝôõ÷å."
-
-#
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "ÄéáãñáöÞ"
-
-#
-#: remailer.c:433
-msgid "Delete"
-msgstr "ÄéáãñáöÞ"
+msgstr "Η αποκρυπτογράφηση απέτυχε."
 
 #
 # recvattach.c:1065
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Ç äéáãñáöÞ õðïóôçñßæåôáé ìüíï ãéá ôá ãñáììáôïêéâþôéá IMAP"
+msgstr "Η διαγραφή υποστηρίζεται μόνο για τα γραμματοκιβώτια IMAP"
 
 #
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "ÄéáãñáöÞ ìçíõìÜôùí áðü ôïí åîõðçñåôçôÞ;"
+msgstr "Διαγραφή μηνυμάτων από τον εξυπηρετητή;"
 
 #
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "ÄéáãñáöÞ ðáñüìïéùí ìçíõìÜôùí: "
+msgstr "Διαγραφή παρόμοιων μηνυμάτων: "
 
 #
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "ÄéáãñáöÞ"
+msgstr "Διαγραφή"
 
 #
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr ""
-"Ç äéáãñáöÞ ðñïóáñôÞóåùí áðü êñõðôïãñáöçìÝíá ìçíýìáôá äåí õðïóôçñßæåôáé."
-
-#
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "ÐåñéãñáöÞ"
+"Η διαγραφή προσαρτήσεων από κρυπτογραφημένα μηνύματα δεν υποστηρίζεται."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "Ôï ID %s äåí Ý÷åé åðéâåâáéùèåß. Óßãïõñá íá ãßíåé ÷ñÞóç ôïõ ãéá %s ;"
+msgstr "Το ID %s δεν έχει επιβεβαιωθεί. Σίγουρα να γίνει χρήση του για %s ;"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "Ôï %s äåí õðÜñ÷åé. Äçìéïõñãßá;"
+msgstr "Το %s δεν υπάρχει. Δημιουργία;"
 
 #
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "ÊáôÜëïãïò [%s], ÌÜóêá áñ÷åßïõ: %s"
+msgstr "Κατάλογος [%s], Μάσκα αρχείου: %s"
 
 #
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "ÓÖÁËÌÁ: ðáñáêáëþ áíáöÝñáôå áõôü ôï óöÜëìá ðñïãñÜììáôïò"
+msgstr "ΣΦΑΛΜΑ: παρακαλώ αναφέρατε αυτό το σφάλμα προγράμματος"
 
 #
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "Åðåîåñãáóßá ðñïùèçìÝíïõ ìçíýìáôïò;"
+msgstr "Επεξεργασία προωθημένου μηνύματος;"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1357,19 +1312,19 @@ msgstr ""
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "óöÜëìá óôçí Ýêöñáóç"
+msgstr "σφάλμα στην έκφραση"
 
 #
 # compose.c:105
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "ÊñõðôïãñÜöçóç"
+msgstr "Κρυπτογράφηση"
 
 #
 # compose.c:105
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "ÊñõðôïãñÜöçóç ìå: "
+msgstr "Κρυπτογράφηση με: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
@@ -1377,45 +1332,45 @@ msgstr ""
 
 #
 # pgp.c:1200
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "ÅéóÜãåôå ôï keyID: "
+msgstr "Εισάγετε το keyID: "
 
 #
 # pgp.c:1200
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "ÅéóÜãåôå keyID ãéá ôï %s: "
+msgstr "Εισάγετε keyID για το %s: "
 
 #
 # pgp.c:1200
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "ÅéóÜãåôå êëåéäéÜ (^G ãéá áðüññéøç): "
+msgstr "Εισάγετε κλειδιά (^G για απόρριψη): "
 
 #
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "ÓöÜëìá êáôÜ ôçí ìåôáâßâáóç ôïõ ìçíýìáôïò!"
+msgstr "Σφάλμα κατά την μεταβίβαση του μηνύματος!"
 
 #
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "ÓöÜëìá êáôÜ ôçí ìåôáâßâáóç ôùí ìçíõìÜôùí!"
+msgstr "Σφάλμα κατά την μεταβίβαση των μηνυμάτων!"
 
 #
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ôïõ ìçíýìáôïò."
+msgstr "Σφάλμα κατά την αποστολή του μηνύματος."
 
 #
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "ÓöÜëìá êáôá ôç óýíäåóç óôï äéáêïìéóôÞ: %s"
+msgstr "Σφάλμα κατα τη σύνδεση στο διακομιστή: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
@@ -1423,128 +1378,111 @@ msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
 #
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "ÓöÜëìá êáôá ôç óýíäåóç óôï äéáêïìéóôÞ: %s"
+msgstr "Σφάλμα κατα τη σύνδεση στο διακομιστή: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
 #
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "ÓöÜëìá óôï %s, ãñáììÞ %d: %s"
+msgstr "Σφάλμα στο %s, γραμμή %d: %s"
 
 #
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "ËÜèïò óôç ãñáììÞ åíôïëþí: %s\n"
+msgstr "Λάθος στη γραμμή εντολών: %s\n"
 
 #
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "ËÜèïò óôçí Ýêöñáóç: %s"
+msgstr "Λάθος στην έκφραση: %s"
 
 #
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "ËÜèïò êáôÜ ôçí áñ÷éêïðïßçóç ôïõ ôåñìáôéêïý."
+msgstr "Λάθος κατά την αρχικοποίηση του τερματικού."
 
 #
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "ËÜèïò êáôÜ ôçí áñ÷éêïðïßçóç ôïõ ôåñìáôéêïý."
+msgstr "Λάθος κατά την αρχικοποίηση του τερματικού."
 
 #
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "ÓöÜëìá êáôÜ  ôï Üíïéãìá ôïõ ãñáììáôïêéâùôßïõ"
+msgstr "Σφάλμα κατά  το άνοιγμα του γραμματοκιβωτίου"
 
 #
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "ÓöÜëìá êáôÜ ôçí áíÜëõóç ôçò äéåýèõíóçò!"
+msgstr "Σφάλμα κατά την ανάλυση της διεύθυνσης!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
 #
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "ÓöÜëìá êáôÜ ôçí åêôÝëåóç ôïõ \"%s\"!"
+msgstr "Σφάλμα κατά την εκτέλεση του \"%s\"!"
 
 #
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "ÓöÜëìá êáôÜ ôç äéåñåýíçóç ôïõ êáôáëüãïõ."
+msgstr "Σφάλμα κατά τη διερεύνηση του καταλόγου."
 
 #
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò èõãáôñéêÞò ìå %d (%s)."
-
-#
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "ÓöÜëìá óôçí áðïóôïëÞ ìçíýìáôïò, ôåñìáôéóìüò èõãáôñéêÞò ìå %d.\n"
-
-#
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "ÓöÜëìá êáôÜ ôçí áðïóôïëÞ ôïõ ìçíýìáôïò."
+msgstr "Σφάλμα κατά την αποστολή μηνύματος, τερματισμός θυγατρικής με %d (%s)."
 
 #
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "ÓöÜëìá óôç óõíïìéëßá ìå ôï %s (%s)"
+msgstr "Σφάλμα στη συνομιλία με το %s (%s)"
 
 #
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "ÓöÜëìá êáôÜ ôçí åìöÜíéóç áñ÷åßïõ"
+msgstr "Σφάλμα κατά την εμφάνιση αρχείου"
 
 #
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "ÓöÜëìá êáôÜ ôçí åããñáöÞ óôï ãñáììáôïêéâþôéï"
+msgstr "Σφάλμα κατά την εγγραφή στο γραμματοκιβώτιο"
 
 #
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "ÓöÜëìá. ÄéáôÞñçóç ðñïóùñéíïý áñ÷åßïõ: %s"
+msgstr "Σφάλμα. Διατήρηση προσωρινού αρχείου: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr ""
-"ÓöÜëìá: ôï %s äåí ìðïñåß íá åßíáé ï ôåëéêüò åðáíáðïóôïëÝáò ôçò áëõóßäáò."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "ÓöÜëìá: '%s' åßíáé ëáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN."
+msgstr "Σφάλμα: '%s' είναι λανθασμένη διεθνής διεύθυνση IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1552,322 +1490,288 @@ msgstr ""
 #
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "ÓöÜëìá: ôï ðïëõìåñÝò/êñõðôïãñáöçìÝíï äåí Ý÷åé ðáñÜìåôñï ðñùôïêüëëïõ!"
+msgstr "Σφάλμα: το πολυμερές/κρυπτογραφημένο δεν έχει παράμετρο πρωτοκόλλου!"
 
 #
 # handler.c:1378
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "ÓöÜëìá: ôï ðïëõìåñÝò/õðïãåãñáììÝíï äåí Ý÷åé ðñùôüêïëëï"
+msgstr "Σφάλμα: το πολυμερές/υπογεγραμμένο δεν έχει πρωτόκολλο"
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
 #
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "ËÜèïò óôç ãñáììÞ åíôïëþí: %s\n"
+msgstr "Λάθος στη γραμμή εντολών: %s\n"
 
 #
 #: imap/message.c:109
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "¸ëåã÷ïò ðñïóùñéíÞò ìíÞìçò... [%d/%d]"
+msgstr "Έλεγχος προσωρινής μνήμης... [%d/%d]"
 
 #
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "ÅêôÝëåóç åíôïëÞò óôá ðáñüìïéá ìçíýìáôá..."
-
-#
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "¸îïäïò"
-
-#
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "¸îïäïò "
+msgstr "Εκτέλεση εντολής στα παρόμοια μηνύματα..."
 
 #
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "¸îïäïò áðü ôï Mutt ÷ùñßò áðïèÞêåõóç;"
+msgstr "Έξοδος από το Mutt χωρίς αποθήκευση;"
 
 #
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "¸îïäïò áðü ôï Mutt;"
+msgstr "Έξοδος από το Mutt;"
 
 #
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "ÄéáãñáöÞ áðÝôõ÷å"
+msgstr "Διαγραφή απέτυχε"
 
 #
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "ÄéáãñáöÞ ìçíõìÜôùí áðü ôïí åîõðçñåôçôÞ..."
+msgstr "Διαγραφή μηνυμάτων από τον εξυπηρετητή..."
 
 #
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá ôçí áíÜëõóç ôùí åðéêåöáëßäùí."
+msgstr "Αποτυχία κατά το άνοιγμα αρχείου για την ανάλυση των επικεφαλίδων."
 
 #
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá áñ÷åßïõ ãéá ôçí áðïãýìíùóç ôùí åðéêåöáëßäùí"
+msgstr "Αποτυχία κατά το άνοιγμα αρχείου για την απογύμνωση των επικεφαλίδων"
 
 #
 #: attach.c:151
 msgid "Failure to rename file."
-msgstr "Áðïôõ÷ßá ìåôïíïìáóßáò áñ÷åßïõ."
+msgstr "Αποτυχία μετονομασίας αρχείου."
 
 #
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Ìïéñáßï ëÜèïò! Áäõíáìßá åðáíáðñüóâáóçò ôïõ ãñáììáôïêéâùôßïõ!"
+msgstr "Μοιραίο λάθος! Αδυναμία επαναπρόσβασης του γραμματοκιβωτίου!"
 
 #
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Ìïéñáßï óöÜëìá. Ï áñéèìüò ôùí ìçíõìÜôùí äåí åßíáé óå óõìöùíßá!"
+msgstr "Μοιραίο σφάλμα. Ο αριθμός των μηνυμάτων δεν είναι σε συμφωνία!"
 
 #
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "ÄéáãñáöÞ ìçíõìÜôùí áðü ôïí åîõðçñåôçôÞ..."
+msgstr "Διαγραφή μηνυμάτων από τον εξυπηρετητή..."
 
 #
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "ËÞøç ìçíýìáôïò..."
+msgstr "Λήψη μηνύματος..."
 
 #
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "ËÞøç ëßóôáò ìçíõìÜôùí..."
+msgstr "Λήψη λίστας μηνυμάτων..."
 
 #
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "ËÞøç ëßóôáò ìçíõìÜôùí..."
+msgstr "Λήψη λίστας μηνυμάτων..."
 
 #
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "ËÞøç åðéêåöáëßäùí áðü ôá ìçíýìáôá... [%d/%d]"
+msgstr "Λήψη επικεφαλίδων από τα μηνύματα... [%d/%d]"
 
 #
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "ËÞøç åðéêåöáëßäùí áðü ôá ìçíýìáôá... [%d/%d]"
+msgstr "Λήψη επικεφαλίδων από τα μηνύματα... [%d/%d]"
 
 #
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "ËÞøç ìçíýìáôïò..."
+msgstr "Λήψη μηνύματος..."
 
 #
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "ÌÜóêá áñ÷åßïõ: "
+msgstr "Μάσκα αρχείου: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Ôï áñ÷åßï õðÜñ÷åé, (o)äéáãñáöÞ ôïõ õðÜñ÷ïíôïò, (a)ðñüóèåóç, (c)Üêõñï;"
+msgstr "Το αρχείο υπάρχει, (o)διαγραφή του υπάρχοντος, (a)πρόσθεση, (c)άκυρο;"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý;"
+msgstr "Το αρχείο είναι φάκελος, αποθήκευση υπό αυτού;"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr ""
-"Ôï áñ÷åßï åßíáé öÜêåëïò, áðïèÞêåõóç õðü áõôïý; [(y)íáé, (n)ü÷é, (a)üëá]"
+"Το αρχείο είναι φάκελος, αποθήκευση υπό αυτού; [(y)ναι, (n)όχι, (a)όλα]"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "Áñ÷åßï õðü öÜêåëï:"
+msgstr "Αρχείο υπό φάκελο:"
 
 #
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "ÖéëôñÜñéóìá ìÝóù: "
+msgstr "Φιλτράρισμα μέσω: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
-msgstr "Áðïôýðùìá: %s"
+msgstr "Αποτύπωμα: %s"
 
 #
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "áðïèÞêåõóç áõôïý ôïõ ìçíýìáôïò ãéá ìåôÝðåéôá áðïóôïëÞ"
+msgstr "αποθήκευση αυτού του μηνύματος για μετέπειτα αποστολή"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
 #
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "ÓõíÝ÷åéá óôï %s%s;"
-
-#
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "ÓõíÝ÷åéá óôï %s%s;"
+msgstr "Συνέχεια στο %s%s;"
 
 #
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Ðñïþèçóç åíóùìáôùìÝíïõ MIME;"
+msgstr "Προώθηση ενσωματωμένου MIME;"
 
 #
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "Ðñïþèçóç óáí ðñïóÜñôçóç;"
+msgstr "Προώθηση σαν προσάρτηση;"
 
 #
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "Ðñïþèçóç óáí ðñïóáñôÞóåéò;"
+msgstr "Προώθηση σαν προσαρτήσεις;"
 
 #
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Ç ëåéôïõñãßá áðáãïñåýåôáé óôçí êáôÜóôáóç ðñïóÜñôçóç-ìçíýìáôïò."
+msgstr "Η λειτουργία απαγορεύεται στην κατάσταση προσάρτηση-μηνύματος."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "ËÞøç ëßóôáò öáêÝëùí..."
+msgstr "Λήψη λίστας φακέλων..."
 
 #
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "ËÞøç namespaces..."
+msgstr "Λήψη namespaces..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "ÏìÜäá"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
 #
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "ÂïÞèåéá"
-
-#
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "ÂïÞèåéá ãéá ôï %s"
+msgstr "Βοήθεια για το %s"
 
 #
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "Ç âïÞèåéá Þäç åìöáíßæåôáé."
+msgstr "Η βοήθεια ήδη εμφανίζεται."
 
 #
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Äåí ãíùñßæù ðþò íá ôï ôõðþóù áõôü!"
+msgstr "Δεν γνωρίζω πώς να το τυπώσω αυτό!"
 
 #
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Äåí îÝñù ðùò íá ôõðþóù ôéò %s ðñïóáñôÞóåéò!"
+msgstr "Δεν ξέρω πως να τυπώσω τις %s προσαρτήσεις!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "Ôï ID Ý÷åé ìç ïñéóìÝíç åãêõñüôçôá."
+msgstr "Το ID έχει μη ορισμένη εγκυρότητα."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "Ôï ID åßíáé ëçãìÝíï/á÷ñçóôåõìÝíï/Üêõñï."
+msgstr "Το ID είναι ληγμένο/αχρηστευμένο/άκυρο."
 
 #
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "Ôï ID äåí åßíáé Ýãêõñï."
+msgstr "Το ID δεν είναι έγκυρο."
 
 #
 # pgpkey.c:259
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "Ôï ID åßíáé ìüíï ìåñéêþò Ýãêõñï."
+msgstr "Το ID είναι μόνο μερικώς έγκυρο."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
 #
 # postpone.c:338 postpone.c:358 postpone.c:367
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "ÁêáôÜëëçëç åðéêåöáëßäá PGP"
+msgstr "Ακατάλληλη επικεφαλίδα PGP"
 
 #
 # postpone.c:338 postpone.c:358 postpone.c:367
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "ÁêáôÜëëçëç åðéêåöáëßäá S/MIME"
+msgstr "Ακατάλληλη επικεφαλίδα S/MIME"
 
 #
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "ÁêáôÜëëçëá ìïñöïðïéçìÝíç åßóïäïò ãéá ôï ôýðï %s óôç \"%s\" ãñáììÞ %d"
+msgstr "Ακατάλληλα μορφοποιημένη είσοδος για το τύπο %s στη \"%s\" γραμμή %d"
 
 #
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Óõìðåñßëçøç ôïõ ìçíýìáôïò óôçí áðÜíôçóç;"
+msgstr "Συμπερίληψη του μηνύματος στην απάντηση;"
 
 #
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "Óõìðåñßëçøç êáèïñéóìÝíïõ ìçíýìáôïò..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "Åßóïäïò"
+msgstr "Συμπερίληψη καθορισμένου μηνύματος..."
 
 #
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Ìç Ýãêõñç ìÝñá ôïõ ìÞíá: %s"
+msgstr "Μη έγκυρη μέρα του μήνα: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
@@ -1875,131 +1779,127 @@ msgid ""
 msgstr ""
 
 #
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Ìç Ýãêõñç êùäéêïðïßçóç."
+msgstr "Μη έγκυρη κωδικοποίηση."
 
 #
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Ìç Ýãêõñïò áñéèìüò äåßêôç"
+msgstr "Μη έγκυρος αριθμός δείκτη"
 
 #
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Ìç Ýãêõñïò áñéèìüò ìçíýìáôïò."
+msgstr "Μη έγκυρος αριθμός μηνύματος."
 
 #
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Ìç Ýãêõñïò ìÞíáò: %s"
+msgstr "Μη έγκυρος μήνας: %s"
 
 #
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "Ìç Ýãêõñïò áíáöïñéêþò ìÞíáò: %s"
+msgstr "Μη έγκυρος αναφορικώς μήνας: %s"
 
 #
 # commands.c:87 commands.c:95 pgp.c:1373 pgpkey.c:220
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "ÊëÞóç ôïõ PGP..."
+msgstr "Κλήση του PGP..."
 
 #
 # commands.c:87 commands.c:95 pgp.c:1373 pgpkey.c:220
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "ÊëÞóç ôïõ PGP..."
+msgstr "Κλήση του PGP..."
 
 #
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "ÊëÞóç ôçò åíôïëÞò autoview: %s"
+msgstr "Κλήση της εντολής autoview: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "ÌåôÜâáóç óôï ìÞíõìá: "
+msgstr "Μετάβαση στο μήνυμα: "
 
 #
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Ìåôáêßíçóç óôï: "
+msgstr "Μετακίνηση στο: "
 
 #
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Äåí Ý÷åé åöáñìïóôåß ìåôáêßíçóç ãéá ôïõò äéáëüãïõò."
+msgstr "Δεν έχει εφαρμοστεί μετακίνηση για τους διαλόγους."
 
 #
 # pgpkey.c:236
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "ID êëåéäéïý: 0x%s"
+msgstr "ID κλειδιού: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
 #
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Ôï ðëÞêôñï äåí åßíáé óõíäåäåìÝíï."
+msgstr "Το πλήκτρο δεν είναι συνδεδεμένο."
 
 #
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Ôï ðëÞêôñï äåí åßíáé óõíäåäåìÝíï. ÐáôÞóôå '%s' ãéá âïÞèåéá."
+msgstr "Το πλήκτρο δεν είναι συνδεδεμένο. Πατήστε '%s' για βοήθεια."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Ðåñéïñéóìüò óôá ðáñüìïéá ìçíýìáôá: "
+msgstr "Περιορισμός στα παρόμοια μηνύματα: "
 
 #
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "¼ñéï: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Όριο: %s"
 
 #
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "Åßóïäïò óôï óýóôçìá..."
+msgstr "Είσοδος στο σύστημα..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -2008,160 +1908,150 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Ï áñéèìüò êëåéäùìÜôùí îåðåñÜóôçêå, îåêëåßäùìá ôïõ %s;"
+msgstr "Ο αριθμός κλειδωμάτων ξεπεράστηκε, ξεκλείδωμα του %s;"
 
 #
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "Åßóïäïò óôï óýóôçìá..."
+msgstr "Είσοδος στο σύστημα..."
 
 #
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "ÁðÝôõ÷å ç åßóïäïò óôï óýóôçìá."
+msgstr "Απέτυχε η είσοδος στο σύστημα."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Åýñåóç üìïéùí êëåéäéþí ìå \"%s\"..."
+msgstr "Εύρεση όμοιων κλειδιών με \"%s\"..."
 
 #
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "ÁíáæÞôçóç ôïõ %s..."
+msgstr "Αναζήτηση του %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "Áðïôýðùìá: %s"
+msgstr "Αποτύπωμα: %s"
 
 #
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "Ï ôýðïò MIME äåí Ý÷åé ïñéóôåß. Áäõíáìßá åìöÜíéóçò ðñïóáñôÞóåùò."
+msgstr "Ο τύπος MIME δεν έχει οριστεί. Αδυναμία εμφάνισης προσαρτήσεως."
 
 #
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Åíôïðßóôçêå âñüã÷ïò ìáêñïåíôïëÞò."
+msgstr "Εντοπίστηκε βρόγχος μακροεντολής."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Ôá÷õäñ"
-
-#
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "Ôï ãñÜììá äåí åóôÜëç."
+msgstr "Το γράμμα δεν εστάλη."
 
 #
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "Ôï ãñÜììá åóôÜëç."
+msgstr "Το γράμμα εστάλη."
 
 #
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "Ôï ãñáììáôïêéâþôéï óçìåéþèçêå."
+msgstr "Το γραμματοκιβώτιο σημειώθηκε."
 
 #
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Ôï ãñáììáôïêéâþôéï Ýêëåéóå"
+msgstr "Το γραμματοκιβώτιο έκλεισε"
 
 #
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Ôï ãñáììáôïêéâþôéï äçìéïõñãÞèçêå."
+msgstr "Το γραμματοκιβώτιο δημιουργήθηκε."
 
 #
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Ôï ãñáììáôïêéâþôéï äéáãñÜöçêå."
+msgstr "Το γραμματοκιβώτιο διαγράφηκε."
 
 #
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "Ôï ãñáììáôïêéâþôéï åßíáé Üäåéï."
+msgstr "Το γραμματοκιβώτιο είναι άδειο."
 
 #
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "Ôï ãñáììáôïêéâþôéï åßíáé óçìåéùìÝíï ìç åããñÜøéìï. %s"
+msgstr "Το γραμματοκιβώτιο είναι σημειωμένο μη εγγράψιμο. %s"
 
 #
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "Ôï ãñáììáôïêéâþôéï åßíáé ìüíï ãéá áíÜãíùóç."
+msgstr "Το γραμματοκιβώτιο είναι μόνο για ανάγνωση."
 
 #
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Äåí Ýãéíå áëëáãÞ óôï ãñáììáôïêéâþôéï "
+msgstr "Δεν έγινε αλλαγή στο γραμματοκιβώτιο "
 
 #
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "Ôï ãñáììáôïêéâþôéï ðñÝðåé íá Ý÷åé üíïìá."
+msgstr "Το γραμματοκιβώτιο πρέπει να έχει όνομα."
 
 #
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Ôï ãñáììáôïêéâþôéï äåí äéáãñÜöçêå."
+msgstr "Το γραμματοκιβώτιο δεν διαγράφηκε."
 
 #
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Ôï ãñáììáôïêéâþôéï äçìéïõñãÞèçêå."
+msgstr "Το γραμματοκιβώτιο δημιουργήθηκε."
 
 #
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Ôï ãñáììáôïêéâþôéï åß÷å áëëïéùèåß!"
+msgstr "Το γραμματοκιβώτιο είχε αλλοιωθεί!"
 
 #
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Ôï ãñáììáôïêéâþôéï ôñïðïðïéÞèçêå åîùôåñéêÜ."
+msgstr "Το γραμματοκιβώτιο τροποποιήθηκε εξωτερικά."
 
 #
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
-"Ôï ãñáììáôïêéâþôéï ôñïðïðïéÞèçêå åîùôåñéêÜ. Ïé óçìáßåò ìðïñåß íá åßíáé ëÜèïò"
+"Το γραμματοκιβώτιο τροποποιήθηκε εξωτερικά. Οι σημαίες μπορεί να είναι λάθος"
 
 #
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Ãñáììáôïêéâþôéá [%d]"
+msgstr "Γραμματοκιβώτια [%d]"
 
 #
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Ç êáôá÷þñçóç mailcap Edit ÷ñåéÜæåôáé ôï %%s"
+msgstr "Η καταχώρηση mailcap Edit χρειάζεται το %%s"
 
 #
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Ç êáôá÷þñçóç óôïé÷åßùí ôïõ mailcap ÷ñåéÜæåôáé ôï %%s"
-
-#
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Äçìéïõñãßá Øåõäþíõìïõ"
+msgstr "Η καταχώρηση στοιχείων του mailcap χρειάζεται το %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -2169,728 +2059,647 @@ msgstr ""
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Óçìåßùóç %d äéáãñáöÝíôùí ìçíõìÜôùí..."
+msgstr "Σημείωση %d διαγραφέντων μηνυμάτων..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "ÌÜóêá"
-
 #
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Ôï ìÞíõìá äéáâéâÜóôçêå."
+msgstr "Το μήνυμα διαβιβάστηκε."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "Áäõíáìßá åêôýðùóçò ìçíýìáôïò"
+msgstr "Αδυναμία εκτύπωσης μηνύματος"
 
 #
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "Ôï áñ÷åßï ìçíõìÜôùí åßíáé Üäåéï!"
+msgstr "Το αρχείο μηνυμάτων είναι άδειο!"
 
 #
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "Ôï ìÞíõìá äåí äéáâéâÜóôçêå."
+msgstr "Το μήνυμα δεν διαβιβάστηκε."
 
 #
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Ôï ìÞíõìá äåí ôñïðïðïéÞèçêå!"
+msgstr "Το μήνυμα δεν τροποποιήθηκε!"
 
 #
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Ôï ôñÝ÷ïí ìÞíõìá äåí åßíáé ïñáôü óå áõôÞ ôç ðåñéïñéóìÝíç üøç"
+msgstr "Το τρέχον μήνυμα δεν είναι ορατό σε αυτή τη περιορισμένη όψη"
 
 #
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Ôï ìÞíõìá áíåâëÞèç."
+msgstr "Το μήνυμα ανεβλήθη."
 
 #
 #: commands.c:390
 msgid "Message printed"
-msgstr "Ôï ìÞíõìá åêôõðþèçêå"
+msgstr "Το μήνυμα εκτυπώθηκε"
 
 #
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "Ôï ìÞíõìá ãñÜöôçêå."
+msgstr "Το μήνυμα γράφτηκε."
 
 #
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Ôá ìçíýìáôá äéáâéâÜóôçêáí."
+msgstr "Τα μηνύματα διαβιβάστηκαν."
 
 #
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "Áäõíáìßá åêôýðùóçò ìçíõìÜôùí"
+msgstr "Αδυναμία εκτύπωσης μηνυμάτων"
 
 #
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "Ôá ìçíýìáôá äåí äéáâéâÜóôçêáí."
+msgstr "Τα μηνύματα δεν διαβιβάστηκαν."
 
 #
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Ôá ìçíýìáôá åêôõðþèçêáí"
+msgstr "Τα μηνύματα εκτυπώθηκαν"
 
 #
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "ÅëëéðÞ ïñßóìáôá."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Ïé áëõóßäåò Mixmaster åßíáé ðåñéïñéóìÝíåò óå %d óôïé÷åßá."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Ï Mixmaster äåí äÝ÷åôáé Cc Þ Bcc åðéêåöáëßäåò."
+msgstr "Ελλιπή ορίσματα."
 
 #
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Ìåôáêßíçóç áíáãíùóìÝíùí ìçíõìÜôùí óôï %s;"
+msgstr "Μετακίνηση αναγνωσμένων μηνυμάτων στο %s;"
 
 #
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Ìåôáêßíçóç áíáãíùóìÝíùí ìçíõìÜôùí óôï %s..."
+msgstr "Μετακίνηση αναγνωσμένων μηνυμάτων στο %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
 #
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "ÍÝá Åñþôçóç"
-
-#
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "ÍÝï üíïìá áñ÷åßïõ: "
+msgstr "Νέο όνομα αρχείου: "
 
 #
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "ÍÝï áñ÷åßï: "
+msgstr "Νέο αρχείο: "
 
 #
 #: buffy.cpkg:330
 msgid "New mail in "
-msgstr "ÍÝá áëëçëïãñáößá óôï "
+msgstr "Νέα αλληλογραφία στο "
 
 #
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "ÍÝá áëëçëïãñáößá óå áõôü ôï ãñáììáôïêéâþôéï."
+msgstr "Νέα αλληλογραφία σε αυτό το γραμματοκιβώτιο."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Åðüìåíï"
-
-#
-#: pager.c:1304
-msgid "NextPg"
-msgstr "ÅðüìÓåë"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "Äåí õðÜñ÷åé äéáèÝóéìç áõèåíôéêïðïßçóç."
+msgstr "Δεν υπάρχει διαθέσιμη αυθεντικοποίηση."
 
 #
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Äå âñÝèçêå ðáñÜìåôñïò ïñéïèÝôçóçò! [áíáöÝñáôå áõôü ôï óöÜëìá]"
+msgstr "Δε βρέθηκε παράμετρος οριοθέτησης! [αναφέρατε αυτό το σφάλμα]"
 
 #
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "Êáììßá êáôá÷þñçóç"
+msgstr "Καμμία καταχώρηση"
 
 #
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "ÊáíÝíá áñ÷åßï äåí ôáéñéÜæåé ìå ôç ìÜóêá áñ÷åßïõ"
+msgstr "Κανένα αρχείο δεν ταιριάζει με τη μάσκα αρχείου"
 
 #
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Äåí Ý÷åé ïñéóôåß ãñáììáôïêéâþôéï åéóåñ÷ïìÝíùí."
+msgstr "Δεν έχει οριστεί γραμματοκιβώτιο εισερχομένων."
 
 #
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "ÊáíÝíá õðüäåéãìá ïñßùí óå ëåéôïõñãßá."
+msgstr "Κανένα υπόδειγμα ορίων σε λειτουργία."
 
 #
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Äåí õðÜñ÷ïõí áíïé÷ôÜ ãñáììáôïêéâþôéá."
+msgstr "Δεν υπάρχουν ανοιχτά γραμματοκιβώτια."
 
 #
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Äåí õðÜñ÷åé íÝá áëëçëïãñáößá óå êáíÝíá ãñáììáôïêéâþôéï."
+msgstr "Δεν υπάρχει νέα αλληλογραφία σε κανένα γραμματοκιβώτιο."
 
 #
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "Êáììßá êáôá÷þñçóç mailcap ãéá ôï %s, äçìéïõñãßá êåíïý áñ÷åßïõ."
+msgstr "Καμμία καταχώρηση mailcap για το %s, δημιουργία κενού αρχείου."
 
 #
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "Äåí õðÜñ÷åé êáôá÷þñçóç mailcap ãéá åðåîåñãáóßá êåéìÝíïõ ãéá ôï %s"
+msgstr "Δεν υπάρχει καταχώρηση mailcap για επεξεργασία κειμένου για το %s"
 
 #
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "Äåí âñÝèçêáí ëßóôåò óõæçôÞóåùí!"
+msgstr "Δεν βρέθηκαν λίστες συζητήσεων!"
 
 #
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "Äåí âñÝèçêå üìïéá êáôá÷þñçóç Mailcap. Áðåéêüíéóç ùò êåßìåíï."
+msgstr "Δεν βρέθηκε όμοια καταχώρηση Mailcap. Απεικόνιση ως κείμενο."
 
 #
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá óå áõôü ôï öÜêåëï."
+msgstr "Δεν υπάρχουν μηνύματα σε αυτό το φάκελο."
 
 #
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "ÊáíÝíá ìÞíõìá äåí ôáéñéÜæåé óôá êñéôÞñéá."
+msgstr "Κανένα μήνυμα δεν ταιριάζει στα κριτήρια."
 
 #
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "¼÷é Üëëï êáèïñéóìÝíï êåßìåíï."
+msgstr "Όχι άλλο καθορισμένο κείμενο."
 
 #
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Äåí õðÜñ÷ïõí Üëëåò óõæçôÞóåéò."
+msgstr "Δεν υπάρχουν άλλες συζητήσεις."
 
 #
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "¼÷é Üëëï ìç êáèïñéóìÝíï êåßìåíï ìåôÜ áðü êáèïñéóìÝíï."
+msgstr "Όχι άλλο μη καθορισμένο κείμενο μετά από καθορισμένο."
 
 #
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Äåí õðÜñ÷åé áëëçëïãñáößá óôï POP ãñáììáôïêéâþôéï."
+msgstr "Δεν υπάρχει αλληλογραφία στο POP γραμματοκιβώτιο."
 
 #
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "Äåí õðÜñ÷ïõí íÝá ìçíýìáôá"
+msgstr "Δεν υπάρχουν νέα μηνύματα"
 
 #
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Äåí êáèïñßóôçêå èÝìá."
+msgstr "Δεν καθορίστηκε θέμα."
 
 #
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "ÊáíÝíá áñ÷åßï äåí ôáéñéÜæåé ìå ôç ìÜóêá áñ÷åßïõ"
+msgstr "Κανένα αρχείο δεν ταιριάζει με τη μάσκα αρχείου"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
 #
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Äåí õðÜñ÷åé íÝá áëëçëïãñáößá óå êáíÝíá ãñáììáôïêéâþôéï."
-
-#
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "Äåí õðÜñ÷ïõí áíáâëçèÝíôá ìçíýìáôá."
-
-#
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Äåí õðÜñ÷åé íÝá áëëçëïãñáößá óå êáíÝíá ãñáììáôïêéâþôéï."
+msgstr "Δεν υπάρχουν αναβληθέντα μηνύματα."
 
 #
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Äåí Ý÷åé ïñéóôåß åíôïëÞ åêôõðþóåùò."
+msgstr "Δεν έχει οριστεί εντολή εκτυπώσεως."
 
 #
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Äåí Ý÷ïõí êáèïñéóôåß ðáñáëÞðôåò!"
+msgstr "Δεν έχουν καθοριστεί παραλήπτες!"
 
 #
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Äåí Ý÷ïõí ïñéóôåß ðáñáëÞðôåò.\n"
+msgstr "Δεν έχουν οριστεί παραλήπτες.\n"
 
 #
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Äåí êáèïñßóôçêáí ðáñáëÞðôåò."
+msgstr "Δεν καθορίστηκαν παραλήπτες."
 
 #
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "ÊáíÝíá ó÷Ýäéï áíáæÞôçóçò."
+msgstr "Κανένα σχέδιο αναζήτησης."
 
 #
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Äåí êáèïñßóôçêå èÝìá."
+msgstr "Δεν καθορίστηκε θέμα."
 
 #
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Äåí õðÜñ÷åé èÝìá, áêýñùóç áðïóôïëÞò;"
+msgstr "Δεν υπάρχει θέμα, ακύρωση αποστολής;"
 
 #
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Äåí õðÜñ÷åé èÝìá, íá åãêáôáëåßøù;"
+msgstr "Δεν υπάρχει θέμα, να εγκαταλείψω;"
 
 #
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "Äåí õðÜñ÷åé èÝìá, åãêáôÜëåéøç."
+msgstr "Δεν υπάρχει θέμα, εγκατάλειψη."
 
 #
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "Äåí õðÜñ÷åé ôÝôïéïò öÜêåëïò"
+msgstr "Δεν υπάρχει τέτοιος φάκελος"
 
 #
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "Êáììßá óçìåéùìÝíç åßóïäïò."
+msgstr "Καμμία σημειωμένη είσοδος."
 
 #
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "ÊáíÝíá óçìåéùìÝíï ìÞíõìá äåí åßíáé ïñáôü!"
+msgstr "Κανένα σημειωμένο μήνυμα δεν είναι ορατό!"
 
 #
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Äåí õðÜñ÷ïõí óçìåéùìÝíá ìçíýìáôá."
+msgstr "Δεν υπάρχουν σημειωμένα μηνύματα."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Äåí õðÜñ÷ïõí áðïêáôáóôçìÝíá ìçíýìáôá."
+msgstr "Δεν υπάρχουν αποκαταστημένα μηνύματα."
 
 #
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Äåí õðÜñ÷ïõí ìç áíáãíùóìÝíá ìçíýìáôá"
+msgstr "Δεν υπάρχουν μη αναγνωσμένα μηνύματα"
 
 #
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "Äåí õðÜñ÷ïõí ïñáôÜ ìçíýìáôá."
+msgstr "Δεν υπάρχουν ορατά μηνύματα."
 
 #
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Äåí åßíáé äéáèÝóéìï óå áõôü ôï ìåíïý."
+msgstr "Δεν είναι διαθέσιμο σε αυτό το μενού."
 
 #
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "Äå âñÝèçêå."
+msgstr "Δε βρέθηκε."
 
 #
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
-msgstr "Êáììßá åíÝñãåéá."
-
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
+msgstr "Καμμία ενέργεια."
 
 #
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Ìüíï ç äéáãñáöÞ ðïëõìåñþí ðñïóáñôÞóåùí õðïóôçñßæåôáé."
+msgstr "Μόνο η διαγραφή πολυμερών προσαρτήσεων υποστηρίζεται."
 
 #
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Áíïßîôå ôï ãñáììáôïêéâþôéï"
+msgstr "Ανοίξτε το γραμματοκιβώτιο"
 
 #
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Áíïßîôå ôï ãñáììáôïêéâþôéï óå êáôÜóôáóç ìüíï ãéá åããñáöÞ"
+msgstr "Ανοίξτε το γραμματοκιβώτιο σε κατάσταση μόνο για εγγραφή"
 
 #
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "¶íïéãìá ãñáììáôïêéâùôßïõ ãéá ôçí ðñïóÜñôçóç ìçíýìáôïò áðü"
+msgstr "Άνοιγμα γραμματοκιβωτίου για την προσάρτηση μηνύματος από"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Áíïßîôå ôï ãñáììáôïêéâþôéï óå êáôÜóôáóç ìüíï ãéá åããñáöÞ"
+msgstr "Ανοίξτε το γραμματοκιβώτιο σε κατάσταση μόνο για εγγραφή"
 
 #
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "¶íïéãìá ãñáììáôïêéâùôßïõ ãéá ôçí ðñïóÜñôçóç ìçíýìáôïò áðü"
+msgstr "Άνοιγμα γραμματοκιβωτίου για την προσάρτηση μηνύματος από"
 
 #
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "¸îïäïò ôçò äéåñãáóßáò áðïóôïëÞò"
+msgstr "Έξοδος της διεργασίας αποστολής"
 
 #
 # compose.c:132
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "PGP (e)êëåßä, (s)õðïãñ, õðïãñ.ó(a)í, (b)êë+õð, %s, Þ (c)ôßðïôá; "
+msgstr "PGP (e)κλείδ, (s)υπογρ, υπογρ.σ(a)ν, (b)κλ+υπ, %s, ή (c)τίποτα; "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "Ôï PGP åß÷å Þäç åðéëåãåß. Êáèáñéóìüò Þ óõíÝ÷åéá ; "
+msgstr "Το PGP είχε ήδη επιλεγεί. Καθαρισμός ή συνέχεια ; "
 
 #
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "¼ìïéá PGP êëåéäéÜ <%s>."
+msgstr "Όμοια PGP κλειδιά <%s>."
 
 #
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "¼ìïéá PGP êëåéäéÜ <%s>."
+msgstr "Όμοια PGP κλειδιά <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "Ç õðïãñáöÞ PGP ÄÅÍ åðáëçèåýôçêå."
+msgstr "Η υπογραφή PGP ΔΕΝ επαληθεύτηκε."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "Ç õðïãñáöÞ PGP åðáëçèåýôçêå åðéôõ÷þò."
+msgstr "Η υπογραφή PGP επαληθεύτηκε επιτυχώς."
 
 #
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "Ï POP host äåí êáèïñßóôçêå."
+msgstr "Ο POP host δεν καθορίστηκε."
 
 #
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Ôï ôñÝ÷ïí ìÞíõìá äåí åßíáé äéáèÝóéìï."
+msgstr "Το τρέχον μήνυμα δεν είναι διαθέσιμο."
 
 #
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Ôï ôñÝ÷ïí ìÞíõìá äåí åßíáé ïñáôü óå áõôÞ ôç ðåñéïñéóìÝíç üøç"
+msgstr "Το τρέχον μήνυμα δεν είναι ορατό σε αυτή τη περιορισμένη όψη"
 
 #
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "Óõíèçìáôéêü ãéá ôï %s@%s: "
+msgstr "Συνθηματικό για το %s@%s: "
 
 #
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "Ðñïóùðéêü ¼íïìá: "
-
-#
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Äéï÷Ýôåõóç"
+msgstr "Προσωπικό Όνομα: "
 
 #
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Äéï÷Ýôåõóç óôçí åíôïëÞ: "
+msgstr "Διοχέτευση στην εντολή: "
 
 #
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Äéï÷Ýôåõóç óôï: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Ðáñáêáëþ ïñßóôå óùóôÜ ôçí ìåôáâëçôÞ ôïõ ïíüìáôïò ôïõ óõóôÞìáôïò üôáí "
-"÷ñçóéìïðïéåßôå ôï mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "Διοχέτευση στο: "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
 #
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Íá áíáâëçèåß ç ôá÷õäñüìçóç áõôïý ôïõ ìçíýìáôïò;"
+msgstr "Να αναβληθεί η ταχυδρόμηση αυτού του μηνύματος;"
 
 #
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "ÁíáâëçèÝíôá Ìçíýìáôá"
+msgstr "Αναβληθέντα Μηνύματα"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "Áðïôõ÷ßá åíôïëÞò ðñïóýíäåóçò"
+msgstr "Αποτυχία εντολής προσύνδεσης"
 
 #
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Åôïéìáóßá ðñïùèçìÝíïõ ìçíýìáôïò ..."
+msgstr "Ετοιμασία προωθημένου μηνύματος ..."
 
 #
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "ÐáôÞóôå Ýíá ðëÞêôñï ãéá íá óõíå÷ßóåôå..."
+msgstr "Πατήστε ένα πλήκτρο για να συνεχίσετε..."
 
 #
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "ÐñïçãÓåë"
-
-#
-#: recvattach.c:34
-msgid "Print"
-msgstr "Åêôýðùóç"
-
-#
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Åêôýðùóç ðñïóáñôÞóåùí;"
+msgstr "Εκτύπωση προσαρτήσεων;"
 
 #
 #: commands.c:383
 msgid "Print message?"
-msgstr "Åêôýðùóç ìçíýìáôïò;"
+msgstr "Εκτύπωση μηνύματος;"
 
 #
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Åêôýðùóç óçìåéùìÝíïõ/ùí ðñïóÜñôçóçò/óåùí;"
+msgstr "Εκτύπωση σημειωμένου/ων προσάρτησης/σεων;"
 
 #
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Åêôýðùóç ôùí óçìåéùìÝíùí ìçíõìÜôùí;"
+msgstr "Εκτύπωση των σημειωμένων μηνυμάτων;"
 
 #
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Êáèáñéóìüò %d äéåãñáììÝíïõ ìçíýìáôïò;"
+msgstr "Καθαρισμός %d διεγραμμένου μηνύματος;"
 
 #
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Êáèáñéóìüò %d äéåãñáììÝíùí ìçíõìÜôùí;"
+msgstr "Καθαρισμός %d διεγραμμένων μηνυμάτων;"
 
 #
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Åñþôçóç"
+msgstr "Ερώτηση"
 
 #
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "Åñþôçóç '%s'"
+msgstr "Ερώτηση '%s'"
 
 #
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Ç åíôïëÞ åñùôÞóåùò äåí êáèïñßóôçêå."
+msgstr "Η εντολή ερωτήσεως δεν καθορίστηκε."
 
 #
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Åñþôçóç: "
+msgstr "Ερώτηση: "
 
 #
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "¸îïäïò"
-
-#
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "¸îïäïò áðü ôï Mutt;"
+msgstr "Έξοδος από το Mutt;"
 
 #
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "ËÞøç namespaces..."
+msgstr "Λήψη namespaces..."
 
 #
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "ÁíÜãíùóç %s..."
+msgstr "Ανάγνωση %s..."
 
 #
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "ÁíÜãíùóç %s... %d"
+msgstr "Ανάγνωση %s... %d"
 
 #
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "ÁíÜãíùóç %s... %d (%d%%)"
+msgstr "Ανάγνωση %s... %d (%d%%)"
 
 #
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "ÁíÜãíùóç íÝùí ìçíõìÜôùí (%d bytes)..."
+msgstr "Ανάγνωση νέων μηνυμάτων (%d bytes)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "ÄéáãñáöÞ ôïõ ãñáììáôïêéâùôßïõ \"%s\";"
+msgstr "Διαγραφή του γραμματοκιβωτίου \"%s\";"
 
 #
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "ÁíÜêëçóç áíáâëçèÝíôïò ìçíýìáôïò;"
+msgstr "Ανάκληση αναβληθέντος μηνύματος;"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Ç åðáíáêùäéêïðïßçóç åðçñåÜæåé ìüíï ôçò ðñïóáñôÞóåéò êåéìÝíïõ."
+msgstr "Η επανακωδικοποίηση επηρεάζει μόνο της προσαρτήσεις κειμένου."
 
 #
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
-msgstr "SSL áðÝôõ÷å: %s"
+msgstr "SSL απέτυχε: %s"
 
 #
 # recvattach.c:1065
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Ç äçìéïõñãßá õðïóôçñßæåôáé ìüíï ãéá ôá ãñáììáôïêéâþôéá IMAP"
+msgstr "Η δημιουργία υποστηρίζεται μόνο για τα γραμματοκιβώτια IMAP"
 
 #
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Äçìéïõñãßá ãñáììáôïêéâùôßïõ: "
+msgstr "Δημιουργία γραμματοκιβωτίου: "
 
 #
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "Ìåôïíïìáóßá óå: "
+msgstr "Μετονομασία σε: "
 
 #
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Åðáíáðñüóâáóç óôï ãñáììáôïêéâþôéï..."
-
-#
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "ÁðÜíô"
+msgstr "Επαναπρόσβαση στο γραμματοκιβώτιο..."
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
 #
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "ÁðÜíôçóç óôï %s%s;"
+msgstr "Απάντηση στο %s%s;"
 
 #
 #: commands.c:403
@@ -2898,233 +2707,203 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Áíô-Ôáî (d)çìí/(f)áðü/(r)ëÞø/(s)èÝì/(o)ðñïò/(t)íÞì/(u)Üíåõ/(z)ìåã/(c)âáèì/s"
+"Αντ-Ταξ (d)ημν/(f)από/(r)λήψ/(s)θέμ/(o)προς/(t)νήμ/(u)άνευ/(z)μεγ/(c)βαθμ/s"
 "(p)am;: "
 
 #
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "ÁíÜóôñïöç áíáæÞôçóç ãéá: "
+msgstr "Ανάστροφη αναζήτηση για: "
 
 #
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "ÁíÜóôñïöç áíáæÞôçóç: "
+msgstr "Ανάστροφη αναζήτηση: "
 
 #
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
-"ÁíÜóôñïöç ôáîéíüìçóç êáôÜ (d)çìåñïìçíßá, (a)áëöáâçôéêÜ, (z)ìÝãåèïò Þ (n)"
-"Üêõñï;"
+"Ανάστροφη ταξινόμηση κατά (d)ημερομηνία, (a)αλφαβητικά, (z)μέγεθος ή (n)"
+"άκυρο;"
 
 #
 # compose.c:132
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "PGP (e)êëåßä, (s)õðïãñ, õðïãñ.ó(a)í, (b)êë+õð, %s, Þ (c)ôßðïôá; "
+msgstr "PGP (e)κλείδ, (s)υπογρ, υπογρ.σ(a)ν, (b)κλ+υπ, %s, ή (c)τίποτα; "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "Ôï S/MIME åß÷å Þäç åðéëåãåß. Êáèáñéóìüò Þ óõíÝ÷åéá ; "
+msgstr "Το S/MIME είχε ήδη επιλεγεί. Καθαρισμός ή συνέχεια ; "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "Ï éäéïêôÞôçò ôïõ ðéóôïðïéçôéêïý S/MIME äåí ôáéñéÜæåé ìå ôïí áðïóôïëÝá."
+msgstr "Ο ιδιοκτήτης του πιστοποιητικού S/MIME δεν ταιριάζει με τον αποστολέα."
 
 #
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
-msgstr "¼ìïéá ðéóôïðïéçôéêÜ S/MIME \"%s\"."
+msgstr "Όμοια πιστοποιητικά S/MIME \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "Äåí õðïóôçñßæïíôáé ìçíýìáôá S/MIME ÷ùñßò ðëçñïöïñßåò óôçí åðéêåöáëßäá."
+msgstr "Δεν υποστηρίζονται μηνύματα S/MIME χωρίς πληροφορίες στην επικεφαλίδα."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "Ç õðïãñáöÞ S/MIME ÄÅÍ åðáëçèåýôçêå."
+msgstr "Η υπογραφή S/MIME ΔΕΝ επαληθεύτηκε."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "Ç õðïãñáöÞ S/MIME åðáëçèåýôçêå åðéôõ÷þò."
+msgstr "Η υπογραφή S/MIME επαληθεύτηκε επιτυχώς."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "Áõèåíôéêïðïßçóç SASL áðÝôõ÷å."
+msgstr "Αυθεντικοποίηση SASL απέτυχε."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "Áðïôýðùìá: %s"
+msgstr "Αποτύπωμα: %s"
 
 #
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "Óýíäåóç SSL ÷ñçóéìïðïéþíôáò ôï %s (%s)"
+msgstr "Σύνδεση SSL χρησιμοποιώντας το %s (%s)"
 
 #
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "ÁðïèÞê"
-
-#
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "ÁðïèÞêåõóç áíôéãñÜöïõ ôïõ ìçíýìáôïò;"
+msgstr "Αποθήκευση αντιγράφου του μηνύματος;"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
 #
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "ÁðïèÞêåõóç óôï áñ÷åßï: "
+msgstr "Αποθήκευση στο αρχείο: "
 
 #
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "ÁðïèÞêåõóç%s óôï ãñáììáôïêéâþôéï"
+msgstr "Αποθήκευση%s στο γραμματοκιβώτιο"
 
 #
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "ÁðïèÞêåõóç óçìáéþí êáôÜóôáóçò ìçíýìáôïò... [%d/%d]"
+msgstr "Αποθήκευση σημαιών κατάστασης μηνύματος... [%d/%d]"
 
 #
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "ÁðïèÞêåõóç..."
-
-#
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "ÁíáæÞôçóç"
+msgstr "Αποθήκευση..."
 
 #
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "ÁíáæÞôçóç ãéá: "
+msgstr "Αναζήτηση για: "
 
 #
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Ç áíáæÞôçóç Ýöèáóå óôï ôÝëïò ÷ùñßò íá âñåé üìïéï"
+msgstr "Η αναζήτηση έφθασε στο τέλος χωρίς να βρει όμοιο"
 
 #
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Ç áíáæÞôçóç Ýöèáóå óôçí áñ÷Þ ÷ùñßò íá âñåé üìïéï"
+msgstr "Η αναζήτηση έφθασε στην αρχή χωρίς να βρει όμοιο"
 
 #
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Ç áíáæÞôçóç äéáêüðçêå."
+msgstr "Η αναζήτηση διακόπηκε."
 
 #
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Äåí Ý÷åé åöáñìïóôåß áíáæÞôçóç ãéá áõôü ôï ìåíïý."
+msgstr "Δεν έχει εφαρμοστεί αναζήτηση για αυτό το μενού."
 
 #
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå óôç âÜóç."
+msgstr "Αναζήτηση συνεχίστηκε στη βάση."
 
 #
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "ÁíáæÞôçóç óõíå÷ßóôçêå áðü ôçí êïñõöÞ."
+msgstr "Αναζήτηση συνεχίστηκε από την κορυφή."
 
 #
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "ÁíáæÞôçóç:"
-
-#
-#: alias.cpkg:151
-msgid "Select"
-msgstr "ÅðéëÝîôå"
-
-#
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "ÄéáëÝîôå "
+msgstr "Αναζήτηση:"
 
 #
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "ÅðéëïãÞ ìéáò áëõóßäáò åðáíáðïóôïëÝùí."
-
-#
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "ÅðéëïãÞ %s..."
-
-#
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "ÁðïóôïëÞ"
+msgstr "Επιλογή %s..."
 
 #
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "ÁðïóôïëÞ óôï ðáñáóêÞíéï."
+msgstr "Αποστολή στο παρασκήνιο."
 
 #
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "ÁðïóôïëÞ ìçíýìáôïò..."
+msgstr "Αποστολή μηνύματος..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
 #
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Ç óýíäåóç ìå ôïí åîõðçñåôçôÞ Ýêëåéóå!"
+msgstr "Η σύνδεση με τον εξυπηρετητή έκλεισε!"
 
 #
 #: flags.c:335
 msgid "Set flag"
-msgstr "Ïñßóôå óçìáßá"
+msgstr "Ορίστε σημαία"
 
 #
 #: commands.c:463
 msgid "Shell command: "
-msgstr "ÅíôïëÞ öëïéïý: "
+msgstr "Εντολή φλοιού: "
 
 #
 # compose.c:107
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "ÕðïãñáöÞ"
+msgstr "Υπογραφή"
 
 #
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "ÕðïãñáöÞ ùò: "
+msgstr "Υπογραφή ως: "
 
 #
 # compose.c:103
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "ÕðïãñáöÞ, êñõðôïãñÜöçóç"
+msgstr "Υπογραφή, κρυπτογράφηση"
 
 #
 #: commands.c:406
@@ -3132,42 +2911,38 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Ôáî (d)çìí/(f)áðü/(r)ëÞø/(s)èÝì/(o)ðñïò/(t)íÞì/(u)Üíåõ/(z)ìåã/(c)âáèì/s(p)"
+"Ταξ (d)ημν/(f)από/(r)λήψ/(s)θέμ/(o)προς/(t)νήμ/(u)άνευ/(z)μεγ/(c)βαθμ/s(p)"
 "am;: "
 
 #
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Ôáîéíüìçóç êáôÜ (d)çìåñïìçíßá, (a)áëöáâçôéêÜ, (z)ìÝãåèïò Þ (n)Üêõñï;"
+msgstr "Ταξινόμηση κατά (d)ημερομηνία, (a)αλφαβητικά, (z)μέγεθος ή (n)άκυρο;"
 
 #
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Ôáêôïðïßçóç ãñáììáôïêéâùôßïõ..."
+msgstr "Τακτοποίηση γραμματοκιβωτίου..."
 
 #
 # pgpkey.c:236
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "ID êëåéäéïý: 0x%s"
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
+msgstr "ID κλειδιού: 0x%s"
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
 #
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "ÅããåãñáììÝíá [%s], ÌÜóêá áñ÷åßïõ: %s"
+msgstr "Εγγεγραμμένα [%s], Μάσκα αρχείου: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -3175,149 +2950,149 @@ msgstr ""
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "ÅããñáöÞ óôï %s..."
+msgstr "Εγγραφή στο %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "¸ëåã÷ïò Ðéóôïðïéçôéêïý SSL"
+msgstr "Έλεγχος Πιστοποιητικού SSL"
 
 #
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Óçìåéþóôå ìçíýìáôá ðïõ ôáéñéÜæïõí óå: "
+msgstr "Σημειώστε μηνύματα που ταιριάζουν σε: "
 
 #
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Óçìåéþóôå ôá ìçíýìáôá ðïõ èÝëåôå íá ðñïóáñôÞóåôå!"
+msgstr "Σημειώστε τα μηνύματα που θέλετε να προσαρτήσετε!"
 
 #
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Óçìåéþóåéò äåí õðïóôçñßæïíôáé."
+msgstr "Σημειώσεις δεν υποστηρίζονται."
 
 #
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Áõôü ôï ìÞíõìá äåí åßíáé ïñáôü."
+msgstr "Αυτό το μήνυμα δεν είναι ορατό."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "Ôï SSL äåí åßíáé äéáèÝóéìï."
+msgstr "Το SSL δεν είναι διαθέσιμο."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "Ç ôñÝ÷ïõóá ðñïóÜñôçóç èá ìåôáôñáðåß."
+msgstr "Η τρέχουσα προσάρτηση θα μετατραπεί."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "Ç ôñÝ÷ïõóá ðñïóÜñôçóç äåí èá ìåôáôñáðåß."
+msgstr "Η τρέχουσα προσάρτηση δεν θα μετατραπεί."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "Ï äåßêôçò ôïõ ìçíýìáôïò åßíáé Üêõñïò. Îáíáíïßîôå ôï ãñáììáôïêéâþôéï."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "Ç áëõóßäá åðáíáðïóôïëÝùí åßíáé Þäç Üäåéá."
+msgstr "Ο δείκτης του μηνύματος είναι άκυρος. Ξανανοίξτε το γραμματοκιβώτιο."
 
 #
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "Äåí õðÜñ÷ïõí ðñïóáñôÞóåéò."
+msgstr "Δεν υπάρχουν προσαρτήσεις."
 
 #
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá."
+msgstr "Δεν υπάρχουν μηνύματα."
 
 #
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "Äåí õðÜñ÷ïõí åðéìÝñïõò ôìÞìáôá ãéá íá åìöáíéóôïýí."
+msgstr "Δεν υπάρχουν επιμέρους τμήματα για να εμφανιστούν."
 
 #
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr ""
-"Áõôüò ï åîõðçñåôçôÞò IMAP åßíáé áñ÷áßïò. Ôï Mutt äåí åßíáé óõìâáôü ìå áõôüí."
+"Αυτός ο εξυπηρετητής IMAP είναι αρχαίος. Το Mutt δεν είναι συμβατό με αυτόν."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Áõôü ôï ðéóôïðïéçôéêü áíÞêåé óôï:"
+msgstr "Αυτό το πιστοποιητικό ανήκει στο:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Áõôü ôï ðéóôïðïéçôéêü åßíáé Ýãêõñï"
+msgstr "Αυτό το πιστοποιητικό είναι έγκυρο"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Áõôü ôï ðéóôïðïéçôéêü åêäüèçêå áðü ôï:"
+msgstr "Αυτό το πιστοποιητικό εκδόθηκε από το:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr ""
-"Áõôü ôï êëåéäß äåí ìðïñåß íá ÷ñçóéìïðïéçèåß ëçãìÝíï/á÷ñçóôåõìÝíï/Üêõñï."
+"Αυτό το κλειδί δεν μπορεί να χρησιμοποιηθεί ληγμένο/αχρηστευμένο/άκυρο."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
 #
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Ç óõæÞôçóç ðåñéÝ÷åé ìç áíáãíùóìÝíá ìçíýìáôá."
+msgstr "Η συζήτηση περιέχει μη αναγνωσμένα μηνύματα."
 
 #
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Ç ÷ñÞóç óõæçôÞóåùí äåí Ý÷åé åíåñãïðïéçèåß."
+msgstr "Η χρήση συζητήσεων δεν έχει ενεργοποιηθεί."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Ôï üñéï ÷ñüíïõ îåðåñÜóôçêå êáôÜ ôçí ðñïóðÜèåéá êëåéäþìáôïò ìå fcntl!"
+msgstr "Το όριο χρόνου ξεπεράστηκε κατά την προσπάθεια κλειδώματος με fcntl!"
 
 #
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Ôï üñéï ÷ñüíïõ îåðåñÜóôçêå êáôÜ ôçí ðñïóðÜèåéá êëåéäþìáôïò flock!"
+msgstr "Το όριο χρόνου ξεπεράστηκε κατά την προσπάθεια κλειδώματος flock!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
 #
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Åìöáíßæåôáé ç áñ÷Þ ôïõ ìçíýìáôïò."
+msgstr "Εμφανίζεται η αρχή του μηνύματος."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "ÐñïóðÜèåéá åîáãùãÞò êëåéäéþí PGP...\n"
+msgstr "Προσπάθεια εξαγωγής κλειδιών PGP...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "ÐñïóðÜèåéá åîáãùãÞò ðéóôïðïéçôéêþí S/MIME...\n"
+msgstr "Προσπάθεια εξαγωγής πιστοποιητικών S/MIME...\n"
 
 #
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "ÓöÜëìá óôç óõíïìéëßá ìå ôï %s (%s)"
+msgstr "Σφάλμα στη συνομιλία με το %s (%s)"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -3327,170 +3102,150 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "Áõèåíôéêïðïßçóç SASL áðÝôõ÷å."
+msgstr "Αυθεντικοποίηση SASL απέτυχε."
 
 #
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "Áäõíáìßá ðñïóÜñôçóçò ôïõ %s!"
+msgstr "Αδυναμία προσάρτησης του %s!"
 
 #
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "Áäõíáìßá ðñïóÜñôçóçò!"
+msgstr "Αδυναμία προσάρτησης!"
 
 #
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Áäõíáìßá ëÞøçò åðéêåöáëßäùí áðü áõôÞ ôçí Ýêäïóç ôïõ åîõðçñåôçôÞ IMAP."
+msgstr "Αδυναμία λήψης επικεφαλίδων από αυτή την έκδοση του εξυπηρετητή IMAP."
 
 #
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "Áäõíáìßá óôç ëÞøç ðéóôïðïéçôéêïý áðü ôï ôáßñé"
+msgstr "Αδυναμία στη λήψη πιστοποιητικού από το ταίρι"
 
 #
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Áäõíáìßá Üöåóçò ôùí ìçíõìÜôùí óôïí åîõðçñåôçôÞ."
+msgstr "Αδυναμία άφεσης των μηνυμάτων στον εξυπηρετητή."
 
 #
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "Áäõíáìßá ðñïóÜñôçóçò ôïõ %s!"
+msgstr "Αδυναμία προσάρτησης του %s!"
 
 #
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Áäõíáìßá êëåéäþìáôïò ôïõ ãñáììáôïêéâùôßïõ!"
+msgstr "Αδυναμία κλειδώματος του γραμματοκιβωτίου!"
 
 #
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Áäõíáìßá áíïßãìáôïò ðñïóùñéíïý áñ÷åßïõ!"
+msgstr "Αδυναμία ανοίγματος προσωρινού αρχείου!"
 
 #
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Áäõíáìßá áíïßãìáôïò ðñïóùñéíïý áñ÷åßïõ!"
+msgstr "Αδυναμία ανοίγματος προσωρινού αρχείου!"
 
 #
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Áäõíáìßá áíïßãìáôïò ðñïóùñéíïý áñ÷åßïõ!"
-
-#
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "ÅðáíáöïñÜ"
+msgstr "Αδυναμία ανοίγματος προσωρινού αρχείου!"
 
 #
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "ÅðáíáöïñÜ ôá ìçíýìáôá ðïõ ôáéñéÜæïõí óå: "
+msgstr "Επαναφορά τα μηνύματα που ταιριάζουν σε: "
 
 #
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "ÅðáíáöïñÜ"
+msgstr "Επαναφορά"
 
 #
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "¶ãíùóôï Content-Type %s"
-
-#
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "ÄéáãñáöÞ óôï %s..."
+msgstr "Άγνωστο Content-Type %s"
 
 #
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "ÄéáãñáöÞ óôï %s..."
+msgstr "Διαγραφή στο %s..."
 
 #
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "ÄéáãñáöÞ óôï %s..."
+msgstr "Διαγραφή στο %s..."
 
 #
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Áöáßñåóç ôçò óçìåßùóçò óôá ìçíýìáôá ðïõ ôáéñéÜæïõí óå: "
+msgstr "Αφαίρεση της σημείωσης στα μηνύματα που ταιριάζουν σε: "
 
 #
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "ÁíÝâáóìá ìçíýìáôïò ..."
+msgstr "Ανέβασμα μηνύματος ..."
 
 #
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "×ñçóéìïðïéÞóôå ôï 'toggle-write' ãéá íá åíåñãïðïéÞóåôå ôçí åããñáöÞ!"
+msgstr "Χρησιμοποιήστε το 'toggle-write' για να ενεργοποιήσετε την εγγραφή!"
 
 #
 # pgp.c:1194
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Íá ÷ñçóéìïðïéçèåß keyID = \"%s\" ãéá ôï %s;"
+msgstr "Να χρησιμοποιηθεί keyID = \"%s\" για το %s;"
 
 #
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "¼íïìá ÷ñÞóôç óôï %s: "
+msgstr "Όνομα χρήστη στο %s: "
 
 #
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Ìç Ýãêõñïò ìÞíáò: %s"
+msgstr "Μη έγκυρος μήνας: %s"
 
 #
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Ìç Ýãêõñïò ìÞíáò: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Μη έγκυρος μήνας: %s"
 
 #
 # commands.c:92
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Åðéâåâáßùóç ôçò PGP øçöéáêÞò õðïãñáöÞò;"
+msgstr "Επιβεβαίωση της PGP ψηφιακής υπογραφής;"
 
 #
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Åðéâåâáßùóç ôùí åõñåôçñßùí ìçíõìÜôùí..."
-
-#
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "¼øçÐñïóÜñô"
+msgstr "Επιβεβαίωση των ευρετηρίων μηνυμάτων..."
 
 #
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ! Ðñüêåéôáé íá ãñÜøåéò ðÜíù áðü ôï %s, óõíÝ÷åéá;"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ! Πρόκειται να γράψεις πάνω από το %s, συνέχεια;"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -3498,29 +3253,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "Ôï ðéóôïðïéçôéêü ôïõ äéáêïìéóôÞ Ýëçîå"
+msgstr "Το πιστοποιητικό του διακομιστή έληξε"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "Ôï ðéóôïðïéçôéêü ôïõ äéáêïìéóôÞ Ýëçîå"
+msgstr "Το πιστοποιητικό του διακομιστή έληξε"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "Ç ðéóôïðïßçóç ôïõ äéáêïìéóôÞ äåí åßíáé áêüìá Ýãêõñç"
+msgstr "Η πιστοποίηση του διακομιστή δεν είναι ακόμα έγκυρη"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "Ç ðéóôïðïßçóç ôïõ äéáêïìéóôÞ äåí åßíáé áêüìá Ýãêõñç"
+msgstr "Η πιστοποίηση του διακομιστή δεν είναι ακόμα έγκυρη"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3536,47 +3291,47 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "ÁíáìïíÞ ãéá ôï êëåßäùìá fcntl... %d"
+msgstr "Αναμονή για το κλείδωμα fcntl... %d"
 
 #
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "ÁíáìïíÞ ãéá ðñïóðÜèåéá flock... %d"
+msgstr "Αναμονή για προσπάθεια flock... %d"
 
 #
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "ÁíáìïíÞ áðÜíôçóçò..."
+msgstr "Αναμονή απάντησης..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "Ðñïåéäïðïßçóç: '%s' åßíáé ëáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN."
+msgstr "Προειδοποίηση: '%s' είναι λανθασμένη διεθνής διεύθυνση IDN."
 
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Ôï ðéóôïðïéçôéêü ôïõ äéáêïìéóôÞ Ýëçîå"
+msgstr "Το πιστοποιητικό του διακομιστή έληξε"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
-"Ðñïåéäïðïßçóç: ËáíèáóìÝíç äéåèíÞò äéåýèõíóç IDN '%s' óôï øåõäþíõìï '%s'.\n"
+"Προειδοποίηση: Λανθασμένη διεθνής διεύθυνση IDN '%s' στο ψευδώνυμο '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "Ðñïåéäïðïßçóç: Áäõíáìßá áðïèÞêåõóçò ðéóôïðïéçôéêïý"
+msgstr "Προειδοποίηση: Αδυναμία αποθήκευσης πιστοποιητικού"
 
 #: crypt.cpkg:902
 #, fuzzy
 msgid "Warning: One of the keys has been revoked\n"
-msgstr "Ðñïåéäïðïßçóç: ÔìÞìá áõôïý ôïõ ìçíýìáôïò äåí åßíáé õðïãåãñáììÝíï."
+msgstr "Προειδοποίηση: Τμήμα αυτού του μηνύματος δεν είναι υπογεγραμμένο."
 
 #: commands.c:141 commands.c:151
 msgid "Warning: Part of this message has not been signed."
-msgstr "Ðñïåéäïðïßçóç: ÔìÞìá áõôïý ôïõ ìçíýìáôïò äåí åßíáé õðïãåãñáììÝíï."
+msgstr "Προειδοποίηση: Τμήμα αυτού του μηνύματος δεν είναι υπογεγραμμένο."
 
 #: crypt.cpkg:910
 msgid "Warning: The key used to create the signature expired at: "
@@ -3586,204 +3341,183 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
 #
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Áðïôõ÷ßá êáôÜ ôçí äçìéïõñãßá ðñïóÜñôçóçò"
+msgstr "Αποτυχία κατά την δημιουργία προσάρτησης"
 
 #
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Ç åããñáöÞ áðÝôõ÷å! ÌÝñïò ôïõ ãñáììáôïêéâùôßïõ áðïèçêåýôçêå óôï %s"
+msgstr "Η εγγραφή απέτυχε! Μέρος του γραμματοκιβωτίου αποθηκεύτηκε στο %s"
 
 #
 #: attach.c:731
 msgid "Write fault!"
-msgstr "ÓöÜëìá åããñáöÞò!"
+msgstr "Σφάλμα εγγραφής!"
 
 #
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "ÅããñáöÞ ôïõò ìçíýìáôïò óôï ãñáììáôïêéâþôéï"
+msgstr "Εγγραφή τους μηνύματος στο γραμματοκιβώτιο"
 
 #
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "ÅããñáöÞ %s..."
+msgstr "Εγγραφή %s..."
 
 #
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "ÅããñáöÞ ìçíýìáôïò óôï %s ..."
+msgstr "Εγγραφή μηνύματος στο %s ..."
 
 #
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "ÅããñáöÞ ìçíõìÜôùí... %d (%d%%)"
+msgstr "Εγγραφή μηνυμάτων... %d (%d%%)"
 
 #
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "ËÜèïò óôç ãñáììÞ åíôïëþí: %s\n"
+msgstr "Λάθος στη γραμμή εντολών: %s\n"
 
 #
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "¸÷åôå Þäç Ýíá øåõäþíõìï ìå áõôü ôï üíïìá!"
+msgstr "Έχετε ήδη ένα ψευδώνυμο με αυτό το όνομα!"
 
 #
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "¸÷åôå Þäç åðéëÝîåé ôï ðñþôï óôïé÷åßï ôçò áëõóßäáò."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "¸÷åôå Þäç åðéëÝîåé ôï ôåëåõôáßï óôïé÷åßï ôçò áëõóßäáò."
-
-#
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Åßóôå óôçí ðñþôç êáôá÷þñçóç."
-
-#
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Åßóôå óôçí ðñþôç óåëßäá."
+msgstr "Είστε στην πρώτη καταχώρηση."
 
 #
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Åßóôå óôï ðñþôï ìÞíõìá."
+msgstr "Είστε στο πρώτο μήνυμα."
 
 #
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Åßóôå óôçí ðñþôç óåëßäá."
+msgstr "Είστε στην πρώτη σελίδα."
 
 #
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Åßóôå óôçí ðñþôç óõæÞôçóç."
+msgstr "Είστε στην πρώτη συζήτηση."
 
 #
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Åßóôå óôçí ôåëåõôáßá êáôá÷þñçóç."
-
-#
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Åßóôå óôçí ôåëåõôáßá óåëßäá."
+msgstr "Είστε στην τελευταία καταχώρηση."
 
 #
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Åßóôå óôï ôåëåõôáßï ìÞíõìá."
+msgstr "Είστε στο τελευταίο μήνυμα."
 
 #
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Åßóôå óôçí ôåëåõôáßá óåëßäá."
+msgstr "Είστε στην τελευταία σελίδα."
 
 #
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Äåí ìðïñåßôå íá ìåôáêéíçèåßôå ðáñáêÜôù."
+msgstr "Δεν μπορείτε να μετακινηθείτε παρακάτω."
 
 #
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Äåí ìðïñåßôå íá ìåôáêéíçèåßôå ðáñáðÜíù."
+msgstr "Δεν μπορείτε να μετακινηθείτε παραπάνω."
 
 #
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Äåí Ý÷åôå êáíÝíá øåõäþíõìï!"
+msgstr "Δεν έχετε κανένα ψευδώνυμο!"
 
 #
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôç ìïíáäéêÞ ðñïóÜñôçóç."
+msgstr "Δεν μπορείτε να διαγράψετε τη μοναδική προσάρτηση."
 
 #
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Ìðïñåßôå íá äéáâéâÜóåôå ìüíï ìÞíõìá/ìÝñç rfc822"
+msgstr "Μπορείτε να διαβιβάσετε μόνο μήνυμα/μέρη rfc822"
 
 #
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] ÄÝ÷åóôå;"
+msgstr "[%s = %s] Δέχεστε;"
 
 #
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- Ôï %s/%s äåí õðïóôçñßæåôáé "
+msgstr "[-- Το %s/%s δεν υποστηρίζεται "
 
 #
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- ÐñïóÜñôçóç #%d"
+msgstr "[-- Προσάρτηση #%d"
 
 #
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Autoview êáíïíéêÞ Ýîïäïò ôïõ %s --]\n"
+msgstr "[-- Autoview κανονική έξοδος του %s --]\n"
 
 #
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Autoview ÷ñçóéìïðïéþíôáò ôï %s --]\n"
+msgstr "[-- Autoview χρησιμοποιώντας το %s --]\n"
 
 #
 # pgp.c:353
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ÅÍÁÑÎÇ ÌÇÍÕÌÁÔÏÓ PGP --]\n"
+"[-- ΕΝΑΡΞΗ ΜΗΝΥΜΑΤΟΣ PGP --]\n"
 "\n"
 
 #
 # pgp.c:355
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ÅÍÁÑÎÇ ÏÌÁÄÁÓ ÄÇÌÏÓÉÙÍ ÊËÅÉÄÉÙÍ PGP --]\n"
+msgstr "[-- ΕΝΑΡΞΗ ΟΜΑΔΑΣ ΔΗΜΟΣΙΩΝ ΚΛΕΙΔΙΩΝ PGP --]\n"
 
 #
 # pgp.c:357
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ÅÍÁÑÎÇ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]\n"
+"[-- ΕΝΑΡΞΗ ΥΠΟΓΕΓΡΑΜΜΕΝΟΥ PGP ΜΗΝΥΜΑΤΟΣ --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3791,221 +3525,221 @@ msgstr ""
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- Áäõíáìßá åêôÝëåóçò óôéò %s --]\n"
+msgstr "[-- Αδυναμία εκτέλεσης στις %s --]\n"
 
 #
 # pgp.c:459
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- ÔÅËÏÓ ÌÇÍÕÌÁÔÏÓ PGP --]\n"
+msgstr "[-- ΤΕΛΟΣ ΜΗΝΥΜΑΤΟΣ PGP --]\n"
 
 #
 # pgp.c:461
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ÔÅËÏÓ ÏÌÁÄÁÓ ÄÇÌÏÓÉÙÍ ÊËÅÉÄÉÙÍ PGP --]\n"
+msgstr "[-- ΤΕΛΟΣ ΟΜΑΔΑΣ ΔΗΜΟΣΙΩΝ ΚΛΕΙΔΙΩΝ PGP --]\n"
 
 #
 # pgp.c:463
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- ÔÅËÏÓ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]\n"
+msgstr "[-- ΤΕΛΟΣ ΥΠΟΓΕΓΡΑΜΜΕΝΟΥ PGP ΜΗΝΥΜΑΤΟΣ --]\n"
 
 #
 # pgp.c:988
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]\n"
+msgstr "[-- Τέλος δεδομένων κρυπτογραφημένων μέσω PGP/MIME --]\n"
 
 #
 # pgp.c:988
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]\n"
+msgstr "[-- Τέλος δεδομένων κρυπτογραφημένων μέσω PGP/MIME --]\n"
 
 #
 # pgp.c:988
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù S/MIME --]\n"
+"[-- Τέλος δεδομένων κρυπτογραφημένων μέσω S/MIME --]\n"
 
 #
 # pgp.c:682
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- ÔÝëïò äåäïìÝíùí õðïãåãñáììÝíùí ìå S/MIME --]\n"
+"[-- Τέλος δεδομένων υπογεγραμμένων με S/MIME --]\n"
 
 #
 # pgp.c:682
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- ÔÝëïò õðïãåãñáììÝíùí äåäïìÝíùí --]\n"
+"[-- Τέλος υπογεγραμμένων δεδομένων --]\n"
 
 #
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- ÓöÜëìá: Áäõíáìßá áðåéêüíéóçò óå üëá ôá ìÝñç ôïõ Multipart/Alternative! "
+"[-- Σφάλμα: Αδυναμία απεικόνισης σε όλα τα μέρη του Multipart/Alternative! "
 "--]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- ÓöÜëìá: ÁóõíåðÞò ðïëõìåñÞò/õðïãåãñáììÝíç äïìÞ! --]\n"
+"[-- Σφάλμα: Ασυνεπής πολυμερής/υπογεγραμμένη δομή! --]\n"
 "\n"
 
 #
 # handler.c:1378
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- ÓöÜëìá: ¶ãíùóôï ðïëõìåñÝò/õðïãåãñáììÝíï ðñùôüêïëëï %s! --]\n"
+"[-- Σφάλμα: Άγνωστο πολυμερές/υπογεγραμμένο πρωτόκολλο %s! --]\n"
 "\n"
 
 #
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ÓöÜëìá: áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ! --]\n"
+msgstr "[-- Σφάλμα: αδυναμία δημιουργίας προσωρινού αρχείου! --]\n"
 
 #
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- ÓöÜëìá: äå ìðüñåóå íá âñåèåß ç áñ÷Þ ôïõ ìçíýìáôïò PGP! --]\n"
+"[-- Σφάλμα: δε μπόρεσε να βρεθεί η αρχή του μηνύματος PGP! --]\n"
 "\n"
 
 #
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- ÓöÜëìá: áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý áñ÷åßïõ! --]\n"
+msgstr "[-- Σφάλμα: αδυναμία δημιουργίας προσωρινού αρχείου! --]\n"
 
 #
 # pgp.c:958
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- ÓöÜëìá: êáêïöôéáãìÝíï ìÞíõìá PGP/MIME! --]\n"
+"[-- Σφάλμα: κακοφτιαγμένο μήνυμα PGP/MIME! --]\n"
 "\n"
 
 #
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- ÓöÜëìá: ôï ìÞíõìá/åîùôåñéêü-óþìá äåí Ý÷åé ðáñÜìåôñï access-type --]\n"
+"[-- Σφάλμα: το μήνυμα/εξωτερικό-σώμα δεν έχει παράμετρο access-type --]\n"
 
 #
 # pgp.c:980
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Ôá åðüìåíá äåäïìÝíá åßíáé êñõðôïãñáöçìÝíá ìÝóù PGP/MIME --]\n"
+"[-- Τα επόμενα δεδομένα είναι κρυπτογραφημένα μέσω PGP/MIME --]\n"
 "\n"
 
 #
 # pgp.c:980
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Ôá åðüìåíá äåäïìÝíá åßíáé êñõðôïãñáöçìÝíá ìÝóù PGP/MIME --]\n"
+"[-- Τα επόμενα δεδομένα είναι κρυπτογραφημένα μέσω PGP/MIME --]\n"
 "\n"
 
 #
 # pgp.c:980
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
-msgstr "[-- Ôá åðüìåíá äåäïìÝíá åßíáé êñõðôïãñáöçìÝíá ìÝóù S/MIME --]\n"
+msgstr "[-- Τα επόμενα δεδομένα είναι κρυπτογραφημένα μέσω S/MIME --]\n"
 
 #
 # pgp.c:676
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
-msgstr "[-- Ôá åðüìåíá äåäïìÝíá åßíáé õðïãåãñáììÝíá ìå S/MIME --]\n"
+msgstr "[-- Τα επόμενα δεδομένα είναι υπογεγραμμένα με S/MIME --]\n"
 
 #
 # pgp.c:676
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Ôá åðüìåíá äåäïìÝíá åßíáé õðïãåãñáììÝíá --]\n"
+"[-- Τα επόμενα δεδομένα είναι υπογεγραμμένα --]\n"
 "\n"
 
 #
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- ÁõôÞ ç %s/%s ðñïóÜñôçóç "
+msgstr "[-- Αυτή η %s/%s προσάρτηση "
 
 #
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- ÁõôÞ ç %s/%s ðñïóÜñôçóç äåí ðåñéëáìâÜíåôå, --]\n"
+msgstr "[-- Αυτή η %s/%s προσάρτηση δεν περιλαμβάνετε, --]\n"
 
 #
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Ôýðïò: %s/%s, Êùäéêïðïßçóç: %s, ÌÝãåèïò: %s --]\n"
+msgstr "[-- Τύπος: %s/%s, Κωδικοποίηση: %s, Μέγεθος: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Ðñïåéäïðïßçóç: Áäõíáìßá åýñåóçò õðïãñáöþí. --]\n"
+"[-- Προειδοποίηση: Αδυναμία εύρεσης υπογραφών. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Ðñïåéäïðïßçóç: áäõíáìßá åðéâåâáßùóçò %s%s õðïãñáöþí --]\n"
+"[-- Προειδοποίηση: αδυναμία επιβεβαίωσης %s%s υπογραφών --]\n"
 "\n"
 
 #
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- êáé ôï åíäåäåéãìÝíï access-type %s äåí õðïóôçñßæåôáé --]\n"
+msgstr "[-- και το ενδεδειγμένο access-type %s δεν υποστηρίζεται --]\n"
 
 #
 #: handler.c:1214
@@ -4013,137 +3747,325 @@ msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- êáé ç åíäåäåéãìÝíç åîùôåñéêÞ ðçãÞ Ý÷åé --]\n"
-"[-- ëÞîåé. --]\n"
+"[-- και η ενδεδειγμένη εξωτερική πηγή έχει --]\n"
+"[-- λήξει. --]\n"
 
 #
 #: handler.c:1201
 #, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- üíïìá: %s --]\n"
+msgstr "[-- όνομα: %s --]\n"
 
 #
 #: handler.c:1197
 #, c-format
 msgid "[-- on %s --]\n"
-msgstr "[-- óôéò %s --]\n"
+msgstr "[-- στις %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
 #
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "¸ëçîå   "
+msgstr "Έληξε   "
 
 #
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Ìç Ýãêõñï   "
+msgstr "Μη έγκυρο   "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
-msgstr "ÁíáêëÞèçêå   "
+msgstr "Ανακλήθηκε   "
 
 #
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[ìç Ýãêõñç çìåñïìçíßá]"
+msgstr "[μη έγκυρη ημερομηνία]"
 
 #
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[áäõíáìßá õðïëïãéóìïý]"
+msgstr "[αδυναμία υπολογισμού]"
 
 #
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "øåõäþíõìï: êáììßá äéåýèõíóç"
+msgstr "ψευδώνυμο: καμμία διεύθυνση"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Αδυναμία εύρεσης σημειωμένων μηνυμάτων."
+
+#
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Αδυναμία εύρεσης σημειωμένων μηνυμάτων."
 
 #
-#: init.c:654
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Αποθήκευση αντιγράφου του μηνύματος;"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "åðåîåñãáóßá ôçò ðåñéãñáöÞò ôçò ðñïóÜñôçóçò"
+msgstr "επεξεργασία της περιγραφής της προσάρτησης"
 
 #
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "åðåîåñãáóßá ôçò ðåñéãñáöÞò ôçò ðñïóÜñôçóçò"
+msgstr "επεξεργασία της περιγραφής της προσάρτησης"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
 #
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: ðÜñá ðïëëÜ ïñßóìáôá"
+msgstr "bind: πάρα πολλά ορίσματα"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
 #
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Σφάλμα κατά τη διερεύνηση του καταλόγου."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Δεν υπάρχει νέα αλληλογραφία σε κανένα γραμματοκιβώτιο."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "÷ñþìá: ðïëý ëßãá ïñßóìáôá"
+msgstr "χρώμα: πολύ λίγα ορίσματα"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Δεν υπάρχουν νέα μηνύματα"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
-msgstr "ìåôáôñïðÞ"
+msgstr "μετατροπή"
+
+#
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Εγγραφή τους μηνύματος στο γραμματοκιβώτιο"
 
 #
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "áäõíáìßá äçìéïõñãßáò ðñïóùñéíïý öáêÝëïõ: %s"
+msgstr "αδυναμία δημιουργίας προσωρινού φακέλου: %s"
 
 #
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "áäõíáìßá ðåñéêïðÞ ðñïóùñéíïý öáêÝëïõ áëëçëïãñáößáò: %s"
+msgstr "αδυναμία περικοπή προσωρινού φακέλου αλληλογραφίας: %s"
 
 #
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "áäõíáìßá åããñáöÞò ðñïóùñéíïý öáêÝëïõ áëëçëïãñáößáò: %s"
+msgstr "αδυναμία εγγραφής προσωρινού φακέλου αλληλογραφίας: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Δεν έχει οριστεί γραμματοκιβώτιο εισερχομένων."
 
 #
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "dazn"
 
 #
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "äåí õðïóôçñßæïíôáé ôá åî'ïñéóìïý ÷ñþìáôá"
+msgstr "δεν υποστηρίζονται τα εξ'ορισμού χρώματα"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Διαγραφή μηνυμάτων από τον εξυπηρετητή;"
+
+#
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Επαναφορά τα μηνύματα που ταιριάζουν σε: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Επαναφορά τα μηνύματα που ταιριάζουν σε: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzcp"
 
+#
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Επεξεργασία προωθημένου μηνύματος;"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -4153,94 +4075,187 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "ÁíôéãñáöÞ óôï %s..."
+msgstr "Αντιγραφή στο %s..."
 
 #
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "ÅðéëïãÞ %s..."
+msgstr "Επιλογή %s..."
 
-#
-#: pattern.c:777
-msgid "empty pattern"
-msgstr "Üäåéï ìïíôÝëï/ìïñöÞ"
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Η τρέχουσα προσάρτηση δεν θα μετατραπεί."
 
 #
-# compose.c:105
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: keymap_defs.h:29
 #, fuzzy
-msgid "encryption"
-msgstr "ÊñõðôïãñÜöçóç"
+msgid "edit attachment description"
+msgstr "επεξεργασία της περιγραφής της προσάρτησης"
 
-#
-#: crypt.cpkg:570
-#, fuzzy, c-format
-msgid "error adding recipient `%.*s': %s\n"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
 
-#
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
-#, fuzzy, c-format
-msgid "error allocating data object: %s\n"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
 
-#
-#: crypt.cpkg:328
-#, fuzzy, c-format
-msgid "error creating gpgme context: %s\n"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
 
-#: crypt.cpkg:354
-#, c-format
-msgid "error creating gpgme data object: %s\n"
+#: keymap_defs.h:28
+msgid "edit the CC list"
 msgstr ""
 
-#: crypt.cpkg:338
-#, c-format
-msgid "error enabling CMS protocol: %s\n"
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Αδυναμία εγγραφής του μηνύματος"
+
+#
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Λήψη επικεφαλίδων από τα μηνύματα... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Επεξεργασία προωθημένου μηνύματος;"
+
+#
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Αποθήκευση αντιγράφου του μηνύματος;"
+
+#
+#: pattern.c:777
+msgid "empty pattern"
+msgstr "άδειο μοντέλο/μορφή"
+
+#
+# compose.c:105
+#: crypt.cpkg:2718 crypt.cpkg:2841
+#, fuzzy
+msgid "encryption"
+msgstr "Κρυπτογράφηση"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Αποθήκευση αντιγράφου του μηνύματος;"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
+#
+#: crypt.cpkg:570
+#, fuzzy, c-format
+msgid "error adding recipient `%.*s': %s\n"
+msgstr "σφάλμα στο μοντέλο στο: %s"
+
+#
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "σφάλμα στο μοντέλο στο: %s"
+
+#
+#: crypt.cpkg:328
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "σφάλμα στο μοντέλο στο: %s"
+
+#: crypt.cpkg:354
+#, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr ""
+
+#: crypt.cpkg:338
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
 msgstr ""
 
 #
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+msgstr "σφάλμα στο μοντέλο στο: %s"
 
 #
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+msgstr "σφάλμα στο μοντέλο στο: %s"
 
 #
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+msgstr "σφάλμα στο μοντέλο στο: %s"
 
 #
 #: pattern.c:499
 msgid "error in expression"
-msgstr "óöÜëìá óôçí Ýêöñáóç"
+msgstr "σφάλμα στην έκφραση"
 
 #
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+msgstr "σφάλμα στο μοντέλο στο: %s"
 
 #
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+msgstr "σφάλμα στο μοντέλο στο: %s"
 
 #
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+msgstr "σφάλμα στο μοντέλο στο: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -4251,32 +4266,92 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "óöÜëìá óôï ìïíôÝëï óôï: %s"
+msgstr "σφάλμα στο μοντέλο στο: %s"
 
 #
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "ëÜèïò: Üãíùóôç äéåñãáóßá %d (áíÝöåñå áõôü ôï óöÜëìá)."
+msgstr "λάθος: άγνωστη διεργασία %d (ανέφερε αυτό το σφάλμα)."
 
 #
 # compose.c:133
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "esabifc"
 
 #
 # compose.c:133
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "esabifc"
 
 #
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
-msgstr "exec: êáèüëïõ ïñßóìáôá"
+msgstr "exec: καθόλου ορίσματα"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Συνέχεια στο %s%s;"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Προώθηση σαν προσαρτήσεις;"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Έλεγχος για νέα μηνύματα..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Είστε στο πρώτο μήνυμα."
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -4298,12 +4373,36 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Είστε στην τελευταία σελίδα."
+
+#
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Δεν υπάρχει νέα αλληλογραφία σε κανένα γραμματοκιβώτιο."
+
+#
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Σφάλμα κατά  το άνοιγμα του γραμματοκιβωτίου"
+
+#
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Δεν υπάρχει νέα αλληλογραφία σε κανένα γραμματοκιβώτιο."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
@@ -4311,141 +4410,657 @@ msgstr ""
 #
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "Ý÷åé äéáãñáöåß --]\n"
+msgstr "έχει διαγραφεί --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbox: EXPUNGE áðÝôõ÷å"
+msgstr "imap_sync_mailbox: EXPUNGE απέτυχε"
 
 #
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "ìç Ýãêõñï ðåäßï åðéêåöáëßäáò"
+msgstr "μη έγκυρο πεδίο επικεφαλίδας"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
 
 #
-#: crypt.cpkg:3122
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Μη έγκυρος αριθμός δείκτη"
+
+#
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Μετάβαση στο μήνυμα: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Μετάβαση στο μήνυμα: "
+
+#
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Η συζήτηση περιέχει μη αναγνωσμένα μηνύματα."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Είστε στην πρώτη συζήτηση."
+
+#
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Δεν υπάρχουν μη αναγνωσμένα μηνύματα"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Δεν υπάρχουν μη αναγνωσμένα μηνύματα"
+
+#
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Αποθήκευση αντιγράφου του μηνύματος;"
+
+#
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
-msgstr "¼ìïéá PGP êëåéäéÜ <%s>."
+msgstr "Όμοια PGP κλειδιά <%s>."
 
 #
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Διαβίβαση σημειωμένων μηνυμάτων στον: "
+
+#
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Δεν υπάρχει νέα αλληλογραφία σε κανένα γραμματοκιβώτιο."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: Üäåéá áêïëïõèßá ðëÞêôñùí"
+msgstr "macro: άδεια ακολουθία πλήκτρων"
 
 #
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: ðÜñá ðïëëÝò ðáñÜìåôñïé"
+msgstr "macro: πάρα πολλές παράμετροι"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "Ç åßóïäïò mailcap ãéá ôï ôýðï %s äå âñÝèçêå"
+msgstr "Η είσοδος mailcap για το τύπο %s δε βρέθηκε"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): áäõíáìßá ïñéóìïý ÷ñüíïõ óôï áñ÷åßï"
+msgstr "maildir_commit_message(): αδυναμία ορισμού χρόνου στο αρχείο"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "Ôá ìçíýìáôá äåí äéáâéâÜóôçêáí."
+msgstr "Τα μηνύματα δεν διαβιβάστηκαν."
 
 #
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "áôáßñéáóôç ðáñÝíèåóç/åéò: %s"
+msgstr "αταίριαστη παρένθεση/εις: %s"
 
 #
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "Ýëëåéøç ðáñáìÝôñïõ"
+msgstr "έλλειψη παραμέτρου"
 
 #
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "ìïíü÷ñùìá: ëßãá ïñßóìáôá"
+msgstr "μονόχρωμα: λίγα ορίσματα"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Είστε στην πρώτη καταχώρηση."
+
+#
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Είστε στο πρώτο μήνυμα."
+
+#
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Είστε στην τελευταία καταχώρηση."
+
+#
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Είστε στο τελευταίο μήνυμα."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Είστε στην τελευταία καταχώρηση."
+
+#
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Είστε στην τελευταία σελίδα."
+
+#
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Δεν υπάρχουν αποκαταστημένα μηνύματα."
+
+#
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Είστε στην πρώτη καταχώρηση."
+
+#
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Είστε στην πρώτη σελίδα."
+
+#
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Δεν υπάρχουν αποκαταστημένα μηνύματα."
+
+#
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Είστε στην πρώτη σελίδα."
 
 #
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "ôï ðïëõìåñÝò ìÞíõìá äåí Ý÷åé ïñéïèÝôïõóá ðáñÜìåôñï!"
+msgstr "το πολυμερές μήνυμα δεν έχει οριοθέτουσα παράμετρο!"
 
 #
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
-msgstr "n(ü÷é)"
+msgstr "n(όχι)"
 
 #
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(êáíÝíá ãñáììáôïêéâþôéï)"
+msgstr "(κανένα γραμματοκιβώτιο)"
 
 #: commands.c:788
 msgid "not converting"
-msgstr "ü÷é ìåôáôñïðÞ"
+msgstr "όχι μετατροπή"
 
 #
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "êåíÞ áêïëïõèßá ðëÞêôñùí"
+msgstr "κενή ακολουθία πλήκτρων"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "oac"
 
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Ανοίξτε το γραμματοκιβώτιο σε κατάσταση μόνο για εγγραφή"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Ανοίξτε το γραμματοκιβώτιο σε κατάσταση μόνο για εγγραφή"
+
+#
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Επαναπρόσβαση στο γραμματοκιβώτιο..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Διαβίβαση μηνύματος στον %s"
+
 #
-#: init.c:1065
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "ôï ðñüèåìá åßíáé Üêõñï ìå ôçí åðáíáöïñÜ"
+msgstr "το πρόθεμα είναι άκυρο με την επαναφορά"
+
+#
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Είστε στην πρώτη καταχώρηση."
 
 #
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: ðÜñá ðïëëÜ ïñßóìáôá"
+msgstr "push: πάρα πολλά ορίσματα"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Ανάκληση αναβληθέντος μηνύματος;"
+
+#
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Η συζήτηση περιέχει μη αναγνωσμένα μηνύματα."
+
+#
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Αδυναμία επεξεργασίας μηνύματος στο διακομιστή POP."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: αδυναμία στην προσάρτηση του αρχείου"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Μετάβαση στο μήνυμα: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Διαγραφή μηνυμάτων από τον εξυπηρετητή;"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ro"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "roa"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Αποθήκευση%s στο γραμματοκιβώτιο"
+
+#
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Αποθήκευση%s στο γραμματοκιβώτιο"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Αδυναμία επεξεργασίας μηνύματος στο διακομιστή POP."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "σφάλμα στην έκφραση"
+
+#
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Αναζήτηση για: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Αδυναμία αποστολής του μηνύματος."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Προώθηση σαν προσαρτήσεις;"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Περιορισμός στα παρόμοια μηνύματα: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
 #
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Όχι άλλο καθορισμένο κείμενο."
+
+#
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Εκτύπωση μηνύματος;"
+
+#
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Δεν υπάρχουν μηνύματα σε αυτό το φάκελο."
+
+#
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source: ëÜèïò óôï %s"
+msgstr "source: λάθος στο %s"
 
 #
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
-msgstr "source: ëÜèç óôï %s"
+msgstr "source: λάθη στο %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "ðçãÞ: áðüññéøç áíÜãíùóçò ëüãù ðïëëþí óöáëìÜôùí óôï %s"
+msgstr "πηγή: απόρριψη ανάγνωσης λόγω πολλών σφαλμάτων στο %s"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Κανένα αρχείο δεν ταιριάζει με τη μάσκα αρχείου"
 
 #
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: ôï mbox Ý÷åé ôñïðïðïéçèåß, äåí õðÜñ÷ïõí ôñïðïðïéçìÝíá ìçíýìáôá!\n"
-"(áíáöÝñáôå áõôü ôï óöÜëìá)"
+"sync: το mbox έχει τροποποιηθεί, δεν υπάρχουν τροποποιημένα μηνύματα!\n"
+"(αναφέρατε αυτό το σφάλμα)"
+
+#
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Αφαίρεση της σημείωσης στα μηνύματα που ταιριάζουν σε: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Είστε στην πρώτη συζήτηση."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -4457,46 +5072,143 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Όχι άλλο καθορισμένο κείμενο."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Η επανακωδικοποίηση επηρεάζει μόνο της προσαρτήσεις κειμένου."
+
+#
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Κανένα σχέδιο αναζήτησης."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Δεν υπάρχουν μη αναγνωσμένα μηνύματα"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
 #
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "ðïëý ëßãá ïñßóìáôá"
+msgstr "πολύ λίγα ορίσματα"
 
 #
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
+msgstr "πάρα πολλά ορίσματα"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
 #
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "åðåîåñãáóßá ôçò ðåñéãñáöÞò ôçò ðñïóÜñôçóçò"
+msgstr "επεξεργασία της περιγραφής της προσάρτησης"
+
+#
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Επαναφορά τα μηνύματα που ταιριάζουν σε: "
+
+#
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Επαναφορά τα μηνύματα που ταιριάζουν σε: "
+
+#
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Επαναφορά τα μηνύματα που ταιριάζουν σε: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: Áäõíáìßá äéáãñáöÞò åíüò %s ìÝóá áðü Ýíá %s."
+msgstr "unhook: Αδυναμία διαγραφής ενός %s μέσα από ένα %s."
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: Áäõíáìßá unhook * ìÝóá áðü Ýíá hook."
+msgstr "unhook: Αδυναμία unhook * μέσα από ένα hook."
 
 #
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: Üãíùóôïò ôýðïò hook: %s"
+msgstr "unhook: άγνωστος τύπος hook: %s"
 
 #
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "Üãíùóôï óöÜëìá"
+msgstr "άγνωστο σφάλμα"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Αφαίρεση της σημείωσης στα μηνύματα που ταιριάζουν σε: "
+
+#
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "επεξεργασία της περιγραφής της προσάρτησης"
 
 #: main.c:82
 msgid ""
@@ -4509,18 +5221,55 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
 #
-#: init.c:1070
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "ç ôéìÞ åßíáé Üêõñç ìå ôçí åðáíáöïñÜ"
+msgstr "η τιμή είναι άκυρη με την επαναφορά"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
 
 #
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Η προσάρτηση αποθηκεύθηκε."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Νέο αρχείο: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Εγγραφή τους μηνύματος στο γραμματοκιβώτιο"
+
+#
+#: lib-ui/curs_lib.c:118
 msgid "yes"
-msgstr "y(íáé)"
+msgstr "y(ναι)"
 
 #: muttlib.c:227
 msgid "yna"
 msgstr "yna"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/eo.po b/po/eo.po
index be8aa3b..708fbef 100644 (file)
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,29 +1,29 @@
-# Mesaøoj por la programo "mutt".
+# Mesaĝoj por la programo "mutt".
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2000-2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2003-11-12 22:03+0000\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: eo <eo@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-3\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Øeneralaj klavodifinoj:\n"
+"Ĝeneralaj klavodifinoj:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -33,7 +33,7 @@ msgstr ""
 "Funkcioj, kiuj ne havas klavodifinon:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -76,38 +76,38 @@ msgstr ""
 "\n"
 "opcioj:\n"
 "  -A <nomo>     traduki la nomon per la adresaro\n"
-"  -a <dosiero>\taldoni dosieron al la mesaøo\n"
+"  -a <dosiero>\taldoni dosieron al la mesaĝo\n"
 "  -b <adreso>\tspecifi adreson por blinda kopio (BCC)\n"
 "  -c <adreso>\tspecifi adreson por kopio (CC)\n"
 "  -e <komando>\tspecifi komandon por ruligi post la starto\n"
-"  -f <dosiero>\tspecifi la poþtfakon por malfermi\n"
+"  -f <dosiero>\tspecifi la poŝtfakon por malfermi\n"
 "  -F <dosiero>\tspecifi alian dosieron muttrc\n"
-"  -H <dosiero>\tspecifi malnetan dosieron por legi la æapon\n"
+"  -H <dosiero>\tspecifi malnetan dosieron por legi la ĉapon\n"
 "  -i <dosiero>\tspecifi dosieron, kiun Mutt inkluzivu en la respondo\n"
-"  -m <speco>\tspecifi implicitan specon de poþtfakoj\n"
+"  -m <speco>\tspecifi implicitan specon de poŝtfakoj\n"
 "  -n\t\tindikas al Mutt ne legi la sisteman dosieron Muttrc\n"
-"  -p\t\trevoki prokrastitan mesaøon\n"
+"  -p\t\trevoki prokrastitan mesaĝon\n"
 "  -Q <variablo> pridemandi la valoron de agordo-variablo\n"
-"  -R\t\tmalfermi poþtfakon nurlege\n"
-"  -s <temo>\tspecifi temlinion (en citiloj, se øi enhavas spacetojn)\n"
-"  -v\t\tmontri version kaj parametrojn de la traduka¼o\n"
-"  -x\t\timiti la sendreøimon de mailx\n"
-"  -y\t\telekti poþtfakon specifitan en via listo 'mailboxes'\n"
-"  -z\t\teliri tuj, se ne estas mesaøoj en la poþtfako\n"
-"  -Z\t\tmalfermi la unuan poþtfakon kun nova mesaøo; eliri tuj, se mankas\n"
-"  -h\t\tdoni æi tiun helpmesaøon"
-
-#: compose.c:152 compose.c:156
+"  -R\t\tmalfermi poŝtfakon nurlege\n"
+"  -s <temo>\tspecifi temlinion (en citiloj, se ĝi enhavas spacetojn)\n"
+"  -v\t\tmontri version kaj parametrojn de la tradukaĵo\n"
+"  -x\t\timiti la sendreĝimon de mailx\n"
+"  -y\t\telekti poŝtfakon specifitan en via listo 'mailboxes'\n"
+"  -z\t\teliri tuj, se ne estas mesaĝoj en la poŝtfako\n"
+"  -Z\t\tmalfermi la unuan poŝtfakon kun nova mesaĝo; eliri tuj, se mankas\n"
+"  -h\t\tdoni ĉi tiun helpmesaĝon"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " subskribi kiel: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     al %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "     de %s"
@@ -150,31 +150,31 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' por listo): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
-msgstr "(daýrigi)\n"
+msgstr "(daŭrigi)\n"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Premu '%s' por (mal)þalti skribon"
+msgstr " Premu '%s' por (mal)ŝalti skribon"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " en æi tiu limigita rigardo"
+msgstr " en ĉi tiu limigita rigardo"
 
 #: commands.c:601
 msgid " tagged"
@@ -188,44 +188,44 @@ msgstr "%c: nevalida komando"
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: ne funkcias en æi tiu reøimo"
+msgstr "%c: ne funkcias en ĉi tiu reĝimo"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d retenite, %d forviþite."
+msgstr "%d retenite, %d forviŝite."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d retenite, %d movite, %d forviþite."
+msgstr "%d retenite, %d movite, %d forviŝite."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s [%s]\n"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s [%s]\n"
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Æu vi vere volas uzi la þlosilon?"
+msgstr "%s Ĉu vi vere volas uzi la ŝlosilon?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] modifita. Æu aktualigi kodadon?"
+msgstr "%s [#%d] modifita. Ĉu aktualigi kodadon?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] ne plu ekzistas!"
@@ -233,12 +233,12 @@ msgstr "%s [#%d] ne plu ekzistas!"
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d el %d mesaøoj legitaj]"
+msgstr "%s [%d el %d mesaĝoj legitaj]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s ne ekzistas. Æu krei øin?"
+msgstr "%s ne ekzistas. Ĉu krei ĝin?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
@@ -250,17 +250,17 @@ msgstr "%s ne estas valida IMAP-vojo"
 msgid "%s is an invalid POP path"
 msgstr "%s ne estas valida POP-vojo"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr "%s ne estas valida POP-vojo"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr "%s ne estas valida POP-vojo"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ne estas dosierujo."
@@ -268,12 +268,12 @@ msgstr "%s ne estas dosierujo."
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s ne estas poþtfako!"
+msgstr "%s ne estas poŝtfako!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s ne estas poþtfako."
+msgstr "%s ne estas poŝtfako."
 
 #: sendlib.c:748
 #, c-format
@@ -297,92 +297,92 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Nekonata speco."
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s: terminalo ne kapablas je koloro"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s: komando validas nur por indeksobjekto"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: nekonata trajto"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: koloro ne ekzistas"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: funkcio ne ekzistas"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: nekonata funkcio"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: nekonata menuo"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: objekto ne ekzistas"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: Nesufiæe da argumentoj"
+msgstr "%s: Nesufiĉe da argumentoj"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s: ne povas aldoni dosieron"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ne povas aldoni dosieron.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: nekonata komando"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: nekonata speco"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: nekonata variablo"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
 msgstr "%s ne estas valida POP-vojo"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr "%s ne estas valida POP-vojo"
@@ -391,17 +391,17 @@ msgstr "%s ne estas valida POP-vojo"
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(bezonas klavodifinon por 'view-attachments'!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(mankas poþtfako)"
+msgstr "(mankas poŝtfako)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(m)alakcepti, akcepti (u)nufoje"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(m)alakcepti, akcepti (u)nufoje, (a)kcepti æiam"
+msgstr "(m)alakcepti, akcepti (u)nufoje, (a)kcepti ĉiam"
 
 #: handler.c:1191
 #, c-format
@@ -411,26 +411,26 @@ msgstr "(grando %s bitokoj) "
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(uzu '%s' por vidigi æi tiun parton)"
+msgstr "(uzu '%s' por vidigi ĉi tiun parton)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Partoj"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<NEKONATA>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<implicite>"
 
@@ -444,37 +444,33 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "APOP-rajtiøo malsukcesis."
+msgstr "APOP-rajtiĝo malsukcesis."
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Interrompi"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Æu nuligi nemodifitan mesaøon?"
+msgstr "Ĉu nuligi nemodifitan mesaĝon?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Nemodifita mesaøon nuligita"
+msgstr "Nemodifita mesaĝon nuligita"
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adreso: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Adreso aldonita."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Aldonu nomon: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Adresaro"
 
@@ -482,85 +478,81 @@ msgstr "Adresaro"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr ""
-"Æiuj kongruaj þlosiloj estas eksvalidiøintaj, revokitaj, aý malþaltitaj."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Aldoni"
+"Ĉiuj kongruaj ŝlosiloj estas eksvalidiĝintaj, revokitaj, aŭ malŝaltitaj."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Æu aldoni mesaøojn al %s?"
+msgstr "Ĉu aldoni mesaĝojn al %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Argumento devas esti mesaønumero."
+msgstr "Argumento devas esti mesaĝnumero."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Parto skribita."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Aldoni dosieron"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Aldonas la elektitajn dosierojn ..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Parto filtrita."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Parto skribita."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Partoj"
 
 #: imap/auth.c:83
 #, c-format
 msgid "Authenticating (%s)..."
-msgstr "Rajtiøas (%s) ..."
+msgstr "Rajtiĝas (%s) ..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "Rajtiøas (APOP) ..."
+msgstr "Rajtiĝas (APOP) ..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "Rajtiøas (SASL) ..."
+msgstr "Rajtiĝas (SASL) ..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "Rajtiøas (SASL) ..."
+msgstr "Rajtiĝas (SASL) ..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -571,12 +563,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr "Malbona IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Malbona IDN %s dum kreado de resent-from."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "Malbona IDN en \"%s\": '%s'"
@@ -588,31 +580,31 @@ msgstr "Malbona IDN: '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "Malbona nomo por poþtfako"
+msgstr "Malbona nomo por poŝtfako"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "Fino de mesaøo estas montrita."
+msgstr "Fino de mesaĝo estas montrita."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Redirekti mesaøon al %s"
+msgstr "Redirekti mesaĝon al %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Redirekti mesaøon al: "
+msgstr "Redirekti mesaĝon al: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Redirekti mesaøojn al %s"
+msgstr "Redirekti mesaĝojn al %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Redirekti markitajn mesaøojn al: "
+msgstr "Redirekti markitajn mesaĝojn al: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -627,18 +619,18 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Ne povas aldoni al poþtfako: %s"
+msgstr "Ne povas aldoni al poŝtfako: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "Ne povas aldoni dosierujon!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Ne povas krei %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Ne povas krei dosieron %s"
@@ -651,38 +643,38 @@ msgstr "Ne povas krei filtrilon"
 msgid "Can't create filter process"
 msgstr "Ne povas krei filtrilprocezon"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "Ne povas krei dumtempan dosieron"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
-msgstr "Ne povas malkodi æiujn markitajn partojn. Æu MIME-paki la aliajn?"
+msgstr "Ne povas malkodi ĉiujn markitajn partojn. Ĉu MIME-paki la aliajn?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr "Ne povas malkodi æiujn markitajn partojn. Æu MIME-plusendi la aliajn?"
+msgstr "Ne povas malkodi ĉiujn markitajn partojn. Ĉu MIME-plusendi la aliajn?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "Ne povas malæifri æifritan mesaøon!"
+msgstr "Ne povas malĉifri ĉifritan mesaĝon!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "Ne povas forviþi parton de POP-servilo."
+msgstr "Ne povas forviŝi parton de POP-servilo."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "Ne povas forviþi parton de POP-servilo."
+msgstr "Ne povas forviŝi parton de POP-servilo."
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Ne povas þlosi %s.\n"
+msgstr "Ne povas ŝlosi %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -690,61 +682,57 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Ne povas trovi markitajn mesaøojn."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Ne povas preni type2.list de mixmaster!"
+msgstr "Ne povas trovi markitajn mesaĝojn."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Nomþamblono ne estas plenumebla. Æu daýrigi?"
+msgstr "Nomŝamblono ne estas plenumebla. Ĉu daŭrigi?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Ne povas malfermi mesaøodosieron: %s"
+msgstr "Ne povas malfermi mesaĝodosieron: %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Ne povas aldoni al poþtfako: %s"
+msgstr "Ne povas aldoni al poŝtfako: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "Konekto al %s fermita"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "Fermas la konekton al POP-servilo ..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Ne povas ekzameni la dosieron %s."
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "Ne povas krei %s: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Ne eblas skribi mesaøon al POP-poþtfako."
+msgstr "Ne eblas skribi mesaĝon al POP-poŝtfako."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Ne eblas redakti mesaøon en POP-servilo."
+msgstr "Ne eblas redakti mesaĝon en POP-servilo."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ne povas ekzameni la dosieron %s: %s"
@@ -753,26 +741,26 @@ msgstr "Ne povas ekzameni la dosieron %s: %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "Ne povas rigardi dosierujon"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "Ne povas krei %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Ne povas skribi la æapa¼on al dumtempa dosiero!"
+msgstr "Ne povas skribi la ĉapaĵon al dumtempa dosiero!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Ne povas skribi mesaøon"
+msgstr "Ne povas skribi mesaĝon"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Ne povas skribi mesaøon al dumtempa dosiero!"
+msgstr "Ne povas skribi mesaĝon al dumtempa dosiero!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
@@ -782,42 +770,38 @@ msgstr "Ne povas krei vidig-filtrilon"
 msgid "Cannot create filter"
 msgstr "Ne povas krei filtrilon."
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Ne povas þanøi skribostaton æe nurlega poþtfako!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Ne povas ŝanĝi skribostaton ĉe nurlega poŝtfako!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "Ricevis %s ... Eliras.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "Atestilo de servilo ankoraý ne validas"
+msgstr "Atestilo de servilo ankoraŭ ne validas"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Atestilo skribita"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Þanøoj al poþtfako estos skribitaj æe eliro."
+msgstr "Ŝanĝoj al poŝtfako estos skribitaj ĉe eliro."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Þanøoj al poþtfako ne estos skribitaj."
+msgstr "Ŝanĝoj al poŝtfako ne estos skribitaj."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Signo = %s, Okume = %o, Dekume = %d"
@@ -825,47 +809,39 @@ msgstr "Signo = %s, Okume = %o, Dekume = %d"
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Signaro þanøita al %s; %s."
+msgstr "Signaro ŝanĝita al %s; %s."
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "Listo"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Iri al la dosierujo: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "Kontrolas pri novaj mesaøoj ..."
+msgstr "Kontrolas pri novaj mesaĝoj ..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Kontroli þlosilon  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "Kontrolas pri novaj mesaøoj ..."
+msgstr "Kontrolas pri novaj mesaĝoj ..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "Kontrolas pri novaj mesaøoj ..."
+msgstr "Kontrolas pri novaj mesaĝoj ..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "Neæifrita"
+msgstr "Neĉifrita"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Malþalti flagon"
+msgstr "Malŝalti flagon"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Fermas la konekton al %s ..."
@@ -874,10 +850,10 @@ msgstr "Fermas la konekton al %s ..."
 msgid "Closing connection to POP server..."
 msgstr "Fermas la konekton al POP-servilo ..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "Konektiøas al %s ..."
+msgstr "Konektiĝas al %s ..."
 
 #: pop.c:600 pop.c:863
 #, c-format
@@ -891,18 +867,18 @@ msgstr "Servilo ne havas la komandon UIDL."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "Skribas þanøojn ..."
+msgstr "Skribas ŝanĝojn ..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Parametroj de la traduka¼o:"
+"Parametroj de la tradukaĵo:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Tradukas seræþablonon ..."
+msgstr "Tradukas serĉŝablonon ..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
@@ -914,41 +890,41 @@ msgstr "Kopias al %s ..."
 msgid "Compressing %s..."
 msgstr "Kopias al %s ..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "Konektiøas al %s ..."
+msgstr "Konektiĝas al %s ..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "Konektiøas al %s ..."
+msgstr "Konektiĝas al %s ..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "Konektiøas al %s ..."
+msgstr "Konektiĝas al %s ..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Konekto perdita. Æu rekonekti al POP-servilo?"
+msgstr "Konekto perdita. Ĉu rekonekti al POP-servilo?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Konekto perdita. Æu rekonekti al POP-servilo?"
+msgstr "Konekto perdita. Ĉu rekonekti al POP-servilo?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
 msgstr "Konekto al %s fermita"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "Konekto al %s fermita"
@@ -956,35 +932,35 @@ msgstr "Konekto al %s fermita"
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Content-Type þanøita al %s."
+msgstr "Content-Type ŝanĝita al %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type havas la formon bazo/subspeco"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "Æu daýrigi?"
+msgstr "Ĉu daŭrigi?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "Æu konverti al %s æe sendado?"
+msgstr "Ĉu konverti al %s ĉe sendado?"
 
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "Kopii%s al poþtfako"
+msgstr "Kopii%s al poŝtfako"
 
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "Kopias %d mesaøojn al %s ..."
+msgstr "Kopias %d mesaĝojn al %s ..."
 
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "Kopias mesaøon %d al %s ..."
+msgstr "Kopias mesaĝon %d al %s ..."
 
 #: commands.c:658
 #, c-format
@@ -1005,15 +981,15 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Ne povis konektiøi al %s (%s)."
+msgstr "Ne povis konektiĝi al %s (%s)."
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "Ne povis kopii mesaøon"
+msgstr "Ne povis kopii mesaĝon"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
 msgstr "Ne povis krei dumtempan dosieron!"
@@ -1024,16 +1000,16 @@ msgstr "Ne povis krei dumtempan dosieron!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Ne povis trovi ordigfunkcion! (Raportu æi tiun cimon.)"
+msgstr "Ne povis trovi ordigfunkcion! (Raportu ĉi tiun cimon.)"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Ne povis trovi la servilon \"%s\""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Ne povis inkluzivi æiujn petitajn mesaøojn!"
+msgstr "Ne povis inkluzivi ĉiujn petitajn mesaĝojn!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
@@ -1046,39 +1022,39 @@ msgstr "Ne povas malfermi %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Ne povis remalfermi poþtfakon!"
+msgstr "Ne povis remalfermi poŝtfakon!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Ne povis sendi la mesaøon."
+msgstr "Ne povis sendi la mesaĝon."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Ne povis þlosi %s\n"
+msgstr "Ne povis ŝlosi %s\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "Æu krei %s?"
+msgstr "Ĉu krei %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Kreado funkcias nur æe IMAP-poþtfakoj"
+msgstr "Kreado funkcias nur ĉe IMAP-poŝtfakoj"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Krei poþtfakon: "
+msgstr "Krei poŝtfakon: "
 
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "Malkodita kopii%s al poþtfako"
+msgstr "Malkodita kopii%s al poŝtfako"
 
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "Malkodita skribi%s al poþtfako"
+msgstr "Malkodita skribi%s al poŝtfako"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
@@ -1088,81 +1064,68 @@ msgstr "Elektas %s ..."
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Malæifrita kopii%s al poþtfako"
+msgstr "Malĉifrita kopii%s al poŝtfako"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "Malæifrita skribi%s al poþtfako"
+msgstr "Malĉifrita skribi%s al poŝtfako"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
-msgstr "Prenas mesaøon ..."
+msgstr "Prenas mesaĝon ..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Malæifro malsukcesis."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Forviþi"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Forviþi"
+msgstr "Malĉifro malsukcesis."
 
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Forviþado funkcias nur æe IMAP-poþtfakoj"
+msgstr "Forviŝado funkcias nur ĉe IMAP-poŝtfakoj"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "Æu forviþi mesaøojn de servilo?"
+msgstr "Ĉu forviŝi mesaĝojn de servilo?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "Forviþi mesaøojn laý la þablono: "
+msgstr "Forviŝi mesaĝojn laŭ la ŝablono: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "Forviþi"
+msgstr "Forviŝi"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Mutt ne kapablas forviþi partojn el æifrita mesaøo."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Priskribo"
+msgstr "Mutt ne kapablas forviŝi partojn el ĉifrita mesaĝo."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "Identigilo %s estas nekontrolita. Æu vi volas uzi øin por %s?"
+msgstr "Identigilo %s estas nekontrolita. Ĉu vi volas uzi ĝin por %s?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s ne ekzistas. Æu krei øin?"
+msgstr "%s ne ekzistas. Ĉu krei ĝin?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Dosierujo [%s], Dosieromasko: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "ERARO: bonvolu raporti æi tiun cimon"
+msgstr "ERARO: bonvolu raporti ĉi tiun cimon"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "Æu redakti plusendatan mesaøon?"
+msgstr "Ĉu redakti plusendatan mesaĝon?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1171,70 +1134,70 @@ msgstr ""
 msgid "Empty expression"
 msgstr "eraro en esprimo"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Æifri"
+msgstr "Ĉifri"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "Æifri per: "
+msgstr "Ĉifri per: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Donu keyID: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Donu keyID por %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "Donu þlosilojn (^G por nuligi): "
+msgstr "Donu ŝlosilojn (^G por nuligi): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "Eraro dum redirektado de mesaøo!"
+msgstr "Eraro dum redirektado de mesaĝo!"
 
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "Eraro dum redirektado de mesaøoj!"
+msgstr "Eraro dum redirektado de mesaĝoj!"
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "Eraro dum sendado de mesaøo."
+msgstr "Eraro dum sendado de mesaĝo."
 
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "Eraro dum konektiøo al servilo: %s"
+msgstr "Eraro dum konektiĝo al servilo: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Eraro dum konektiøo al servilo: %s"
+msgstr "Eraro dum konektiĝo al servilo: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Eraro en %s, linio %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Eraro en komandlinio: %s\n"
@@ -1244,87 +1207,73 @@ msgstr "Eraro en komandlinio: %s\n"
 msgid "Error in expression: %s"
 msgstr "Eraro en esprimo: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Eraro dum startigo de la terminalo."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Eraro dum startigo de la terminalo."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "Eraro dum malfermado de poþtfako"
+msgstr "Eraro dum malfermado de poŝtfako"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
 msgstr "Eraro dum analizo de adreso!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Eraro dum ruligo de \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "Eraro dum legado de dosierujo."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Eraro dum sendado de mesaøo; ido finis per %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Eraro dum sendado de mesaøo; ido finis per %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Eraro dum sendado de mesaøo."
+msgstr "Eraro dum sendado de mesaĝo; ido finis per %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Eraro dum komunikado kun %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Eraro dum vidigo de dosiero"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "Eraro dum skribado de poþtfako!"
+msgstr "Eraro dum skribado de poŝtfako!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
 msgstr "Eraro. Konservas dumtempan dosieron: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Eraro: %s ne estas uzebla kiel la fina plusendilo de æeno."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Eraro: '%s' estas malbona IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1341,7 +1290,7 @@ msgstr "Eraro: multipart/signed ne havas parametron protocol!"
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Eraro en komandlinio: %s\n"
@@ -1349,160 +1298,146 @@ msgstr "Eraro en komandlinio: %s\n"
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Prenas mesaøoæapojn ... [%d/%d]"
+msgstr "Prenas mesaĝoĉapojn ... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Ruligas komandon pri trafataj mesaøoj ..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Fino"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Eliri  "
+msgstr "Ruligas komandon pri trafataj mesaĝoj ..."
 
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
 msgstr "Eliri el Mutt sen skribi?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Æu eliri el Mutt?"
+msgstr "Ĉu eliri el Mutt?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "Forviþo malsukcesis"
+msgstr "Forviŝo malsukcesis"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Forviþas mesaøojn de la servilo ..."
+msgstr "Forviŝas mesaĝojn de la servilo ..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Malsukceso malferi dosieron por analizi æapa¼ojn."
+msgstr "Malsukceso malferi dosieron por analizi ĉapaĵojn."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Malsukceso malferi dosieron por forigi æapa¼ojn."
+msgstr "Malsukceso malferi dosieron por forigi ĉapaĵojn."
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Malsukceso malferi dosieron por analizi æapa¼ojn."
+msgstr "Malsukceso malferi dosieron por analizi ĉapaĵojn."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Fatala eraro! Ne povis remalfermi poþtfakon!"
+msgstr "Fatala eraro! Ne povis remalfermi poŝtfakon!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Fatala eraro. Mesaøonombro ne kongruas!"
+msgstr "Fatala eraro. Mesaĝonombro ne kongruas!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "Forviþas mesaøojn de la servilo ..."
+msgstr "Forviŝas mesaĝojn de la servilo ..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "Prenas mesaøon ..."
+msgstr "Prenas mesaĝon ..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Prenas liston de mesaøoj ..."
+msgstr "Prenas liston de mesaĝoj ..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "Prenas liston de mesaøoj ..."
+msgstr "Prenas liston de mesaĝoj ..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Prenas mesaøoæapojn ... [%d/%d]"
+msgstr "Prenas mesaĝoĉapojn ... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Prenas mesaøoæapojn ... [%d/%d]"
+msgstr "Prenas mesaĝoĉapojn ... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "Prenas mesaøon ..."
+msgstr "Prenas mesaĝon ..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "Dosieromasko: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Dosiero ekzistas; æu (s)urskribi, (a)ldoni, aý (n)uligi?"
+msgstr "Dosiero ekzistas; ĉu (s)urskribi, (a)ldoni, aŭ (n)uligi?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Tio estas dosierujo; æu skribi dosieron en øi?"
+msgstr "Tio estas dosierujo; ĉu skribi dosieron en ĝi?"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Dosiero estas dosierujo; æu skribi sub øi? [(j)es, (n)e, æ(i)uj]"
+msgstr "Dosiero estas dosierujo; ĉu skribi sub ĝi? [(j)es, (n)e, ĉ(i)uj]"
 
 #: muttlib.c:249
 msgid "File under directory: "
 msgstr "Dosiero en dosierujo: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filtri tra: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Fingrospuro: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "skribi æi tiun mesaøon por sendi øin poste"
+msgstr "skribi ĉi tiun mesaĝon por sendi ĝin poste"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "Æu respondi grupe al %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Æu respondi grupe al %s%s?"
+msgstr "Ĉu respondi grupe al %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Æu plusendi MIME-pakita?"
+msgstr "Ĉu plusendi MIME-pakita?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "Æu plusendi kiel kunsenda¼on?"
+msgstr "Ĉu plusendi kiel kunsendaĵon?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "Æu plusendi kiel kunsenda¼ojn?"
+msgstr "Ĉu plusendi kiel kunsendaĵojn?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
 msgstr "Funkcio nepermesata dum elektado de aldonoj."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "Prenas liston de poþtfakoj ..."
+msgstr "Prenas liston de poŝtfakoj ..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
@@ -1512,28 +1447,17 @@ msgstr "Prenas nomspacojn ..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Respondi al grupo"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Helpo"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Helpo por %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
 msgstr "Helpo estas nun montrata."
 
@@ -1541,79 +1465,75 @@ msgstr "Helpo estas nun montrata."
 msgid "I don't know how to print that!"
 msgstr "Mi ne scias presi tion!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Mi ne scias presi %s-partojn!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr "ID havas nedifinitan validecon."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "ID estas eksvalidiøinta/malþaltita/revokita."
+msgstr "ID estas eksvalidiĝinta/malŝaltita/revokita."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
 msgstr "ID ne estas valida."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
 msgstr "ID estas nur iomete valida."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Nevalida PGP-æapo"
+msgstr "Nevalida PGP-ĉapo"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "Nevalida S/MIME-æapo"
+msgstr "Nevalida S/MIME-ĉapo"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Maløuste strukturita elemento por speco %s en \"%s\" linio %d"
+msgstr "Malĝuste strukturita elemento por speco %s en \"%s\" linio %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Æu inkluzivi mesaøon en respondo?"
+msgstr "Ĉu inkluzivi mesaĝon en respondo?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "Inkluzivas cititan mesaøon ..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "Enþovi"
+msgstr "Inkluzivas cititan mesaĝon ..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Nevalida tago de monato: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "Nevalida kodado."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "Nevalida indeksnumero."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Nevalida mesaønumero."
+msgstr "Nevalida mesaĝnumero."
 
 #: pattern.c:343
 #, c-format
@@ -1625,11 +1545,11 @@ msgstr "Nevalida monato: %s"
 msgid "Invalid relative date: %s"
 msgstr "Nevalida relativa dato: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "Alvokas PGP ..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "Alvokas PGP ..."
@@ -1637,78 +1557,74 @@ msgstr "Alvokas PGP ..."
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Alvokas aýtomatan vidigon per: %s"
+msgstr "Alvokas aŭtomatan vidigon per: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Salti al mesaøo: "
+msgstr "Salti al mesaĝo: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Salti al: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Saltado ne funkcias æe dialogoj."
+msgstr "Saltado ne funkcias ĉe dialogoj."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
 msgstr "Klavo ne estas difinita."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Klavo ne estas difinita. Premu '%s' por helpo."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Limigi al mesaøoj laý la þablono: "
+msgstr "Limigi al mesaĝoj laŭ la ŝablono: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "Þablono: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Ŝablono: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Salutas ..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1716,27 +1632,27 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Tro da þlosoj; æu forigi la þloson por %s?"
+msgstr "Tro da ŝlosoj; ĉu forigi la ŝloson por %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Salutas ..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Saluto malsukcesis."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Seræas þlosilojn, kiuj kongruas kun \"%s\" ..."
+msgstr "Serĉas ŝlosilojn, kiuj kongruas kun \"%s\" ..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "Seræas pri %s ..."
+msgstr "Serĉas pri %s ..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Fingrospuro: %s"
@@ -1745,88 +1661,84 @@ msgstr "Fingrospuro: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME-speco ne difinita. Ne povas vidigi parton."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "Cirkla makroo trovita."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Nova mesaøo"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "Mesaøo ne sendita."
+msgstr "Mesaĝo ne sendita."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "Mesaøo sendita."
+msgstr "Mesaĝo sendita."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "Poþtfako sinkronigita."
+msgstr "Poŝtfako sinkronigita."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Poþtfako fermita"
+msgstr "Poŝtfako fermita"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Poþtfako kreita."
+msgstr "Poŝtfako kreita."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Poþtfako forviþita."
+msgstr "Poŝtfako forviŝita."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "Poþtfako estas malplena."
+msgstr "Poŝtfako estas malplena."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "Poþtfako estas markita kiel neskribebla. %s"
+msgstr "Poŝtfako estas markita kiel neskribebla. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "Poþtfako estas nurlega."
+msgstr "Poŝtfako estas nurlega."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Poþtfako estas neþanøita."
+msgstr "Poŝtfako estas neŝanĝita."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "Poþtfako devas havi nomon."
+msgstr "Poŝtfako devas havi nomon."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Poþtfako ne forviþita."
+msgstr "Poŝtfako ne forviŝita."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Poþtfako kreita."
+msgstr "Poŝtfako kreita."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Poþtfako fuþiøis!"
+msgstr "Poŝtfako fuŝiĝis!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Poþtfako estis modifita de ekstere."
+msgstr "Poŝtfako estis modifita de ekstere."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Poþtfako estis modifita de ekstere. Flagoj povas esti maløustaj."
+msgstr "Poŝtfako estis modifita de ekstere. Flagoj povas esti malĝustaj."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Poþtfakoj [%d]"
+msgstr "Poŝtfakoj [%d]"
 
 #: attach.c:218
 #, c-format
@@ -1838,199 +1750,170 @@ msgstr "\"edit\" en Mailcap-dosiero postulas %%s"
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\" en Mailcap-dosiero postulas %%s"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Aldoni Nomon"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Markas %d mesaøojn kiel forviþitajn ..."
+msgstr "Markas %d mesaĝojn kiel forviŝitajn ..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Masko"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Mesaøo redirektita."
+msgstr "Mesaĝo redirektita."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "Ne eblis presi mesaøon"
+msgstr "Ne eblis presi mesaĝon"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "Mesaøodosiero estas malplena!"
+msgstr "Mesaĝodosiero estas malplena!"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "Mesaøo ne redirektita."
+msgstr "Mesaĝo ne redirektita."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Mesaøo ne modifita!"
+msgstr "Mesaĝo ne modifita!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Patra mesaøo ne estas videbla en æi tiu limigita rigardo."
+msgstr "Patra mesaĝo ne estas videbla en ĉi tiu limigita rigardo."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Mesaøo prokrastita."
+msgstr "Mesaĝo prokrastita."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "Mesaøo presita"
+msgstr "Mesaĝo presita"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "Mesaøo skribita."
+msgstr "Mesaĝo skribita."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Mesaøoj redirektitaj."
+msgstr "Mesaĝoj redirektitaj."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "Ne eblis presi mesaøojn"
+msgstr "Ne eblis presi mesaĝojn"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "Mesaøoj ne redirektitaj."
+msgstr "Mesaĝoj ne redirektitaj."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Mesaøoj presitaj"
+msgstr "Mesaĝoj presitaj"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Mankas argumentoj"
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Mixmaster-æenoj estas limigitaj al %d elementoj."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster ne akceptas la kampon Cc aý Bcc en la æapo."
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Æu movi legitajn mesaøojn al %s?"
+msgstr "Ĉu movi legitajn mesaĝojn al %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Movas legitajn mesaøojn al %s ..."
+msgstr "Movas legitajn mesaĝojn al %s ..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nova Demando"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nova dosieronomo: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Nova dosiero: "
 
 #: buffy.cpkg:330
 msgid "New mail in "
-msgstr "Nova mesaøo en "
+msgstr "Nova mesaĝo en "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Nova mesaøo en æi tiu poþtfako"
+msgstr "Nova mesaĝo en ĉi tiu poŝtfako"
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Sekva"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "SekvPø"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "Nenia rajtiøilo disponata"
+msgstr "Nenia rajtiĝilo disponata"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Nenia limparametro trovita! (Raportu æi tiun cimon.)"
+msgstr "Nenia limparametro trovita! (Raportu ĉi tiun cimon.)"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Neniaj registroj."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Neniu dosiero kongruas kun la dosieromasko"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Neniu enir-poþtfako estas difinita."
+msgstr "Neniu enir-poŝtfako estas difinita."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Nenia þablono estas aktiva."
+msgstr "Nenia ŝablono estas aktiva."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Neniu poþtfako estas malfermita."
+msgstr "Neniu poŝtfako estas malfermita."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Mankas poþtfako kun nova poþto."
+msgstr "Mankas poŝtfako kun nova poŝto."
 
 #: attach.c:163
 #, c-format
@@ -2044,7 +1927,7 @@ msgstr ""
 msgid "No mailcap edit entry for %s"
 msgstr "En la Mailcap-dosiero mankas \"edit\" por %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "Neniu dissendolisto trovita!"
 
@@ -2052,201 +1935,187 @@ msgstr "Neniu dissendolisto trovita!"
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Neniu Mailcap-regulo kongruas. Traktas kiel tekston."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Ne estas mesaøoj en tiu poþtfako."
+msgstr "Ne estas mesaĝoj en tiu poŝtfako."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "Mankas mesaøoj, kiuj plenumas la kondiæojn"
+msgstr "Mankas mesaĝoj, kiuj plenumas la kondiĉojn"
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "Ne plu da citita teksto."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "Ne restas fadenoj."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "Ne plu da necitita teksto post citita teksto."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Mankas novaj mesaøoj en POP-poþtfako."
+msgstr "Mankas novaj mesaĝoj en POP-poŝtfako."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "Mankas novaj mesaøoj"
+msgstr "Mankas novaj mesaĝoj"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Temlinio ne specifita."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Neniu dosiero kongruas kun la dosieromasko"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Mankas poþtfako kun nova poþto."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "Mankas prokrastitaj mesaøoj."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Mankas poþtfako kun nova poþto."
+msgstr "Mankas prokrastitaj mesaĝoj."
 
 #: commands.c:378
 msgid "No printing command has been defined."
 msgstr "Neniu pres-komando estas difinita."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
 msgstr "Neniu ricevanto estas specifita!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr "Nenia ricevonto specifita.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
 msgstr "Neniuj ricevantoj estis specifitaj."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Mankas seræþablono."
+msgstr "Mankas serĉŝablono."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Temlinio ne specifita."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Mankas temlinio; æu haltigi sendon?"
+msgstr "Mankas temlinio; ĉu haltigi sendon?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Mankas temlinio; æu nuligi?"
+msgstr "Mankas temlinio; ĉu nuligi?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Mankas temlinio; eliras."
 
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "Poþtfako ne ekzistas"
+msgstr "Poŝtfako ne ekzistas"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "Mankas markitaj registroj."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Neniuj markitaj mesaøoj estas videblaj!"
+msgstr "Neniuj markitaj mesaĝoj estas videblaj!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Mankas markitaj mesaøoj."
+msgstr "Mankas markitaj mesaĝoj."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Mankas neforviþitaj mesaøoj."
+msgstr "Mankas neforviŝitaj mesaĝoj."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Mankas nelegitaj mesaøoj"
+msgstr "Mankas nelegitaj mesaĝoj"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "Mankas videblaj mesaøoj"
+msgstr "Mankas videblaj mesaĝoj"
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Ne disponata en æi tiu menuo."
+msgstr "Ne disponata en ĉi tiu menuo."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Ne trovita."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
 msgstr "Nenio farenda."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "Bone"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Mutt kapablas forviþi nur multipart-partojn."
+msgstr "Mutt kapablas forviŝi nur multipart-partojn."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Malfermi poþtfakon"
+msgstr "Malfermi poŝtfakon"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Malfermi poþtfakon nurlege"
+msgstr "Malfermi poŝtfakon nurlege"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Malfermu poþtfakon por aldoni mesaøon el øi"
+msgstr "Malfermu poŝtfakon por aldoni mesaĝon el ĝi"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Malfermi poþtfakon nurlege"
+msgstr "Malfermi poŝtfakon nurlege"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Malfermu poþtfakon por aldoni mesaøon el øi"
+msgstr "Malfermu poŝtfakon por aldoni mesaĝon el ĝi"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Eligo de la liverprocezo"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
-"PGP æ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaý, \"i(n)line\", aý (f)"
+"PGP ĉ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaŭ, \"i(n)line\", aŭ (f)"
 "orgesi? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP jam elektita. Æu nuligi kaj daýrigi? "
+msgstr "PGP jam elektita. Ĉu nuligi kaj daŭrigi? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP-þlosiloj, kiuj kongruas kun <%s>."
+msgstr "PGP-ŝlosiloj, kiuj kongruas kun <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "PGP-þlosiloj, kiuj kongruas kun <%s>."
+msgstr "PGP-ŝlosiloj, kiuj kongruas kun <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
@@ -2260,130 +2129,105 @@ msgstr "PGP-subskribo estis sukcese kontrolita."
 msgid "POP host is not defined."
 msgstr "POP-servilo ne estas difinita."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Patra mesaøo ne estas havebla."
+msgstr "Patra mesaĝo ne estas havebla."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Patra mesaøo ne estas videbla en æi tiu limigita rigardo."
+msgstr "Patra mesaĝo ne estas videbla en ĉi tiu limigita rigardo."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Pasvorto por %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Plena nomo: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Tubo"
-
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "Filtri per komando: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Trakti per: "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "Bonvolu doni øustan valoron al \"hostname\", kiam vi uzas mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Æu prokrasti æi tiun mesaøon?"
+msgstr "Ĉu prokrasti ĉi tiun mesaĝon?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "Prokrastitaj Mesaøoj"
+msgstr "Prokrastitaj Mesaĝoj"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "Antaýkonekta komando malsukcesis."
+msgstr "Antaŭkonekta komando malsukcesis."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Pretigas plusenditan mesaøon ..."
+msgstr "Pretigas plusenditan mesaĝon ..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Premu klavon por daýrigi ..."
+msgstr "Premu klavon por daŭrigi ..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "AntPø"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Presi"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Æu presi parton?"
+msgstr "Ĉu presi parton?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "Æu presi mesaøon?"
+msgstr "Ĉu presi mesaĝon?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Æu presi markitajn partojn?"
+msgstr "Ĉu presi markitajn partojn?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Æu presi markitajn mesaøojn?"
+msgstr "Ĉu presi markitajn mesaĝojn?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Æu forpurigi %d forviþitan mesaøon?"
+msgstr "Ĉu forpurigi %d forviŝitan mesaĝon?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Æu forpurigi %d forviþitajn mesaøojn?"
+msgstr "Ĉu forpurigi %d forviŝitajn mesaĝojn?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Demando"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Demando '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
 msgstr "Demandokomando ne difinita."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Demando: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Fini"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Æu eliri el Mutt?"
+msgstr "Ĉu eliri el Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Prenas nomspacojn ..."
@@ -2406,18 +2250,18 @@ msgstr "Legas %s ... %d (%d%%)"
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "Legas novajn mesaøojn (%d bitokojn) ..."
+msgstr "Legas novajn mesaĝojn (%d bitokojn) ..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Æu vere forviþi la poþtfakon \"%s\"?"
+msgstr "Ĉu vere forviŝi la poŝtfakon \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Æu revoki prokrastitan mesaøon?"
+msgstr "Ĉu revoki prokrastitan mesaĝon?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr "Rekodado efikas nur al tekstaj partoj."
 
@@ -2426,36 +2270,32 @@ msgstr "Rekodado efikas nur al tekstaj partoj."
 msgid "Rename failed: %s"
 msgstr "SSL malsukcesis: %s"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Kreado funkcias nur æe IMAP-poþtfakoj"
+msgstr "Kreado funkcias nur ĉe IMAP-poŝtfakoj"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Krei poþtfakon: "
+msgstr "Krei poŝtfakon: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Renomi al: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Remalfermas poþtfakon ..."
-
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Respondi"
+msgstr "Remalfermas poŝtfakon ..."
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "Æu respondi al %s%s?"
+msgstr "Ĉu respondi al %s%s?"
 
 #: commands.c:403
 #, fuzzy
@@ -2463,44 +2303,44 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Inversa ordigo laý (d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)"
+"Inversa ordigo laŭ (d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)"
 "rando/(p)oentoj?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Inversa seræo pri: "
+msgstr "Inversa serĉo pri: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Inversa seræo: "
+msgstr "Inversa serĉo: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Inversa ordigo laý (d)ato, (a)lfabete, (g)rando, aý (n)e ordigu? "
+msgstr "Inversa ordigo laŭ (d)ato, (a)lfabete, (g)rando, aŭ (n)e ordigu? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
-"PGP æ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaý, \"i(n)line\", aý (f)"
+"PGP ĉ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaŭ, \"i(n)line\", aŭ (f)"
 "orgesi? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME jam elektita. Æu nuligi kaj daýrigi? "
+msgstr "S/MIME jam elektita. Ĉu nuligi kaj daŭrigi? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Posedanto de S/MIME-atestilo ne kongruas kun sendinto."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME-atestiloj, kiuj kongruas kun \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "S/MIME-mesaøoj sen informoj pri enhavo ne funkcias."
+msgstr "S/MIME-mesaĝoj sen informoj pri enhavo ne funkcias."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
@@ -2512,9 +2352,9 @@ msgstr "S/MIME-subskribo estis sukcese kontrolita."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "SASL-rajtiøo malsukcesis."
+msgstr "SASL-rajtiĝo malsukcesis."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Fingrospuro: %s"
@@ -2524,135 +2364,111 @@ msgstr "Fingrospuro: %s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "SSL-konekto per %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Skribi"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "Æu skribi kopion de æi tiu mesaøo?"
+msgstr "Ĉu skribi kopion de ĉi tiu mesaĝo?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Skribi al dosiero: "
 
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "Skribi%s al poþtfako"
+msgstr "Skribi%s al poŝtfako"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "Skribas mesaøoflagojn ... [%d/%d]"
+msgstr "Skribas mesaĝoflagojn ... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Skribas ..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Seræi"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "Seræi pri: "
+msgstr "Serĉi pri: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Seræo atingis la finon sen trovi trafon"
+msgstr "Serĉo atingis la finon sen trovi trafon"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Seræo atingis la komencon sen trovi trafon"
+msgstr "Serĉo atingis la komencon sen trovi trafon"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Seræo interrompita."
+msgstr "Serĉo interrompita."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Seræo ne eblas por æi tiu menuo."
+msgstr "Serĉo ne eblas por ĉi tiu menuo."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Seræo rekomencis æe la fino."
+msgstr "Serĉo rekomencis ĉe la fino."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Seræo rekomencis æe la komenco."
+msgstr "Serĉo rekomencis ĉe la komenco."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "Seræo: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Elekto"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Elekti  "
+msgstr "Serĉo: "
 
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Elekti plusendiloæenon."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "Elektas %s ..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Sendi"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Sendas en fono."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "Sendas mesaøon ..."
+msgstr "Sendas mesaĝon ..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
 msgstr "Servilo fermis la konekton!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Þalti flagon"
+msgstr "Ŝalti flagon"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "Þelkomando: "
+msgstr "Ŝelkomando: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Subskribi"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Subskribi kiel: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Subskribi, Æifri"
+msgstr "Subskribi, Ĉifri"
 
 #: commands.c:406
 #, fuzzy
@@ -2660,37 +2476,33 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Ordigo laý (d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)rando/(p)"
+"Ordigo laŭ (d)ato/d(e)/(r)ecv/(t)emo/(a)l/(f)adeno/(n)esortite/(g)rando/(p)"
 "oentoj?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Ordigo laý (d)ato, (a)lfabete, (g)rando, aý (n)e ordigu? "
+msgstr "Ordigo laŭ (d)ato, (a)lfabete, (g)rando, aŭ (n)e ordigu? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Ordigas poþtfakon ..."
+msgstr "Ordigas poŝtfakon ..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Abonita [%s], Dosieromasko: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2699,124 +2511,124 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "Abonas %s ..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "Kontrolo de SSL-atestilo"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Marki mesaøojn laý la þablono: "
+msgstr "Marki mesaĝojn laŭ la ŝablono: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Marku la mesaøojn, kiujn vi volas aldoni!"
+msgstr "Marku la mesaĝojn, kiujn vi volas aldoni!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
 msgstr "Markado ne funkcias."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Tiu mesaøo ne estas videbla."
+msgstr "Tiu mesaĝo ne estas videbla."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
 msgstr "SSL ne estas disponata."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "Æi tiu parto estos konvertita."
+msgstr "Ĉi tiu parto estos konvertita."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "Æi tiu parto ne estos konvertita."
+msgstr "Ĉi tiu parto ne estos konvertita."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "La mesaøindekso estas maløusta. Provu remalfermi la poþtfakon."
+msgstr "La mesaĝindekso estas malĝusta. Provu remalfermi la poŝtfakon."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "La plusendiloæeno estas jam malplena."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "Mankas mesaøopartoj."
+msgstr "Mankas mesaĝopartoj."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "Ne estas mesaøoj."
+msgstr "Ne estas mesaĝoj."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "Mankas subpartoj por montri!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Æi tiu IMAP-servilo estas antikva. Mutt ne funkcias kun øi."
+msgstr "Ĉi tiu IMAP-servilo estas antikva. Mutt ne funkcias kun ĝi."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Æi tiu atestilo apartenas al:"
+msgstr "Ĉi tiu atestilo apartenas al:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Æi tiu atestilo estis valida"
+msgstr "Ĉi tiu atestilo estis valida"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Æi tiu atestilo estis eldonita de:"
+msgstr "Ĉi tiu atestilo estis eldonita de:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Æi tiu þlosilo ne estas uzebla: eksvalidiøinta/malþaltita/revokita."
+msgstr "Ĉi tiu ŝlosilo ne estas uzebla: eksvalidiĝinta/malŝaltita/revokita."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Fadeno enhavas nelegitajn mesaøojn."
+msgstr "Fadeno enhavas nelegitajn mesaĝojn."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Fadenoj ne estas þaltitaj."
+msgstr "Fadenoj ne estas ŝaltitaj."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Tro da tempo pasis dum provado akiri fcntl-þloson!"
+msgstr "Tro da tempo pasis dum provado akiri fcntl-ŝloson!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Tro da tempo pasis dum provado akiri flock-þloson!"
+msgstr "Tro da tempo pasis dum provado akiri flock-ŝloson!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Vi estas æe la komenco de la mesaøo"
+msgstr "Vi estas ĉe la komenco de la mesaĝo"
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "Provas eltiri PGP-þlosilojn ...\n"
+msgstr "Provas eltiri PGP-ŝlosilojn ...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Provas eltiri S/MIME-atestilojn ...\n"
 
@@ -2833,30 +2645,30 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "SASL-rajtiøo malsukcesis."
+msgstr "SASL-rajtiĝo malsukcesis."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Ne povas aldoni %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "Ne povas aldoni!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Ne povas preni æapojn de æi tiu versio de IMAP-servilo."
+msgstr "Ne povas preni ĉapojn de ĉi tiu versio de IMAP-servilo."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "Ne povas akiri SSL-atestilon"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Ne povas lasi mesaøojn æe la servilo."
+msgstr "Ne povas lasi mesaĝojn ĉe la servilo."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "Ne povas aldoni %s!"
@@ -2864,14 +2676,14 @@ msgstr "Ne povas aldoni %s!"
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Ne povis þlosi poþtfakon!"
+msgstr "Ne povis ŝlosi poŝtfakon!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
 msgstr "Ne povas malfermi dumtempan dosieron!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
 msgstr "Ne povas malfermi dumtempan dosieron!"
@@ -2880,31 +2692,22 @@ msgstr "Ne povas malfermi dumtempan dosieron!"
 msgid "Unable to open temporary file!"
 msgstr "Ne povas malfermi dumtempan dosieron!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Malforviþi"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Malforviþi mesaøojn laý la þablono: "
+msgstr "Malforviŝi mesaĝojn laŭ la ŝablono: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "Malforviþi"
+msgstr "Malforviŝi"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Nekonata Content-Type %s"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Malabonas %s ..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Malabonas %s ..."
@@ -2914,59 +2717,51 @@ msgstr "Malabonas %s ..."
 msgid "Unsubscribing to %s..."
 msgstr "Malabonas %s ..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Malmarki mesaøojn laý la þablono: "
+msgstr "Malmarki mesaĝojn laŭ la ŝablono: "
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "Alþutas mesaøon ..."
+msgstr "Alŝutas mesaĝon ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Uzu 'toggle-write' por reebligi skribon!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Æu uzi keyID = \"%s\" por %s?"
+msgstr "Ĉu uzi keyID = \"%s\" por %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "Uzantonomo æe %s: "
+msgstr "Uzantonomo ĉe %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "Nevalida monato: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "Nevalida monato: %s"
 
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
-
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Æu kontroli PGP-subskribon?"
+msgstr "Ĉu kontroli PGP-subskribon?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Kontrolas mesaøindeksojn ..."
-
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Vidi Partojn"
+msgstr "Kontrolas mesaĝindeksojn ..."
 
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "AVERTO! Vi estas surskribonta %s; æu daýrigi?"
+msgstr "AVERTO! Vi estas surskribonta %s; ĉu daŭrigi?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2974,29 +2769,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "Atestilo de servilo estas eksvalidiøinta"
+msgstr "Atestilo de servilo estas eksvalidiĝinta"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "Atestilo de servilo estas eksvalidiøinta"
+msgstr "Atestilo de servilo estas eksvalidiĝinta"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "Atestilo de servilo ankoraý ne validas"
+msgstr "Atestilo de servilo ankoraŭ ne validas"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "Atestilo de servilo ankoraý ne validas"
+msgstr "Atestilo de servilo ankoraŭ ne validas"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3011,18 +2806,18 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "Atendas fcntl-þloson ... %d"
+msgstr "Atendas fcntl-ŝloson ... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "Atendas flock-þloson ... %d"
+msgstr "Atendas flock-ŝloson ... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Atendas respondon ..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "Averto: '%s' estas malbona IDN."
@@ -3030,14 +2825,14 @@ msgstr "Averto: '%s' estas malbona IDN."
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Atestilo de servilo estas eksvalidiøinta"
+msgstr "Atestilo de servilo estas eksvalidiĝinta"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Averto: Malbona IDN '%s' en adreso '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Averto: Ne povis skribi atestilon"
 
@@ -3057,127 +2852,109 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Oni malsukcesis krei kunsenda¼on"
+msgstr "Oni malsukcesis krei kunsendaĵon"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Skribo malsukcesis! Skribis partan poþtfakon al %s"
+msgstr "Skribo malsukcesis! Skribis partan poŝtfakon al %s"
 
 #: attach.c:731
 msgid "Write fault!"
 msgstr "Skriberaro!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Skribi mesaøon al poþtfako"
+msgstr "Skribi mesaĝon al poŝtfako"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
 msgstr "Skribas %s ..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "Skribas mesaøon al %s ..."
+msgstr "Skribas mesaĝon al %s ..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "Skribas mesaøojn ... %d (%d%%)"
+msgstr "Skribas mesaĝojn ... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Eraro en komandlinio: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
 msgstr "En la adresaro jam estas nomo kun tiu adreso!"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Vi jam elektis la unuan elementon de la æeno."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Vi jam elektis la lastan elementon de la æeno."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Vi estas æe la lasta registro."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Vi estas æe la unua paøo."
+msgstr "Vi estas ĉe la lasta registro."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Vi estas æe la unua mesaøo."
+msgstr "Vi estas ĉe la unua mesaĝo."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Vi estas æe la unua paøo."
+msgstr "Vi estas ĉe la unua paĝo."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Vi estas æe la unua fadeno."
+msgstr "Vi estas ĉe la unua fadeno."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Vi estas æe la lasta registro."
+msgstr "Vi estas ĉe la lasta registro."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Vi estas æe la lasta paøo."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Vi estas æe la lasta mesaøo."
+msgstr "Vi estas ĉe la lasta mesaĝo."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Vi estas æe la lasta paøo."
+msgstr "Vi estas ĉe la lasta paĝo."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
 msgstr "Vi ne povas rulumi pli malsupren."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
 msgstr "Vi ne povas rulumi pli supren."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
 msgstr "Vi ne havas adresaron!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Vi ne povas forviþi la solan parton."
+msgstr "Vi ne povas forviŝi la solan parton."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Vi povas redirekti nur message/rfc822-partojn."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] Æu akcepti?"
+msgstr "[%s = %s] Ĉu akcepti?"
 
 #: handler.c:1443
 #, c-format
@@ -3197,27 +2974,27 @@ msgstr "[-- Erareligo de %s --]\n"
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Aýtomata vidigo per %s --]\n"
+msgstr "[-- Aŭtomata vidigo per %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
-msgstr "[-- KOMENCO DE PGP-MESAØO --]\n"
+msgstr "[-- KOMENCO DE PGP-MESAĜO --]\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- KOMENCO DE PUBLIKA PGP-ÞLOSILO --]\n"
+msgstr "[-- KOMENCO DE PUBLIKA PGP-ŜLOSILO --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- KOMENCO DE PGP-SUBSKRIBITA MESAØO --]\n"
+"[-- KOMENCO DE PGP-SUBSKRIBITA MESAĜO --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3226,42 +3003,42 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Ne povas ruli %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- FINO DE PGP-MESAØO --]\n"
+msgstr "[-- FINO DE PGP-MESAĜO --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FINO DE PUBLIKA PGP-ÞLOSILO --]\n"
+msgstr "[-- FINO DE PUBLIKA PGP-ŜLOSILO --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- FINO DE PGP-SUBSKRIBITA MESAØO --]\n"
+msgstr "[-- FINO DE PGP-SUBSKRIBITA MESAĜO --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Fino de PGP/MIME-æifritaj datenoj --]\n"
+msgstr "[-- Fino de PGP/MIME-ĉifritaj datenoj --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- Fino de PGP/MIME-æifritaj datenoj --]\n"
+msgstr "[-- Fino de PGP/MIME-ĉifritaj datenoj --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Fino de S/MIME-æifritaj datenoj. --]\n"
+"[-- Fino de S/MIME-ĉifritaj datenoj. --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Fino de S/MIME-subskribitaj datenoj. --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3274,15 +3051,15 @@ msgstr ""
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- Eraro: Neniu parto de Multipart/Alternative estis montrebla! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- Eraro: maløusta strukturo de multipart/signed! --]\n"
+"[-- Eraro: malĝusta strukturo de multipart/signed! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3291,69 +3068,69 @@ msgstr ""
 "[-- Eraro: nekonata multipart/signed-protokolo %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Eraro: ne povas krei dumtempan dosieron! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Eraro: ne povas trovi komencon de PGP-mesaøo! --]\n"
+"[-- Eraro: ne povas trovi komencon de PGP-mesaĝo! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- Eraro: ne povas krei dumtempan dosieron! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- Eraro: misformita PGP/MIME-mesaøo! --]\n"
+"[-- Eraro: misformita PGP/MIME-mesaĝo! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- Eraro: parto message/external ne havas parametro access-type --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- La sekvaj datenoj estas PGP/MIME-æifritaj --]\n"
+"[-- La sekvaj datenoj estas PGP/MIME-ĉifritaj --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- La sekvaj datenoj estas PGP/MIME-æifritaj --]\n"
+"[-- La sekvaj datenoj estas PGP/MIME-ĉifritaj --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
-msgstr "[-- La sekvaj datenoj estas S/MIME-æifritaj --]\n"
+msgstr "[-- La sekvaj datenoj estas S/MIME-ĉifritaj --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr "[-- La sekvaj datenoj estas S/MIME-subskribitaj --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -3364,19 +3141,19 @@ msgstr ""
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- Æi tiu %s/%s-parto "
+msgstr "[-- Ĉi tiu %s/%s-parto "
 
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- Æi tiu %s/%s-parto ne estas inkluzivita, --]\n"
+msgstr "[-- Ĉi tiu %s/%s-parto ne estas inkluzivita, --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Speco: %s/%s, Kodado: %s, Grando: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -3384,7 +3161,7 @@ msgstr ""
 "[-- Averto: ne povas trovi subskribon. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3402,7 +3179,7 @@ msgstr "[-- kaj Mutt ne kapablas je la indikita alirmaniero %s. --]\n"
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
-msgstr "[-- kaj la indikita ekstera fonto eksvalidiøis. --]\n"
+msgstr "[-- kaj la indikita ekstera fonto eksvalidiĝis. --]\n"
 
 #: handler.c:1201
 #, c-format
@@ -3414,33 +3191,33 @@ msgstr "[-- nomo: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- je %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Eksvalidiøinte"
+msgstr "Eksvalidiĝinte"
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
 msgstr "Nevalida      "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
 msgstr "Revokite      "
@@ -3454,16 +3231,43 @@ msgstr "[nevalida dato]"
 msgid "[unable to calculate]"
 msgstr "[ne povas kalkuli]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "adresaro: mankas adreso"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Ne povas trovi markitajn mesaĝojn."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Ne povas trovi markitajn mesaĝojn."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Ĉu skribi kopion de ĉi tiu mesaĝo?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "redakti priskribon de parto"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "redakti priskribon de parto"
@@ -3472,50 +3276,199 @@ msgstr "redakti priskribon de parto"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: tro da argumentoj"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Eraro dum legado de dosierujo."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Mankas poŝtfako kun nova poŝto."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: nesufiæe da argumentoj"
+msgstr "color: nesufiĉe da argumentoj"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Mankas novaj mesaĝoj"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr "konvertas"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Skribi mesaĝon al poŝtfako"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "Ne povis krei dumtempan poþtfakon: %s"
+msgstr "Ne povis krei dumtempan poŝtfakon: %s"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "Ne povis stumpigi dumtempan poþtfakon: %s"
+msgstr "Ne povis stumpigi dumtempan poŝtfakon: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Ne povis skribi al dumtempa poþtfako: %s"
+msgstr "Ne povis skribi al dumtempa poŝtfako: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
 
-#: browser.c:1206
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Neniu enir-poŝtfako estas difinita."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dagn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
 msgstr "implicitaj koloroj ne funkcias"
 
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Ĉu forviŝi mesaĝojn de servilo?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Malforviŝi mesaĝojn laŭ la ŝablono: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Malforviŝi mesaĝojn laŭ la ŝablono: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
+
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dertafngp"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Ĉu redakti plusendatan mesaĝon?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3531,29 +3484,116 @@ msgstr "Kopias al %s ..."
 msgid "echo Decompressing %s..."
 msgstr "Elektas %s ..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Ĉi tiu parto ne estos konvertita."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "redakti priskribon de parto"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Ne povas skribi mesaĝon"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Prenas mesaĝoĉapojn ... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Ĉu redakti plusendatan mesaĝon?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Ĉu skribi kopion de ĉi tiu mesaĝo?"
+
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "malplena þablono"
+msgstr "malplena ŝablono"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "Æifri"
+msgstr "Ĉifri"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Ĉu skribi kopion de ĉi tiu mesaĝo?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3568,17 +3608,17 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
 #: pattern.c:499
 msgid "error in expression"
@@ -3587,17 +3627,17 @@ msgstr "eraro en esprimo"
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3607,27 +3647,83 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "eraro en þablono æe: %s"
+msgstr "eraro en ŝablono ĉe: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "eraro: nekonata funkcio %d (raportu æi tiun cimon)"
+msgstr "eraro: nekonata funkcio %d (raportu ĉi tiun cimon)"
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "iskanf"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "iskanf"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec: mankas argumentoj"
 
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Ĉu respondi grupe al %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Ĉu plusendi kiel kunsendaĵojn?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Kontrolas pri novaj mesaĝoj ..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Vi estas ĉe la unua mesaĝo."
+
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
 msgid "gnutls_certificate_allocate_credentials: %s"
@@ -3648,41 +3744,155 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Vi estas ĉe la lasta paĝo."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Mankas poŝtfako kun nova poŝto."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Eraro dum malfermado de poŝtfako"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Mankas poŝtfako kun nova poŝto."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "estas forviþita --]\n"
+msgstr "estas forviŝita --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE malsukcesis"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "nevalida æaplinio"
+msgstr "nevalida ĉaplinio"
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Nevalida indeksnumero."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Salti al mesaĝo: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Salti al mesaĝo: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Fadeno enhavas nelegitajn mesaĝojn."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Vi estas ĉe la unua fadeno."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Mankas nelegitaj mesaĝoj"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Mankas nelegitaj mesaĝoj"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Ĉu skribi kopion de ĉi tiu mesaĝo?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
-msgstr "PGP-þlosiloj, kiuj kongruas kun <%s>."
+msgstr "PGP-ŝlosiloj, kiuj kongruas kun <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Redirekti markitajn mesaĝojn al: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Mankas poŝtfako kun nova poŝto."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: malplena klavoserio"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro: tro da argumentoj"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
@@ -3690,12 +3900,44 @@ msgstr "mailcap-regulo por speco %s ne trovita"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): ne povas þanøi tempon de dosiero"
+msgstr "maildir_commit_message(): ne povas ŝanĝi tempon de dosiero"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "Mesaøoj ne redirektitaj."
+msgstr "Mesaĝoj ne redirektitaj."
 
 #: pattern.c:746
 #, c-format
@@ -3707,75 +3949,419 @@ msgstr "krampoj ne kongruas: %s"
 msgid "missing parameter"
 msgstr "parametro mankas"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: nesufiæe da argumentoj"
+msgstr "mono: nesufiĉe da argumentoj"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Vi estas ĉe la lasta registro."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Vi estas ĉe la unua mesaĝo."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Vi estas ĉe la lasta registro."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Vi estas ĉe la lasta mesaĝo."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Vi estas ĉe la lasta registro."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Vi estas ĉe la lasta paĝo."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Mankas neforviŝitaj mesaĝoj."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Vi estas ĉe la lasta registro."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Vi estas ĉe la unua paĝo."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Mankas neforviŝitaj mesaĝoj."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Vi estas ĉe la unua paĝo."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "Plurparta mesaøo ne havas limparametron!"
+msgstr "Plurparta mesaĝo ne havas limparametron!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "ne"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(mankas poþtfako)"
+msgstr "(mankas poŝtfako)"
 
 #: commands.c:788
 msgid "not converting"
 msgstr "ne konvertas"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "malplena klavoserio"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
 msgstr "san"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Malfermi poŝtfakon nurlege"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Malfermi poŝtfakon nurlege"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Remalfermas poŝtfakon ..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Redirekti mesaĝon al %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "reset: prefikso ne permesata"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Vi estas ĉe la lasta registro."
+
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push: tro da argumentoj"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Ĉu revoki prokrastitan mesaĝon?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Fadeno enhavas nelegitajn mesaĝojn."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Ne eblas redakti mesaĝon en POP-servilo."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: ne povas aldoni dosieron"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Salti al mesaĝo: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Ĉu forviŝi mesaĝojn de servilo?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "mu"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "mua"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Skribi%s al poŝtfako"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Skribi%s al poŝtfako"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Ne eblas redakti mesaĝon en POP-servilo."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "eraro en esprimo"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Serĉi pri: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Ne povis sendi la mesaĝon."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Ĉu plusendi kiel kunsendaĵojn?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Limigi al mesaĝoj laŭ la ŝablono: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Ne plu da citita teksto."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Ĉu presi mesaĝon?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Ne estas mesaĝoj en tiu poŝtfako."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source: eraro æe %s"
+msgstr "source: eraro ĉe %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: eraroj en %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: legado æesis pro tro da eraroj en %s"
+msgstr "source: legado ĉesis pro tro da eraroj en %s"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Neniu dosiero kongruas kun la dosieromasko"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: mbox modifita, sed mankas modifitaj mesaøoj! (Raportu æi tiun cimon.)"
+"sync: mbox modifita, sed mankas modifitaj mesaĝoj! (Raportu ĉi tiun cimon.)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Malmarki mesaĝojn laŭ la ŝablono: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Vi estas ĉe la unua fadeno."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3787,27 +4373,98 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Ne plu da citita teksto."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Rekodado efikas nur al tekstaj partoj."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Mankas serĉŝablono."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Mankas nelegitaj mesaĝoj"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "nesufiæe da argumentoj"
+msgstr "nesufiĉe da argumentoj"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "tro da argumentoj"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "redakti priskribon de parto"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Malforviŝi mesaĝojn laŭ la ŝablono: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Malforviŝi mesaĝojn laŭ la ŝablono: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Malforviŝi mesaĝojn laŭ la ŝablono: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: Ne povas forviþi %s de en %s."
+msgstr "unhook: Ne povas forviŝi %s de en %s."
 
 #: hook.c:204
 #, c-format
@@ -3819,10 +4476,28 @@ msgstr "unhook: Ne povas fari unhook * de en hoko."
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: nekonata speco de hook: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "nekonata eraro"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Malmarki mesaĝojn laŭ la ŝablono: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "redakti priskribon de parto"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3834,12 +4509,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
 msgstr "reset: valoro ne permesata"
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Parto skribita."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Nova dosiero: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Skribi mesaĝon al poŝtfako"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "jes"
 
@@ -3847,3 +4553,6 @@ msgstr "jes"
 msgid "yna"
 msgstr "jni"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/es.po b/po/es.po
index b52196c..aab5cea 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -4,25 +4,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2001-06-08 19:44+02:00\n"
 "Last-Translator: Boris Wesslowski <Boris@Wesslowski.com>\n"
 "Language-Team: -\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Enlaces genéricos:\n"
+"Enlaces genéricos:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -32,7 +32,7 @@ msgstr ""
 "Funciones sin enlazar:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 #, fuzzy
 msgid ""
 "\n"
@@ -72,38 +72,38 @@ msgstr ""
 "     mutt -v[v]\n"
 "\n"
 "opciones:\n"
-"  -a <archivo>\tañadir un archivo al mensaje\n"
-"  -b <dirección>\tespecifica una dirección para enviar copia ciega (BCC)\n"
-"  -c <dirección>\tespecifica una dirección para enviar copia (CC)\n"
+"  -a <archivo>\tañadir un archivo al mensaje\n"
+"  -b <dirección>\tespecifica una dirección para enviar copia ciega (BCC)\n"
+"  -c <dirección>\tespecifica una dirección para enviar copia (CC)\n"
 "  -e <comando>\tespecifica un comando a ser ejecutado al empezar\n"
-"  -f <archivo>\tespecifica un buzón a leer\n"
+"  -f <archivo>\tespecifica un buzón a leer\n"
 "  -F <archivo>\tespecifica un archivo muttrc alterno\n"
 "  -H <archivo>\tespecifica un archivo para obtener una cabecera\n"
 "  -i <archivo>\tespecifica un archivo a incluir en la respuesta\n"
-"  -m <tipo>\tespecifica un tipo de buzón\n"
+"  -m <tipo>\tespecifica un tipo de buzón\n"
 "  -n\t\tproduce que Mutt no lea el archivo Muttrc del sistema\n"
 "  -p\t\tcontinuar un mensaje pospuesto\n"
-"  -R\t\tabrir un buzón en modo de solo-lectura\n"
+"  -R\t\tabrir un buzón en modo de solo-lectura\n"
 "  -s <asunto>\tespecifica el asunto (necesita comillas si contiene "
 "espacios)\n"
-"  -v\t\tmuestra versión y opciones definidas al compilar\n"
-"  -x\t\tsimula el modo de envío mailx\n"
-"  -y\t\tselecciona un buzón especificado en su lista `mailboxes'\n"
-"  -z\t\tsalir inmediatamente si no hay mensajes en el buzón\n"
+"  -v\t\tmuestra versión y opciones definidas al compilar\n"
+"  -x\t\tsimula el modo de envío mailx\n"
+"  -y\t\tselecciona un buzón especificado en su lista `mailboxes'\n"
+"  -z\t\tsalir inmediatamente si no hay mensajes en el buzón\n"
 "  -Z\t\tabrir la primera carpeta con mensajes nuevos, salir si no hay\n"
 "  -h\t\teste mensaje de ayuda"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " firmar como: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     a %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   de %s"
@@ -146,15 +146,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' para lista): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
 msgstr "(continuar)\n"
@@ -164,11 +164,11 @@ msgstr "(continuar)\n"
 msgid " Press '%s' to toggle write"
 msgstr "Presione '%s' para cambiar escritura"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr " en esta vista limitada"
 
@@ -179,7 +179,7 @@ msgstr " marcado"
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: comando inválido"
+msgstr "%c: comando inválido"
 
 #: pattern.c:721
 #, c-format
@@ -196,45 +196,45 @@ msgstr "quedan %d, %d suprimidos."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "quedan %d, %d movidos, %d suprimidos."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s [%s]\n"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s [%s]\n"
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s ¿Realmente quiere utilizar la llave?"
+msgstr "%s ¿Realmente quiere utilizar la llave?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] modificado. ¿Rehacer codificación?"
+msgstr "%s [#%d] modificado. ¿Rehacer codificación?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "¡%s [#%d] ya no existe!"
+msgstr "¡%s [#%d] ya no existe!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d de %d mensajes leídos]"
+msgstr "%s [%d de %d mensajes leídos]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s no existe. ¿Crearlo?"
+msgstr "%s no existe. ¿Crearlo?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
@@ -246,17 +246,17 @@ msgstr ""
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr ""
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s no es un directorio."
@@ -264,22 +264,22 @@ msgstr "%s no es un directorio."
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "¡%s no es un buzón!"
+msgstr "¡%s no es un buzón!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s no es un buzón."
+msgstr "%s no es un buzón."
 
 #: sendlib.c:748
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
-msgstr "%s no es un buzón."
+msgstr "%s no es un buzón."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "¡%s ya no existe!"
+msgstr "¡%s ya no existe!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -293,92 +293,92 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: tipo desconocido"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s: color no soportado por la terminal"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: comando sólo válido para objetos en el índice"
+msgstr "%s: comando sólo válido para objetos en el índice"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: atributo desconocido"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: color desconocido"
 
-#: keymap.c:847
+#: keymap.c:839
 #, fuzzy, c-format
 msgid "%s: no such function"
-msgstr "%s: función deconocida"
+msgstr "%s: función deconocida"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: función deconocida"
+msgstr "%s: función deconocida"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: menú desconocido"
+msgstr "%s: menú desconocido"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: objeto desconocido"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: parámetros insuficientes"
+msgstr "%s: parámetros insuficientes"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s: imposible adjuntar archivo"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: imposible adjuntar archivo.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando desconocido"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo desconocido"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variable desconocida"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
 msgstr ""
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr ""
@@ -387,22 +387,22 @@ msgstr ""
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(necesita 'view-attachments' enlazado a una tecla)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(ningún buzón)"
+msgstr "(ningún buzón)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)echazar, aceptar (u)na vez"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)echazar, aceptar (u)na vez, (a)ceptar siempre"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(tamaño %s bytes) "
+msgstr "(tamaño %s bytes) "
 
 #: handler.c:1448
 #, c-format
@@ -413,20 +413,20 @@ msgstr "(use '%s' para ver esta parte)"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Archivos adjuntos"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<DESCONOCIDO>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<por defecto>"
 
@@ -440,37 +440,33 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "Verificación de autentidad APOP falló."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Abortar"
+msgstr "Verificación de autentidad APOP falló."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "¿Cancelar mensaje sin cambios?"
+msgstr "¿Cancelar mensaje sin cambios?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
 msgstr "Mensaje sin cambios cancelado."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "Dirección: "
+msgstr "Dirección: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Dirección añadida."
+msgstr "Dirección añadida."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Nombre corto: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Libreta"
 
@@ -478,64 +474,60 @@ msgstr "Libreta"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Todas las llaves que coinciden están marcadas expiradas/revocadas."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Adjuntar"
+msgstr "Todas las llaves que coinciden están marcadas expiradas/revocadas."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "¿Agregar mensajes a %s?"
+msgstr "¿Agregar mensajes a %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Argumento tiene que ser un número de mensaje."
+msgstr "Argumento tiene que ser un número de mensaje."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Archivo adjunto guardado."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Adjuntar archivo"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Adjuntando archivos seleccionados..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Archivo adjunto filtrado."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Archivo adjunto guardado."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Archivos adjuntos"
 
@@ -566,12 +558,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -584,11 +576,11 @@ msgstr ""
 #: imap/imap.c:1342
 #, fuzzy
 msgid "Bad mailbox name"
-msgstr "Crear buzón: "
+msgstr "Crear buzón: "
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "El final del mensaje está siendo mostrado."
+msgstr "El final del mensaje está siendo mostrado."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
@@ -608,13 +600,13 @@ msgstr "Rebotar mensajes a %s"
 msgid "Bounce tagged messages to: "
 msgstr "Rebotar mensajes marcados a: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "CLOSE falló"
+msgstr "CLOSE falló"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -625,16 +617,16 @@ msgstr ""
 msgid "Can't append to folder: %s"
 msgstr "No se pudo agregar a la carpeta: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "¡No se puede adjuntar un directorio!"
+msgstr "¡No se puede adjuntar un directorio!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "No se pudo crear %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "No se pudo creal el archivo %s"
@@ -647,10 +639,10 @@ msgstr "No se pudo crear filtro"
 msgid "Can't create filter process"
 msgstr "No se pudo crear el proceso del filtro"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "No se pudo crear archivo temporal"
 
@@ -658,24 +650,24 @@ msgstr "No se pudo crear archivo temporal"
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
 "No se pudieron decodificar todos los archivos adjuntos marcados.  "
-"¿Encapsular los otros por MIME?"
+"¿Encapsular los otros por MIME?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"No se pudieron decodificar todos los archivos adjuntos marcados.  ¿Adelantar "
+"No se pudieron decodificar todos los archivos adjuntos marcados.  ¿Adelantar "
 "los otros por MIME?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
-msgstr "No fue encontrado ningún mensaje marcado."
+msgstr "No fue encontrado ningún mensaje marcado."
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "No se puede suprimir un archivo adjunto del servidor POP."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "No se puede suprimir un archivo adjunto del servidor POP."
@@ -691,15 +683,11 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "No fue encontrado ningún mensaje marcado."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "¡No se pudo obtener el type2.list del mixmaster!"
+msgstr "No fue encontrado ningún mensaje marcado."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "No se pudo encontrar el nombre, ¿continuar?"
+msgstr "No se pudo encontrar el nombre, ¿continuar?"
 
 #: editmsg.c:115
 #, c-format
@@ -711,41 +699,41 @@ msgstr "No se pudo abrir el archivo del mensaje: %s"
 msgid "Can't open trash folder"
 msgstr "No se pudo agregar a la carpeta: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Conexión a %s cerrada"
+msgstr "Conexión a %s cerrada"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Cerrando conexión al servidor POP..."
+msgstr "Cerrando conexión al servidor POP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "No se pudo encontrar en disco: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "No se pudo crear %s: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "No se puede guardar un mensaje en un buzón POP."
+msgstr "No se puede guardar un mensaje en un buzón POP."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
 msgstr "No se pueden editar mensajes en el servidor POP."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "No se pudo encontrar en disco: %s"
@@ -754,18 +742,18 @@ msgstr "No se pudo encontrar en disco: %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "No se puede mostrar el directorio"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "No se pudo crear %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "¡No se pudo escribir la cabecera al archivo temporal!"
+msgstr "¡No se pudo escribir la cabecera al archivo temporal!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
@@ -773,7 +761,7 @@ msgstr "No se pudo escribir el mensaje"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "¡No se pudo escribir el mensaje al archivo temporal!"
+msgstr "¡No se pudo escribir el mensaje al archivo temporal!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
@@ -783,42 +771,38 @@ msgstr "No se pudo crear el filtro de muestra"
 msgid "Cannot create filter"
 msgstr "No se pudo crear el filtro"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "¡No se puede cambiar a escritura un buzón de sólo lectura!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "¡No se puede cambiar a escritura un buzón de sólo lectura!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "\"%s\" recibido...  Saliendo.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "Certificado del servidor todavía no es válido"
+msgstr "Certificado del servidor todavía no es válido"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "El certificado fue guardado"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Los cambios al buzón seran escritos al salir del mismo."
+msgstr "Los cambios al buzón seran escritos al salir del mismo."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Los cambios al buzón no serán escritos."
+msgstr "Los cambios al buzón no serán escritos."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -828,28 +812,20 @@ msgstr ""
 msgid "Character set changed to %s; %s."
 msgstr "El mapa de caracteres fue cambiado a %s; %s."
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "Directorio"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Cambiar directorio a:"
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Revisando si hay mensajes nuevos..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Verificar clave  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Revisando si hay mensajes nuevos..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Revisando si hay mensajes nuevos..."
@@ -858,7 +834,7 @@ msgstr "Revisando si hay mensajes nuevos..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "En claro"
 
@@ -866,16 +842,16 @@ msgstr "En claro"
 msgid "Clear flag"
 msgstr "Quitar indicador"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Cerrando conexión a %s..."
+msgstr "Cerrando conexión a %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "Cerrando conexión al servidor POP..."
+msgstr "Cerrando conexión al servidor POP..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Conectando a %s..."
@@ -883,19 +859,19 @@ msgstr "Conectando a %s..."
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "La órden TOP no es soportada por el servidor."
+msgstr "La órden TOP no es soportada por el servidor."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "La órden UIDL no es soportada por el servidor."
+msgstr "La órden UIDL no es soportada por el servidor."
 
 #: lib-mx/mbox.c:547
 #, fuzzy
 msgid "Committing changes..."
-msgstr "Compilando patrón de búsqueda..."
+msgstr "Compilando patrón de búsqueda..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -904,7 +880,7 @@ msgstr ""
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Compilando patrón de búsqueda..."
+msgstr "Compilando patrón de búsqueda..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
@@ -916,12 +892,12 @@ msgstr "Copiando a %s..."
 msgid "Compressing %s..."
 msgstr "Copiando a %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Conectando a %s..."
@@ -939,44 +915,44 @@ msgstr "Conectando a %s..."
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Conexión perdida. ¿Reconectar al servidor POP?"
+msgstr "Conexión perdida. ¿Reconectar al servidor POP?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Conexión perdida. ¿Reconectar al servidor POP?"
+msgstr "Conexión perdida. ¿Reconectar al servidor POP?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "Conexión a %s cerrada"
+msgstr "Conexión a %s cerrada"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Conexión a %s cerrada"
+msgstr "Conexión a %s cerrada"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type cambiado a %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type es de la forma base/subtipo"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "¿Continuar?"
+msgstr "¿Continuar?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "¿Convertir a %s al mandar?"
+msgstr "¿Convertir a %s al mandar?"
 
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
-msgstr "%s%s en buzón"
+msgstr "%s%s en buzón"
 
 #: imap/message.c:681
 #, c-format
@@ -1013,33 +989,33 @@ msgstr "No se pudo conectar a %s (%s)."
 msgid "Could not copy message"
 msgstr "No se pudo copiar el mensaje"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "¡No se pudo crear el archivo temporal!"
+msgstr "¡No se pudo crear el archivo temporal!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "¡No se pudo crear el archivo temporal!"
+msgstr "¡No se pudo crear el archivo temporal!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "¡No se pudo encontrar la función para ordenar! [reporte este fallo]"
+msgstr "¡No se pudo encontrar la función para ordenar! [reporte este fallo]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "No se encontró la dirección del servidor %s"
+msgstr "No se encontró la dirección del servidor %s"
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "¡No se pudieron incluir todos los mensajes pedidos!"
+msgstr "¡No se pudieron incluir todos los mensajes pedidos!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "No se pudo negociar una conexión TLS"
+msgstr "No se pudo negociar una conexión TLS"
 
 #: sendlib.c:908
 #, c-format
@@ -1048,9 +1024,9 @@ msgstr "No se pudo abrir %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "¡Imposible reabrir buzón!"
+msgstr "¡Imposible reabrir buzón!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "No se pudo enviar el mensaje."
 
@@ -1062,25 +1038,25 @@ msgstr "No se pudo bloquear %s\n"
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "¿Crear %s?"
+msgstr "¿Crear %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Crear sólo está soportado para buzones IMAP"
+msgstr "Crear sólo está soportado para buzones IMAP"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Crear buzón: "
+msgstr "Crear buzón: "
 
 #: commands.c:597
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "%s%s en buzón"
+msgstr "%s%s en buzón"
 
 #: commands.c:596
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "%s%s en buzón"
+msgstr "%s%s en buzón"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
@@ -1090,59 +1066,46 @@ msgstr "Seleccionando %s..."
 #: commands.c:599
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "%s%s en buzón"
+msgstr "%s%s en buzón"
 
 #: commands.c:598
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "%s%s en buzón"
+msgstr "%s%s en buzón"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "Consiguiendo mensaje..."
 
-#: postpone.c:517
+#: postpone.c:482
 #, fuzzy
 msgid "Decryption failed."
-msgstr "El login falló."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Sup."
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Suprimir"
+msgstr "El login falló."
 
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Suprimir sólo está soportado para buzones IMAP"
+msgstr "Suprimir sólo está soportado para buzones IMAP"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "¿Suprimir mensajes del servidor?"
+msgstr "¿Suprimir mensajes del servidor?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Suprimir mensajes que coincidan con: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Suprimir"
 
-#: recvattach.c:993
+#: recvattach.c:981
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "Suprimir archivos adjuntos de mensajes PGP no es soportado."
 
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Descrip"
-
 #: lib-lua/madmutt.cpkg:106
 #, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
@@ -1151,36 +1114,36 @@ msgstr ""
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s no existe. ¿Crearlo?"
+msgstr "%s no existe. ¿Crearlo?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Directorio [%s], patrón de archivos: %s"
+msgstr "Directorio [%s], patrón de archivos: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "ERROR: por favor reporte este fallo"
 
-#: send.c:1387
+#: send.c:1381
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "Preparando mensaje reenviado..."
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "error en expresión"
+msgstr "error en expresión"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Cifrar"
 
-#: compose.c:163
+#: compose.c:135
 #, fuzzy
 msgid "Encrypt with: "
 msgstr "Cifrar"
@@ -1189,17 +1152,17 @@ msgstr "Cifrar"
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Entre keyID para %s: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Entre keyID para %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "Entre keyID para %s: "
@@ -1229,7 +1192,7 @@ msgstr "Error al conectar al servidor: %s"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Error al conectar al servidor: %s"
@@ -1238,110 +1201,96 @@ msgstr "Error al conectar al servidor: %s"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "Error en %s, renglón %d: %s"
+msgstr "Error en %s, renglón %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Error en línea de comando: %s\n"
+msgstr "Error en línea de comando: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "Error en expresión: %s"
+msgstr "Error en expresión: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Error al inicializar la terminal."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Error al inicializar la terminal."
 
 #: imap/imap.c:620
 #, fuzzy
 msgid "Error opening mailbox"
-msgstr "¡Error al escribir el buzón!"
+msgstr "¡Error al escribir el buzón!"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "¡Dirección errónea!"
+msgstr "¡Dirección errónea!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "¡Error al ejecutar \"%s\"!"
+msgstr "¡Error al ejecutar \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "Error leyendo directorio."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Error al enviar mensaje, proceso hijo terminó %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Error al enviar mensaje, proceso hijo terminó %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Error al enviar el mensaje."
+msgstr "Error al enviar mensaje, proceso hijo terminó %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Error al hablar con %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Error al tratar de mostrar el archivo"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "¡Error al escribir el buzón!"
+msgstr "¡Error al escribir el buzón!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
 msgstr "Error. Preservando el archivo temporal: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Error: %s no puede ser usado como remailer final de una cadena."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "Error: ¡multipart/encrypted no tiene parámetro de protocolo!"
+msgstr "Error: ¡multipart/encrypted no tiene parámetro de protocolo!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
@@ -1351,10 +1300,10 @@ msgstr "Error: multipart/signed no tiene protocolo."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Error en línea de comando: %s\n"
+msgstr "Error en línea de comando: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
@@ -1365,29 +1314,20 @@ msgstr "Consiguiendo cabeceras de mensajes... [%d/%d]"
 msgid "Executing command on matching messages..."
 msgstr "Ejecutando comando en mensajes que coinciden..."
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Salir"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Salir  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "¿Salir de Mutt sin guardar?"
+msgstr "¿Salir de Mutt sin guardar?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "¿Salir de Mutt?"
+msgstr "¿Salir de Mutt?"
 
 #: imap/imap.c:898
 #, fuzzy
 msgid "Expunge failed"
-msgstr "CLOSE falló"
+msgstr "CLOSE falló"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
@@ -1408,23 +1348,23 @@ msgstr "Error al abrir el archivo para leer las cabeceras."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "¡Error fatal! ¡No se pudo reabrir el buzón!"
+msgstr "¡Error fatal! ¡No se pudo reabrir el buzón!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "¡Error fatal!  La cuenta de mensajes no está sincronizada."
+msgstr "¡Error fatal!  La cuenta de mensajes no está sincronizada."
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Eliminando mensajes del servidor..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "Consiguiendo mensaje..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "Consiguiendo la lista de mensajes..."
@@ -1433,7 +1373,7 @@ msgstr "Consiguiendo la lista de mensajes..."
 msgid "Fetching list of messages..."
 msgstr "Consiguiendo la lista de mensajes..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "Consiguiendo cabeceras de mensajes... [%d/%d]"
@@ -1443,74 +1383,69 @@ msgstr "Consiguiendo cabeceras de mensajes... [%d/%d]"
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Consiguiendo cabeceras de mensajes... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Consiguiendo mensaje..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Patrón de archivos: "
+msgstr "Patrón de archivos: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "El archivo existe, ¿(s)obreescribir, (a)gregar o (c)ancelar?"
+msgstr "El archivo existe, ¿(s)obreescribir, (a)gregar o (c)ancelar?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Archivo es un directorio, ¿guardar en él?"
+msgstr "Archivo es un directorio, ¿guardar en él?"
 
 #: muttlib.c:226
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Archivo es un directorio, ¿guardar en él?"
+msgstr "Archivo es un directorio, ¿guardar en él?"
 
 #: muttlib.c:249
 msgid "File under directory: "
 msgstr "Archivo bajo directorio: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "Filtrar a través de: "
+msgstr "Filtrar a través de: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Huella: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "guardar este mensaje para enviarlo después"
+msgstr "guardar este mensaje para enviarlo después"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "¿Responder a %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "¿Responder a %s%s?"
+msgstr "¿Responder a %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "¿Adelantar con encapsulado MIME?"
+msgstr "¿Adelantar con encapsulado MIME?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "¿Adelatar como archivo adjunto?"
+msgstr "¿Adelatar como archivo adjunto?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "¿Adelatar como archivos adjuntos?"
+msgstr "¿Adelatar como archivos adjuntos?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Función no permitida en el modo de adjuntar mensaje."
+msgstr "Función no permitida en el modo de adjuntar mensaje."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
@@ -1524,68 +1459,57 @@ msgstr "Consiguiendo espacio de nombres..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Grupo"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Ayuda"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Ayuda para %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "La ayuda está siendo mostrada."
+msgstr "La ayuda está siendo mostrada."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "¡No sé cómo se imprime eso!"
+msgstr "¡No sé cómo se imprime eso!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "¡No sé cómo imprimir archivos adjuntos %s!"
+msgstr "¡No sé cómo imprimir archivos adjuntos %s!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
-msgstr "Esta clave está expirada/desactivada/revocada"
+msgstr "Esta clave está expirada/desactivada/revocada"
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 #, fuzzy
 msgid "ID is not valid."
 msgstr "Esta ID no es de confianza."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 #, fuzzy
 msgid "ID is only marginally valid."
 msgstr "Esta ID es marginalmente de confianza."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
 msgstr "Cabecera PGP illegal"
 
-#: postpone.c:434
+#: postpone.c:399
 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "Cabecera PGP illegal"
@@ -1593,59 +1517,55 @@ msgstr "Cabecera PGP illegal"
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Entrada mal formateada para el tipo %s en \"%s\" renglón %d"
+msgstr "Entrada mal formateada para el tipo %s en \"%s\" renglón %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "¿Incluir mensaje en respuesta?"
+msgstr "¿Incluir mensaje en respuesta?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Incluyendo mensaje citado..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Insertar"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Día inválido del mes: %s"
+msgstr "Día inválido del mes: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "La codificación no es válida."
+msgstr "La codificación no es válida."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Número de índice inválido."
+msgstr "Número de índice inválido."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Número de mensaje erróneo."
+msgstr "Número de mensaje erróneo."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Mes inválido: %s"
+msgstr "Mes inválido: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "Fecha relativa incorrecta: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "Invocando PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "Invocando PGP..."
@@ -1655,76 +1575,72 @@ msgstr "Invocando PGP..."
 msgid "Invoking autoview command: %s"
 msgstr "Invocando comando de automuestra: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Saltar a mensaje: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Saltar a: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Saltar no está implementado para diálogos."
+msgstr "Saltar no está implementado para diálogos."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "La tecla no tiene enlace a una función."
+msgstr "La tecla no tiene enlace a una función."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tecla sin enlace. Presione '%s' para obtener ayuda."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "Limitar a mensajes que coincidan con: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "Límite: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Límite: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Entrando..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1732,17 +1648,17 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Cuenta de bloqueo excedida, ¿quitar bloqueo de %s?"
+msgstr "Cuenta de bloqueo excedida, ¿quitar bloqueo de %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Entrando..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "El login falló."
+msgstr "El login falló."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "Buscando claves que coincidan con \"%s\"..."
@@ -1752,7 +1668,7 @@ msgstr "Buscando claves que coincidan con \"%s\"..."
 msgid "Looking up %s..."
 msgstr "Buscando %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Huella: %s"
@@ -1761,85 +1677,81 @@ msgstr "Huella: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Tipo MIME no definido.  No se puede mostrar el archivo adjunto."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "Bucle de macros detectado."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Nuevo"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "Mensaje no enviado."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Mensaje enviado."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "El buzón fue marcado."
+msgstr "El buzón fue marcado."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Buzón cerrado"
+msgstr "Buzón cerrado"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Buzón creado."
+msgstr "Buzón creado."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "El buzón fue suprimido."
+msgstr "El buzón fue suprimido."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "El buzón está vacío."
+msgstr "El buzón está vacío."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "Buzón está marcado inescribible. %s"
+msgstr "Buzón está marcado inescribible. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "El buzón es de sólo lectura."
+msgstr "El buzón es de sólo lectura."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Buzón sin cambios."
+msgstr "Buzón sin cambios."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "El buzón tiene que tener un nombre."
+msgstr "El buzón tiene que tener un nombre."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "El buzón no fue suprimido."
+msgstr "El buzón no fue suprimido."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Buzón creado."
+msgstr "Buzón creado."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "¡El buzón fue corrupto!"
+msgstr "¡El buzón fue corrupto!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Buzón fue modificado externamente."
+msgstr "Buzón fue modificado externamente."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Buzón fue modificado.  Los indicadores pueden estar mal."
+msgstr "Buzón fue modificado.  Los indicadores pueden estar mal."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Buzones [%d]"
@@ -1854,11 +1766,7 @@ msgstr "La entrada \"edit\" en el archivo Mailcap requiere %%s"
 msgid "Mailcap compose entry requires %%s"
 msgstr "La entrada \"compose\" en el archivo Mailcap requiere %%s"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Producir nombre corto"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1867,19 +1775,15 @@ msgstr ""
 msgid "Marking %d messages deleted..."
 msgstr "Marcando %d mensajes como suprimidos..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Patrón"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Mensaje rebotado."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1889,7 +1793,7 @@ msgstr "El mensaje no pudo ser imprimido"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "¡El archivo del mensaje está vacío!"
+msgstr "¡El archivo del mensaje está vacío!"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
@@ -1898,14 +1802,14 @@ msgstr "Mensaje rebotado."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "¡El mensaje no fue modificado!"
+msgstr "¡El mensaje no fue modificado!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
 msgstr "El mensaje anterior no es visible en vista limitada"
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "Mensaje pospuesto."
 
@@ -1913,7 +1817,7 @@ msgstr "Mensaje pospuesto."
 msgid "Message printed"
 msgstr "Mensaje impreso"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Mensaje escrito."
 
@@ -1934,42 +1838,29 @@ msgstr "Mensajes rebotados."
 msgid "Messages printed"
 msgstr "Mensajes impresos"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Faltan parámetros."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Las cadenas mixmaster están limitadas a %d elementos."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster no acepta cabeceras Cc or Bcc."
+msgstr "Faltan parámetros."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "¿Mover mensajes leidos a %s?"
+msgstr "¿Mover mensajes leidos a %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Moviendo mensajes leídos a %s..."
+msgstr "Moviendo mensajes leídos a %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nueva indagación"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nombre del nuevo archivo: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Archivo nuevo: "
 
@@ -1978,188 +1869,170 @@ msgstr "Archivo nuevo: "
 msgid "New mail in "
 msgstr "Correo nuevo en %s."
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Correo nuevo en este buzón."
+msgstr "Correo nuevo en este buzón."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Sig."
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "PróxPág"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "Falta un método de verificación de autentidad"
+msgstr "Falta un método de verificación de autentidad"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "El parámetro límite no fue encontrado. [reporte este error]"
+msgstr "El parámetro límite no fue encontrado. [reporte este error]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "No hay entradas."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "Ningún archivo coincide con el patrón"
+msgstr "Ningún archivo coincide con el patrón"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Ningún buzón de entrada fue definido."
+msgstr "Ningún buzón de entrada fue definido."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "No hay patrón limitante activo."
+msgstr "No hay patrón limitante activo."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Ningún buzón está abierto."
+msgstr "Ningún buzón está abierto."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Ningún buzón con correo nuevo."
+msgstr "Ningún buzón con correo nuevo."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
-"Falta la entrada \"compose\" de mailcap para %s, creando archivo vacío."
+"Falta la entrada \"compose\" de mailcap para %s, creando archivo vacío."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Falta la entrada \"edit\" para %s en el archivo Mailcap"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "¡Ninguna lista de correo encontrada!"
+msgstr "¡Ninguna lista de correo encontrada!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr ""
 "No hay una entrada correspondiente en el archivo mailcap. Viendo como texto."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "No hay mensajes en esa carpeta."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "Ningún mensaje responde al criterio dado."
+msgstr "Ningún mensaje responde al criterio dado."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "No hay mas texto citado."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "No hay mas hilos."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "No hay mas texto sin citar bajo el texto citado."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "No hay correo nuevo en el buzón POP."
+msgstr "No hay correo nuevo en el buzón POP."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "No hay mensajes nuevos"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Asunto no fue especificado."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "Ningún archivo coincide con el patrón"
+msgstr "Ningún archivo coincide con el patrón"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Ningún buzón con correo nuevo."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "No hay mensajes pospuestos."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Ningún buzón con correo nuevo."
-
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "No ha sido definida la órden de impresión."
+msgstr "No ha sido definida la órden de impresión."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "¡No especificó destinatarios!"
+msgstr "¡No especificó destinatarios!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr "No hay destinatario.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "No especificó destinatarios."
+msgstr "No especificó destinatarios."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "Nada que buscar."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Asunto no fue especificado."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Falta el asunto, ¿cancelar envío?"
+msgstr "Falta el asunto, ¿cancelar envío?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Sin asunto, ¿cancelar?"
+msgstr "Sin asunto, ¿cancelar?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Sin asunto, cancelando."
 
@@ -2168,101 +2041,97 @@ msgstr "Sin asunto, cancelando."
 msgid "No such folder"
 msgstr "%s: color desconocido"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "No hay entradas marcadas."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "¡No hay mensajes marcados visibles!"
+msgstr "¡No hay mensajes marcados visibles!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "No hay mensajes marcados."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr "No hay mensajes sin suprimir."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "No hay mensajes sin leer"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "No hay mensajes visibles."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "No disponible en este menú."
+msgstr "No disponible en este menú."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "No fue encontrado."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Conectando a %s..."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "Aceptar"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Suprimir sólo es soportado con archivos adjuntos tipo multiparte."
+msgstr "Suprimir sólo es soportado con archivos adjuntos tipo multiparte."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Abrir buzón"
+msgstr "Abrir buzón"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Abrir buzón en modo de sólo lectura"
+msgstr "Abrir buzón en modo de sólo lectura"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Abrir buzón para adjuntar mensaje de"
+msgstr "Abrir buzón para adjuntar mensaje de"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Abrir buzón en modo de sólo lectura"
+msgstr "Abrir buzón en modo de sólo lectura"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Abrir buzón para adjuntar mensaje de"
+msgstr "Abrir buzón para adjuntar mensaje de"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Salida del proceso de repartición de correo"
+msgstr "Salida del proceso de repartición de correo"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
+msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "Claves PGP que coinciden con <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "Claves PGP que coinciden con <%s>."
@@ -2273,17 +2142,17 @@ msgstr "Firma PGP NO pudo ser verificada."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "Firma PGP verificada con éxito."
+msgstr "Firma PGP verificada con éxito."
 
 #: pop.c:1216
 msgid "POP host is not defined."
 msgstr "El servidor POP no fue definido."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "El mensaje anterior no está disponible."
+msgstr "El mensaje anterior no está disponible."
 
-#: thread.c:980
+#: thread.c:976
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
 msgstr "El mensaje anterior no es visible en vista limitada"
@@ -2291,120 +2160,94 @@ msgstr "El mensaje anterior no es visible en vista limitada"
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "Contraseña para %s@%s: "
+msgstr "Contraseña para %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Nombre: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Redirigir"
-
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "Redirigir el mensaje al comando:"
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Redirigir a: "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"¡Por favor ajuste la variable hostname a un valor correcto si usa mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "¿Posponer el mensaje?"
+msgstr "¿Posponer el mensaje?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Mensajes pospuestos"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "La órden anterior a la conexión falló."
+msgstr "La órden anterior a la conexión falló."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "Preparando mensaje reenviado..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr "Presione una tecla para continuar..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "PágAnt"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Imprimir"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "¿Imprimir archivo adjunto?"
+msgstr "¿Imprimir archivo adjunto?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "¿Impimir mensaje?"
+msgstr "¿Impimir mensaje?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "¿Imprimir archivo(s) adjunto(s) marcado(s)?"
+msgstr "¿Imprimir archivo(s) adjunto(s) marcado(s)?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "¿Imprimir mensajes marcados?"
+msgstr "¿Imprimir mensajes marcados?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "¿Expulsar %d mensaje suprimido?"
+msgstr "¿Expulsar %d mensaje suprimido?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "¿Expulsar %d mensajes suprimidos?"
+msgstr "¿Expulsar %d mensajes suprimidos?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Indagación"
+msgstr "Indagación"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Indagar '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "El comando de indagación no fue definido."
+msgstr "El comando de indagación no fue definido."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Indagar: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Salir"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "¿Salir de Mutt?"
+msgstr "¿Salir de Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Consiguiendo espacio de nombres..."
@@ -2429,54 +2272,50 @@ msgstr "Leyendo %s... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Leyendo mensajes nuevos (%d bytes)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "¿Realmente quiere suprimir el buzón \"%s\"?"
+msgstr "¿Realmente quiere suprimir el buzón \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "¿Continuar mensaje pospuesto?"
+msgstr "¿Continuar mensaje pospuesto?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Recodificado sólo afecta archivos adjuntos de tipo texto."
+msgstr "Recodificado sólo afecta archivos adjuntos de tipo texto."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
-msgstr "CLOSE falló"
+msgstr "CLOSE falló"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Crear sólo está soportado para buzones IMAP"
+msgstr "Crear sólo está soportado para buzones IMAP"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Crear buzón: "
+msgstr "Crear buzón: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Renombrar a: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Reabriendo buzón..."
+msgstr "Reabriendo buzón..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Responder"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "¿Responder a %s%s?"
+msgstr "¿Responder a %s%s?"
 
 #: commands.c:403
 #, fuzzy
@@ -2484,27 +2323,27 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Órden-rev fech(a)/d(e)/(r)ece/a(s)nto/(p)ara/(h)ilo/(n)ada/ta(m)añ/punta(j): "
+"Órden-rev fech(a)/d(e)/(r)ece/a(s)nto/(p)ara/(h)ilo/(n)ada/ta(m)añ/punta(j): "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr "Buscar en sentido opuesto: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Buscar hacia atrás: "
+msgstr "Buscar hacia atrás: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
-"¿Órden inverso por (f)echa, (t)amaño, (a)lfabéticamente o (s)in órden? "
+"¿Órden inverso por (f)echa, (t)amaño, (a)lfabéticamente o (s)in órden? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
+msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
@@ -2512,7 +2351,7 @@ msgstr ""
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "Claves PGP que coinciden con \"%s\"."
@@ -2529,13 +2368,13 @@ msgstr "Firma PGP NO pudo ser verificada."
 #: commands.c:135
 #, fuzzy
 msgid "S/MIME signature successfully verified."
-msgstr "Firma PGP verificada con éxito."
+msgstr "Firma PGP verificada con éxito."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "Verificación de autentidad SASL falló."
+msgstr "Verificación de autentidad SASL falló."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Huella: %s"
@@ -2545,115 +2384,91 @@ msgstr "Huella: %s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "Conectando por SSL con %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Guardar"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "¿Guardar una copia de este mensaje?"
+msgstr "¿Guardar una copia de este mensaje?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Guardar en archivo: "
 
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
-msgstr "%s%s en buzón"
+msgstr "%s%s en buzón"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Guardando indicadores de estado de mensajes... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Buscar"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Buscar por: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "La búsqueda llegó al final sin encontrar nada."
+msgstr "La búsqueda llegó al final sin encontrar nada."
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "La búsqueda llegó al principio sin encontrar nada."
+msgstr "La búsqueda llegó al principio sin encontrar nada."
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Búsqueda interrumpida."
+msgstr "Búsqueda interrumpida."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "No puede buscar en este menú."
+msgstr "No puede buscar en este menú."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "La búsqueda volvió a empezar desde abajo."
+msgstr "La búsqueda volvió a empezar desde abajo."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "La búsqueda volvió a empezar desde arriba."
+msgstr "La búsqueda volvió a empezar desde arriba."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Buscar: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Seleccionar"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Seleccionar  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Seleccionar una cadena de remailers."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "Seleccionando %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Mandar"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Enviando en un proceso en segundo plano."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Enviando mensaje..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "¡El servidor cerró la conneción!"
+msgstr "¡El servidor cerró la conneción!"
 
 #: flags.c:335
 msgid "Set flag"
@@ -2663,15 +2478,15 @@ msgstr "Poner indicador"
 msgid "Shell command: "
 msgstr "Comando de shell: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Firmar"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Firmar como: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Firmar, cifrar"
 
@@ -2681,36 +2496,32 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Órden fech(a)/d(e)/(r)ecep/a(s)unto/(p)ara/(h)ilo/(n)ada/ta(m)año/punta(j)e: "
+"Órden fech(a)/d(e)/(r)ecep/a(s)unto/(p)ara/(h)ilo/(n)ada/ta(m)año/punta(j)e: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "¿Ordenar por (f)echa, (t)amaño, (a)lfabéticamente o (s)in órden? "
+msgstr "¿Ordenar por (f)echa, (t)amaño, (a)lfabéticamente o (s)in órden? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Ordenando buzón..."
+msgstr "Ordenando buzón..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Suscrito [%s], patrón de archivos: %s"
+msgstr "Suscrito [%s], patrón de archivos: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2719,124 +2530,124 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "Suscribiendo a %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "Prueba del certificado SSL"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr "Marcar mensajes que coincidan con: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
 msgstr "Marque el mensaje que quiere adjuntar."
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Marcar no está soportado."
+msgstr "Marcar no está soportado."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr "Ese mensaje no es visible."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL no está disponible."
+msgstr "SSL no está disponible."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "El archivo adjunto actual será convertido."
+msgstr "El archivo adjunto actual será convertido."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "El archivo adjunto actual no será convertido."
+msgstr "El archivo adjunto actual no será convertido."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "El índice de mensajes es incorrecto. Intente reabrir el buzón."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "La cadena de remailers ya está vacía."
+msgstr "El índice de mensajes es incorrecto. Intente reabrir el buzón."
 
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "No hay archivos adjuntos."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "No hay mensajes."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "¡No hay subpartes para mostrar!"
+msgstr "¡No hay subpartes para mostrar!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Este servidor IMAP es ancestral. Mutt no puede trabajar con el."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr "Este certificado pertenece a:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Este certificado es válido"
+msgstr "Este certificado es válido"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr "Este certificado fue producido por:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "Esta clave no se puede usar: expirada/desactivada/revocada."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
 msgstr "El hilo contiene mensajes sin leer."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "La muestra por hilos no está activada."
+msgstr "La muestra por hilos no está activada."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "¡Bloqueo fcntl tardó demasiado!"
+msgstr "¡Bloqueo fcntl tardó demasiado!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "¡Bloqueo flock tardó demasiado!"
+msgstr "¡Bloqueo flock tardó demasiado!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "El principio del mensaje está siendo mostrado."
+msgstr "El principio del mensaje está siendo mostrado."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -2853,23 +2664,23 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "Verificación de autentidad SASL falló."
+msgstr "Verificación de autentidad SASL falló."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "¡Imposible adjuntar %s!"
+msgstr "¡Imposible adjuntar %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "¡Imposible adjuntar!"
+msgstr "¡Imposible adjuntar!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
-"No se pueden recoger cabeceras de mensajes de esta versión de servidor IMAP."
+"No se pueden recoger cabeceras de mensajes de esta versión de servidor IMAP."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "Imposible recoger el certificado de la contraparte"
 
@@ -2877,55 +2688,46 @@ msgstr "Imposible recoger el certificado de la contraparte"
 msgid "Unable to leave messages on server."
 msgstr "No es posible dejar los mensajes en el servidor."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "¡Imposible adjuntar %s!"
+msgstr "¡Imposible adjuntar %s!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "¡Imposible bloquear buzón!"
+msgstr "¡Imposible bloquear buzón!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "¡Imposible abrir archivo temporal!"
+msgstr "¡Imposible abrir archivo temporal!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "¡Imposible abrir archivo temporal!"
+msgstr "¡Imposible abrir archivo temporal!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "¡Imposible abrir archivo temporal!"
+msgstr "¡Imposible abrir archivo temporal!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Recuperar"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "No suprimir mensajes que coincidan con: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Recuperar"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s desconocido"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Desuscribiendo de %s..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Desuscribiendo de %s..."
@@ -2935,7 +2737,7 @@ msgstr "Desuscribiendo de %s..."
 msgid "Unsubscribing to %s..."
 msgstr "Desuscribiendo de %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "Desmarcar mensajes que coincidan con: "
 
@@ -2946,48 +2748,40 @@ msgstr "Subiendo mensaje ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "¡Use 'toggle-write' para activar escritura!"
+msgstr "¡Use 'toggle-write' para activar escritura!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "¿Usar keyID = \"%s\" para %s?"
+msgstr "¿Usar keyID = \"%s\" para %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
 msgstr "Nombre de usuario en %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Mes inválido: %s"
+msgstr "Mes inválido: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Mes inválido: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Mes inválido: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "¿Verificar firma PGP?"
+msgstr "¿Verificar firma PGP?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Verificando índice de mensajes..."
-
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Adjuntos"
+msgstr "Verificando índice de mensajes..."
 
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "¡Atención!  Está a punto de sobreescribir %s, ¿continuar?"
+msgstr "¡Atención!  Está a punto de sobreescribir %s, ¿continuar?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2995,29 +2789,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "Certificado del servidor ha expirado"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "Certificado del servidor ha expirado"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "Certificado del servidor todavía no es válido"
+msgstr "Certificado del servidor todavía no es válido"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "Certificado del servidor todavía no es válido"
+msgstr "Certificado del servidor todavía no es válido"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3039,11 +2833,11 @@ msgstr "Esperando bloqueo fcntl... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "Esperando bloqueo flock... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Esperando respuesta..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3053,12 +2847,12 @@ msgstr ""
 msgid "Warning: At least one certification key has expired\n"
 msgstr "Certificado del servidor ha expirado"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Advertencia: no se pudo guardar el certificado"
 
@@ -3078,39 +2872,39 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Lo que tenemos aquí es un fallo al producir el archivo a adjuntar"
+msgstr "Lo que tenemos aquí es un fallo al producir el archivo a adjuntar"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "¡La escritura falló! Buzón parcial fue guardado en %s"
+msgstr "¡La escritura falló! Buzón parcial fue guardado en %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "¡Error de escritura!"
+msgstr "¡Error de escritura!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Guardar mensaje en el buzón"
+msgstr "Guardar mensaje en el buzón"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
 msgstr "Escribiendo %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Escribiendo mensaje en %s ..."
@@ -3120,90 +2914,72 @@ msgstr "Escribiendo mensaje en %s ..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Guardando mensajes... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Error en línea de comando: %s\n"
+msgstr "Error en línea de comando: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "¡Este nombre ya está definido en la libreta!"
+msgstr "¡Este nombre ya está definido en la libreta!"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Ya tiene el primer elemento de la cadena seleccionado."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Ya tiene el último elemento de la cadena seleccionado."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Está en la primera entrada."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Está en la primera página."
+msgstr "Está en la primera entrada."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Está en el primer mensaje."
+msgstr "Está en el primer mensaje."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Está en la primera página."
+msgstr "Está en la primera página."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Ya está en el primer hilo."
+msgstr "Ya está en el primer hilo."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Está en la última entrada."
+msgstr "Está en la última entrada."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Está en la última página."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Está en el último mensaje."
+msgstr "Está en el último mensaje."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Está en la última página."
+msgstr "Está en la última página."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Ya no puede bajar más."
+msgstr "Ya no puede bajar más."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Ya no puede subir más."
+msgstr "Ya no puede subir más."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "¡No tiene nombres en la libreta!"
+msgstr "¡No tiene nombres en la libreta!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "No puede borrar la única pieza."
+msgstr "No puede borrar la única pieza."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Solo puede rebotar partes tipo message/rfc822."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] ¿Aceptar?"
+msgstr "[%s = %s] ¿Aceptar?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s no está soportado "
+msgstr "[-- %s/%s no está soportado "
 
 #: handler.c:1000
 #, c-format
@@ -3220,7 +2996,7 @@ msgstr "[-- Error al ejecutar %s --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automuestra usando %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3228,11 +3004,11 @@ msgstr ""
 "[-- PRINCIPIO DEL MENSAJE PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PRINCIPIO DEL BLOQUE DE CLAVES PÚBLICAS PGP --]\n"
+msgstr "[-- PRINCIPIO DEL BLOQUE DE CLAVES PÚBLICAS PGP --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3240,7 +3016,7 @@ msgstr ""
 "[-- PRINCIPIO DEL MENSAJE FIRMADO CON PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3249,7 +3025,7 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- No se puede ejecutar %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
@@ -3257,11 +3033,11 @@ msgstr ""
 "[-- FIN DEL MENSAJE PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FIN DEL BLOQUE DE CLAVES PÚBLICAS PGP --]\n"
+msgstr "[-- FIN DEL BLOQUE DE CLAVES PÚBLICAS PGP --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
@@ -3269,35 +3045,35 @@ msgstr ""
 "[-- FIN DEL MENSAJE FIRMADO CON PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Fin de datos cifrados con PGP/MIME --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Fin de datos cifrados con PGP/MIME --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Fin de datos cifrados con PGP/MIME --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Fin de datos firmados --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3309,99 +3085,99 @@ msgstr ""
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- ¡Error: no se pudo mostrar ninguna parte de multipart/alternative! --]\n"
+"[-- ¡Error: no se pudo mostrar ninguna parte de multipart/alternative! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- Error: ¡Estructura multipart/signed inconsistente! --]\n"
+"[-- Error: ¡Estructura multipart/signed inconsistente! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- Error: ¡Protocolo multipart/signed %s desconocido! --]\n"
+"[-- Error: ¡Protocolo multipart/signed %s desconocido! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ¡Error: no se pudo cear archivo temporal! --]\n"
+msgstr "[-- ¡Error: no se pudo cear archivo temporal! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- ¡Error: no se encontró el principio del mensaje PGP! --]\n"
+"[-- ¡Error: no se encontró el principio del mensaje PGP! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- ¡Error: no se pudo cear archivo temporal! --]\n"
+msgstr "[-- ¡Error: no se pudo cear archivo temporal! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- ¡Error: mensaje PGP/MIME mal formado! --]\n"
+"[-- ¡Error: mensaje PGP/MIME mal formado! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- Error: Contenido message/external no tiene parámetro acces-type --]\n"
+"[-- Error: Contenido message/external no tiene parámetro acces-type --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
+"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
+"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
+"[-- Lo siguiente está cifrado con PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- Los siguientes datos están firmados --]\n"
+"[-- Los siguientes datos están firmados --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Los siguientes datos están firmados --]\n"
+"[-- Los siguientes datos están firmados --]\n"
 "\n"
 
 #: handler.c:1185
@@ -3417,9 +3193,9 @@ msgstr "[-- Este archivo adjunto %s/%s "
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Tipo: %s/%s, codificación: %s, tamaño: %s --]\n"
+msgstr "[-- Tipo: %s/%s, codificación: %s, tamaño: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -3427,7 +3203,7 @@ msgstr ""
 "[-- Advertencia: No se pudieron encontrar firmas. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3440,8 +3216,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
-"[-- Este archivo adjunto %s/%s no está incluido --]\n"
-"[-- y el tipo de acceso indicado %s no está soportado --]\n"
+"[-- Este archivo adjunto %s/%s no está incluido --]\n"
+"[-- y el tipo de acceso indicado %s no está soportado --]\n"
 
 #: handler.c:1214
 #, fuzzy
@@ -3449,7 +3225,7 @@ msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- Este archivo adjunto %s/%s no está incluido --]\n"
+"[-- Este archivo adjunto %s/%s no está incluido --]\n"
 "[-- y la fuente externa indicada ha expirado. --]\n"
 
 #: handler.c:1201
@@ -3462,79 +3238,174 @@ msgstr "[-- nombre: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- el %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
 msgstr "Salir  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Mes inválido: %s"
+msgstr "Mes inválido: %s"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[fecha inválida]"
+msgstr "[fecha inválida]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[imposible calcular]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "alias: sin dirección"
+msgstr "alias: sin dirección"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "No fue encontrado ningún mensaje marcado."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "No fue encontrado ningún mensaje marcado."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "¿Guardar una copia de este mensaje?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
 
-#: init.c:654
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "editar la descripción del archivo adjunto"
+msgstr "editar la descripción del archivo adjunto"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "editar la descripción del archivo adjunto"
+msgstr "editar la descripción del archivo adjunto"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: demasiados parámetros"
+msgstr "bind: demasiados parámetros"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Error leyendo directorio."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Ningún buzón con correo nuevo."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: faltan parámetros"
+msgstr "color: faltan parámetros"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "No hay mensajes nuevos"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr "convirtiendo"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Guardar mensaje en el buzón"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
@@ -3550,19 +3421,100 @@ msgstr "no se pudo escribir la carpeta temporal: %s"
 msgid "could not write temporary mail folder: %s"
 msgstr "no se pudo escribir la carpeta temporal: %s"
 
-#: browser.c:1206
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Ningún buzón de entrada fue definido."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "fats"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "No hay soporte para colores estándar"
+msgstr "No hay soporte para colores estándar"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "¿Suprimir mensajes del servidor?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "No suprimir mensajes que coincidan con: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "No suprimir mensajes que coincidan con: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "aersphnmj"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Preparando mensaje reenviado..."
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3578,29 +3530,116 @@ msgstr "Copiando a %s..."
 msgid "echo Decompressing %s..."
 msgstr "Seleccionando %s..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "El archivo adjunto actual no será convertido."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "editar la descripción del archivo adjunto"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "No se pudo escribir el mensaje"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Consiguiendo cabeceras de mensajes... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Preparando mensaje reenviado..."
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "¿Guardar una copia de este mensaje?"
+
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "patrón vacío"
+msgstr "patrón vacío"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
 msgstr "Cifrar"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "¿Guardar una copia de este mensaje?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3615,36 +3654,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "error en expresión"
+msgstr "error en expresión"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3654,82 +3693,252 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "error en patrón en: %s"
+msgstr "error en patrón en: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "error: op %d desconocida (reporte este error)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "dicoln"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "dicoln"
 
-#: keymap.c:829
+#: keymap.c:821
 #, fuzzy
 msgid "exec: no arguments"
-msgstr "exec: faltan parámetros"
+msgstr "exec: faltan parámetros"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "¿Responder a %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
-#, c-format
-msgid "gpgme_op_keylist_start failed: %s"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
 msgstr ""
 
-#: handler.c:1193
-msgid "has been deleted --]\n"
-msgstr "ha sido suprimido --]\n"
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "¿Adelatar como archivos adjuntos?"
 
-#: imap/imap.c:941
-msgid "imap_sync_mailbox: EXPUNGE failed"
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
 msgstr ""
 
-#: init.c:823
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Revisando si hay mensajes nuevos..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Está en el primer mensaje."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Está en la última página."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Ningún buzón con correo nuevo."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "¡Error al escribir el buzón!"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Ningún buzón con correo nuevo."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: handler.c:1193
+msgid "has been deleted --]\n"
+msgstr "ha sido suprimido --]\n"
+
+#: imap/imap.c:941
+msgid "imap_sync_mailbox: EXPUNGE failed"
+msgstr ""
+
+#: init.c:820
 msgid "invalid header field"
-msgstr "encabezado erróneo"
+msgstr "encabezado erróneo"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Número de índice inválido."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Saltar a mensaje: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Saltar a mensaje: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "El hilo contiene mensajes sin leer."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Ya está en el primer hilo."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "No hay mensajes sin leer"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "No hay mensajes sin leer"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "¿Guardar una copia de este mensaje?"
 
-#: crypt.cpkg:3122
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "Claves PGP que coinciden con <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Rebotar mensajes marcados a: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Ningún buzón con correo nuevo."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: sequencia de teclas vacía"
+msgstr "macro: sequencia de teclas vacía"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: demasiados parámetros"
+msgstr "macro: demasiados parámetros"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
@@ -3740,6 +3949,38 @@ msgstr "Entrada mailcap para tipo %s no encontrada"
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
@@ -3748,83 +3989,427 @@ msgstr "Mensajes rebotados."
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "paréntesis sin contraparte: %s"
+msgstr "paréntesis sin contraparte: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "falta un parámetro"
+msgstr "falta un parámetro"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: faltan parámetros"
+msgstr "mono: faltan parámetros"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Está en la primera entrada."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Está en el primer mensaje."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Está en la última entrada."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Está en el último mensaje."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Está en la última entrada."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Está en la última página."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "No hay mensajes sin suprimir."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Está en la primera entrada."
 
-# boundary es un parámetro definido por el estándar MIME
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Está en la primera página."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "No hay mensajes sin suprimir."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Está en la primera página."
+
+# boundary es un parámetro definido por el estándar MIME
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "¡mensaje multiparte no tiene parámetro boundary!"
+msgstr "¡mensaje multiparte no tiene parámetro boundary!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "no"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(ningún buzón)"
+msgstr "(ningún buzón)"
 
 #: commands.c:788
 msgid "not converting"
 msgstr "dejando sin convertir"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "sequencia de teclas vacía"
+msgstr "sequencia de teclas vacía"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "sac"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Abrir buzón en modo de sólo lectura"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Abrir buzón en modo de sólo lectura"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Reabriendo buzón..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Rebotar mensaje a %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefijo es ilegal con reset"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Está en la primera entrada."
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: demasiados parámetros"
+msgstr "push: demasiados parámetros"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "¿Continuar mensaje pospuesto?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "El hilo contiene mensajes sin leer."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "No se pueden editar mensajes en el servidor POP."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: imposible adjuntar archivo"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Saltar a mensaje: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "¿Suprimir mensajes del servidor?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ru"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "rua"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "%s%s en buzón"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "%s%s en buzón"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "No se pueden editar mensajes en el servidor POP."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "error en expresión"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Buscar por: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "No se pudo enviar el mensaje."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "¿Adelatar como archivos adjuntos?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Limitar a mensajes que coincidan con: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "No hay mas texto citado."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "¿Impimir mensaje?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "No hay mensajes en esa carpeta."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: errores en %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: errores en %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: lectura fue cancelada por demasiados errores en %s"
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Ningún archivo coincide con el patrón"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: buzón modificado, ¡pero sin mensajes modificados! (reporte este fallo)"
+"sync: buzón modificado, ¡pero sin mensajes modificados! (reporte este fallo)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Desmarcar mensajes que coincidan con: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Ya está en el primer hilo."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3836,22 +4421,93 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "No hay mas texto citado."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Recodificado sólo afecta archivos adjuntos de tipo texto."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Nada que buscar."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "No hay mensajes sin leer"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "Faltan parámetros"
+msgstr "Faltan parámetros"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "Demasiados parámetros"
+msgstr "Demasiados parámetros"
+
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
 
-#: init.c:690
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "editar la descripción del archivo adjunto"
+msgstr "editar la descripción del archivo adjunto"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "No suprimir mensajes que coincidan con: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "No suprimir mensajes que coincidan con: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "No suprimir mensajes que coincidan con: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
@@ -3868,10 +4524,28 @@ msgstr "unhook: No se puede desenganchar * desde dentro de un gancho."
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: tipo de gancho desconocido: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "error desconocido"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Desmarcar mensajes que coincidan con: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "editar la descripción del archivo adjunto"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3883,16 +4557,50 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
 msgstr "valor es ilegal con reset"
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Archivo adjunto guardado."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Archivo nuevo: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Guardar mensaje en el buzón"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
-msgstr "sí"
+msgstr "sí"
 
 #: muttlib.c:227
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/et.po b/po/et.po
index 46be98a..eab3152 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -6,25 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2002-12-09 17:19+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@muhv.pri.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Üldised seosed:\n"
+"Üldised seosed:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -34,13 +34,13 @@ msgstr ""
 "Sidumata funktsioonid:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Allkirjastatud info lõpp --]\n"
+"[-- Allkirjastatud info lõpp --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -66,53 +66,53 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"kasutage: mutt [ -nRyzZ ] [ -e <käsk> ] [ -F <fail> ] [ -m <tüüp> ]\n"
+"kasutage: mutt [ -nRyzZ ] [ -e <käsk> ] [ -F <fail> ] [ -m <tüüp> ]\n"
 "               [ -f <fail> ]\n"
-"          mutt [ -nR ] [ -e <käsk> ] [ -F <fail> ] -Q <päring>\n"
-"               [ -Q <päring> ] [...]\n"
-"          mutt [ -nR ] [ -e <käsk> ] [ -F <fail> ] -A <hüüdnimi>\n"
-"               [ -A <hüüdnimi> ] [...]\n"
-"          mutt [ -nx ] [ -e <käsk> ] [ -a <fail> ] [ -F <fail> ] [ -H "
+"          mutt [ -nR ] [ -e <käsk> ] [ -F <fail> ] -Q <päring>\n"
+"               [ -Q <päring> ] [...]\n"
+"          mutt [ -nR ] [ -e <käsk> ] [ -F <fail> ] -A <hüüdnimi>\n"
+"               [ -A <hüüdnimi> ] [...]\n"
+"          mutt [ -nx ] [ -e <käsk> ] [ -a <fail> ] [ -F <fail> ] [ -H "
 "<fail> ]\n"
 "               [ -i <fail> ] [ -s <teema> ] [ -b <aadr> ] [ -c <aadr> ]\n"
 "               <aadr> [ ... ]\n"
-"          mutt [ -n ] [ -e <käsk> ] [ -F <fail> ] -p\n"
+"          mutt [ -n ] [ -e <käsk> ] [ -F <fail> ] -p\n"
 "          mutt -v[v]\n"
 "\n"
-"võtmed:\n"
-"  -A <hüüdnimi>\tavalda antud hüüdnimi\n"
+"võtmed:\n"
+"  -A <hüüdnimi>\tavalda antud hüüdnimi\n"
 "  -a <fail>\tlisa teatele fail\n"
-"  -b <aadress>\tmäära pimekoopia (BCC) aadress\n"
-"  -c <aadress>\tmäära koopia (CC) aadress\n"
-"  -e <käsk>\tkäivita peale algväärtutamist käsk\n"
+"  -b <aadress>\tmäära pimekoopia (BCC) aadress\n"
+"  -c <aadress>\tmäära koopia (CC) aadress\n"
+"  -e <käsk>\tkäivita peale algväärtutamist käsk\n"
 "  -f <fail>\tmillist postkasti lugeda\n"
-"  -F <fail>\tmäära alternatiivne muttrc fail\n"
-"  -H <fail>\tmäära päiste mustandi fail\n"
+"  -F <fail>\tmäära alternatiivne muttrc fail\n"
+"  -H <fail>\tmäära päiste mustandi fail\n"
 "  -i <fail>\tfail mida mutt peab vastamisel lisama\n"
-"  -m <tüüp>\tmääta vaikimisi postkasti tüüp\n"
-"  -n\t\tära loe süsteemset Muttrc faili\n"
+"  -m <tüüp>\tmääta vaikimisi postkasti tüüp\n"
+"  -n\t\tära loe süsteemset Muttrc faili\n"
 "  -p\t\tlae postitusootel teade\n"
 "  -Q <muutuja>\tloe seadete muutuja\n"
 "  -R\t\tava postkast ainult lugemiseks\n"
-"  -s <teema>\tmäära teate teema (jutumärkides, kui on mitmesõnaline)\n"
-"  -v\t\tnäita versiooni ja kompileerimis-aegseid määranguid\n"
+"  -s <teema>\tmäära teate teema (jutumärkides, kui on mitmesõnaline)\n"
+"  -v\t\tnäita versiooni ja kompileerimis-aegseid määranguid\n"
 "  -x\t\tsimuleeri mailx saatmise moodi\n"
 "  -y\t\tvali postkast teie 'postkastide' loendist\n"
-"  -z\t\tvälju kohe, kui postkastis pole uusi teateid\n"
-"  -Z\t\tava esimene kaust uue teatega, välju kohe, kui pole\n"
+"  -z\t\tvälju kohe, kui postkastis pole uusi teateid\n"
+"  -Z\t\tava esimene kaust uue teatega, välju kohe, kui pole\n"
 "  -h\t\tesita see abiinfo"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " allkirjasta kui: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     kuni %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   alates %s"
@@ -155,40 +155,40 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' annab loendi): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
-msgstr "(jätka)\n"
+msgstr "(jätka)\n"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr "Kirjutamise lülitamiseks vajutage '%s'"
+msgstr "Kirjutamise lülitamiseks vajutage '%s'"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr " selles piiratud vaates"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " märgitud"
+msgstr " märgitud"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: vigane käsklus"
+msgstr "%c: vigane käsklus"
 
 #: pattern.c:721
 #, c-format
@@ -198,39 +198,39 @@ msgstr "%c: ei toetata selles moodis"
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d säilitatud, %d kustutatud."
+msgstr "%d säilitatud, %d kustutatud."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d säilitatud, %d tõstetud, %d kustutatud."
+msgstr "%d säilitatud, %d tõstetud, %d kustutatud."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Kas te soovite seda võtit tõesti kasutada?"
+msgstr "%s Kas te soovite seda võtit tõesti kasutada?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] muudeti. Uuendan kodeerimist?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] ei eksisteeri!"
@@ -240,7 +240,7 @@ msgstr "%s [#%d] ei eksisteeri!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d/%d teadet loetud]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ei ole. Loon selle?"
@@ -255,17 +255,17 @@ msgstr "%s on vigane IMAP tee"
 msgid "%s is an invalid POP path"
 msgstr "%s on vigane POP tee"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr "%s on vigane POP tee"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr "%s on vigane POP tee"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ei ole kataloog."
@@ -275,7 +275,7 @@ msgstr "%s ei ole kataloog."
 msgid "%s is not a mailbox!"
 msgstr "%s ei ole postkast!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ei ole postkast."
@@ -302,92 +302,92 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
-msgstr "%s: tundmatu tüüp"
+msgstr "%s: tundmatu tüüp"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: terminal ei toeta värve"
+msgstr "%s: terminal ei toeta värve"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: käsk kehtib ainult indekseeritud objektiga"
+msgstr "%s: käsk kehtib ainult indekseeritud objektiga"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s. sellist atribuuti pole"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s. sellist värvi ei ole"
+msgstr "%s. sellist värvi ei ole"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: sellist funktsiooni pole"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: sellist funktsiooni tabelis ei ole"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: sellist menüüd ei ole"
+msgstr "%s: sellist menüüd ei ole"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: sellist objekti ei ole"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: liiga vähe argumente"
+msgstr "%s: liiga vähe argumente"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: faili lisamine ebaõnnestus"
+msgstr "%s: faili lisamine ebaõnnestus"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: faili ei saa lisada.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: tundmatu käsk"
+msgstr "%s: tundmatu käsk"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: tundmatu tüüp"
+msgstr "%s: tundmatu tüüp"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: tundmatu muutuja"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
 msgstr "%s on vigane POP tee"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr "%s on vigane POP tee"
@@ -396,17 +396,17 @@ msgstr "%s on vigane POP tee"
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' peab olema klahviga seotud!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(pole postkast)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(k)eeldu, (n)õustu korra"
+msgstr "(k)eeldu, (n)õustu korra"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(k)eeldu, (n)õustu korra, nõustu (a)alati"
+msgstr "(k)eeldu, (n)õustu korra, nõustu (a)alati"
 
 #: handler.c:1191
 #, c-format
@@ -422,20 +422,20 @@ msgstr "(selle osa vaatamiseks kasutage '%s')"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Lisad"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<TUNDMATU>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<vaikimisi>"
 
@@ -449,102 +449,94 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "APOP autentimine ebaõnnestus."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Katkesta"
+msgstr "APOP autentimine ebaõnnestus."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
 msgstr "Katkestan muutmata teate?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
 msgstr "Katkestasin muutmata teate saatmise."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Aadress: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Hüüdnimi on lisatud."
+msgstr "Hüüdnimi on lisatud."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Hüüdnimeks: "
+msgstr "Hüüdnimeks: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "Hüüdnimed"
+msgstr "Hüüdnimed"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Kõik sobivad võtmed on märgitud aegunuks/tühistatuks."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Lõppu"
+msgstr "Kõik sobivad võtmed on märgitud aegunuks/tühistatuks."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Lisan teated kausta %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
 msgstr "Argument peab olema teate number."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Lisa on salvestatud."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Lisa fail"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Lisan valitud failid..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Lisa on filtreeritud."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Lisa on salvestatud."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Lisad"
 
@@ -575,12 +567,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -594,9 +586,9 @@ msgstr ""
 msgid "Bad mailbox name"
 msgstr "Halb nimi postkastile"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "Teate lõpp on näidatud."
+msgstr "Teate lõpp on näidatud."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
@@ -614,15 +606,15 @@ msgstr "Peegelda teated aadressile %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Peegelda märgitud teated aadressile: "
+msgstr "Peegelda märgitud teated aadressile: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "CLOSE ebaõnnestus."
+msgstr "CLOSE ebaõnnestus."
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -633,54 +625,54 @@ msgstr ""
 msgid "Can't append to folder: %s"
 msgstr "Kausta ei saa lisada: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "Kataloogi ei saa lisada!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "%s ei saa luua: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Faili %s ei saa luua"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Ei õnnestu luua filtrit"
+msgstr "Ei õnnestu luua filtrit"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "Filterprotsessi loomine ebaõnnestus"
+msgstr "Filterprotsessi loomine ebaõnnestus"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Ei õnnestu avada ajutist faili"
+msgstr "Ei õnnestu avada ajutist faili"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Kõiki märgitud lisasid ei saa dekodeerida. Kapseldan ülejäänud MIME formaati?"
+"Kõiki märgitud lisasid ei saa dekodeerida. Kapseldan ülejäänud MIME formaati?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Kõiki märgitud lisasid ei saa dekodeerida. Edastan ülejäänud MIME formaadis?"
+"Kõiki märgitud lisasid ei saa dekodeerida. Edastan ülejäänud MIME formaadis?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "Krüpteeritud teadet ei õnnestu lahti krüpteerida!"
+msgstr "Krüpteeritud teadet ei õnnestu lahti krüpteerida!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "Lisasid ei saa POP serverilt kustutada."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "Lisasid ei saa POP serverilt kustutada."
@@ -688,7 +680,7 @@ msgstr "Lisasid ei saa POP serverilt kustutada."
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "%s punktfailiga lukustamine ei õnnestu.\n"
+msgstr "%s punktfailiga lukustamine ei õnnestu.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -696,15 +688,11 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Ei leia ühtegi märgitud teadet."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Mixmaster type2.list laadimine ei õnnestu!"
+msgstr "Ei leia ühtegi märgitud teadet."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Nimemuster ei sobi, jätkan?"
+msgstr "Nimemuster ei sobi, jätkan?"
 
 #: editmsg.c:115
 #, c-format
@@ -716,27 +704,27 @@ msgstr "Teate faili ei saa avada: %s"
 msgid "Can't open trash folder"
 msgstr "Kausta ei saa lisada: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Ühendus serveriga %s suleti"
+msgstr "Ühendus serveriga %s suleti"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Sulen ühenduse POP serveriga..."
+msgstr "Sulen ühenduse POP serveriga..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Ei saa lugeda %s atribuute: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "%s ei saa luua: %s."
@@ -750,7 +738,7 @@ msgstr "Teadet ei saa POP postkasti salvestada."
 msgid "Can't save message to newsserver."
 msgstr "POP serveril ei saa teadet toimetada."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ei saa lugeda %s atribuute: %s"
@@ -759,71 +747,67 @@ msgstr "Ei saa lugeda %s atribuute: %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "Kataloogi ei saa vaadata"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "%s loomine ebaõnnestus."
+msgstr "%s loomine ebaõnnestus."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Päist ei õnnestu ajutissse faili kirjutada!"
+msgstr "Päist ei õnnestu ajutissse faili kirjutada!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Teadet ei õnnestu kirjutada"
+msgstr "Teadet ei õnnestu kirjutada"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Teadet ei õnnestu ajutisse faili kirjutada!"
+msgstr "Teadet ei õnnestu ajutisse faili kirjutada!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Filtri loomine ebaõnnestus"
+msgstr "Filtri loomine ebaõnnestus"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Filtri loomine ebaõnnestus"
+msgstr "Filtri loomine ebaõnnestus"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Ainult lugemiseks postkastil ei saa kirjutamist lülitada!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Ainult lugemiseks postkastil ei saa kirjutamist lülitada!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "Sain %s...  Väljun.\n"
+msgstr "Sain %s...  Väljun.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "Serveri sertifikaat ei ole veel kehtiv"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Sertifikaat on salvestatud"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Muudatused kaustas salvestatakse kaustast väljumisel."
+msgstr "Muudatused kaustas salvestatakse kaustast väljumisel."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
 msgstr "Muudatusi kaustas ei kirjutata."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -831,30 +815,22 @@ msgstr ""
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Kooditabeliks on nüüd %s; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Chdir"
+msgstr "Kooditabeliks on nüüd %s; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Mine kataloogi: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Kontrollin, kas on uusi teateid..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Võtme kontroll  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Kontrollin, kas on uusi teateid..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Kontrollin, kas on uusi teateid..."
@@ -863,7 +839,7 @@ msgstr "Kontrollin, kas on uusi teateid..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Puhas"
 
@@ -871,40 +847,40 @@ msgstr "Puhas"
 msgid "Clear flag"
 msgstr "Eemalda lipp"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Sulen ühendust serveriga %s..."
+msgstr "Sulen ühendust serveriga %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "Sulen ühenduse POP serveriga..."
+msgstr "Sulen ühenduse POP serveriga..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "Ühendus serverisse %s..."
+msgstr "Ühendus serverisse %s..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Server ei toeta käsklust TOP."
+msgstr "Server ei toeta käsklust TOP."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Server ei toeta UIDL käsklust."
+msgstr "Server ei toeta UIDL käsklust."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
 msgstr "Kinnitan muutused..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Kompileerimise võtmed:"
+"Kompileerimise võtmed:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
@@ -920,57 +896,57 @@ msgstr "Kopeerin kausta %s..."
 msgid "Compressing %s..."
 msgstr "Kopeerin kausta %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "Ühendus serverisse %s..."
+msgstr "Ühendus serverisse %s..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "Ühendus serverisse %s..."
+msgstr "Ühendus serverisse %s..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "Ühendus serverisse %s..."
+msgstr "Ühendus serverisse %s..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Ühendus katkes. Taastan ühenduse POP serveriga?"
+msgstr "Ühendus katkes. Taastan ühenduse POP serveriga?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Ühendus katkes. Taastan ühenduse POP serveriga?"
+msgstr "Ühendus katkes. Taastan ühenduse POP serveriga?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "Ühendus serveriga %s suleti"
+msgstr "Ühendus serveriga %s suleti"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Ühendus serveriga %s suleti"
+msgstr "Ühendus serveriga %s suleti"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Sisu tüübiks on nüüd %s."
+msgstr "Sisu tüübiks on nüüd %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type on kujul baas/alam"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "Jätkan?"
+msgstr "Jätkan?"
 
 #: commands.c:772
 #, c-format
@@ -1011,39 +987,39 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Serveriga %s ei õnnestu ühendust luua (%s)."
+msgstr "Serveriga %s ei õnnestu ühendust luua (%s)."
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "Teadet ei õnnestu kopeerida."
+msgstr "Teadet ei õnnestu kopeerida."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Ei õnnestu luua ajutist faili!"
+msgstr "Ei õnnestu luua ajutist faili!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Ei õnnestu luua ajutist faili!"
+msgstr "Ei õnnestu luua ajutist faili!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Ei leia järjestamisfunktsiooni! [teatage sellest veast]"
+msgstr "Ei leia järjestamisfunktsiooni! [teatage sellest veast]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Ei leia masina \"%s\" aadressi"
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Kõiki soovitud teateid ei õnnestu kaasata!"
+msgstr "Kõiki soovitud teateid ei õnnestu kaasata!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "TLS ühendust ei õnnestu kokku leppida"
+msgstr "TLS ühendust ei õnnestu kokku leppida"
 
 #: sendlib.c:908
 #, c-format
@@ -1052,11 +1028,11 @@ msgstr "%s ei saa avada"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Postkasti ei õnnestu uuesti avada!"
+msgstr "Postkasti ei õnnestu uuesti avada!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Teadet ei õnnestu saata."
+msgstr "Teadet ei õnnestu saata."
 
 #: lib-mx/mx.c:407
 #, c-format
@@ -1068,7 +1044,7 @@ msgstr "%s ei saa lukustada\n"
 msgid "Create %s?"
 msgstr "Loon %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Luua saab ainult IMAP postkaste"
 
@@ -1094,32 +1070,23 @@ msgstr "Valin %s..."
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Dekrüpti-kopeeri%s postkasti"
+msgstr "Dekrüpti-kopeeri%s postkasti"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "Dekrüpti-salvesta%s postkasti"
+msgstr "Dekrüpti-salvesta%s postkasti"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "Laen teadet..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Dekrüptimine ebaõnnestus."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Kustuta"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Kustuta"
+msgstr "Dekrüptimine ebaõnnestus."
 
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Kustutada saab ainult IMAP postkaste"
 
@@ -1127,23 +1094,19 @@ msgstr "Kustutada saab ainult IMAP postkaste"
 msgid "Delete messages from server?"
 msgstr "Kustutan teated serverist?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Kustuta teated mustriga: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Kustuta"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Krüpteeritud teadetest ei saa lisasid eemaldada."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Kirjeldus"
+msgstr "Krüpteeritud teadetest ei saa lisasid eemaldada."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
@@ -1155,20 +1118,20 @@ msgstr "ID %s pole kontrollitud. Kas soovite seda ikka %s jaoks kasutada ?"
 msgid "Directory %s not exist. Create it?"
 msgstr "%s ei ole. Loon selle?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Kataloog [%s], failimask: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "VIGA: Palun teatage sellest veast"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
 msgstr "Toimetan edastatavat teadet?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1177,29 +1140,29 @@ msgstr ""
 msgid "Empty expression"
 msgstr "viga avaldises"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Krüpti"
+msgstr "Krüpti"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "Krüpti kasutades: "
+msgstr "Krüpti kasutades: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "Sisestage võtme ID: "
+msgstr "Sisestage võtme ID: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Sisestage kasutaja teatele %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "Sisestage kasutaja teatele %s: "
@@ -1222,43 +1185,43 @@ msgstr "Viga teate saatmisel."
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "Viga serveriga ühenduse loomisel: %s"
+msgstr "Viga serveriga ühenduse loomisel: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Viga serveriga ühenduse loomisel: %s"
+msgstr "Viga serveriga ühenduse loomisel: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Viga failis %s, real %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Viga käsureal: %s\n"
+msgstr "Viga käsureal: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
 msgstr "Viga avaldises: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Viga terminali initsialiseerimisel."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Viga terminali initsialiseerimisel."
 
@@ -1268,41 +1231,32 @@ msgstr "Viga postkasti avamisel!"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "Viga aadressi analüüsimisel!"
+msgstr "Viga aadressi analüüsimisel!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Viga \"%s\" käivitamisel!"
+msgstr "Viga \"%s\" käivitamisel!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "Viga kataloogi skaneerimisel."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Viga teate saatmisel, alamprotsess lõpetas %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Viga teate saatmisel, alamprotsess lõpetas koodiga %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Viga teate saatmisel."
+msgstr "Viga teate saatmisel, alamprotsess lõpetas %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Viga serveriga %s suhtlemisel (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Viga faili vaatamisel"
 
@@ -1313,27 +1267,22 @@ msgstr "Viga postkasti kirjutamisel!"
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Viga. Säilitan ajutise faili: %s"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Viga: %s ei saa ahela viimase vahendajana kasutada."
+msgstr "Viga. Säilitan ajutise faili: %s"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1350,42 +1299,33 @@ msgstr "Viga: multipart/signed teatel puudub protokoll."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Viga käsureal: %s\n"
+msgstr "Viga käsureal: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Laen teadete päiseid... [%d/%d]"
+msgstr "Laen teadete päiseid... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Käivitan leitud teadetel käsu..."
+msgstr "Käivitan leitud teadetel käsu..."
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Välju"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Välju  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Väljun Muttist salvestamata?"
+msgstr "Väljun Muttist salvestamata?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Väljuda Muttist?"
+msgstr "Väljuda Muttist?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "Kustutamine ebaõnnestus."
+msgstr "Kustutamine ebaõnnestus."
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
@@ -1393,36 +1333,36 @@ msgstr "Kustutan serveril teateid..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Faili avamine päiste analüüsiks ebaõnnestus."
+msgstr "Faili avamine päiste analüüsiks ebaõnnestus."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Faili avamine päiste eemaldamiseks ebaõnnestus."
+msgstr "Faili avamine päiste eemaldamiseks ebaõnnestus."
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Faili avamine päiste analüüsiks ebaõnnestus."
+msgstr "Faili avamine päiste analüüsiks ebaõnnestus."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Fataalne viga! Postkasti ei õnnestu uuesti avada!"
+msgstr "Fataalne viga! Postkasti ei õnnestu uuesti avada!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Fataalne viga. Teadete arv ei ole sünkroonis!"
+msgstr "Fataalne viga. Teadete arv ei ole sünkroonis!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Kustutan serveril teateid..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "Laen teadet..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "Laen teadete nimekirja..."
@@ -1431,27 +1371,27 @@ msgstr "Laen teadete nimekirja..."
 msgid "Fetching list of messages..."
 msgstr "Laen teadete nimekirja..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Laen teadete päiseid... [%d/%d]"
+msgstr "Laen teadete päiseid... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Laen teadete päiseid... [%d/%d]"
+msgstr "Laen teadete päiseid... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Laen teadet..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "Failimask: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Fail on olemas, (k)irjutan üle, (l)isan või ka(t)kestan?"
+msgstr "Fail on olemas, (k)irjutan üle, (l)isan või ka(t)kestan?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
@@ -1466,39 +1406,34 @@ msgstr "Fail on kataloog, salvestan sinna?"
 msgid "File under directory: "
 msgstr "Fail kataloogis: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "Filtreeri läbi: "
+msgstr "Filtreeri läbi: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
-msgstr "Sõrmejälg: %s"
+msgstr "Sõrmejälg: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "salvesta teade hilisemaks saatmiseks"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Vastus aadressile %s%s?"
 
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Vastus aadressile %s%s?"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "Edastan MIME pakina?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Edasta lisadena?"
 
@@ -1506,7 +1441,7 @@ msgstr "Edasta lisadena?"
 msgid "Forward as attachments?"
 msgstr "Edasta lisadena?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
 msgstr "Funktsioon ei ole teate lisamise moodis lubatud."
 
@@ -1522,106 +1457,91 @@ msgstr "Laen nimeruumid..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Grupp"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Appi"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "%s abiinfo"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
 msgstr "Te loete praegu abiinfot."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Ma ei tea, kuidas seda trükkida!"
+msgstr "Ma ei tea, kuidas seda trükkida!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Ma ei tea, kuidas trükkida %s lisasid!"
+msgstr "Ma ei tea, kuidas trükkida %s lisasid!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "ID kehtivuse väärtus ei ole defineeritud."
+msgstr "ID kehtivuse väärtus ei ole defineeritud."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "ID on aegunud/blokeeritud/tühistatud."
+msgstr "ID on aegunud/blokeeritud/tühistatud."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
 msgstr "ID ei ole kehtiv."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
 msgstr "ID on ainult osaliselt kehtiv."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Vigane PGP päis"
+msgstr "Vigane PGP päis"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "Vigane S/MIME päis"
+msgstr "Vigane S/MIME päis"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Vigaselt formaaditud kirje tüübile %s faili \"%s\" real %d"
+msgstr "Vigaselt formaaditud kirje tüübile %s faili \"%s\" real %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr "Kaasan vastuses teate?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Tsiteerin teadet..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Lisa"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Vigane kuupäev: %s"
+msgstr "Vigane kuupäev: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "Vigane kodeering."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "Vigane indeksi number."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
 msgstr "Vigane teate number."
 
@@ -1633,92 +1553,88 @@ msgstr "Vigane kuu: %s"
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "Vigane suhteline kuupäev: %s"
+msgstr "Vigane suhteline kuupäev: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "Käivitan PGP..."
+msgstr "Käivitan PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "Käivitan PGP..."
+msgstr "Käivitan PGP..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Käivitan autovaate käskluse: %s"
+msgstr "Käivitan autovaate käskluse: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Hüppa teatele: "
+msgstr "Hüppa teatele: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Hüppa: "
+msgstr "Hüppa: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "hüppamine ei ole dialoogidele realiseeritud."
+msgstr "hüppamine ei ole dialoogidele realiseeritud."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "Võtme ID: 0x%s"
+msgstr "Võtme ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
 msgstr "Klahv ei ole seotud."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Klahv ei ole seotud. Abiinfo saamiseks vajutage '%s'."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "Piirdu teadetega mustriga: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Piirang: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Meldin..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1726,52 +1642,48 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Lukustamise arv on ületatud, eemaldan %s lukufaili? "
+msgstr "Lukustamise arv on ületatud, eemaldan %s lukufaili? "
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Meldin..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "Meldimine ebaõnnestus."
+msgstr "Meldimine ebaõnnestus."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Otsin võtmeid, mis sisaldavad \"%s\"..."
+msgstr "Otsin võtmeid, mis sisaldavad \"%s\"..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
 msgstr "Otsin serverit %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "Sõrmejälg: %s"
+msgstr "Sõrmejälg: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "MIME tüüp ei ole defineeritud. Lisa ei saa vaadata."
+msgstr "MIME tüüp ei ole defineeritud. Lisa ei saa vaadata."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Tuvastasin makros tsükli."
+msgstr "Tuvastasin makros tsükli."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Kiri"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "Kirja ei saadetud."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Teade on saadetud."
 
@@ -1787,20 +1699,20 @@ msgstr "Postkast on suletud"
 msgid "Mailbox created."
 msgstr "Postkast on loodud."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr "Postkast on kustutatud."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "Postkast on tühi."
+msgstr "Postkast on tühi."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "Postkast on märgitud mittekirjutatavaks. %s"
+msgstr "Postkast on märgitud mittekirjutatavaks. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
 msgstr "Postkast on ainult lugemiseks."
 
@@ -1812,7 +1724,7 @@ msgstr "Postkasti ei muudetud."
 msgid "Mailbox must have a name."
 msgstr "Postkastil peab olema nimi."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
 msgstr "Postkasti ei kustutatud."
 
@@ -1825,15 +1737,15 @@ msgstr "Postkast on loodud."
 msgid "Mailbox was corrupted!"
 msgstr "Postkast oli riknenud!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Postkasti on väliselt muudetud."
+msgstr "Postkasti on väliselt muudetud."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Postkasti on väliselt muudetud. Lipud võivad olla valed."
+msgstr "Postkasti on väliselt muudetud. Lipud võivad olla valed."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Postkastid [%d]"
@@ -1841,49 +1753,41 @@ msgstr "Postkastid [%d]"
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Mailcap toimeta kirje nõuab %%s"
+msgstr "Mailcap toimeta kirje nõuab %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Mailcap koostamise kirje nõuab %%s"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Loo alias"
+msgstr "Mailcap koostamise kirje nõuab %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "märgin %d teadet kustutatuks..."
+msgstr "märgin %d teadet kustutatuks..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Mask"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Teade on peegeldatud."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "Teadet ei saa trükkida"
+msgstr "Teadet ei saa trükkida"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "Teate fail on tühi!"
+msgstr "Teate fail on tühi!"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
@@ -1894,20 +1798,20 @@ msgstr "Teade on peegeldatud."
 msgid "Message not modified!"
 msgstr "Teadet ei muudetud!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Vanem teade ei ole selles piiratud vaates nähtav."
+msgstr "Vanem teade ei ole selles piiratud vaates nähtav."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Teade jäeti postitusootele."
+msgstr "Teade jäeti postitusootele."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "Teade on trükitud"
+msgstr "Teade on trükitud"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Teade on kirjutatud."
 
@@ -1917,7 +1821,7 @@ msgstr "Teated on peegeldatud."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "Teateid ei saa trükkida"
+msgstr "Teateid ei saa trükkida"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
@@ -1926,44 +1830,31 @@ msgstr "Teated on peegeldatud."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Teated on trükitud"
+msgstr "Teated on trükitud"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Puuduvad argumendid."
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Mixmaster ahelad on piiratud %d lüliga."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster ei toeta Cc või Bcc päiseid."
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Tõstan loetud teated postkasti %s?"
+msgstr "Tõstan loetud teated postkasti %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Tõstan loetud teated kausta %s..."
+msgstr "Tõstan loetud teated kausta %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Uus päring"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Uus failinimi: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Uus fail: "
 
@@ -1971,41 +1862,33 @@ msgstr "Uus fail: "
 msgid "New mail in "
 msgstr "Uus kiri kaustas "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr "Selles postkastis on uus kiri."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Järgm."
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "JärgmLm"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2017,250 +1900,236 @@ msgstr "Autentikaatoreid pole"
 msgid "No boundary parameter found! [report this error]"
 msgstr "Eraldaja puudub! [teatage sellest veast]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Kirjeid pole."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Maskile vastavaid faile ei ole"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Sissetulevate kirjade postkaste ei ole määratud."
+msgstr "Sissetulevate kirjade postkaste ei ole määratud."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
 msgstr "Kehtivat piirangumustrit ei ole."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
 msgstr "Avatud postkaste pole."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr "Uute teadetega postkaste ei ole."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "Mailcap koostamise kirjet %s jaoks puudub, loon tühja faili."
+msgstr "Mailcap koostamise kirjet %s jaoks puudub, loon tühja faili."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Mailcap toimeta kirjet %s jaoks ei ole."
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "Postiloendeid pole!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "Sobivat mailcap kirjet pole. Käsitlen tekstina."
+msgstr "Sobivat mailcap kirjet pole. Käsitlen tekstina."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "Selles kaustas ei ole teateid."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "Ühtegi mustrile vastavat teadet ei leitud."
+msgstr "Ühtegi mustrile vastavat teadet ei leitud."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "Rohkem tsiteetitud teksti pole."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "Rohkem teemasid pole."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Tsiteeritud teksiti järel rohkem teksti ei ole."
+msgstr "Tsiteeritud teksiti järel rohkem teksti ei ole."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
 msgstr "Uusi teateid POP postkastis pole."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Uusi teateid pole"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Teema puudub."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Maskile vastavaid faile ei ole"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Uute teadetega postkaste ei ole."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "Postitusootel teateid pole"
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Uute teadetega postkaste ei ole."
-
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Trükkimise käsklust ei ole defineeritud."
+msgstr "Trükkimise käsklust ei ole defineeritud."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Kirja saajaid pole määratud!"
+msgstr "Kirja saajaid pole määratud!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Saajaid ei ole määratud.\n"
+msgstr "Saajaid ei ole määratud.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Kirja saajaid ei määratud!"
+msgstr "Kirja saajaid ei määratud!"
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "Otsingumuster puudub."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Teema puudub."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "Teema puudub, katkestan saatmise?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "Teema puudub, katkestan?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Teema puudub, katkestan."
 
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "Sellist värvi ei ole"
+msgstr "Sellist värvi ei ole"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "Märgitud kirjeid pole."
+msgstr "Märgitud kirjeid pole."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Märgitud teateid ei ole näha!"
+msgstr "Märgitud teateid ei ole näha!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Märgitud teateid pole."
+msgstr "Märgitud teateid pole."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr "Kustutamata teateid pole."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "Lugemata teateid pole"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "Nähtavaid teateid pole."
+msgstr "Nähtavaid teateid pole."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Ei ole selles menüüs kasutatav."
+msgstr "Ei ole selles menüüs kasutatav."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Ei leitud."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
-msgstr "Ühendus serverisse %s..."
-
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
+msgstr "Ühendus serverisse %s..."
 
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
 msgstr "Kustutada saab ainult mitmeosalise teate lisasid."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
 msgstr "Avan postkasti"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
 msgstr "Avan postkasti ainult lugemiseks"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
 msgstr "Avage postkast, millest lisada teade"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "Avan postkasti ainult lugemiseks"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "Avage postkast, millest lisada teade"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Väljund saatmise protsessist"
+msgstr "Väljund saatmise protsessist"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
-"PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
+"PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP on juba valitud. Puhasta ja jätka ? "
+msgstr "PGP on juba valitud. Puhasta ja jätka ? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP võtmed, mis sisaldavad <%s>."
+msgstr "PGP võtmed, mis sisaldavad <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "PGP võtmed, mis sisaldavad <%s>."
+msgstr "PGP võtmed, mis sisaldavad <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP allkirja EI ÕNNESTU kontrollida."
+msgstr "PGP allkirja EI ÕNNESTU kontrollida."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
@@ -2268,94 +2137,72 @@ msgstr "PGP allkiri on edukalt kontrollitud."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "POP serverit ei ole määratud."
+msgstr "POP serverit ei ole määratud."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Vanem teade ei ole kättesaadav."
+msgstr "Vanem teade ei ole kättesaadav."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Vanem teade ei ole selles piiratud vaates nähtav."
+msgstr "Vanem teade ei ole selles piiratud vaates nähtav."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s parool: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Isiku nimi: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Toru"
-
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Toruga käsule: "
+msgstr "Toruga käsule: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Toru käsule: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Mixmaster kasutamisel omistage palun hostname muutujale korrektne väärtus!"
+msgstr "Toru käsule: "
 
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr "Panen teate postitusootele?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Postitusootel teated"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "Preconnect käsklus ebaõnnestus"
+msgstr "Preconnect käsklus ebaõnnestus"
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "Valmistan edastatavat teadet..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Jätkamiseks vajutage klahvi..."
-
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "EelmLk"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Trüki"
+msgstr "Jätkamiseks vajutage klahvi..."
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Trükin lisa?"
+msgstr "Trükin lisa?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "Trükin teate?"
+msgstr "Trükin teate?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Trükin märgitud lisa(d)?"
+msgstr "Trükin märgitud lisa(d)?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Trükin märgitud teated?"
+msgstr "Trükin märgitud teated?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
@@ -2367,34 +2214,30 @@ msgstr "Eemaldan %d kustutatud teate?"
 msgid "Purge %d deleted messages?"
 msgstr "Eemaldan %d kustutatud teadet?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Päring"
+msgstr "Päring"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "Päring '%s'"
+msgstr "Päring '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Päringukäsku ei ole defineeritud."
+msgstr "Päringukäsku ei ole defineeritud."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Päring: "
+msgstr "Päring: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Välju"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Väljun Muttist?"
+msgstr "Väljun Muttist?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Laen nimeruumid..."
@@ -2419,25 +2262,25 @@ msgstr "Loen %s... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Loen uusi teateid (%d baiti)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Kas tõesti kustutada postkast \"%s\"?"
+msgstr "Kas tõesti kustutada postkast \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
 msgstr "Laen postitusootel teate?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Ümberkodeerimine puudutab ainult tekstilisasid."
+msgstr "Ümberkodeerimine puudutab ainult tekstilisasid."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
-msgstr "SSL ebaõnnestus: %s"
+msgstr "SSL ebaõnnestus: %s"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Luua saab ainult IMAP postkaste"
@@ -2447,7 +2290,7 @@ msgstr "Luua saab ainult IMAP postkaste"
 msgid "Rename mailbox %s to: "
 msgstr "Loon postkasti: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Uus nimi: "
 
@@ -2455,15 +2298,11 @@ msgstr "Uus nimi: "
 msgid "Reopening mailbox..."
 msgstr "Avan postkasti uuesti..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Vasta"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Vastan aadressile %s%s?"
@@ -2476,34 +2315,34 @@ msgid ""
 msgstr ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr "Otsi tagurpidi: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
 msgstr "tagurpidi otsing: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
-"Järjestan tagurpidi (k)uup., (t)ähest., (s)uuruse järgi või (e)i järjesta? "
+"Järjestan tagurpidi (k)uup., (t)ähest., (s)uuruse järgi või (e)i järjesta? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
-"PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
+"PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või (u)nusta? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME on juba valitud. Puhasta ja jätka ? "
+msgstr "S/MIME on juba valitud. Puhasta ja jätka ? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME sertifikaadi omanik ei ole kirja saatja."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME sertifikaadid, mis sisaldavad \"%s\"."
@@ -2514,7 +2353,7 @@ msgstr "Sisu vihjeta S/MIME teateid ei toetata."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME allkirja EI ÕNNESTU kontrollida."
+msgstr "S/MIME allkirja EI ÕNNESTU kontrollida."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
@@ -2522,32 +2361,28 @@ msgstr "S/MIME allkiri on edukalt kontrollitud."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "SASL autentimine ebaõnnestus."
+msgstr "SASL autentimine ebaõnnestus."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "Sõrmejälg: %s"
+msgstr "Sõrmejälg: %s"
 
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "SSL ühendus kasutades %s (%s)"
+msgstr "SSL ühendus kasutades %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Salvesta"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "Salvestan sellest teatest koopia?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Salvestan faili: "
 
@@ -2561,88 +2396,68 @@ msgstr "Salvesta%s postkasti"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Salvestan teadete olekud... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Salvestan..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Otsi"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Otsi: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Otsing jõudis midagi leidmata lõppu"
+msgstr "Otsing jõudis midagi leidmata lõppu"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Otsing jõudis midagi leidmata algusse"
+msgstr "Otsing jõudis midagi leidmata algusse"
 
 #: pattern.c:1320
 msgid "Search interrupted."
 msgstr "Otsing katkestati."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Selles menüüs ei ole otsimist realiseeritud."
+msgstr "Selles menüüs ei ole otsimist realiseeritud."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Otsing pööras lõpust tagasi."
+msgstr "Otsing pööras lõpust tagasi."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Otsing pööras algusest tagasi."
+msgstr "Otsing pööras algusest tagasi."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Otsing: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Vali"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Vali  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Valige vahendajate ahel."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "Valin %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Saada"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Saadan taustal."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Saadan teadet..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Server sulges ühenduse!"
+msgstr "Server sulges ühenduse!"
 
 #: flags.c:335
 msgid "Set flag"
@@ -2650,19 +2465,19 @@ msgstr "Sea lipp"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "Käsurea käsk: "
+msgstr "Käsurea käsk: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Allkirjasta"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Allkirjasta kui: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Allkirjasta, krüpti"
+msgstr "Allkirjasta, krüpti"
 
 #: commands.c:406
 #, fuzzy
@@ -2672,34 +2487,30 @@ msgid ""
 msgstr ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Järjestan (k)uup., (t)ähest., (s)uuruse järgi või (e)i järjesta? "
+msgstr "Järjestan (k)uup., (t)ähest., (s)uuruse järgi või (e)i järjesta? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Järjestan teateid..."
+msgstr "Järjestan teateid..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "Võtme ID: 0x%s"
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
+msgstr "Võtme ID: 0x%s"
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Tellitud [%s], faili mask: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2708,96 +2519,92 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "Tellin %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "SSL Sertifikaadi kontroll"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Märgi teated mustriga: "
+msgstr "Märgi teated mustriga: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Märkige teada, mida soovite lisada!"
+msgstr "Märkige teada, mida soovite lisada!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Märkimist ei toetata."
+msgstr "Märkimist ei toetata."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "See teate ei ole nähtav."
+msgstr "See teate ei ole nähtav."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
 msgstr "SSL ei ole kasutatav."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "Käesolev lisa teisendatakse."
+msgstr "Käesolev lisa teisendatakse."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "Käesolevat lisa ei teisendata."
+msgstr "Käesolevat lisa ei teisendata."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Teadete indeks on vigane. Proovige postkasti uuesti avada."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "Vahendajate ahel on juba tühi."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "Lisasid ei ole."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Teateid ei ole."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "Osasid, mida näidata, ei ole!"
+msgstr "Osasid, mida näidata, ei ole!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "See IMAP server on iganenud. Mutt ei tööta sellega."
+msgstr "See IMAP server on iganenud. Mutt ei tööta sellega."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr "Selle serveri omanik on:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr "See sertifikaat on kehtiv"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Selle sertifikaadi väljastas:"
+msgstr "Selle sertifikaadi väljastas:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Seda võtit ei saa kasutada: aegunud/blokeeritud/tühistatud."
+msgstr "Seda võtit ei saa kasutada: aegunud/blokeeritud/tühistatud."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
 msgstr "Teema sisaldab lugemata teateid."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
 msgstr "Teemad ei ole lubatud."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
@@ -2809,23 +2616,27 @@ msgstr "fcntl luku seadmine aegus!"
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "flock luku seadmine aegus!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Teate algus on näidatud."
+msgstr "Teate algus on näidatud."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "Proovin eraldada PGP võtmed...\n"
+msgstr "Proovin eraldada PGP võtmed...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Proovin eraldada S/MIME sertifikaadid...\n"
 
@@ -2842,78 +2653,69 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "SASL autentimine ebaõnnestus."
+msgstr "SASL autentimine ebaõnnestus."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "%s ei õnnestu lisada!"
+msgstr "%s ei õnnestu lisada!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "Ei õnnestu lisada!"
+msgstr "Ei õnnestu lisada!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Sellest IMAP serverist ei saa päiseid laadida."
+msgstr "Sellest IMAP serverist ei saa päiseid laadida."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "Ei õnnestu saada partneri sertifikaati"
+msgstr "Ei õnnestu saada partneri sertifikaati"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Teateid ei õnnestu sererile jätta."
+msgstr "Teateid ei õnnestu sererile jätta."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "%s ei õnnestu lisada!"
+msgstr "%s ei õnnestu lisada!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
 msgstr "Postkasti ei saa lukustada!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Ajutise faili avamine ebaõnnestus!"
+msgstr "Ajutise faili avamine ebaõnnestus!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Ajutise faili avamine ebaõnnestus!"
+msgstr "Ajutise faili avamine ebaõnnestus!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Ajutise faili avamine ebaõnnestus!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Taasta"
+msgstr "Ajutise faili avamine ebaõnnestus!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "Taasta teated mustriga: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Taasta"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Tundmatu Content-Type %s"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Loobun kaustast %s..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Loobun kaustast %s..."
@@ -2923,9 +2725,9 @@ msgstr "Loobun kaustast %s..."
 msgid "Unsubscribing to %s..."
 msgstr "Loobun kaustast %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Võta märk teadetelt mustriga: "
+msgstr "Võta märk teadetelt mustriga: "
 
 #: imap/message.c:546
 #, fuzzy
@@ -2936,7 +2738,7 @@ msgstr "Saadan teadet ..."
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Kirjutamise uuesti lubamiseks kasutage 'toggle-write'!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Kasutan kasutajat = \"%s\" teatel %s?"
@@ -2946,20 +2748,16 @@ msgstr "Kasutan kasutajat = \"%s\" teatel %s?"
 msgid "Username at %s: "
 msgstr "Kasutajanimi serveril %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "Vigane kuu: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "Vigane kuu: %s"
 
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
-
 #: commands.c:89
 msgid "Verify PGP signature?"
 msgstr "Kontrollin PGP allkirja?"
@@ -2968,14 +2766,10 @@ msgstr "Kontrollin PGP allkirja?"
 msgid "Verifying message indexes..."
 msgstr "Kontrollin teadete indekseid ..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Vaata lisa"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "HOIATUS: Te olete üle kirjutamas faili %s, jätkan?"
+msgstr "HOIATUS: Te olete üle kirjutamas faili %s, jätkan?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2983,26 +2777,26 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "Serveri sertifikaat on aegunud"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "Serveri sertifikaat on aegunud"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "Serveri sertifikaat ei ole veel kehtiv"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "Serveri sertifikaat ei ole veel kehtiv"
@@ -3027,11 +2821,11 @@ msgstr "Ootan fcntl lukku... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "Ootan flock lukku... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Ootan vastust..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3041,12 +2835,12 @@ msgstr ""
 msgid "Warning: At least one certification key has expired\n"
 msgstr "Serveri sertifikaat on aegunud"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Hoiatus: Sertifikaati ei saa salvestada"
 
@@ -3066,30 +2860,30 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "See mis siin nüüd on, on viga lisa loomisel"
+msgstr "See mis siin nüüd on, on viga lisa loomisel"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Kirjutamine ebaõnnestus! Osaline postkast salvestatud faili %s"
+msgstr "Kirjutamine ebaõnnestus! Osaline postkast salvestatud faili %s"
 
 #: attach.c:731
 msgid "Write fault!"
 msgstr "Viga kirjutamisel!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Kirjuta teade postkasti"
 
@@ -3098,7 +2892,7 @@ msgstr "Kirjuta teade postkasti"
 msgid "Writing %s..."
 msgstr "Kirjutan %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Kirjutan teate faili %s ..."
@@ -3108,74 +2902,56 @@ msgstr "Kirjutan teate faili %s ..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Kirjutan teateid... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Viga käsureal: %s\n"
+msgstr "Viga käsureal: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Teil on juba selle nimeline hüüdnimi!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Te olete ahela esimese lüli juba valinud."
+msgstr "Teil on juba selle nimeline hüüdnimi!"
 
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Te olete ahela viimase lüli juba valinud."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr "Te olete esimesel kirjel."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Te olete esimesel lehel."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr "Te olete esimesel teatel."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr "Te olete esimesel lehel."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
 msgstr "Te olete esimesel teemal."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr "Te olete viimasel kirjel."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Te olete viimasel lehel."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "Te olete viimasel teatel."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr "Te olete viimasel lehel."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
 msgstr "Enam allapoole ei saa kerida."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Enam ülespoole ei saa kerida."
+msgstr "Enam ülespoole ei saa kerida."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Tei pole hüüdnimesid!"
+msgstr "Tei pole hüüdnimesid!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
 msgstr "Ainukest lisa ei saa kustutada."
 
@@ -3183,10 +2959,10 @@ msgstr "Ainukest lisa ei saa kustutada."
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Peegeldada saab ainult message/rfc822 osi."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] Nõus?"
+msgstr "[%s = %s] Nõus?"
 
 #: handler.c:1443
 #, c-format
@@ -3208,7 +2984,7 @@ msgstr "[-- Autovaate %s stderr --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autovaade kasutades %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3216,11 +2992,11 @@ msgstr ""
 "[-- PGP TEATE ALGUS --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP AVALIKU VÕTME BLOKI ALGUS --]\n"
+msgstr "[-- PGP AVALIKU VÕTME BLOKI ALGUS --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3228,64 +3004,64 @@ msgstr ""
 "[-- PGP ALLKIRJASTATUD TEATE ALGUS --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- %s ei saa käivitada.--]\n"
+msgstr "[-- %s ei saa käivitada.--]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- PGP TEATE LÕPP --]\n"
+msgstr "[-- PGP TEATE LÕPP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP AVALIKU VÕTME BLOKI LÕPP --]\n"
+msgstr "[-- PGP AVALIKU VÕTME BLOKI LÕPP --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- PGP ALLKIRJASTATUD TEATE LÕPP --]\n"
+msgstr "[-- PGP ALLKIRJASTATUD TEATE LÕPP --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- PGP/MIME krüptitud info lõpp --]\n"
+msgstr "[-- PGP/MIME krüptitud info lõpp --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- PGP/MIME krüptitud info lõpp --]\n"
+msgstr "[-- PGP/MIME krüptitud info lõpp --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- S/MIME krüptitud info lõpp --]\n"
+"[-- S/MIME krüptitud info lõpp --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- S/MIME Allkirjastatud info lõpp --]\n"
+"[-- S/MIME Allkirjastatud info lõpp --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Allkirjastatud info lõpp --]\n"
+"[-- Allkirjastatud info lõpp --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[-- Viga:  Multipart/Alternative osasid ei saa näidata! --]\n"
+msgstr "[-- Viga:  Multipart/Alternative osasid ei saa näidata! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3293,7 +3069,7 @@ msgstr ""
 "[-- Viga: Vigane multipart/signed struktuur! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3302,11 +3078,11 @@ msgstr ""
 "[-- Viga: Tundmatu multipart/signed protokoll %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Viga: ajutise faili loomine ebaõnnestus! --]\n"
+msgstr "[-- Viga: ajutise faili loomine ebaõnnestus! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3314,14 +3090,14 @@ msgstr ""
 "[-- Viga: ei suuda leida PGP teate algust! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- Viga: ajutise faili loomine ebaõnnestus! --]\n"
+msgstr "[-- Viga: ajutise faili loomine ebaõnnestus! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3331,45 +3107,45 @@ msgstr ""
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- Viga: message/external-body juurdepääsu parameeter puudub --]\n"
+msgstr "[-- Viga: message/external-body juurdepääsu parameeter puudub --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Järgneb PGP/MIME krüptitud info --]\n"
+"[-- Järgneb PGP/MIME krüptitud info --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Järgneb PGP/MIME krüptitud info --]\n"
+"[-- Järgneb PGP/MIME krüptitud info --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
-msgstr "[-- Järgneb S/MIME krüptitud info --]\n"
+msgstr "[-- Järgneb S/MIME krüptitud info --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
-msgstr "[-- Järgneb S/MIME allkirjastatud info --]\n"
+msgstr "[-- Järgneb S/MIME allkirjastatud info --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Järgnev info on allkirjastatud --]\n"
+"[-- Järgnev info on allkirjastatud --]\n"
 "\n"
 
 #: handler.c:1185
@@ -3385,17 +3161,17 @@ msgstr "[-- Seda %s/%s lisa ei ole kaasatud, --]\n"
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Tüüp: %s/%s, Kodeering: %s, Maht: %s --]\n"
+msgstr "[-- Tüüp: %s/%s, Kodeering: %s, Maht: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Hoiatus: Ei leia ühtegi allkirja. --]\n"
+"[-- Hoiatus: Ei leia ühtegi allkirja. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3407,13 +3183,13 @@ msgstr ""
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- ja näidatud juurdepääsu tüüpi %s ei toetata --]\n"
+msgstr "[-- ja näidatud juurdepääsu tüüpi %s ei toetata --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
-msgstr "[-- ja näidatud väline allikas on aegunud --]\n"
+msgstr "[-- ja näidatud väline allikas on aegunud --]\n"
 
 #: handler.c:1201
 #, c-format
@@ -3425,56 +3201,83 @@ msgstr "[-- nimi: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
 msgstr "Aegunud   "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
 msgstr "Vigane    "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
-msgstr "Tühistatud "
+msgstr "Tühistatud "
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[vigane kuupäev]"
+msgstr "[vigane kuupäev]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[arvutamine ei õnnestu]"
+msgstr "[arvutamine ei õnnestu]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: aadress puudub"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Ei leia ühtegi märgitud teadet."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Ei leia ühtegi märgitud teadet."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Salvestan sellest teatest koopia?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "toimeta lisa kirjeldust"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "toimeta lisa kirjeldust"
@@ -3483,50 +3286,199 @@ msgstr "toimeta lisa kirjeldust"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: iiga palju argumente"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Viga kataloogi skaneerimisel."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Uute teadetega postkaste ei ole."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: liiga vähe argumente"
+msgstr "color: liiga vähe argumente"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Uusi teateid pole"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr "teisendan"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Kirjuta teade postkasti"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "ajutise kausta loomine ebaõnnestus: %s"
+msgstr "ajutise kausta loomine ebaõnnestus: %s"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "ajutist kausta ei õnnestu lühendada: %s"
+msgstr "ajutist kausta ei õnnestu lühendada: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "ei õnnestu kirjutada ajutisse kausta: %s"
+msgstr "ei õnnestu kirjutada ajutisse kausta: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Sissetulevate kirjade postkaste ei ole määratud."
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "ktse"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "vaikimisi värve ei toetata"
+msgstr "vaikimisi värve ei toetata"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Kustutan teated serverist?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Taasta teated mustriga: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Taasta teated mustriga: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Toimetan edastatavat teadet?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3542,21 +3494,108 @@ msgstr "Kopeerin kausta %s..."
 msgid "echo Decompressing %s..."
 msgstr "Valin %s..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Käesolevat lisa ei teisendata."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "toimeta lisa kirjeldust"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Teadet ei õnnestu kirjutada"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Laen teadete päiseid... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Toimetan edastatavat teadet?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Salvestan sellest teatest koopia?"
+
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "tühi muster"
+msgstr "tühi muster"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "Krüpti"
+msgstr "Krüpti"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Salvestan sellest teatest koopia?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
 msgstr "viga mustris: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "viga mustris: %s"
@@ -3586,7 +3625,7 @@ msgstr "viga mustris: %s"
 msgid "error getting secret key `%s': %s\n"
 msgstr "viga mustris: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "viga mustris: %s"
@@ -3625,46 +3664,122 @@ msgstr "viga mustris: %s"
 msgid "error: unknown op %d (report this error)."
 msgstr "viga: tundmatu op %d (teatage sellest veast)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "kaimeu"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "kaimeu"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec: argumente pole"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Vastus aadressile %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Edasta lisadena?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Kontrollin, kas on uusi teateid..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Te olete esimesel teatel."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Te olete viimasel lehel."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Uute teadetega postkaste ei ole."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Viga postkasti avamisel!"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Uute teadetega postkaste ei ole."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
@@ -3675,33 +3790,159 @@ msgstr "on kustutatud --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbox: EXPUNGE ebaõnnestus"
+msgstr "imap_sync_mailbox: EXPUNGE ebaõnnestus"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "vigane päiseväli"
+msgstr "vigane päiseväli"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Vigane indeksi number."
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Hüppa teatele: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Hüppa teatele: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Teema sisaldab lugemata teateid."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Te olete esimesel teemal."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Lugemata teateid pole"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Lugemata teateid pole"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Salvestan sellest teatest koopia?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
-msgstr "PGP võtmed, mis sisaldavad <%s>."
+msgstr "PGP võtmed, mis sisaldavad <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Peegelda märgitud teated aadressile: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Uute teadetega postkaste ei ole."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "makro: tühi klahvijärjend"
+msgstr "makro: tühi klahvijärjend"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "makro: liiga palju argumente"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "Tüübil %s puudub mailcap kirje"
+msgstr "Tüübil %s puudub mailcap kirje"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): ei õnnestu seada faili aegu"
+msgstr "maildir_commit_message(): ei õnnestu seada faili aegu"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
@@ -3718,19 +3959,110 @@ msgstr "sulud ei klapi: %s"
 msgid "missing parameter"
 msgstr "parameeter puudub"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: liiga vähe argumente"
+msgstr "mono: liiga vähe argumente"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Te olete esimesel kirjel."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Te olete esimesel teatel."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Te olete viimasel kirjel."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Te olete viimasel teatel."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Te olete viimasel kirjel."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Te olete viimasel lehel."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Kustutamata teateid pole."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Te olete esimesel kirjel."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Te olete esimesel lehel."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Kustutamata teateid pole."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Te olete esimesel lehel."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
 msgstr "mitmeosalisel teatel puudub eraldaja!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "ei"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "(pole postkast)"
@@ -3739,55 +4071,308 @@ msgstr "(pole postkast)"
 msgid "not converting"
 msgstr "ei teisenda"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "tühi klahvijärjend"
+msgstr "tühi klahvijärjend"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "klt"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Avan postkasti ainult lugemiseks"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Avan postkasti ainult lugemiseks"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Avan postkasti uuesti..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Peegelda teade aadressile %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "reset käsuga ei ole prefiks lubatud"
+msgstr "reset käsuga ei ole prefiks lubatud"
+
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Te olete esimesel kirjel."
 
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push: liiga palju argumente"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Laen postitusootel teate?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Teema sisaldab lugemata teateid."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "POP serveril ei saa teadet toimetada."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: faili lisamine ebaõnnestus"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Hüppa teatele: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Kustutan teated serverist?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "kn"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "kna"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Salvesta%s postkasti"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Salvesta%s postkasti"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "POP serveril ei saa teadet toimetada."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "viga avaldises"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Otsi: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Teadet ei õnnestu saata."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Edasta lisadena?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Piirdu teadetega mustriga: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Rohkem tsiteetitud teksti pole."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Trükin teate?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Selles kaustas ei ole teateid."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: viga kohal %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: vead failis %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: lugemine katkestati, kuna %s on liialt vigane"
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Maskile vastavaid faile ei ole"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox on muudetud, aga muudetud teateid ei ole! (teatage sellest veast)"
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Võta märk teadetelt mustriga: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Te olete esimesel teemal."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3798,23 +4383,94 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Rohkem tsiteetitud teksti pole."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Ümberkodeerimine puudutab ainult tekstilisasid."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Otsingumuster puudub."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Lugemata teateid pole"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "liiga vähe argumente"
+msgstr "liiga vähe argumente"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "toimeta lisa kirjeldust"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Taasta teated mustriga: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Taasta teated mustriga: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Taasta teated mustriga: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
@@ -3828,12 +4484,30 @@ msgstr "unhook: seose sees ei saa unhook * kasutada."
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: tundmatu seose tüüp: %s"
+msgstr "unhook: tundmatu seose tüüp: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "tundmatu viga"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Võta märk teadetelt mustriga: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "toimeta lisa kirjeldust"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3845,12 +4519,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "reset käsuga ei ole väärtus lubatud"
+msgstr "reset käsuga ei ole väärtus lubatud"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Lisa on salvestatud."
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Uus fail: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Kirjuta teade postkasti"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "jah"
 
@@ -3858,3 +4563,6 @@ msgstr "jah"
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/fr.po b/po/fr.po
index 09ad052..60e87ee 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,49 +10,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-08-12 01:40+0200\n"
 "Last-Translator: Vincent Lefevre <vincent@vinc17.org>\n"
 "Language-Team: mutt-dev <mutt-dev@mutt.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Affectations génériques :\n"
+"Affectations génériques :\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"Fonctions non affectées :\n"
+"Fonctions non affectées :\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Fin des données signées --]\n"
+"[-- Fin des données signées --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
-msgstr "             alias : "
+msgstr "             alias : "
 
 #: crypt.cpkg:1145 crypt.cpkg:1165
 msgid "            created: "
-msgstr "             créée : "
+msgstr "             créée : "
 
 #: main.c:87
 #, fuzzy
@@ -72,7 +72,7 @@ msgid ""
 msgstr ""
 "usage : mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <fich> ] [ -m <type> ] [ -f "
 "<fich> ]\n"
-"        mutt [ -nR ] [ -e <cmd> ] [ -F <fich> ] -Q <requête> [ -Q <req> ] "
+"        mutt [ -nR ] [ -e <cmd> ] [ -F <fich> ] -Q <requête> [ -Q <req> ] "
 "[...]\n"
 "        mutt [ -nR ] [ -e <cmd> ] [ -F <fich> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
@@ -83,23 +83,23 @@ msgstr ""
 "        mutt -v[v]\n"
 "\n"
 "options :\n"
-"  -A <alias>\tdéveloppe l'alias mentionné\n"
-"  -a <fich>\tattache un fichier à ce message\n"
-"  -b <adresse>\tspécifie une adresse à mettre en copie aveugle (BCC)\n"
-"  -c <adresse>\tspécifie une adresse à mettre en copie (CC)\n"
-"  -D\t\técrit la valeur de toutes les variables sur stderr"
+"  -A <alias>\tdéveloppe l'alias mentionné\n"
+"  -a <fich>\tattache un fichier à ce message\n"
+"  -b <adresse>\tspécifie une adresse à mettre en copie aveugle (BCC)\n"
+"  -c <adresse>\tspécifie une adresse à mettre en copie (CC)\n"
+"  -D\t\técrit la valeur de toutes les variables sur stderr"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " signer en tant que : "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
-msgstr "      à %s"
+msgstr "      à %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "     de %s"
@@ -142,15 +142,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' pour avoir la liste) : "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr " (en ligne)"
 
@@ -158,19 +158,19 @@ msgstr " (en ligne)"
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Appuyez sur '%s' pour inverser l'écriture autorisée"
+msgstr " Appuyez sur '%s' pour inverser l'écriture autorisée"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr "alias ......: "
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " dans cette vue limitée"
+msgstr " dans cette vue limitée"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " les messages marqués"
+msgstr " les messages marqués"
 
 # , c-format
 #: pattern.c:716
@@ -182,49 +182,49 @@ msgstr "%c : commande invalide"
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c : non supporté dans ce mode"
+msgstr "%c : non supporté dans ce mode"
 
 # , c-format
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d gardé(s), %d effacé(s)."
+msgstr "%d gardé(s), %d effacé(s)."
 
 # , c-format
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d gardé(s), %d déplacé(s), %d effacé(s)."
+msgstr "%d gardé(s), %d déplacé(s), %d effacé(s)."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr "%s \"%s\"."
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr "%s <%s>."
 
 # , c-format
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Voulez-vous vraiment utiliser la clé ?"
+msgstr "%s Voulez-vous vraiment utiliser la clé ?"
 
 # , c-format
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] modifié. Mise à jour du codage ?"
+msgstr "%s [#%d] modifié. Mise à jour du codage ?"
 
 # , c-format
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] n'existe plus !"
@@ -235,10 +235,10 @@ msgstr "%s [#%d] n'existe plus !"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d messages lus sur %d]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s n'existe pas. Le créer ?"
+msgstr "%s n'existe pas. Le créer ?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
@@ -250,33 +250,33 @@ msgstr "%s n'est pas un chemin IMAP valide"
 msgid "%s is an invalid POP path"
 msgstr "%s est un chemin POP invalide"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr "%s est un chemin POP invalide"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr "%s est un chemin POP invalide"
 
 # , c-format
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s n'est pas un répertoire."
+msgstr "%s n'est pas un répertoire."
 
 # , c-format
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s n'est pas une boîte aux lettres !"
+msgstr "%s n'est pas une boîte aux lettres !"
 
 # , c-format
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s n'est pas une boîte aux lettres."
+msgstr "%s n'est pas une boîte aux lettres."
 
 # , c-format
 #: sendlib.c:748
@@ -303,61 +303,61 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s : type inconnu."
 
 # , c-format
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s : couleur non disponible sur ce terminal"
 
 # , c-format
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s : commande uniquement valide pour l'objet index"
 
 # , c-format
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s : cet attribut n'existe pas"
 
 # , c-format
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s : cette couleur n'existe pas"
 
 # , c-format
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s : cette fonction n'existe pas"
 
 # , c-format
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s : cette fonction n'existe pas dans la table"
 
 # , c-format
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s : ce menu n'existe pas"
 
 # , c-format
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s : cet objet n'existe pas"
 
 # , c-format
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s : pas assez d'arguments"
@@ -369,57 +369,57 @@ msgid "%s: unable to attach file"
 msgstr "%s : impossible d'attacher le fichier"
 
 # , c-format
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s : impossible d'attacher le fichier.\n"
 
 # , c-format
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s : commande inconnue"
 
 # , c-format
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s : type inconnu"
 
 # , c-format
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s : variable inconnue"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
 msgstr "%s est un chemin POP invalide"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr "%s est un chemin POP invalide"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(la fonction 'view-attachments' doit être affectée à une touche !)"
+msgstr "(la fonction 'view-attachments' doit être affectée à une touche !)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(pas de boîte aux lettres)"
+msgstr "(pas de boîte aux lettres)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ejeter, accepter (u)ne fois"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ejeter, accepter (u)ne fois, (a)ccepter toujours"
 
@@ -437,132 +437,124 @@ msgstr "(utilisez '%s' pour voir cette partie)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
-msgstr "*MAUVAISE* signature prétendant venir de : "
+msgstr "*MAUVAISE* signature prétendant venir de : "
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ", "
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Attachements"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<INCONNU>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<défaut>"
+msgstr "<défaut>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
-msgstr "Désaccord avec une partie de la politique\n"
+msgstr "Désaccord avec une partie de la politique\n"
 
 #: crypt.cpkg:958
 msgid "A system error occurred"
-msgstr "Une erreur système s'est produite"
+msgstr "Une erreur système s'est produite"
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "L'authentification APOP a échoué."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Abandonner"
+msgstr "L'authentification APOP a échoué."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Message non modifié. Abandonner ?"
+msgstr "Message non modifié. Abandonner ?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Message non modifié. Abandon."
+msgstr "Message non modifié. Abandon."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adresse : "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Alias ajouté."
+msgstr "Alias ajouté."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Créer l'alias : "
+msgstr "Créer l'alias : "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Alias"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
-"Tous les protocoles disponibles pour une connexion TLS/SSL sont désactivés"
+"Tous les protocoles disponibles pour une connexion TLS/SSL sont désactivés"
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 msgid "All matching keys are marked expired/revoked."
-msgstr "Toutes les clés correspondantes sont marquées expirées/révoquées."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Ajouter"
+msgstr "Toutes les clés correspondantes sont marquées expirées/révoquées."
 
 # , c-format
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Ajouter les messages à %s ?"
+msgstr "Ajouter les messages à %s ?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "L'argument doit être un numéro de message."
+msgstr "L'argument doit être un numéro de message."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "Attachement sauvé."
+msgstr "Attachement sauvé."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Attacher fichier"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "J'attache les fichiers sélectionnés..."
+msgstr "J'attache les fichiers sélectionnés..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "Attachement filtré."
+msgstr "Attachement filtré."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "Attachement sauvé."
+msgstr "Attachement sauvé."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Attachements"
 
@@ -591,58 +583,58 @@ msgstr "La CRL disponible est trop ancienne\n"
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "Mauvais IDN « %s »."
+msgstr "Mauvais IDN « %s »."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "Mauvais IDN %s lors de la préparation du resent-from."
+msgstr "Mauvais IDN %s lors de la préparation du resent-from."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "Mauvais IDN dans « %s » : '%s'"
+msgstr "Mauvais IDN dans « %s » : '%s'"
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "Mauvais IDN : '%s'"
+msgstr "Mauvais IDNÂ : '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "Mauvaise boîte aux lettres"
+msgstr "Mauvaise boîte aux lettres"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "La fin du message est affichée."
+msgstr "La fin du message est affichée."
 
 # , c-format
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Renvoyer le message à %s"
+msgstr "Renvoyer le message à %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Renvoyer le message à : "
+msgstr "Renvoyer le message à : "
 
 # , c-format
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Renvoyer les messages à %s"
+msgstr "Renvoyer les messages à %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Renvoyer les messages marqués à : "
+msgstr "Renvoyer les messages marqués à : "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "CLOSE a échoué"
+msgstr "CLOSE a échoué"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -654,58 +646,58 @@ msgstr ""
 msgid "Can't append to folder: %s"
 msgstr "Impossible d'ajouter au dossier : %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Impossible d'attacher un répertoire !"
+msgstr "Impossible d'attacher un répertoire !"
 
 # , c-format
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "Impossible de créer %s : %s."
+msgstr "Impossible de créer %s : %s."
 
 # , c-format
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "Impossible de créer le fichier %s"
+msgstr "Impossible de créer le fichier %s"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Impossible de créer le filtre"
+msgstr "Impossible de créer le filtre"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "Impossible de créer le processus filtrant"
+msgstr "Impossible de créer le processus filtrant"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Impossible de créer le fichier temporaire"
+msgstr "Impossible de créer le fichier temporaire"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Impossible de décoder ts les attachements marqués. MIME-encapsuler les "
+"Impossible de décoder ts les attachements marqués. MIME-encapsuler les "
 "autres ?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Impossible de décoder tous les attachements marqués. Faire suivre les "
+"Impossible de décoder tous les attachements marqués. Faire suivre les "
 "autres ?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "Impossible de déchiffrer le message chiffré !"
+msgstr "Impossible de déchiffrer le message chiffré !"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "Impossible d'effacer l'attachement depuis le serveur POP."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "Impossible d'effacer l'attachement depuis le serveur POP."
@@ -722,11 +714,7 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Aucun message marqué n'a pu être trouvé."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Impossible d'obtenir le type2.list du mixmaster !"
+msgstr "Aucun message marqué n'a pu être trouvé."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
@@ -745,90 +733,86 @@ msgid "Can't open trash folder"
 msgstr "Impossible d'ajouter au dossier : %s"
 
 # , c-format
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Connexion à %s fermée"
+msgstr "Connexion à %s fermée"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "Fermeture de la connexion au serveur POP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
 # , c-format
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Impossible d'obtenir le statut de %s : %s"
 
 # , c-format
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "Impossible de créer %s : %s."
+msgstr "Impossible de créer %s : %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Impossible de sauver le message dans la boîte aux lettres POP."
+msgstr "Impossible de sauver le message dans la boîte aux lettres POP."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Impossible d'éditer le message sur le serveur POP."
+msgstr "Impossible d'éditer le message sur le serveur POP."
 
 # , c-format
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Impossible d'obtenir le statut de %s : %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
-msgstr "Impossible de vérifier par suite d'une clé ou certificat manquant\n"
+msgstr "Impossible de vérifier par suite d'une clé ou certificat manquant\n"
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Impossible de visualiser un répertoire"
+msgstr "Impossible de visualiser un répertoire"
 
 # , c-format
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "Impossible de créer %s."
+msgstr "Impossible de créer %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Impossible d'écrire l'en-tête dans le fichier temporaire !"
+msgstr "Impossible d'écrire l'en-tête dans le fichier temporaire !"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Impossible d'écrire le message"
+msgstr "Impossible d'écrire le message"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Impossible d'écrire le message dans le fichier temporaire !"
+msgstr "Impossible d'écrire le message dans le fichier temporaire !"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Impossible de créer le filtre d'affichage"
+msgstr "Impossible de créer le filtre d'affichage"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Impossible de créer le filtre"
+msgstr "Impossible de créer le filtre"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr ""
-"Impossible de rendre inscriptible une boîte aux lettres en lecture seule !"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+"Impossible de rendre inscriptible une boîte aux lettres en lecture seule !"
 
 # , c-format
 #: lib-sys/mutt_signal.c:27
@@ -836,68 +820,60 @@ msgstr ""
 msgid "Caught %s...  Exiting.\n"
 msgstr "Erreur %s... On quitte.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 msgid "Certificate is not X.509"
 msgstr "Le certificat n'est pas de type X.509"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "Certificat sauvé"
+msgstr "Certificat sauvé"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
-msgstr "Erreur de vérification du certificat (%s)"
+msgstr "Erreur de vérification du certificat (%s)"
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Les modifications du dossier seront enregistrées à sa sortie."
+msgstr "Les modifications du dossier seront enregistrées à sa sortie."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Les modifications du dossier ne seront pas enregistrées."
+msgstr "Les modifications du dossier ne seront pas enregistrées."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr "Caractère = %s, Octal = %o, Decimal = %d"
+msgstr "Caractère = %s, Octal = %o, Decimal = %d"
 
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Jeu de caractères changé à %s ; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Changement de répertoire"
+msgstr "Jeu de caractères changé à %s ; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "Changement de répertoire vers : "
+msgstr "Changement de répertoire vers : "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Recherche de nouveaux messages..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Vérifier clé  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Recherche de nouveaux messages..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Recherche de nouveaux messages..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
-msgstr "Vérification des abonnements aux boîtes aux lettres"
+msgstr "Vérification des abonnements aux boîtes aux lettres"
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Clair"
 
@@ -906,35 +882,35 @@ msgstr "Clair"
 msgid "Clear flag"
 msgstr "Effacer l'indicateur"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Fermeture de la connexion à %s..."
+msgstr "Fermeture de la connexion à %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
 msgstr "Fermeture de la connexion au serveur POP..."
 
 # , c-format
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 msgid "Collecting data..."
-msgstr "Récupération des données..."
+msgstr "Récupération des données..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "La commande TOP n'est pas supportée par le serveur."
+msgstr "La commande TOP n'est pas supportée par le serveur."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "La commande UIDL n'est pas supportée par le serveur."
+msgstr "La commande UIDL n'est pas supportée par le serveur."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "Écriture des changements..."
+msgstr "Écriture des changements..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -957,22 +933,22 @@ msgstr "Copie vers %s..."
 msgid "Compressing %s..."
 msgstr "Copie vers %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
 # , c-format
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "Connexion à %s..."
+msgstr "Connexion à %s..."
 
 # , c-format
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "Connexion à %s..."
+msgstr "Connexion à %s..."
 
 # , c-format
 #: lib-sys/mutt_tunnel.c:61
@@ -993,21 +969,21 @@ msgstr "Connexion perdue. Se reconnecter au serveur POP ?"
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "Connexion à %s fermée"
+msgstr "Connexion à %s fermée"
 
 # , c-format
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Connexion à %s fermée"
+msgstr "Connexion à %s fermée"
 
 # , c-format
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Content-Type changé à %s."
+msgstr "Content-Type changé à %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type est de la forme base/sous"
 
@@ -1018,7 +994,7 @@ msgstr "Continuer ?"
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "Convertir en %s à l'envoi ?"
+msgstr "Convertir en %s à l'envoi ?"
 
 # , c-format
 #: commands.c:600
@@ -1059,26 +1035,26 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Impossible de se connecter à %s (%s)."
+msgstr "Impossible de se connecter à %s (%s)."
 
 #: commands.c:111
 msgid "Could not copy message"
 msgstr "Impossible de copier le message"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Impossible de créer le fichier temporaire !"
+msgstr "Impossible de créer le fichier temporaire !"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Impossible de créer le fichier temporaire !"
+msgstr "Impossible de créer le fichier temporaire !"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Fonction de tri non trouvée ! [signalez ce bug]"
+msgstr "Fonction de tri non trouvée ! [signalez ce bug]"
 
 # , c-format
 #: lib-sys/mutt_socket.c:350
@@ -1086,13 +1062,13 @@ msgstr "Fonction de tri non trouv
 msgid "Could not find the host \"%s\""
 msgstr "Impossible de trouver la machine \"%s\""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Tous les messages demandés n'ont pas pu être inclus !"
+msgstr "Tous les messages demandés n'ont pas pu être inclus !"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "Impossible de négocier la connexion TLS"
+msgstr "Impossible de négocier la connexion TLS"
 
 # , c-format
 #: sendlib.c:908
@@ -1102,9 +1078,9 @@ msgstr "Impossible d'ouvrir %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "La boîte aux lettres n'a pas pu être réouverte !"
+msgstr "La boîte aux lettres n'a pas pu être réouverte !"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "Impossible d'envoyer le message."
 
@@ -1118,114 +1094,101 @@ msgstr "Impossible de verrouiller %s\n"
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "Créer %s ?"
+msgstr "Créer %s ?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "La création n'est supportée que pour les boîtes aux lettres IMAP"
+msgstr "La création n'est supportée que pour les boîtes aux lettres IMAP"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Créer la boîte aux lettres : "
+msgstr "Créer la boîte aux lettres : "
 
 # , c-format
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "Décoder-copier%s vers une BAL"
+msgstr "Décoder-copier%s vers une BAL"
 
 # , c-format
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "Décoder-sauver%s vers une BAL"
+msgstr "Décoder-sauver%s vers une BAL"
 
 # , c-format
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "Sélection de %s..."
+msgstr "Sélection de %s..."
 
 # , c-format
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Déchiffrer-copier%s vers une BAL"
+msgstr "Déchiffrer-copier%s vers une BAL"
 
 # , c-format
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "Déchiffrer-sauver%s vers une BAL"
+msgstr "Déchiffrer-sauver%s vers une BAL"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
-msgstr "Déchiffrage du message..."
+msgstr "Déchiffrage du message..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Le déchiffrage a échoué."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Effacer"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Retirer"
+msgstr "Le déchiffrage a échoué."
 
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "La suppression n'est supportée que pour les boîtes aux lettres IMAP"
+msgstr "La suppression n'est supportée que pour les boîtes aux lettres IMAP"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
 msgstr "Effacer les messages sur le serveur ?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "Effacer les messages correspondant à : "
+msgstr "Effacer les messages correspondant à : "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Retirer"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "L'effacement d'attachements des messages chiffrés n'est pas supporté."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Description"
+msgstr "L'effacement d'attachements des messages chiffrés n'est pas supporté."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "L'ID %s n'est pas vérifié. Voulez-vous l'utiliser pour %s ?"
+msgstr "L'ID %s n'est pas vérifié. Voulez-vous l'utiliser pour %s ?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s n'existe pas. Le créer ?"
+msgstr "%s n'existe pas. Le créer ?"
 
 # , c-format
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Répertoire [%s], masque de fichier : %s"
+msgstr "Répertoire [%s], masque de fichier : %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "ERREUR : veuillez signaler ce problème"
+msgstr "ERREUR : veuillez signaler ce problème"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "Éditer le message à faire suivre ?"
+msgstr "Éditer le message à faire suivre ?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1234,46 +1197,46 @@ msgstr ""
 msgid "Empty expression"
 msgstr "erreur dans l'expression"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
 msgstr "Chiffrer avec : "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
-msgstr "Connexion chiffrée non disponible"
+msgstr "Connexion chiffrée non disponible"
 
 # , c-format
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Entrez keyID : "
 
 # , c-format
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Entrez keyID pour %s : "
 
 # , c-format
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
 msgstr "Entrez des touches (^G pour abandonner) : "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "Erreur en renvoyant le message !"
+msgstr "Erreur en renvoyant le message !"
 
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "Erreur en renvoyant les messages !"
+msgstr "Erreur en renvoyant les messages !"
 
 #: crypt.cpkg:1175
 msgid "Error checking signature"
-msgstr "Erreur en vérifiant la signature"
+msgstr "Erreur en vérifiant la signature"
 
 # , c-format
 #: pop.c:142
@@ -1287,23 +1250,23 @@ msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
 # , c-format
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Erreur en cherchant la clé de l'émetteur : %s\n"
+msgstr "Erreur en cherchant la clé de l'émetteur : %s\n"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
-msgstr "Erreur en récupérant les informations sur la clé : "
+msgstr "Erreur en récupérant les informations sur la clé : "
 
 # , c-format
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Erreur dans %s, ligne %d : %s"
 
 # , c-format
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Erreur dans la ligne de commande : %s\n"
@@ -1314,96 +1277,81 @@ msgstr "Erreur dans la ligne de commande : %s\n"
 msgid "Error in expression: %s"
 msgstr "Erreur dans l'expression : %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 msgid "Error initialising gnutls certificate data"
-msgstr "Erreur d'initialisation des données du certificat gnutls"
+msgstr "Erreur d'initialisation des données du certificat gnutls"
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Erreur d'initialisation du terminal."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "Erreur à l'ouverture de la boîte aux lettres"
+msgstr "Erreur à l'ouverture de la boîte aux lettres"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "Erreur de décodage de l'adresse !"
+msgstr "Erreur de décodage de l'adresse !"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
-msgstr "Erreur de traitement des données du certificat"
+msgstr "Erreur de traitement des données du certificat"
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Erreur en exécutant \"%s\" !"
+msgstr "Erreur en exécutant \"%s\" !"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Erreur de lecture du répertoire."
+msgstr "Erreur de lecture du répertoire."
 
 # , c-format
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Erreur en envoyant le message, fils terminé avec le code %d (%s)."
-
-# , c-format
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Erreur en envoyant le message, fils terminé avec le code %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Erreur en envoyant le message."
+msgstr "Erreur en envoyant le message, fils terminé avec le code %d (%s)."
 
 # , c-format
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "Erreur en parlant à %s (%s)"
+msgstr "Erreur en parlant à %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Erreur en essayant de visualiser le fichier"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "Erreur à l'écriture de la boîte aux lettres !"
+msgstr "Erreur à l'écriture de la boîte aux lettres !"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Erreur. On préserve le fichier temporaire : %s"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Erreur : %s ne peut pas être utilisé comme redistributeur final."
+msgstr "Erreur. On préserve le fichier temporaire : %s"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "Erreur : '%s' est un mauvais IDN."
+msgstr "Erreur : '%s' est un mauvais IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
-msgstr "Erreur : chaîne de certification trop longue - on arrête ici\n"
+msgstr "Erreur : chaîne de certification trop longue - on arrête ici\n"
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
-msgstr "Erreur : la copie des données a échoué\n"
+msgstr "Erreur : la copie des données a échoué\n"
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
-msgstr "Erreur : le déchiffrage/vérification a échoué : %s\n"
+msgstr "Erreur : le déchiffrage/vérification a échoué : %s\n"
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "Erreur : multipart/encrypted n'a pas de paramètre de protocole !"
+msgstr "Erreur : multipart/encrypted n'a pas de paramètre de protocole !"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
@@ -1411,46 +1359,37 @@ msgstr "Erreur : multipart/signed n'a pas de protocole."
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
-msgstr "Erreur : pas de socket TLS ouverte"
+msgstr "Erreur : pas de socket TLS ouverte"
 
 # , c-format
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Erreur : la vérification a échoué : %s\n"
+msgstr "Erreur : la vérification a échoué : %s\n"
 
 # , c-format
 #: imap/message.c:109
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Évaluation du cache... [%d/%d]"
+msgstr "Évaluation du cache... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Exécution de la commande sur les messages correspondants..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Quitter"
+msgstr "Exécution de la commande sur les messages correspondants..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Quitter  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
 msgstr "Quitter Mutt sans sauvegarder ?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
 msgstr "Quitter Mutt ?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "Expunge a échoué"
+msgstr "Expunge a échoué"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
@@ -1458,113 +1397,107 @@ msgstr "Effacement des messages sur le serveur..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Échec d'ouverture du fichier pour décoder les en-têtes."
+msgstr "Échec d'ouverture du fichier pour décoder les en-têtes."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Échec d'ouverture du fichier pour enlever les en-têtes."
+msgstr "Échec d'ouverture du fichier pour enlever les en-têtes."
 
 #: attach.c:151
 msgid "Failure to rename file."
-msgstr "Échec de renommage du fichier."
+msgstr "Échec de renommage du fichier."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Erreur fatale ! La boîte aux lettres n'a pas pu être réouverte !"
+msgstr "Erreur fatale ! La boîte aux lettres n'a pas pu être réouverte !"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Erreur fatale. Le nombre de messages ne correspond pas !"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Effacement des messages sur le serveur..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "Récupération du message..."
+msgstr "Récupération du message..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Récupération de la liste des messages..."
+msgstr "Récupération de la liste des messages..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "Récupération de la liste des messages..."
+msgstr "Récupération de la liste des messages..."
 
 # , c-format
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Récupération des en-têtes des messages... [%d/%d]"
+msgstr "Récupération des en-têtes des messages... [%d/%d]"
 
 # , c-format
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Récupération des en-têtes des messages... [%d/%d]"
+msgstr "Récupération des en-têtes des messages... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "Récupération du message..."
+msgstr "Récupération du message..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "Masque de fichier : "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Le fichier existe, écras(e)r, (c)oncaténer ou (a)nnuler ?"
+msgstr "Le fichier existe, écras(e)r, (c)oncaténer ou (a)nnuler ?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Le fichier est un répertoire, sauver dans celui-ci ?"
+msgstr "Le fichier est un répertoire, sauver dans celui-ci ?"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr ""
-"Le fichier est un répertoire, sauver dans celui-ci ? [(o)ui, (n)on, (t)ous]"
+"Le fichier est un répertoire, sauver dans celui-ci ? [(o)ui, (n)on, (t)ous]"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "Fichier dans le répertoire : "
+msgstr "Fichier dans le répertoire : "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filtrer avec : "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 msgid "Fingerprint: "
-msgstr "Empreinte : "
+msgstr "Empreinte : "
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 msgid "First, please tag a message to be linked here"
-msgstr "D'abord, veuillez marquer un message à lier ici"
+msgstr "D'abord, veuillez marquer un message à lier ici"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
 # , c-format
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "Suivi de la discussion à %s%s ?"
-
-# , c-format
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Suivi de la discussion à %s%s ?"
+msgstr "Suivi de la discussion à %s%s ?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Faire suivre en MIME encapsulé ?"
+msgstr "Faire suivre en MIME encapsulé ?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Faire suivre sous forme d'attachement ?"
 
@@ -1573,128 +1506,113 @@ msgid "Forward as attachments?"
 msgstr "Faire suivre sous forme d'attachements ?"
 
 # , c-format
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Fonction non autorisée en mode attach-message."
+msgstr "Fonction non autorisée en mode attach-message."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "Récupération de la liste des dossiers..."
+msgstr "Récupération de la liste des dossiers..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "Récupération des espaces de noms..."
+msgstr "Récupération des espaces de noms..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
-msgstr "Bonne signature de : "
-
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Groupe"
+msgstr "Bonne signature de : "
 
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Aide"
-
 # , c-format
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Aide pour %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "L'aide est actuellement affichée."
+msgstr "L'aide est actuellement affichée."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
 msgstr "Je ne sais pas comment imprimer ceci !"
 
 # , c-format
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Je ne sais pas comment imprimer %s attachements !"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "L'ID a une validité indéfinie."
+msgstr "L'ID a une validité indéfinie."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "L'ID est expiré/désactivé/annulé."
+msgstr "L'ID est expiré/désactivé/annulé."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
 msgstr "L'ID n'est pas valide."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
 msgstr "L'ID n'est que peu valide."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "En-tête PGP illégal"
+msgstr "En-tête PGP illégal"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "En-tête S/MIME illégal"
+msgstr "En-tête S/MIME illégal"
 
 # , c-format
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Entrée incorrectement formatée pour le type %s dans \"%s\" ligne %d"
+msgstr "Entrée incorrectement formatée pour le type %s dans \"%s\" ligne %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Inclure le message dans la réponse ?"
+msgstr "Inclure le message dans la réponse ?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "Inclusion du message cité..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "Insérer"
+msgstr "Inclusion du message cité..."
 
 # , c-format
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Quantième invalide : %s"
+msgstr "Quantième invalide : %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "Codage invalide."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Numéro d'index invalide."
+msgstr "Numéro d'index invalide."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Numéro de message invalide."
+msgstr "Numéro de message invalide."
 
 # , c-format
 #: pattern.c:343
@@ -1708,11 +1626,11 @@ msgstr "Mois invalide : %s"
 msgid "Invalid relative date: %s"
 msgstr "Date relative invalide : %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "Appel de PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "Appel de SMIME..."
@@ -1723,79 +1641,75 @@ msgstr "Appel de SMIME..."
 msgid "Invoking autoview command: %s"
 msgstr "Invocation de la commande de visualisation automatique : %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
-msgstr "Publiée par : "
+msgstr "Publiée par : "
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Aller au message : "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Aller à : "
+msgstr "Aller à : "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Le saut n'est pas implémenté pour les dialogues."
+msgstr "Le saut n'est pas implémenté pour les dialogues."
 
 # , c-format
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "ID de la clé : 0x%s"
+msgstr "ID de la clé : 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
-msgstr "Type de clé : %s, %lu bits %s\n"
+msgstr "Type de clé : %s, %lu bits %s\n"
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr "Utilisation : "
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Cette touche n'est pas affectée."
+msgstr "Cette touche n'est pas affectée."
 
 # , c-format
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Cette touche n'est pas affectée. Tapez '%s' pour avoir l'aide."
+msgstr "Cette touche n'est pas affectée. Tapez '%s' pour avoir l'aide."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Limiter aux messages correspondant à : "
+msgstr "Limiter aux messages correspondant à : "
 
 # , c-format
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Limite : %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Connexion..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1804,20 +1718,20 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Nombre d'essais de verrouillage dépassé, enlever le verrou pour %s ?"
+msgstr "Nombre d'essais de verrouillage dépassé, enlever le verrou pour %s ?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Connexion..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "La connexion a échoué."
+msgstr "La connexion a échoué."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Recherche des clés correspondant à \"%s\"..."
+msgstr "Recherche des clés correspondant à \"%s\"..."
 
 # , c-format
 #: lib-sys/mutt_socket.c:341
@@ -1825,115 +1739,107 @@ msgstr "Recherche des cl
 msgid "Looking up %s..."
 msgstr "Recherche de %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "Empreinte MD5 : %s"
+msgstr "Empreinte MD5Â : %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "Type MIME non défini. Impossible de visualiser l'attachement."
+msgstr "Type MIME non défini. Impossible de visualiser l'attachement."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Boucle de macro détectée."
+msgstr "Boucle de macro détectée."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Message"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "Message non envoyé."
+msgstr "Message non envoyé."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "Message envoyé."
+msgstr "Message envoyé."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "Boîte aux lettres vérifiée."
+msgstr "Boîte aux lettres vérifiée."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Boîte aux lettres fermée"
+msgstr "Boîte aux lettres fermée"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Boîte aux lettres créée."
+msgstr "Boîte aux lettres créée."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Boîte aux lettres supprimée."
+msgstr "Boîte aux lettres supprimée."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "La boîte aux lettres est vide."
+msgstr "La boîte aux lettres est vide."
 
 # , c-format
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "La boîte aux lettres est protégée contre l'écriture. %s"
+msgstr "La boîte aux lettres est protégée contre l'écriture. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "La boîte aux lettres est en lecture seule."
+msgstr "La boîte aux lettres est en lecture seule."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "La boîte aux lettres est inchangée."
+msgstr "La boîte aux lettres est inchangée."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "La boîte aux lettres doit avoir un nom."
+msgstr "La boîte aux lettres doit avoir un nom."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Boîte aux lettres non supprimée."
+msgstr "Boîte aux lettres non supprimée."
 
 #: imap/browse.c:306
 msgid "Mailbox renamed."
-msgstr "Boîte aux lettres renommée."
+msgstr "Boîte aux lettres renommée."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "La boîte aux lettres a été altérée !"
+msgstr "La boîte aux lettres a été altérée !"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "La boîte aux lettres a été modifiée extérieurement."
+msgstr "La boîte aux lettres a été modifiée extérieurement."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
-"Boîte aux lettres modifiée extérieurement. Les indicateurs peuvent être faux."
+"Boîte aux lettres modifiée extérieurement. Les indicateurs peuvent être faux."
 
 # , c-format
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Boîtes aux lettres [%d]"
+msgstr "Boîtes aux lettres [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "L'entrée Edit du fichier mailcap nécessite %%s"
+msgstr "L'entrée Edit du fichier mailcap nécessite %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "L'entrée compose du fichier mailcap nécessite %%s"
+msgstr "L'entrée compose du fichier mailcap nécessite %%s"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Créer un alias"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1941,27 +1847,23 @@ msgstr ""
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Marquage de %d messages à effacer..."
+msgstr "Marquage de %d messages à effacer..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Masque"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Message renvoyé."
+msgstr "Message renvoyé."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "Le message n'a pas pu être imprimé"
+msgstr "Le message n'a pas pu être imprimé"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
@@ -1969,83 +1871,70 @@ msgstr "Le fichier contenant le message est vide !"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "Message non renvoyé."
+msgstr "Message non renvoyé."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Message non modifié !"
+msgstr "Message non modifié !"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Le message père n'est pas visible dans cette vue limitée."
+msgstr "Le message père n'est pas visible dans cette vue limitée."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Message ajourné."
+msgstr "Message ajourné."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "Message imprimé"
+msgstr "Message imprimé"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "Message écrit."
+msgstr "Message écrit."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Messages renvoyés."
+msgstr "Messages renvoyés."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "Les messages n'ont pas pu être imprimés"
+msgstr "Les messages n'ont pas pu être imprimés"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "Messages non renvoyés."
+msgstr "Messages non renvoyés."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Messages imprimés"
+msgstr "Messages imprimés"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Arguments manquants."
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Les chaînes mixmaster sont limitées à %d éléments."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Le mixmaster n'accepte pas les en-têtes Cc et Bcc."
-
 # , c-format
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Déplacer les messages lus dans %s ?"
+msgstr "Déplacer les messages lus dans %s ?"
 
 # , c-format
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Déplacement des messages lus dans %s..."
+msgstr "Déplacement des messages lus dans %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr "Nom ........: "
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nouvelle requête"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nouveau nom de fichier : "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Nouveau fichier : "
 
@@ -2054,41 +1943,33 @@ msgstr "Nouveau fichier : "
 msgid "New mail in "
 msgstr "Nouveau(x) message(s) dans "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Nouveau(x) message(s) dans cette boîte aux lettres."
+msgstr "Nouveau(x) message(s) dans cette boîte aux lettres."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Suivant"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "PgSuiv"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
-msgstr "Pas d'en-tête Message-ID: disponible pour lier la discussion"
+msgstr "Pas d'en-tête Message-ID: disponible pour lier la discussion"
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2098,144 +1979,134 @@ msgstr "Pas d'authentificateurs disponibles"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Pas de paramètre boundary trouvé !  [signalez cette erreur]"
+msgstr "Pas de paramètre boundary trouvé !  [signalez cette erreur]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "Pas d'entrées."
+msgstr "Pas d'entrées."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Aucun fichier ne correspond au masque"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Pas de boîtes aux lettres recevant du courrier définies."
+msgstr "Pas de boîtes aux lettres recevant du courrier définies."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
 msgstr "Aucun motif de limite n'est en vigueur."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Aucune boîte aux lettres n'est ouverte."
+msgstr "Aucune boîte aux lettres n'est ouverte."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Pas de boîte aux lettres avec des nouveaux messages."
+msgstr "Pas de boîte aux lettres avec des nouveaux messages."
 
 # , c-format
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "Pas d'entrée compose pour %s dans mailcap, création d'un fichier vide."
+msgstr "Pas d'entrée compose pour %s dans mailcap, création d'un fichier vide."
 
 # , c-format
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "Pas d'entrée edit pour %s dans mailcap"
+msgstr "Pas d'entrée edit pour %s dans mailcap"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "Pas de liste de diffusion trouvée !"
+msgstr "Pas de liste de diffusion trouvée !"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "Pas d'entrée mailcap correspondante. Visualisation en texte."
+msgstr "Pas d'entrée mailcap correspondante. Visualisation en texte."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "Aucun message dans ce dossier."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "Aucun message ne correspond au critère."
+msgstr "Aucun message ne correspond au critère."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "Il n'y a plus de texte cité."
+msgstr "Il n'y a plus de texte cité."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "Pas d'autres discussions."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Il n'y a plus de texte non cité après le texte cité."
+msgstr "Il n'y a plus de texte non cité après le texte cité."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Aucun nouveau message dans la boîte aux lettres POP."
+msgstr "Aucun nouveau message dans la boîte aux lettres POP."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Pas de nouveaux messages"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Pas d'objet spécifié."
+msgstr "Pas d'objet spécifié."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Aucun fichier ne correspond au masque"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Pas de boîte aux lettres avec des nouveaux messages."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "Pas de message ajourné."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Pas de boîte aux lettres avec des nouveaux messages."
+msgstr "Pas de message ajourné."
 
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Aucune commande d'impression n'a été définie."
+msgstr "Aucune commande d'impression n'a été définie."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Aucun destinataire spécifié !"
+msgstr "Aucun destinataire spécifié !"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Pas de destinataire spécifié.\n"
+msgstr "Pas de destinataire spécifié.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Aucun destinataire spécifié."
+msgstr "Aucun destinataire spécifié."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "Pas de motif de recherche."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Pas d'objet spécifié."
+msgstr "Pas d'objet spécifié."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "Pas d'objet, abandonner l'envoi ?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "Pas de sujet, abandonner ?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Pas de sujet, abandon."
 
@@ -2244,122 +2115,118 @@ msgstr "Pas de sujet, abandon."
 msgid "No such folder"
 msgstr "Ce dossier n'existe pas"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "Pas d'entrées marquées."
+msgstr "Pas d'entrées marquées."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Pas de messages marqués visibles !"
+msgstr "Pas de messages marqués visibles !"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Pas de messages marqués."
+msgstr "Pas de messages marqués."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
-msgstr "Pas de discussion liée"
+msgstr "Pas de discussion liée"
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Pas de message non effacé."
+msgstr "Pas de message non effacé."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "Pas de messages non lus"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "Pas de messages visibles."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
 msgstr "Non disponible dans ce menu."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "Non trouvé."
+msgstr "Non trouvé."
 
 # , c-format
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
-msgstr "Rien à faire."
+msgstr "Rien à faire."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Seul l'effacement d'attachements multipart est supporté."
+msgstr "Seul l'effacement d'attachements multipart est supporté."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Ouvre la boîte aux lettres"
+msgstr "Ouvre la boîte aux lettres"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Ouvre la boîte aux lettres en lecture seule"
+msgstr "Ouvre la boîte aux lettres en lecture seule"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Ouvrir une boîte aux lettres d'où attacher un message"
+msgstr "Ouvrir une boîte aux lettres d'où attacher un message"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Ouvre la boîte aux lettres en lecture seule"
+msgstr "Ouvre la boîte aux lettres en lecture seule"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Ouvrir une boîte aux lettres d'où attacher un message"
+msgstr "Ouvrir une boîte aux lettres d'où attacher un message"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Sortie du processus de livraison"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
 "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, s/(m)ime ou en clai(r) ?"
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP déjà sélectionné. Effacer & continuer ? "
+msgstr "PGP déjà sélectionné. Effacer & continuer ? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 msgid "PGP and S/MIME keys matching"
-msgstr "clés PGP et S/MIME correspondant à"
+msgstr "clés PGP et S/MIME correspondant à"
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 msgid "PGP keys matching"
-msgstr "clés PGP correspondant à"
+msgstr "clés PGP correspondant à"
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "La signature PGP n'a PAS pu être vérifiée."
+msgstr "La signature PGP n'a PAS pu être vérifiée."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "Signature PGP vérifiée avec succès."
+msgstr "Signature PGP vérifiée avec succès."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "Le serveur POP n'est pas défini."
+msgstr "Le serveur POP n'est pas défini."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Le message père n'est pas disponible."
+msgstr "Le message père n'est pas disponible."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Le message père n'est pas visible dans cette vue limitée."
+msgstr "Le message père n'est pas visible dans cette vue limitée."
 
 # , c-format
 #: account.c:184
@@ -2367,65 +2234,43 @@ msgstr "Le message p
 msgid "Password for %s@%s: "
 msgstr "Mot de passe pour %s@%s : "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Nom de la personne : "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Pipe"
-
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Passer à la commande : "
+msgstr "Passer à la commande : "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Passer à la commande : "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Donnez une valeur correcte à hostname quand vous utilisez le mixmaster !"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "Passer à la commande : "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr "Ajourner ce message ?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "Messages ajournés"
+msgstr "Messages ajournés"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "La commande Preconnect a échoué."
+msgstr "La commande Preconnect a échoué."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Préparation du message à faire suivre..."
+msgstr "Préparation du message à faire suivre..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr "Appuyez sur une touche pour continuer..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "PgPréc"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Imprimer"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "Imprimer l'attachement ?"
 
@@ -2433,58 +2278,54 @@ msgstr "Imprimer l'attachement ?"
 msgid "Print message?"
 msgstr "Imprimer le message ?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Imprimer l(es) attachement(s) marqué(s) ?"
+msgstr "Imprimer l(es) attachement(s) marqué(s) ?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Imprimer les messages marqués ?"
+msgstr "Imprimer les messages marqués ?"
 
 # , c-format
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Effacer %d message(s) marqué(s) à effacer ?"
+msgstr "Effacer %d message(s) marqué(s) à effacer ?"
 
 # , c-format
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Effacer %d message(s) marqué(s) à effacer ?"
+msgstr "Effacer %d message(s) marqué(s) à effacer ?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Requête"
+msgstr "Requête"
 
 # , c-format
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "Requête '%s'"
+msgstr "Requête '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Commande de requête non définie."
+msgstr "Commande de requête non définie."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Requête : "
-
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Quitter"
+msgstr "Requête : "
 
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "Quitter Mutt ?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "Récupération des espaces de noms..."
+msgstr "Récupération des espaces de noms..."
 
 # , c-format
 #: lib-mx/mx.c:494
@@ -2509,113 +2350,109 @@ msgstr "Lecture de %s... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Lecture de nouveaux messages (%d octets)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Voulez-vous vraiment supprimer la boîte aux lettres \"%s\" ?"
+msgstr "Voulez-vous vraiment supprimer la boîte aux lettres \"%s\" ?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Rappeler un message ajourné ?"
+msgstr "Rappeler un message ajourné ?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr "Le recodage affecte uniquement les attachements textuels."
 
 #: imap/browse.c:300
 #, c-format
 msgid "Rename failed: %s"
-msgstr "Le renommage a échoué : %s"
+msgstr "Le renommage a échoué : %s"
 
-#: browser.c:1020
+#: browser.c:991
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Le renommage n'est supporté que pour les boîtes aux lettres IMAP"
+msgstr "Le renommage n'est supporté que pour les boîtes aux lettres IMAP"
 
 #: imap/browse.c:288
 #, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Renommer la boîte aux lettres %s en : "
+msgstr "Renommer la boîte aux lettres %s en : "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Renommer en : "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Réouverture de la boîte aux lettres..."
+msgstr "Réouverture de la boîte aux lettres..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Répondre"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
 # , c-format
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "Répondre à %s%s ?"
+msgstr "Répondre à %s%s ?"
 
 #: commands.c:403
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Tri inv (d)at/(a)ut/(r)eçu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)or/s(p)"
+"Tri inv (d)at/(a)ut/(r)eçu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)or/s(p)"
 "am ? : "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Rechercher en arrière : "
+msgstr "Rechercher en arrière : "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Rechercher en arrière : "
+msgstr "Rechercher en arrière : "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Tri inverse par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
+msgstr "Tri inverse par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
-"(c)hiffrer S/MIME, (s)igner, (e)n tant que, les (d)eux, (p)gp ou en clai(r) ?"
+"(c)hiffrer S/MIME, (s)igner, (e)n tant que, les (d)eux, (p)gp ou en clai(r)Â ?"
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME déjà sélectionné. Effacer & continuer ? "
+msgstr "S/MIME déjà sélectionné. Effacer & continuer ? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "Le propriétaire du certificat S/MIME ne correspond pas à l'expéditeur."
+msgstr "Le propriétaire du certificat S/MIME ne correspond pas à l'expéditeur."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 msgid "S/MIME keys matching"
-msgstr "clés S/MIME correspondant à"
+msgstr "clés S/MIME correspondant à"
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
-"Les messages S/MIME sans indication sur le contenu ne sont pas supportés."
+"Les messages S/MIME sans indication sur le contenu ne sont pas supportés."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "La signature S/MIME n'a PAS pu être vérifiée."
+msgstr "La signature S/MIME n'a PAS pu être vérifiée."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "Signature S/MIME vérifiée avec succès."
+msgstr "Signature S/MIME vérifiée avec succès."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "L'authentification SASL a échoué."
+msgstr "L'authentification SASL a échoué."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "Empreinte SHA1 : %s"
+msgstr "Empreinte SHA1Â : %s"
 
 # , c-format
 #: lib-sys/mutt_ssl.cpkg:304
@@ -2623,20 +2460,16 @@ msgstr "Empreinte SHA1
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "Connexion SSL/TLS utilisant %s (%s/%s/%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Sauver"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "Sauver une copie de ce message ?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Sauver dans le fichier : "
 
@@ -2652,89 +2485,69 @@ msgstr "Sauver%s vers une BAL"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Sauvegarde des indicateurs de statut du message... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "On sauve..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Rechercher"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Rechercher : "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Fin atteinte sans rien avoir trouvé"
+msgstr "Fin atteinte sans rien avoir trouvé"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Début atteint sans rien avoir trouvé"
+msgstr "Début atteint sans rien avoir trouvé"
 
 #: pattern.c:1320
 msgid "Search interrupted."
 msgstr "Recherche interrompue."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "La recherche n'est pas implémentée pour ce menu."
+msgstr "La recherche n'est pas implémentée pour ce menu."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
 msgstr "La recherche est repartie de la fin."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "La recherche est repartie du début."
+msgstr "La recherche est repartie du début."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Rechercher : "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Sélectionner"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Sélectionner  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Sélectionner une chaîne de redistributeurs de courrier."
-
 # , c-format
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "Sélection de %s..."
+msgstr "Sélection de %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Envoyer"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "Envoi en tâche de fond."
+msgstr "Envoi en tâche de fond."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
-msgstr "N° de série : 0x%s\n"
+msgstr "N° de série : 0x%s\n"
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Le serveur a fermé la connexion !"
+msgstr "Le serveur a fermé la connexion !"
 
 # , c-format
 #: flags.c:335
@@ -2745,15 +2558,15 @@ msgstr "Positionner l'indicateur"
 msgid "Shell command: "
 msgstr "Commande shell : "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Signer"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Signer en tant que : "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Signer, Chiffrer"
 
@@ -2762,39 +2575,35 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Tri (d)ate/(a)ut/(r)eçu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)ore/s(p)"
+"Tri (d)ate/(a)ut/(r)eçu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)ore/s(p)"
 "am ? : "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Tri par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
+msgstr "Tri par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Tri de la boîte aux lettres..."
+msgstr "Tri de la boîte aux lettres..."
 
 # , c-format
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "Sous-clé ...: 0x%s"
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
+msgstr "Sous-clé ...: 0x%s"
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
 # , c-format
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Abonné [%s], masque de fichier : %s"
+msgstr "Abonné [%s], masque de fichier : %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2802,25 +2611,25 @@ msgstr ""
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "Abonnement à %s..."
+msgstr "Abonnement à %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 msgid "TLS/SSL Certificate check"
-msgstr "Vérification du certificat TLS/SSL"
+msgstr "Vérification du certificat TLS/SSL"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Marquer les messages correspondant à : "
+msgstr "Marquer les messages correspondant à : "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
 msgstr "Marquez les messages que vous voulez attacher !"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Le marquage n'est pas supporté."
+msgstr "Le marquage n'est pas supporté."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr "Ce message n'est pas visible."
 
@@ -2828,99 +2637,99 @@ msgstr "Ce message n'est pas visible."
 msgid "The CRL is not available\n"
 msgstr "La CRL n'est pas disponible.\n"
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr "L'attachement courant sera converti."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr "L'attachement courant ne sera pas converti."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
-"L'index du message est incorrect. Essayez de rouvrir la boîte aux lettres."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "La chaîne de redistributeurs de courrier est déjà vide."
+"L'index du message est incorrect. Essayez de rouvrir la boîte aux lettres."
 
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "Il n'y a pas d'attachements."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Il n'y a pas de messages."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "Il n'y a pas de sous-parties à montrer !"
+msgstr "Il n'y a pas de sous-parties à montrer !"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Ce serveur IMAP est trop ancien. Mutt ne marche pas avec."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Ce certificat appartient à :"
+msgstr "Ce certificat appartient à :"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr "Ce certificat est valide"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Ce certificat a été émis par :"
+msgstr "Ce certificat a été émis par :"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Cette clé ne peut pas être utilisée : expirée/désactivée/annulée."
+msgstr "Cette clé ne peut pas être utilisée : expirée/désactivée/annulée."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
-msgstr "Discussion cassée"
+msgstr "Discussion cassée"
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
 msgstr "Cette discussion contient des messages non-lus."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "L'affichage des discussions n'est pas activé."
+msgstr "L'affichage des discussions n'est pas activé."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
-msgstr "Discussions liées"
+msgstr "Discussions liées"
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Délai dépassé lors de la tentative de verrouillage fcntl !"
+msgstr "Délai dépassé lors de la tentative de verrouillage fcntl !"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Délai dépassé lors de la tentative de verrouillage flock !"
+msgstr "Délai dépassé lors de la tentative de verrouillage flock !"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Le début du message est affiché."
+msgstr "Le début du message est affiché."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "Tentative d'extraction de clés PGP...\n"
+msgstr "Tentative d'extraction de clés PGP...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Tentative d'extraction de certificats S/MIME...\n"
 
@@ -2928,34 +2737,34 @@ msgstr "Tentative d'extraction de certificats S/MIME...\n"
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "Erreur de tunnel en parlant à %s : %s"
+msgstr "Erreur de tunnel en parlant à %s : %s"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
 msgid "Tunnel to %s returned error %d (%s)"
-msgstr "Le tunnel vers %s a renvoyé l'erreur %d (%s)"
+msgstr "Le tunnel vers %s a renvoyé l'erreur %d (%s)"
 
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "L'authentification SASL a échoué."
+msgstr "L'authentification SASL a échoué."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Impossible d'attacher %s !"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "Impossible d'attacher !"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr ""
-"Impossible de récupérer les en-têtes à partir de cette version du serveur "
+"Impossible de récupérer les en-têtes à partir de cette version du serveur "
 "IMAP."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "Impossible d'obtenir le certificat de la machine distante"
 
@@ -2963,7 +2772,7 @@ msgstr "Impossible d'obtenir le certificat de la machine distante"
 msgid "Unable to leave messages on server."
 msgstr "Impossible de laisser les messages sur le serveur."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "Impossible d'attacher %s !"
@@ -2971,14 +2780,14 @@ msgstr "Impossible d'attacher %s !"
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Impossible de verrouiller la boîte aux lettres !"
+msgstr "Impossible de verrouiller la boîte aux lettres !"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
 msgstr "Impossible d'ouvrir le fichier temporaire !"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
 msgstr "Impossible d'ouvrir le fichier temporaire !"
@@ -2987,47 +2796,37 @@ msgstr "Impossible d'ouvrir le fichier temporaire !"
 msgid "Unable to open temporary file!"
 msgstr "Impossible d'ouvrir le fichier temporaire !"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Récup"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Récupérer les messages correspondant à : "
+msgstr "Récupérer les messages correspondant à : "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "Récup"
+msgstr "Récup"
 
 # , c-format
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s inconnu"
 
 # , c-format
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Désabonnement de %s..."
-
-# , c-format
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "Désabonnement de %s..."
+msgstr "Désabonnement de %s..."
 
 # , c-format
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "Désabonnement de %s..."
+msgstr "Désabonnement de %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Démarquer les messages correspondant à : "
+msgstr "Démarquer les messages correspondant à : "
 
 #: imap/message.c:546
 #, fuzzy
@@ -3036,10 +2835,10 @@ msgstr "Chargement du message ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "Utilisez 'toggle-write' pour réautoriser l'écriture !"
+msgstr "Utilisez 'toggle-write' pour réautoriser l'écriture !"
 
 # , c-format
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Utiliser keyID = \"%s\" pour %s ?"
@@ -3050,79 +2849,71 @@ msgid "Username at %s: "
 msgstr "Nom d'utilisateur sur %s : "
 
 # , c-format
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, c-format
 msgid "Valid From : %s\n"
 msgstr "From valide : %s\n"
 
 # , c-format
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, c-format
 msgid "Valid To ..: %s\n"
 msgstr "To valide ..: %s\n"
 
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
-
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Vérifier la signature PGP ?"
+msgstr "Vérifier la signature PGP ?"
 
 # , c-format
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Vérification des index des messages..."
-
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Voir attach."
+msgstr "Vérification des index des messages..."
 
 # , c-format
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "ATTENTION ! Vous allez écraser %s, continuer ?"
+msgstr "ATTENTION ! Vous allez écraser %s, continuer ?"
 
 #: crypt.cpkg:1058
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
 msgstr ""
-"ATTENTION ! Il n'est PAS certain que la clé appartienne à la personne nommée "
+"ATTENTION ! Il n'est PAS certain que la clé appartienne à la personne nommée "
 "ci-dessus\n"
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 msgid "WARNING: Server certificate has been revoked"
-msgstr "ATTENTION ! Le certificat du serveur a été révoqué"
+msgstr "ATTENTION ! Le certificat du serveur a été révoqué"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 msgid "WARNING: Server certificate has expired"
-msgstr "ATTENTION ! Le certificat du serveur a expiré"
+msgstr "ATTENTION ! Le certificat du serveur a expiré"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "ATTENTION ! Le certificat du serveur n'est pas encore valide"
+msgstr "ATTENTIONÂ ! Le certificat du serveur n'est pas encore valide"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
-msgstr "ATTENTION ! Le nom du serveur ne correspond pas au certificat"
+msgstr "ATTENTIONÂ ! Le nom du serveur ne correspond pas au certificat"
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "ATTENTION ! Le signataire du certificat du serveur n'est pas un CA"
+msgstr "ATTENTIONÂ ! Le signataire du certificat du serveur n'est pas un CA"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
-msgstr "ATTENTION ! La clé N'APPARTIENT PAS à la personne nommée ci-dessus\n"
+msgstr "ATTENTION ! La clé N'APPARTIENT PAS à la personne nommée ci-dessus\n"
 
 #: crypt.cpkg:1048
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr ""
-"ATTENTION ! Nous n'avons AUCUNE indication informant si la clé appartient à "
-"la personne nommée ci-dessus\n"
+"ATTENTION ! Nous n'avons AUCUNE indication informant si la clé appartient à "
+"la personne nommée ci-dessus\n"
 
 # , c-format
 #: lib-mx/mx.c:190
@@ -3136,158 +2927,140 @@ msgstr "Attente du verrouillage fcntl... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "Attente de la tentative de flock... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "Attente de la réponse..."
+msgstr "Attente de la réponse..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "Attention : '%s' est un mauvais IDN."
+msgstr "Attention : '%s' est un mauvais IDN."
 
 #: crypt.cpkg:916
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Attention ! Au moins une clé de certification a expiré\n"
+msgstr "Attention ! Au moins une clé de certification a expiré\n"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "Attention : mauvais IDN '%s' dans l'alias '%s'.\n"
+msgstr "Attention : mauvais IDN '%s' dans l'alias '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "Attention : le certificat n'a pas pu être sauvé"
+msgstr "Attention : le certificat n'a pas pu être sauvé"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
-msgstr "Attention ! Une des clés a été révoquée\n"
+msgstr "Attention ! Une des clés a été révoquée\n"
 
 #: commands.c:141 commands.c:151
 msgid "Warning: Part of this message has not been signed."
-msgstr "Attention ! Une partie de ce message n'a pas été signée."
+msgstr "Attention ! Une partie de ce message n'a pas été signée."
 
 #: crypt.cpkg:910
 msgid "Warning: The key used to create the signature expired at: "
-msgstr "Attention ! La clé utilisée pour créer la signature a expiré à :"
+msgstr "Attention ! La clé utilisée pour créer la signature a expiré à  :"
 
 #: crypt.cpkg:930
 msgid "Warning: The signature expired at: "
-msgstr "Attention ! La signature a expiré à :"
+msgstr "Attention ! La signature a expiré à  :"
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Nous sommes en présence d'un échec de fabrication d'un attachement"
+msgstr "Nous sommes en présence d'un échec de fabrication d'un attachement"
 
 # , c-format
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Erreur d'écriture ! Boîte aux lettres partielle sauvée dans %s"
+msgstr "Erreur d'écriture ! Boîte aux lettres partielle sauvée dans %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "Erreur d'écriture !"
+msgstr "Erreur d'écriture !"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Écrire le message dans la boîte aux lettres"
+msgstr "Écrire le message dans la boîte aux lettres"
 
 # , c-format
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "Écriture de %s..."
+msgstr "Écriture de %s..."
 
 # , c-format
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "Écriture du message dans %s ..."
+msgstr "Écriture du message dans %s ..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "Écriture des messages... %d (%d%%)"
+msgstr "Écriture des messages... %d (%d%%)"
 
 # , c-format
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Erreur dans la ligne de commande : %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Vous avez déjà défini un alias ayant ce nom !"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Le premier élément de la chaîne est déjà sélectionné."
+msgstr "Vous avez déjà défini un alias ayant ce nom !"
 
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Le dernier élément de la chaîne est déjà sélectionné."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Vous êtes sur la première entrée."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Vous êtes sur la première page."
+msgstr "Vous êtes sur la première entrée."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Vous êtes sur le premier message."
+msgstr "Vous êtes sur le premier message."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Vous êtes sur la première page."
+msgstr "Vous êtes sur la première page."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Vous êtes sur la première discussion."
+msgstr "Vous êtes sur la première discussion."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Vous êtes sur la dernière entrée."
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Vous êtes sur la dernière page."
+msgstr "Vous êtes sur la dernière entrée."
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Vous êtes sur le dernier message."
+msgstr "Vous êtes sur le dernier message."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Vous êtes sur la dernière page."
+msgstr "Vous êtes sur la dernière page."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Défilement vers le bas impossible."
+msgstr "Défilement vers le bas impossible."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Défilement vers le haut impossible."
+msgstr "Défilement vers le haut impossible."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Vous n'avez pas défini d'alias !"
+msgstr "Vous n'avez pas défini d'alias !"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
 msgstr "Vous ne pouvez pas effacer l'unique attachement."
 
@@ -3296,7 +3069,7 @@ msgid "You may only bounce message/rfc822 parts."
 msgstr "Vous ne pouvez renvoyer que des parties message/rfc822."
 
 # , c-format
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Accepter ?"
@@ -3325,65 +3098,65 @@ msgstr "[-- Visualisation automatique stderr de %s --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Visualisation automatique en utilisant %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- DÉBUT DE MESSAGE PGP --]\n"
+"[-- DÉBUT DE MESSAGE PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- DÉBUT DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
+msgstr "[-- DÉBUT DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- DÉBUT DE MESSAGE SIGNÉ PGP --]\n"
+"[-- DÉBUT DE MESSAGE SIGNÉ PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
-msgstr "[-- Début des informations sur la signature --]\n"
+msgstr "[-- Début des informations sur la signature --]\n"
 
 # , c-format
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- Impossible d'exécuter %s. --]\n"
+msgstr "[-- Impossible d'exécuter %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- FIN DE MESSAGE PGP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FIN DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
+msgstr "[-- FIN DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- FIN DE MESSAGE SIGNÉ PGP --]\n"
+msgstr "[-- FIN DE MESSAGE SIGNÉ PGP --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Fin des données chiffrées avec PGP/MIME --]\n"
+msgstr "[-- Fin des données chiffrées avec PGP/MIME --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- Fin des données signées et chiffrées avec PGP/MIME --]\n"
+msgstr "[-- Fin des données signées et chiffrées avec PGP/MIME --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 msgid "[-- End of S/MIME encrypted data --]\n"
-msgstr "[-- Fin des données chiffrées avec S/MIME --]\n"
+msgstr "[-- Fin des données chiffrées avec S/MIME --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 msgid "[-- End of S/MIME signed data --]\n"
-msgstr "[-- Fin des données signées avec S/MIME --]\n"
+msgstr "[-- Fin des données signées avec S/MIME --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 msgid ""
 "[-- End signature information --]\n"
 "\n"
@@ -3394,18 +3167,18 @@ msgstr ""
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- Erreur : Aucune partie du Multipart/Alternative n'a pu être affichée ! "
+"[-- Erreur : Aucune partie du Multipart/Alternative n'a pu être affichée ! "
 "--]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- Erreur : Structure multipart/signed incohérente ! --]\n"
+"[-- Erreur : Structure multipart/signed incohérente ! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3414,78 +3187,78 @@ msgstr ""
 "[-- Erreur : Protocole multipart/signed %s inconnu ! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Erreur : impossible de créer le fichier temporaire ! --]\n"
+msgstr "[-- Erreur : impossible de créer le fichier temporaire ! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Erreur : impossible de trouver le début du message PGP ! --]\n"
+"[-- Erreur : impossible de trouver le début du message PGP ! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr ""
-"[-- Erreur : le déchiffrage a échoué : %s --]\n"
+"[-- Erreur : le déchiffrage a échoué : %s --]\n"
 "\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- Erreur : message PGP/MIME mal formé ! --]\n"
+"[-- Erreur : message PGP/MIME mal formé ! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- Erreur : message/external-body n'a pas de paramètre access-type --]\n"
+"[-- Erreur : message/external-body n'a pas de paramètre access-type --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Les données suivantes sont chiffrées avec PGP/MIME --]\n"
+"[-- Les données suivantes sont chiffrées avec PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Les données suivantes sont signées et chiffrées avec PGP/MIME --]\n"
+"[-- Les données suivantes sont signées et chiffrées avec PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Les données suivantes sont chiffrées avec S/MIME --]\n"
+"[-- Les données suivantes sont chiffrées avec S/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- Les données suivantes sont signées avec S/MIME --]\n"
+"[-- Les données suivantes sont signées avec S/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Les données suivantes sont signées --]\n"
+"[-- Les données suivantes sont signées --]\n"
 "\n"
 
 # , c-format
@@ -3506,7 +3279,7 @@ msgstr "[-- Cet attachement %s/%s n'est pas inclus, --]\n"
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Type : %s/%s, Codage : %s, Taille : %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -3514,26 +3287,26 @@ msgstr ""
 "[-- Attention : Impossible de trouver des signatures. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Attention : les signatures %s/%s ne peuvent pas être vérifiées. --]\n"
+"[-- Attention : les signatures %s/%s ne peuvent pas être vérifiées. --]\n"
 "\n"
 
 # , c-format
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- et l'access-type %s indiqué n'est pas supporté --]\n"
+msgstr "[-- et l'access-type %s indiqué n'est pas supporté --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
-msgstr "[-- et la source externe indiquée a expiré. --]\n"
+msgstr "[-- et la source externe indiquée a expiré. --]\n"
 
 # , c-format
 #: handler.c:1201
@@ -3547,34 +3320,34 @@ msgstr "[-- nom: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- le %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr "[Impossible d'afficher cet ID d'utilisateur (DN invalide)]"
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr "[Impossible d'afficher cet ID d'utilisateur (encodage invalide)]"
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr "[Impossible d'afficher cet ID d'utilisateur (encodage inconnu)]"
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
-msgstr "[Désactivée]"
+msgstr "[Désactivée]"
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 msgid "[Expired]"
-msgstr "[Expirée]"
+msgstr "[Expirée]"
 
 # , c-format
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 msgid "[Invalid]"
 msgstr "[Invalide]"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
-msgstr "[Révoquée]"
+msgstr "[Révoquée]"
 
 # , c-format
 #: lib-sys/mutt_ssl.cpkg:439
@@ -3587,44 +3360,139 @@ msgstr "[date invalide]"
 msgid "[unable to calculate]"
 msgstr "[impossible de calculer]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias : pas d'adresse"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Aucun message marqué n'a pu être trouvé."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Aucun message marqué n'a pu être trouvé."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Sauver une copie de ce message ?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "éditer la description de l'attachement"
+msgstr "éditer la description de l'attachement"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "éditer la description de l'attachement"
+msgstr "éditer la description de l'attachement"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind : trop d'arguments"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr "certification"
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Erreur de lecture du répertoire."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Pas de boîte aux lettres avec des nouveaux messages."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
 msgstr "color : pas assez d'arguments"
 
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Pas de nouveaux messages"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
+
 #: commands.c:788
 msgid "converting"
 msgstr "conversion"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Écrire le message dans la boîte aux lettres"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "impossible de créer le dossier temporaire : %s"
+msgstr "impossible de créer le dossier temporaire : %s"
 
 #: editmsg.c:89
 #, c-format
@@ -3634,20 +3502,101 @@ msgstr "impossible de tronquer le dossier temporaire : %s"
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "impossible d'écrire dans le dossier temporaire : %s"
+msgstr "impossible d'écrire dans le dossier temporaire : %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Pas de boîtes aux lettres recevant du courrier définies."
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "datn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
 msgstr "La couleur default n'est pas disponible"
 
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Effacer les messages sur le serveur ?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Récupérer les messages correspondant à : "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Récupérer les messages correspondant à : "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
+
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "darosintcp"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Éditer le message à faire suivre ?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3663,61 +3612,149 @@ msgstr "Copie vers %s..."
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "Sélection de %s..."
+msgstr "Sélection de %s..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "L'attachement courant ne sera pas converti."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "éditer la description de l'attachement"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Impossible d'écrire le message"
+
+# , c-format
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Récupération des en-têtes des messages... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Éditer le message à faire suivre ?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Sauver une copie de ce message ?"
 
 #: pattern.c:777
 msgid "empty pattern"
 msgstr "motif vide"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 msgid "encryption"
 msgstr "chiffrage"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Sauver une copie de ce message ?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 # , c-format
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "erreur lors de l'ajout du destinataire « %s » : %s\n"
+msgstr "erreur lors de l'ajout du destinataire « %s » : %s\n"
 
 # , c-format
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, c-format
 msgid "error allocating data object: %s\n"
-msgstr "erreur lors de l'allocation de l'objet : %s\n"
+msgstr "erreur lors de l'allocation de l'objet : %s\n"
 
 # , c-format
 #: crypt.cpkg:328
 #, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "erreur lors de la création du contexte gpgme : %s\n"
+msgstr "erreur lors de la création du contexte gpgme : %s\n"
 
 # , c-format
 #: crypt.cpkg:354
 #, c-format
 msgid "error creating gpgme data object: %s\n"
-msgstr "erreur lors de la création de l'objet gpgme : %s\n"
+msgstr "erreur lors de la création de l'objet gpgme : %s\n"
 
 #: crypt.cpkg:338
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
-msgstr "erreur lors de l'activation du protocole CMS : %s\n"
+msgstr "erreur lors de l'activation du protocole CMSÂ : %s\n"
 
 # , c-format
 #: crypt.cpkg:655
 #, c-format
 msgid "error encrypting data: %s\n"
-msgstr "erreur lors du chiffrage des données : %s\n"
+msgstr "erreur lors du chiffrage des données : %s\n"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "erreur lors de la mise en place de la clé secrète « %s »: %s\n"
+msgstr "erreur lors de la mise en place de la clé secrète « %s »: %s\n"
 
 # , c-format
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "erreur lors de la signature des données : %s\n"
+msgstr "erreur lors de la signature des données : %s\n"
 
 #: pattern.c:499
 msgid "error in expression"
@@ -3727,201 +3764,752 @@ msgstr "erreur dans l'expression"
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "erreur dans le motif à : %s"
+msgstr "erreur dans le motif à : %s"
 
 # , c-format
 #: crypt.cpkg:462 crypt.cpkg:500
 #, c-format
 msgid "error reading data object: %s\n"
-msgstr "erreur lors de la lecture de l'objet : %s\n"
+msgstr "erreur lors de la lecture de l'objet : %s\n"
 
 # , c-format
 #: crypt.cpkg:443
 #, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "erreur lors du retour au début de l'objet : %s\n"
+msgstr "erreur lors du retour au début de l'objet : %s\n"
 
 #: crypt.cpkg:613
 #, c-format
 msgid "error setting secret key `%s': %s\n"
-msgstr "erreur lors de la mise en place de la clé secrète « %s »: %s\n"
+msgstr "erreur lors de la mise en place de la clé secrète « %s »: %s\n"
 
 # , c-format
 #: crypt.cpkg:739
 #, c-format
 msgid "error signing data: %s\n"
-msgstr "erreur lors de la signature des données : %s\n"
+msgstr "erreur lors de la signature des données : %s\n"
 
 # , c-format
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "erreur : opération inconnue %d (signalez cette erreur)."
+msgstr "erreur : opération inconnue %d (signalez cette erreur)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "csedmor"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "csedpor"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec : pas d'arguments"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
-msgstr "gpgme_op_keylist_next a échoué : %s"
+# , c-format
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Suivi de la discussion à %s%s ?"
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
-#, c-format
-msgid "gpgme_op_keylist_start failed: %s"
-msgstr "gpgme_op_keylist_start a échoué : %s"
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
 
-#: handler.c:1193
-msgid "has been deleted --]\n"
-msgstr "a été effacé --]\n"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
 
-#: imap/imap.c:941
-msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbox: EXPUNGE a échoué"
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Faire suivre sous forme d'attachements ?"
 
-#: init.c:823
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Recherche de nouveaux messages..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Vous êtes sur le premier message."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Vous êtes sur la dernière page."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Pas de boîte aux lettres avec des nouveaux messages."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Erreur à l'ouverture de la boîte aux lettres"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Pas de boîte aux lettres avec des nouveaux messages."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr "gpgme_op_keylist_next a échoué : %s"
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr "gpgme_op_keylist_start a échoué : %s"
+
+#: handler.c:1193
+msgid "has been deleted --]\n"
+msgstr "a été effacé --]\n"
+
+#: imap/imap.c:941
+msgid "imap_sync_mailbox: EXPUNGE failed"
+msgstr "imap_sync_mailbox: EXPUNGE a échoué"
+
+#: init.c:820
 msgid "invalid header field"
-msgstr "en-tête invalide"
+msgstr "en-tête invalide"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Numéro d'index invalide."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Aller au message : "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Aller au message : "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Cette discussion contient des messages non-lus."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Vous êtes sur la première discussion."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Pas de messages non lus"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Pas de messages non lus"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Sauver une copie de ce message ?"
 
-#: crypt.cpkg:3122
+#: crypt.cpkg:3108
 msgid "keys matching"
-msgstr "clés correspondant à"
+msgstr "clés correspondant à"
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Renvoyer les messages marqués à : "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Pas de boîte aux lettres avec des nouveaux messages."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro : séquence de touches vide"
+msgstr "macro : séquence de touches vide"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro : trop d'arguments"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 # , c-format
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "Entrée mailcap pour le type %s non trouvée"
+msgstr "Entrée mailcap pour le type %s non trouvée"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message() : impossible de fixer l'heure du fichier"
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "Messages non renvoyés."
+msgstr "Messages non renvoyés."
 
 # , c-format
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "parenthésage incorrect : %s"
+msgstr "parenthésage incorrect : %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "paramètre manquant"
+msgstr "paramètre manquant"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
 msgstr "mono : pas assez d'arguments"
 
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Vous êtes sur la première entrée."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Vous êtes sur le premier message."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Vous êtes sur la dernière entrée."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Vous êtes sur le dernier message."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Vous êtes sur la dernière entrée."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Vous êtes sur la dernière page."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Pas de message non effacé."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Vous êtes sur la première entrée."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Vous êtes sur la première page."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Pas de message non effacé."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Vous êtes sur la première page."
+
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "le message multipart n'a pas de paramètre boundary !"
+msgstr "le message multipart n'a pas de paramètre boundary !"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "non"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(pas de boîte aux lettres)"
+msgstr "(pas de boîte aux lettres)"
 
 #: commands.c:788
 msgid "not converting"
 msgstr "pas de conversion"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "séquence de touches nulle"
+msgstr "séquence de touches nulle"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "eca"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Ouvre la boîte aux lettres en lecture seule"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Ouvre la boîte aux lettres en lecture seule"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Réouverture de la boîte aux lettres..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+# , c-format
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Renvoyer le message à %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "ce préfixe est illégal avec reset"
+msgstr "ce préfixe est illégal avec reset"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Vous êtes sur la première entrée."
+
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push : trop d'arguments"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Rappeler un message ajourné ?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Cette discussion contient des messages non-lus."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Impossible d'éditer le message sur le serveur POP."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+# , c-format
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s : impossible d'attacher le fichier"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Aller au message : "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Effacer les messages sur le serveur ?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ru"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "rua"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+# , c-format
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Sauver%s vers une BAL"
+
+# , c-format
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Sauver%s vers une BAL"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Impossible d'éditer le message sur le serveur POP."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "erreur dans l'expression"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Rechercher : "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Impossible d'envoyer le message."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Faire suivre sous forme d'attachements ?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Limiter aux messages correspondant à : "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr "signature"
 
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Il n'y a plus de texte cité."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Imprimer le message ?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Aucun message dans ce dossier."
+
 # , c-format
-#: init.c:1289
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source : erreur dans %s"
 
 # , c-format
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source : erreurs dans %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source : lecture interrompue car trop d'erreurs dans %s"
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Aucun fichier ne correspond au masque"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "sync : BAL modifiée, mais pas de message modifié ! (signalez ce bug)"
+msgstr "sync : BAL modifiée, mais pas de message modifié ! (signalez ce bug)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Démarquer les messages correspondant à : "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Vous êtes sur la première discussion."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3933,32 +4521,103 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Il n'y a plus de texte cité."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Le recodage affecte uniquement les attachements textuels."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Pas de motif de recherche."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Pas de messages non lus"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
 msgstr "pas assez d'arguments"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "éditer la description de l'attachement"
+msgstr "éditer la description de l'attachement"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Récupérer les messages correspondant à : "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Récupérer les messages correspondant à : "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Récupérer les messages correspondant à : "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook : impossible de supprimer un %s à l'intérieur d'un %s."
+msgstr "unhook : impossible de supprimer un %s à l'intérieur d'un %s."
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook : impossible de faire un unhook * à l'intérieur d'un hook."
+msgstr "unhook : impossible de faire un unhook * à l'intérieur d'un hook."
 
 # , c-format
 #: hook.c:213
@@ -3966,10 +4625,28 @@ msgstr "unhook : impossible de faire un unhook * 
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook : type hook inconnu : %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "erreur inconnue"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Démarquer les messages correspondant à : "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "éditer la description de l'attachement"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3981,15 +4658,50 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "cette valeur est illégale avec reset"
+msgstr "cette valeur est illégale avec reset"
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Attachement sauvé."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Nouveau fichier : "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Écrire le message dans la boîte aux lettres"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "oui"
 
 #: muttlib.c:227
 msgid "yna"
 msgstr "ont"
+
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/gl.po b/po/gl.po
index 2e5f53c..9f832ab 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,35 +6,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2001-04-22 22:05+0200\n"
 "Last-Translator: Roberto Suarez Soto <ask4it@bigfoot.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Vínculos xerais:\n"
+"Vínculos xerais:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"Funcións sen vínculo:\n"
+"Funcións sen vínculo:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 #, fuzzy
 msgid ""
 "\n"
@@ -75,39 +75,39 @@ msgstr ""
 "       mutt -v[v]\n"
 "\n"
 "options:\n"
-"  -a <ficheiro>\tadxuntar un ficheiro á mensaxe\n"
+"  -a <ficheiro>\tadxuntar un ficheiro á mensaxe\n"
 "  -b <enderezo>\tespecificar un enderezo para carbon-copy cego (BCC)\n"
 "  -c <enderezo>\tespecificar un enderezo para carbon-copy (CC)\n"
 "  -e <comando>\tespecificar un comando a executar despois do inicio\n"
-"  -f <ficheiro>\tespecificar que buzón ler\n"
+"  -f <ficheiro>\tespecificar que buzón ler\n"
 "  -F <ficheiro>\tespecificar un ficheiro muttrc alternativo\n"
 "  -H <ficheiro>\tespecificar un ficheiro borrador do que le-la cabeceira\n"
-"  -i <ficheiro>\tespecificar un ficheiro que Mutt deberá incluir na "
+"  -i <ficheiro>\tespecificar un ficheiro que Mutt deberá incluir na "
 "resposta\n"
-"  -m <tipo>\tespecificar un tipo de buzón por defecto\n"
+"  -m <tipo>\tespecificar un tipo de buzón por defecto\n"
 "  -n\t\tfai que Mutt non lea o Muttrc do sistema\n"
 "  -p\t\teditar unha mensaxe posposta\n"
-"  -R\t\tabrir un buzón en modo de só lectura\n"
+"  -R\t\tabrir un buzón en modo de só lectura\n"
 "  -s <tema>\tespecificar un tema (debe ir entre comillas se ten espacios)\n"
-"  -v\t\tamosa-la versión e las definicións en tempo de compilación\n"
-"  -x\t\tsimula-lo modo de envío de mailx\n"
-"  -y\t\tseleccionar un buzón especificado na súa lista de buzóns\n"
-"  -z\t\tsalir de contado se non quedan mensaxes no buzón\n"
-"  -Z\t\tabri-la primeira carpeta con algunha mensaxe nova, saír de contado "
+"  -v\t\tamosa-la versión e las definicións en tempo de compilación\n"
+"  -x\t\tsimula-lo modo de envío de mailx\n"
+"  -y\t\tseleccionar un buzón especificado na súa lista de buzóns\n"
+"  -z\t\tsalir de contado se non quedan mensaxes no buzón\n"
+"  -Z\t\tabri-la primeira carpeta con algunha mensaxe nova, saír de contado "
 "si non hai tal\n"
 "  -h\t\testa mensaxe de axuda"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " firmar como: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     a %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   de %s"
@@ -150,15 +150,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr "('?' para lista): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
 msgstr "(seguir)\n"
@@ -168,11 +168,11 @@ msgstr "(seguir)\n"
 msgid " Press '%s' to toggle write"
 msgstr " Pulse '%s' para cambiar a modo escritura"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr " nesta vista limitada"
 
@@ -183,12 +183,12 @@ msgstr " marcado"
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: comando inválido"
+msgstr "%c: comando inválido"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: non está soportado neste modo"
+msgstr "%c: non está soportado neste modo"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
@@ -200,32 +200,32 @@ msgstr "%d conservados, %d borrados."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d conservados, %d movidos, %d borrados."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s [%s]\n"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s [%s]\n"
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s ¿Está seguro de querer usa-la chave?"
+msgstr "%s ¿Está seguro de querer usa-la chave?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] modificado. ¿Actualizar codificación?"
+msgstr "%s [#%d] modificado. ¿Actualizar codificación?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] xa non existe!"
@@ -235,10 +235,10 @@ msgstr "%s [#%d] xa non existe!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d de %d mensaxes lidas]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s non existe. ¿Desexa crealo?"
+msgstr "%s non existe. ¿Desexa crealo?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
@@ -250,40 +250,40 @@ msgstr ""
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr ""
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s non é un directorio."
+msgstr "%s non é un directorio."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "¡%s non é un buzón!"
+msgstr "¡%s non é un buzón!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s non é un buzón."
+msgstr "%s non é un buzón."
 
 #: sendlib.c:748
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
-msgstr "%s non é un buzón."
+msgstr "%s non é un buzón."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "¡Xa non existe %s!"
+msgstr "¡Xa non existe %s!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -297,116 +297,116 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
-msgstr "%s: tipo descoñecido"
+msgstr "%s: tipo descoñecido"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s: color non soportado polo terminal"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: comando válido só para o obxeto \"índice\""
+msgstr "%s: comando válido só para o obxeto \"índice\""
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: non hai tal atributo"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: non hai tal color"
 
-#: keymap.c:847
+#: keymap.c:839
 #, fuzzy, c-format
 msgid "%s: no such function"
-msgstr "%s: función descoñecida"
+msgstr "%s: función descoñecida"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: función descoñecida"
+msgstr "%s: función descoñecida"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: non hai tal menú"
+msgstr "%s: non hai tal menú"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: non hai tal obxeto"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: parámetros insuficientes"
+msgstr "%s: parámetros insuficientes"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s: non foi posible adxuntar ficheiro"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: non foi posible adxuntar ficheiro.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: comando descoñecido"
+msgstr "%s: comando descoñecido"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: tipo descoñecido"
+msgstr "%s: tipo descoñecido"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: variable descoñecida"
+msgstr "%s: variable descoñecida"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
 msgstr ""
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr ""
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(cómpre que 'view-attachments' esté vinculado a unha tecla!)"
+msgstr "(cómpre que 'view-attachments' esté vinculado a unha tecla!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(non hai buzón)"
+msgstr "(non hai buzón)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)exeitar, aceptar (e)sta vez"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)exeitar, aceptar (e)sta vez, (a)ceptar sempre"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(tamaño %s bytes) "
+msgstr "(tamaño %s bytes) "
 
 #: handler.c:1448
 #, c-format
@@ -417,20 +417,20 @@ msgstr "(use '%s' para ver esta parte)"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Adxuntos"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<DESCOÑECIDO>"
+msgstr "<DESCOÑECIDO>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<por defecto>"
 
@@ -444,37 +444,33 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "Autenticación APOP fallida."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Cancelar"
+msgstr "Autenticación APOP fallida."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "¿Cancelar mensaxe sen modificar?"
+msgstr "¿Cancelar mensaxe sen modificar?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
 msgstr "Mensaxe sen modificar cancelada."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Enderezo: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Alias engadido."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Alias como: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Aliases"
 
@@ -482,64 +478,60 @@ msgstr "Aliases"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Tódalas chaves coincidintes están marcadas como expiradas/revocadas."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Engadir"
+msgstr "Tódalas chaves coincidintes están marcadas como expiradas/revocadas."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "¿engadir mensaxes a %s?"
+msgstr "¿engadir mensaxes a %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "O parámetro debe ser un número de mensaxe."
+msgstr "O parámetro debe ser un número de mensaxe."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Adxunto gardado."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Adxuntar ficheiro"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Adxuntando ficheiros seleccionados ..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Adxunto filtrado."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Adxunto gardado."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Adxuntos"
 
@@ -570,12 +562,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -588,9 +580,9 @@ msgstr ""
 #: imap/imap.c:1342
 #, fuzzy
 msgid "Bad mailbox name"
-msgstr "Crear buzón:"
+msgstr "Crear buzón:"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "Amosase o final da mensaxe."
 
@@ -612,7 +604,7 @@ msgstr "Rebotar mensaxes a %s"
 msgid "Bounce tagged messages to: "
 msgstr "Rebotar mensaxes marcadas a: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -628,18 +620,18 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Non foi posible engadir á carpeta: %s"
+msgstr "Non foi posible engadir á carpeta: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Non é posible adxuntar un directorio"
+msgstr "Non é posible adxuntar un directorio"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Non foi posible crear %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Non fun capaz de crea-lo ficheiro %s"
@@ -653,38 +645,38 @@ msgstr "Non podo crea-lo filtro"
 msgid "Can't create filter process"
 msgstr "Non podo crea-lo filtro"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "Non podo crea-lo ficheiro temporal"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Non foi posible decodificar tódolos adxuntos marcados.\n"
-"¿Remitir con MIME os outros?"
+"Non foi posible decodificar tódolos adxuntos marcados.\n"
+"¿Remitir con MIME os outros?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Non foi posible decodificar tódolos adxuntos marcados.\n"
-"¿Remitir con MIME os outros?"
+"Non foi posible decodificar tódolos adxuntos marcados.\n"
+"¿Remitir con MIME os outros?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "Non foi posible atopar ningunha mensaxe marcada."
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "Non é posible borrar un adxunto do servidor POP."
+msgstr "Non é posible borrar un adxunto do servidor POP."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "Non é posible borrar un adxunto do servidor POP."
+msgstr "Non é posible borrar un adxunto do servidor POP."
 
 #: lib-mx/mx.c:103
 #, c-format
@@ -699,13 +691,9 @@ msgstr ""
 msgid "Can't find any tagged messages."
 msgstr "Non foi posible atopar ningunha mensaxe marcada."
 
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Non foi posible recolle-lo 'type2.list' do mixmaster."
-
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Non se puido atopa-lo nome, ¿continuar?"
+msgstr "Non se puido atopa-lo nome, ¿continuar?"
 
 #: editmsg.c:115
 #, c-format
@@ -715,43 +703,43 @@ msgstr "Non foi posible abri-lo ficheiro da mensaxe: %s"
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Non foi posible engadir á carpeta: %s"
+msgstr "Non foi posible engadir á carpeta: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Fallou a conexión con %s."
+msgstr "Fallou a conexión con %s."
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Pechando conexión có servidor POP..."
+msgstr "Pechando conexión có servidor POP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Non foi atopado: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "Non foi posible crear %s: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Non foi posible garda-la mensaxe no buzón POP."
+msgstr "Non foi posible garda-la mensaxe no buzón POP."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Non é posible editar unha mensaxe no servidor POP."
+msgstr "Non é posible editar unha mensaxe no servidor POP."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "Non foi atopado: %s"
@@ -760,18 +748,18 @@ msgstr "Non foi atopado: %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Non é posible ver un directorio"
+msgstr "Non é posible ver un directorio"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "Non foi posible crear %s"
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Non foi posible escribi-la cabeceira ó ficheiro temporal"
+msgstr "Non foi posible escribi-la cabeceira ó ficheiro temporal"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
@@ -779,52 +767,48 @@ msgstr "Non foi posible escribi-la mensaxe"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Non foi posible escribi-la mensaxe ó ficheiro temporal"
+msgstr "Non foi posible escribi-la mensaxe ó ficheiro temporal"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Non foi posible crea-lo filtro de visualización"
+msgstr "Non foi posible crea-lo filtro de visualización"
 
 #: attach.c:473
 msgid "Cannot create filter"
 msgstr "Non se puido crea-lo filtro"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "¡Non se pode cambiar a escritura un buzón de só lectura!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "¡Non se pode cambiar a escritura un buzón de só lectura!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "Atrapado %s... Saíndo.\n"
+msgstr "Atrapado %s... Saíndo.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "O certificado do servidor non é aínda válido"
+msgstr "O certificado do servidor non é aínda válido"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Certificado gardado"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Os cambios ó buzón serán escritos á saída da carpeta."
+msgstr "Os cambios ó buzón serán escritos á saída da carpeta."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Os cambios á carpeta non serán gardados."
+msgstr "Os cambios á carpeta non serán gardados."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -834,28 +818,20 @@ msgstr ""
 msgid "Character set changed to %s; %s."
 msgstr "O xogo de caracteres foi cambiado a %s."
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "Directorio"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Cambiar directorio a: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Buscando novas mensaxes..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Comprobar chave  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Buscando novas mensaxes..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Buscando novas mensaxes..."
@@ -864,7 +840,7 @@ msgstr "Buscando novas mensaxes..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Limpar"
 
@@ -872,16 +848,16 @@ msgstr "Limpar"
 msgid "Clear flag"
 msgstr "Limpar indicador"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Pechando conexión con %s..."
+msgstr "Pechando conexión con %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "Pechando conexión có servidor POP..."
+msgstr "Pechando conexión có servidor POP..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Conectando con %s..."
@@ -889,28 +865,28 @@ msgstr "Conectando con %s..."
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "O comando TOP non está soportado polo servidor."
+msgstr "O comando TOP non está soportado polo servidor."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "O comando UIDL non está soportado polo servidor."
+msgstr "O comando UIDL non está soportado polo servidor."
 
 #: lib-mx/mbox.c:547
 #, fuzzy
 msgid "Committing changes..."
-msgstr "Compilando patrón de búsqueda..."
+msgstr "Compilando patrón de búsqueda..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Opcións de compilación:"
+"Opcións de compilación:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Compilando patrón de búsqueda..."
+msgstr "Compilando patrón de búsqueda..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
@@ -922,12 +898,12 @@ msgstr "Copiando a %s..."
 msgid "Compressing %s..."
 msgstr "Copiando a %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Conectando con %s..."
@@ -945,34 +921,34 @@ msgstr "Conectando con %s..."
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Perdeuse a conexión. ¿Volver a conectar ó servidor POP?"
+msgstr "Perdeuse a conexión. ¿Volver a conectar ó servidor POP?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Perdeuse a conexión. ¿Volver a conectar ó servidor POP?"
+msgstr "Perdeuse a conexión. ¿Volver a conectar ó servidor POP?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, fuzzy, c-format
 msgid "Connection to %s closed"
-msgstr "Fallou a conexión con %s."
+msgstr "Fallou a conexión con %s."
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Fallou a conexión con %s."
+msgstr "Fallou a conexión con %s."
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Tipo de contido cambiado a %s..."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-Type é da forma base/subtipo"
+msgstr "Content-Type é da forma base/subtipo"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "¿Seguir?"
+msgstr "¿Seguir?"
 
 #: commands.c:772
 #, c-format
@@ -982,7 +958,7 @@ msgstr ""
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
-msgstr "%s%s ó buzón"
+msgstr "%s%s ó buzón"
 
 #: imap/message.c:681
 #, c-format
@@ -1019,29 +995,29 @@ msgstr "Non foi posible conectar con %s (%s)"
 msgid "Could not copy message"
 msgstr "Non foi posible copia-la mensaxe."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "¡Non foi posible crear o ficheiro temporal!"
+msgstr "¡Non foi posible crear o ficheiro temporal!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "¡Non foi posible crear o ficheiro temporal!"
+msgstr "¡Non foi posible crear o ficheiro temporal!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "¡Non foi atopada unha función de ordeación! [informe deste fallo]"
+msgstr "¡Non foi atopada unha función de ordeación! [informe deste fallo]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Non foi posible atopa-lo servidor \"%s\""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "¡Non foi posible incluir tódalas mensaxes requeridas!"
+msgstr "¡Non foi posible incluir tódalas mensaxes requeridas!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
@@ -1054,9 +1030,9 @@ msgstr "Non foi posible abrir %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "¡Non foi posible reabri-lo buzón!"
+msgstr "¡Non foi posible reabri-lo buzón!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "Non foi posible envia-la mensaxe."
 
@@ -1068,25 +1044,25 @@ msgstr "Non foi posible bloquear %s.\n"
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "¿Crear %s?"
+msgstr "¿Crear %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "A operación 'Crear' está soportada só en buzóns IMAP"
+msgstr "A operación 'Crear' está soportada só en buzóns IMAP"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Crear buzón:"
+msgstr "Crear buzón:"
 
 #: commands.c:597
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "%s%s ó buzón"
+msgstr "%s%s ó buzón"
 
 #: commands.c:596
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "%s%s ó buzón"
+msgstr "%s%s ó buzón"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
@@ -1096,58 +1072,45 @@ msgstr "Seleccionando %s..."
 #: commands.c:599
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "%s%s ó buzón"
+msgstr "%s%s ó buzón"
 
 #: commands.c:598
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "%s%s ó buzón"
+msgstr "%s%s ó buzón"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "Recollendo mensaxe..."
 
-#: postpone.c:517
+#: postpone.c:482
 #, fuzzy
 msgid "Decryption failed."
 msgstr "O login fallou."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Borrar"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Borrar"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "A operación 'Borrar' está soportada só en buzóns IMAP"
+msgstr "A operación 'Borrar' está soportada só en buzóns IMAP"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "¿Borra-las mensaxes do servidor?"
+msgstr "¿Borra-las mensaxes do servidor?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Borrar as mensaxes que coincidan con: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Borrar"
 
-#: recvattach.c:993
+#: recvattach.c:981
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "O borrado de adxuntos de mensaxes PGP non está soportado."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Descrip"
+msgstr "O borrado de adxuntos de mensaxes PGP non está soportado."
 
 #: lib-lua/madmutt.cpkg:106
 #, c-format
@@ -1157,36 +1120,36 @@ msgstr ""
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s non existe. ¿Desexa crealo?"
+msgstr "%s non existe. ¿Desexa crealo?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Directorio [%s], máscara de ficheiro: %s"
+msgstr "Directorio [%s], máscara de ficheiro: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "ERRO: por favor, informe deste fallo"
 
-#: send.c:1387
+#: send.c:1381
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "Preparando mensaxe remitida ..."
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "erro na expresión"
+msgstr "erro na expresión"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Encriptar"
 
-#: compose.c:163
+#: compose.c:135
 #, fuzzy
 msgid "Encrypt with: "
 msgstr "Encriptar"
@@ -1194,19 +1157,19 @@ msgstr "Encriptar"
 #: imap/imap.c:407 pop.c:706
 #, fuzzy
 msgid "Encrypted connection unavailable"
-msgstr "Chave da sesión encriptada"
+msgstr "Chave da sesión encriptada"
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Introduza keyID para %s: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Introduza keyID para %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "Introduza keyID para %s: "
@@ -1229,126 +1192,112 @@ msgstr "Erro enviando a mensaxe."
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "Erro ó conectar có servidor: %s"
+msgstr "Erro ó conectar có servidor: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Erro ó conectar có servidor: %s"
+msgstr "Erro ó conectar có servidor: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "Erro en %s, liña %d: %s"
+msgstr "Erro en %s, liña %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Erro na liña de comando: %s\n"
+msgstr "Erro na liña de comando: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "Erro na expresión: %s"
+msgstr "Erro na expresión: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Error iniciando terminal."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Error iniciando terminal."
 
 #: imap/imap.c:620
 #, fuzzy
 msgid "Error opening mailbox"
-msgstr "¡Erro cando se estaba a escribi-lo buzón!"
+msgstr "¡Erro cando se estaba a escribi-lo buzón!"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "¡Erro analizando enderezo!"
+msgstr "¡Erro analizando enderezo!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "¡Erro executando \"%s\"!"
+msgstr "¡Erro executando \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "Erro lendo directorio."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Erro enviando mensaxe, o proceso fillo saíu con %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Erro enviando mensaxe, o proceso fillo saíu con %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Erro enviando a mensaxe."
+msgstr "Erro enviando mensaxe, o proceso fillo saíu con %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
-msgstr "Erro ó conectar có servidor: %s"
+msgstr "Erro ó conectar có servidor: %s"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Erro intentando ver ficheiro"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "¡Erro cando se estaba a escribi-lo buzón!"
+msgstr "¡Erro cando se estaba a escribi-lo buzón!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
 msgstr "Erro. Conservando ficheiro temporal: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Erro: %s non pode ser usado como remailer final dunha cadea."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "Erro: ¡multipart/encrypted non ten parámetro de protocolo!"
+msgstr "Erro: ¡multipart/encrypted non ten parámetro de protocolo!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
@@ -1358,10 +1307,10 @@ msgstr "Erro: multipart/signed non ten protocolo."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Erro na liña de comando: %s\n"
+msgstr "Erro na liña de comando: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
@@ -1372,24 +1321,15 @@ msgstr "Recollendo cabeceiras de mensaxes... [%d/%d]"
 msgid "Executing command on matching messages..."
 msgstr "Executando comando nas mensaxes coincidintes..."
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Saír"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Saír  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "¿Saír de Mutt sen gardar?"
+msgstr "¿Saír de Mutt sen gardar?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "¿Saír de Mutt?"
+msgstr "¿Saír de Mutt?"
 
 #: imap/imap.c:898
 #, fuzzy
@@ -1402,36 +1342,36 @@ msgstr "Borrando mensaxes do servidor..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Fallo ó abri-lo ficheiro para analiza-las cabeceiras."
+msgstr "Fallo ó abri-lo ficheiro para analiza-las cabeceiras."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Fallo ó abri-lo ficheiro para quitar as cabeceiras"
+msgstr "Fallo ó abri-lo ficheiro para quitar as cabeceiras"
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Fallo ó abri-lo ficheiro para analiza-las cabeceiras."
+msgstr "Fallo ó abri-lo ficheiro para analiza-las cabeceiras."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "¡Erro fatal! ¡Non foi posible reabri-lo buzón!"
+msgstr "¡Erro fatal! ¡Non foi posible reabri-lo buzón!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Erro fatal. ¡A conta de mensaxes non está sincronizada!"
+msgstr "Erro fatal. ¡A conta de mensaxes non está sincronizada!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Borrando mensaxes do servidor..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "Recollendo mensaxe..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "Recollendo a lista de mensaxes..."
@@ -1440,7 +1380,7 @@ msgstr "Recollendo a lista de mensaxes..."
 msgid "Fetching list of messages..."
 msgstr "Recollendo a lista de mensaxes..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "Recollendo cabeceiras de mensaxes... [%d/%d]"
@@ -1450,75 +1390,70 @@ msgstr "Recollendo cabeceiras de mensaxes... [%d/%d]"
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Recollendo cabeceiras de mensaxes... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Recollendo mensaxe..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Máscara de ficheiro: "
+msgstr "Máscara de ficheiro: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "O ficheiro existe, ¿(s)obreescribir, (e)ngadir ou (c)ancelar?"
+msgstr "O ficheiro existe, ¿(s)obreescribir, (e)ngadir ou (c)ancelar?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "O ficheiro é un directorio, ¿gardar nel?"
+msgstr "O ficheiro é un directorio, ¿gardar nel?"
 
 #: muttlib.c:226
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "O ficheiro é un directorio, ¿gardar nel?"
+msgstr "O ficheiro é un directorio, ¿gardar nel?"
 
 #: muttlib.c:249
 msgid "File under directory: "
 msgstr "Ficheiro no directorio: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "Filtrar a través de: "
+msgstr "Filtrar a través de: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Fingerprint: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "gardar esta mensaxe para mandar logo"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "¿Responder a %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "¿Responder a %s%s?"
+msgstr "¿Responder a %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "¿Facer \"forward\" con encapsulamento MIME?"
+msgstr "¿Facer \"forward\" con encapsulamento MIME?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "¿Remitir como adxunto?"
+msgstr "¿Remitir como adxunto?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "¿Reenviar mensaxes coma adxuntos?"
+msgstr "¿Reenviar mensaxes coma adxuntos?"
 
 #
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Función non permitida no modo \"adxuntar-mensaxe\"."
+msgstr "Función non permitida no modo \"adxuntar-mensaxe\"."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
@@ -1532,68 +1467,57 @@ msgstr "Recollendo entornos de nomes..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Grupo"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Axuda"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Axuda sobre %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
 msgstr "Estase a amosa-la axuda"
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "¡Non lle sei cómo imprimir iso!"
+msgstr "¡Non lle sei cómo imprimir iso!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "¡Non sei cómo imprimir adxuntos %s!"
+msgstr "¡Non sei cómo imprimir adxuntos %s!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
 msgstr "Este ID expirou/foi deshabilitado/foi revocado"
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 #, fuzzy
 msgid "ID is not valid."
-msgstr "Este ID non é de confianza."
+msgstr "Este ID non é de confianza."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 #, fuzzy
 msgid "ID is only marginally valid."
-msgstr "Este ID é de confianza marxinal."
+msgstr "Este ID é de confianza marxinal."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
 msgstr "Cabeceira PGP ilegal"
 
-#: postpone.c:434
+#: postpone.c:399
 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "Cabeceira PGP ilegal"
@@ -1601,138 +1525,130 @@ msgstr "Cabeceira PGP ilegal"
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Entrada malformada para o tipo %s en \"%s\" liña %d"
+msgstr "Entrada malformada para o tipo %s en \"%s\" liña %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "¿Inclui-la mensaxe na resposta?"
+msgstr "¿Inclui-la mensaxe na resposta?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Incluindo mensaxe citada..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Insertar"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Día do mes inválido: %s"
+msgstr "Día do mes inválido: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Codificación inválida."
+msgstr "Codificación inválida."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Número de índice inválido."
+msgstr "Número de índice inválido."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Número de mensaxe inválido."
+msgstr "Número de mensaxe inválido."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Mes inválido: %s"
+msgstr "Mes inválido: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "Data relativa incorrecta: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "Chamando ó PGP..."
+msgstr "Chamando ó PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "Chamando ó PGP..."
+msgstr "Chamando ó PGP..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Chamando ó comando de automostra: %s"
+msgstr "Chamando ó comando de automostra: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Saltar á mensaxe: "
+msgstr "Saltar á mensaxe: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Saltar a: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "O salto non está implementado nos diálogos."
+msgstr "O salto non está implementado nos diálogos."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "A tecla non está vinculada."
+msgstr "A tecla non está vinculada."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "A tecla non está vinculada. Pulsa '%s' para axuda."
+msgstr "A tecla non está vinculada. Pulsa '%s' para axuda."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Limitar ás mensaxes que coincidan con: "
+msgstr "Limitar ás mensaxes que coincidan con: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "Límite: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Límite: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Comezando secuencia de login ..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1740,17 +1656,17 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Excedeuse a conta de bloqueos, ¿borrar bloqueo para %s?"
+msgstr "Excedeuse a conta de bloqueos, ¿borrar bloqueo para %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Comezando secuencia de login ..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "O login fallou."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "Buscando chaves que coincidan con \"%s\"..."
@@ -1760,7 +1676,7 @@ msgstr "Buscando chaves que coincidan con \"%s\"..."
 msgid "Looking up %s..."
 msgstr "Buscando %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Fingerprint: %s"
@@ -1769,91 +1685,87 @@ msgstr "Fingerprint: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Tipo MIME non definido. Non se pode ver-lo ficheiro adxunto."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "Bucle de macro detectado."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Nova"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "Mensaxe non enviada."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Mensaxe enviada."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "Buzón marcado para comprobación."
+msgstr "Buzón marcado para comprobación."
 
 #: imap/command.c:235
 #, fuzzy
 msgid "Mailbox closed"
-msgstr "Buzón borrado."
+msgstr "Buzón borrado."
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Buzón creado."
+msgstr "Buzón creado."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Buzón borrado."
+msgstr "Buzón borrado."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "O buzón está valeiro."
+msgstr "O buzón está valeiro."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "O buzón está marcado como non escribible. %s"
+msgstr "O buzón está marcado como non escribible. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "O buzón é de só lectura."
+msgstr "O buzón é de só lectura."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "O buzón non cambiou."
+msgstr "O buzón non cambiou."
 
 #: imap/browse.c:253 imap/browse.c:294
 #, fuzzy
 msgid "Mailbox must have a name."
-msgstr "O buzón non cambiou."
+msgstr "O buzón non cambiou."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Buzón non borrado."
+msgstr "Buzón non borrado."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Buzón creado."
+msgstr "Buzón creado."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "¡O buzón foi corrompido!"
+msgstr "¡O buzón foi corrompido!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 #, fuzzy
 msgid "Mailbox was externally modified."
-msgstr "O buzón foi modificado externamente. Os indicadores poden ser erróneos"
+msgstr "O buzón foi modificado externamente. Os indicadores poden ser erróneos"
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "O buzón foi modificado externamente. Os indicadores poden ser erróneos"
+msgstr "O buzón foi modificado externamente. Os indicadores poden ser erróneos"
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Buzóns [%d]"
+msgstr "Buzóns [%d]"
 
 #: attach.c:218
 #, c-format
@@ -1865,11 +1777,7 @@ msgstr "A entrada \"Edit\" do ficheiro Mailcap require %%s"
 msgid "Mailcap compose entry requires %%s"
 msgstr "A entrada \"compose\" no ficheiro Mailcap require %%s"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Facer alias"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1878,19 +1786,15 @@ msgstr ""
 msgid "Marking %d messages deleted..."
 msgstr "Marcando %d mensaxes borradas ..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Máscara"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Mensaxe rebotada."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1900,7 +1804,7 @@ msgstr "Non foi posible imprimi-la mensaxe"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "¡A mensaxe está valeira!"
+msgstr "¡A mensaxe está valeira!"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
@@ -1911,12 +1815,12 @@ msgstr "Mensaxe rebotada."
 msgid "Message not modified!"
 msgstr "Mensaxe non modificada."
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "A mensaxe pai non é visible na vista limitada."
+msgstr "A mensaxe pai non é visible na vista limitada."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "Mensaxe posposta."
 
@@ -1924,7 +1828,7 @@ msgstr "Mensaxe posposta."
 msgid "Message printed"
 msgstr "Mensaxe impresa"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Mensaxe escrita."
 
@@ -1945,42 +1849,29 @@ msgstr "Mensaxes rebotadas."
 msgid "Messages printed"
 msgstr "Mensaxes impresas"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Faltan parámetros."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "As cadeas mixmaster están limitadas a %d elementos."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "O mixmaster non acepta cabeceiras Cc ou Bcc."
+msgstr "Faltan parámetros."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "¿Mover mensaxes lidas a %s?"
+msgstr "¿Mover mensaxes lidas a %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "Movendo mensaxes lidas a %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nova consulta"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Novo nome de ficheiro: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Novo ficheiro: "
 
@@ -1989,95 +1880,87 @@ msgstr "Novo ficheiro: "
 msgid "New mail in "
 msgstr "Novo correo en %s."
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Novo correo neste buzón."
+msgstr "Novo correo neste buzón."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Seguinte"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "SegPáx"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 #, fuzzy
 msgid "No authenticators available"
-msgstr "Autenticación SASL fallida."
+msgstr "Autenticación SASL fallida."
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "¡Non se atopout parámetro \"boundary\"! [informe deste erro]"
+msgstr "¡Non se atopout parámetro \"boundary\"! [informe deste erro]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Non hai entradas."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "Non hai ficheiros que coincidan coa máscara"
+msgstr "Non hai ficheiros que coincidan coa máscara"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Non se definiron buzóns para correo entrante."
+msgstr "Non se definiron buzóns para correo entrante."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Non hai patrón limitante efectivo."
+msgstr "Non hai patrón limitante efectivo."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Non hai buzóns abertos."
+msgstr "Non hai buzóns abertos."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Non hai buzóns con novo correo."
+msgstr "Non hai buzóns con novo correo."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
 "Non hai entrada \"compose\"  para %sno ficheiro Mailcap, creando\n"
-" ficheiro vacío."
+" ficheiro vacío."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "Non hai entrada \"edit\" no ficheiro Mailcap para %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "¡Non se atoparon listas de correo!"
+msgstr "¡Non se atoparon listas de correo!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
@@ -2085,96 +1968,86 @@ msgstr ""
 "Non se atopou ningunha entrada coincidente no ficheiro mailcap.Vendo como "
 "texto"
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Non hai mensaxes nese buzón."
+msgstr "Non hai mensaxes nese buzón."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
 msgstr "Non hai mensaxes que coincidan co criterio."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "Non hai máis texto citado."
+msgstr "Non hai máis texto citado."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Non hai máis fíos"
+msgstr "Non hai máis fíos"
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Non hai máis texto sen citar despois do texto citado."
+msgstr "Non hai máis texto sen citar despois do texto citado."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Non hai novo correo no buzón POP."
+msgstr "Non hai novo correo no buzón POP."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Non hai novas mensaxes"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Non se especificou tema."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "Non hai ficheiros que coincidan coa máscara"
+msgstr "Non hai ficheiros que coincidan coa máscara"
 
-#: nntp.c:357
+#: nntp.c:360
 #, fuzzy
 msgid "No newsserver defined!"
 msgstr "Non foi definido nome de usuario POP."
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Non hai buzóns con novo correo."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "Non hai mensaxes pospostas."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Non hai buzóns con novo correo."
-
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Non foi definido ningún comando de impresión."
+msgstr "Non foi definido ningún comando de impresión."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "¡Non se especificaron destinatarios!"
+msgstr "¡Non se especificaron destinatarios!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Non foi especificado ningún destinatario.\n"
+msgstr "Non foi especificado ningún destinatario.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
 msgstr "Non se especificaron destinatarios."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Non hai patrón de búsqueda."
+msgstr "Non hai patrón de búsqueda."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Non se especificou tema."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Non hai tema, ¿cancela-lo envío?"
+msgstr "Non hai tema, ¿cancela-lo envío?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Non hai tema, ¿cancelar?"
+msgstr "Non hai tema, ¿cancelar?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Non hai tema, cancelando."
 
@@ -2183,104 +2056,100 @@ msgstr "Non hai tema, cancelando."
 msgid "No such folder"
 msgstr "%s: non hai tal color"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "Non hai entradas marcadas."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "¡Non hai mensaxes marcadas que sexan visibles!"
+msgstr "¡Non hai mensaxes marcadas que sexan visibles!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr "Non hai mensaxes recuperadas."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "Non hai mensaxes sen ler"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 #, fuzzy
 msgid "No visible messages."
 msgstr "Non hai novas mensaxes"
 
 #
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Non dispoñible neste menú."
+msgstr "Non dispoñible neste menú."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Non se atopou."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Conectando con %s..."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "Ok"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Só o borrado de adxuntos de mensaxes multiparte está soportado."
+msgstr "Só o borrado de adxuntos de mensaxes multiparte está soportado."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Abrir buzón"
+msgstr "Abrir buzón"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Abrir buzón en modo de só lectura"
+msgstr "Abrir buzón en modo de só lectura"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Abrir buzón do que adxuntar mensaxe"
+msgstr "Abrir buzón do que adxuntar mensaxe"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Abrir buzón en modo de só lectura"
+msgstr "Abrir buzón en modo de só lectura"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Abrir buzón do que adxuntar mensaxe"
+msgstr "Abrir buzón do que adxuntar mensaxe"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Saída do proceso de distribución"
+msgstr "Saída do proceso de distribución"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
-"¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
+"¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "Chaves PGP coincidintes con <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "Chaves PGP coincidintes con <%s>."
@@ -2291,139 +2160,112 @@ msgstr "Non foi posible verifica-la sinatura PGP."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "Sinatura PGP verificada con éxito."
+msgstr "Sinatura PGP verificada con éxito."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "O servidor POP non está definido"
+msgstr "O servidor POP non está definido"
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "A mensaxe pai non é accesible."
+msgstr "A mensaxe pai non é accesible."
 
-#: thread.c:980
+#: thread.c:976
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
-msgstr "A mensaxe pai non é visible na vista limitada."
+msgstr "A mensaxe pai non é visible na vista limitada."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Contrasinal para %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Nome persoal: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Canalizar"
-
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Canalizar ó comando: "
+msgstr "Canalizar ó comando: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Canalizar a: "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Por favor, use un valor correcto da variable 'hostname' cando use o "
-"mixmaster."
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "¿Pospór esta mensaxe?"
+msgstr "¿Pospór esta mensaxe?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Mensaxes pospostas"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "O comando de preconexión fallou."
+msgstr "O comando de preconexión fallou."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "Preparando mensaxe remitida ..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr "Pulsa calquera tecla para seguir..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "PáxAnt"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Imprimir"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "¿Imprimir adxunto?"
+msgstr "¿Imprimir adxunto?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "¿Imprimir mensaxe?"
+msgstr "¿Imprimir mensaxe?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "¿Imprimi-la(s) mensaxe(s) marcada(s)?"
+msgstr "¿Imprimi-la(s) mensaxe(s) marcada(s)?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "¿Imprimir mensaxes marcadas?"
+msgstr "¿Imprimir mensaxes marcadas?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "¿Purgar %d mensaxe marcada como borrada?"
+msgstr "¿Purgar %d mensaxe marcada como borrada?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "¿Purgar %d mensaxes marcadas como borradas?"
+msgstr "¿Purgar %d mensaxes marcadas como borradas?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Consulta"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Consulta '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
 msgstr "Comando de consulta non definido."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Consulta: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Saír"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "¿Saír de Mutt?"
+msgstr "¿Saír de Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Recollendo entornos de nomes..."
@@ -2448,54 +2290,50 @@ msgstr "Lendo %s... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Lendo novas mensaxes (%d bytes)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "¿Seguro de borra-lo buzón \"%s\"?"
+msgstr "¿Seguro de borra-lo buzón \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "¿Editar mensaxe posposta?"
+msgstr "¿Editar mensaxe posposta?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "A recodificación só afecta ós adxuntos de texto."
+msgstr "A recodificación só afecta ós adxuntos de texto."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "O login fallou."
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "A operación 'Crear' está soportada só en buzóns IMAP"
+msgstr "A operación 'Crear' está soportada só en buzóns IMAP"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Crear buzón:"
+msgstr "Crear buzón:"
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Cambiar nome a: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Reabrindo buzón..."
+msgstr "Reabrindo buzón..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Responder"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "¿Responder a %s%s?"
+msgstr "¿Responder a %s%s?"
 
 #: commands.c:403
 #, fuzzy
@@ -2503,27 +2341,27 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Ordear-inv (d)ata/d(e)/(r)ecb/(t)ema/(p)ara/(f)ío/(n)ada/t(a)m/p(u)nt: "
+"Ordear-inv (d)ata/d(e)/(r)ecb/(t)ema/(p)ara/(f)ío/(n)ada/t(a)m/p(u)nt: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Búsqueda inversa de: "
+msgstr "Búsqueda inversa de: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Búsqueda inversa: "
+msgstr "Búsqueda inversa: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "¿Ordear inversamente por (d)ata, (a)lfabeto, (t)amaño ou (s)en orden?"
+msgstr "¿Ordear inversamente por (d)ata, (a)lfabeto, (t)amaño ou (s)en orden?"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
-"¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
+"¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou (o)lvidar? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
@@ -2531,7 +2369,7 @@ msgstr ""
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "Chaves PGP coincidintes con \"%s\""
@@ -2548,13 +2386,13 @@ msgstr "Non foi posible verifica-la sinatura PGP."
 #: commands.c:135
 #, fuzzy
 msgid "S/MIME signature successfully verified."
-msgstr "Sinatura PGP verificada con éxito."
+msgstr "Sinatura PGP verificada con éxito."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "Autenticación SASL fallida."
+msgstr "Autenticación SASL fallida."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Fingerprint: %s"
@@ -2564,133 +2402,109 @@ msgstr "Fingerprint: %s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "Conectando mediante SSL usando %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Gardar"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "¿Gardar unha copia desta mensaxe?"
+msgstr "¿Gardar unha copia desta mensaxe?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Gardar a ficheiro: "
 
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
-msgstr "%s%s ó buzón"
+msgstr "%s%s ó buzón"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Gardando indicadores de estado da mensaxe... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Gardando..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Búsqueda"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "Búsqueda de: "
+msgstr "Búsqueda de: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "A búsqueda cheou ó final sen atopar coincidencias"
+msgstr "A búsqueda cheou ó final sen atopar coincidencias"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "A búsqueda chegou ó comezo sen atopar coincidencia"
+msgstr "A búsqueda chegou ó comezo sen atopar coincidencia"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Búsqueda interrompida."
+msgstr "Búsqueda interrompida."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "A búsqueda non está implementada neste menú."
+msgstr "A búsqueda non está implementada neste menú."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "A búsqueda volveu ó final."
+msgstr "A búsqueda volveu ó final."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "A búsqueda volveu ó principio."
+msgstr "A búsqueda volveu ó principio."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "Búsqueda: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Seleccionar"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Seleccionar  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Seleccionar unha cadea de remailers."
+msgstr "Búsqueda: "
 
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "Seleccionando %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Enviar"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Mandando en segundo plano."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Enviando mensaxe..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "¡O servidor pechou a conexión!"
+msgstr "¡O servidor pechou a conexión!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Pór indicador"
+msgstr "Pór indicador"
 
 #: commands.c:463
 msgid "Shell command: "
 msgstr "Comando de shell: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Firmar"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Firmar como: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Firmar, Encriptar"
 
@@ -2699,36 +2513,32 @@ msgstr "Firmar, Encriptar"
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
-msgstr "Ordear (d)ata/d(e)/(r)ecb/(t)ema/(p)ara/(f)ío/(n)ada/t(a)m/p(u)nt: "
+msgstr "Ordear (d)ata/d(e)/(r)ecb/(t)ema/(p)ara/(f)ío/(n)ada/t(a)m/p(u)nt: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "¿Ordear por (d)ata, (a)lfabeto, (t)amaño ou (s)en orden?"
+msgstr "¿Ordear por (d)ata, (a)lfabeto, (t)amaño ou (s)en orden?"
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Ordeando buzón..."
+msgstr "Ordeando buzón..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Subscrito [%s], máscara de ficheiro: %s"
+msgstr "Subscrito [%s], máscara de ficheiro: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2737,134 +2547,134 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "Subscribindo a %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "Comprobación do certificado SSL"
+msgstr "Comprobación do certificado SSL"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr "Marcar as mensaxes que coincidan con: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "¡Marca as mensaxes que queres adxuntar!"
+msgstr "¡Marca as mensaxes que queres adxuntar!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "O marcado non está soportado."
+msgstr "O marcado non está soportado."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Esa mensaxe non é visible."
+msgstr "Esa mensaxe non é visible."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL non está accesible."
+msgstr "SSL non está accesible."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "O adxunto actual será convertido"
+msgstr "O adxunto actual será convertido"
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "O adxunto actual non será convertido."
+msgstr "O adxunto actual non será convertido."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "O índice de mensaxes é incorrecto. Tente reabri-lo buzón."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "A cadea de remailers xa está valeira."
+msgstr "O índice de mensaxes é incorrecto. Tente reabri-lo buzón."
 
 #
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "Non hai ficheiros adxuntos."
 
 #
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Non hai mensaxes."
 
 #
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "Non hai subpartes que amosar."
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Este servidor IMAP é moi vello. Mutt non traballa con el."
+msgstr "Este servidor IMAP é moi vello. Mutt non traballa con el."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr "Este certificado pertence a:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Este certificado é válido"
+msgstr "Este certificado é válido"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr "Este certificado foi emitido por:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "Esta chave non pode ser usada: expirada/deshabilitada/revocada."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "O fío contén mensaxes sen ler."
+msgstr "O fío contén mensaxes sen ler."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
 msgstr "Enfiamento non habilitado."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "¡Tempo de espera excedido cando se tentaba face-lo bloqueo fcntl!"
+msgstr "¡Tempo de espera excedido cando se tentaba face-lo bloqueo fcntl!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "¡Tempo de espera excedido cando se tentaba face-lo bloqueo flock!"
+msgstr "¡Tempo de espera excedido cando se tentaba face-lo bloqueo flock!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
 msgstr "Amosase o principio da mensaxe."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "Erro ó conectar có servidor: %s"
+msgstr "Erro ó conectar có servidor: %s"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2874,22 +2684,22 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "Autenticación SASL fallida."
+msgstr "Autenticación SASL fallida."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "¡Non foi posible adxuntar %s!"
+msgstr "¡Non foi posible adxuntar %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "¡Non foi posible adxuntar!"
+msgstr "¡Non foi posible adxuntar!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Non foi posible recoller cabeceiras da versión de IMAP do servidor"
+msgstr "Non foi posible recoller cabeceiras da versión de IMAP do servidor"
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "Non foi posible obter un certificado do outro extremo"
 
@@ -2897,65 +2707,56 @@ msgstr "Non foi posible obter un certificado do outro extremo"
 msgid "Unable to leave messages on server."
 msgstr "Non foi posible deixa-las mensaxes no servidor."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "¡Non foi posible adxuntar %s!"
+msgstr "¡Non foi posible adxuntar %s!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "¡Imposible bloquea-lo buzón!"
+msgstr "¡Imposible bloquea-lo buzón!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "¡Non foi posible abri-lo ficheiro temporal!"
+msgstr "¡Non foi posible abri-lo ficheiro temporal!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "¡Non foi posible abri-lo ficheiro temporal!"
+msgstr "¡Non foi posible abri-lo ficheiro temporal!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "¡Non foi posible abri-lo ficheiro temporal!"
+msgstr "¡Non foi posible abri-lo ficheiro temporal!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Recuperar"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "Recuperar as mensaxes que coincidan con: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Recuperar"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "Non coñezo ó Content-Type %s"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Borrando a subscripción con %s..."
+msgstr "Non coñezo ó Content-Type %s"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "Borrando a subscripción con %s..."
+msgstr "Borrando a subscripción con %s..."
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "Borrando a subscripción con %s..."
+msgstr "Borrando a subscripción con %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "Desmarcar as mensaxes que coincidan con: "
 
@@ -2966,48 +2767,40 @@ msgstr "Enviando mensaxe ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "¡Use 'toggle-write' para restablece-lo modo escritura!"
+msgstr "¡Use 'toggle-write' para restablece-lo modo escritura!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "¿Usa-lo keyID = \"%s\" para %s?"
+msgstr "¿Usa-lo keyID = \"%s\" para %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
 msgstr "Nome de usuario en %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Mes inválido: %s"
+msgstr "Mes inválido: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Mes inválido: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Mes inválido: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "¿Verificar firma PGP?"
+msgstr "¿Verificar firma PGP?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Verificando os índices de mensaxes..."
+msgstr "Verificando os índices de mensaxes..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Ver adxunto"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "¡ATENCION! Está a punto de sobreescribir %s, ¿seguir?"
+msgstr "¡ATENCION! Está a punto de sobreescribir %s, ¿seguir?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -3015,29 +2808,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "O certificado do servidor expirou"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "O certificado do servidor expirou"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "O certificado do servidor non é aínda válido"
+msgstr "O certificado do servidor non é aínda válido"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "O certificado do servidor non é aínda válido"
+msgstr "O certificado do servidor non é aínda válido"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3059,11 +2852,11 @@ msgstr "Agardando polo bloqueo fcntl... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "Agardando polo intento de flock... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Agardando resposta..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3073,14 +2866,14 @@ msgstr ""
 msgid "Warning: At least one certification key has expired\n"
 msgstr "O certificado do servidor expirou"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "Atención: non foi posible garda-lo certificado"
+msgstr "Atención: non foi posible garda-lo certificado"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
@@ -3098,39 +2891,39 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "O que temos aquí é un fallo ó face-lo adxunto"
+msgstr "O que temos aquí é un fallo ó face-lo adxunto"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "¡Fallou a escritura! Gardado buzón parcialmente a %s"
+msgstr "¡Fallou a escritura! Gardado buzón parcialmente a %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "¡Fallo de escritura!"
+msgstr "¡Fallo de escritura!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Escribir mensaxe ó buzón"
+msgstr "Escribir mensaxe ó buzón"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
 msgstr "Escribindo %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Escribindo mensaxe a %s..."
@@ -3140,90 +2933,72 @@ msgstr "Escribindo mensaxe a %s..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Escribindo mensaxes... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Erro na liña de comando: %s\n"
+msgstr "Erro na liña de comando: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "¡Xa tés un alias definido con ese nome!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "O primeiro elemento da cadea xa está seleccionado."
+msgstr "¡Xa tés un alias definido con ese nome!"
 
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "O derradeiro elemento da cadea xa está seleccionado."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Está na primeira entrada."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Está na primeira páxina."
+msgstr "Está na primeira entrada."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Está na primeira mensaxe."
+msgstr "Está na primeira mensaxe."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Está na primeira páxina."
+msgstr "Está na primeira páxina."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Está no primeiro fío"
+msgstr "Está no primeiro fío"
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Está na derradeira entrada."
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Está na derradeira páxina."
+msgstr "Está na derradeira entrada."
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Está na última mensaxe."
+msgstr "Está na última mensaxe."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Está na derradeira páxina."
+msgstr "Está na derradeira páxina."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Non é posible moverse máis abaixo."
+msgstr "Non é posible moverse máis abaixo."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Non é posible moverse máis arriba."
+msgstr "Non é posible moverse máis arriba."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "¡Non tés aliases definidas!"
+msgstr "¡Non tés aliases definidas!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Non podes borra-lo único adxunto."
+msgstr "Non podes borra-lo único adxunto."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Somentes podes rebotar partes \"message/rfc822\""
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] ¿Aceptar?"
+msgstr "[%s = %s] ¿Aceptar?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s non está soportado "
+msgstr "[-- %s/%s non está soportado "
 
 #: handler.c:1000
 #, c-format
@@ -3240,7 +3015,7 @@ msgstr "[-- Automostra da stderr de %s --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automostra usando %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3248,11 +3023,11 @@ msgstr ""
 "[-- COMEZA A MESAXE PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- COMEZA O BLOQUE DE CHAVE PÚBLICA PGP --]\n"
+msgstr "[-- COMEZA O BLOQUE DE CHAVE PÚBLICA PGP --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3260,7 +3035,7 @@ msgstr ""
 "[-- COMEZA A MESAXE FIRMADA CON PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3269,53 +3044,53 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- o %s --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- FIN DA MESAXE PGP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FIN DO BLOQUE DE CHAVE PÚBLICA PGP --]\n"
+msgstr "[-- FIN DO BLOQUE DE CHAVE PÚBLICA PGP --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- FIN DA MESAXE FIRMADA CON PGP --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Fin dos datos con encriptación PGP/MIME --]\n"
+"[-- Fin dos datos con encriptación PGP/MIME --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Fin dos datos con encriptación PGP/MIME --]\n"
+"[-- Fin dos datos con encriptación PGP/MIME --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Fin dos datos con encriptación PGP/MIME --]\n"
+"[-- Fin dos datos con encriptación PGP/MIME --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Fin dos datos asinados --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3327,95 +3102,95 @@ msgstr ""
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- Erro: ¡Non foi posible amosar ningunha parte de Multipart/"
+"[-- Erro: ¡Non foi posible amosar ningunha parte de Multipart/"
 "Alternative!--]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr "[-- Erro: estructura multiparte/asinada inconsistente --]\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
-msgstr "[-- Erro: protocolo multiparte/asinado %s descoñecido --]\n"
+msgstr "[-- Erro: protocolo multiparte/asinado %s descoñecido --]\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Erro: ¡non foi posible crea-lo ficheiro temporal! --]\n"
+msgstr "[-- Erro: ¡non foi posible crea-lo ficheiro temporal! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Erro: ¡non se atopou o comezo da mensaxe PGP! --]\n"
+"[-- Erro: ¡non se atopou o comezo da mensaxe PGP! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- Erro: ¡fin de ficheiro inesperado! --]\n"
+msgstr "[-- Erro: ¡fin de ficheiro inesperado! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- Erro: ¡mensaxe PGP/MIME mal formada! --]\n"
+"[-- Erro: ¡mensaxe PGP/MIME mal formada! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- Erro: mensaxe/corpo externo non ten parámetro \"access-type\"--]\n"
+msgstr "[-- Erro: mensaxe/corpo externo non ten parámetro \"access-type\"--]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
+"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
+"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
+"[-- Os datos a continuación están encriptados con PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- Os datos a continuación están asinados --]\n"
+"[-- Os datos a continuación están asinados --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Os datos a continuación están asinados --]\n"
+"[-- Os datos a continuación están asinados --]\n"
 "\n"
 
 #: handler.c:1185
@@ -3431,31 +3206,31 @@ msgstr "[-- Este adxunto %s/%s "
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Tipo: %s/%s, Codificación: %s, Tamaño: %s --]\n"
+msgstr "[-- Tipo: %s/%s, Codificación: %s, Tamaño: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Atención: non se atoparon sinaturas. --]\n"
+"[-- Atención: non se atoparon sinaturas. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Atención: non é posible verificar sinaturas %s/%s --]\n"
+"[-- Atención: non é posible verificar sinaturas %s/%s --]\n"
 "\n"
 
 #: handler.c:1230
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
-"[-- Este adxunto %s/%s non está incluido, --]\n"
-"[-- e o \"access-type\" %s indicado non está soportado --]\n"
+"[-- Este adxunto %s/%s non está incluido, --]\n"
+"[-- e o \"access-type\" %s indicado non está soportado --]\n"
 
 #: handler.c:1214
 #, fuzzy
@@ -3463,7 +3238,7 @@ msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- Este adxunto %s/%s non está incluido --]\n"
+"[-- Este adxunto %s/%s non está incluido --]\n"
 "[-- e a fonte externa indicada expirou--]\n"
 
 #: handler.c:1201
@@ -3476,33 +3251,33 @@ msgstr "[-- nome: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- o %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Saír  "
+msgstr "Saír  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Mes inválido: %s"
+msgstr "Mes inválido: %s"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
@@ -3515,40 +3290,135 @@ msgstr "[ data incorrecta ]"
 msgid "[unable to calculate]"
 msgstr "[imposible calcular]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: sen enderezo"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Non foi posible atopar ningunha mensaxe marcada."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Non foi posible atopar ningunha mensaxe marcada."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "¿Gardar unha copia desta mensaxe?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "edita-la descripción do adxunto"
+msgstr "edita-la descripción do adxunto"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "edita-la descripción do adxunto"
+msgstr "edita-la descripción do adxunto"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: demasiados argumentos"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Erro lendo directorio."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Non hai buzóns con novo correo."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: parámetros insuficientes"
+msgstr "color: parámetros insuficientes"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Non hai novas mensaxes"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr ""
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Escribir mensaxe ó buzón"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
@@ -3557,26 +3427,107 @@ msgstr "Non foi posible crea-la carpeta temporal: %s"
 #: editmsg.c:89
 #, fuzzy, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "Non foi posible crea-lo buzón temporal: %s"
+msgstr "Non foi posible crea-lo buzón temporal: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Non foi posible crea-lo buzón temporal: %s"
+msgstr "Non foi posible crea-lo buzón temporal: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
 
-#: browser.c:1206
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Non se definiron buzóns para correo entrante."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dats"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
 msgstr "colores por defecto non soportados"
 
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "¿Borra-las mensaxes do servidor?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Recuperar as mensaxes que coincidan con: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Recuperar as mensaxes que coincidan con: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
+
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dertpfnau"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Preparando mensaxe remitida ..."
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3592,29 +3543,116 @@ msgstr "Copiando a %s..."
 msgid "echo Decompressing %s..."
 msgstr "Seleccionando %s..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "O adxunto actual non será convertido."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "edita-la descripción do adxunto"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Non foi posible escribi-la mensaxe"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Recollendo cabeceiras de mensaxes... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Preparando mensaxe remitida ..."
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "¿Gardar unha copia desta mensaxe?"
+
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "patrón valeiro"
+msgstr "patrón valeiro"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
 msgstr "Encriptar"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "¿Gardar unha copia desta mensaxe?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3629,36 +3667,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "erro na expresión"
+msgstr "erro na expresión"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3668,82 +3706,252 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "erro no patrón en: %s"
+msgstr "erro no patrón en: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "erro: operador descoñecido %d (informe deste erro)."
+msgstr "erro: operador descoñecido %d (informe deste erro)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "efcaio"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "efcaio"
 
-#: keymap.c:829
+#: keymap.c:821
 #, fuzzy
 msgid "exec: no arguments"
-msgstr "exec: parámetros insuficientes"
+msgstr "exec: parámetros insuficientes"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "¿Responder a %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
-#, c-format
-msgid "gpgme_op_keylist_start failed: %s"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
 msgstr ""
 
-#: handler.c:1193
-msgid "has been deleted --]\n"
-msgstr "foi borrado --]\n"
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "¿Reenviar mensaxes coma adxuntos?"
 
-#: imap/imap.c:941
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Buscando novas mensaxes..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Está na primeira mensaxe."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Está na derradeira páxina."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Non hai buzóns con novo correo."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "¡Erro cando se estaba a escribi-lo buzón!"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Non hai buzóns con novo correo."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: handler.c:1193
+msgid "has been deleted --]\n"
+msgstr "foi borrado --]\n"
+
+#: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "campo de cabeceira inválido"
+msgstr "campo de cabeceira inválido"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Número de índice inválido."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Saltar á mensaxe: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Saltar á mensaxe: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "O fío contén mensaxes sen ler."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Está no primeiro fío"
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Non hai mensaxes sen ler"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Non hai mensaxes sen ler"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "¿Gardar unha copia desta mensaxe?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "Chaves PGP coincidintes con <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Rebotar mensaxes marcadas a: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Non hai buzóns con novo correo."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: secuencia de teclas baleira"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: demasiados parámetros"
+msgstr "macro: demasiados parámetros"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
@@ -3754,6 +3962,38 @@ msgstr "non se atopou unha entrada mailcap para o tipo %s"
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
@@ -3762,84 +4002,428 @@ msgstr "Mensaxes rebotadas."
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "paréntese sen contraparte: %s"
+msgstr "paréntese sen contraparte: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "falta un parámetro"
+msgstr "falta un parámetro"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: parámetros insuficientes"
+msgstr "mono: parámetros insuficientes"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Está na primeira entrada."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Está na primeira mensaxe."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Está na derradeira entrada."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Está na última mensaxe."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Está na derradeira entrada."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Está na derradeira páxina."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Non hai mensaxes recuperadas."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Está na primeira entrada."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Está na primeira páxina."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Non hai mensaxes recuperadas."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Está na primeira páxina."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "¡A mensaxe multiparte non ten parámetro \"boundary\"!"
+msgstr "¡A mensaxe multiparte non ten parámetro \"boundary\"!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "non"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(non hai buzón)"
+msgstr "(non hai buzón)"
 
 #: commands.c:788
 msgid "not converting"
 msgstr ""
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "secuencia de teclas nula"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
 msgstr "sec"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Abrir buzón en modo de só lectura"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Abrir buzón en modo de só lectura"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Reabrindo buzón..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Rebotar mensaxe a %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefixo ilegal con reset"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Está na primeira entrada."
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: demasiados parámetros"
+msgstr "push: demasiados parámetros"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "¿Editar mensaxe posposta?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "O fío contén mensaxes sen ler."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Non é posible editar unha mensaxe no servidor POP."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: non foi posible adxuntar ficheiro"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Saltar á mensaxe: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "¿Borra-las mensaxes do servidor?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "re"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "rea"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "%s%s ó buzón"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "%s%s ó buzón"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Non é posible editar unha mensaxe no servidor POP."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "erro na expresión"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Búsqueda de: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Non foi posible envia-la mensaxe."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "¿Reenviar mensaxes coma adxuntos?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Limitar ás mensaxes que coincidan con: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Non hai máis texto citado."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "¿Imprimir mensaxe?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Non hai mensaxes nese buzón."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: erro en %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: erros en %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: a lectura foi abortada por haber demasiados erros in %s"
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Non hai ficheiros que coincidan coa máscara"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: ¡buzón modificado, mais non hai mensaxes modificadas! (informe deste "
+"sync: ¡buzón modificado, mais non hai mensaxes modificadas! (informe deste "
 "fallo)"
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Desmarcar as mensaxes que coincidan con: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Está no primeiro fío"
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3850,41 +4434,130 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Non hai máis texto citado."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "A recodificación só afecta ós adxuntos de texto."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Non hai patrón de búsqueda."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Non hai mensaxes sen ler"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "parámetros insuficientes"
+msgstr "parámetros insuficientes"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "demasiados parámetros"
+msgstr "demasiados parámetros"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "edita-la descripción do adxunto"
+msgstr "edita-la descripción do adxunto"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Recuperar as mensaxes que coincidan con: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Recuperar as mensaxes que coincidan con: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Recuperar as mensaxes que coincidan con: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: non é posible borrar un %s dende dentro dun %s"
+msgstr "unhook: non é posible borrar un %s dende dentro dun %s"
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: Non é posible facer 'unhook *' dentro doutro hook."
+msgstr "unhook: Non é posible facer 'unhook *' dentro doutro hook."
 
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: tipo descoñecido: %s"
+msgstr "unhook: tipo descoñecido: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "erro descoñecido"
+msgstr "erro descoñecido"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Desmarcar as mensaxes que coincidan con: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "edita-la descripción do adxunto"
 
 #: main.c:82
 msgid ""
@@ -3897,16 +4570,50 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
 msgstr "valor ilegal con reset"
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Adxunto gardado."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Novo ficheiro: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Escribir mensaxe ó buzón"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
-msgstr "sí"
+msgstr "sí"
 
 #: muttlib.c:227
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/hu.po b/po/hu.po
index 222373e..0153574 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,47 +1,47 @@
 # Hungarian translation for Mutt.
 # Copyright (C) 2000-2001 Free Software Foundation, Inc.
-# László Kiss <kissl@eptan.efe.hu>, 2000-2001;
-# Szabolcs Horváth <horvaths@fi.inf.elte.hu>, 2001-2003.
+# László Kiss <kissl@eptan.efe.hu>, 2000-2001;
+# Szabolcs Horváth <horvaths@fi.inf.elte.hu>, 2001-2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.4i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2003-08-01 13:56+0000\n"
-"Last-Translator: Szabolcs Horváth <horvaths@fi.inf.elte.hu>\n"
+"Last-Translator: Szabolcs Horváth <horvaths@fi.inf.elte.hu>\n"
 "Language-Team: LME Magyaritasok Lista <magyar@lists.linux.hu>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Alap billentyûkombinációk:\n"
+"Alap billentyűkombinációk:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"Billentyûkombináció nélküli parancsok:\n"
+"Billentyűkombináció nélküli parancsok:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Aláírt adat vége --]\n"
+"[-- Aláírt adat vége --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -67,56 +67,56 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"használat:\n"
-"     mutt [ -nRyzZ ] [ -e <par.> ] [ -F <fájl> ] [ -m <típus> ] [ -f "
-"<fájl> ]\n"
-"     mutt [ -nR ] [ -e <par.> ] [ -F <fájl> ] -Q <kérd.> [ -Q <kérd.> ] "
+"használat:\n"
+"     mutt [ -nRyzZ ] [ -e <par.> ] [ -F <fájl> ] [ -m <típus> ] [ -f "
+"<fájl> ]\n"
+"     mutt [ -nR ] [ -e <par.> ] [ -F <fájl> ] -Q <kérd.> [ -Q <kérd.> ] "
 "[...]\n"
-"     mutt [ -nR ] [ -e <par.> ] [ -F <fájl> ] -A <álnév> [ -A <álnév> ] "
+"     mutt [ -nR ] [ -e <par.> ] [ -F <fájl> ] -A <álnév> [ -A <álnév> ] "
 "[...]\n"
-"     mutt [ -nx ] [ -e <par.> ] [ -a <fájl> ] [ -F <fájl> ] [ -H <fájl> ]\n"
-"\t[ -i <fájl> ] [ -s <tárgy> ] [ -b <címek> ] [ -c <címek> ] <címek>\n"
+"     mutt [ -nx ] [ -e <par.> ] [ -a <fájl> ] [ -F <fájl> ] [ -H <fájl> ]\n"
+"\t[ -i <fájl> ] [ -s <tárgy> ] [ -b <címek> ] [ -c <címek> ] <címek>\n"
 "\t[ ... ]\n"
-"     mutt [ -n ] [ -e <par.> ] [ -F <fájl> ] -p\n"
+"     mutt [ -n ] [ -e <par.> ] [ -F <fájl> ] -p\n"
 "     mutt -v[v]\n"
 "\n"
-"paraméterek:\n"
-"  -A <álnév>\trövid név kifejtése\n"
-"  -a <fájl>\tfájl csatolása a levélhez\n"
-"  -b <cím>\trejtett másolatot (BCC) küld a megadott címre\n"
-"  -c <cím>\tmásolatot (CC) küld a megadott címre\n"
-"  -e <parancs>\tmegadott parancs végrehajtása inicializálás után\n"
-"  -f <fájl>\tbetöltendõ levelesláda megadása\n"
-"  -F <fájl>\talternatív muttrc fájl használata\n"
-"  -H <fájl>\tvázlat (draft) fájl megadása, amibõl a fejlécet és\n"
-"\t\ta törzset kell beolvasni\n"
-"  -i <fájl>\tválasz esetén a Mutt beleteszi ezt a fájlt a válaszba\n"
-"  -m <típus>\taz alapértelmezett postafiók típusának megadása\n"
-"  -n\t\ta Mutt nem fogja beolvasni a rendszerre vonatkozó Muttrc-t\n"
-"  -p\t\telhalasztott levél visszahívása\n"
-"  -Q <változó>\tkonfigurációs beállítása lekérdezése\n"
-"  -R\t\tpostafiók megnyitása csak olvasható módban\n"
-"  -s <tárgy>\ttárgy megadása (idézõjelek közé kell tenni, ha van benne "
-"szóköz)\n"
-"  -v\t\tverziószám és fordítási opciók mutatása\n"
-"  -x\t\tmailx küldés szimulálása\n"
-"  -y\t\tpostafiók megadása a `mailboxes' listából\n"
-"  -z\t\tkilép rögtön, ha nincs új levél a postafiókban\n"
-"  -Z\t\tmegnyitja az elsõ olyan postafiókot, amiben új levél van (ha nincs, "
-"kilép)\n"
-"  -h\t\tkiírja ezt az üzenetet"
-
-#: compose.c:152 compose.c:156
+"paraméterek:\n"
+"  -A <álnév>\trövid név kifejtése\n"
+"  -a <fájl>\tfájl csatolása a levélhez\n"
+"  -b <cím>\trejtett másolatot (BCC) küld a megadott címre\n"
+"  -c <cím>\tmásolatot (CC) küld a megadott címre\n"
+"  -e <parancs>\tmegadott parancs végrehajtása inicializálás után\n"
+"  -f <fájl>\tbetöltendő levelesláda megadása\n"
+"  -F <fájl>\talternatív muttrc fájl használata\n"
+"  -H <fájl>\tvázlat (draft) fájl megadása, amiből a fejlécet és\n"
+"\t\ta törzset kell beolvasni\n"
+"  -i <fájl>\tválasz esetén a Mutt beleteszi ezt a fájlt a válaszba\n"
+"  -m <típus>\taz alapértelmezett postafiók típusának megadása\n"
+"  -n\t\ta Mutt nem fogja beolvasni a rendszerre vonatkozó Muttrc-t\n"
+"  -p\t\telhalasztott levél visszahívása\n"
+"  -Q <változó>\tkonfigurációs beállítása lekérdezése\n"
+"  -R\t\tpostafiók megnyitása csak olvasható módban\n"
+"  -s <tárgy>\ttárgy megadása (idézőjelek közé kell tenni, ha van benne "
+"szóköz)\n"
+"  -v\t\tverziószám és fordítási opciók mutatása\n"
+"  -x\t\tmailx küldés szimulálása\n"
+"  -y\t\tpostafiók megadása a `mailboxes' listából\n"
+"  -z\t\tkilép rögtön, ha nincs új levél a postafiókban\n"
+"  -Z\t\tmegnyitja az első olyan postafiókot, amiben új levél van (ha nincs, "
+"kilép)\n"
+"  -h\t\tkiírja ezt az üzenetet"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " aláír mint: "
+msgstr " aláír mint: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
-msgstr "     vége: %s"
+msgstr "     vége: %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   kezdete: %s"
@@ -159,140 +159,140 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' lista): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
-msgstr "(tovább)\n"
+msgstr "(tovább)\n"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Nyomd meg a '%s' gombot az írás ki/bekapcsolásához"
+msgstr " Nyomd meg a '%s' gombot az írás ki/bekapcsolásához"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " ebben a szûkített megjelenítésben"
+msgstr " ebben a szűkített megjelenítésben"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " kijelölt"
+msgstr " kijelölt"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: érvénytelen parancs"
+msgstr "%c: érvénytelen parancs"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: nincs támogatva ebben a módban"
+msgstr "%c: nincs támogatva ebben a módban"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d megtartva, %d törölve."
+msgstr "%d megtartva, %d törölve."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d megtartva, %d átmozgatva, %d törölve."
+msgstr "%d megtartva, %d átmozgatva, %d törölve."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Valóban szeretnéd használni ezt a kulcsot?"
+msgstr "%s Valóban szeretnéd használni ezt a kulcsot?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] módosítva. Frissítsük a kódolást?"
+msgstr "%s [#%d] módosítva. Frissítsük a kódolást?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] tovább nem létezik!"
+msgstr "%s [#%d] tovább nem létezik!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d/%d levél beolvasva]"
+msgstr "%s [%d/%d levél beolvasva]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s nem létezik. Létrehozzam?"
+msgstr "%s nem létezik. Létrehozzam?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s érvénytelen IMAP útvonal"
+msgstr "%s érvénytelen IMAP útvonal"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s érvénytelen POP útvonal"
+msgstr "%s érvénytelen POP útvonal"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s érvénytelen POP útvonal"
+msgstr "%s érvénytelen POP útvonal"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s érvénytelen POP útvonal"
+msgstr "%s érvénytelen POP útvonal"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "A(z) %s nem könyvtár."
+msgstr "A(z) %s nem könyvtár."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "A %s nem postafiók!"
+msgstr "A %s nem postafiók!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "A(z) %s nem egy postafiók."
+msgstr "A(z) %s nem egy postafiók."
 
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s nem egy hagyományos fájl."
+msgstr "%s nem egy hagyományos fájl."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s többé nem létezik!"
+msgstr "%s többé nem létezik!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -306,140 +306,140 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
-msgstr "%s: ismeretlen típus"
+msgstr "%s: ismeretlen típus"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: a terminál által nem támogatott szín"
+msgstr "%s: a terminál által nem támogatott szín"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: a parancs csak index objektumra érvényes"
+msgstr "%s: a parancs csak index objektumra érvényes"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: nincs ilyen attribútum"
+msgstr "%s: nincs ilyen attribútum"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: nincs ilyen szín"
+msgstr "%s: nincs ilyen szín"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
-msgstr "%s: nincs ilyen funkció"
+msgstr "%s: nincs ilyen funkció"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: ismeretlen funkció"
+msgstr "%s: ismeretlen funkció"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: nincs ilyen menü"
+msgstr "%s: nincs ilyen menü"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: nincs ilyen objektum"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: túl kevés paraméter"
+msgstr "%s: túl kevés paraméter"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: nem lehet csatolni a fájlt"
+msgstr "%s: nem lehet csatolni a fájlt"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: nem tudom csatolni a fájlt.\n"
+msgstr "%s: nem tudom csatolni a fájlt.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: ismeretlen parancs"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: ismeretlen típus"
+msgstr "%s: ismeretlen típus"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: ismeretlen változó"
+msgstr "%s: ismeretlen változó"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s érvénytelen POP útvonal"
+msgstr "%s érvénytelen POP útvonal"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s érvénytelen POP útvonal"
+msgstr "%s érvénytelen POP útvonal"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(a mellélet megtekintéshez billentyû lenyomás szükséges!)"
+msgstr "(a mellélet megtekintéshez billentyű lenyomás szükséges!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(nincs postafiók)"
+msgstr "(nincs postafiók)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(v)isszautasít, (e)gyszer elfogad"
+msgstr "(v)isszautasít, (e)gyszer elfogad"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(v)isszautasít, (e)gyszer elfogad, (m)indig elfogad"
+msgstr "(v)isszautasít, (e)gyszer elfogad, (m)indig elfogad"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(mérete %s bájt)"
+msgstr "(mérete %s bájt)"
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(E rész megjelenítéséhez használja a(z) '%s'-t)"
+msgstr "(E rész megjelenítéséhez használja a(z) '%s'-t)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- Mellékletek"
+msgstr "-- Mellékletek"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<ISMERETLEN>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<alapeset>"
 
@@ -453,122 +453,114 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "APOP azonosítás sikertelen."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Mégse"
+msgstr "APOP azonosítás sikertelen."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Megszakítod a nem módosított levelet?"
+msgstr "Megszakítod a nem módosított levelet?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Nem módosított levelet megszakítottam."
+msgstr "Nem módosított levelet megszakítottam."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "Cím: "
+msgstr "Cím: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Cím bejegyezve."
+msgstr "Cím bejegyezve."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Álnév: "
+msgstr "Álnév: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "Címjegyzék"
+msgstr "Címjegyzék"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Minden illeszkedõ kulcs lejárt/letiltott/visszavont."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Hozzáfûzés"
+msgstr "Minden illeszkedő kulcs lejárt/letiltott/visszavont."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Levelek hozzáfûzése %s postafiókhoz?"
+msgstr "Levelek hozzáfűzése %s postafiókhoz?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "A paraméternek levélszámnak kell lennie."
+msgstr "A paraméternek levélszámnak kell lennie."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "A melléklet elmentve."
+msgstr "A melléklet elmentve."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "Fájl csatolás"
+msgstr "Fájl csatolás"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "A kiválasztott fájlok csatolása..."
+msgstr "A kiválasztott fájlok csatolása..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "Melléklet szûrve."
+msgstr "Melléklet szűrve."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "A melléklet elmentve."
+msgstr "A melléklet elmentve."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "Mellékletek"
+msgstr "Mellékletek"
 
 #: imap/auth.c:83
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
-msgstr "Azonosítás (APOP)..."
+msgstr "Azonosítás (APOP)..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "Azonosítás (APOP)..."
+msgstr "Azonosítás (APOP)..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "Azonosítás (SASL)..."
+msgstr "Azonosítás (SASL)..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "Azonosítás (SASL)..."
+msgstr "Azonosítás (SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -577,50 +569,50 @@ msgstr ""
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "Hibás IDN \"%s\"."
+msgstr "Hibás IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "Hibás IDN %s a resent-from mezõ elõkészítésekor"
+msgstr "Hibás IDN %s a resent-from mező előkészítésekor"
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "Hibás IDN \"%s\": '%s'"
+msgstr "Hibás IDN \"%s\": '%s'"
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "Hibás IDN: '%s'"
+msgstr "Hibás IDN: '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "Hibás postafiók név"
+msgstr "Hibás postafiók név"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "Ez az üzenet vége."
+msgstr "Ez az üzenet vége."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Levél visszaküldése %s részére"
+msgstr "Levél visszaküldése %s részére"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Levél visszaküldése. Címzett: "
+msgstr "Levél visszaküldése. Címzett: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Levél visszaküldése %s részére"
+msgstr "Levél visszaküldése %s részére"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Kijelölt levelek visszaküldése. Címzett: "
+msgstr "Kijelölt levelek visszaküldése. Címzett: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -635,61 +627,61 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Nem lehet hozzáfûzni a(z) %s postafiókhoz"
+msgstr "Nem lehet hozzáfűzni a(z) %s postafiókhoz"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Könyvtár nem csatolható!"
+msgstr "Könyvtár nem csatolható!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "Nem tudom létrehozni %s: %s."
+msgstr "Nem tudom létrehozni %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "Nem lehet a(z) %s fájlt létrehozni"
+msgstr "Nem lehet a(z) %s fájlt létrehozni"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Szûrõt nem lehet létrehozni"
+msgstr "Szűrőt nem lehet létrehozni"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "Szûrõfolyamatot nem lehet létrehozni"
+msgstr "Szűrőfolyamatot nem lehet létrehozni"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Nem lehet ideiglenes fájlt létrehozni"
+msgstr "Nem lehet ideiglenes fájlt létrehozni"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Nem tudom az összes kijelölt mellékletet visszaalakítani.  A többit MIME-"
-"kódolod?"
+"Nem tudom az összes kijelölt mellékletet visszaalakítani.  A többit MIME-"
+"kódolod?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Nem lehet kibontani minden kijelölt mellékletet. A többit MIME kódolva "
-"küldöd?"
+"Nem lehet kibontani minden kijelölt mellékletet. A többit MIME kódolva "
+"küldöd?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "Nem tudtam visszafejteni a titkosított üzenetet!"
+msgstr "Nem tudtam visszafejteni a titkosított üzenetet!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "POP kiszolgálón nem lehet mellékletet törölni."
+msgstr "POP kiszolgálón nem lehet mellékletet törölni."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "POP kiszolgálón nem lehet mellékletet törölni."
+msgstr "POP kiszolgálón nem lehet mellékletet törölni."
 
 #: lib-mx/mx.c:103
 #, c-format
@@ -702,278 +694,262 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Nem található egyetlen kijelölt levél sem."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Nem lehet beolvasni a mixmaster type2.list-jét!"
+msgstr "Nem található egyetlen kijelölt levél sem."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Nem felel meg a névmintának, tovább?"
+msgstr "Nem felel meg a névmintának, tovább?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "A(z) %s levélfájl üres"
+msgstr "A(z) %s levélfájl üres"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Nem lehet hozzáfûzni a(z) %s postafiókhoz"
+msgstr "Nem lehet hozzáfűzni a(z) %s postafiókhoz"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "%s kapcsolat lezárva"
+msgstr "%s kapcsolat lezárva"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "POP kapcsolat lezárása..."
+msgstr "POP kapcsolat lezárása..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "%s nem olvasható: %s"
+msgstr "%s nem olvasható: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "Nem tudom létrehozni %s: %s."
+msgstr "Nem tudom létrehozni %s: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Levelet nem lehet menteni POP postafiókba."
+msgstr "Levelet nem lehet menteni POP postafiókba."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "A POP kiszolgálón nem lehet szerkeszteni a levelet."
+msgstr "A POP kiszolgálón nem lehet szerkeszteni a levelet."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "%s nem olvasható: %s"
+msgstr "%s nem olvasható: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "A könyvtár nem jeleníthetõ meg"
+msgstr "A könyvtár nem jeleníthető meg"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "Nem tudtam létrehozni: %s."
+msgstr "Nem tudtam létrehozni: %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Nem lehet írni az ideiglenes fájlba!"
+msgstr "Nem lehet írni az ideiglenes fájlba!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Nem lehet írni a levelet"
+msgstr "Nem lehet írni a levelet"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Nem lehet a levelet beleírni az ideiglenes fájlba!"
+msgstr "Nem lehet a levelet beleírni az ideiglenes fájlba!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Nem lehet megjelenítõ szûrõt létrehozni."
+msgstr "Nem lehet megjelenítő szűrőt létrehozni."
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Nem lehet szûrõt létrehozni."
+msgstr "Nem lehet szűrőt létrehozni."
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "A csak olvasható postafiókba nem lehet írni!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "A csak olvasható postafiókba nem lehet írni!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "%s-t kaptam...  Kilépek.\n"
+msgstr "%s-t kaptam...  Kilépek.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "A szerver tanúsítványa még nem érvényes"
+msgstr "A szerver tanúsítványa még nem érvényes"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "A tanúsítvány elmentve"
+msgstr "A tanúsítvány elmentve"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
 msgstr ""
-"A postafiók módosításai a postafiókból történõ kilépéskor lesznek elmentve."
+"A postafiók módosításai a postafiókból történő kilépéskor lesznek elmentve."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "A postafiók módosításai nem lesznek elmentve."
+msgstr "A postafiók módosításai nem lesznek elmentve."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr "Karakter = %s, Oktális = %o, Decimális = %d"
+msgstr "Karakter = %s, Oktális = %o, Decimális = %d"
 
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Karakterkészlet beállítva: %s; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Könyvtárváltás"
+msgstr "Karakterkészlet beállítva: %s; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "Könyvtár: "
+msgstr "Könyvtár: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "Új levelek letöltése..."
-
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Kulcs ellenõrzése  "
+msgstr "Új levelek letöltése..."
 
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "Új levelek letöltése..."
+msgstr "Új levelek letöltése..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "Új levelek letöltése..."
+msgstr "Új levelek letöltése..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Nincs"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Jelzõ törlése"
+msgstr "Jelző törlése"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "%s kapcsolat lezárása..."
+msgstr "%s kapcsolat lezárása..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "POP kapcsolat lezárása..."
+msgstr "POP kapcsolat lezárása..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "Kapcsolódás %s-hez..."
+msgstr "Kapcsolódás %s-hez..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "A TOP parancsot nem támogatja a szerver."
+msgstr "A TOP parancsot nem támogatja a szerver."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Az UIDL parancsot nem támogatja a szerver."
+msgstr "Az UIDL parancsot nem támogatja a szerver."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "Változások mentése..."
+msgstr "Változások mentése..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Fordítási opciók:"
+"Fordítási opciók:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Keresési minta fordítása..."
+msgstr "Keresési minta fordítása..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "Másolás a(z) %s-ba..."
+msgstr "Másolás a(z) %s-ba..."
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "Másolás a(z) %s-ba..."
+msgstr "Másolás a(z) %s-ba..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "Kapcsolódás %s-hez..."
+msgstr "Kapcsolódás %s-hez..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "Kapcsolódás %s-hez..."
+msgstr "Kapcsolódás %s-hez..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "Kapcsolódás %s-hez..."
+msgstr "Kapcsolódás %s-hez..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "A kapcsolatot elveszett. Újracsatlakozik a POP kiszolgálóhoz?"
+msgstr "A kapcsolatot elveszett. Újracsatlakozik a POP kiszolgálóhoz?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "A kapcsolatot elveszett. Újracsatlakozik a POP kiszolgálóhoz?"
+msgstr "A kapcsolatot elveszett. Újracsatlakozik a POP kiszolgálóhoz?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "%s kapcsolat lezárva"
+msgstr "%s kapcsolat lezárva"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "%s kapcsolat lezárva"
+msgstr "%s kapcsolat lezárva"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Tartalom-típus megváltoztatva %s-ra."
+msgstr "Tartalom-típus megváltoztatva %s-ra."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "A tartalom-típus alap-/altípus formájú."
+msgstr "A tartalom-típus alap-/altípus formájú."
 
 #: imap/util.c:135
 msgid "Continue?"
@@ -982,27 +958,27 @@ msgstr "Folytatod?"
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "Átalakítsam %s formátumra küldéskor?"
+msgstr "Átalakítsam %s formátumra küldéskor?"
 
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "Másolás%s postafiókba"
+msgstr "Másolás%s postafiókba"
 
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "%d levél másolása a %s postafiókba..."
+msgstr "%d levél másolása a %s postafiókba..."
 
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "%d levél másolása %s-ba ..."
+msgstr "%d levél másolása %s-ba ..."
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "Másolás a(z) %s-ba..."
+msgstr "Másolás a(z) %s-ba..."
 
 #: main.c:63
 msgid ""
@@ -1022,48 +998,48 @@ msgstr ""
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "A levelet nem tudtam másolni"
+msgstr "A levelet nem tudtam másolni"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Nem lehet átmeneti fájlt létrehozni!"
+msgstr "Nem lehet átmeneti fájlt létrehozni!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Nem lehet átmeneti fájlt létrehozni!"
+msgstr "Nem lehet átmeneti fájlt létrehozni!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Nincs meg a rendezõ függvény! [kérlek jelentsd ezt a hibát]"
+msgstr "Nincs meg a rendező függvény! [kérlek jelentsd ezt a hibát]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "A \"%s\" host nem található."
+msgstr "A \"%s\" host nem található."
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Nem tudtam az összes kért levelet beilleszteni!"
+msgstr "Nem tudtam az összes kért levelet beilleszteni!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "Nem lehetett megtárgyalni a TLS kapcsolatot"
+msgstr "Nem lehetett megtárgyalni a TLS kapcsolatot"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "%s nem nyitható meg"
+msgstr "%s nem nyitható meg"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Nem lehetett újra megnyitni a postafiókot!"
+msgstr "Nem lehetett újra megnyitni a postafiókot!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Nem tudtam a levelet elküldeni."
+msgstr "Nem tudtam a levelet elküldeni."
 
 #: lib-mx/mx.c:407
 #, c-format
@@ -1073,658 +1049,598 @@ msgstr "Nem lehet lockolni %s\n"
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "%s létrehozása?"
+msgstr "%s létrehozása?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Csak IMAP postafiókok létrehozása támogatott"
+msgstr "Csak IMAP postafiókok létrehozása támogatott"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Postafiók létrehozása: "
+msgstr "Postafiók létrehozása: "
 
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "Dekódolás-másolás%s postafiókba"
+msgstr "Dekódolás-másolás%s postafiókba"
 
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "Dekódolás-mentés%s postafiókba"
+msgstr "Dekódolás-mentés%s postafiókba"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "%s választása..."
+msgstr "%s választása..."
 
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Visszafejtés-másolás%s postafiókba"
+msgstr "Visszafejtés-másolás%s postafiókba"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "Visszafejtés-mentés%s postafiókba"
+msgstr "Visszafejtés-mentés%s postafiókba"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
-msgstr "Levél letöltése..."
+msgstr "Levél letöltése..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Visszafejtés sikertelen."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Töröl"
+msgstr "Visszafejtés sikertelen."
 
-#: remailer.c:433
-msgid "Delete"
-msgstr "Törlés"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Csak IMAP postafiókok törlése támogatott"
+msgstr "Csak IMAP postafiókok törlése támogatott"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "Levelek törlése a szerverrõl?"
+msgstr "Levelek törlése a szerverről?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "A mintára illeszkedõ levelek törlése: "
+msgstr "A mintára illeszkedő levelek törlése: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "Törlés"
+msgstr "Törlés"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Mellékletek törlése kódolt üzenetbõl nem támogatott."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Leírás"
+msgstr "Mellékletek törlése kódolt üzenetből nem támogatott."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "ID %s ellenõrizetlen. Szeretnéd használni a következõhöz: %s ?"
+msgstr "ID %s ellenőrizetlen. Szeretnéd használni a következőhöz: %s ?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s nem létezik. Létrehozzam?"
+msgstr "%s nem létezik. Létrehozzam?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Könyvtár [%s], Fájlmaszk: %s"
+msgstr "Könyvtár [%s], Fájlmaszk: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "HIBA: kérlek jelezd ezt a hibát a fejlesztõknek"
+msgstr "HIBA: kérlek jelezd ezt a hibát a fejlesztőknek"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "Továbbított levél szerkesztése?"
+msgstr "Továbbított levél szerkesztése?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "hiba a kifejezésben"
+msgstr "hiba a kifejezésben"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Titkosít"
+msgstr "Titkosít"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "Titkosítás: "
+msgstr "Titkosítás: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Add meg a kulcsID-t: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Add meg a kulcsID-t %s-hoz: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "Add meg a kulcsokat (^G megszakítás): "
+msgstr "Add meg a kulcsokat (^G megszakítás): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "Hiba a levél újraküldésekor."
+msgstr "Hiba a levél újraküldésekor."
 
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "Hiba a levelek újraküldésekor."
+msgstr "Hiba a levelek újraküldésekor."
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "Hiba a levél elküldésekor."
+msgstr "Hiba a levél elküldésekor."
 
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "Hiba a szerverre való csatlakozás közben: %s"
+msgstr "Hiba a szerverre való csatlakozás közben: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Hiba a szerverre való csatlakozás közben: %s"
+msgstr "Hiba a szerverre való csatlakozás közben: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Hiba a %s-ban, sor %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Hibás parancssor: %s\n"
+msgstr "Hibás parancssor: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "Hiba a kifejezésben: %s"
+msgstr "Hiba a kifejezésben: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "Hiba a terminál inicializálásakor."
+msgstr "Hiba a terminál inicializálásakor."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "Hiba a terminál inicializálásakor."
+msgstr "Hiba a terminál inicializálásakor."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "Hiba a postafiók megnyitásaor"
+msgstr "Hiba a postafiók megnyitásaor"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "Hibás cím!"
+msgstr "Hibás cím!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Hiba a(z) \"%s\" futtatásakor!"
+msgstr "Hiba a(z) \"%s\" futtatásakor!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Hiba a könyvtár beolvasásakor."
+msgstr "Hiba a könyvtár beolvasásakor."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Hiba a levél elküldése közben, a gyermek folyamat kilépett: %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Hiba a levél elküldésekor, a gyermek folyamat kilépett: %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Hiba a levél elküldésekor."
+msgstr "Hiba a levél elküldése közben, a gyermek folyamat kilépett: %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "Hiba a %s kapcsolat közben (%s)"
+msgstr "Hiba a %s kapcsolat közben (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "Hiba a fájl megjelenítéskor"
+msgstr "Hiba a fájl megjelenítéskor"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "Hiba a postafiók írásakor!"
+msgstr "Hiba a postafiók írásakor!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Hiba a(z) %s ideiglenes fájl mentésekor"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Hiba: %s-t nem lehet használni a lánc utolsó újraküldõjeként."
+msgstr "Hiba a(z) %s ideiglenes fájl mentésekor"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "Hiba: '%s' hibás IDN."
+msgstr "Hiba: '%s' hibás IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "Hiba: a többrészes/kódolt rész protokoll paramétere hiányzik!"
+msgstr "Hiba: a többrészes/kódolt rész protokoll paramétere hiányzik!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "Hiba: a többrészes/aláírt részhez nincs protokoll megadva."
+msgstr "Hiba: a többrészes/aláírt részhez nincs protokoll megadva."
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Hibás parancssor: %s\n"
+msgstr "Hibás parancssor: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Levélfejlécek letöltése... [%d/%d]"
+msgstr "Levélfejlécek letöltése... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Parancs végrehajtása az egyezõ leveleken..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Kilép"
+msgstr "Parancs végrehajtása az egyező leveleken..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Kilép  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Kilépsz a Muttból mentés nélül?"
+msgstr "Kilépsz a Muttból mentés nélül?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Kilépsz a Mutt-ból?"
+msgstr "Kilépsz a Mutt-ból?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "Sikertelen törlés"
+msgstr "Sikertelen törlés"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Levelek törlése a szerverrõl..."
+msgstr "Levelek törlése a szerverről..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Fájl megnyitási hiba a fejléc vizsgálatakor."
+msgstr "Fájl megnyitási hiba a fejléc vizsgálatakor."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Fájl megnyitási hiba a fejléc eltávolításkor."
+msgstr "Fájl megnyitási hiba a fejléc eltávolításkor."
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Fájl megnyitási hiba a fejléc vizsgálatakor."
+msgstr "Fájl megnyitási hiba a fejléc vizsgálatakor."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Végzetes hiba!  A postafiókot nem lehet újra megnyitni!"
+msgstr "Végzetes hiba!  A postafiókot nem lehet újra megnyitni!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Végzetes hiba.  Az üzenetszámláló nincs szinkronban."
+msgstr "Végzetes hiba.  Az üzenetszámláló nincs szinkronban."
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "Levelek törlése a szerverrõl..."
+msgstr "Levelek törlése a szerverről..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "Levél letöltése..."
+msgstr "Levél letöltése..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Üzenetek listájának letöltése..."
+msgstr "Üzenetek listájának letöltése..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "Üzenetek listájának letöltése..."
+msgstr "Üzenetek listájának letöltése..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Levélfejlécek letöltése... [%d/%d]"
+msgstr "Levélfejlécek letöltése... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Levélfejlécek letöltése... [%d/%d]"
+msgstr "Levélfejlécek letöltése... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "Levél letöltése..."
+msgstr "Levél letöltése..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Fájlmaszk: "
+msgstr "Fájlmaszk: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "A fájl létezik, (f)elülírjam, (h)ozzáfûzzem, vagy (m)égsem?"
+msgstr "A fájl létezik, (f)elülírjam, (h)ozzáfűzzem, vagy (m)égsem?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "A fájl egy könyvtár, elmentsem ebbe a könyvtárba?"
+msgstr "A fájl egy könyvtár, elmentsem ebbe a könyvtárba?"
 
 #: muttlib.c:226
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "A fájl egy könyvtár, elmentsem ebbe a könyvtárba?"
+msgstr "A fájl egy könyvtár, elmentsem ebbe a könyvtárba?"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "Könyvtárbeli fájlok: "
+msgstr "Könyvtárbeli fájlok: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "Szûrõn keresztül: "
+msgstr "Szűrőn keresztül: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Ujjlenyomat: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "üzenet elmentése késõbbi küldéshez"
+msgstr "üzenet elmentése későbbi küldéshez"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "Válasz a %s%s címre?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Válasz a %s%s címre?"
+msgstr "Válasz a %s%s címre?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Továbbküldés MIME kódolással?"
+msgstr "Továbbküldés MIME kódolással?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "Továbbítás mellékletként?"
+msgstr "Továbbítás mellékletként?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "Továbbítás mellékletként?"
+msgstr "Továbbítás mellékletként?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "A funkció levél-csatolás módban le van tiltva."
+msgstr "A funkció levél-csatolás módban le van tiltva."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "Postafiókok listájának letöltése..."
+msgstr "Postafiókok listájának letöltése..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "Névterek letöltése..."
+msgstr "Névterek letöltése..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Csoport"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Súgó"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "Súgó: %s"
+msgstr "Súgó: %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "A súgó már meg van jelenítve."
+msgstr "A súgó már meg van jelenítve."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
 msgstr "Nem ismert, hogy ezt hogyan kell kinyomtatni!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Nem tudom hogyan kell nyomtatni a(z) %s csatolást!"
+msgstr "Nem tudom hogyan kell nyomtatni a(z) %s csatolást!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "ID-nek nincs meghatározva az érvényessége."
+msgstr "ID-nek nincs meghatározva az érvényessége."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "ID lejárt/letiltott/visszavont."
+msgstr "ID lejárt/letiltott/visszavont."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "Az ID nem érvényes."
+msgstr "Az ID nem érvényes."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "Az ID csak részlegesen érvényes."
+msgstr "Az ID csak részlegesen érvényes."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Érvénytelen PGP fejléc"
+msgstr "Érvénytelen PGP fejléc"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "Érvénytelen S/MIME fejléc"
+msgstr "Érvénytelen S/MIME fejléc"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr ""
-"Nem megfelelõen formázott bejegyzés a(z) %s típushoz a(z) \"%s\" fájl %d. "
-"sorában"
+"Nem megfelelően formázott bejegyzés a(z) %s típushoz a(z) \"%s\" fájl %d. "
+"sorában"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Levél beillesztése a válaszba?"
+msgstr "Levél beillesztése a válaszba?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "Idézett levél beillesztése..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "Beszúrás"
+msgstr "Idézett levél beillesztése..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Érvénytelen a hónap napja: %s"
+msgstr "Érvénytelen a hónap napja: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Érvénytelen kódolás."
+msgstr "Érvénytelen kódolás."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Érvénytelen indexszám."
+msgstr "Érvénytelen indexszám."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Érvénytelen levélszám."
+msgstr "Érvénytelen levélszám."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Érvénytelen hónap: %s"
+msgstr "Érvénytelen hónap: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "Érvénytelen viszonylagos hónap: %s"
+msgstr "Érvénytelen viszonylagos hónap: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "PGP betöltés..."
+msgstr "PGP betöltés..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "PGP betöltés..."
+msgstr "PGP betöltés..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Megjelenítõ parancs indítása: %s"
+msgstr "Megjelenítő parancs indítása: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Levélre ugrás: "
+msgstr "Levélre ugrás: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Ugrás: "
+msgstr "Ugrás: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Az ugrás funkció nincs megírva ehhez a menühöz."
+msgstr "Az ugrás funkció nincs megírva ehhez a menühöz."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Kulcs ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "A billentyûhöz nincs funkció rendelve."
+msgstr "A billentyűhöz nincs funkció rendelve."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "A billentyûhöz nincs funkció rendelve. A súgóhoz nyomd meg a '%s'-t."
+msgstr "A billentyűhöz nincs funkció rendelve. A súgóhoz nyomd meg a '%s'-t."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Minta a levelek szûkítéséhez: "
+msgstr "Minta a levelek szűkítéséhez: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "Szûkítés: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Szűkítés: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "Bejelentkezés..."
+msgstr "Bejelentkezés..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1732,154 +1648,142 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "A lock számláló túlhaladt, eltávolítsam a(z) %s lockfájlt?"
+msgstr "A lock számláló túlhaladt, eltávolítsam a(z) %s lockfájlt?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "Bejelentkezés..."
+msgstr "Bejelentkezés..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "Sikertelen bejelentkezés."
+msgstr "Sikertelen bejelentkezés."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Egyezõ \"%s\" kulcsok keresése..."
+msgstr "Egyező \"%s\" kulcsok keresése..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "%s feloldása..."
+msgstr "%s feloldása..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Ujjlenyomat: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "A MIME típus nincs definiálva. A melléklet nem jeleníthetõ meg."
+msgstr "A MIME típus nincs definiálva. A melléklet nem jeleníthető meg."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Végtelen ciklus a makróban."
+msgstr "Végtelen ciklus a makróban."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Levél"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "A levél nem lett elküldve."
+msgstr "A levél nem lett elküldve."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "Levél elküldve."
+msgstr "Levél elküldve."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "A postafiók ellenõrizve."
+msgstr "A postafiók ellenőrizve."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Postafiók lezárva"
+msgstr "Postafiók lezárva"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Postafiók létrehozva."
+msgstr "Postafiók létrehozva."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Postafiók törölve."
+msgstr "Postafiók törölve."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "A postafiók üres."
+msgstr "A postafiók üres."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "A postafiókot megjelöltem nem írhatónak. %s"
+msgstr "A postafiókot megjelöltem nem írhatónak. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "A postafiók csak olvasható."
+msgstr "A postafiók csak olvasható."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Postafiók változatlan."
+msgstr "Postafiók változatlan."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "A postafióknak nevet kell adni."
+msgstr "A postafióknak nevet kell adni."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "A postafiók nem lett törölve."
+msgstr "A postafiók nem lett törölve."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Postafiók létrehozva."
+msgstr "Postafiók létrehozva."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "A postafiók megsérült!"
+msgstr "A postafiók megsérült!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "A postafiókot más program módosította."
+msgstr "A postafiókot más program módosította."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "A postafiókot más program módosította. A jelzõk hibásak lehetnek."
+msgstr "A postafiókot más program módosította. A jelzők hibásak lehetnek."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Postafiókok [%d]"
+msgstr "Postafiókok [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "A mailcap-ba \"edit\" bejegyzés szükséges %%s"
+msgstr "A mailcap-ba \"edit\" bejegyzés szükséges %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "A mailcap-ba \"compose\" bejegyzés szükséges %%s"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Álnév"
+msgstr "A mailcap-ba \"compose\" bejegyzés szükséges %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "%d levél megjelölése töröltnek..."
+msgstr "%d levél megjelölése töröltnek..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Maszk"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Levél visszaküldve."
+msgstr "Levél visszaküldve."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1889,36 +1793,36 @@ msgstr "A levelet nem tudtam kinyomtatni"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "A levélfájl üres!"
+msgstr "A levélfájl üres!"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "A levél nem lett visszaküldve."
+msgstr "A levél nem lett visszaküldve."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "A levél nem lett módosítva!"
+msgstr "A levél nem lett módosítva!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "A nyitóüzenet nem látható a szûkített nézetben."
+msgstr "A nyitóüzenet nem látható a szűkített nézetben."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "A levél el lett halasztva."
+msgstr "A levél el lett halasztva."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "Levél kinyomtatva"
+msgstr "Levél kinyomtatva"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "Levél elmentve."
+msgstr "Levél elmentve."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Levél visszaküldve."
+msgstr "Levél visszaküldve."
 
 #: commands.c:393
 msgid "Messages could not be printed"
@@ -1926,554 +1830,488 @@ msgstr "A leveleket nem tudtam kinyomtatni"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "A levél nem lett visszaküldve."
+msgstr "A levél nem lett visszaküldve."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Levél kinyomtatva"
+msgstr "Levél kinyomtatva"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Hiányzó paraméter."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "A Mixmaster lánc maximálisan %d elembõl állhat."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "A Mixmaster nem fogadja el a Cc vagy a Bcc fejléceket."
+msgstr "Hiányzó paraméter."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Az olvasott leveleket mozgassam a %s postafiókba?"
+msgstr "Az olvasott leveleket mozgassam a %s postafiókba?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Olvasott levelek mozgatása a %s postafiókba..."
+msgstr "Olvasott levelek mozgatása a %s postafiókba..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Új lekérdezés"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "Az új fájl neve: "
+msgstr "Az új fájl neve: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "Új fájl: "
+msgstr "Új fájl: "
 
 #: buffy.cpkg:330
 msgid "New mail in "
-msgstr "Új levél: "
+msgstr "Új levél: "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Új levél érkezett a postafiókba."
+msgstr "Új levél érkezett a postafiókba."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Köv."
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "KövO"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "Egyetlen azonosító sem érhetõ el"
+msgstr "Egyetlen azonosító sem érhető el"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Nem található határoló paraméter! [jelentsd ezt a hibát]"
+msgstr "Nem található határoló paraméter! [jelentsd ezt a hibát]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "Nincsenek bejegyzések."
+msgstr "Nincsenek bejegyzések."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "Nincs a fájlmaszknak megfelelõ fájl"
+msgstr "Nincs a fájlmaszknak megfelelő fájl"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Nincs bejövõ postafiók megadva."
+msgstr "Nincs bejövő postafiók megadva."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "A szûrõ mintának nincs hatása."
+msgstr "A szűrő mintának nincs hatása."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Nincs megnyitott postafiók."
+msgstr "Nincs megnyitott postafiók."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Nincs új levél egyik postafiókban sem."
+msgstr "Nincs új levél egyik postafiókban sem."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
-"Nincs mailcap \"compose\" bejegyzés a(z) %s esetre, üres fájl létrehozása."
+"Nincs mailcap \"compose\" bejegyzés a(z) %s esetre, üres fájl létrehozása."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "Nincs \"edit\" bejegyzés a mailcap-ban a(z) %s esetre"
+msgstr "Nincs \"edit\" bejegyzés a mailcap-ban a(z) %s esetre"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "Nincs levelezõlista!"
+msgstr "Nincs levelezőlista!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "Nincs megfelelõ mailcap bejegyzés. Megjelenítés szövegként."
+msgstr "Nincs megfelelő mailcap bejegyzés. Megjelenítés szövegként."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Nincs levél ebben a postafiókban."
+msgstr "Nincs levél ebben a postafiókban."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "Nincs a kritériumnak megfelelõ levél."
+msgstr "Nincs a kritériumnak megfelelő levél."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "Nincs több idézett szöveg."
+msgstr "Nincs több idézett szöveg."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Nincs több téma."
+msgstr "Nincs több téma."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Nincs nem idézett szöveg az idézett szöveg után."
+msgstr "Nincs nem idézett szöveg az idézett szöveg után."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Nincs új levél a POP postafiókban."
+msgstr "Nincs új levél a POP postafiókban."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "Nincs új levél"
+msgstr "Nincs új levél"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Nincs tárgy megadva."
+msgstr "Nincs tárgy megadva."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "Nincs a fájlmaszknak megfelelõ fájl"
+msgstr "Nincs a fájlmaszknak megfelelő fájl"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Nincs új levél egyik postafiókban sem."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "Nincsenek elhalasztott levelek."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Nincs új levél egyik postafiókban sem."
-
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Nincs nyomtatási parancs megadva."
+msgstr "Nincs nyomtatási parancs megadva."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Nincs címzett megadva!"
+msgstr "Nincs címzett megadva!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Nincs címzett megadva.\n"
+msgstr "Nincs címzett megadva.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Nem volt címzett megadva."
+msgstr "Nem volt címzett megadva."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Nincs keresési minta."
+msgstr "Nincs keresési minta."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Nincs tárgy megadva."
+msgstr "Nincs tárgy megadva."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Nincs tárgy, megszakítsam a küldést?"
+msgstr "Nincs tárgy, megszakítsam a küldést?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Nincs tárgy megadva, megszakítod?"
+msgstr "Nincs tárgy megadva, megszakítod?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "Nincs tárgy megadva, megszakítom."
+msgstr "Nincs tárgy megadva, megszakítom."
 
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "Nincs ilyen postafiók"
+msgstr "Nincs ilyen postafiók"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "Nincsenek kijelölt bejegyzések."
+msgstr "Nincsenek kijelölt bejegyzések."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Nincs látható, kijeölt levél!"
+msgstr "Nincs látható, kijeölt levél!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Nincs kijelölt levél."
+msgstr "Nincs kijelölt levél."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Nincs visszaállított levél."
+msgstr "Nincs visszaállított levél."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Nincs olvasatlan levél"
+msgstr "Nincs olvasatlan levél"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "Nincs látható levél."
+msgstr "Nincs látható levél."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Nem elérhetõ ebben a menüben."
+msgstr "Nem elérhető ebben a menüben."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "Nem található."
+msgstr "Nem található."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
-msgstr "Kapcsolódás %s-hez..."
-
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
+msgstr "Kapcsolódás %s-hez..."
 
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Többrészes csatolásoknál csak a törlés támogatott."
+msgstr "Többrészes csatolásoknál csak a törlés támogatott."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Postafiók megnyitása"
+msgstr "Postafiók megnyitása"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Postafiók megnyitása csak olvasásra"
+msgstr "Postafiók megnyitása csak olvasásra"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Postafiók megnyitása levél csatolásához"
+msgstr "Postafiók megnyitása levél csatolásához"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Postafiók megnyitása csak olvasásra"
+msgstr "Postafiók megnyitása csak olvasásra"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Postafiók megnyitása levél csatolásához"
+msgstr "Postafiók megnyitása levél csatolásához"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "A kézbesítõ folyamat kimenete"
+msgstr "A kézbesítő folyamat kimenete"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
-"PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír, (b)eágyazott, mé"
+"PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír, (b)eágyazott, mé"
 "(g)se? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP már ki van jelölve. Törlés & folytatás ?"
+msgstr "PGP már ki van jelölve. Törlés & folytatás ?"
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP kulcsok egyeznek <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP kulcsok egyeznek <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "A PGP aláírást NEM tudtam ellenõrizni."
+msgstr "A PGP aláírást NEM tudtam ellenőrizni."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "A PGP aláírás sikeresen ellenõrizve."
+msgstr "A PGP aláírás sikeresen ellenőrizve."
 
 #: pop.c:1216
 msgid "POP host is not defined."
 msgstr "POP szerver nincs megadva."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "A nyitóüzenet nem áll rendelkezésre."
+msgstr "A nyitóüzenet nem áll rendelkezésre."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "A nyitóüzenet nem látható a szûkített nézetben."
+msgstr "A nyitóüzenet nem látható a szűkített nézetben."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s jelszava: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "Név: "
-
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Átküld"
+msgstr "Név: "
 
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Parancs, aminek továbbít: "
+msgstr "Parancs, aminek továbbít: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Átküld: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Kérlek állítsd be a hostname változót a megfelelõ értékre, ha mixmastert "
-"használsz!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "Átküld: "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Eltegyük a levelet késõbbre?"
+msgstr "Eltegyük a levelet későbbre?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Elhalasztott levelek"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "A \"preconnect\" parancs nem sikerült."
+msgstr "A \"preconnect\" parancs nem sikerült."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Továbbított levél elõkészítése..."
+msgstr "Továbbított levél előkészítése..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Nyomj le egy billentyût a folytatáshoz..."
+msgstr "Nyomj le egy billentyűt a folytatáshoz..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "ElõzõO"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Nyomtat"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Kinyomtassam a mellékletet?"
+msgstr "Kinyomtassam a mellékletet?"
 
 #: commands.c:383
 msgid "Print message?"
 msgstr "Kinyomtatod a levelet?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Kinyomtassam a kijelölt melléklet(ek)et?"
+msgstr "Kinyomtassam a kijelölt melléklet(ek)et?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Kinyomtatod a kijelölt leveleket?"
+msgstr "Kinyomtatod a kijelölt leveleket?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Töröljem a %d töröltnek jelölt levelet?"
+msgstr "Töröljem a %d töröltnek jelölt levelet?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Töröljem a %d töröltnek jelölt levelet?"
+msgstr "Töröljem a %d töröltnek jelölt levelet?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Lekérdezés"
+msgstr "Lekérdezés"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "'%s' lekérdezése"
+msgstr "'%s' lekérdezése"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "A lekérdezés parancs nincs megadva."
+msgstr "A lekérdezés parancs nincs megadva."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Lekérdezés: "
+msgstr "Lekérdezés: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Kilép"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Kilépsz a Muttból?"
+msgstr "Kilépsz a Muttból?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "Névterek letöltése..."
+msgstr "Névterek letöltése..."
 
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "%s olvasása..."
+msgstr "%s olvasása..."
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "%s olvasása... %d"
+msgstr "%s olvasása... %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "%s olvasása... %d (%d%%)"
+msgstr "%s olvasása... %d (%d%%)"
 
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "Új levelek olvasása (%d bytes)..."
+msgstr "Új levelek olvasása (%d bytes)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Valóban törli a \"%s\" postafiókot?"
+msgstr "Valóban törli a \"%s\" postafiókot?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Elhalasztott levél újrahívása?"
+msgstr "Elhalasztott levél újrahívása?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Az újrakódolás csak a szöveg mellékleteket érinti."
+msgstr "Az újrakódolás csak a szöveg mellékleteket érinti."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "SSL sikertelen: %s"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Csak IMAP postafiókok létrehozása támogatott"
+msgstr "Csak IMAP postafiókok létrehozása támogatott"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Postafiók létrehozása: "
+msgstr "Postafiók létrehozása: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "Átnevezés: "
+msgstr "Átnevezés: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Postafiók újra megnyitása..."
-
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Válasz"
+msgstr "Postafiók újra megnyitása..."
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "Válasz a %s%s címre?"
+msgstr "Válasz a %s%s címre?"
 
 #: commands.c:403
 #, fuzzy
@@ -2481,58 +2319,58 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Fordítva rendez Dátum/Feladó/érK/tárGy/Címzett/Téma/Rendetlen/Méret/"
-"Pontszám: "
+"Fordítva rendez Dátum/Feladó/érK/tárGy/Címzett/Téma/Rendetlen/Méret/"
+"Pontszám: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Keresés visszafelé: "
+msgstr "Keresés visszafelé: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Keresés visszafelé: "
+msgstr "Keresés visszafelé: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Fordított rendezés (d)átum, (n)év, (m)éret szerint vagy (r)endezetlen?"
+msgstr "Fordított rendezés (d)átum, (n)év, (m)éret szerint vagy (r)endezetlen?"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
-"PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír, (b)eágyazott, mé"
+"PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír, (b)eágyazott, mé"
 "(g)se? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME már ki van jelölve. Törlés & folytatás ?"
+msgstr "S/MIME már ki van jelölve. Törlés & folytatás ?"
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "Az S/MIME tanúsítvány tulajdonosa nem egyezik a küldõvel. "
+msgstr "Az S/MIME tanúsítvány tulajdonosa nem egyezik a küldővel. "
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME kulcsok egyeznek \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "Tartalom-útmutatás nélküli S/MIME üzenetek nem támogatottak."
+msgstr "Tartalom-útmutatás nélküli S/MIME üzenetek nem támogatottak."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "Az S/MIME aláírást NEM tudtam ellenõrizni."
+msgstr "Az S/MIME aláírást NEM tudtam ellenőrizni."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "S/MIME aláírás sikeresen ellenõrizve."
+msgstr "S/MIME aláírás sikeresen ellenőrizve."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "SASL azonosítás nem sikerült."
+msgstr "SASL azonosítás nem sikerült."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Ujjlenyomat: %s"
@@ -2540,137 +2378,113 @@ msgstr "Ujjlenyomat: %s"
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "SSL kapcsolódás a(z) %s használatával (%s)"
+msgstr "SSL kapcsolódás a(z) %s használatával (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Ment"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "Mented egy másolatát a levélnek?"
+msgstr "Mented egy másolatát a levélnek?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "Mentés fájlba: "
+msgstr "Mentés fájlba: "
 
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "Mentés%s postafiókba"
+msgstr "Mentés%s postafiókba"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "Állapotjelzõk mentése... [%d/%d]"
+msgstr "Állapotjelzők mentése... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "Mentés..."
-
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Keresés"
+msgstr "Mentés..."
 
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "Keresés: "
+msgstr "Keresés: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "A keresõ elérte a végét, és nem talált egyezést"
+msgstr "A kereső elérte a végét, és nem talált egyezést"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "A keresõ elérte az elejét, és nem talált egyezést"
+msgstr "A kereső elérte az elejét, és nem talált egyezést"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Keresés megszakítva."
+msgstr "Keresés megszakítva."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "A keresés nincs megírva ehhez a menühöz."
+msgstr "A keresés nincs megírva ehhez a menühöz."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Keresés a végétõl."
+msgstr "Keresés a végétől."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Keresés az elejétõl."
+msgstr "Keresés az elejétől."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "Keresés: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Választ"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Választ  "
+msgstr "Keresés: "
 
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Válaszd ki az újraküldõ láncot."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "%s választása..."
-
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Küld"
+msgstr "%s választása..."
 
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "Küldés a háttérben."
+msgstr "Küldés a háttérben."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "Levél elküldése..."
+msgstr "Levél elküldése..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "A szerver lezárta a kapcsolatot!"
+msgstr "A szerver lezárta a kapcsolatot!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Jelzõ beállítása"
+msgstr "Jelző beállítása"
 
 #: commands.c:463
 msgid "Shell command: "
 msgstr "Shell parancs: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "Aláír"
+msgstr "Aláír"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "Aláír mint: "
+msgstr "Aláír mint: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Aláír, Titkosít"
+msgstr "Aláír, Titkosít"
 
 #: commands.c:406
 #, fuzzy
@@ -2678,170 +2492,166 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Rendez Dátum/Feladó/érKezés/tárGy/Címzett/Téma/Rendezetlen/Méret/Pontszám: "
+"Rendez Dátum/Feladó/érKezés/tárGy/Címzett/Téma/Rendezetlen/Méret/Pontszám: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Rendezés (d)átum, (n)év, (m)éret szerint vagy (r)endezetlen?"
+msgstr "Rendezés (d)átum, (n)év, (m)éret szerint vagy (r)endezetlen?"
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Postafiók rendezése..."
+msgstr "Postafiók rendezése..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Kulcs ID: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Felírt [%s], Fájlmaszk: %s"
+msgstr "Felírt [%s], Fájlmaszk: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "%s felírása..."
+msgstr "%s felírása..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "SSL Tanúsítvány ellenõrzés"
+msgstr "SSL Tanúsítvány ellenőrzés"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Minta a levelek kijelöléséhez: "
+msgstr "Minta a levelek kijelöléséhez: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Jelöld ki a csatolandó levelet!"
+msgstr "Jelöld ki a csatolandó levelet!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Kijelölés nem támogatott."
+msgstr "Kijelölés nem támogatott."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Ez a levél nem látható."
+msgstr "Ez a levél nem látható."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL nem elérhetõ."
+msgstr "SSL nem elérhető."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "Ez a melléklet konvertálva lesz."
+msgstr "Ez a melléklet konvertálva lesz."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "Ez a melléklet nem lesz konvertálva."
+msgstr "Ez a melléklet nem lesz konvertálva."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
-"A levelek tartalomjegyzéke hibás. Próbáld megnyitni újra a postafiókot."
+"A levelek tartalomjegyzéke hibás. Próbáld megnyitni újra a postafiókot."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "Az újraküldõ lánc már üres."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "Nincs melléklet."
+msgstr "Nincs melléklet."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "Nincs levél."
+msgstr "Nincs levél."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "Nincsenek mutatható részek!"
+msgstr "Nincsenek mutatható részek!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Ez az IMAP kiszolgáló nagyon régi. A Mutt nem tud együttmûködni vele."
+msgstr "Ez az IMAP kiszolgáló nagyon régi. A Mutt nem tud együttműködni vele."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Akire a tanusítvány vonatkozik:"
+msgstr "Akire a tanusítvány vonatkozik:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Ez a tanúsítvány érvényes"
+msgstr "Ez a tanúsítvány érvényes"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "A tanusítványt kiállította:"
+msgstr "A tanusítványt kiállította:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Ez a kulcs nem használható: lejárt/letiltott/visszahívott."
+msgstr "Ez a kulcs nem használható: lejárt/letiltott/visszahívott."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "A témában olvasatlan levelek vannak."
+msgstr "A témában olvasatlan levelek vannak."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "A témázás le van tiltva."
+msgstr "A témázás le van tiltva."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Lejárt a maximális várakozási idõ az fcntl lock-ra!"
+msgstr "Lejárt a maximális várakozási idő az fcntl lock-ra!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Lejárt a maximális várakozási idõ az flock lock-ra!"
+msgstr "Lejárt a maximális várakozási idő az flock lock-ra!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Ez az üzenet eleje."
+msgstr "Ez az üzenet eleje."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "PGP kulcsok kibontása...\n"
+msgstr "PGP kulcsok kibontása...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "S/MIME tanúsítványok kibontása...\n"
+msgstr "S/MIME tanúsítványok kibontása...\n"
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "Hiba a %s kapcsolat közben (%s)"
+msgstr "Hiba a %s kapcsolat közben (%s)"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2851,140 +2661,123 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "SASL azonosítás nem sikerült."
+msgstr "SASL azonosítás nem sikerült."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "%s nem csatolható!"
+msgstr "%s nem csatolható!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "Nem lehet csatolni!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Nem lehet a fejléceket letölteni ezen verziójú IMAP szerverrõl"
+msgstr "Nem lehet a fejléceket letölteni ezen verziójú IMAP szerverről"
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "A szervertõl nem lehet tanusítványt kapni"
+msgstr "A szervertől nem lehet tanusítványt kapni"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
 msgstr "Nem lehet a leveleket a szerveren hagyni."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "%s nem csatolható!"
+msgstr "%s nem csatolható!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Nem tudom zárolni a postafiókot!"
+msgstr "Nem tudom zárolni a postafiókot!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Nem lehet megnyitni átmeneti fájlt!"
+msgstr "Nem lehet megnyitni átmeneti fájlt!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Nem lehet megnyitni átmeneti fájlt!"
+msgstr "Nem lehet megnyitni átmeneti fájlt!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Nem lehet megnyitni átmeneti fájlt!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Visszaállít"
+msgstr "Nem lehet megnyitni átmeneti fájlt!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Minta a levelek visszaállításához: "
+msgstr "Minta a levelek visszaállításához: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "Visszaállít"
+msgstr "Visszaállít"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "%s ismeretlen tartalom-típus"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "%s leírása..."
+msgstr "%s ismeretlen tartalom-típus"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "%s leírása..."
+msgstr "%s leírása..."
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "%s leírása..."
+msgstr "%s leírása..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Minta a levélkijelölés megszüntetéséhez:"
+msgstr "Minta a levélkijelölés megszüntetéséhez:"
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "Levél feltöltése..."
+msgstr "Levél feltöltése..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "Használd a 'toggle-write'-ot az írás újra engedélyezéséhez!"
+msgstr "Használd a 'toggle-write'-ot az írás újra engedélyezéséhez!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Használjam a kulcsID = \"%s\" ehhez: %s?"
+msgstr "Használjam a kulcsID = \"%s\" ehhez: %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "%s azonosító: "
+msgstr "%s azonosító: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Érvénytelen hónap: %s"
+msgstr "Érvénytelen hónap: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Érvénytelen hónap: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Érvénytelen hónap: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Ellenõrizzük a PGP aláírást?"
+msgstr "Ellenőrizzük a PGP aláírást?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Levelek tartalomjegyzékének ellenõrzése..."
+msgstr "Levelek tartalomjegyzékének ellenőrzése..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Melléklet"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "FIGYELMEZTETÉS!  %s-t felülírására készülsz, folytatod?"
+msgstr "FIGYELMEZTETÉS!  %s-t felülírására készülsz, folytatod?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2992,29 +2785,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "A szerver tanúsítványa lejárt"
+msgstr "A szerver tanúsítványa lejárt"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "A szerver tanúsítványa lejárt"
+msgstr "A szerver tanúsítványa lejárt"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "A szerver tanúsítványa még nem érvényes"
+msgstr "A szerver tanúsítványa még nem érvényes"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "A szerver tanúsítványa még nem érvényes"
+msgstr "A szerver tanúsítványa még nem érvényes"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3029,35 +2822,35 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "Várakozás az fcntl lock-ra... %d"
+msgstr "Várakozás az fcntl lock-ra... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "Várakozás az flock-ra... %d"
+msgstr "Várakozás az flock-ra... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "Várakozás a válaszra..."
+msgstr "Várakozás a válaszra..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "Figyelmeztetés: '%s' hibás IDN."
+msgstr "Figyelmeztetés: '%s' hibás IDN."
 
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "A szerver tanúsítványa lejárt"
+msgstr "A szerver tanúsítványa lejárt"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "Figyelmeztetés: Hibás IDN '%s' a '%s' álnévben.\n"
+msgstr "Figyelmeztetés: Hibás IDN '%s' a '%s' álnévben.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "Figyelmeztetés: A tanúsítvány nem menthetõ"
+msgstr "Figyelmeztetés: A tanúsítvány nem menthető"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
@@ -3075,124 +2868,106 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Hiba a melléklet csatolásakor"
+msgstr "Hiba a melléklet csatolásakor"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Írás nem sikerült!  Részleges postafiókot elmentettem a(z) %s fájlba"
+msgstr "Írás nem sikerült!  Részleges postafiókot elmentettem a(z) %s fájlba"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "Írási hiba!"
+msgstr "Írási hiba!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Levél mentése postafiókba"
+msgstr "Levél mentése postafiókba"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "%s írása..."
+msgstr "%s írása..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "Levél mentése %s-ba ..."
+msgstr "Levél mentése %s-ba ..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "Levelek írása... %d (%d%%)"
+msgstr "Levelek írása... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Hibás parancssor: %s\n"
+msgstr "Hibás parancssor: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Már van bejegyzés ilyen álnévvel!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Már ki van választva a lánc elsõ eleme."
+msgstr "Már van bejegyzés ilyen álnévvel!"
 
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Már ki van választva a lánc utolsó eleme."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Az elsõ bejegyzésen vagy."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Ez az elsõ oldal."
+msgstr "Az első bejegyzésen vagy."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Ez az elsõ levél."
+msgstr "Ez az első levél."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Ez az elsõ oldal."
+msgstr "Ez az első oldal."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Ez az elsõ téma."
+msgstr "Ez az első téma."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Az utolsó bejegyzésen vagy."
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Ez az utolsó oldal."
+msgstr "Az utolsó bejegyzésen vagy."
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Ez az utolsó levél."
+msgstr "Ez az utolsó levél."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Ez az utolsó oldal."
+msgstr "Ez az utolsó oldal."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Nem lehet tovább lefelé scrollozni."
+msgstr "Nem lehet tovább lefelé scrollozni."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Nem lehet tovább felfelé scrollozni."
+msgstr "Nem lehet tovább felfelé scrollozni."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Nincs bejegyzés a címjegyzékben!"
+msgstr "Nincs bejegyzés a címjegyzékben!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Az egyetlen melléklet nem törölhetõ."
+msgstr "Az egyetlen melléklet nem törölhető."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Csak levél/rfc222 részeket lehet visszaküldeni."
+msgstr "Csak levél/rfc222 részeket lehet visszaküldeni."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Rendben?"
@@ -3200,12 +2975,12 @@ msgstr "[%s = %s] Rendben?"
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s nincs támogatva "
+msgstr "[-- %s/%s nincs támogatva "
 
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- Melléklet #%d"
+msgstr "[-- Melléklet #%d"
 
 #: handler.c:1117 handler.c:1133
 #, c-format
@@ -3215,330 +2990,506 @@ msgstr "[-- A(z) %s hiba kimenete --]\n"
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Automatikus megjelenítés a(z) %s segítségével --]\n"
+msgstr "[-- Automatikus megjelenítés a(z) %s segítségével --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP LEVÉL KEZDÕDIK --]\n"
+"[-- PGP LEVÉL KEZDŐDIK --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP NYILVÁNOS KULCS KEZDÕDIK --]\n"
+msgstr "[-- PGP NYILVÁNOS KULCS KEZDŐDIK --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP ALÁÍRT LEVÉL KEZDÕDIK --]\n"
+"[-- PGP ALÁÍRT LEVÉL KEZDŐDIK --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- Nem futtatható: %s --]\n"
+msgstr "[-- Nem futtatható: %s --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- PGP LEVÉL VÉGE --]\n"
+msgstr "[-- PGP LEVÉL VÉGE --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP NYILVÁNOS KULCS VÉGE --]\n"
+msgstr "[-- PGP NYILVÁNOS KULCS VÉGE --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- PGP ALÁÍRT LEVÉL VÉGE --]\n"
+msgstr "[-- PGP ALÁÍRT LEVÉL VÉGE --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- PGP/MIME titkosított adat vége --]\n"
+msgstr "[-- PGP/MIME titkosított adat vége --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- PGP/MIME titkosított adat vége --]\n"
+msgstr "[-- PGP/MIME titkosított adat vége --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- S/MIME titkosított adat vége. --]\n"
+"[-- S/MIME titkosított adat vége. --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- S/MIME aláírt adat vége --]\n"
+"[-- S/MIME aláírt adat vége --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Aláírt adat vége --]\n"
+"[-- Aláírt adat vége --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[-- Hiba:  Egy Többrészes/Alternatív rész sem jeleníthetõ meg! --]\n"
+msgstr "[-- Hiba:  Egy Többrészes/Alternatív rész sem jeleníthető meg! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- Hiba: Ellentmondó többrészes/aláírt struktúra! --]\n"
+"[-- Hiba: Ellentmondó többrészes/aláírt struktúra! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- Hiba: Ismeretlen többrészes/aláírt protokoll %s! --]\n"
+"[-- Hiba: Ismeretlen többrészes/aláírt protokoll %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Hiba: nem lehet létrehozni az ideiglenes fájlt! --]\n"
+msgstr "[-- Hiba: nem lehet létrehozni az ideiglenes fájlt! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Hiba: nem található a PGP levél kezdete! --]\n"
+"[-- Hiba: nem található a PGP levél kezdete! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- Hiba: nem lehet létrehozni az ideiglenes fájlt! --]\n"
+msgstr "[-- Hiba: nem lehet létrehozni az ideiglenes fájlt! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- Hiba: hibás PGP/MIME levél! --]\n"
+"[-- Hiba: hibás PGP/MIME levél! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- Hiba: az üzenetnek/külsõ-törzsének nincs elérési-típus paramétere --]\n"
+"[-- Hiba: az üzenetnek/külső-törzsének nincs elérési-típus paramétere --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- A következõ adat PGP/MIME-vel titkosított --]\n"
+"[-- A következő adat PGP/MIME-vel titkosított --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- A következõ adat PGP/MIME-vel titkosított --]\n"
+"[-- A következő adat PGP/MIME-vel titkosított --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
-msgstr "[-- A következõ adat S/MIME-vel titkosított --]\n"
+msgstr "[-- A következő adat S/MIME-vel titkosított --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
-msgstr "[-- A következõ adatok S/MIME-vel alá vannak írva --]\n"
+msgstr "[-- A következő adatok S/MIME-vel alá vannak írva --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- A következõ adatok alá vannak írva --]\n"
+"[-- A következő adatok alá vannak írva --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- Ez a %s/%s melléklet "
+msgstr "[-- Ez a %s/%s melléklet "
 
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- A %s/%s melléklet nincs beágyazva, --]\n"
+msgstr "[-- A %s/%s melléklet nincs beágyazva, --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Típus: %s/%s, Kódolás: %s, Méret: %s --]\n"
+msgstr "[-- Típus: %s/%s, Kódolás: %s, Méret: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Figyelmeztetés: Nem találtam egy aláírást sem. --]\n"
+"[-- Figyelmeztetés: Nem találtam egy aláírást sem. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Figyelmeztetés: Nem tudtam leellenõrizni a %s/%s aláírásokat. --]\n"
+"[-- Figyelmeztetés: Nem tudtam leellenőrizni a %s/%s aláírásokat. --]\n"
 "\n"
 
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- és a jelzett elérési-típus, %s nincs támogatva --]\n"
+msgstr "[-- és a jelzett elérési-típus, %s nincs támogatva --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- és a jelzett külsõ forrás --]\n"
-"[-- megszûnt. --]\n"
+"[-- és a jelzett külső forrás --]\n"
+"[-- megszűnt. --]\n"
 
 #: handler.c:1201
 #, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- név: %s --]\n"
+msgstr "[-- név: %s --]\n"
 
 #: handler.c:1197
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s-on --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Lejárt        "
+msgstr "Lejárt        "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Érvénytelen   "
+msgstr "Érvénytelen   "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
 msgstr "Visszavont    "
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[érvénytelen dátum]"
+msgstr "[érvénytelen dátum]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[nem kiszámítható]"
+msgstr "[nem kiszámítható]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "címjegyzék: nincs cím"
+msgstr "címjegyzék: nincs cím"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Nem található egyetlen kijelölt levél sem."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Nem található egyetlen kijelölt levél sem."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Mented egy másolatát a levélnek?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "melléklet-leírás szerkesztése"
+msgstr "melléklet-leírás szerkesztése"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "melléklet-leírás szerkesztése"
+msgstr "melléklet-leírás szerkesztése"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: túl sok paraméter"
+msgstr "bind: túl sok paraméter"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Hiba a könyvtár beolvasásakor."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Nincs új levél egyik postafiókban sem."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: túl kevés paraméter"
+msgstr "color: túl kevés paraméter"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Nincs új levél"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
-msgstr "átalakítom"
+msgstr "átalakítom"
+
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Levél mentése postafiókba"
 
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "%s ideiglenes postafiók nem hozható létre"
+msgstr "%s ideiglenes postafiók nem hozható létre"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "nem lehet levágni a(z) %s ideiglenes postafiókból"
+msgstr "nem lehet levágni a(z) %s ideiglenes postafiókból"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "nem lehet írni a(z) %s ideiglenes postafiókba"
+msgstr "nem lehet írni a(z) %s ideiglenes postafiókba"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
 
-#: browser.c:1206
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Nincs bejövő postafiók megadva."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dnmr"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "az alapértelmezett színek nem támogatottak"
+msgstr "az alapértelmezett színek nem támogatottak"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Levelek törlése a szerverről?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Minta a levelek visszaállításához: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Minta a levelek visszaállításához: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfkgctrmp"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Továbbított levél szerkesztése?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3547,36 +3498,123 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "Másolás a(z) %s-ba..."
+msgstr "Másolás a(z) %s-ba..."
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "%s választása..."
+msgstr "%s választása..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Ez a melléklet nem lesz konvertálva."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "melléklet-leírás szerkesztése"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Nem lehet írni a levelet"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Levélfejlécek letöltése... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Továbbított levél szerkesztése?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Mented egy másolatát a levélnek?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "üres minta"
+msgstr "üres minta"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "Titkosít"
+msgstr "Titkosít"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Mented egy másolatát a levélnek?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3591,36 +3629,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "hiba a kifejezésben"
+msgstr "hiba a kifejezésben"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3630,26 +3668,82 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "hiba a mintában: %s"
+msgstr "hiba a mintában: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "hiba: ismeretlen operandus %d (jelentsd ezt a hibát)."
+msgstr "hiba: ismeretlen operandus %d (jelentsd ezt a hibát)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "tamsbg"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "tamsbg"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
-msgstr "exec: nincs paraméter"
+msgstr "exec: nincs paraméter"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Válasz a %s%s címre?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Továbbítás mellékletként?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Új levelek letöltése..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Ez az első levél."
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -3671,134 +3765,624 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Ez az utolsó oldal."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Nincs új levél egyik postafiókban sem."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Hiba a postafiók megnyitásaor"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Nincs új levél egyik postafiókban sem."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr " törölve lett --]\n"
+msgstr " törölve lett --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE sikertelen"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "érvénytelen mezõ a fejlécben"
+msgstr "érvénytelen mező a fejlécben"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:108
 #, fuzzy
-msgid "keys matching"
+msgid "jump to an index number"
+msgstr "Érvénytelen indexszám."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Levélre ugrás: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Levélre ugrás: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "A témában olvasatlan levelek vannak."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Ez az első téma."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Nincs olvasatlan levél"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Nincs olvasatlan levél"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Mented egy másolatát a levélnek?"
+
+#: crypt.cpkg:3108
+#, fuzzy
+msgid "keys matching"
 msgstr "PGP kulcsok egyeznek <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Kijelölt levelek visszaküldése. Címzett: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Nincs új levél egyik postafiókban sem."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: üres billentyûzet-szekvencia"
+msgstr "macro: üres billentyűzet-szekvencia"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: túl sok paraméter"
+msgstr "macro: túl sok paraméter"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "mailcap bejegyzés a(z) %s típushoz nem található"
+msgstr "mailcap bejegyzés a(z) %s típushoz nem található"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message (): a fájlidõ beállítása nem sikerült"
+msgstr "maildir_commit_message (): a fájlidő beállítása nem sikerült"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "A levél nem lett visszaküldve."
+msgstr "A levél nem lett visszaküldve."
 
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "nem megegyezõ zárójelek: %s"
+msgstr "nem megegyező zárójelek: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "hiányzó paraméter"
+msgstr "hiányzó paraméter"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: túl kevés paraméter"
+msgstr "mono: túl kevés paraméter"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Az első bejegyzésen vagy."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Ez az első levél."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Az utolsó bejegyzésen vagy."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Ez az utolsó levél."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Az utolsó bejegyzésen vagy."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Ez az utolsó oldal."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Nincs visszaállított levél."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Az első bejegyzésen vagy."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Ez az első oldal."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Nincs visszaállított levél."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Ez az első oldal."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "a többrészes üzenetnek nincs határoló paramétere!"
+msgstr "a többrészes üzenetnek nincs határoló paramétere!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "nem"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(nincs postafiók)"
+msgstr "(nincs postafiók)"
 
 #: commands.c:788
 msgid "not converting"
-msgstr "nem alakítom át"
+msgstr "nem alakítom át"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "üres billentyûzet-szekvencia"
+msgstr "üres billentyűzet-szekvencia"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "fhm"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Postafiók megnyitása csak olvasásra"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Postafiók megnyitása csak olvasásra"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Postafiók újra megnyitása..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Levél visszaküldése %s részére"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "\"reset\"-nél nem adható meg elõtag"
+msgstr "\"reset\"-nél nem adható meg előtag"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Az első bejegyzésen vagy."
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: túl sok paraméter"
+msgstr "push: túl sok paraméter"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Elhalasztott levél újrahívása?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "A témában olvasatlan levelek vannak."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "A POP kiszolgálón nem lehet szerkeszteni a levelet."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: nem lehet csatolni a fájlt"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Levélre ugrás: "
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Levelek törlése a szerverről?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ve"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "vem"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Mentés%s postafiókba"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Mentés%s postafiókba"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "A POP kiszolgálón nem lehet szerkeszteni a levelet."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "hiba a kifejezésben"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Keresés: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Nem tudtam a levelet elküldeni."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Továbbítás mellékletként?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Minta a levelek szűkítéséhez: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Nincs több idézett szöveg."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Kinyomtatod a levelet?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Nincs levél ebben a postafiókban."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source: hiba a %s-nál"
+msgstr "source: hiba a %s-nál"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
-msgstr "source: hiba a %s fájlban"
+msgstr "source: hiba a %s fájlban"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: az olvasás megszakadt, a %s fájlban túl sok a hiba"
+msgstr "source: az olvasás megszakadt, a %s fájlban túl sok a hiba"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Nincs a fájlmaszknak megfelelő fájl"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: mbox megváltozott, de nincs módosított levél! (jelentsd ezt a hibát)"
+"sync: mbox megváltozott, de nincs módosított levél! (jelentsd ezt a hibát)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Minta a levélkijelölés megszüntetéséhez:"
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Ez az első téma."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3810,42 +4394,131 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Nincs több idézett szöveg."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Az újrakódolás csak a szöveg mellékleteket érinti."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Nincs keresési minta."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Nincs olvasatlan levél"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "túl kevés paraméter"
+msgstr "túl kevés paraméter"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "túl sok paraméter"
+msgstr "túl sok paraméter"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "melléklet-leírás szerkesztése"
+msgstr "melléklet-leírás szerkesztése"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Minta a levelek visszaállításához: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Minta a levelek visszaállításához: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Minta a levelek visszaállításához: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: %s-t nem lehet törölni a következõbõl: %s."
+msgstr "unhook: %s-t nem lehet törölni a következőből: %s."
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: Nem lehet 'unhook *'-ot végrehajtani hook parancsból."
+msgstr "unhook: Nem lehet 'unhook *'-ot végrehajtani hook parancsból."
 
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "hozzárendelés törlése: ismeretlen hozzárendelési típus: %s"
+msgstr "hozzárendelés törlése: ismeretlen hozzárendelési típus: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Minta a levélkijelölés megszüntetéséhez:"
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "melléklet-leírás szerkesztése"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3857,12 +4530,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "\"reset\"-nél nem adható meg érték"
+msgstr "\"reset\"-nél nem adható meg érték"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "A melléklet elmentve."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Új fájl: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Levél mentése postafiókba"
 
-#: lib-ui/curs_lib.c:155
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "igen"
 
@@ -3870,3 +4574,6 @@ msgstr "igen"
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/id.po b/po/id.po
index b556051..de0b8d9 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.10i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-03-21 17:31+1100\n"
 "Last-Translator: Ronny Haryanto <ronny-mutt-po-file@haryan.to>\n"
 "Language-Team: Indonesia <web@linux.or.id>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 7bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Penentuan tombol generik:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -34,7 +34,7 @@ msgstr ""
 "Fungsi-fungsi yang belum ditentukan tombolnya:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -100,17 +100,17 @@ msgstr ""
 "  -Z\t\tbuka folder pertama dg surat baru, langsung keluar jika tidak ada\n"
 "  -h\t\tpesan bantuan ini"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " tandatangan sebagai: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     ke %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   dari %s"
@@ -153,15 +153,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' utk lihat daftar): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr " (inline)"
 
@@ -170,11 +170,11 @@ msgstr " (inline)"
 msgid " Press '%s' to toggle write"
 msgstr "Tekan '%s' untuk mengeset bisa/tidak menulis"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr " di tampilan terbatas ini"
 
@@ -202,32 +202,32 @@ msgstr "%d disimpan, %d dihapus."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d disimpan, %d dipindahkan, %d dihapus."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s [%s]\n"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s [%s]\n"
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s Anda yakin mau menggunakan kunci tsb?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] telah diubah. Update encoding?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] sudah tidak ada!"
@@ -237,7 +237,7 @@ msgstr "%s [#%d] sudah tidak ada!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d dari %d surat dibaca]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s tidak ada. Buat?"
@@ -252,17 +252,17 @@ msgstr "%s bukan path IMAP yang valid"
 msgid "%s is an invalid POP path"
 msgstr "%s bukan path POP yang valid"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr "%s bukan path POP yang valid"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr "%s bukan path POP yang valid"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s bukan direktori."
@@ -272,7 +272,7 @@ msgstr "%s bukan direktori."
 msgid "%s is not a mailbox!"
 msgstr "%s bukan kotak surat!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s bukan kotak surat."
@@ -299,52 +299,52 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Jenis tidak dikenali."
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s: warna tidak didukung oleh term"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s: perintah hanya untuk objek indeks"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: tidak ada atribut begitu"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: tidak ada warna begitu"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: tidak ada fungsi begitu"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: tidak ada fungsi begitu di map"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: tidak ada menu begitu"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: tidak ada objek begitu"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: parameternya kurang"
@@ -354,37 +354,37 @@ msgstr "%s: parameternya kurang"
 msgid "%s: unable to attach file"
 msgstr "%s: tidak bisa melampirkan file"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: tidak bisa melampirkan file.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: perintah tidak dikenali"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: jenis tidak dikenali"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variable tidak diketahui"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
 msgstr "%s bukan path POP yang valid"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr "%s bukan path POP yang valid"
@@ -393,15 +393,15 @@ msgstr "%s bukan path POP yang valid"
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(tombol untuk 'view-attachments' belum ditentukan!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(tidak ada kotak surat)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(t)olak, terima (s)ekali"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(t)olak, terima (s)ekali, terima selal(u)"
 
@@ -419,20 +419,20 @@ msgstr "(gunakan '%s' untuk melihat bagian ini)"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Lampiran"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<GAK TAU>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<default>"
 
@@ -448,35 +448,31 @@ msgstr ""
 msgid "APOP authentication failed."
 msgstr "Authentikasi APOP gagal."
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Batal"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
 msgstr "Batalkan surat yang tidak diubah?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
 msgstr "Surat yang tidak diubah dibatalkan."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Alamat: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Alias telah ditambahkan."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Alias sebagai: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Kumpulan alias"
 
@@ -484,64 +480,60 @@ msgstr "Kumpulan alias"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "Semua kunci yang cocok telah kadaluwarsa, dicabut, atau disabled."
 
-#: remailer.c:431
-msgid "Append"
-msgstr "Tambahkan"
-
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Tambahkan surat-surat ke %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
 msgstr "Parameter harus berupa nomer surat."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Lampiran telah disimpan."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Lampirkan file"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Melampirkan file-file yang dipilih..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Lampiran telah difilter."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Lampiran telah disimpan."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Lampiran"
 
@@ -572,12 +564,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr "IDN \"%s\" tidak benar."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "IDN %s pada saat mempersiapkan resent-from tidak benar."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "IDN di \"%s\" tidak benar: '%s'"
@@ -591,7 +583,7 @@ msgstr "IDN salah: '%s'"
 msgid "Bad mailbox name"
 msgstr "Nama kotak surat yg buruk"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "Sudah paling bawah."
 
@@ -613,7 +605,7 @@ msgstr "Bounce surat-surat ke %s"
 msgid "Bounce tagged messages to: "
 msgstr "Bounce surat yang telah ditandai ke: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -630,16 +622,16 @@ msgstr ""
 msgid "Can't append to folder: %s"
 msgstr "Tidak bisa menambah ke kotak surat: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "Tidak bisa melampirkan sebuah direktori"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Tidak bisa membuat %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Tidak bisa membuat file %s"
@@ -652,10 +644,10 @@ msgstr "Tidak bisa membuat filter"
 msgid "Can't create filter process"
 msgstr "Tidak bisa membuat proses filter"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "Tidak bisa membuat file sementara"
 
@@ -671,15 +663,15 @@ msgstr ""
 "Tidak dapat menguraikan semua lampiran yang ditandai. MIME-forward yg "
 "lainnya?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
 msgstr "Tidak dapat men-decrypt surat ini!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "Tidak bisa menghapus lampiran dari server POP."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "Tidak bisa menghapus lampiran dari server POP."
@@ -697,10 +689,6 @@ msgstr ""
 msgid "Can't find any tagged messages."
 msgstr "Tidak dapat menemukan surat yang ditandai."
 
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Tidak dapat mengambil type2.list milik mixmaster!"
-
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
 msgstr "Tidak cocok dengan nametemplate, lanjutkan?"
@@ -715,27 +703,27 @@ msgstr "Tidak bisa membuka file surat: %s"
 msgid "Can't open trash folder"
 msgstr "Tidak bisa menambah ke kotak surat: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "Hubungan ke %s ditutup."
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "Menutup hubungan ke server POP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Tidak bisa stat: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "Tidak bisa membuat %s: %s."
@@ -749,7 +737,7 @@ msgstr "Tidak bisa menyimpan surat ke kotak surat POP"
 msgid "Can't save message to newsserver."
 msgstr "Tidak bisa menyunting surat di server POP"
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Tidak bisa stat %s: %s"
@@ -758,11 +746,11 @@ msgstr "Tidak bisa stat %s: %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "Tidak bisa menampilkan sebuah direktori"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "Tidak bisa membuat %s."
@@ -787,42 +775,38 @@ msgstr "Tidak bisa membuat tampilan filter"
 msgid "Cannot create filter"
 msgstr "Tidak bisa membuat filter"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Kotak surat read-only, tidak bisa toggle write!"
 
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
-
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "%s tertangkap... Keluar.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "Sertifikat server belum sah"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Sertifikat telah disimpan"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
 msgstr "Perubahan ke folder akan dilakukan sewaktu keluar dari folder."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
 msgstr "Perubahan ke folder tidak akan dilakukan."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Kar = %s, Oktal = %o, Desimal = %d"
@@ -832,28 +816,20 @@ msgstr "Kar = %s, Oktal = %o, Desimal = %d"
 msgid "Character set changed to %s; %s."
 msgstr "Character set diubah ke %s; %s."
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "Pindah dir"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Pindah dir ke: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Memeriksa surat baru..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Cek key  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Memeriksa surat baru..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Memeriksa surat baru..."
@@ -862,7 +838,7 @@ msgstr "Memeriksa surat baru..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Polos"
 
@@ -870,7 +846,7 @@ msgstr "Polos"
 msgid "Clear flag"
 msgstr "Batal ditandai"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Menutup hubungan ke %s..."
@@ -879,7 +855,7 @@ msgstr "Menutup hubungan ke %s..."
 msgid "Closing connection to POP server..."
 msgstr "Menutup hubungan ke server POP..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Menghubungi %s..."
@@ -898,7 +874,7 @@ msgstr "Perintah UIDL tidak didukung oleh server."
 msgid "Committing changes..."
 msgstr "Melakukan perubahan..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -919,12 +895,12 @@ msgstr "Sedang menyalin ke %s..."
 msgid "Compressing %s..."
 msgstr "Sedang menyalin ke %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Menghubungi %s..."
@@ -953,7 +929,7 @@ msgstr "Hubungan terputus. Hubungi kembali server POP?"
 msgid "Connection to %s closed"
 msgstr "Hubungan ke %s ditutup."
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "Hubungan ke %s ditutup."
@@ -963,7 +939,7 @@ msgstr "Hubungan ke %s ditutup."
 msgid "Content-Type changed to %s."
 msgstr "Content-Type diubah ke %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type harus dalam format jenis-dasar/sub-jenis"
 
@@ -1016,9 +992,9 @@ msgstr "Tidak bisa berhubungan ke %s (%s)"
 msgid "Could not copy message"
 msgstr "Tidak bisa menyalin surat"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
 msgstr "Tidak bisa membuat file sementara!"
@@ -1036,7 +1012,7 @@ msgstr "Tidak bisa menemukan fungsi pengurutan! [laporkan bug ini]"
 msgid "Could not find the host \"%s\""
 msgstr "Tidak dapat menemukan host \"%s\""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
 msgstr "Tidak bisa menyertakan semua surat yang diminta!"
 
@@ -1053,7 +1029,7 @@ msgstr "Tidak bisa membuka %s"
 msgid "Could not reopen mailbox!"
 msgstr "Tidak bisa membuka kembali mailbox!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "Tidak bisa mengirim surat."
 
@@ -1067,7 +1043,7 @@ msgstr "Tidak bisa mengunci %s\n"
 msgid "Create %s?"
 msgstr "Buat %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Pembuatan hanya didukung untuk kotak surat jenis IMAP."
 
@@ -1100,24 +1076,15 @@ msgstr "Dekripsi-salin%s ke kotak surat"
 msgid "Decrypt-save%s to mailbox"
 msgstr "Dekripsi-simpan%s ke kotak surat"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
 msgstr "Mendekripsi surat..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
 msgstr "Dekripsi gagal."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Hapus"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Hapus"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Penghapusan hanya didukung untuk kotak surat jenis IMAP."
 
@@ -1125,24 +1092,20 @@ msgstr "Penghapusan hanya didukung untuk kotak surat jenis IMAP."
 msgid "Delete messages from server?"
 msgstr "Hapus surat-surat dari server?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Hapus surat-surat yang: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Hapus"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "Penghapusan lampiran dari surat yg dienkripsi tidak didukung."
 
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Ket"
-
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
@@ -1153,20 +1116,20 @@ msgstr "ID %s belum diverifikasi. Yakin mau digunakan utk %s ?"
 msgid "Directory %s not exist. Create it?"
 msgstr "%s tidak ada. Buat?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Direktori [%s], File mask: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "ERROR: harap laporkan bug ini"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
 msgstr "Edit surat yg diforward?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1175,11 +1138,11 @@ msgstr ""
 msgid "Empty expression"
 msgstr "kesalahan pada ekspresi"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Enkrip"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
 msgstr "Enkrip dengan: "
 
@@ -1187,17 +1150,17 @@ msgstr "Enkrip dengan: "
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Masukkan keyID: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Masukkan keyID untuk %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
 msgstr "Masukkan kunci-kunci (^G utk batal): "
 
@@ -1224,7 +1187,7 @@ msgstr "Kesalahan waktu menghubungi ke server: %s"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Kesalahan waktu menghubungi ke server: %s"
@@ -1233,12 +1196,12 @@ msgstr "Kesalahan waktu menghubungi ke server: %s"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Error di %s, baris %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Error di baris perintah: %s\n"
@@ -1248,12 +1211,12 @@ msgstr "Error di baris perintah: %s\n"
 msgid "Error in expression: %s"
 msgstr "Kesalahan pada ekspresi: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Gagal menginisialisasi terminal."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Gagal menginisialisasi terminal."
 
@@ -1265,39 +1228,30 @@ msgstr "Error sewaktu membuka kotak surat"
 msgid "Error parsing address!"
 msgstr "Gagal menguraikan alamat!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Gagal menjalankan \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "Gagal membaca direktori."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Error mengirimkan surat, proses keluar dengan kode %d (%s)."
 
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Error mengirimkan surat, proses keluar dengan kode %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Gagal mengirim surat."
-
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Kesalahan waktu menghubungi ke server %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Gagal menampilkan file"
 
@@ -1310,25 +1264,20 @@ msgstr "Error sewaktu menulis ke kotak surat!"
 msgid "Error. Preserving temporary file: %s"
 msgstr "Error. Menyimpan file sementara: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Error: %s tidak dapat digunakan sebagai akhir rangkaian remailer."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Error: IDN '%s' tidak benar."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1345,7 +1294,7 @@ msgstr "Error: multipart/signed tidak punya protokol."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Error di baris perintah: %s\n"
@@ -1359,21 +1308,12 @@ msgstr "Memeriksa cache... [%d/%d]"
 msgid "Executing command on matching messages..."
 msgstr "Menjalankan perintah terhadap surat-surat yang cocok..."
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Keluar"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Keluar  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
 msgstr "Keluar dari Mutt tanpa menyimpan?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
 msgstr "Keluar dari Mutt?"
@@ -1406,17 +1346,17 @@ msgstr "Fatal error! Tidak bisa membuka kembali kotak surat!"
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Fatal error. Jumlah surat tidak konsisten dengan server!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Menghapus surat-surat di server..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "Mengambil surat..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "Mengambil daftar surat..."
@@ -1425,7 +1365,7 @@ msgstr "Mengambil daftar surat..."
 msgid "Fetching list of messages..."
 msgstr "Mengambil daftar surat..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "Mengambil header surat... [%d/%d]"
@@ -1435,11 +1375,11 @@ msgstr "Mengambil header surat... [%d/%d]"
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Mengambil header surat... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Mengambil surat..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "File Mask: "
 
@@ -1460,39 +1400,34 @@ msgstr ""
 msgid "File under directory: "
 msgstr "File di dalam direktori: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filter melalui: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Cap jari: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "simpan surat ini untuk dikirim nanti"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Balas ke %s%s?"
 
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Balas ke %s%s?"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "Forward dalam MIME?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Forward sebagai lampiran?"
 
@@ -1500,7 +1435,7 @@ msgstr "Forward sebagai lampiran?"
 msgid "Forward as attachments?"
 msgstr "Forward sebagai lampiran?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
 msgstr "Fungsi ini tidak diperbolehkan pada mode pelampiran-surat"
 
@@ -1516,28 +1451,17 @@ msgstr "Mencari namespaces..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Grup"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Bantuan"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Bantuan utk %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
 msgstr "Bantuan sedang ditampilkan."
 
@@ -1545,36 +1469,36 @@ msgstr "Bantuan sedang ditampilkan."
 msgid "I don't know how to print that!"
 msgstr "Saya tidak tahu bagaimana mencetak itu!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Saya tidak tahu bagaimana mencetak lampiran %s!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr "Validitas ID tidak terdifinisikan."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
 msgstr "ID telah kadaluwarsa/disabled/dicabut."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
 msgstr "ID tidak valid."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
 msgstr "ID hanya valid secara marginal."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
 msgstr "PGP header tidak betul"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
 msgstr "S/MIME header tidak betul"
 
@@ -1583,39 +1507,35 @@ msgstr "S/MIME header tidak betul"
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "Entry utk jenis %s di '%s' baris %d tidak diformat dengan benar"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr "Sertakan surat asli di surat balasan?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Menyertakan surat terkutip..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Masukkan"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Tidak tanggal: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "Encoding tidak betul."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "Nomer indeks tidak betul."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
 msgstr "Tidak ada nomer begitu."
 
@@ -1629,11 +1549,11 @@ msgstr "Tidak ada bulan: %s"
 msgid "Invalid relative date: %s"
 msgstr "Bulan relatif tidak benar: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "Memanggil PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "Memanggil PGP..."
@@ -1643,76 +1563,72 @@ msgstr "Memanggil PGP..."
 msgid "Invoking autoview command: %s"
 msgstr "Menjalankan perintah tampil-otomatis: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Ke surat no: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Ke: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
 msgstr "Pelompatan tidak diimplementasikan untuk dialogs."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Identifikasi kunci: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
 msgstr "Tombol itu tidak ditentukan untuk apa."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tombol itu tidak ditentukan untuk apa. Tekan '%s' utk bantuan."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "Hanya surat-surat yang: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr " Batas: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Sedang login..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1722,15 +1638,15 @@ msgstr ""
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "Jumlah lock terlalu banyak, hapus lock untuk %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Sedang login..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Login gagal."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "Mencari kunci yg cocok dengan \"%s\"..."
@@ -1740,7 +1656,7 @@ msgstr "Mencari kunci yg cocok dengan \"%s\"..."
 msgid "Looking up %s..."
 msgstr "Mencari %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Cap jari: %s"
@@ -1749,23 +1665,19 @@ msgstr "Cap jari: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Jenis MIME tidak didefinisikan. Tidak bisa melihat lampiran."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "Loop macro terdeteksi."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Surat"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "Surat tidak dikirim."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Surat telah dikirim."
 
@@ -1781,11 +1693,11 @@ msgstr "Kotak surat telah ditutup."
 msgid "Mailbox created."
 msgstr "Kotak surat telah dibuat."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr "Kotak surat telah dihapus."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
 msgstr "Kotak surat kosong."
 
@@ -1794,7 +1706,7 @@ msgstr "Kotak surat kosong."
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Kotak surat ditandai tidak boleh ditulisi. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
 msgstr "Kotak surat hanya bisa dibaca."
 
@@ -1806,7 +1718,7 @@ msgstr "Kotak surat tidak berubah."
 msgid "Mailbox must have a name."
 msgstr "Kotak surat harus punya nama."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
 msgstr "Kotak surat tidak dihapus."
 
@@ -1818,17 +1730,17 @@ msgstr "Kotak surat telah diganti namanya."
 msgid "Mailbox was corrupted!"
 msgstr "Kotak surat diobok-obok sampe kacau!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
 msgstr "Kotak surat diobok-obok oleh program lain."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 "Kotak surat diobok-obok oleh program lain. Tanda-tanda surat mungkin tidak "
 "tepat."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Kotak surat [%d]"
@@ -1843,11 +1755,7 @@ msgstr "'Edit' di file mailcap membutuhkan %%s"
 msgid "Mailcap compose entry requires %%s"
 msgstr "'compose' di file mailcap membutuhkan %%s"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Buat Alias"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1856,19 +1764,15 @@ msgstr ""
 msgid "Marking %d messages deleted..."
 msgstr "Menandai %d surat-surat \"dihapus\"..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Mask"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Surat telah dibounce."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1888,12 +1792,12 @@ msgstr "Surat tidak dibounce."
 msgid "Message not modified!"
 msgstr "Surat tidak diubah!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
 msgstr "Surat induk tidak bisa dilihat di tampilan terbatas ini."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "Surat ditunda."
 
@@ -1901,7 +1805,7 @@ msgstr "Surat ditunda."
 msgid "Message printed"
 msgstr "Surat telah dicetak"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Surat telah disimpan."
 
@@ -1921,19 +1825,10 @@ msgstr "Surat-surat tidak dibounce."
 msgid "Messages printed"
 msgstr "Surat-surat telah dicetak"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Parameter tidak ditemukan"
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Rangkaian mixmaster dibatasi hingga %d elemen."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster tidak menerima header Cc maupun Bcc."
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
@@ -1944,19 +1839,15 @@ msgstr "Pindahkan surat-surat yang sudah dibaca ke %s?"
 msgid "Moving read messages to %s..."
 msgstr "Pindahkan surat-surat yang sudah dibaca ke %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Query Baru"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nama file baru: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "File baru: "
 
@@ -1964,41 +1855,33 @@ msgstr "File baru: "
 msgid "New mail in "
 msgstr "Surat baru di "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr "Surat baru di kotak ini."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Brkt"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "HlmnBrkt"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2010,30 +1893,30 @@ msgstr "Tidak ada pengauthentikasi yg bisa digunakan"
 msgid "No boundary parameter found! [report this error]"
 msgstr "Tidak ada parameter batas yang bisa ditemukan! [laporkan error ini]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Tidak ada entry."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Tidak ada file yang sesuai dengan mask"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
 msgstr "Tidak ada kotak surat incoming yang didefinisikan."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
 msgstr "Pola batas (limit pattern) tidak ditentukan."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
 msgstr "Tidak ada kotak surat yang terbuka."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr "Tidak ada kotak surat dengan surat baru."
 
@@ -2048,7 +1931,7 @@ msgstr ""
 msgid "No mailcap edit entry for %s"
 msgstr "'Edit' di file mailcap tidak ditemukan untuk %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "Tidak ada mailing list yang ditemukan!"
 
@@ -2056,7 +1939,7 @@ msgstr "Tidak ada mailing list yang ditemukan!"
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Tidak ada jenis yang cocok di file mailcap. Ditampilkan sebagai teks."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "Tidak ada surat di kotak tersebut."
 
@@ -2064,15 +1947,15 @@ msgstr "Tidak ada surat di kotak tersebut."
 msgid "No messages matched criteria."
 msgstr "Tidak ada surat yang memenuhi kriteria."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "Tidak ada lagi teks kutipan."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "Tidak ada thread lagi."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "Tidak ada lagi teks yang tidak dikutp setelah teks kutipan."
 
@@ -2080,72 +1963,62 @@ msgstr "Tidak ada lagi teks yang tidak dikutp setelah teks kutipan."
 msgid "No new mail in POP mailbox."
 msgstr "Tidak ada surat baru di kotak surat POP."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Tidak ada surat baru"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Tidak ada subjek."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Tidak ada file yang sesuai dengan mask"
 
-#: nntp.c:357
+#: nntp.c:360
 #, fuzzy
 msgid "No newsserver defined!"
 msgstr "Username POP tidak diketahui."
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Tidak ada kotak surat dengan surat baru."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "Tidak ada surat yg ditunda."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Tidak ada kotak surat dengan surat baru."
-
 #: commands.c:378
 msgid "No printing command has been defined."
 msgstr "Perintah untuk mencetak belum didefinisikan."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
 msgstr "Tidak ada penerima yang disebutkan!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr "Tidak ada penerima yang disebutkan.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
 msgstr "Tidak ada penerima yang disebutkan."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "Tidak ada kriteria pencarian."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Tidak ada subjek."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "Tidak ada subjek, batalkan pengiriman?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "Tidak ada subjek, batal?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Tidak ada subjek, batal."
 
@@ -2153,101 +2026,97 @@ msgstr "Tidak ada subjek, batal."
 msgid "No such folder"
 msgstr "Tidak ada folder itu"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "Tidak ada entry yang ditandai."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
 msgstr "Tidak ada surat yang ditandai yang kelihatan!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "Tidak ada surat yang ditandai."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr "Tidak ada surat yang tidak jadi dihapus."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "Tidak ada surat yang belum dibaca"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "Tidak ada surat yg bisa dilihat."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
 msgstr "Tidak ada di menu ini."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Tidak ketemu."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
 msgstr "Gak ngapa-ngapain."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
 msgstr "Hanya penghapusan lampiran dari surat multi bagian yang didukung."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
 msgstr "Buka kotak surat"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
 msgstr "Buka kotak surat dengan mode read-only"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
 msgstr "Buka kotak surat untuk mengambil lampiran"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "Buka kotak surat dengan mode read-only"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "Buka kotak surat untuk mengambil lampiran"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Keluaran dari proses pengiriman"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
 "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, %s, (b)ersih? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP sudah dipilih. Bersihkan & lanjut ? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP keys yg cocok dg <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP keys yg cocok dg <%s>."
@@ -2264,11 +2133,11 @@ msgstr "Tanda tangan PGP berhasil diverifikasi."
 msgid "POP host is not defined."
 msgstr "Nama server POP tidak diketahui."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
 msgstr "Surat induk tidak ada."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
 msgstr "Surat induk tidak bisa dilihat di tampilan terbatas ini."
 
@@ -2277,40 +2146,27 @@ msgstr "Surat induk tidak bisa dilihat di tampilan terbatas ini."
 msgid "Password for %s@%s: "
 msgstr "Password utk %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Nama lengkap: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Pipa"
-
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "Pipe ke perintah: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Pipe ke: "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "Mohon variabel hostname diisi dengan benar jika menggunakan mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr "Tunda surat ini?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Surat-surat tertunda"
 
@@ -2318,23 +2174,15 @@ msgstr "Surat-surat tertunda"
 msgid "Preconnect command failed."
 msgstr "Perintah pra-koneksi gagal."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "Mempersiapkan surat yg diforward..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr "Tekan sembarang tombol untuk lanjut..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "HlmnSblm"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Cetak"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "Cetak lampiran?"
 
@@ -2342,7 +2190,7 @@ msgstr "Cetak lampiran?"
 msgid "Print message?"
 msgstr "Cetak surat?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
 msgstr "Cetak lampiran yang ditandai?"
 
@@ -2360,34 +2208,30 @@ msgstr "Benar-benar hapus %d surat yang ditandai akan dihapus?"
 msgid "Purge %d deleted messages?"
 msgstr "Benar-benar hapus %d surat yang ditandai akan dihapus?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Query"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Query '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
 msgstr "Perintah query tidak diketahui."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Query: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Keluar"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "Keluar dari Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Mencari namespaces..."
@@ -2412,16 +2256,16 @@ msgstr "Membaca %s... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Membaca surat-surat baru (%d bytes)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Yakin hapus kotak surat \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
 msgstr "Lanjutkan surat yang ditunda sebelumnya?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr "Peng-coding-an ulang hanya berpengaruh terhadap lampiran teks."
 
@@ -2430,7 +2274,7 @@ msgstr "Peng-coding-an ulang hanya berpengaruh terhadap lampiran teks."
 msgid "Rename failed: %s"
 msgstr "Penggantian nama gagal: %s"
 
-#: browser.c:1020
+#: browser.c:991
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Penggantian nama hanya didukung untuk kotak surat jenis IMAP."
 
@@ -2439,7 +2283,7 @@ msgstr "Penggantian nama hanya didukung untuk kotak surat jenis IMAP."
 msgid "Rename mailbox %s to: "
 msgstr "Ganti nama kotak surat %s ke: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Ganti nama ke: "
 
@@ -2447,15 +2291,11 @@ msgstr "Ganti nama ke: "
 msgid "Reopening mailbox..."
 msgstr "Membuka kembali kotak surat..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Balas"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Balas ke %s%s?"
@@ -2468,26 +2308,26 @@ msgstr ""
 "Urut terbalik tan(g)gal/d(a)ri/t(e)rima/(s)ubj/(k)e/(t)hread/(n)ggak urut/(u)"
 "kuran/n(i)lai/s(p)am?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr "Cari mundur: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
 msgstr "Cari mundur: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Urut terbalik berdasarkan (t)anggal, (a)bjad, (u)kuran atau (n)ggak diurut? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
 "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, %s, (b)ersih? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME sudah dipilih. Bersihkan & lanjut ? "
 
@@ -2495,7 +2335,7 @@ msgstr "S/MIME sudah dipilih. Bersihkan & lanjut ? "
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Pemilik sertifikat S/MIME tidak sesuai dg pengirim."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "Sertifikat2 S/MIME yg cocok dg \"%s\"."
@@ -2516,7 +2356,7 @@ msgstr "Tanda tangan S/MIME berhasil diverifikasi."
 msgid "SASL authentication failed."
 msgstr "Authentikasi SASL gagal."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Cap jari: %s"
@@ -2526,20 +2366,16 @@ msgstr "Cap jari: %s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "Hubungan SSL menggunakan %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Simpan"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "Simpan salinan dari surat ini?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Simpan ke file: "
 
@@ -2553,15 +2389,11 @@ msgstr "Simpan%s ke kotak surat"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Menyimpan tanda-tanda status surat... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Menyimpan..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Cari"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Cari: "
 
@@ -2577,62 +2409,46 @@ msgstr "Sudah dicari sampe atas, tapi tidak ketemu"
 msgid "Search interrupted."
 msgstr "Pencarian dibatalkan."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
 msgstr "Pencarian tidak bisa dilakukan untuk menu ini."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
 msgstr "Pencarian kembali ke bawah."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
 msgstr "Pencarian kembali ke atas."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Cari: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Pilih"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Pilih  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Pilih rangkaian remailer."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "Memilih %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Kirim"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Mengirim di latar belakang."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Mengirim surat..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
 msgstr "Server menutup hubungan!"
 
@@ -2644,15 +2460,15 @@ msgstr "Tandai"
 msgid "Shell command: "
 msgstr "Perintah shell: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Tandatangan"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Tandatangani sebagai: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Tandatangan, Enkrip"
 
@@ -2664,7 +2480,7 @@ msgstr ""
 "Urut tan(g)gal/d(a)ri/t(e)rima/(s)ubj/(k)e/(t)hread/(n)ggak urut/(u)kuran/n"
 "(i)lai/s(p)am?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Urut berdasarkan (t)anggal, (a)bjad, (u)kuran atau (n)ggak diurut? "
 
@@ -2672,26 +2488,22 @@ msgstr "Urut berdasarkan (t)anggal, (a)bjad, (u)kuran atau (n)ggak diurut? "
 msgid "Sorting mailbox..."
 msgstr "Mengurutkan surat-surat..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Identifikasi kunci: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Berlangganan [%s], File mask: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2700,24 +2512,24 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "Berlangganan ke %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "Cek sertifikat SSL"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr "Tandai surat-surat yang: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
 msgstr "Tandai surat-surat yang mau dilampirkan!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
 msgstr "Penandaan tidak didukung."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr "Surat itu tidak bisa dilihat."
 
@@ -2726,11 +2538,11 @@ msgstr "Surat itu tidak bisa dilihat."
 msgid "The CRL is not available\n"
 msgstr "SSL tidak tersedia."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr "Lampiran yg dipilih akan dikonversi."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr "Lampiran yg dipilih tidak akan dikonersi."
 
@@ -2738,19 +2550,15 @@ msgstr "Lampiran yg dipilih tidak akan dikonersi."
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Index dari surat tidak benar. Cobalah membuka kembali kotak surat tsb."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "Rangkaian remailer sudah kosong."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "Tidak ada lampiran."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Tidak ada surat."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "Tidak ada sub-bagian yg bisa ditampilkan!"
 
@@ -2758,38 +2566,38 @@ msgstr "Tidak ada sub-bagian yg bisa ditampilkan!"
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "IMAP server ini sudah kuno. Mutt tidak bisa menggunakannya."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr "Sertifikat ini dimiliki oleh:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr "Sertifikat ini sah"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr "Sertifikat ini dikeluarkan oleh:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "Kunci ini tidak dapat digunakan: kadaluwarsa/disabled/dicabut."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
 msgstr "Thread berisi surat yang belum dibaca."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
 msgstr "Tidak disetting untuk melakukan threading."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
@@ -2801,23 +2609,27 @@ msgstr "Terlalu lama menunggu waktu mencoba fcntl lock!"
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "Terlalu lama menunggu waktu mencoba flock!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
 msgstr "Sudah paling atas."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr "Mencoba mengekstrak kunci2 PGP...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Mencoba mengekstrak sertifikat2 S/MIME...\n"
 
@@ -2836,12 +2648,12 @@ msgstr ""
 msgid "USER authentication failed."
 msgstr "Authentikasi SASL gagal."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Tidak bisa melampirkan %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "Tidak bisa dilampirkan!"
 
@@ -2849,7 +2661,7 @@ msgstr "Tidak bisa dilampirkan!"
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Tidak dapat mengambil header dari IMAP server versi ini."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "Tidak bisa mengambil sertifikat"
 
@@ -2857,7 +2669,7 @@ msgstr "Tidak bisa mengambil sertifikat"
 msgid "Unable to leave messages on server."
 msgstr "Tidak bisa meninggalkan surat-surat di server."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "Tidak bisa melampirkan %s!"
@@ -2867,12 +2679,12 @@ msgstr "Tidak bisa melampirkan %s!"
 msgid "Unable to lock mailbox!"
 msgstr "Tidak bisa mengunci kotak surat!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
 msgstr "Tidak bisa membuka file sementara!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
 msgstr "Tidak bisa membuka file sementara!"
@@ -2881,31 +2693,22 @@ msgstr "Tidak bisa membuka file sementara!"
 msgid "Unable to open temporary file!"
 msgstr "Tidak bisa membuka file sementara!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Nggak jadi hapus"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "Tidak jadi hapus surat-surat yang: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Nggak jadi hapus"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s tak dikenali"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Berhenti langganan dari %s..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Berhenti langganan dari %s..."
@@ -2915,7 +2718,7 @@ msgstr "Berhenti langganan dari %s..."
 msgid "Unsubscribing to %s..."
 msgstr "Berhenti langganan dari %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "Tidak jadi tandai surat-surat yang: "
 
@@ -2928,7 +2731,7 @@ msgstr "Meletakkan surat ..."
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Gunakan 'toggle-write' supaya bisa menulis lagi!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Gunakan keyID = '%s' untuk %s?"
@@ -2938,20 +2741,16 @@ msgstr "Gunakan keyID = '%s' untuk %s?"
 msgid "Username at %s: "
 msgstr "Nama user di %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "Tidak ada bulan: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "Tidak ada bulan: %s"
 
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
-
 #: commands.c:89
 msgid "Verify PGP signature?"
 msgstr "Periksa tandatangan PGP?"
@@ -2960,11 +2759,7 @@ msgstr "Periksa tandatangan PGP?"
 msgid "Verifying message indexes..."
 msgstr "Memverifikasi indeks surat..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Lampiran"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "PERHATIAN! Anda akan menimpa %s, lanjut?"
@@ -2975,26 +2770,26 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "Sertifikat server sudah kadaluwarsa"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "Sertifikat server sudah kadaluwarsa"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "Sertifikat server belum sah"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "Sertifikat server belum sah"
@@ -3019,11 +2814,11 @@ msgstr "Menunggu fcntl lock... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "Menunggu flock... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Menunggu respons..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "Peringatan: IDN '%s' tidak benar."
@@ -3033,12 +2828,12 @@ msgstr "Peringatan: IDN '%s' tidak benar."
 msgid "Warning: At least one certification key has expired\n"
 msgstr "Sertifikat server sudah kadaluwarsa"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Peringatan: IDN '%s' di alias '%s' tidak benar.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Warning: Tidak dapat menyimpan sertifikat"
 
@@ -3059,17 +2854,17 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
 msgstr "Gagal membuat lampiran, nih..."
 
@@ -3082,7 +2877,7 @@ msgstr "Gagal menulis! Sebagian dari kotak surat disimpan ke %s"
 msgid "Write fault!"
 msgstr "Gagal menulis!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Simpan surat ke kotak surat"
 
@@ -3091,7 +2886,7 @@ msgstr "Simpan surat ke kotak surat"
 msgid "Writing %s..."
 msgstr "Menulis %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Menyimpan surat ke %s ..."
@@ -3101,74 +2896,56 @@ msgstr "Menyimpan surat ke %s ..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Menulis surat-surat... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Error di baris perintah: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
 msgstr "Anda telah punya alias dengan nama tersebut!"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Anda sudah memilih awal rangkaian."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Anda sudah memilih akhir rangkaian."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr "Anda di entry pertama."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Anda di halaman pertama."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr "Anda sudah di surat yang pertama."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr "Anda di halaman pertama."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
 msgstr "Anda di thread yang pertama."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr "Anda di entry terakhir."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Anda di halaman terakhir."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "Anda sudah di surat yang terakhir."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr "Anda di halaman terakhir."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
 msgstr "Sudah tidak bisa geser lagi. Jebol nanti."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
 msgstr "Sudah tidak bisa geser lagi. Jebol nanti."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
 msgstr "Anda tidak punya kumpulan alias!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
 msgstr "Tidak bisa menghapus satu-satunya lampiran."
 
@@ -3176,7 +2953,7 @@ msgstr "Tidak bisa menghapus satu-satunya lampiran."
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Anda hanya dapat menge-bounce bagian-bagian 'message/rfc822'."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Sudah betul?"
@@ -3201,7 +2978,7 @@ msgstr "[-- Stderr dari tampil-otomatis %s --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Tampil-otomatis dengan %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3209,11 +2986,11 @@ msgstr ""
 "[-- AWAL SURAT PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- AWAL PGP PUBLIC KEY BLOCK --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3221,7 +2998,7 @@ msgstr ""
 "[-- AWAL SURAT DG TANDATANGAN PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3230,42 +3007,42 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Tidak bisa menjalankan %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- AKHIR PESAN PGP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- AKHIR PGP PUBLIC KEY BLOCK --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- AKHIR PESAN DG TANDATANGAN PGP --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- Akhir data yang dienkripsi dg PGP/MIME --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- Akhir data yang dienkripsi dg PGP/MIME --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Akhir data yang dienkripsi dg S/MIME. --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Akhir data yg ditandatangani dg S/MIME. --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3279,7 +3056,7 @@ msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Error: Tidak ada bagian Multipart/Alternative yg bisa ditampilkan! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3287,7 +3064,7 @@ msgstr ""
 "[-- Error: Struktur multipart/signed tidak konsisten! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3296,11 +3073,11 @@ msgstr ""
 "[-- Error: Protokol multipart/signed %s tidak dikenal! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Error: tidak bisa membuat file sementara! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3308,14 +3085,14 @@ msgstr ""
 "[-- Error: tidak tahu dimana surat PGP dimulai! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- Error: akhir file tak diduga! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3328,7 +3105,7 @@ msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Error:  message/external-body tidak punya parameter access-type --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -3336,7 +3113,7 @@ msgstr ""
 "[-- Data berikut dienkripsi dg PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
@@ -3345,21 +3122,21 @@ msgstr ""
 "[-- Data berikut dienkripsi dg PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr "[-- Data berikut dienkripsi dg S/MIME --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr "[-- Data berikut ditandatangani dg S/MIME --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -3382,7 +3159,7 @@ msgstr "[-- Lampiran %s/%s ini tidak disertakan, --]\n"
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Jenis: %s/%s, Encoding: %s, Ukuran: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -3390,7 +3167,7 @@ msgstr ""
 "[-- Warning: Tidak dapat menemukan tandatangan. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3422,33 +3199,33 @@ msgstr "[-- nama: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- pada %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
 msgstr "Kadaluarsa"
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
 msgstr "Tdk valid "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
 msgstr "Dicabut   "
@@ -3462,16 +3239,43 @@ msgstr "[tanggal tidak betul]"
 msgid "[unable to calculate]"
 msgstr "[tidak bisa melakukan penghitungan]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: tidak ada alamat email"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Tidak dapat menemukan surat yang ditandai."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Tidak dapat menemukan surat yang ditandai."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Simpan salinan dari surat ini?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "edit keterangan lampiran"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "edit keterangan lampiran"
@@ -3480,22 +3284,90 @@ msgstr "edit keterangan lampiran"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: parameter terlalu banyak"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Gagal membaca direktori."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Tidak ada kotak surat dengan surat baru."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
 msgstr "color: parameternya kurang"
 
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Tidak ada surat baru"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
+
 #: commands.c:788
 msgid "converting"
 msgstr "melakukan konversi"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Simpan surat ke kotak surat"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
@@ -3511,18 +3383,99 @@ msgstr "tidak bisa memotong kotak surat sementara: %s"
 msgid "could not write temporary mail folder: %s"
 msgstr "Tidak bisa membuat kotak surat sementara: %s"
 
-#: browser.c:1206
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Tidak ada kotak surat incoming yang didefinisikan."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "taun"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
 msgstr "warna default tidak didukung"
 
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Hapus surat-surat dari server?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Tidak jadi hapus surat-surat yang: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Tidak jadi hapus surat-surat yang: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
+
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "gaesktnuip"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Edit surat yg diforward?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3538,21 +3491,108 @@ msgstr "Sedang menyalin ke %s..."
 msgid "echo Decompressing %s..."
 msgstr "Memilih %s..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Lampiran yg dipilih tidak akan dikonersi."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "edit keterangan lampiran"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Tidak dapat menulis surat"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Mengambil header surat... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Edit surat yg diforward?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Simpan salinan dari surat ini?"
+
 #: pattern.c:777
 msgid "empty pattern"
 msgstr "kriteria kosong"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
 msgstr "Enkrip"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Simpan salinan dari surat ini?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
 msgstr "error pada kriteria pada: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "error pada kriteria pada: %s"
@@ -3582,7 +3622,7 @@ msgstr "error pada kriteria pada: %s"
 msgid "error getting secret key `%s': %s\n"
 msgstr "error pada kriteria pada: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "error pada kriteria pada: %s"
@@ -3621,32 +3661,88 @@ msgstr "error pada kriteria pada: %s"
 msgid "error: unknown op %d (report this error)."
 msgstr "error: %d tidak dikenali (laporkan error ini)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "etsdilb"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "etsdilb"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec: tidak ada parameter"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Balas ke %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Forward sebagai lampiran?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Memeriksa surat baru..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Anda sudah di surat yang pertama."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
 msgid "gnutls_handshake: %s"
 msgstr ""
 
@@ -3655,12 +3751,32 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Anda di halaman terakhir."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Tidak ada kotak surat dengan surat baru."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Error sewaktu membuka kotak surat"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Tidak ada kotak surat dengan surat baru."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
@@ -3673,23 +3789,117 @@ msgstr "telah dihapus --]\n"
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE (hapus) gagal"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
 msgstr "kolom header tidak dikenali"
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Nomer indeks tidak betul."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Ke surat no: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Ke surat no: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Thread berisi surat yang belum dibaca."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Anda di thread yang pertama."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Tidak ada surat yang belum dibaca"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Tidak ada surat yang belum dibaca"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Simpan salinan dari surat ini?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP keys yg cocok dg <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Bounce surat yang telah ditandai ke: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Tidak ada kotak surat dengan surat baru."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: urutan tombol kosong"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro: parameter terlalu banyak"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
@@ -3699,6 +3909,38 @@ msgstr "entry mailcap untuk jenis %s tidak ditemukan"
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): tidak dapat mengeset waktu pada file"
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
@@ -3714,19 +3956,110 @@ msgstr "tanda kurung tidak klop: %s"
 msgid "missing parameter"
 msgstr "parameter tidak ada"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
 msgstr "mono: parameternya kurang"
 
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Anda di entry pertama."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Anda sudah di surat yang pertama."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Anda di entry terakhir."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Anda sudah di surat yang terakhir."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Anda di entry terakhir."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Anda di halaman terakhir."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Tidak ada surat yang tidak jadi dihapus."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Anda di entry pertama."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Anda di halaman pertama."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Tidak ada surat yang tidak jadi dihapus."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Anda di halaman pertama."
+
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
 msgstr "surat multi bagian tidak punya parameter batas!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "nggak"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "(tidak ada kotak surat)"
@@ -3735,55 +4068,308 @@ msgstr "(tidak ada kotak surat)"
 msgid "not converting"
 msgstr "tidak melakukan konversi"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "urutan tombol kosong"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
 msgstr "tab"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Buka kotak surat dengan mode read-only"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Buka kotak surat dengan mode read-only"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Membuka kembali kotak surat..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Bounce surat ke %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "prefix tidak diperbolehkan dengan reset"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Anda di entry pertama."
+
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push: parameter terlalu banyak"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Lanjutkan surat yang ditunda sebelumnya?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Thread berisi surat yang belum dibaca."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Tidak bisa menyunting surat di server POP"
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: tidak bisa melampirkan file"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Ke surat no: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Hapus surat-surat dari server?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ts"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "tsu"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Simpan%s ke kotak surat"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Simpan%s ke kotak surat"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Tidak bisa menyunting surat di server POP"
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "kesalahan pada ekspresi"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Cari: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Tidak bisa mengirim surat."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Forward sebagai lampiran?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Hanya surat-surat yang: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Tidak ada lagi teks kutipan."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Cetak surat?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Tidak ada surat di kotak tersebut."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: error pada %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: errors di %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: pembacaan dibatalkan sebab terlalu banyak error di %s"
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Tidak ada file yang sesuai dengan mask"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox diubah, tapi tidak ada surat yang berubah! (laporkan bug ini)"
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Tidak jadi tandai surat-surat yang: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Anda di thread yang pertama."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3794,23 +4380,94 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Tidak ada lagi teks kutipan."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Peng-coding-an ulang hanya berpengaruh terhadap lampiran teks."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Tidak ada kriteria pencarian."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Tidak ada surat yang belum dibaca"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
 msgstr "parameternya kurang"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "parameternya terlalu banyak"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "edit keterangan lampiran"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Tidak jadi hapus surat-surat yang: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Tidak jadi hapus surat-surat yang: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Tidak jadi hapus surat-surat yang: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
@@ -3826,10 +4483,28 @@ msgstr "unhook: Tidak dapat melakukan unhook * dari hook."
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: jenis tidak dikenali: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "eh..eh.. napa nih?"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Tidak jadi tandai surat-surat yang: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "edit keterangan lampiran"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3841,12 +4516,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
 msgstr "nilai tidak diperbolehkan dengan reset"
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Lampiran telah disimpan."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "File baru: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Simpan surat ke kotak surat"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "ya"
 
@@ -3854,3 +4560,6 @@ msgstr "ya"
 msgid "yna"
 msgstr "yts"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/it.po b/po/it.po
index d6db066..19c4f72 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt-1.3.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2004-08-22 22:12+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Assegnazioni generiche:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Funzioni non assegnate:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -69,14 +69,14 @@ msgid ""
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
 "uso: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <tipo> ] [ -f <file> ]\n"
-"····· ·mutt·[·-nR·]·[·-e·<cmd>·]·[·-F·<file>·]·-Q·<query>·[·-Q·<query>·]·"
+"····· ·mutt·[·-nR·]·[·-e·<cmd>·]·[·-F·<file>·]·-Q·<query>·[·-Q·<query>·]·"
 "[...]\n"
-"·······mutt·[·-nR·]·[·-e·<cmd>·]·[·-F·<file>·]·-A·<alias>·[·-A·<alias>·]·"
+"·······mutt·[·-nR·]·[·-e·<cmd>·]·[·-F·<file>·]·-A·<alias>·[·-A·<alias>·]·"
 "[...]\n"
-"·······mutt·[·-nx·]·[·-e·<cmd>·]·[·-a·<file>·]·[·-F·<file>·]·[·-H·<file>·]·"
-"[·-i·<file>·]·[·-s·<subj>·]·[·-b·<indir>·]·[·-c·<indir>·]·<indir>·[·...·]\n"
-"·······mutt·[·-n·]·[·-e·<cmd>·]·[·-F·<file>·]·-p\n"
-"·······mutt·-v[v]\n"
+"·······mutt·[·-nx·]·[·-e·<cmd>·]·[·-a·<file>·]·[·-F·<file>·]·[·-H·<file>·]·"
+"[·-i·<file>·]·[·-s·<subj>·]·[·-b·<indir>·]·[·-c·<indir>·]·<indir>·[·...·]\n"
+"·······mutt·[·-n·]·[·-e·<cmd>·]·[·-F·<file>·]·-p\n"
+"·······mutt·-v[v]\n"
 "\n"
 "opzioni\n"
 "  -A <alias>\tespande l'alias indicato\n"
@@ -94,23 +94,23 @@ msgstr ""
 "  -R\t\tapri la mailbox in sola lettura\n"
 "  -s <sogg>\tspecifica il Subject (deve essere tra apici se ha spazi)\n"
 "  -v\t\tmostra la versione e le definizioni della compilazione\n"
-"  -x\t\tsimula la modalità invio di mailx\n"
+"  -x\t\tsimula la modalità invio di mailx\n"
 "  -y\t\tseleziona una mailbox specificata nella lista `mailboxes'\n"
 "  -z\t\tesce immediatamente se non ci sono messaggi nella mailbox\n"
 "  -Z\t\tapre il primo folder con un nuovo messaggio, esce se non ce ne sono\n"
 "  -h\t\tquesto messaggio di aiuto"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " firma come: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "    a %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "    da %s"
@@ -153,15 +153,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' per la lista): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
 msgstr "(continua)\n"
@@ -171,11 +171,11 @@ msgstr "(continua)\n"
 msgid " Press '%s' to toggle write"
 msgstr "Premi '%s' per (dis)abilitare la scrittura"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr " in questa visualizzazione limitata"
 
@@ -191,7 +191,7 @@ msgstr "%c: comando non valido"
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: non gestito in questa modalità"
+msgstr "%c: non gestito in questa modalità"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
@@ -203,42 +203,42 @@ msgstr "%d tenuti, %d cancellati."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d tenuti, %d spostati, %d cancellati."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s Vuoi veramente usare questa chiave?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] è stato modificato. Aggiorno la codifica?"
+msgstr "%s [#%d] è stato modificato. Aggiorno la codifica?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] non esiste più!"
+msgstr "%s [#%d] non esiste più!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d messaggi letti su %d]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s non esiste. Lo creo?"
@@ -246,47 +246,47 @@ msgstr "%s non esiste. Lo creo?"
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s non è un percorso IMAP valido"
+msgstr "%s non è un percorso IMAP valido"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s non è un percorso POP valido"
+msgstr "%s non è un percorso POP valido"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s non è un percorso POP valido"
+msgstr "%s non è un percorso POP valido"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s non è un percorso POP valido"
+msgstr "%s non è un percorso POP valido"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s non è una directory."
+msgstr "%s non è una directory."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s non è una mailbox!"
+msgstr "%s non è una mailbox!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s non è una mailbox."
+msgstr "%s non è una mailbox."
 
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s non è un file regolare."
+msgstr "%s non è un file regolare."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s non esiste più!"
+msgstr "%s non esiste più!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -300,52 +300,52 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: tipo sconosciuto."
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: il colore non è gestito dal terminale"
+msgstr "%s: il colore non è gestito dal terminale"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s: comando valido solo per l'oggetto index"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: attributo inesistente"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: colore inesistente"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: la funzione non esiste"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: la funzione non è nella mappa"
+msgstr "%s: la funzione non è nella mappa"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: menù inesistente"
+msgstr "%s: menù inesistente"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: oggetto inesistente"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: troppo pochi argomenti"
@@ -355,54 +355,54 @@ msgstr "%s: troppo pochi argomenti"
 msgid "%s: unable to attach file"
 msgstr "%s: impossibile allegare il file"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: impossibile allegare il file.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando sconosciuto"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: tipo sconosciuto"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: variabile sconosciuta"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s non è un percorso POP valido"
+msgstr "%s non è un percorso POP valido"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s non è un percorso POP valido"
+msgstr "%s non è un percorso POP valido"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' deve essere assegnato a un tasto!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(nessuna mailbox)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ifiuta, accetta questa v(o)lta"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ifiuta, accetta questa v(o)lta, (a)ccetta sempre"
 
@@ -420,20 +420,20 @@ msgstr "(usa '%s' per vederlo)"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Allegati"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<SCONOSCIUTO>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<predefinito>"
 
@@ -449,35 +449,31 @@ msgstr ""
 msgid "APOP authentication failed."
 msgstr "Autenticazione APOP fallita."
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Abbandona"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
 msgstr "Abbandono il messaggio non modificato?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
 msgstr "Ho abbandonato il messaggio non modificato."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Indirizzo: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Alias aggiunto."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Crea l'alias: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Crea l'alias"
 
@@ -485,64 +481,60 @@ msgstr "Crea l'alias"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "Tutte le chiavi corrispondenti sono scadute, revocate o disattivate."
 
-#: remailer.c:431
-msgid "Append"
-msgstr "Accoda"
-
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Accodo i messaggi a %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
 msgstr "L'argomento deve essere il numero di un messaggio."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Allegato salvato."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Allega un file"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Allego i file selezionati..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Allegato filtrato."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Allegato salvato."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Allegati"
 
@@ -571,14 +563,14 @@ msgstr ""
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "L'IDN \"%s\" non è valido."
+msgstr "L'IDN \"%s\" non è valido."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Trovato l'IDN %s non valido preparando l'header resent-from"
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "IDN non valido in \"%s\": '%s'"
@@ -592,7 +584,7 @@ msgstr "IDN non valido: '%s'"
 msgid "Bad mailbox name"
 msgstr "Nome della mailbox non valido"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "Il messaggio finisce qui."
 
@@ -614,7 +606,7 @@ msgstr "Rimbalza i messaggi a %s"
 msgid "Bounce tagged messages to: "
 msgstr "Rimbalza i messaggi segnati a: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -631,16 +623,16 @@ msgstr ""
 msgid "Can't append to folder: %s"
 msgstr "Impossibile accodare al folder: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "Impossibile allegare una directory!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Impossibile creare %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Impossibile creare il file %s"
@@ -653,10 +645,10 @@ msgstr "Impossibile creare il filtro"
 msgid "Can't create filter process"
 msgstr "Impossibile creare il processo filtro"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "Impossibile creare il file temporaneo"
 
@@ -670,15 +662,15 @@ msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
 "Impossibile decodificare tutti gli allegati segnati. Uso MIME per gli altri?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
 msgstr "Impossibile decifrare il messaggio cifrato!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "Impossibile cancellare l'allegato dal server POP"
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "Impossibile cancellare l'allegato dal server POP"
@@ -696,10 +688,6 @@ msgstr ""
 msgid "Can't find any tagged messages."
 msgstr "Non ci sono messaggi segnati."
 
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Non trovo type2.list di mixmaster!"
-
 # FIXME
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
@@ -715,27 +703,27 @@ msgstr "Impossibile aprire il file del messaggio: %s"
 msgid "Can't open trash folder"
 msgstr "Impossibile accodare al folder: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "Connessione a %s chiusa."
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "Chiudo la connessione al server POP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Impossibile fare stat di %s: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "Impossibile creare %s: %s."
@@ -749,7 +737,7 @@ msgstr "Impossibile salvare il messaggio nella mailbox POP."
 msgid "Can't save message to newsserver."
 msgstr "Impossibile modificare i messaggi sul server POP."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Impossibile fare stat di %s: %s"
@@ -758,11 +746,11 @@ msgstr "Impossibile fare stat di %s: %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "Impossibile vedere una directory"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "Impossibile creare %s."
@@ -787,42 +775,38 @@ msgstr "Impossibile creare il filtro di visualizzazione"
 msgid "Cannot create filter"
 msgstr "Impossibile creare il filtro"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Impossibile (dis)abilitare la scrittura a una mailbox di sola lettura!"
 
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
-
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "Preso %s...  Esco.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "Il certificato del server non è ancora valido"
+msgstr "Il certificato del server non è ancora valido"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Certificato salvato"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
 msgstr "I cambiamenti al folder saranno scritti all'uscita dal folder."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
 msgstr "I cambiamenti al folder non saranno scritti."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Car = %s, Ottale = %o, Decimale = %d"
@@ -830,30 +814,22 @@ msgstr "Car = %s, Ottale = %o, Decimale = %d"
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Il set di caratteri è stato cambiato in %s; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "CambiaDir"
+msgstr "Il set di caratteri è stato cambiato in %s; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Cambia directory:"
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Controllo se ci sono nuovi messaggi..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Controlla la chiave  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Controllo se ci sono nuovi messaggi..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Controllo se ci sono nuovi messaggi..."
@@ -862,7 +838,7 @@ msgstr "Controllo se ci sono nuovi messaggi..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Normale"
 
@@ -870,7 +846,7 @@ msgstr "Normale"
 msgid "Clear flag"
 msgstr "Cancella il flag"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Chiudo la connessione a %s..."
@@ -879,7 +855,7 @@ msgstr "Chiudo la connessione a %s..."
 msgid "Closing connection to POP server..."
 msgstr "Chiudo la connessione al server POP..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Mi connetto a %s..."
@@ -887,18 +863,18 @@ msgstr "Mi connetto a %s..."
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Il comando TOP non è gestito dal server."
+msgstr "Il comando TOP non è gestito dal server."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Il comando UIDL non è gestito dal server."
+msgstr "Il comando UIDL non è gestito dal server."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
 msgstr "Applico i cambiamenti..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -919,12 +895,12 @@ msgstr "Copio in %s..."
 msgid "Compressing %s..."
 msgstr "Copio in %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Mi connetto a %s..."
@@ -953,7 +929,7 @@ msgstr "Connessione persa. Mi riconnetto al server POP?"
 msgid "Connection to %s closed"
 msgstr "Connessione a %s chiusa."
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "Connessione a %s chiusa."
@@ -961,11 +937,11 @@ msgstr "Connessione a %s chiusa."
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Il Content-Type è stato cambiato in %s."
+msgstr "Il Content-Type è stato cambiato in %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-Type non è nella forma base/sub"
+msgstr "Content-Type non è nella forma base/sub"
 
 #: imap/util.c:135
 msgid "Continue?"
@@ -1016,9 +992,9 @@ msgstr "Impossibile connettersi a %s (%s)."
 msgid "Could not copy message"
 msgstr "Impossibile copiare il messaggio"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
 msgstr "Impossibile creare il file temporaneo!"
@@ -1036,7 +1012,7 @@ msgstr "Could not find sorting function! [segnala questo bug]"
 msgid "Could not find the host \"%s\""
 msgstr "Impossibile trovare l'host \"%s\"."
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
 msgstr "Non ho potuto includere tutti i messaggi richiesti!"
 
@@ -1053,7 +1029,7 @@ msgstr "Impossibile aprire %s"
 msgid "Could not reopen mailbox!"
 msgstr "Impossibile riaprire la mailbox!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "Impossibile spedire il messaggio."
 
@@ -1067,9 +1043,9 @@ msgstr "Impossibile fare il lock di %s\n"
 msgid "Create %s?"
 msgstr "Creo %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "È possibile creare solo mailbox IMAP"
+msgstr "È possibile creare solo mailbox IMAP"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
@@ -1100,74 +1076,61 @@ msgstr "Decifra e copia nella mailbox%s"
 msgid "Decrypt-save%s to mailbox"
 msgstr "Decifra e salva nella mailbox%s"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "Prendo il messaggio..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
 msgstr "Decifratura fallita."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Canc"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Cancella"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "È possibile cancellare solo mailbox IMAP"
+msgstr "È possibile cancellare solo mailbox IMAP"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
 msgstr "Cancello i messaggi dal server?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Cancella i messaggi corrispondenti a: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Cancella"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "La cancellazione di allegati da messaggi cifrati non è gestita."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Descr"
+msgstr "La cancellazione di allegati da messaggi cifrati non è gestita."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "L'ID %s non è verificato. Vuoi usarlo per %s?"
+msgstr "L'ID %s non è verificato. Vuoi usarlo per %s?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
 msgstr "%s non esiste. Lo creo?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Directory [%s], Maschera dei file: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "ERRORE: per favore segnala questo bug"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
 msgstr "Modificare il messaggio da inoltrare?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1176,11 +1139,11 @@ msgstr ""
 msgid "Empty expression"
 msgstr "errore nell'espressione"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Crittografa"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
 msgstr "Cifra con: "
 
@@ -1188,17 +1151,17 @@ msgstr "Cifra con: "
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Inserisci il keyID: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Inserisci il keyID per %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
 msgstr "Inserisci i tasti (^G per annullare): "
 
@@ -1225,7 +1188,7 @@ msgstr "Errore nella connessione al server: %s"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Errore nella connessione al server: %s"
@@ -1234,12 +1197,12 @@ msgstr "Errore nella connessione al server: %s"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Errore in %s, linea %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Errore nella riga di comando: %s\n"
@@ -1249,12 +1212,12 @@ msgstr "Errore nella riga di comando: %s\n"
 msgid "Error in expression: %s"
 msgstr "Errore nell'espressione: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Errore nell'inizializzazione del terminale."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Errore nell'inizializzazione del terminale."
 
@@ -1266,41 +1229,32 @@ msgstr "Errore durante l'apertura della mailbox"
 msgid "Error parsing address!"
 msgstr "Errore nella lettura dell'indirizzo!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Errore eseguendo \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "Errore nella lettura della directory."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Errore nella spedizione del messaggio, il figlio è uscito con %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Errore nella spedizione del messaggio, il figlio è uscito con %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Errore durante l'invio del messaggio."
+msgstr "Errore nella spedizione del messaggio, il figlio è uscito con %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Errore parlando a %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "C'è stato un errore nella visualizzazione del file"
+msgstr "C'è stato un errore nella visualizzazione del file"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
@@ -1311,25 +1265,20 @@ msgstr "Errore durante la scrittura della mailbox!"
 msgid "Error. Preserving temporary file: %s"
 msgstr "Errore. Preservato il file temporaneo: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Errore: %s non può essere usato come remailer finale di una catena."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "Errore: '%s' non è un IDN valido."
+msgstr "Errore: '%s' non è un IDN valido."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1346,7 +1295,7 @@ msgstr "Errore: multipart/signed non ha protocollo."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Errore nella riga di comando: %s\n"
@@ -1360,21 +1309,12 @@ msgstr "Prendo gli header dei messaggi... [%d/%d]"
 msgid "Executing command on matching messages..."
 msgstr "Eseguo il comando sui messaggi corrispondenti..."
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Esci"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Esci  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
 msgstr "Esci da Mutt senza salvare?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
 msgstr "Esci da mutt?"
@@ -1406,19 +1346,19 @@ msgstr "Errore fatale!  Impossibile riaprire la mailbox!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Errore fatale. Il numero dei messaggi non è sincronizzato!"
+msgstr "Errore fatale. Il numero dei messaggi non è sincronizzato!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Cancello i messaggi dal server..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "Prendo il messaggio..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "Prendo la lista dei messaggi..."
@@ -1427,7 +1367,7 @@ msgstr "Prendo la lista dei messaggi..."
 msgid "Fetching list of messages..."
 msgstr "Prendo la lista dei messaggi..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "Prendo gli header dei messaggi... [%d/%d]"
@@ -1437,11 +1377,11 @@ msgstr "Prendo gli header dei messaggi... [%d/%d]"
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Prendo gli header dei messaggi... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Prendo il messaggio..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "Maschera dei file: "
 
@@ -1451,51 +1391,45 @@ msgstr "Il file esiste, lo s(o)vrascrivo, (a)ccodo, o (c)ancello l'operazione?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Il file è una directory, salvo lì dentro?"
+msgstr "Il file è una directory, salvo lì dentro?"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Il file è una directory, salvo lì dentro? [(s)ì, (n)o, (t)utti]"
+msgstr "Il file è una directory, salvo lì dentro? [(s)ì, (n)o, (t)utti]"
 
 #: muttlib.c:249
 msgid "File under directory: "
 msgstr "File nella directory: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filtra attraverso: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Fingerprint: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "salva questo messaggio per inviarlo in seguito"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
 # FIXME - come tradurre questo messaggio?
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Rispondo a %s%s?"
 
-# FIXME - come tradurre questo messaggio?
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Rispondo a %s%s?"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "Inoltro incapsulato in MIME?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Inoltro come allegato?"
 
@@ -1503,9 +1437,9 @@ msgstr "Inoltro come allegato?"
 msgid "Forward as attachments?"
 msgstr "Inoltro come allegati?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Funzione non permessa nella modalità attach-message."
+msgstr "Funzione non permessa nella modalità attach-message."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
@@ -1519,65 +1453,54 @@ msgstr "Scarico i namespace..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Gruppo"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Aiuto"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Aiuto per %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "L'help è questo."
+msgstr "L'help è questo."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
 msgstr "Non so come stamparlo!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Non so come stampare allegati %s!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "L'ID ha validità indefinita."
+msgstr "L'ID ha validità indefinita."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "L'ID è scaduto/disabilitato/revocato."
+msgstr "L'ID è scaduto/disabilitato/revocato."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "L'ID non è valido."
+msgstr "L'ID non è valido."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "L'ID è solo marginalmente valido."
+msgstr "L'ID è solo marginalmente valido."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
 msgstr "Header PGP non consentito"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
 msgstr "Header S/MIME non consentito"
 
@@ -1586,39 +1509,35 @@ msgstr "Header S/MIME non consentito"
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "Voce impropriamente formattata per il tipo %s in \"%s\", linea %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr "Includo il messaggio nella risposta?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Includo il messaggio citato..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Inserisce"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Giorno del mese non valido: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "Codifica non valida."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "Numero dell'indice non valido."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
 msgstr "Numero del messaggio non valido."
 
@@ -1632,11 +1551,11 @@ msgstr "Mese non valido: %s"
 msgid "Invalid relative date: %s"
 msgstr "Data relativa non valida: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "Eseguo PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "Eseguo PGP..."
@@ -1646,76 +1565,72 @@ msgstr "Eseguo PGP..."
 msgid "Invoking autoview command: %s"
 msgstr "Richiamo il comando di autovisualizzazione: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Salta al messaggio: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Salta a: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
 msgstr "I salti non sono implementati per i dialog."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Il tasto non è assegnato."
+msgstr "Il tasto non è assegnato."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Il tasto non è assegnato.  Premi '%s' per l'aiuto."
+msgstr "Il tasto non è assegnato.  Premi '%s' per l'aiuto."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "Limita ai messaggi corrispondenti a: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Limita: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Faccio il login..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1725,15 +1640,15 @@ msgstr ""
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "Tentati troppi lock, rimuovo il lock di %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Faccio il login..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Login fallito."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "Cerco chiavi corrispondenti a \"%s\"..."
@@ -1743,7 +1658,7 @@ msgstr "Cerco chiavi corrispondenti a \"%s\"..."
 msgid "Looking up %s..."
 msgstr "Cerco %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Fingerprint: %s"
@@ -1752,23 +1667,19 @@ msgstr "Fingerprint: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "Tipo MIME non definito.  Impossibile visualizzare l'allegato."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "Individuato un loop di macro."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Mail"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "Il messaggio non è stato spedito."
+msgstr "Il messaggio non è stato spedito."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Messaggio spedito."
 
@@ -1784,32 +1695,32 @@ msgstr "Mailbox chiusa"
 msgid "Mailbox created."
 msgstr "Mailbox creata."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr "Mailbox cancellata."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "La mailbox è vuota."
+msgstr "La mailbox è vuota."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "La mailbox è indicata non scrivibile. %s"
+msgstr "La mailbox è indicata non scrivibile. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "La mailbox è di sola lettura."
+msgstr "La mailbox è di sola lettura."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "La mailbox non è stata modificata."
+msgstr "La mailbox non è stata modificata."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
 msgstr "La mailbox deve avere un nome."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
 msgstr "Mailbox non cancellata."
 
@@ -1820,18 +1731,18 @@ msgstr "Mailbox creata."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "La mailbox è stata rovinata!"
+msgstr "La mailbox è stata rovinata!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "La mailbox è stata modificata dall'esterno."
+msgstr "La mailbox è stata modificata dall'esterno."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
-"La mailbox è stata modificata dall'esterno.  I flag possono essere sbagliati."
+"La mailbox è stata modificata dall'esterno.  I flag possono essere sbagliati."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Mailbox [%d]"
@@ -1846,11 +1757,7 @@ msgstr "La voce edit di mailcap richiede %%s"
 msgid "Mailcap compose entry requires %%s"
 msgstr "La voce compose di mailcap richiede %%s"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Crea un alias"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1859,19 +1766,15 @@ msgstr ""
 msgid "Marking %d messages deleted..."
 msgstr "Segno cancellati %d messaggi..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Maschera"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Messaggio rimbalzato."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1881,7 +1784,7 @@ msgstr "Impossibile stampare il messaggio"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "Il file del messaggio è vuoto!"
+msgstr "Il file del messaggio è vuoto!"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
@@ -1891,20 +1794,20 @@ msgstr "Messaggio non rimbalzato."
 msgid "Message not modified!"
 msgstr "Messaggio non modificato!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Il messaggio padre non è visibil in questa visualizzazione limitata."
+msgstr "Il messaggio padre non è visibil in questa visualizzazione limitata."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Il messaggio è stato rimandato."
+msgstr "Il messaggio è stato rimandato."
 
 #: commands.c:390
 msgid "Message printed"
 msgstr "Messaggio stampato"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Messaggio scritto."
 
@@ -1924,19 +1827,10 @@ msgstr "Messaggi non rimbalzati."
 msgid "Messages printed"
 msgstr "Messaggi stampati"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Mancano dei parametri."
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Le catene mixmaster sono limitate a %d elementi."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster non accetta header Cc o Bcc."
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
@@ -1947,19 +1841,15 @@ msgstr "Sposto i messaggi letti in %s?"
 msgid "Moving read messages to %s..."
 msgstr "Sposto i messaggi letti in %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nuova Ricerca"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nuovo nome del file: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Nuovo file: "
 
@@ -1967,41 +1857,33 @@ msgstr "Nuovo file: "
 msgid "New mail in "
 msgstr "Nuova posta in "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "C'è nuova posta in questa mailbox."
+msgstr "C'è nuova posta in questa mailbox."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Succ"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "PgSucc"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2013,30 +1895,30 @@ msgstr "Non ci sono autenticatori disponibili."
 msgid "No boundary parameter found! [report this error]"
 msgstr "No boundary parameter found! [segnala questo errore]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Nessuna voce."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Non ci sono file corrispondenti alla maschera"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Non è stata definita una mailbox di ingresso."
+msgstr "Non è stata definita una mailbox di ingresso."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Non è attivo alcun modello limitatore."
+msgstr "Non è attivo alcun modello limitatore."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
 msgstr "Nessuna mailbox aperta."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr "Nessuna mailbox con nuova posta."
 
@@ -2050,17 +1932,17 @@ msgstr "Manca la voce compose di mailcap per %s, creo un file vuoto."
 msgid "No mailcap edit entry for %s"
 msgstr "Manca la voce edit di mailcap per %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "Non è stata trovata alcuna mailing list!"
+msgstr "Non è stata trovata alcuna mailing list!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr ""
-"Non è stata trovata la voce di mailcap corrispondente.  Visualizzo come "
+"Non è stata trovata la voce di mailcap corrispondente.  Visualizzo come "
 "testo."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "In questo folder non ci sono messaggi."
 
@@ -2068,87 +1950,77 @@ msgstr "In questo folder non ci sono messaggi."
 msgid "No messages matched criteria."
 msgstr "Nessun messaggio corrisponde al criterio."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "Non c'è altro testo citato."
+msgstr "Non c'è altro testo citato."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "Non ci sono altri thread."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Non c'è altro testo non citato dopo quello citato."
+msgstr "Non c'è altro testo non citato dopo quello citato."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Non c'è nuova posta nella mailbox POP."
+msgstr "Non c'è nuova posta nella mailbox POP."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Non ci sono nuovi messaggi"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Non è stato specificato un soggetto."
+msgstr "Non è stato specificato un soggetto."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Non ci sono file corrispondenti alla maschera"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Nessuna mailbox con nuova posta."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "Non ci sono messaggi rimandati."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Nessuna mailbox con nuova posta."
-
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Non è stato definito un comando di stampa."
+msgstr "Non è stato definito un comando di stampa."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
 msgstr "Non sono stati specificati destinatari!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr "Nessun destinatario specificato.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
 msgstr "Non sono stati specificati destinatari."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "Nessun modello di ricerca."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Non è stato specificato un soggetto."
+msgstr "Non è stato specificato un soggetto."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "Nessun soggetto, abbandono l'invio?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "Nessun soggetto, lo abbandono?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Nessun soggetto, abbandonato."
 
@@ -2156,108 +2028,104 @@ msgstr "Nessun soggetto, abbandonato."
 msgid "No such folder"
 msgstr "Folder inesistente"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "Nessuna voce segnata."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Non è visibile alcun messaggio segnato!"
+msgstr "Non è visibile alcun messaggio segnato!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "Nessun messaggio segnato."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr "Nessun messaggio da de-cancellare."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "Non ci sono messaggi non letti"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "Non ci sono messaggi visibili"
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Non disponibile in questo menù."
+msgstr "Non disponibile in questo menù."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Non trovato."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
 msgstr "Niente da fare."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "È gestita solo la cancellazione degli allegati multiparte."
+msgstr "È gestita solo la cancellazione degli allegati multiparte."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
 msgstr "Apri la mailbox"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
 msgstr "Apri la mailbox in sola lettura"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
 msgstr "Apri la mailbox da cui allegare il messaggio"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "Apri la mailbox in sola lettura"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "Apri la mailbox da cui allegare il messaggio"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Output del processo di consegna"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
 "PGP: cifra(e), firma(s), firma (c)ome, entram(b)i, in l(i)nea, (a)nnullare? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP già selezionato. Annullare & continuare? "
+msgstr "PGP già selezionato. Annullare & continuare? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "Chiavi PGP corrispondenti a <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "Chiavi PGP corrispondenti a <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "Non è stato possibile verificare la firma PGP."
+msgstr "Non è stato possibile verificare la firma PGP."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
@@ -2265,55 +2133,42 @@ msgstr "Firma PGP verificata con successo."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "L'host POP non è stato definito."
+msgstr "L'host POP non è stato definito."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Il messaggio padre non è disponibile."
+msgstr "Il messaggio padre non è disponibile."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Il messaggio padre non è visibil in questa visualizzazione limitata."
+msgstr "Il messaggio padre non è visibil in questa visualizzazione limitata."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Password per %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Nome della persona: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Pipe"
-
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "Apri una pipe con il comando: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Manda con una pipe a: "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "Imposta la variabile hostname al valore corretto quando usi mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr "Rimando a dopo questo messaggio?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Messaggi Rimandati"
 
@@ -2321,23 +2176,15 @@ msgstr "Messaggi Rimandati"
 msgid "Preconnect command failed."
 msgstr "Comando di preconnessione fallito."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "Preparo il messaggio inoltrato..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr "Premi un tasto per continuare..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "PgPrec"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Stampa"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "Stampo l'allegato?"
 
@@ -2345,7 +2192,7 @@ msgstr "Stampo l'allegato?"
 msgid "Print message?"
 msgstr "Stampo il messaggio?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
 msgstr "Stampo gli allegati segnati?"
 
@@ -2363,34 +2210,30 @@ msgstr "Cancello %d messaggio cancellato?"
 msgid "Purge %d deleted messages?"
 msgstr "Cancello %d messaggi cancellati?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Ricerca"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Ricerca '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Il comando della ricerca non è definito."
+msgstr "Il comando della ricerca non è definito."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Cerca: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Esci"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "Esci da Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Scarico i namespace..."
@@ -2415,16 +2258,16 @@ msgstr "Leggo %s... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Leggo i nuovi messaggi (%d byte)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Cancello davvero la mailbox \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
 msgstr "Richiamo il messaggio rimandato?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr "La ricodifica ha effetti solo sugli allegati di testo."
 
@@ -2433,17 +2276,17 @@ msgstr "La ricodifica ha effetti solo sugli allegati di testo."
 msgid "Rename failed: %s"
 msgstr "SSL fallito: %s"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "È possibile creare solo mailbox IMAP"
+msgstr "È possibile creare solo mailbox IMAP"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Crea la mailbox:"
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Rinomina in: "
 
@@ -2451,15 +2294,11 @@ msgstr "Rinomina in: "
 msgid "Reopening mailbox..."
 msgstr "Riapro la mailbox..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Rispondi"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Rispondo a %s%s?"
@@ -2472,34 +2311,34 @@ msgid ""
 msgstr ""
 "OrdContr (d)ata/(f)rom/(r)icev/(s)ogg/t(o)/(t)hread/n(u)lla/si(z)e/s(c)ore?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr "Cerca all'indietro: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
 msgstr "Cerca all'indietro: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Ordino al contrario per (d)ata, (a)lfabetico, dimensioni(z) o (n)ulla? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
 "PGP: cifra(e), firma(s), firma (c)ome, entram(b)i, in l(i)nea, (a)nnullare? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME già selezionato. Annullare & continuare? "
+msgstr "S/MIME già selezionato. Annullare & continuare? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
 msgstr "Il proprietario del certificato S/MIME non corrisponde al mittente."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "Certificati S/MIME corrispondenti a \"%s\"."
@@ -2510,7 +2349,7 @@ msgstr "I messaggi S/MIME senza suggerimenti del contenuto non sono gestiti."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "Non è stato possibile verificare la firma S/MIME."
+msgstr "Non è stato possibile verificare la firma S/MIME."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
@@ -2520,7 +2359,7 @@ msgstr "Firma S/MIME verificata con successo."
 msgid "SASL authentication failed."
 msgstr "Autenticazione SASL fallita."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Fingerprint: %s"
@@ -2530,20 +2369,16 @@ msgstr "Fingerprint: %s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "Connessione SSL con %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Salva"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "Salvo una copia di questo messaggio?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Salva nel file: "
 
@@ -2557,86 +2392,66 @@ msgstr "Salva nella mailbox%s"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Salvo i flag di stato dei messaggi... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Salvo..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Cerca"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Cerca: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "La ricerca è arrivata in fondo senza trovare una corrispondenza"
+msgstr "La ricerca è arrivata in fondo senza trovare una corrispondenza"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "La ricerca è arrivata all'inizio senza trovare una corrispondenza"
+msgstr "La ricerca è arrivata all'inizio senza trovare una corrispondenza"
 
 #: pattern.c:1320
 msgid "Search interrupted."
 msgstr "Ricerca interrotta."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "In questo menù la ricerca non è stata implementata."
+msgstr "In questo menù la ricerca non è stata implementata."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "La ricerca è ritornata al fondo."
+msgstr "La ricerca è ritornata al fondo."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "La ricerca è ritornata all'inizio."
+msgstr "La ricerca è ritornata all'inizio."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Cerca: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Seleziona"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Seleziona  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Seleziona una catena di remailer."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "Seleziono %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Spedisci"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Invio in background."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Spedisco il messaggio..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
 msgstr "Il server ha chiuso la connessione!"
 
@@ -2648,15 +2463,15 @@ msgstr "Imposta il flag"
 msgid "Shell command: "
 msgstr "Comando della shell: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Firma"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Firma come: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Firma, Crittografa"
 
@@ -2669,7 +2484,7 @@ msgstr ""
 "Ordina per (d)ata/(f)rom/(r)icev/(s)ogg/t(o)/(t)hread/n(u)lla/si(z)e/s(c)"
 "ore?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Ordino per (d)ata, (a)lfabetico, dimensioni(z) o (n)ulla? "
 
@@ -2678,26 +2493,22 @@ msgstr "Ordino per (d)ata, (a)lfabetico, dimensioni(z) o (n)ulla? "
 msgid "Sorting mailbox..."
 msgstr "Ordino la mailbox..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Iscritto [%s], Maschera dei file: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2706,96 +2517,92 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "Mi iscrivo a %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "Controllo del certificato SSL"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr "Segna i messaggi corrispondenti a: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
 msgstr "Segna i messaggi che vuoi allegare!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Non è possibile segnare un messaggio."
+msgstr "Non è possibile segnare un messaggio."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Questo messaggio non è visibile."
+msgstr "Questo messaggio non è visibile."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL non è disponibile."
+msgstr "SSL non è disponibile."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "L'allegato corrente sarà convertito."
+msgstr "L'allegato corrente sarà convertito."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "L'allegato corrente non sarà convertito."
+msgstr "L'allegato corrente non sarà convertito."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "L'indice dei messaggi non è corretto; prova a riaprire la mailbox."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "La catena di remailer è già vuota."
+msgstr "L'indice dei messaggi non è corretto; prova a riaprire la mailbox."
 
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "Non ci sono allegati."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Non ci sono messaggi."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "Non ci sono sottoparti da visualizzare!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Questo server IMAP è troppo vecchio, mutt non può usarlo."
+msgstr "Questo server IMAP è troppo vecchio, mutt non può usarlo."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr "Questo certificato appartiene a:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Questo certificato è valido"
+msgstr "Questo certificato è valido"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Questo certificato è stato emesso da:"
+msgstr "Questo certificato è stato emesso da:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Questa chiave non può essere usata: è scaduta/disabilitata/revocata."
+msgstr "Questa chiave non può essere usata: è scaduta/disabilitata/revocata."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
 msgstr "Il thread contiene messaggi non letti."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Il threading non è attivo."
+msgstr "Il threading non è attivo."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
@@ -2807,23 +2614,27 @@ msgstr "Timeout scaduto durante il tentativo di lock fcntl!"
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "Timeout scaduto durante il tentativo di lock flock!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "L'inizio del messaggio è questo."
+msgstr "L'inizio del messaggio è questo."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr "Cerco di estrarre le chiavi PGP...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "Cerco di estrarre i certificati S/MIME...\n"
 
@@ -2842,12 +2653,12 @@ msgstr ""
 msgid "USER authentication failed."
 msgstr "Autenticazione SASL fallita."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Impossibile allegare %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "Impossibile allegare!"
 
@@ -2855,7 +2666,7 @@ msgstr "Impossibile allegare!"
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Impossibile scaricare gli header da questa versione del server IMAP."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "Impossibile ottenere il certificato dal peer"
 
@@ -2863,7 +2674,7 @@ msgstr "Impossibile ottenere il certificato dal peer"
 msgid "Unable to leave messages on server."
 msgstr "Impossibile lasciare i messaggi sul server."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "Impossibile allegare %s!"
@@ -2873,12 +2684,12 @@ msgstr "Impossibile allegare %s!"
 msgid "Unable to lock mailbox!"
 msgstr "Impossibile bloccare la mailbox."
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
 msgstr "Impossibile aprire il file temporaneo!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
 msgstr "Impossibile aprire il file temporaneo!"
@@ -2887,31 +2698,22 @@ msgstr "Impossibile aprire il file temporaneo!"
 msgid "Unable to open temporary file!"
 msgstr "Impossibile aprire il file temporaneo!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "DeCanc"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "De-cancella i messaggi corrispondenti a: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "DeCanc"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s sconosciuto"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Mi deiscrivo da %s..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Mi deiscrivo da %s..."
@@ -2921,7 +2723,7 @@ msgstr "Mi deiscrivo da %s..."
 msgid "Unsubscribing to %s..."
 msgstr "Mi deiscrivo da %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "Togli il segno ai messaggi corrispondenti a: "
 
@@ -2934,7 +2736,7 @@ msgstr "Mando il messaggio..."
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Usa 'toggle-write' per riabilitare la scrittura!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Uso il keyID \"%s\" per %s?"
@@ -2944,20 +2746,16 @@ msgstr "Uso il keyID \"%s\" per %s?"
 msgid "Username at %s: "
 msgstr "Nome dell'utente su %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "Mese non valido: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "Mese non valido: %s"
 
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
-
 #: commands.c:89
 msgid "Verify PGP signature?"
 msgstr "Verifico la firma PGP?"
@@ -2966,11 +2764,7 @@ msgstr "Verifico la firma PGP?"
 msgid "Verifying message indexes..."
 msgstr "Verifica degli indici dei messaggi..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Vedi Allegato"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "ATTENZIONE!  Stai per sovrascrivere %s, continuo?"
@@ -2981,29 +2775,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "Il certificato del server è scaduto"
+msgstr "Il certificato del server è scaduto"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "Il certificato del server è scaduto"
+msgstr "Il certificato del server è scaduto"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "Il certificato del server non è ancora valido"
+msgstr "Il certificato del server non è ancora valido"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "Il certificato del server non è ancora valido"
+msgstr "Il certificato del server non è ancora valido"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3025,37 +2819,37 @@ msgstr "Aspetto il lock fcntl... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "Attesa del lock flock... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Aspetto la risposta..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "Attenzione: '%s' è un IDN non valido."
+msgstr "Attenzione: '%s' è un IDN non valido."
 
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Il certificato del server è scaduto"
+msgstr "Il certificato del server è scaduto"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "Attenzione: l'IDN '%s' nell'alias '%s' non è valido.\n"
+msgstr "Attenzione: l'IDN '%s' nell'alias '%s' non è valido.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Attenzione: impossibile salvare il certificato"
 
 #: crypt.cpkg:902
 #, fuzzy
 msgid "Warning: One of the keys has been revoked\n"
-msgstr "Attenzione: una parte di questo messaggio non è stata firmata."
+msgstr "Attenzione: una parte di questo messaggio non è stata firmata."
 
 #: commands.c:141 commands.c:151
 msgid "Warning: Part of this message has not been signed."
-msgstr "Attenzione: una parte di questo messaggio non è stata firmata."
+msgstr "Attenzione: una parte di questo messaggio non è stata firmata."
 
 #: crypt.cpkg:910
 msgid "Warning: The key used to create the signature expired at: "
@@ -3065,19 +2859,19 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Quel che abbiamo qui è l'impossibilità di fare un allegato"
+msgstr "Quel che abbiamo qui è l'impossibilità di fare un allegato"
 
 #: lib-mx/mbox.c:576
 #, c-format
@@ -3088,7 +2882,7 @@ msgstr "Scrittura fallita!  Salvo la mailbox parziale in %s"
 msgid "Write fault!"
 msgstr "Errore di scrittura!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Salva il messaggio nella mailbox"
 
@@ -3097,7 +2891,7 @@ msgstr "Salva il messaggio nella mailbox"
 msgid "Writing %s..."
 msgstr "Scrivo %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Scrivo il messaggio in %s..."
@@ -3107,74 +2901,56 @@ msgstr "Scrivo il messaggio in %s..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Scrivo i messaggi... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Errore nella riga di comando: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Hai già definito un alias con questo nome!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Hai già selezionato il primo elemento della catena."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Hai già selezionato l'ultimo elemento della catena."
+msgstr "Hai già definito un alias con questo nome!"
 
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr "Sei alla prima voce."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Sei alla prima pagina."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr "Sei al primo messaggio."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr "Sei alla prima pagina."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
 msgstr "Sei al primo thread."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr "Sei all'ultima voce."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Sei all'ultima pagina."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "Sei all'ultimo messaggio."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr "Sei all'ultima pagina."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Non puoi spostarti più in basso."
+msgstr "Non puoi spostarti più in basso."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Non puoi spostarti più in alto."
+msgstr "Non puoi spostarti più in alto."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
 msgstr "Non hai alias!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
 msgstr "Non puoi cancellare l'unico allegato."
 
@@ -3182,7 +2958,7 @@ msgstr "Non puoi cancellare l'unico allegato."
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Puoi rimbalzare solo parti message/rfc822."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Va bene?"
@@ -3190,7 +2966,7 @@ msgstr "[%s = %s] Va bene?"
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s non è gestito "
+msgstr "[-- %s/%s non è gestito "
 
 #: handler.c:1000
 #, c-format
@@ -3207,23 +2983,23 @@ msgstr "[-- stderr dell'autoview di %s --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Visualizzato automaticamente con %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr "[-- INIZIO DEL MESSAGGIO DI PGP --]\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- INIZIO DEL BLOCCO DELLA CHIAVE PUBBLICA --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr "[-- INIZIO DEL MESSAGGIO FIRMATO CON PGP --]\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3232,42 +3008,42 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Impossibile eseguire %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- FINE DEL MESSAGGIO DI PGP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- FINE DEL BLOCCO DELLA CHIAVE PUBBLICA --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- FINE DEL MESSAGGIO FIRMATO CON PGP --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- Fine dei dati cifrati con PGP/MIME  --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- Fine dei dati cifrati con PGP/MIME  --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Fine dei dati cifrati con S/MIME --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Fine dei dati firmati com S/MIME. --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3282,7 +3058,7 @@ msgstr ""
 "[-- Errore: impossibile visualizzare ogni parte di multipart/alternative! "
 "--]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3290,18 +3066,18 @@ msgstr ""
 "[-- Errore: struttura multipart/signed incoerente! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr "[-- Errore: protocollo multipart/signed %s sconosciuto! --]\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Errore: impossibile creare il file temporaneo! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3309,14 +3085,14 @@ msgstr ""
 "[-- Errore: impossibile trovare l'inizio del messaggio di PGP! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- Errore: impossibile creare il file temporaneo! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3329,34 +3105,34 @@ msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Errore: message/external-body non ha un parametro access-type --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr "[-- I seguenti dati sono cifrati con PGP/MIME  --]\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr "[-- I seguenti dati sono cifrati con PGP/MIME  --]\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr "[-- I seguenti dati sono cifrati con S/MIME --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr "[-- I seguenti dati sono firmati con S/MIME --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -3372,22 +3148,22 @@ msgstr "[-- Questo allegato %s/%s "
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- Questo allegato %s/%s non è incluso, --]\n"
+msgstr "[-- Questo allegato %s/%s non è incluso, --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Tipo: %s/%s, Codifica: %s, Dimensioni: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Attenzione: non è stata trovata alcuna firma. --]\n"
+"[-- Attenzione: non è stata trovata alcuna firma. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3397,13 +3173,13 @@ msgstr "[-- Attenzione: impossibile verificare firme %s/%s. --]\n"
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- e il l'access-type %s indicato non è gestito --]\n"
+msgstr "[-- e il l'access-type %s indicato non è gestito --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
-msgstr "[-- e l'origine esterna indicata è scaduta. --]\n"
+msgstr "[-- e l'origine esterna indicata è scaduta. --]\n"
 
 #: handler.c:1201
 #, c-format
@@ -3415,33 +3191,33 @@ msgstr "[-- nome: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- su %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
 msgstr "Scaduto   "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
 msgstr "Non valido   "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
 msgstr "Revocato   "
@@ -3455,16 +3231,43 @@ msgstr "[data non valida]"
 msgid "[unable to calculate]"
 msgstr "[impossibile da calcolare]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: nessun indirizzo"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Non ci sono messaggi segnati."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Non ci sono messaggi segnati."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Salvo una copia di questo messaggio?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "modifica la descrizione dell'allegato"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "modifica la descrizione dell'allegato"
@@ -3473,22 +3276,90 @@ msgstr "modifica la descrizione dell'allegato"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: troppi argomenti"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Errore nella lettura della directory."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Nessuna mailbox con nuova posta."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
 msgstr "color: troppo pochi argomenti"
 
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Non ci sono nuovi messaggi"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
+
 #: commands.c:788
 msgid "converting"
 msgstr "convertito"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Salva il messaggio nella mailbox"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
@@ -3504,19 +3375,100 @@ msgstr "impossibile troncare il folder temporaneo: %s"
 msgid "could not write temporary mail folder: %s"
 msgstr "impossibile scrivere il folder temporaneo: %s"
 
-#: browser.c:1206
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Non è stata definita una mailbox di ingresso."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dazn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
 msgstr "i colori predefiniti non sono gestiti"
 
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Cancello i messaggi dal server?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "De-cancella i messaggi corrispondenti a: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "De-cancella i messaggi corrispondenti a: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
+
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Modificare il messaggio da inoltrare?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3532,21 +3484,108 @@ msgstr "Copio in %s..."
 msgid "echo Decompressing %s..."
 msgstr "Seleziono %s..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "L'allegato corrente non sarà convertito."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "modifica la descrizione dell'allegato"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Impossibile scrivere il messaggio"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Prendo gli header dei messaggi... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Modificare il messaggio da inoltrare?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Salvo una copia di questo messaggio?"
+
 #: pattern.c:777
 msgid "empty pattern"
 msgstr "modello vuoto"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
 msgstr "Crittografa"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Salvo una copia di questo messaggio?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
 msgstr "errore nel modello in: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "errore nel modello in: %s"
@@ -3576,7 +3615,7 @@ msgstr "errore nel modello in: %s"
 msgid "error getting secret key `%s': %s\n"
 msgstr "errore nel modello in: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "errore nel modello in: %s"
@@ -3615,83 +3654,286 @@ msgstr "errore nel modello in: %s"
 msgid "error: unknown op %d (report this error)."
 msgstr "errore: unknown op %d (segnala questo errore)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "escbia"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "escbia"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec: non ci sono argomenti"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+# FIXME - come tradurre questo messaggio?
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Rispondo a %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Inoltro come allegati?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Controllo se ci sono nuovi messaggi..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Sei al primo messaggio."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Sei all'ultima pagina."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Nessuna mailbox con nuova posta."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Errore durante l'apertura della mailbox"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Nessuna mailbox con nuova posta."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "è stato cancellato -- ]\n"
+msgstr "è stato cancellato -- ]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE fallito"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
 msgstr "Campo dell'header non valido"
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Numero dell'indice non valido."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Salta al messaggio: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Salta al messaggio: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Il thread contiene messaggi non letti."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Sei al primo thread."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Non ci sono messaggi non letti"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Non ci sono messaggi non letti"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Salvo una copia di questo messaggio?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "Chiavi PGP corrispondenti a <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Rimbalza i messaggi segnati a: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Nessuna mailbox con nuova posta."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: sequenza di tasti nulla"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro: troppi argomenti"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "La voce di mailcap per il tipo %s non è stata trovata"
+msgstr "La voce di mailcap per il tipo %s non è stata trovata"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message():·impossibile impostare l'orario del file"
+msgstr "maildir_commit_message():·impossibile impostare l'orario del file"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
@@ -3708,19 +3950,110 @@ msgstr "parentesi fuori posto: %s"
 msgid "missing parameter"
 msgstr "parametro mancante"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
 msgstr "mono: troppo pochi argomenti"
 
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Sei alla prima voce."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Sei al primo messaggio."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Sei all'ultima voce."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Sei all'ultimo messaggio."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Sei all'ultima voce."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Sei all'ultima pagina."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Nessun messaggio da de-cancellare."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Sei alla prima voce."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Sei alla prima pagina."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Nessun messaggio da de-cancellare."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Sei alla prima pagina."
+
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
 msgstr "il messaggio multipart non ha il parametro boundary!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "no"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "(nessuna mailbox)"
@@ -3729,54 +4062,307 @@ msgstr "(nessuna mailbox)"
 msgid "not converting"
 msgstr "non convertito"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "sequenza di tasti nulla"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
 msgstr "oac"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Apri la mailbox in sola lettura"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Apri la mailbox in sola lettura"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Riapro la mailbox..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Rimbalza il messaggio a %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "prefix non è consentito con reset"
+msgstr "prefix non è consentito con reset"
+
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Sei alla prima voce."
 
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push: troppi argomenti"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Richiamo il messaggio rimandato?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Il thread contiene messaggi non letti."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Impossibile modificare i messaggi sul server POP."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: impossibile allegare il file"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Salta al messaggio: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Cancello i messaggi dal server?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ro"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "roa"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Salva nella mailbox%s"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Salva nella mailbox%s"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Impossibile modificare i messaggi sul server POP."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "errore nell'espressione"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Cerca: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Impossibile spedire il messaggio."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Inoltro come allegati?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Limita ai messaggi corrispondenti a: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Non c'è altro testo citato."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Stampo il messaggio?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "In questo folder non ci sono messaggi."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: errore in %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: errori in %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: lettura terminata a causa di troppi errori in %s"
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Non ci sono file corrispondenti alla maschera"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: mbox modified, but no modified messages! (segnala questo bug)"
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Togli il segno ai messaggi corrispondenti a: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Sei al primo thread."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3787,23 +4373,94 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Non c'è altro testo citato."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "La ricodifica ha effetti solo sugli allegati di testo."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Nessun modello di ricerca."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Non ci sono messaggi non letti"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
 msgstr "troppo pochi argomenti"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "modifica la descrizione dell'allegato"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "De-cancella i messaggi corrispondenti a: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "De-cancella i messaggi corrispondenti a: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "De-cancella i messaggi corrispondenti a: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
@@ -3819,10 +4476,28 @@ msgstr "unhook: impossibile usare unhook * dentro un hook."
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: tipo di hook sconosciuto: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Togli il segno ai messaggi corrispondenti a: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "modifica la descrizione dell'allegato"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3834,16 +4509,50 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "value non è consentito con reset"
+msgstr "value non è consentito con reset"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Allegato salvato."
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Nuovo file: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Salva il messaggio nella mailbox"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
-msgstr "sì"
+msgstr "sì"
 
 #: muttlib.c:227
 msgid "yna"
 msgstr "yna"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/ja.po b/po/ja.po
index 7f81851..e3fab41 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,49 +8,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-08-12 19:00+0900\n"
 "Last-Translator: Tamotsu TAKAHASHI <tamo@momonga-linux.org>\n"
 "Language-Team: mutt-j <mutt-j-users@lists.sourceforge.jp>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-jp\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"°ìÈÌŪ¤Ê¥­¡¼¥Ð¥¤¥ó¥É:\n"
+"一般的なキーバインド:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"̤¥Ð¥¤¥ó¥É¤Îµ¡Ç½:\n"
+"æ\9cªã\83\90ã\82¤ã\83³ã\83\89ã\81®æ©\9fè\83½:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
+"[-- 署名データ終了 --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
-msgstr "¡¡¡¡¡¡ÊÌ̾: "
+msgstr "　　　別名: "
 
 #: crypt.cpkg:1145 crypt.cpkg:1165
 msgid "            created: "
-msgstr "¡¡½ð̾ÆüÉÕ: "
+msgstr "　署名日付: "
 
 #: main.c:87
 #, fuzzy
@@ -68,40 +68,40 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"»ÈÍÑË¡: mutt [-nRyzZ] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] [-m <¥¿¥¤¥×>] \n"
-"             [-f <¥Õ¥¡¥¤¥ë>]\n"
-"        mutt [-nR] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -Q <Ì䤤¹ç¤ï¤»> \n"
-"             [-Q <Ì䤤¹ç¤ï¤»> ]\n"
-"        mutt [-nR] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -A <ÊÌ̾> \n"
-"             [-A <ÊÌ̾> ]\n"
-"        mutt [-nR] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -D\n"
-"        mutt [-nx] [-e <¥³¥Þ¥ó¥É>] [-a <¥Õ¥¡¥¤¥ë>] [-F <¥Õ¥¡¥¤¥ë>] \n"
-"             [-H <¥Õ¥¡¥¤¥ë>] [-i <¥Õ¥¡¥¤¥ë>] [-s <Âê̾>] [-b <¥¢¥É¥ì¥¹>] \n"
-"             [-c <¥¢¥É¥ì¥¹>] <¥¢¥É¥ì¥¹> [ ... ]\n"
-"        mutt [-n] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -p\n"
+"使用法: mutt [-nRyzZ] [-e <コマンド>] [-F <ファイル>] [-m <タイプ>] \n"
+"             [-f <ファイル>]\n"
+"        mutt [-nR] [-e <コマンド>] [-F <ファイル>] -Q <問い合わせ> \n"
+"             [-Q <問い合わせ> ]\n"
+"        mutt [-nR] [-e <コマンド>] [-F <ファイル>] -A <別名> \n"
+"             [-A <別名> ]\n"
+"        mutt [-nR] [-e <コマンド>] [-F <ファイル>] -D\n"
+"        mutt [-nx] [-e <コマンド>] [-a <ファイル>] [-F <ファイル>] \n"
+"             [-H <ã\83\95ã\82¡ã\82¤ã\83«>] [-i <ã\83\95ã\82¡ã\82¤ã\83«>] [-s <é¡\8cå\90\8d>] [-b <ã\82¢ã\83\89ã\83¬ã\82¹>] \n"
+"             [-c <ã\82¢ã\83\89ã\83¬ã\82¹>] <ã\82¢ã\83\89ã\83¬ã\82¹> [ ... ]\n"
+"        mutt [-n] [-e <コマンド>] [-F <ファイル>] -p\n"
 "        mutt -v[v]\n"
 "\n"
-"¥ª¥×¥·¥ç¥ó:\n"
-"  -A <ÊÌ̾>\t»ØÄꤷ¤¿ÊÌ̾¤ÎŸ³«\n"
-"  -a <¥Õ¥¡¥¤¥ë>\t¥á¥Ã¥»¡¼¥¸¤Ë¥Õ¥¡¥¤¥ë¤òźÉÕ\n"
-"  -b <¥¢¥É¥ì¥¹>\tblind carbon-copy (BCC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n"
-"  -c <¥¢¥É¥ì¥¹>\tcarbon-copy (CC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n"
-"  -D\t\tÊÑ¿ô¤ò¤¹¤Ù¤Æɸ½à¥¨¥é¡¼½ÐÎϤØɽ¼¨"
-
-#: compose.c:152 compose.c:156
+"オプション:\n"
+"  -A <別名>\t指定した別名の展開\n"
+"  -a <ファイル>\tメッセージにファイルを添付\n"
+"  -b <アドレス>\tblind carbon-copy (BCC) アドレスの指定\n"
+"  -c <アドレス>\tcarbon-copy (CC) アドレスの指定\n"
+"  -D\t\t変数をすべて標準エラー出力へ表示"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr "    ½ð̾: "
+msgstr "    署名: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
-msgstr "   %s ¤Þ¤Ç"
+msgstr "   %s まで"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
-msgstr "   %s ¤«¤é"
+msgstr "   %s から"
 
 #: main.c:106
 msgid ""
@@ -141,144 +141,144 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr "('?' ¤Ç°ìÍ÷): "
+msgstr "('?' で一覧): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
-msgstr " (¥¤¥ó¥é¥¤¥ó)"
+msgstr " (インライン)"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " '%s' ¤ò²¡¤¹¤ÈÊѹ¹¤ò½ñ¤­¹þ¤à¤«¤É¤¦¤«¤òÀÚÂØ"
+msgstr " '%s' を押すと変更を書き込むかどうかを切替"
 
-# "¥·¥ê¥¢¥ëÈÖ¹æ" == Á´³Ñ 6 ʸ»ú
-# "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È" == Á´³Ñ 9 ʸ»ú
-#: crypt.cpkg:2666
+# "シリアル番号" == 全角 6 文字
+# "フィンガープリント" == 全角 9 文字
+#: crypt.cpkg:2665
 msgid " aka ......: "
-msgstr " ÊÌ̾ ............: "
+msgstr " 別名 ............: "
 
-# ÆüËܸì¤Ç¤Ï¸ì½ç¤¬°ã¤¦¤Î¤Ç¤¹ (T_T
-#: lib-ui/curs_main.c:1584
+# 日本語では語順が違うのです (T_T
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " (¤³¤ÎÀ©¸Âɽ¼¨¾õÂ֤ǤÏ)"
+msgstr " (この制限表示状態では)"
 
 #: commands.c:601
 msgid " tagged"
-msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ò"
+msgstr "タグ付きメッセージを"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c ¤ÏÉÔÀµ¤Ê¥³¥Þ¥ó¥É"
+msgstr "%c は不正なコマンド"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c ¤Ï¤³¤Î¥â¡¼¥É¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤"
+msgstr "%c はこのモードではサポートされていない"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d ÊÝ»ý¡¢%d ÇÑ´þ"
+msgstr "%d 保持、%d 廃棄"
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d ÊÝ»ý¡¢%d °ÜÆ°¡¢%d ÇÑ´þ"
+msgstr "%d 保持、%d 移動、%d 廃棄"
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
-msgstr "¡Ö%2$s¡×¤Ë%1$s¡£"
+msgstr "「%2$s」に%1$s。"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-# "<hoge@example.org> ¤Ë°ìÃפ¹¤ë S/MIME ¸°¡£"
-#: crypt.cpkg:3125
+# "<hoge@example.org> に一致する S/MIME 鍵。"
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
-msgstr "<%2$s> ¤Ë%1$s¡£"
+msgstr "<%2$s> に%1$s。"
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s ËÜÅö¤Ë¤³¤Î¸°¤ò»ÈÍÑ?"
+msgstr "%s 本当にこの鍵を使用?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] ¤ÏÊѹ¹¤µ¤ì¤¿¡£¥¨¥ó¥³¡¼¥É¹¹¿·?"
+msgstr "%s [#%d] は変更された。エンコード更新?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] ¤Ï¤â¤Ï¤ä¸ºß¤·¤Ê¤¤!"
+msgstr "%s [#%d] はもはや存在しない!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d / %d ¥á¥Ã¥»¡¼¥¸Æɤ߽Ф·]"
+msgstr "%s [%d / %d メッセージ読み出し]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s ¤¬Â¸ºß¤·¤Ê¤¤¡£ºîÀ®?"
+msgstr "%s が存在しない。作成?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s ¤ÏÉÔÀµ¤Ê IMAP ¥Ñ¥¹"
+msgstr "%s ã\81¯ä¸\8dæ­£ã\81ª IMAP ã\83\91ã\82¹"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
+msgstr "%s ã\81¯ä¸\8dæ­£ã\81ª POP ã\83\91ã\82¹"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
+msgstr "%s ã\81¯ä¸\8dæ­£ã\81ª POP ã\83\91ã\82¹"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
+msgstr "%s ã\81¯ä¸\8dæ­£ã\81ª POP ã\83\91ã\82¹"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤Ê¤¤¡£"
+msgstr "%s はディレクトリではない。"
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s ¤Ï¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤Ï¤Ê¤¤!"
+msgstr "%s はメールボックスではない!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s ¤Ï¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤Ï¤Ê¤¤¡£"
+msgstr "%s はメールボックスではない。"
 
-# regular file ¤Ã¤Æ¡ÖÄ̾ï¥Õ¥¡¥¤¥ë¡×¤Ç¤¹¤«¡©
+# regular file って「通常ファイル」ですか？
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s ¤Ïɸ½à¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¡£"
+msgstr "%s は標準ファイルではない。"
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s ¤Ï¤â¤Ï¤ä¸ºß¤·¤Ê¤¤!"
+msgstr "%s はもはや存在しない!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -292,392 +292,384 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
-msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¿¥¤¥×"
+msgstr "%s は不明なタイプ"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "¿§ %s ¤Ï¤³¤ÎüËö¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤"
+msgstr "色 %s はこの端末ではサポートされていない"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s ¥³¥Þ¥ó¥É¤Ï¥¤¥ó¥Ç¥Ã¥¯¥¹¥ª¥Ö¥¸¥§¥¯¥È¤Ë¤Î¤ßÍ­¸ú"
+msgstr "%s コマンドはインデックスオブジェクトにのみ有効"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s ¤È¤¤¤¦Â°À­¤Ï¤Ê¤¤"
+msgstr "%s という属性はない"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s ¤È¤¤¤¦¿§¤Ï¤Ê¤¤"
+msgstr "%s という色はない"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
-msgstr "%s ¤È¤¤¤¦µ¡Ç½¤Ï¤Ê¤¤"
+msgstr "%s という機能はない"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s ¤È¤¤¤¦µ¡Ç½¤Ï¥Þ¥Ã¥×Ãæ¤Ë¤Ê¤¤"
+msgstr "%s という機能はマップ中にない"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s ¤È¤¤¤¦¥á¥Ë¥å¡¼¤Ï¤Ê¤¤"
+msgstr "%s というメニューはない"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s ¤È¤¤¤¦¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤Ê¤¤"
+msgstr "%s というオブジェクトはない"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: °ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
+msgstr "%s: 引数が少なすぎる"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: ¥Õ¥¡¥¤¥ë¤òźÉդǤ­¤Ê¤¤"
+msgstr "%s: ファイルを添付できない"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: ¥Õ¥¡¥¤¥ë¤òźÉդǤ­¤Ê¤¤¡£\n"
+msgstr "%s: ファイルを添付できない。\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É"
+msgstr "%s: 不明なコマンド"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¿¥¤¥×"
+msgstr "%s は不明なタイプ"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s ¤ÏÉÔÌÀ¤ÊÊÑ¿ô"
+msgstr "%s は不明な変数"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
+msgstr "%s ã\81¯ä¸\8dæ­£ã\81ª POP ã\83\91ã\82¹"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s ¤ÏÉÔÀµ¤Ê POP ¥Ñ¥¹"
+msgstr "%s ã\81¯ä¸\8dæ­£ã\81ª POP ã\83\91ã\82¹"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(¥­¡¼¤Ë 'view-attachments' ¤ò³ä¤êÅö¤Æ¤ëɬÍפ¬¤¢¤ë!)"
+msgstr "(キーに 'view-attachments' を割り当てる必要がある!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤Ê¤¤)"
+msgstr "(メールボックスがない)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "r:µñÈÝ, o:º£²ó¤Î¤ß¾µÇ§"
+msgstr "r:拒否, o:今回のみ承認"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "r:µñÈÝ, o:º£²ó¤Î¤ß¾µÇ§, a:¾ï¤Ë¾µÇ§"
+msgstr "r:拒否, o:今回のみ承認, a:常に承認"
 
-# °ì¹Ô¤Ë¤ª¤µ¤Þ¤é¤Ê¤¤¤Èµ¤»ý¤Á°­¤¤¤Î¤Ç¡Ö¥µ¥¤¥º¡×¤ò¤±¤º¤Ã¤¿¤ê¤·¤¿
+# 一行におさまらないと気持ち悪いので「サイズ」をけずったりした
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(%s ¥Ð¥¤¥È)"
+msgstr "(%s バイト)"
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(¤³¤Î¥Ñ¡¼¥È¤òɽ¼¨¤¹¤ë¤Ë¤Ï '%s' ¤ò»ÈÍÑ)"
+msgstr "(このパートを表示するには '%s' を使用)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
-msgstr "**ÉÔÀµ¤Ê½ð̾**¡¡¼çÄ¥: "
+msgstr "**不正な署名**　主張: "
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
-msgstr "¡¢"
+msgstr "、"
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- źÉÕ¥Õ¥¡¥¤¥ë"
+msgstr "-- 添付ファイル"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<ÉÔÌÀ>"
+msgstr "<不明>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<´ûÄêÃÍ>"
+msgstr "<既定値>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
-msgstr "¥Ý¥ê¥·¡¼¤Î¾ò·ï¤¬Ëþ¤¿¤µ¤ì¤Ê¤«¤Ã¤¿\n"
+msgstr "ポリシーの条件が満たされなかった\n"
 
 #: crypt.cpkg:958
 msgid "A system error occurred"
-msgstr "¥·¥¹¥Æ¥à¥¨¥é¡¼¤¬È¯À¸"
+msgstr "システムエラーが発生"
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "APOP ǧ¾Ú¤Ë¼ºÇÔ¤·¤¿¡£"
+msgstr "APOP 認証に失敗した。"
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "̾ȧ"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ï̤Êѹ¹¡£Ãæ»ß?"
+msgstr "メッセージは未変更。中止?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "̤Êѹ¹¤Î¥á¥Ã¥»¡¼¥¸¤òÃæ»ß¤·¤¿¡£"
+msgstr "未変更のメッセージを中止した。"
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "¥¢¥É¥ì¥¹: "
+msgstr "ã\82¢ã\83\89ã\83¬ã\82¹: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "ÊÌ̾¤òÄɲä·¤¿¡£"
+msgstr "別名を追加した。"
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "ÊÌ̾ÆþÎÏ: "
+msgstr "別名入力: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "ÊÌ̾"
+msgstr "別名"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
-msgstr "TLS/SSL Àܳ¤ËÍøÍѲÄǽ¤Ê¥×¥í¥È¥³¥ë¤¬¤¹¤Ù¤Æ̵¸ú"
+msgstr "TLS/SSL 接続に利用可能なプロトコルがすべて無効"
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 msgid "All matching keys are marked expired/revoked."
-msgstr "°ìÃפ·¤¿¸°¤Ï¤¹¤Ù¤Æ´ü¸ÂÀڤ줫ÇÑ´þºÑ¤ß¡£"
-
-#: remailer.c:431
-msgid "Append"
-msgstr "ÄɲÃ"
+msgstr "一致した鍵はすべて期限切れか廃棄済み。"
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "%s ¤Ë¥á¥Ã¥»¡¼¥¸¤òÄɲÃ?"
+msgstr "%s にメッセージを追加?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "°ú¿ô¤Ï¥á¥Ã¥»¡¼¥¸ÈÖ¹æ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£"
+msgstr "引数はメッセージ番号でなければならない。"
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤¿¡£"
+msgstr "添付ファイルを保存した。"
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "¥Õ¥¡¥¤¥ëźÉÕ"
+msgstr "ファイル添付"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "ÁªÂò¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤òźÉÕÃæ..."
+msgstr "選択されたファイルを添付中..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤Ï¥³¥Þ¥ó¥É¤òÄ̤·¤Æ¤¢¤ë¡£"
+msgstr "添付ファイルはコマンドを通してある。"
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤¿¡£"
+msgstr "添付ファイルを保存した。"
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë"
+msgstr "添付ファイル"
 
 #: imap/auth.c:83
 #, c-format
 msgid "Authenticating (%s)..."
-msgstr "ǧ¾ÚÃæ (%s)..."
+msgstr "認証中 (%s)..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "ǧ¾ÚÃæ (APOP)..."
+msgstr "認証中 (APOP)..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "ǧ¾ÚÃæ (SASL)..."
+msgstr "認証中 (SASL)..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "ǧ¾ÚÃæ (SASL)..."
+msgstr "認証中 (SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
-msgstr "ÍøÍѤǤ­¤ë CRL ¤Ï¸Å¤¹¤®¤ë\n"
+msgstr "利用できる CRL は古すぎる\n"
 
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "ÉÔÀµ¤Ê IDN \"%s\"."
+msgstr "不正な IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "ÉÔÀµ¤Ê IDN %s ¤ò resent-from ¤Î½àÈ÷Ãæ¤Ëȯ¸«¡£"
+msgstr "不正な IDN %s を resent-from の準備中に発見。"
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "\"%s\" Ãæ¤ËÉÔÀµ¤Ê IDN: '%s'"
+msgstr "\"%s\" 中に不正な IDN: '%s'"
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "ÉÔÀµ¤Ê IDN: '%s'"
+msgstr "不正な IDN: '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "ÉÔÀµ¤Ê¥á¡¼¥ë¥Ü¥Ã¥¯¥¹Ì¾"
+msgstr "不正なメールボックス名"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈÖ²¼¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë"
+msgstr "メッセージの一番下が表示されている"
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "%s ¤Ø¥á¥Ã¥»¡¼¥¸ºÆÁ÷"
+msgstr "%s へメッセージ再送"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "¥á¥Ã¥»¡¼¥¸¤ÎºÆÁ÷Àè: "
+msgstr "メッセージの再送先: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "%s ¤Ø¥á¥Ã¥»¡¼¥¸ºÆÁ÷"
+msgstr "%s へメッセージ再送"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ÎºÆÁ÷Àè: "
+msgstr "タグ付きメッセージの再送先: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "¥¯¥í¡¼¥º¤Ë¼ºÇÔ¤·¤¿"
+msgstr "クローズに失敗した"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
 msgstr ""
 
-# %s ¤Ï strerror(errno) ¤Î¤è¤¦¤Ç¤¢¤ë¡£
+# %s は strerror(errno) のようである。
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "¥Õ¥©¥ë¥À¤ËÄɲäǤ­¤Ê¤¤: %s"
+msgstr "フォルダに追加できない: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÏźÉդǤ­¤Ê¤¤!"
+msgstr "ディレクトリは添付できない!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "%s ¤¬ %s ¤Î¤¿¤á¤ËºîÀ®¤Ç¤­¤Ê¤¤¡£"
+msgstr "%s が %s のために作成できない。"
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Ê¤¤"
+msgstr "ファイル %s を作成できない"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "¥Õ¥£¥ë¥¿¤òºîÀ®¤Ç¤­¤Ê¤¤"
+msgstr "フィルタを作成できない"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "¥Õ¥£¥ë¥¿¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤¤"
+msgstr "フィルタプロセスを作成できない"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤¤"
+msgstr "一時ファイルを作成できない"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
-msgstr "¥¿¥°ÉÕ¤­ÅºÉÕ¥Õ¥¡¥¤¥ë¤¹¤Ù¤Æ¤ÎÉü¹æ²½¤Ï¼ºÇÔ¡£À®¸ùʬ¤À¤± MIME ¥«¥×¥»¥ë²½?"
+msgstr "タグ付き添付ファイルすべての復号化は失敗。成功分だけ MIME カプセル化?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr "¥¿¥°ÉÕ¤­ÅºÉÕ¥Õ¥¡¥¤¥ë¤¹¤Ù¤Æ¤ÎÉü¹æ²½¤Ï¼ºÇÔ¡£À®¸ùʬ¤À¤± MIME žÁ÷?"
+msgstr "タグ付き添付ファイルすべての復号化は失敗。成功分だけ MIME 転送?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "°Å¹æ²½¥á¥Ã¥»¡¼¥¸¤òÉü¹æ²½¤Ç¤­¤Ê¤¤!"
+msgstr "暗号化メッセージを復号化できない!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "POP ¥µ¡¼¥Ð¤«¤éźÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤­¤Ê¤¤¡£"
+msgstr "POP サーバから添付ファイルを削除できない。"
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "POP ¥µ¡¼¥Ð¤«¤éźÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤­¤Ê¤¤¡£"
+msgstr "POP サーバから添付ファイルを削除できない。"
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "%s ¤Î¥É¥Ã¥È¥í¥Ã¥¯¤¬¤Ç¤­¤Ê¤¤¡£\n"
+msgstr "%s のドットロックができない。\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -685,307 +677,291 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤¬°ì¤Ä¤â¸«¤Ä¤«¤é¤Ê¤¤¡£"
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "mixmaster ¤Î type2.list ¼èÆÀ¤Ç¤­¤º!"
+msgstr "タグ付きメッセージが一つも見つからない。"
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "̾Á°¤Î¥Æ¥ó¥×¥ì¡¼¥È¤Ë°ìÃפµ¤»¤é¤ì¤Ê¤¤¡£Â³¹Ô?"
+msgstr "名前のテンプレートに一致させられない。続行?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "¥á¥Ã¥»¡¼¥¸¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤: %s"
+msgstr "メッセージファイルをオープンできない: %s"
 
-# %s ¤Ï strerror(errno) ¤Î¤è¤¦¤Ç¤¢¤ë¡£
+# %s は strerror(errno) のようである。
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "¥Õ¥©¥ë¥À¤ËÄɲäǤ­¤Ê¤¤: %s"
+msgstr "フォルダに追加できない: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»¤·¤¿"
+msgstr "%s への接続を終了した"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "POP ¥µ¡¼¥Ð¤Ø¤ÎÀܳ½ªÎ»Ãæ..."
+msgstr "POP サーバへの接続終了中..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-# system call ¤Î stat() ¤ò¡Ö°À­Ä´ºº¡×¤ÈÌõ¤·¤Æ¤¤¤ë
-#: nntp.c:1970 nntp.c:2000
+# system call の stat() を「属性調査」と訳している
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "%s ¤ò°À­Ä´ºº¤Ç¤­¤Ê¤¤: %s"
+msgstr "%s を属性調査できない: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "%s ¤¬ %s ¤Î¤¿¤á¤ËºîÀ®¤Ç¤­¤Ê¤¤¡£"
+msgstr "%s が %s のために作成できない。"
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "POP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤òÊݸ¤Ç¤­¤Ê¤¤"
+msgstr "POP メールボックスにはメッセージを保存できない"
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "POP ¥µ¡¼¥Ð¾å¤Ç¤Ï¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸¤Ç¤­¤Ê¤¤¡£"
+msgstr "POP サーバ上ではメッセージを編集できない。"
 
-# system call ¤Î stat() ¤ò¡Ö°À­Ä´ºº¡×¤ÈÌõ¤·¤Æ¤¤¤ë
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+# system call の stat() を「属性調査」と訳している
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "%s ¤ò°À­Ä´ºº¤Ç¤­¤Ê¤¤: %s"
+msgstr "%s を属性調査できない: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
-msgstr "¸°¤ä¾ÚÌÀ½ñ¤ÎÉÔ­¤Ë¤è¤ê¡¢¸¡¾Ú¤Ç¤­¤Ê¤¤\n"
+msgstr "鍵や証明書の不足により、検証できない\n"
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Ï±ÜÍ÷¤Ç¤­¤Ê¤¤"
+msgstr "ディレクトリは閲覧できない"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "%s ¤òºîÀ®¤Ç¤­¤Ê¤¤¡£"
+msgstr "%s を作成できない。"
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "¥Ø¥Ã¥À¤ò°ì»þ¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤á¤Ê¤¤!"
+msgstr "ヘッダを一時ファイルに書き込めない!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¹þ¤á¤Ê¤¤"
+msgstr "メッセージを書き込めない"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò°ì»þ¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤á¤Ê¤¤!"
+msgstr "メッセージを一時ファイルに書き込めない!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "ɽ¼¨ÍÑ¥Õ¥£¥ë¥¿¤òºîÀ®¤Ç¤­¤Ê¤¤"
+msgstr "表示用フィルタを作成できない"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "¥Õ¥£¥ë¥¿¤òºîÀ®¤Ç¤­¤Ê¤¤"
+msgstr "フィルタを作成できない"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Æɤ߽Ф·ÀìÍѥ᡼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤ÏÊѹ¹¤Î½ñ¤­¹þ¤ß¤òÀÚÂؤǤ­¤Ê¤¤!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "読み出し専用メールボックスでは変更の書き込みを切替できない!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "%s ¤ò¼õ¤±¼è¤Ã¤¿¡£½ªÎ»¡£\n"
+msgstr "%s を受け取った。終了。\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 msgid "Certificate is not X.509"
-msgstr "¾ÚÌÀ½ñ¤¬ X.509 ¤Ç¤Ê¤¤"
+msgstr "証明書が X.509 でない"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "¾ÚÌÀ½ñ¤òÊݸ¤·¤¿"
+msgstr "証明書を保存した"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
-msgstr "¾ÚÌÀ½ñ¤Î¸¡¾Ú¥¨¥é¡¼ (%s)"
+msgstr "証æ\98\8eæ\9b¸ã\81®æ¤\9c証ã\82¨ã\83©ã\83¼ (%s)"
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "¥Õ¥©¥ë¥Àæ½Ð»þ¤Ë¥Õ¥©¥ë¥À¤Ø¤ÎÊѹ¹¤¬½ñ¤­¹þ¤Þ¤ì¤ë¡£"
+msgstr "フォルダ脱出時にフォルダへの変更が書き込まれる。"
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "¥Õ¥©¥ë¥À¤Ø¤ÎÊѹ¹¤Ï½ñ¤­¹þ¤Þ¤ì¤Ê¤¤¡£"
+msgstr "フォルダへの変更は書き込まれない。"
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr "ʸ»ú = %s, 8¿Ê = %o, 10¿Ê = %d"
+msgstr "文字 = %s, 8進 = %o, 10進 = %d"
 
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "ʸ»ú¥»¥Ã¥È¤ò %s ¤ËÊѹ¹¤·¤¿; %s¡£"
+msgstr "文字セットを %s に変更した; %s。"
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "¥Ç¥£¥ì¥¯¥È¥êÊѹ¹"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "¥Ç¥£¥ì¥¯¥È¥êÊѹ¹Àè: "
+msgstr "ディレクトリ変更先: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¸¡½ÐÃæ..."
+msgstr "新着メッセージ検出中..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "¸°¸¡ºº  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¸¡½ÐÃæ..."
+msgstr "新着メッセージ検出中..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¸¡½ÐÃæ..."
+msgstr "新着メッセージ検出中..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¹ØÆɾõ¶·¤ò³ÎǧÃæ"
+msgstr "メールボックスの購読状況を確認中"
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "ʿʸ"
+msgstr "平文"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "¥Õ¥é¥°²ò½ü"
+msgstr "フラグ解除"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»Ãæ..."
+msgstr "%s への接続を終了中..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "POP ¥µ¡¼¥Ð¤Ø¤ÎÀܳ½ªÎ»Ãæ..."
+msgstr "POP サーバへの接続終了中..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 msgid "Collecting data..."
-msgstr "¥Ç¡¼¥¿¼ý½¸Ãæ..."
+msgstr "データ収集中..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "¥³¥Þ¥ó¥É TOP ¤ò¥µ¡¼¥Ð¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¡£"
+msgstr "コマンド TOP をサーバがサポートしていない。"
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "¥³¥Þ¥ó¥É UIDL ¤ò¥µ¡¼¥Ð¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¡£"
+msgstr "コマンド UIDL をサーバがサポートしていない。"
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "Êѹ¹·ë²Ì¤òÈ¿±ÇÃæ..."
+msgstr "変更結果を反映中..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"¥³¥ó¥Ñ¥¤¥ë»þ¥ª¥×¥·¥ç¥ó:"
+"コンパイル時オプション:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤ò¥³¥ó¥Ñ¥¤¥ëÃæ..."
+msgstr "検索パターンをコンパイル中..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "%s ¤Ë¥³¥Ô¡¼Ãæ..."
+msgstr "%s にコピー中..."
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "%s ¤Ë¥³¥Ô¡¼Ãæ..."
+msgstr "%s にコピー中..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "%s ¤ËÀܳÃæ..."
+msgstr "%s に接続中..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "%s ¤ËÀܳÃæ..."
+msgstr "%s に接続中..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "\"%s\" ¤ÇÀܳÃæ..."
+msgstr "\"%s\" で接続中..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Àܳ¤¬Àڤ줿¡£POP ¥µ¡¼¥Ð¤ËºÆÀܳ?"
+msgstr "接続が切れた。POP サーバに再接続?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Àܳ¤¬Àڤ줿¡£POP ¥µ¡¼¥Ð¤ËºÆÀܳ?"
+msgstr "接続が切れた。POP サーバに再接続?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»¤·¤¿"
+msgstr "%s への接続を終了した"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "%s ¤Ø¤ÎÀܳ¤ò½ªÎ»¤·¤¿"
+msgstr "%s への接続を終了した"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Content-Type¤ò %s ¤ËÊѹ¹¤·¤¿¡£"
+msgstr "Content-Typeを %s に変更した。"
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-Type ¤Ï base/sub ¤È¤¤¤¦·Á¼°¤Ë¤¹¤ë¤³¤È"
+msgstr "Content-Type は base/sub という形式にすること"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "·Ñ³?"
+msgstr "継続?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "Á÷¿®»þ¤Ë %s ¤ËÊÑ´¹?"
+msgstr "送信時に %s に変換?"
 
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¥³¥Ô¡¼"
+msgstr "%sã\83¡ã\83¼ã\83«ã\83\9cã\83\83ã\82¯ã\82¹ã\81«ã\82³ã\83\94ã\83¼"
 
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "%d ¥á¥Ã¥»¡¼¥¸¤ò %s ¤Ë¥³¥Ô¡¼Ãæ..."
+msgstr "%d メッセージを %s にコピー中..."
 
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò %s ¤Ë¥³¥Ô¡¼Ãæ..."
+msgstr "メッセージ %d を %s にコピー中..."
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "%s ¤Ë¥³¥Ô¡¼Ãæ..."
+msgstr "%s にコピー中..."
 
 #: main.c:63
 msgid ""
@@ -1001,706 +977,646 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "%s ¤ËÀܳ¤Ç¤­¤Ê¤«¤Ã¤¿ (%s)¡£"
+msgstr "%s に接続できなかった (%s)。"
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥³¥Ô¡¼¤Ç¤­¤Ê¤«¤Ã¤¿"
+msgstr "メッセージをコピーできなかった"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿!"
+msgstr "一時ファイルを作成できなかった!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿!"
+msgstr "一時ファイルを作成できなかった!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "À°Îóµ¡Ç½¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿! [¤³¤Î¥Ð¥°¤òÊó¹ð¤»¤è]"
+msgstr "整列機能が見つからなかった! [このバグを報告せよ]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "¥Û¥¹¥È \"%s\" ¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿"
+msgstr "ホスト \"%s\" が見つからなかった"
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "¤¹¤Ù¤Æ¤ÎÍ׵ᤵ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê¹þ¤á¤Ê¤«¤Ã¤¿!"
+msgstr "すべての要求されたメッセージを取り込めなかった!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "TLS Àܳ¤ò³ÎΩ¤Ç¤­¤Ê¤«¤Ã¤¿"
+msgstr "TLS 接続を確立できなかった"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿"
+msgstr "%s をオープンできなかった"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºÆ¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿!"
+msgstr "メールボックスを再オープンできなかった!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤Ç¤­¤Ê¤«¤Ã¤¿¡£"
+msgstr "メッセージを送信できなかった。"
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "%s ¤ò¥í¥Ã¥¯¤Ç¤­¤Ê¤«¤Ã¤¿\n"
+msgstr "%s をロックできなかった\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "%s ¤òºîÀ®?"
+msgstr "%s を作成?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "ºîÀ®µ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
+msgstr "作成機能は IMAP メールボックスのみのサポート"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºîÀ®: "
+msgstr "メールボックスを作成: "
 
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¥Ç¥³¡¼¥É¤·¤Æ¥³¥Ô¡¼"
+msgstr "%sã\83¡ã\83¼ã\83«ã\83\9cã\83\83ã\82¯ã\82¹ã\81«ã\83\87ã\82³ã\83¼ã\83\89ã\81\97ã\81¦ã\82³ã\83\94ã\83¼"
 
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¥Ç¥³¡¼¥É¤·¤ÆÊݸ"
+msgstr "%sメールボックスにデコードして保存"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "%s ¤òÁªÂòÃæ..."
+msgstr "%s を選択中..."
 
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÉü¹æ²½¤·¤Æ¥³¥Ô¡¼"
+msgstr "%sã\83¡ã\83¼ã\83«ã\83\9cã\83\83ã\82¯ã\82¹ã\81«å¾©å\8f·å\8c\96ã\81\97ã\81¦ã\82³ã\83\94ã\83¼"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÉü¹æ²½¤·¤ÆÊݸ"
+msgstr "%sメールボックスに復号化して保存"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
-msgstr "¥á¥Ã¥»¡¼¥¸Éü¹æ²½Ãæ..."
+msgstr "メッセージ復号化中..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Éü¹æ²½¤Ë¼ºÇÔ¤·¤¿¡£"
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "ºï½ü"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "ºï½ü"
+msgstr "復号化に失敗した。"
 
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "ºï½üµ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
+msgstr "削除機能は IMAP メールボックスのみのサポート"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "¥µ¡¼¥Ð¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½ü?"
+msgstr "サーバからメッセージを削除?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "¥á¥Ã¥»¡¼¥¸¤òºï½ü¤¹¤ë¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
+msgstr "メッセージを削除するためのパターン: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "ºï½ü"
+msgstr "削除"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "°Å¹æ²½¥á¥Ã¥»¡¼¥¸¤«¤é¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤Îºï½ü¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "ÆâÍÆÀâÌÀ"
+msgstr "暗号化メッセージからの添付ファイルの削除はサポートされていない。"
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "ID %s ¤Ï̤¸¡¾Ú¡£%s ¤Ë»ÈÍÑ?"
+msgstr "ID %s は未検証。%s に使用?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s ¤¬Â¸ºß¤·¤Ê¤¤¡£ºîÀ®?"
+msgstr "%s が存在しない。作成?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê [%s], ¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯: %s"
+msgstr "ã\83\87ã\82£ã\83¬ã\82¯ã\83\88ã\83ª [%s], ã\83\95ã\82¡ã\82¤ã\83«ã\83\9eã\82¹ã\82¯: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "¥¨¥é¡¼: ¤³¤Î¥Ð¥°¤ò¥ì¥Ý¡¼¥È¤»¤è"
+msgstr "エラー: このバグをレポートせよ"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "žÁ÷¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸?"
+msgstr "転送メッセージを編集?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "¼°Ãæ¤Ë¥¨¥é¡¼"
+msgstr "å¼\8f中ã\81«ã\82¨ã\83©ã\83¼"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "°Å¹æ²½"
+msgstr "暗号化"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "  °Å¹æ²½Êý¼°: "
+msgstr "  暗号化方式: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
-msgstr "°Å¹æ²½¤µ¤ì¤¿Àܳ¤¬ÍøÍѤǤ­¤Ê¤¤"
+msgstr "暗号化された接続が利用できない"
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "¸°IDÆþÎÏ: "
+msgstr "鍵ID入力: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "%s ¤Î¸° ID ÆþÎÏ: "
+msgstr "%s の鍵 ID 入力: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "¥­¡¼¤ò²¡¤¹¤È³«»Ï (½ªÎ»¤Ï ^G): "
+msgstr "キーを押すと開始 (終了は ^G): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "¥á¥Ã¥»¡¼¥¸ºÆÁ÷¥¨¥é¡¼!"
+msgstr "ã\83¡ã\83\83ã\82»ã\83¼ã\82¸å\86\8dé\80\81ã\82¨ã\83©ã\83¼!"
 
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "¥á¥Ã¥»¡¼¥¸ºÆÁ÷¥¨¥é¡¼!"
+msgstr "ã\83¡ã\83\83ã\82»ã\83¼ã\82¸å\86\8dé\80\81ã\82¨ã\83©ã\83¼!"
 
 #: crypt.cpkg:1175
 msgid "Error checking signature"
-msgstr "½ð̾¸¡¾Ú¥¨¥é¡¼"
+msgstr "ç½²å\90\8dæ¤\9c証ã\82¨ã\83©ã\83¼"
 
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "¥µ¡¼¥Ð %s ¤Ø¤ÎÀܳ¥¨¥é¡¼¡£"
+msgstr "サーバ %s への接続エラー。"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "ȯ¹Ô¼Ô¸°¤Î¼èÆÀ¥¨¥é¡¼: %s\n"
+msgstr "ç\99ºè¡\8cè\80\85é\8dµã\81®å\8f\96å¾\97ã\82¨ã\83©ã\83¼: %s\n"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
-msgstr "¸°¤Î¾ðÊó¼èÆÀ¥¨¥é¡¼: "
+msgstr "é\8dµã\81®æ\83\85å ±å\8f\96å¾\97ã\82¨ã\83©ã\83¼: "
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "%s Ãæ¤Î %d ¹ÔÌܤǥ¨¥é¡¼: %s"
+msgstr "%s 中ã\81® %d è¡\8cç\9b®ã\81§ã\82¨ã\83©ã\83¼: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¨¥é¡¼: %s\n"
+msgstr "ã\82³ã\83\9eã\83³ã\83\89ã\83©ã\82¤ã\83³ã\81§ã\82¨ã\83©ã\83¼: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "±¦µ­¤Î¼°Ãæ¤Ë¥¨¥é¡¼: %s"
+msgstr "å\8f³è¨\98ã\81®å¼\8f中ã\81«ã\82¨ã\83©ã\83¼: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 msgid "Error initialising gnutls certificate data"
-msgstr "gnutls ¾ÚÌÀ½ñ¥Ç¡¼¥¿½é´ü²½¥¨¥é¡¼"
+msgstr "gnutls 証æ\98\8eæ\9b¸ã\83\87ã\83¼ã\82¿å\88\9dæ\9c\9få\8c\96ã\82¨ã\83©ã\83¼"
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "üËö½é´ü²½¥¨¥é¡¼"
+msgstr "端æ\9c«å\88\9dæ\9c\9få\8c\96ã\82¨ã\83©ã\83¼"
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¥ª¡¼¥×¥ó»þ¥¨¥é¡¼"
+msgstr "ã\83¡ã\83¼ã\83«ã\83\9cã\83\83ã\82¯ã\82¹ã\82ªã\83¼ã\83\97ã\83³æ\99\82ã\82¨ã\83©ã\83¼"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "¥¢¥É¥ì¥¹²òÀÏ¥¨¥é¡¼!"
+msgstr "ã\82¢ã\83\89ã\83¬ã\82¹è§£æ\9e\90ã\82¨ã\83©ã\83¼!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
-msgstr "¾ÚÌÀ½ñ¥Ç¡¼¥¿½èÍý¥¨¥é¡¼"
+msgstr "証æ\98\8eæ\9b¸ã\83\87ã\83¼ã\82¿å\87¦ç\90\86ã\82¨ã\83©ã\83¼"
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "\"%s\" ¼Â¹Ô¥¨¥é¡¼!"
+msgstr "\"%s\" å®\9fè¡\8cã\82¨ã\83©ã\83¼!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥¹¥­¥ã¥ó¥¨¥é¡¼¡£"
+msgstr "ディレクトリのスキャンエラー。"
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "¥á¥Ã¥»¡¼¥¸Á÷¿®¥¨¥é¡¼¡£»Ò¥×¥í¥»¥¹¤¬ %d (%s) ¤Ç½ªÎ»¤·¤¿¡£"
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "¥á¥Ã¥»¡¼¥¸Á÷¿®¥¨¥é¡¼¡¢»Ò¥×¥í¥»¥¹¤¬ %d ¤Ç½ªÎ»¡£\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "¥á¥Ã¥»¡¼¥¸Á÷¿®¥¨¥é¡¼¡£"
+msgstr "メッセージ送信エラー。子プロセスが %d (%s) で終了した。"
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "%s ¤Ø¤Î¸ò¿®¥¨¥é¡¼ (%s)¡£"
+msgstr "%s への交信エラー (%s)。"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "¥Õ¥¡¥¤¥ë±ÜÍ÷¥¨¥é¡¼"
+msgstr "ã\83\95ã\82¡ã\82¤ã\83«é\96²è¦§ã\82¨ã\83©ã\83¼"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼!"
+msgstr "ã\83¡ã\83¼ã\83«ã\83\9cã\83\83ã\82¯ã\82¹æ\9b¸ã\81\8dè¾¼ã\81¿ä¸­ã\81«ã\82¨ã\83©ã\83¼!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "¥¨¥é¡¼¡£°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÏÊÝ´É"
+msgstr "エラー。一時ファイル %s は保管"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "¥¨¥é¡¼: %s ¤ÏºÇ¸å¤Î remailer ¥Á¥§¡¼¥ó¤Ë¤Ï»È¤¨¤Ê¤¤¡£"
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "¥¨¥é¡¼: '%s' ¤ÏÉÔÀµ¤Ê IDN."
+msgstr "エラー: '%s' は不正な IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
-msgstr "¥¨¥é¡¼: ¾ÚÌÀ½ñ¤ÎÏ¢º¿¤¬Ä¹¤¹¤®¤ë - ¤³¤³¤Ç¤ä¤á¤Æ¤ª¤¯\n"
+msgstr "エラー: 証明書の連鎖が長すぎる - ここでやめておく\n"
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
-msgstr "¥¨¥é¡¼: ¥Ç¡¼¥¿¤Î¥³¥Ô¡¼¤Ë¼ºÇÔ¤·¤¿\n"
+msgstr "エラー: データのコピーに失敗した\n"
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
-msgstr "¥¨¥é¡¼: Éü¹æ²½/¸¡¾Ú¤¬¼ºÇÔ¤·¤¿: %s\n"
+msgstr "エラー: 復号化/検証が失敗した: %s\n"
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "¥¨¥é¡¼: multipart/encrypted ¤Ë¥×¥í¥È¥³¥ë¥Ñ¥é¥á¡¼¥¿¤¬¤Ê¤¤!"
+msgstr "エラー: multipart/encrypted にプロトコルパラメータがない!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "¥¨¥é¡¼: multipart/signed ¤Ë¥×¥í¥È¥³¥ë¤¬¤Ê¤¤¡£"
+msgstr "エラー: multipart/signed にプロトコルがない。"
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
-msgstr "¥¨¥é¡¼: TLS ¥½¥±¥Ã¥È¤¬³«¤¤¤Æ¤¤¤Ê¤¤"
+msgstr "エラー: TLS ソケットが開いていない"
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "¥¨¥é¡¼: ¸¡¾Ú¤Ë¼ºÇÔ¤·¤¿: %s\n"
+msgstr "エラー: 検証に失敗した: %s\n"
 
 #: imap/message.c:109
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "¥­¥ã¥Ã¥·¥åÆɤ߽Ф·Ãæ... [%d/%d]"
+msgstr "キャッシュ読み出し中... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "¥á¥Ã¥»¡¼¥¸¥Ñ¥¿¡¼¥ó¸¡º÷¤Î¤¿¤á¤Ë¥³¥Þ¥ó¥É¼Â¹ÔÃæ..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Ìá¤ë"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "½ªÎ»  "
+msgstr "メッセージパターン検索のためにコマンド実行中..."
 
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Êݸ¤·¤Ê¤¤¤Ç Mutt ¤òÈ´¤±¤ë?"
+msgstr "保存しないで Mutt を抜ける?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Mutt ¤òÈ´¤±¤ë?"
+msgstr "Mutt を抜ける?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "ºï½ü¤Ë¼ºÇÔ¤·¤¿"
+msgstr "削除に失敗した"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "¥µ¡¼¥Ð¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½üÃæ..."
+msgstr "サーバからメッセージを削除中..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "¥Ø¥Ã¥À²òÀϤΤ¿¤á¤Î¥Õ¥¡¥¤¥ë¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¡£"
+msgstr "ヘッダ解析のためのファイルオープンに失敗。"
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "¥Ø¥Ã¥Àºï½ü¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¡£"
+msgstr "ヘッダ削除のためのファイルオープンに失敗。"
 
 #: attach.c:151
 msgid "Failure to rename file."
-msgstr "¥Õ¥¡¥¤¥ë¤Î¥ê¥Í¡¼¥à (°ÜÆ°) ¤Ë¼ºÇÔ¡£"
+msgstr "ファイルのリネーム (移動) に失敗。"
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼! ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òºÆ¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤«¤Ã¤¿!"
+msgstr "致命的なエラー! メールボックスを再オープンできなかった!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Ã×̿Ū¥¨¥é¡¼¡£¥á¥Ã¥»¡¼¥¸¿ô¤¬Æ±´ü¤·¤Æ¤¤¤Ê¤¤!"
+msgstr "致命的エラー。メッセージ数が同期していない!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "¥µ¡¼¥Ð¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½üÃæ..."
+msgstr "サーバからメッセージを削除中..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "¥á¥Ã¥»¡¼¥¸¼èÆÀÃæ..."
+msgstr "メッセージ取得中..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "¥á¥Ã¥»¡¼¥¸¥ê¥¹¥È¤ò¼èÆÀÃæ..."
+msgstr "メッセージリストを取得中..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "¥á¥Ã¥»¡¼¥¸¥ê¥¹¥È¤ò¼èÆÀÃæ..."
+msgstr "メッセージリストを取得中..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "¥á¥Ã¥»¡¼¥¸¥Ø¥Ã¥À¼èÆÀÃæ... [%d/%d]"
+msgstr "メッセージヘッダ取得中... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "¥á¥Ã¥»¡¼¥¸¥Ø¥Ã¥À¼èÆÀÃæ... [%d/%d]"
+msgstr "メッセージヘッダ取得中... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "¥á¥Ã¥»¡¼¥¸¼èÆÀÃæ..."
+msgstr "メッセージ取得中..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯: "
+msgstr "ã\83\95ã\82¡ã\82¤ã\83«ã\83\9eã\82¹ã\82¯: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ë¡£o:¾å½ñ¤­, a:ÄɲÃ, c:Ãæ»ß"
+msgstr "ファイルが存在する。o:上書き, a:追加, c:中止"
 
-# »²¹Í: "Save to file: " => "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: " (alias.c, recvattach.c)
+# 参考: "Save to file: " => "保存するファイル: " (alias.c, recvattach.c)
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "¤½¤³¤Ï¥Ç¥£¥ì¥¯¥È¥ê¡£¤½¤ÎÃæ¤ËÊݸ?"
+msgstr "そこはディレクトリ。その中に保存?"
 
-# »²¹Í: "Save to file: " => "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: " (alias.c, recvattach.c)
+# 参考: "Save to file: " => "保存するファイル: " (alias.c, recvattach.c)
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "¤½¤³¤Ï¥Ç¥£¥ì¥¯¥È¥ê¡£¤½¤ÎÃæ¤ËÊݸ? (y:¤¹¤ë, n:¤·¤Ê¤¤, a:¤¹¤Ù¤ÆÊݸ)"
+msgstr "そこはディレクトリ。その中に保存? (y:する, n:しない, a:すべて保存)"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "¥Ç¥£¥ì¥¯¥È¥êÇÛ²¼¤Î¥Õ¥¡¥¤¥ë: "
+msgstr "ディレクトリ配下のファイル: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "ɽ¼¨¤Î¤¿¤á¤ËÄ̲ᤵ¤»¤ë¥³¥Þ¥ó¥É: "
+msgstr "表示のために通過させるコマンド: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 msgid "Fingerprint: "
-msgstr "¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: "
+msgstr "フィンガープリント: "
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 msgid "First, please tag a message to be linked here"
-msgstr "¤½¤ÎÁ°¤Ë¡¢¤³¤³¤Ø¤Ä¤Ê¤²¤¿¤¤¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤Æ¤ª¤¯¤³¤È"
+msgstr "その前に、ここへつなげたいメッセージにタグを付けておくこと"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "%s%s ¤Ø¤Î¥Õ¥©¥í¡¼¥¢¥Ã¥×?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "%s%s ¤Ø¤Î¥Õ¥©¥í¡¼¥¢¥Ã¥×?"
+msgstr "%s%s へのフォローアップ?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "MIME ¥«¥×¥»¥ë²½¤·¤ÆžÁ÷?"
+msgstr "MIME カプセル化して転送?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤È¤·¤ÆžÁ÷?"
+msgstr "添付ファイルとして転送?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤È¤·¤ÆžÁ÷?"
+msgstr "添付ファイルとして転送?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "¤³¤Îµ¡Ç½¤Ï¥á¥Ã¥»¡¼¥¸ÅºÉե⡼¥É¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "この機能はメッセージ添付モードでは許可されていない。"
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "¥Õ¥©¥ë¥À¥ê¥¹¥È¼èÆÀÃæ..."
+msgstr "フォルダリスト取得中..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "¥Í¡¼¥à¥¹¥Ú¡¼¥¹¼èÆÀÃæ..."
+msgstr "ネームスペース取得中..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
-msgstr "Àµ¤·¤¤½ð̾: "
-
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Á´°÷¤ËÊÖ¿®"
+msgstr "正しい署名: "
 
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "¥Ø¥ë¥×"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "%s ¤Î¥Ø¥ë¥×"
+msgstr "%s のヘルプ"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "¸½ºß¥Ø¥ë¥×¤òɽ¼¨Ãæ"
+msgstr "現在ヘルプを表示中"
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "¤É¤Î¤è¤¦¤Ë°õºþ¤¹¤ë¤«ÉÔÌÀ!"
+msgstr "どのように印刷するか不明!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "¤É¤Î¤è¤¦¤ËźÉÕ¥Õ¥¡¥¤¥ë %s ¤ò°õºþ¤¹¤ë¤«ÉÔÌÀ!"
+msgstr "どのように添付ファイル %s を印刷するか不明!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "ID ¤Ï¿®ÍÑÅÙ¤¬Ì¤ÄêµÁ¡£"
+msgstr "ID は信用度が未定義。"
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "ID ¤Ï´ü¸ÂÀڤ줫»ÈÍÑÉԲĤ«ÇÑ´þºÑ¤ß¡£"
+msgstr "ID は期限切れか使用不可か廃棄済み。"
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "ID ¤Ï¿®ÍѤµ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "ID は信用されていない。"
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "ID ¤Ï¤«¤í¤¦¤¸¤Æ¿®ÍѤµ¤ì¤Æ¤¤¤ë¡£"
+msgstr "ID はかろうじて信用されている。"
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "ÉÔÀµ¤Ê PGP ¥Ø¥Ã¥À"
+msgstr "不正な PGP ヘッダ"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "ÉÔÀµ¤Ê S/MIME ¥Ø¥Ã¥À"
+msgstr "不正な S/MIME ヘッダ"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "%s ·Á¼°¤ËÉÔŬÀڤʥ¨¥ó¥È¥ê¤¬ \"%s\" ¤Î %d ¹ÔÌܤˤ¢¤ë"
+msgstr "%s 形式に不適切なエントリが \"%s\" の %d 行目にある"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "ÊÖ¿®¤Ë¥á¥Ã¥»¡¼¥¸¤ò´Þ¤á¤ë¤«?"
+msgstr "返信にメッセージを含めるか?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "°úÍÑ¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê¹þ¤ßÃæ..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "ÁÞÆþ"
+msgstr "引用メッセージを取り込み中..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "%s ¤ÏÉÔÀµ¤ÊÆüÉÕ"
+msgstr "%s は不正な日付"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "ÉÔÀµ¤Ê¥¨¥ó¥³¡¼¥ÉË¡¡£"
+msgstr "不正なエンコード法。"
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "ÉÔÀµ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹Èֹ档"
+msgstr "不正なインデックス番号。"
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "ÉÔÀµ¤Ê¥á¥Ã¥»¡¼¥¸Èֹ档"
+msgstr "不正なメッセージ番号。"
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "%s ¤ÏÉÔÀµ¤Ê·î"
+msgstr "%s は不正な月"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "%s ¤ÏÉÔÀµ¤ÊÁêÂзîÆü"
+msgstr "%s は不正な相対月日"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "PGP µ¯Æ°Ãæ..."
+msgstr "PGP 起動中..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "S/MIME µ¯Æ°Ãæ..."
+msgstr "S/MIME 起動中..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "¼«Æ°É½¼¨¥³¥Þ¥ó¥É %s µ¯Æ°"
+msgstr "自動表示コマンド %s 起動"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
-msgstr "ȯ¹Ô¼Ô ...........: "
+msgstr "発行者 ...........: "
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "¥á¥Ã¥»¡¼¥¸ÈÖ¹æ¤ò»ØÄê: "
+msgstr "メッセージ番号を指定: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "°ÜÆ°À襤¥ó¥Ç¥Ã¥¯¥¹ÈÖ¹æ¤ò»ØÄê: "
+msgstr "移動先インデックス番号を指定: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "¥¸¥ã¥ó¥×µ¡Ç½¤Ï¥À¥¤¥¢¥í¥°¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "ジャンプ機能はダイアログでは実装されていない。"
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "¸° ID: 0x%s"
+msgstr "鍵 ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
-msgstr "¸°¼ïÊÌ ...........: %s, %lu ¥Ó¥Ã¥È %s\n"
+msgstr "鍵種別 ...........: %s, %lu ビット %s\n"
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
-msgstr "¸°Ç½ÎÏ ...........: "
+msgstr "鍵能力 ...........: "
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "¥­¡¼¤Ï¥Ð¥¤¥ó¥É¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "キーはバインドされていない。"
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "¥­¡¼¤Ï¥Ð¥¤¥ó¥É¤µ¤ì¤Æ¤¤¤Ê¤¤¡£'%s' ¤ò²¡¤¹¤È¥Ø¥ë¥×"
+msgstr "キーはバインドされていない。'%s' を押すとヘルプ"
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "¥á¥Ã¥»¡¼¥¸¤Îɽ¼¨¤òÀ©¸Â¤¹¤ë¥Ñ¥¿¡¼¥ó: "
+msgstr "メッセージの表示を制限するパターン: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "À©¸Â¥Ñ¥¿¡¼¥ó: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "制限パターン: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "¥í¥°¥¤¥óÃæ..."
+msgstr "ログイン中..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1708,1786 +1624,1823 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "¥í¥Ã¥¯²ó¿ô¤¬Ëþλ¡¢%s ¤Î¥í¥Ã¥¯¤ò¤Ï¤º¤¹¤«?"
+msgstr "ロック回数が満了、%s のロックをはずすか?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "¥í¥°¥¤¥óÃæ..."
+msgstr "ログイン中..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "¥í¥°¥¤¥ó¤Ë¼ºÇÔ¤·¤¿¡£"
+msgstr "ログインに失敗した。"
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "\"%s\" ¤Ë°ìÃפ¹¤ë¸°¤ò¸¡º÷Ãæ..."
+msgstr "\"%s\" に一致する鍵を検索中..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "%s ¸¡º÷Ãæ..."
+msgstr "%s 検索中..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "MD5 ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
+msgstr "MD5 フィンガープリント: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "MIME ·Á¼°¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£ÅºÉÕ¥Õ¥¡¥¤¥ë¤òɽ¼¨¤Ç¤­¤Ê¤¤¡£"
+msgstr "MIME 形式が定義されていない。添付ファイルを表示できない。"
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "¥Þ¥¯¥í¤Î¥ë¡¼¥×¤¬¸¡½Ð¤µ¤ì¤¿¡£"
+msgstr "マクロのループが検出された。"
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "¥á¡¼¥ë"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "¥á¡¼¥ë¤ÏÁ÷¿®¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
+msgstr "メールは送信されなかった。"
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "¥á¡¼¥ë¤òÁ÷¿®¤·¤¿¡£"
+msgstr "メールを送信した。"
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤òºÎ¼è¤·¤¿¡£"
+msgstr "メールボックスのチェックポイントを採取した。"
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òÊĤ¸¤¿"
+msgstr "メールボックスを閉じた"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬ºîÀ®¤µ¤ì¤¿¡£"
+msgstr "メールボックスが作成された。"
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ïºï½ü¤µ¤ì¤¿¡£"
+msgstr "メールボックスは削除された。"
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¶õ¡£"
+msgstr "メールボックスが空。"
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï½ñ¤­¹þ¤ßÉÔǽ¤Ë¥Þ¡¼¥¯¤µ¤ì¤¿¡£%s"
+msgstr "メールボックスは書き込み不能にマークされた。%s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÏÆɤ߽Ф·ÀìÍÑ¡£"
+msgstr "メールボックスは読み出し専用。"
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÏÊѹ¹¤µ¤ì¤Ê¤«¤Ã¤¿"
+msgstr "メールボックスは変更されなかった"
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤Ï̾Á°¤¬É¬Íס£"
+msgstr "メールボックスには名前が必要。"
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ïºï½ü¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
+msgstr "メールボックスは削除されなかった。"
 
 #: imap/browse.c:306
 msgid "Mailbox renamed."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¥ê¥Í¡¼¥à (°ÜÆ°) ¤µ¤ì¤¿¡£"
+msgstr "メールボックスがリネーム (移動) された。"
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤³¤ï¤ì¤¿!"
+msgstr "メールボックスがこわれた!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬³°Éô¤«¤éÊѹ¹¤µ¤ì¤¿¡£"
+msgstr "メールボックスが外部から変更された。"
 
-# ¡ÖÉÔÀµ¤Ê²ÄǽÀ­¤¢¤ê¡×¤À¤È½ÅÂç¤Ê¤³¤È¤Î¤è¤¦¤Ë»×¤¨¤Æ¤·¤Þ¤¦¤Î¤ÇÊѹ¹¤·¤¿¡£
-#: lib-ui/curs_main.c:469
+# 「不正な可能性あり」だと重大なことのように思えてしまうので変更した。
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬³°Éô¤«¤éÊѹ¹¤µ¤ì¤¿¡£¥Õ¥é¥°¤¬Àµ³Î¤Ç¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡£"
+msgstr "メールボックスが外部から変更された。フラグが正確でないかもしれない。"
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ [%d]"
+msgstr "ã\83¡ã\83¼ã\83«ã\83\9cã\83\83ã\82¯ã\82¹ [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤Ë¤Ï %%s ¤¬É¬Í×"
+msgstr "Mailcap 編集エントリには %%s が必要"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤Ë %%s ¤¬É¬Í×"
+msgstr "Mailcap 編集エントリに %%s が必要"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "ÊÌ̾ºîÀ®"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "%d ¸Ä¤Î¥á¥Ã¥»¡¼¥¸¤Ëºï½ü¤ò¥Þ¡¼¥¯Ãæ..."
+msgstr "%d 個のメッセージに削除をマーク中..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "¥Þ¥¹¥¯"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òºÆÁ÷¤·¤¿¡£"
+msgstr "メッセージを再送した。"
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤Ç¤­¤Ê¤«¤Ã¤¿"
+msgstr "メッセージは印刷できなかった"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "¥á¥Ã¥»¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¶õ!"
+msgstr "メッセージファイルが空!"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "¥á¥Ã¥»¡¼¥¸¤ÏºÆÁ÷¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
+msgstr "メッセージは再送されなかった。"
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤!"
+msgstr "メッセージは変更されていない!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "¿Æ¥á¥Ã¥»¡¼¥¸¤Ï¤³¤ÎÀ©¸Â¤µ¤ì¤¿É½¼¨ÈϰϤǤÏÉԲĻ롣"
+msgstr "親メッセージはこの制限された表示範囲では不可視。"
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ï½ñ¤­¤«¤±¤ÇÊÝᤵ¤ì¤¿¡£"
+msgstr "メッセージは書きかけで保留された。"
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤µ¤ì¤¿"
+msgstr "メッセージは印刷された"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ï½ñ¤­¹þ¤Þ¤ì¤¿¡£"
+msgstr "メッセージは書き込まれた。"
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "¥á¥Ã¥»¡¼¥¸¤òºÆÁ÷¤·¤¿¡£"
+msgstr "メッセージを再送した。"
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤Ç¤­¤Ê¤«¤Ã¤¿"
+msgstr "メッセージは印刷できなかった"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "¥á¥Ã¥»¡¼¥¸¤ÏºÆÁ÷¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
+msgstr "メッセージは再送されなかった。"
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ï°õºþ¤µ¤ì¤¿"
+msgstr "メッセージは印刷された"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "°ú¿ô¤¬¤Ê¤¤¡£"
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Mixmaster ¥Á¥§¡¼¥ó¤Ï %d ¥¨¥ì¥á¥ó¥È¤ËÀ©¸Â¤µ¤ì¤Æ¤¤¤ë¡£"
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster ¤Ï Cc ¤Þ¤¿¤Ï Bcc ¥Ø¥Ã¥À¤ò¼õ¤±¤Ä¤±¤Ê¤¤¡£"
+msgstr "引数がない。"
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "%s ¤Ë´ûÆÉ¥á¥Ã¥»¡¼¥¸¤ò°ÜÆ°?"
+msgstr "%s に既読メッセージを移動?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "%s ¤Ë´ûÆÉ¥á¥Ã¥»¡¼¥¸¤ò°ÜÆ°Ãæ..."
+msgstr "%s に既読メッセージを移動中..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
-msgstr "̾Á° .............: "
-
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "¿·µ¬Ì䤤¹ç¤ï¤»"
+msgstr "名前 .............: "
 
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "¿·µ¬¥Õ¥¡¥¤¥ë̾: "
+msgstr "新規ファイル名: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "¿·µ¬¥Õ¥¡¥¤¥ë: "
+msgstr "新規ファイル: "
 
 #: buffy.cpkg:330
 msgid "New mail in "
-msgstr "¿·Ãå¥á¡¼¥ë¤¢¤ê: "
+msgstr "新着メールあり: "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "¤³¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¿·Ãå¥á¡¼¥ë¡£"
+msgstr "このメールボックスに新着メール。"
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "¼¡"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "¼¡ÊÇ"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
-msgstr "Message-ID ¥Ø¥Ã¥À¤¬ÍøÍѤǤ­¤Ê¤¤¤Î¤Ç¥¹¥ì¥Ã¥É¤ò¤Ä¤Ê¤²¤é¤ì¤Ê¤¤"
+msgstr "Message-ID ヘッダが利用できないのでスレッドをつなげられない"
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "ÍøÍѤǤ­¤ëǧ¾Ú½èÍý¤¬¤Ê¤¤"
+msgstr "利用できる認証処理がない"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "boundary ¥Ñ¥é¥á¡¼¥¿¤¬¤ß¤Ä¤«¤é¤Ê¤¤! [¤³¤Î¥¨¥é¡¼¤òÊó¹ð¤»¤è]"
+msgstr "boundary パラメータがみつからない! [このエラーを報告せよ]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "¥¨¥ó¥È¥ê¤¬¤Ê¤¤¡£"
+msgstr "エントリがない。"
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯¤Ë°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤¬¤Ê¤¤"
+msgstr "ファイルマスクに一致するファイルがない"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "ÅþÃåÍѥ᡼¥ë¥Ü¥Ã¥¯¥¹¤¬Ì¤ÄêµÁ¡£"
+msgstr "到着用メールボックスが未定義。"
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "¸½ºßÍ­¸ú¤ÊÀ©¸Â¥Ñ¥¿¡¼¥ó¤Ï¤Ê¤¤¡£"
+msgstr "現在有効な制限パターンはない。"
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "³«¤¤¤Æ¤¤¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤Ê¤¤¡£"
+msgstr "開いているメールボックスがない。"
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "¿·Ãå¥á¡¼¥ë¤Î¤¢¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï¤Ê¤¤¡£"
+msgstr "新着メールのあるメールボックスはない。"
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "%s ¤Î¤¿¤á¤Î mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤¬¤Ê¤¤¤Î¤Ç¶õ¥Õ¥¡¥¤¥ë¤òºîÀ®¡£"
+msgstr "%s のための mailcap 編集エントリがないので空ファイルを作成。"
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "%s ¤Î¤¿¤á¤Î mailcap ÊÔ½¸¥¨¥ó¥È¥ê¤¬¤Ê¤¤"
+msgstr "%s のための mailcap 編集エントリがない"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿!"
+msgstr "メーリングリストが見つからなかった!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "mailcap ¤Ë°ìÃ×¥¨¥ó¥È¥ê¤¬¤Ê¤¤¡£¥Æ¥­¥¹¥È¤È¤·¤Æɽ¼¨Ãæ¡£"
+msgstr "mailcap に一致エントリがない。テキストとして表示中。"
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "¤½¤Î¥Õ¥©¥ë¥À¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
+msgstr "そのフォルダにはメッセージがない。"
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ¹¤ë¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤«¤Ã¤¿¡£"
+msgstr "パターンに一致するメッセージがなかった。"
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "¤³¤ì°Ê¾å¤Î°úÍÑʸ¤Ï¤Ê¤¤¡£"
+msgstr "これ以上の引用文はない。"
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "¤â¤¦¥¹¥ì¥Ã¥É¤¬¤Ê¤¤¡£"
+msgstr "もうスレッドがない。"
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "°úÍÑʸ¤Î¸å¤Ë¤Ï¤â¤¦Èó°úÍÑʸ¤¬¤Ê¤¤¡£"
+msgstr "引用文の後にはもう非引用文がない。"
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "POP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¿·Ãå¥á¡¼¥ë¤Ï¤Ê¤¤¡£"
+msgstr "POP メールボックスに新着メールはない。"
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤"
+msgstr "新着メッセージがない"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Âê̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "題名が指定されていない。"
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯¤Ë°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤¬¤Ê¤¤"
+msgstr "ファイルマスクに一致するファイルがない"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "¿·Ãå¥á¡¼¥ë¤Î¤¢¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï¤Ê¤¤¡£"
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "½ñ¤­¤«¤±¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "¿·Ãå¥á¡¼¥ë¤Î¤¢¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï¤Ê¤¤¡£"
+msgstr "書きかけメッセージがない。"
 
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "°õºþ¥³¥Þ¥ó¥É¤¬Ì¤ÄêµÁ¡£"
+msgstr "印刷コマンドが未定義。"
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤!"
+msgstr "受信者が指定されていない!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£\n"
+msgstr "受信者が指定されていない。\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¡£"
+msgstr "受信者が指定されていなかった。"
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤¡£"
+msgstr "検索パターンがない。"
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Âê̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "題名が指定されていない。"
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Âê̾¤¬¤Ê¤¤¡£Á÷¿®¤òÃæ»ß?"
+msgstr "題名がない。送信を中止?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Âê̾¤¬¤Ê¤¤¡£Ãæ»ß?"
+msgstr "題名がない。中止?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "̵Âê¤ÇÃæ»ß¤¹¤ë¡£"
+msgstr "無題で中止する。"
 
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "¤½¤Î¤è¤¦¤Ê¥Õ¥©¥ë¥À¤Ï¤Ê¤¤"
+msgstr "そのようなフォルダはない"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "¥¿¥°ÉÕ¤­¥¨¥ó¥È¥ê¤¬¤Ê¤¤¡£"
+msgstr "タグ付きエントリがない。"
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "²Ä»ë¤Ê¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤!"
+msgstr "可視なタグ付きメッセージがない!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
+msgstr "タグ付きメッセージがない。"
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
-msgstr "¥¹¥ì¥Ã¥É¤Ï¤Ä¤Ê¤¬¤é¤Ê¤«¤Ã¤¿"
+msgstr "スレッドはつながらなかった"
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "̤ºï½ü¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
+msgstr "未削除メッセージがない。"
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤"
+msgstr "未読メッセージがない"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "²Ä»ë¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
+msgstr "可視メッセージがない。"
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ç¤ÏÍøÍѤǤ­¤Ê¤¤¡£"
+msgstr "このメニューでは利用できない。"
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¡£"
+msgstr "見つからなかった。"
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
-msgstr "²¿¤â¤·¤Ê¤¤¡£"
+msgstr "何もしない。"
 
-#: remailer.c:435
-msgid "OK"
-msgstr "¾µÇ§(OK)"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "¥Þ¥ë¥Á¥Ñ¡¼¥ÈźÉÕ¥Õ¥¡¥¤¥ë¤Îºï½ü¤Î¤ß¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¡£"
+msgstr "マルチパート添付ファイルの削除のみサポートされている。"
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
+msgstr "メールボックスをオープン"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Æɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
+msgstr "読み出し専用モードでメールボックスをオープン"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Ãæ¤Î¥á¥Ã¥»¡¼¥¸¤òźÉÕ¤¹¤ë¤¿¤á¤Ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
+msgstr "中のメッセージを添付するためにメールボックスをオープン"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Æɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
+msgstr "読み出し専用モードでメールボックスをオープン"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Ãæ¤Î¥á¥Ã¥»¡¼¥¸¤òźÉÕ¤¹¤ë¤¿¤á¤Ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó"
+msgstr "中のメッセージを添付するためにメールボックスをオープン"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "ÇÛ¿®¥×¥í¥»¥¹¤Î½ÐÎÏ"
+msgstr "配信プロセスの出力"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, m:S/MIME, c:¤Ê¤· "
+msgstr "PGP e:暗号化, s:署名, a:署名鍵選択, b:暗号+署名, m:S/MIME, c:なし "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP ¤¬´û¤ËÁªÂò¤µ¤ì¤Æ¤¤¤ë¡£²ò½ü¤·¤Æ·Ñ³?"
+msgstr "PGP が既に選択されている。解除して継続?"
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 msgid "PGP and S/MIME keys matching"
-msgstr "°ìÃפ¹¤ë PGP ¤ª¤è¤Ó S/MIME ¸°"
+msgstr "一致する PGP および S/MIME 鍵"
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 msgid "PGP keys matching"
-msgstr "°ìÃפ¹¤ë PGP ¸°"
+msgstr "一致する PGP 鍵"
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP ½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Ê¤«¤Ã¤¿¡£"
+msgstr "PGP 署名は検証できなかった。"
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP ½ð̾¤Î¸¡¾Ú¤ËÀ®¸ù¤·¤¿¡£"
+msgstr "PGP 署名の検証に成功した。"
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "POP ¥Û¥¹¥È¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "POP ホストが定義されていない。"
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "¿Æ¥á¥Ã¥»¡¼¥¸¤¬ÍøÍѤǤ­¤Ê¤¤¡£"
+msgstr "親メッセージが利用できない。"
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "¿Æ¥á¥Ã¥»¡¼¥¸¤Ï¤³¤ÎÀ©¸Â¤µ¤ì¤¿É½¼¨ÈϰϤǤÏÉԲĻ롣"
+msgstr "親メッセージはこの制限された表示範囲では不可視。"
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "%s@%s ¤Î¥Ñ¥¹¥ï¡¼¥É: "
+msgstr "%s@%s のパスワード: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "¸Ä¿Í̾: "
-
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "¥Ñ¥¤¥×"
+msgstr "個人名: "
 
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "¥³¥Þ¥ó¥É¤Ø¤Î¥Ñ¥¤¥×: "
+msgstr "コマンドへのパイプ: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "¥Ñ¥¤¥×¤¹¤ë¥³¥Þ¥ó¥É: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "mixmaster ¤ò»È¤¦»þ¤Ë¤Ï¡¢hostname ÊÑ¿ô¤ËŬÀÚ¤ÊÃͤòÀßÄꤻ¤è¡£"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "パイプするコマンド: "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¤«¤±¤ÇÊÝα?"
+msgstr "このメッセージを書きかけで保留?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "½ñ¤­¤«¤±¤Î¥á¥Ã¥»¡¼¥¸"
+msgstr "æ\9b¸ã\81\8dã\81\8bã\81\91ã\81®ã\83¡ã\83\83ã\82»ã\83¼ã\82¸"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "»öÁ°Àܳ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¡£"
+msgstr "事前接続コマンドが失敗。"
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "žÁ÷¥á¥Ã¥»¡¼¥¸¤ò½àÈ÷Ãæ..."
+msgstr "転送メッセージを準備中..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "³¤±¤ë¤Ë¤Ï²¿¤«¥­¡¼¤ò..."
+msgstr "続けるには何かキーを..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "Á°ÊÇ"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "°õºþ"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤ò°õºþ?"
+msgstr "添付ファイルを印刷?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò°õºþ?"
+msgstr "メッセージを印刷?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "¥¿¥°ÉÕ¤­ÅºÉÕ¥Õ¥¡¥¤¥ë¤ò°õºþ?"
+msgstr "タグ付き添付ファイルを印刷?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤ò°õºþ?"
+msgstr "タグ付きメッセージを印刷?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "ºï½ü¤µ¤ì¤¿ %d ¥á¥Ã¥»¡¼¥¸¤òÇÑ´þ?"
+msgstr "削除された %d メッセージを廃棄?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "ºï½ü¤µ¤ì¤¿ %d ¥á¥Ã¥»¡¼¥¸¤òÇÑ´þ?"
+msgstr "削除された %d メッセージを廃棄?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Ì䤤¹ç¤ï¤»"
+msgstr "問い合わせ"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "Ì䤤¹ç¤ï¤» '%s'"
+msgstr "問い合わせ '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Ì䤤¹ç¤ï¤»¥³¥Þ¥ó¥É¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "問い合わせコマンドは定義されていない。"
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Ì䤤¹ç¤ï¤»: "
+msgstr "問い合わせ: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "̾ȧ"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Mutt ¤òÃæ»ß?"
+msgstr "Mutt を中止?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "¥Í¡¼¥à¥¹¥Ú¡¼¥¹¼èÆÀÃæ..."
+msgstr "ネームスペース取得中..."
 
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "%s Æɤ߽Ф·Ãæ..."
+msgstr "%s 読み出し中..."
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "%s ¤«¤éÆɤ߽Ф·Ãæ... %d"
+msgstr "%s から読み出し中... %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "Æɤ߽Ф·Ãæ %s... %d (%d%%)"
+msgstr "読み出し中 %s... %d (%d%%)"
 
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸Æɤ߽Ф·Ãæ (%d ¥Ð¥¤¥È)..."
+msgstr "新着メッセージ読み出し中 (%d バイト)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "ËÜÅö¤Ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ \"%s\" ¤òºï½ü?"
+msgstr "本当にメールボックス \"%s\" を削除?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "½ñ¤­¤«¤±¤Î¥á¥Ã¥»¡¼¥¸¤ò¸Æ¤Ó½Ð¤¹?"
+msgstr "書きかけのメッセージを呼び出す?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "¥³¡¼¥ÉÊÑ´¹¤Ï¥Æ¥­¥¹¥È·¿ÅºÉÕ¥Õ¥¡¥¤¥ë¤Ë¤Î¤ßÍ­¸ú¡£"
+msgstr "コード変換はテキスト型添付ファイルにのみ有効。"
 
 #: imap/browse.c:300
 #, c-format
 msgid "Rename failed: %s"
-msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) ¼ºÇÔ: %s"
+msgstr "リネーム (移動) 失敗: %s"
 
-#: browser.c:1020
+#: browser.c:991
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) µ¡Ç½¤Ï IMAP ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î¤ß¤Î¥µ¥Ý¡¼¥È"
+msgstr "リネーム (移動) 機能は IMAP メールボックスのみのサポート"
 
-# Ť¤¤«¤é¡Ö¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¡×¤òºï¤Ã¤Æ¤â¤¤¤¤¤«¤â
+# 長いから「メールボックス」を削ってもいいかも
 #: imap/browse.c:288
 #, c-format
 msgid "Rename mailbox %s to: "
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ %s ¤Î¥ê¥Í¡¼¥à(°ÜÆ°)Àè: "
+msgstr "メールボックス %s のリネーム(移動)先: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "¥ê¥Í¡¼¥à (°ÜÆ°) Àè: "
+msgstr "リネーム (移動) 先: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ºÆ¥ª¡¼¥×¥óÃæ..."
-
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "ÊÖ¿®"
+msgstr "メールボックス再オープン中..."
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-# ¤³¤³¤Ç no ¤À¤È from ¤ËÊÖ¿®¤¹¤ë¡£
-#: send.c:542
+# ここで no だと from に返信する。
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "%s%s ¤Ø¤ÎÊÖ¿®?"
+msgstr "%s%s への返信?"
 
 #: commands.c:403
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"µÕ½çÀ°Îó (d:»þ f:Á÷¼Ô r:Ãå½ç s:Âê o:°¸Àè t:¥¹¥ì u:̵ z:¥µ¥¤¥º c:ÆÀÅÀ p:¥¹¥Ñ"
-"¥à)"
+"逆順整列 (d:時 f:送者 r:着順 s:題 o:宛先 t:スレ u:無 z:サイズ c:得点 p:スパ"
+"ム)"
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "µÕ½ç¸¡º÷¥Ñ¥¿¡¼¥ó: "
+msgstr "逆順検索パターン: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "µÕ½ç¤Î¸¡º÷: "
+msgstr "逆順の検索: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "µÕ½ç¤ÎÀ°Îó (d:ÆüÉÕ, a:ABC½ç, z:¥µ¥¤¥º, n:À°Î󤷤ʤ¤)"
+msgstr "逆順の整列 (d:日付, a:ABC順, z:サイズ, n:整列しない)"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "S/MIME e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, p:PGP, c:¤Ê¤· "
+msgstr "S/MIME e:暗号化, s:署名, a:署名鍵選択, b:暗号+署名, p:PGP, c:なし "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME ¤¬´û¤ËÁªÂò¤µ¤ì¤Æ¤¤¤ë¡£²ò½ü¤·¤Æ·Ñ³?"
+msgstr "S/MIME が既に選択されている。解除して継続?"
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "S/MIME ¾ÚÌÀ½ñ½êÍ­¼Ô¤¬Á÷¿®¼Ô¤Ë°ìÃפ·¤Ê¤¤¡£"
+msgstr "S/MIME 証明書所有者が送信者に一致しない。"
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 msgid "S/MIME keys matching"
-msgstr "°ìÃפ¹¤ë S/MIME ¸°"
+msgstr "一致する S/MIME 鍵"
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "ÆâÍÆ¥Ò¥ó¥È¤Î¤Ê¤¤ S/MIME ¥á¥Ã¥»¡¼¥¸¤Ï̤¥µ¥Ý¡¼¥È¡£"
+msgstr "内容ヒントのない S/MIME メッセージは未サポート。"
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME ½ð̾¤Ï¸¡¾Ú¤Ç¤­¤Ê¤«¤Ã¤¿¡£"
+msgstr "S/MIME 署名は検証できなかった。"
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "S/MIME ½ð̾¤Î¸¡¾Ú¤ËÀ®¸ù¤·¤¿¡£"
+msgstr "S/MIME 署名の検証に成功した。"
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "SASL ǧ¾Ú¤Ë¼ºÇÔ¤·¤¿¡£"
+msgstr "SASL 認証に失敗した。"
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "SHA1 ¥Õ¥£¥ó¥¬¡¼¥×¥ê¥ó¥È: %s"
+msgstr "SHA1 フィンガープリント: %s"
 
 #: lib-sys/mutt_ssl.cpkg:304
 #, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "%s ¤ò»È¤Ã¤¿ SSL/TLS Àܳ (%s/%s/%s)"
+msgstr "%s を使った SSL/TLS 接続 (%s/%s/%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Êݸ"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Î¥³¥Ô¡¼¤òÊݸ?"
+msgstr "このメッセージのコピーを保存?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë: "
+msgstr "保存するファイル: "
 
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "%s¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ËÊݸ"
+msgstr "%sメールボックスに保存"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "¥á¥Ã¥»¡¼¥¸¥¹¥Æ¡¼¥¿¥¹¥Õ¥é¥°¤òÊݸÃæ... [%d/%d]"
+msgstr "メッセージステータスフラグを保存中... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "ÊݸÃæ..."
-
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "¸¡º÷"
+msgstr "保存中..."
 
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó: "
+msgstr "検索パターン: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "°ìÈÖ²¼¤Þ¤Ç¡¢²¿¤â¸¡º÷¤Ë°ìÃפ·¤Ê¤«¤Ã¤¿¡£"
+msgstr "一番下まで、何も検索に一致しなかった。"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "°ìÈÖ¾å¤Þ¤Ç¡¢²¿¤â¸¡º÷¤Ë°ìÃפ·¤Ê¤«¤Ã¤¿¡£"
+msgstr "一番上まで、何も検索に一致しなかった。"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "¸¡º÷¤¬ÃæÃǤµ¤ì¤¿¡£"
+msgstr "検索が中断された。"
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ç¤Ï¸¡º÷µ¡Ç½¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "このメニューでは検索機能が実装されていない。"
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "¸¡º÷¤Ï°ìÈÖ²¼¤ËÌá¤Ã¤¿¡£"
+msgstr "検索は一番下に戻った。"
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "¸¡º÷¤Ï°ìÈÖ¾å¤ËÌá¤Ã¤¿¡£"
+msgstr "検索は一番上に戻った。"
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "¸¡º÷: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "ÁªÂò"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "ÁªÂò  "
+msgstr "検索: "
 
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "remailer ¥Á¥§¡¼¥ó¤òÁªÂò¡£"
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "%s ¤òÁªÂòÃæ..."
-
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Á÷¿®"
+msgstr "%s を選択中..."
 
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤ÇÁ÷¿®¡£"
+msgstr "バックグラウンドで送信。"
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "Á÷¿®Ãæ..."
+msgstr "送信中..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
-msgstr "¥·¥ê¥¢¥ëÈÖ¹æ .....: 0x%s\n"
+msgstr "シリアル番号 .....: 0x%s\n"
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "¥µ¡¼¥Ð¤¬Àܳ¤òÀڤä¿!"
+msgstr "サーバが接続を切った!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "¥Õ¥é¥°ÀßÄê"
+msgstr "フラグ設定"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "¥·¥§¥ë¥³¥Þ¥ó¥É: "
+msgstr "シェルコマンド: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "½ð̾"
+msgstr "署名"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "½ð̾¤Ë»È¤¦¸°: "
+msgstr "署名に使う鍵: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "½ð̾ + °Å¹æ²½"
+msgstr "署名 + 暗号化"
 
 #: commands.c:406
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"À°Îó (d:»þ f:Á÷¼Ô r:Ãå½ç s:Âê o:°¸Àè t:¥¹¥ì u:̵ z:¥µ¥¤¥º c:ÆÀÅÀ p:¥¹¥Ñ¥à)"
+"整列 (d:時 f:送者 r:着順 s:題 o:宛先 t:スレ u:無 z:サイズ c:得点 p:スパム)"
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "À°Îó (d:ÆüÉÕ, a:ABC½ç, z:¥µ¥¤¥º, n:À°Î󤷤ʤ¤)"
+msgstr "整列 (d:日付, a:ABC順, z:サイズ, n:整列しない)"
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹À°ÎóÃæ..."
+msgstr "メールボックス整列中..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "Éû¸° .............: 0x%s"
+msgstr "副鍵 .............: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "¹ØÆÉ [%s], ¥Õ¥¡¥¤¥ë¥Þ¥¹¥¯: %s"
+msgstr "購読 [%s], ã\83\95ã\82¡ã\82¤ã\83«ã\83\9eã\82¹ã\82¯: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "%s ¤Î¹ØÆɤò³«»ÏÃæ..."
+msgstr "%s の購読を開始中..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 msgid "TLS/SSL Certificate check"
-msgstr "TLS/SSL ¾ÚÌÀ½ñ¸¡ºº"
+msgstr "TLS/SSL 証明書検査"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤ë¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
+msgstr "メッセージにタグを付けるためのパターン: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "źÉÕ¤·¤¿¤¤¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤è!"
+msgstr "添付したいメッセージにタグを付けよ!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "¥¿¥°ÉÕ¤±µ¡Ç½¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "タグ付け機能がサポートされていない。"
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "¤½¤Î¥á¥Ã¥»¡¼¥¸¤Ï²Ä»ë¤Ç¤Ï¤Ê¤¤¡£"
+msgstr "そのメッセージは可視ではない。"
 
 #: crypt.cpkg:940
 msgid "The CRL is not available\n"
-msgstr "CRL ¤¬ÍøÍѤǤ­¤Ê¤¤\n"
+msgstr "CRL が利用できない\n"
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "¸½ºß¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤ÏÊÑ´¹¤µ¤ì¤ë¡£"
+msgstr "現在の添付ファイルは変換される。"
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "¸½ºß¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤ÏÊÑ´¹¤µ¤ì¤Ê¤¤¡£"
+msgstr "現在の添付ファイルは変換されない。"
 
-# ¤³¤Î Try ¤¬Ì¿Îá¤Ç¤Ê¤±¤ì¤Ð¤è¤¤¤Î¤À¤¬¡£
+# この Try が命令でなければよいのだが。
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "¥á¥Ã¥»¡¼¥¸º÷°ú¤¬ÉÔÀµ¡£¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ºÆ¥ª¡¼¥×¥ó¤ò»î¤ß¤ë¡£"
+msgstr "メッセージ索引が不正。メールボックス再オープンを試みる。"
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "remailer ¥Á¥§¡¼¥ó¤Ï¤¹¤Ç¤Ë¶õ¡£"
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤¬¤Ê¤¤¡£"
+msgstr "添付ファイルがない。"
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£"
+msgstr "メッセージがない。"
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "ɽ¼¨¤¹¤Ù¤­Éû¥Ñ¡¼¥È¤¬¤Ê¤¤!"
+msgstr "表示すべき副パートがない!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "¤³¤Î IMAP ¥µ¡¼¥Ð¤Ï¸Å¤¤¡£¤³¤ì¤Ç¤Ï Mutt ¤Ï¤¦¤Þ¤¯µ¡Ç½¤·¤Ê¤¤¡£"
+msgstr "この IMAP サーバは古い。これでは Mutt はうまく機能しない。"
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "¤³¤Î¾ÚÌÀ½ñ¤Î½ê°Àè:"
+msgstr "この証明書の所属先:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "¤³¤Î¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´Ö¤Ï"
+msgstr "この証明書の有効期間は"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "¤³¤Î¾ÚÌÀ½ñ¤Îȯ¹Ô¸µ:"
+msgstr "この証明書の発行元:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "¤³¤Î¸°¤Ï´ü¸ÂÀڤ줫»ÈÍÑÉԲĤ«ÇÑ´þºÑ¤ß¤Î¤¿¤á¡¢»È¤¨¤Ê¤¤¡£"
+msgstr "この鍵は期限切れか使用不可か廃棄済みのため、使えない。"
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
-msgstr "¥¹¥ì¥Ã¥É¤¬³°¤µ¤ì¤¿"
+msgstr "スレッドが外された"
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "¥¹¥ì¥Ã¥ÉÃæ¤Ë̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ë¡£"
+msgstr "スレッド中に未読メッセージがある。"
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "¥¹¥ì¥Ã¥Éɽ¼¨¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¡£"
+msgstr "スレッド表示が有効になっていない。"
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
-msgstr "¥¹¥ì¥Ã¥É¤¬¤Ä¤Ê¤¬¤Ã¤¿"
+msgstr "スレッドがつながった"
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "fcntl ¥í¥Ã¥¯Ãæ¤Ë¥¿¥¤¥à¥¢¥¦¥ÈȯÀ¸!"
+msgstr "fcntl ロック中にタイムアウト発生!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "flock ¥í¥Ã¥¯Ãæ¤Ë¥¿¥¤¥à¥¢¥¦¥ÈȯÀ¸!"
+msgstr "flock ロック中にタイムアウト発生!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î°ìÈ־夬ɽ¼¨¤µ¤ì¤Æ¤¤¤ë"
+msgstr "メッセージの一番上が表示されている"
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "PGP ¸°¤ÎŸ³«¤ò»î¹ÔÃæ...\n"
+msgstr "PGP 鍵の展開を試行中...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "S/MIME ¾ÚÌÀ½ñ¤ÎŸ³«¤ò»î¹ÔÃæ...\n"
+msgstr "S/MIME 証明書の展開を試行中...\n"
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "%s ¤Ø¤Î¥È¥ó¥Í¥ë¸ò¿®¥¨¥é¡¼: %s"
+msgstr "%s ã\81¸ã\81®ã\83\88ã\83³ã\83\8dã\83«äº¤ä¿¡ã\82¨ã\83©ã\83¼: %s"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
 msgid "Tunnel to %s returned error %d (%s)"
-msgstr "%s ¤Ø¤Î¥È¥ó¥Í¥ë¤¬¥¨¥é¡¼ %d (%s) ¤òÊÖ¤·¤¿"
+msgstr "%s へのトンネルがエラー %d (%s) を返した"
 
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "SASL ǧ¾Ú¤Ë¼ºÇÔ¤·¤¿¡£"
+msgstr "SASL 認証に失敗した。"
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "%s ¤ÏźÉդǤ­¤Ê¤¤!"
+msgstr "%s は添付できない!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "źÉդǤ­¤Ê¤¤!"
+msgstr "添付できない!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î IMAP ¥µ¡¼¥Ð¤«¤é¤Ï¤Ø¥Ã¥À¤ò¼èÆÀ¤Ç¤­¤Ê¤¤¡£"
+msgstr "このバージョンの IMAP サーバからはへッダを取得できない。"
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "ÀܳÀ褫¤é¾ÚÌÀ½ñ¤òÆÀ¤é¤ì¤Ê¤«¤Ã¤¿"
+msgstr "接続先から証明書を得られなかった"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "¥µ¡¼¥Ð¤Ë¥á¥Ã¥»¡¼¥¸¤ò»Ä¤»¤Ê¤¤¡£"
+msgstr "サーバにメッセージを残せない。"
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "%s ¤ÏźÉդǤ­¤Ê¤¤!"
+msgstr "%s は添付できない!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¥í¥Ã¥¯ÉÔǽ!"
+msgstr "ã\83¡ã\83¼ã\83«ã\83\9cã\83\83ã\82¯ã\82¹ã\83­ã\83\83ã\82¯ä¸\8dè\83½!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
+msgstr "一時ファイルをオープンできない!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
+msgstr "一時ファイルをオープンできない!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "ºï½ü¤ò²ò½ü"
+msgstr "一時ファイルをオープンできない!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "¥á¥Ã¥»¡¼¥¸¤Îºï½ü¤ò²ò½ü¤¹¤ë¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
+msgstr "メッセージの削除を解除するためのパターン: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "ºï½ü¤ò²ò½ü"
+msgstr "削除を解除"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "%s ¤ÏÉÔÌÀ¤Ê Content-Type"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "%s ¤Î¹ØÆɤò¼è¤ê¾Ã¤·Ãæ..."
+msgstr "%s は不明な Content-Type"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "%s ¤Î¹ØÆɤò¼è¤ê¾Ã¤·Ãæ..."
+msgstr "%s の購読を取り消し中..."
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "%s ¤Î¹ØÆɤò¼è¤ê¾Ã¤·Ãæ..."
+msgstr "%s の購読を取り消し中..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "¥á¥Ã¥»¡¼¥¸¤Î¥¿¥°¤ò³°¤¹¤¿¤á¤Î¥Ñ¥¿¡¼¥ó: "
+msgstr "メッセージのタグを外すためのパターン: "
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥¢¥Ã¥×¥í¡¼¥ÉÃæ..."
+msgstr "メッセージをアップロード中..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "'toggle-write' ¤ò»È¤Ã¤Æ½ñ¤­¹þ¤ß¤òÍ­¸ú¤Ë¤»¤è!"
+msgstr "'toggle-write' を使って書き込みを有効にせよ!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "¸° ID = \"%s\" ¤ò %s ¤Ë»È¤¦?"
+msgstr "鍵 ID = \"%s\" を %s に使う?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "%s ¤Î¥æ¡¼¥¶Ì¾: "
+msgstr "%s のユーザ名: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, c-format
 msgid "Valid From : %s\n"
-msgstr "ȯ¸ú´üÆü .........: %s\n"
+msgstr "発効期日 .........: %s\n"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Í­¸ú´ü¸Â .........: %s\n"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "有効期限 .........: %s\n"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "PGP ½ð̾¤ò¸¡¾Ú?"
+msgstr "PGP 署名を検証?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "¥á¥Ã¥»¡¼¥¸º÷°ú¸¡¾ÚÃæ..."
+msgstr "メッセージ索引検証中..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "·Ù¹ð! %s ¤ò¾å½ñ¤­¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¡£·Ñ³?"
+msgstr "警告! %s を上書きしようとしている。継続?"
 
 #: crypt.cpkg:1058
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
-msgstr "·Ù¹ð: ¤³¤Î¸°¤¬³Î¼Â¤Ë¾åµ­¤Î¿Íʪ¤Î¤â¤Î¤À¤È¤Ï¸À¤¨¤Ê¤¤\n"
+msgstr "警告: この鍵が確実に上記の人物のものだとは言えない\n"
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 msgid "WARNING: Server certificate has been revoked"
-msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬ÇÑ´þºÑ¤ß"
+msgstr "警告: サーバの証明書が廃棄済み"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 msgid "WARNING: Server certificate has expired"
-msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤¬´ü¸ÂÀÚ¤ì"
+msgstr "警告: サーバの証明書が期限切れ"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ê¤¤"
+msgstr "警告: サーバの証明書はまだ有効でない"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
-msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤¬¾ÚÌÀ½ñ¤È°ìÃפ·¤Ê¤¤"
+msgstr "警告: サーバのホスト名が証明書と一致しない"
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "·Ù¹ð: ¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Ï½ð̾¼Ô¤¬ CA ¤Ç¤Ê¤¤"
+msgstr "警告: サーバの証明書は署名者が CA でない"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
-msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¾åµ­¤Î¿Íʪ¤Î¤â¤Î¤Ç¤Ï¤Ê¤¤!\n"
+msgstr "警告: この鍵は上記の人物のものではない!\n"
 
 #: crypt.cpkg:1048
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
-msgstr "·Ù¹ð: ¤³¤Î¸°¤¬¾åµ­¤Î¿Íʪ¤Î¤â¤Î¤«¤É¤¦¤«¤ò¼¨¤¹¾Úµò¤Ï°ìÀڤʤ¤\n"
+msgstr "警告: この鍵が上記の人物のものかどうかを示す証拠は一切ない\n"
 
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "fcntl ¥í¥Ã¥¯ÂÔ¤Á... %d"
+msgstr "fcntl ロック待ち... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "flock ¥í¥Ã¥¯ÂÔ¤Á... %d"
+msgstr "flock ロック待ち... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "±þÅúÂÔ¤Á..."
+msgstr "応答待ち..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "·Ù¹ð: '%s' ¤ÏÉÔÀµ¤Ê IDN."
+msgstr "警告: '%s' は不正な IDN."
 
 #: crypt.cpkg:916
 msgid "Warning: At least one certification key has expired\n"
-msgstr "·Ù¹ð: ¾¯¤Ê¤¯¤È¤â°ì¤Ä¤Î¾ÚÌÀ½ñ¤Ç¸°¤¬´ü¸ÂÀÚ¤ì\n"
+msgstr "警告: 少なくとも一つの証明書で鍵が期限切れ\n"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "·Ù¹ð: ÉÔÀµ¤Ê IDN '%s' ¤¬¥¨¥¤¥ê¥¢¥¹ '%s' Ãæ¤Ë¤¢¤ë¡£\n"
+msgstr "警告: 不正な IDN '%s' がエイリアス '%s' 中にある。\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "·Ù¹ð: ¾ÚÌÀ½ñ¤òÊݸ¤Ç¤­¤Ê¤«¤Ã¤¿"
+msgstr "警告: 証明書を保存できなかった"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
-msgstr "·Ù¹ð: ÇÑ´þºÑ¤ß¤Î¸°¤¬¤¢¤ë\n"
+msgstr "警告: 廃棄済みの鍵がある\n"
 
 #: commands.c:141 commands.c:151
 msgid "Warning: Part of this message has not been signed."
-msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤Î°ìÉô¤Ï½ð̾¤µ¤ì¤Æ¤¤¤Ê¤¤¡£"
+msgstr "警告: メッセージの一部は署名されていない。"
 
 #: crypt.cpkg:910
 msgid "Warning: The key used to create the signature expired at: "
-msgstr "·Ù¹ð: ½ð̾¤òºîÀ®¤·¤¿¸°¤Ï´ü¸ÂÀÚ¤ì: ´ü¸Â¤Ï "
+msgstr "警告: 署名を作成した鍵は期限切れ: 期限は "
 
 #: crypt.cpkg:930
 msgid "Warning: The signature expired at: "
-msgstr "·Ù¹ð: ½ð̾¤¬´ü¸ÂÀÚ¤ì: ´ü¸Â¤Ï "
+msgstr "警告: 署名が期限切れ: 期限は "
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "¤Ä¤Þ¤êźÉÕ¥Õ¥¡¥¤¥ë¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤¿¤È¤¤¤¦¤³¤È¤À"
+msgstr "つまり添付ファイルの作成に失敗したということだ"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "½ñ¤­¹þ¤ß¼ºÇÔ! ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ÎÃÇÊÒ¤ò %s ¤ËÊݸ¤·¤¿"
+msgstr "書き込み失敗! メールボックスの断片を %s に保存した"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "½ñ¤­¹þ¤ß¼ºÇÔ!"
+msgstr "書き込み失敗!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë½ñ¤­¹þ¤à"
+msgstr "メッセージをメールボックスに書き込む"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "%s ½ñ¤­¹þ¤ßÃæ..."
+msgstr "%s 書き込み中..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "¥á¥Ã¥»¡¼¥¸¤ò %s ¤Ë½ñ¤­¹þ¤ßÃæ..."
+msgstr "メッセージを %s に書き込み中..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "¥á¥Ã¥»¡¼¥¸½ñ¤­¹þ¤ßÃæ... %d (%d%%)"
+msgstr "メッセージ書き込み中... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¨¥é¡¼: %s\n"
+msgstr "ã\82³ã\83\9eã\83³ã\83\89ã\83©ã\82¤ã\83³ã\81§ã\82¨ã\83©ã\83¼: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "¤¹¤Ç¤Ë¤³¤Î̾Á°¤ÎÊÌ̾¤¬¤¢¤ë!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥Á¥§¡¼¥ó¥¨¥ì¥á¥ó¥È¤òÁªÂò¤·¤Æ¤¤¤ë¡£"
+msgstr "すでにこの名前の別名がある!"
 
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥Á¥§¡¼¥ó¥¨¥ì¥á¥ó¥È¤òÁªÂò¤·¤Æ¤¤¤ë¡£"
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥¨¥ó¥È¥ê¡£"
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥Ú¡¼¥¸¡£"
+msgstr "すでに最初のエントリ。"
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥á¥Ã¥»¡¼¥¸¡£"
+msgstr "すでに最初のメッセージ。"
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥Ú¡¼¥¸¡£"
+msgstr "すでに最初のページ。"
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥¹¥ì¥Ã¥É¡£"
+msgstr "すでに最初のスレッド。"
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥¨¥ó¥È¥ê¡£"
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥Ú¡¼¥¸¡£"
+msgstr "すでに最後のエントリ。"
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥á¥Ã¥»¡¼¥¸¡£"
+msgstr "すでに最後のメッセージ。"
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥Ú¡¼¥¸¡£"
+msgstr "すでに最後のページ。"
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "¤³¤ì¤è¤ê²¼¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¤Ç¤­¤Ê¤¤¡£"
+msgstr "これより下にはスクロールできない。"
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "¤³¤ì¤è¤ê¾å¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¤Ç¤­¤Ê¤¤¡£"
+msgstr "これより上にはスクロールできない。"
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "ÊÌ̾¤¬¤Ê¤¤!"
+msgstr "別名がない!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Í£°ì¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤Ï¤¤¤±¤Ê¤¤¡£"
+msgstr "唯一の添付ファイルを削除してはいけない。"
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "message/rfc822 ¥Ñ¡¼¥È¤Î¤ßºÆÁ÷¤·¤Æ¤â¤è¤¤¡£"
+msgstr "message/rfc822 パートのみ再送してもよい。"
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] λ²ò?"
+msgstr "[%s = %s] 了解?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s ·Á¼°¤Ï̤¥µ¥Ý¡¼¥È "
+msgstr "[-- %s/%s 形式は未サポート "
 
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- źÉÕ¥Õ¥¡¥¤¥ë #%d"
+msgstr "[-- 添付ファイル #%d"
 
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- %s ¤Îɸ½à¥¨¥é¡¼½ÐÎϤò¼«Æ°É½¼¨ --]\n"
+msgstr "[-- %s の標準エラー出力を自動表示 --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- %s ¤ò»È¤Ã¤¿¼«Æ°É½¼¨ --]\n"
+msgstr "[-- %s を使った自動表示 --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP ¥á¥Ã¥»¡¼¥¸³«»Ï --]\n"
+"[-- PGP メッセージ開始 --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯³«»Ï --]\n"
+msgstr "[-- PGP 公開鍵ブロック開始 --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]\n"
+"[-- PGP 署名メッセージ開始 --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
-msgstr "[-- ½ð̾¾ðÊó³«»Ï --]\n"
+msgstr "[-- 署名情報開始 --]\n"
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- %s ¤ò¼Â¹Ô¤Ç¤­¤Ê¤¤¡£ --]\n"
+msgstr "[-- %s を実行できない。 --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- PGP¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n"
+msgstr "[-- PGPメッセージ終了 --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯½ªÎ» --]\n"
+msgstr "[-- PGP 公開鍵ブロック終了 --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n"
+msgstr "[-- PGP 署名メッセージ終了 --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
+msgstr "[-- PGP/MIME 暗号化データ終了 --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- PGP/MIME ½ð̾¤ª¤è¤Ó°Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
+msgstr "[-- PGP/MIME 署名および暗号化データ終了 --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 msgid "[-- End of S/MIME encrypted data --]\n"
-msgstr "[-- S/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n"
+msgstr "[-- S/MIME 暗号化データ終了 --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 msgid "[-- End of S/MIME signed data --]\n"
-msgstr "[-- S/MIME ½ð̾¥Ç¡¼¥¿½ªÎ» --]\n"
+msgstr "[-- S/MIME 署名データ終了 --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
-"[-- ½ð̾¾ðÊó½ªÎ» --]\n"
+"[-- 署名情報終了 --]\n"
 "\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[-- ¥¨¥é¡¼: ¤É¤Î Multipart/Alternative ¥Ñ¡¼¥È¤âɽ¼¨¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
+msgstr "[-- エラー: どの Multipart/Alternative パートも表示できなかった! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- ¥¨¥é¡¼: multipart/signed ¹½Â¤¤¬Ì·½â¤·¤Æ¤¤¤ë! --]\n"
+"[-- エラー: multipart/signed 構造が矛盾している! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- ¥¨¥é¡¼: ÉÔÌÀ¤Ê multipart/signed ¥×¥í¥È¥³¥ë %s! --]\n"
+"[-- エラー: 不明な multipart/signed プロトコル %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ¥¨¥é¡¼: °ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
+msgstr "[-- エラー: 一時ファイルを作成できなかった! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- ¥¨¥é¡¼: PGP ¥á¥Ã¥»¡¼¥¸¤Î³«»ÏÅÀ¤òȯ¸«¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n"
+"[-- エラー: PGP メッセージの開始点を発見できなかった! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr ""
-"[-- ¥¨¥é¡¼: Éü¹æ²½¤Ë¼ºÇÔ¤·¤¿: %s --]\n"
+"[-- エラー: 復号化に失敗した: %s --]\n"
 "\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- ¥¨¥é¡¼: ÉÔÀµ¤Ê·Á¼°¤Î PGP/MIME ¥á¥Ã¥»¡¼¥¸! --]\n"
+"[-- ã\82¨ã\83©ã\83¼: ä¸\8dæ­£ã\81ªå½¢å¼\8fã\81® PGP/MIME ã\83¡ã\83\83ã\82»ã\83¼ã\82¸! --]\n"
 "\n"
 
-# ¡Ö»ØÄê¡×¤Ã¤ÆɬÍס©¤Ï¤ß¤Ç¤½¤¦¤Ê¤ó¤Ç¤¹¤±¤É
+# 「指定」って必要？はみでそうなんですけど
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- ¥¨¥é¡¼: message/external-body ¤Ë access-type ¥Ñ¥é¥á¡¼¥¿¤Î»ØÄ꤬¤Ê¤¤ --]\n"
+"[-- エラー: message/external-body に access-type パラメータの指定がない --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï PGP/MIME ¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
+"[-- 以下のデータは PGP/MIME で暗号化されている --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï PGP/MIME ¤Ç½ð̾¤ª¤è¤Ó°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
+"[-- 以下のデータは PGP/MIME で署名および暗号化されている --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï S/MIME ¤Ç°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n"
+"[-- 以下のデータは S/MIME で暗号化されている --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï S/MIME ¤Ç½ð̾¤µ¤ì¤Æ¤¤¤ë --]\n"
+"[-- 以下のデータは S/MIME で署名されている --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï½ð̾¤µ¤ì¤Æ¤¤¤ë --]\n"
+"[-- 以下のデータは署名されている --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- ¤³¤Î %s/%s ·Á¼°ÅºÉÕ¥Õ¥¡¥¤¥ë"
+msgstr "[-- この %s/%s 形式添付ファイル"
 
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- ¤³¤Î %s/%s ·Á¼°ÅºÉÕ¥Õ¥¡¥¤¥ë¤Ï´Þ¤Þ¤ì¤Æ¤ª¤é¤º¡¢ --]\n"
+msgstr "[-- この %s/%s 形式添付ファイルは含まれておらず、 --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- ¥¿¥¤¥×: %s/%s, ¥¨¥ó¥³¡¼¥ÉË¡: %s, ¥µ¥¤¥º: %s --]\n"
+msgstr "[-- ã\82¿ã\82¤ã\83\97: %s/%s, ã\82¨ã\83³ã\82³ã\83¼ã\83\89æ³\95: %s, ã\82µã\82¤ã\82º: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ·Ù¹ð: °ì¤Ä¤â½ð̾¤ò¸¡½Ð¤Ç¤­¤Ê¤«¤Ã¤¿ --]\n"
+"[-- 警告: 一つも署名を検出できなかった --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ·Ù¹ð: ¤³¤Î Mutt ¤Ç¤Ï %s/%s ½ð̾¤ò¸¡¾Ú¤Ç¤­¤Ê¤¤ --]\n"
+"[-- 警告: この Mutt では %s/%s 署名を検証できない --]\n"
 "\n"
 
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- ¤«¤Ä¡¢»ØÄꤵ¤ì¤¿ access-type %s ¤Ï̤¥µ¥Ý¡¼¥È --]\n"
+msgstr "[-- かつ、指定された access-type %s は未サポート --]\n"
 
-# °ì¹Ô¤Ë¤·¤Æ¤âÂç¾æÉפÀ¤È»×¤¦¤Î¤À¤¬¤Ê¤¡¡Ä¡Ä
+# 一行にしても大丈夫だと思うのだがなぁ……
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- ¤«¤Ä¡¢»ØÄꤵ¤ì¤¿³°Éô¤Î¥½¡¼¥¹¤Ï´ü¸Â¤¬ --]\n"
-"[-- Ëþλ¤·¤Æ¤¤¤ë¡£ --]\n"
+"[-- かつ、指定された外部のソースは期限が --]\n"
+"[-- 満了している。 --]\n"
 
 #: handler.c:1201
 #, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- ̾Á°: %s --]\n"
+msgstr "[-- 名前: %s --]\n"
 
-# ËÜÅö¤Ï¡Ö¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡Á·î¡ÁÆü¤Ëºï½üºÑ¤ß¡×¤È¤·¤¿¤¤¤Î¤À¤¬¡£
+# 本当は「このファイルは〜月〜日に削除済み」としたいのだが。
 #: handler.c:1197
 #, c-format
 msgid "[-- on %s --]\n"
-msgstr "[-- (%s ¤Ëºï½ü) --]\n"
+msgstr "[-- (%s に削除) --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
-msgstr "[¤³¤Î¥æ¡¼¥¶ ID ¤Ïɽ¼¨¤Ç¤­¤Ê¤¤ (DN ¤¬ÉÔÀµ)]"
+msgstr "[このユーザ ID は表示できない (DN が不正)]"
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
-msgstr "[¤³¤Î¥æ¡¼¥¶ ID ¤Ïɽ¼¨¤Ç¤­¤Ê¤¤ (ʸ»ú¥³¡¼¥É¤¬ÉÔÀµ)]"
+msgstr "[このユーザ ID は表示できない (文字コードが不正)]"
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
-msgstr "[¤³¤Î¥æ¡¼¥¶ ID ¤Ïɽ¼¨¤Ç¤­¤Ê¤¤ (ʸ»ú¥³¡¼¥É¤¬ÉÔÌÀ)]"
+msgstr "[このユーザ ID は表示できない (文字コードが不明)]"
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
-msgstr "[»ÈÍÑÉÔ²Ä]"
+msgstr "[使用不可]"
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 msgid "[Expired]"
-msgstr "[´ü¸ÂÀÚ¤ì]"
+msgstr "[期限切れ]"
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 msgid "[Invalid]"
-msgstr "[ÉÔÀµ]"
+msgstr "[不正]"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
-msgstr "[ÇÑ´þºÑ¤ß]"
+msgstr "[廃棄済み]"
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[ÉÔÀµ¤ÊÆüÉÕ]"
+msgstr "[不正な日付]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[·×»»ÉÔǽ]"
+msgstr "[è¨\88ç®\97ä¸\8dè\83½]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "alias (ÊÌ̾): ¥¢¥É¥ì¥¹¤¬¤Ê¤¤"
+msgstr "alias (別名): アドレスがない"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "タグ付きメッセージが一つも見つからない。"
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "タグ付きメッセージが一つも見つからない。"
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "このメッセージのコピーを保存?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤ÎÆâÍÆÀâÌÀʸ¤òÊÔ½¸"
+msgstr "添付ファイルの内容説明文を編集"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤ÎÆâÍÆÀâÌÀʸ¤òÊÔ½¸"
+msgstr "添付ファイルの内容説明文を編集"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: °ú¿ô¤¬Â¿¤¹¤®¤ë"
+msgstr "bind: 引数が多すぎる"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
-msgstr "¾ÚÌÀ"
+msgstr "証明"
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "ディレクトリのスキャンエラー。"
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "新着メールのあるメールボックスはない。"
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: °ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
+msgstr "color: 引数が少なすぎる"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "新着メッセージがない"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
-msgstr "ÊÑ´¹¤¢¤ê"
+msgstr "変換あり"
+
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "メッセージをメールボックスに書き込む"
 
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "°ì»þ¥Õ¥©¥ë¥À¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿: %s"
+msgstr "一時フォルダを作成できなかった: %s"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "°ì»þ¥á¡¼¥ë¥Õ¥©¥ë¥À¤ÎºÇ¸å¤Î¹Ô¤ò¾Ã¤»¤Ê¤«¤Ã¤¿: %s"
+msgstr "一時メールフォルダの最後の行を消せなかった: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "°ì»þ¥á¡¼¥ë¥Õ¥©¥ë¥À¤Ë½ñ¤­¹þ¤á¤Ê¤«¤Ã¤¿: %s"
+msgstr "一時メールフォルダに書き込めなかった: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
 
-#: browser.c:1206
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "到着用メールボックスが未定義。"
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dazn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "´ûÄêÃͤ理¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤"
+msgstr "既定値の色がサポートされていない"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "サーバからメッセージを削除?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "メッセージの削除を解除するためのパターン: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "メッセージの削除を解除するためのパターン: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzcp"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "転送メッセージを編集?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3496,108 +3449,251 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "%s ¤Ë¥³¥Ô¡¼Ãæ..."
+msgstr "%s にコピー中..."
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "%s ¤òÁªÂòÃæ..."
+msgstr "%s を選択中..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "現在の添付ファイルは変換されない。"
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "添付ファイルの内容説明文を編集"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "メッセージを書き込めない"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "メッセージヘッダ取得中... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "転送メッセージを編集?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "このメッセージのコピーを保存?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "¥Ñ¥¿¡¼¥ó¤¬¶õ"
+msgstr "パターンが空"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 msgid "encryption"
-msgstr "°Å¹æ²½"
+msgstr "暗号化"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "このメッセージのコピーを保存?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "¼õ¿®¼Ô %s ¤ÎÄɲäǥ¨¥é¡¼: %s\n"
+msgstr "å\8f\97ä¿¡è\80\85 %s ã\81®è¿½å\8a ã\81§ã\82¨ã\83©ã\83¼: %s\n"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, c-format
 msgid "error allocating data object: %s\n"
-msgstr "¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥È³ä¤êÅö¤Æ¥¨¥é¡¼: %s\n"
+msgstr "ã\83\87ã\83¼ã\82¿ã\82ªã\83\96ã\82¸ã\82§ã\82¯ã\83\88å\89²ã\82\8aå½\93ã\81¦ã\82¨ã\83©ã\83¼: %s\n"
 
 #: crypt.cpkg:328
 #, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "gpgme ¥³¥ó¥Æ¥¯¥¹¥ÈºîÀ®¥¨¥é¡¼: %s\n"
+msgstr "gpgme ã\82³ã\83³ã\83\86ã\82¯ã\82¹ã\83\88ä½\9cæ\88\90ã\82¨ã\83©ã\83¼: %s\n"
 
 #: crypt.cpkg:354
 #, c-format
 msgid "error creating gpgme data object: %s\n"
-msgstr "gpgme ¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥ÈºîÀ®¥¨¥é¡¼: %s\n"
+msgstr "gpgme ã\83\87ã\83¼ã\82¿ã\82ªã\83\96ã\82¸ã\82§ã\82¯ã\83\88ä½\9cæ\88\90ã\82¨ã\83©ã\83¼: %s\n"
 
 #: crypt.cpkg:338
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
-msgstr "CMS ¥×¥í¥È¥³¥ëµ¯Æ°¥¨¥é¡¼: %s\n"
+msgstr "CMS ã\83\97ã\83­ã\83\88ã\82³ã\83«èµ·å\8b\95ã\82¨ã\83©ã\83¼: %s\n"
 
 #: crypt.cpkg:655
 #, c-format
 msgid "error encrypting data: %s\n"
-msgstr "¥Ç¡¼¥¿°Å¹æ²½¥¨¥é¡¼: %s\n"
+msgstr "ã\83\87ã\83¼ã\82¿æ\9a\97å\8f·å\8c\96ã\82¨ã\83©ã\83¼: %s\n"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "ÈëÌ©¸° %s ÀßÄêÃæ¤Ë¥¨¥é¡¼: %s\n"
+msgstr "ç§\98å¯\86é\8dµ %s 設å®\9a中ã\81«ã\82¨ã\83©ã\83¼: %s\n"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "¥Ç¡¼¥¿½ð̾¥¨¥é¡¼: %s\n"
+msgstr "ã\83\87ã\83¼ã\82¿ç½²å\90\8dã\82¨ã\83©ã\83¼: %s\n"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "¼°Ãæ¤Ë¥¨¥é¡¼"
+msgstr "å¼\8f中ã\81«ã\82¨ã\83©ã\83¼"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼"
+msgstr "%s ã\83\91ã\82¿ã\83¼ã\83³ä¸­ã\81«ã\82¨ã\83©ã\83¼"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, c-format
 msgid "error reading data object: %s\n"
-msgstr "¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥ÈÆɤ߽Ф·¥¨¥é¡¼: %s\n"
+msgstr "ã\83\87ã\83¼ã\82¿ã\82ªã\83\96ã\82¸ã\82§ã\82¯ã\83\88読ã\81¿å\87ºã\81\97ã\82¨ã\83©ã\83¼: %s\n"
 
 #: crypt.cpkg:443
 #, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "¥Ç¡¼¥¿¥ª¥Ö¥¸¥§¥¯¥È´¬¤­Ìᤷ¥¨¥é¡¼: %s\n"
+msgstr "ã\83\87ã\83¼ã\82¿ã\82ªã\83\96ã\82¸ã\82§ã\82¯ã\83\88å·»ã\81\8dæ\88»ã\81\97ã\82¨ã\83©ã\83¼: %s\n"
 
 #: crypt.cpkg:613
 #, c-format
 msgid "error setting secret key `%s': %s\n"
-msgstr "ÈëÌ©¸° %s ÀßÄêÃæ¤Ë¥¨¥é¡¼: %s\n"
+msgstr "ç§\98å¯\86é\8dµ %s 設å®\9a中ã\81«ã\82¨ã\83©ã\83¼: %s\n"
 
 #: crypt.cpkg:739
 #, c-format
 msgid "error signing data: %s\n"
-msgstr "¥Ç¡¼¥¿½ð̾¥¨¥é¡¼: %s\n"
+msgstr "ã\83\87ã\83¼ã\82¿ç½²å\90\8dã\82¨ã\83©ã\83¼: %s\n"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "¥¨¥é¡¼: ÉÔÌÀ¤Ê op %d (¤³¤Î¥¨¥é¡¼¤òÊó¹ð¤»¤è)¡£"
+msgstr "エラー: 不明な op %d (このエラーを報告せよ)。"
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "esabmfc"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "esabpfc"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
-msgstr "exec: °ú¿ô¤¬¤Ê¤¤"
+msgstr "exec: 引数がない"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "%s%s へのフォローアップ?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "添付ファイルとして転送?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "新着メッセージ検出中..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "すでに最初のメッセージ。"
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -3619,133 +3715,623 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "すでに最後のページ。"
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "新着メールのあるメールボックスはない。"
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "メールボックスオープン時エラー"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "新着メールのあるメールボックスはない。"
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
-msgstr "gpgme_op_keylist_next ¼ºÇÔ: %s"
+msgstr "gpgme_op_keylist_next 失敗: %s"
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
-msgstr "gpgme_op_keylist_start ¼ºÇÔ: %s"
+msgstr "gpgme_op_keylist_start 失敗: %s"
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "¤Ïºï½üºÑ¤ß --]\n"
+msgstr "は削除済み --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbox: ºï½ü¤Ë¼ºÇÔ¤·¤¿"
+msgstr "imap_sync_mailbox: 削除に失敗した"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "ÉÔÀµ¤Ê¤Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É"
+msgstr "不正なへッダフィールド"
 
-#: crypt.cpkg:3122
-msgid "keys matching"
-msgstr "°ìÃפ¹¤ë¸°"
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
 
-#: keymap.c:789
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "不正なインデックス番号。"
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "メッセージ番号を指定: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "メッセージ番号を指定: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "スレッド中に未読メッセージがある。"
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "すでに最初のスレッド。"
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "未読メッセージがない"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "未読メッセージがない"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "このメッセージのコピーを保存?"
+
+#: crypt.cpkg:3108
+msgid "keys matching"
+msgstr "一致する鍵"
+
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "タグ付きメッセージの再送先: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "新着メールのあるメールボックスはない。"
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: ¥­¡¼¥·¡¼¥±¥ó¥¹¤¬¤Ê¤¤"
+msgstr "macro: キーシーケンスがない"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: °ú¿ô¤¬Â¿¤¹¤®¤ë"
+msgstr "macro: 引数が多すぎる"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "%s ·Á¼°ÍѤΠmailcap ¥¨¥ó¥È¥ê¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿"
+msgstr "%s 形式用の mailcap エントリが見つからなかった"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): ¥Õ¥¡¥¤¥ë¤Ë»þ¹ï¤òÀßÄê¤Ç¤­¤Ê¤¤"
+msgstr "maildir_commit_message(): ファイルに時刻を設定できない"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "¥á¥Ã¥»¡¼¥¸¤ÏºÆÁ÷¤µ¤ì¤Ê¤«¤Ã¤¿¡£"
+msgstr "メッセージは再送されなかった。"
 
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "Âбþ¤¹¤ë³ç¸Ì¤¬¤Ê¤¤: %s"
+msgstr "対応する括弧がない: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "¥Ñ¥é¥á¡¼¥¿¤¬¤Ê¤¤"
+msgstr "パラメータがない"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: °ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
+msgstr "mono: 引数が少なすぎる"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "すでに最初のエントリ。"
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "すでに最初のメッセージ。"
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "すでに最後のエントリ。"
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "すでに最後のメッセージ。"
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "すでに最後のエントリ。"
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "すでに最後のページ。"
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "未削除メッセージがない。"
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "すでに最初のエントリ。"
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "すでに最初のページ。"
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "未削除メッセージがない。"
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "すでに最初のページ。"
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "¥Þ¥ë¥Á¥Ñ¡¼¥È¤Î¥á¥Ã¥»¡¼¥¸¤À¤¬ boundary ¥Ñ¥é¥á¡¼¥¿¤¬¤Ê¤¤!"
+msgstr "マルチパートのメッセージだが boundary パラメータがない!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "no"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¤Ê¤¤)"
+msgstr "(メールボックスがない)"
 
 #: commands.c:788
 msgid "not converting"
-msgstr "ÊÑ´¹¤Ê¤·"
+msgstr "変換なし"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "¥­¡¼¥·¡¼¥±¥ó¥¹¤¬¤Ê¤¤"
+msgstr "キーシーケンスがない"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "oac"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "読み出し専用モードでメールボックスをオープン"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "読み出し専用モードでメールボックスをオープン"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "メールボックス再オープン中..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "%s へメッセージ再送"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "reset ¤È¶¦¤Ë»È¤¦ÀÜƬ¼­¤¬ÉÔÀµ"
+msgstr "reset と共に使う接頭辞が不正"
+
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "すでに最初のエントリ。"
 
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: °ú¿ô¤¬Â¿¤¹¤®¤ë"
+msgstr "push: 引数が多すぎる"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "書きかけのメッセージを呼び出す?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "スレッド中に未読メッセージがある。"
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "POP サーバ上ではメッセージを編集できない。"
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: ファイルを添付できない"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "メッセージ番号を指定: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "サーバからメッセージを削除?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ro"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "roa"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "%sメールボックスに保存"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "%sメールボックスに保存"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "POP サーバ上ではメッセージを編集できない。"
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "式中にエラー"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "検索パターン: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "メッセージを送信できなかった。"
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "添付ファイルとして転送?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "メッセージの表示を制限するパターン: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
-msgstr "½ð̾"
+msgstr "署名"
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "これ以上の引用文はない。"
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "メッセージを印刷?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "そのフォルダにはメッセージがない。"
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source: %s ¤Ç¥¨¥é¡¼"
+msgstr "source: %s ã\81§ã\82¨ã\83©ã\83¼"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
-msgstr "source: %s Ãæ¤Ç¥¨¥é¡¼"
+msgstr "source: %s 中ã\81§ã\82¨ã\83©ã\83¼"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: %s Ãæ¤Ë¥¨¥é¡¼¤¬Â¿¤¹¤®¤ë¤Î¤ÇÆɤ߽Ф·Ãæ»ß"
+msgstr "source: %s 中にエラーが多すぎるので読み出し中止"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "ファイルマスクに一致するファイルがない"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: ¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬Êѹ¹¤µ¤ì¤¿¤¬¡¢Êѹ¹¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤(¤³¤Î¥Ð¥°¤òÊó¹ð¤»¤è)!"
+"sync: メールボックスが変更されたが、変更メッセージがない(このバグを報告せよ)!"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "メッセージのタグを外すためのパターン: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "すでに最初のスレッド。"
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3757,41 +4343,130 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "これ以上の引用文はない。"
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "コード変換はテキスト型添付ファイルにのみ有効。"
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "検索パターンがない。"
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "未読メッセージがない"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "°ú¿ô¤¬¾¯¤Ê¤¹¤®¤ë"
+msgstr "引数が少なすぎる"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "°ú¿ô¤¬Â¿¤¹¤®¤ë"
+msgstr "引数が多すぎる"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤ÎÆâÍÆÀâÌÀʸ¤òÊÔ½¸"
+msgstr "添付ファイルの内容説明文を編集"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "メッセージの削除を解除するためのパターン: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "メッセージの削除を解除するためのパターン: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "メッセージの削除を解除するためのパターン: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: %s ¤ò %s Æ⤫¤éºï½ü¤Ç¤­¤Ê¤¤¡£"
+msgstr "unhook: %s を %s 内から削除できない。"
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: ¥Õ¥Ã¥¯Æ⤫¤é¤Ï unhook * ¤Ç¤­¤Ê¤¤"
+msgstr "unhook: フック内からは unhook * できない"
 
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: %s ¤ÏÉÔÌÀ¤Ê¥Õ¥Ã¥¯¥¿¥¤¥×"
+msgstr "unhook: %s は不明なフックタイプ"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼"
+msgstr "不明なエラー"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "メッセージのタグを外すためのパターン: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "添付ファイルの内容説明文を編集"
 
 #: main.c:82
 msgid ""
@@ -3804,12 +4479,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "reset ¤È¶¦¤Ë»È¤¦Ãͤ¬ÉÔÀµ"
+msgstr "reset と共に使う値が不正"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "添付ファイルを保存した。"
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "新規ファイル: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "メッセージをメールボックスに書き込む"
 
-#: lib-ui/curs_lib.c:155
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "yes"
 
@@ -3817,3 +4523,6 @@ msgstr "yes"
 msgid "yna"
 msgstr "yna"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/ko.po b/po/ko.po
index 0507398..ca1c85d 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,41 +8,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.5.6i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2004-03-03 10:25+900\n"
 "Last-Translator: Im Eunjea <eunjea@kldp.org>\n"
 "Language-Team: Im Eunjea <eunjea@kldp.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-KR\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"±âº» ±Û¼è Á¤ÀÇ:\n"
+"기본 글쇠 정의:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"±Û¼è°¡ Á¤ÀǵÇÁö ¾ÊÀº ±â´É:\n"
+"글쇠가 정의되지 않은 기능:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- ¼­¸í ÀÚ·áÀÇ ³¡ --]\n"
+"[-- 서명 자료의 끝 --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -68,51 +68,51 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"usage: mutt [ -nRyzZ ] [ -e <¸í·É¾î> ] [ -F <ÆÄÀÏ> ] [ -m <Á¾·ù> ] [ -f <ÆÄÀÏ"
+"usage: mutt [ -nRyzZ ] [ -e <명령어> ] [ -F <파일> ] [ -m <종류> ] [ -f <파일"
 "> ]\n"
-"       mutt [ -nR ] [ -e <¸í·É¾î> ] [ -F <ÆÄÀÏ> ] -Q <Äõ¸®> [ -Q <Äõ¸®> ] "
+"       mutt [ -nR ] [ -e <명령어> ] [ -F <파일> ] -Q <쿼리> [ -Q <쿼리> ] "
 "[...]\n"
-"       mutt [ -nR ] [ -e <¸í·É¾î> ] [ -F <ÆÄÀÏ> ] -A <¾Ë¸®¾Æ½º> [ -A <¾Ë¸®¾Æ"
-"½º> ] [...]\n"
-"       mutt [ -nx ] [ -e <¸í·É¾î> ] [ -a <ÆÄÀÏ> ] [ -F <ÆÄÀÏ> ] [ -H <ÆÄÀÏ"
-"> ] [ -i <ÆÄÀÏ> ] [ -s <Á¦¸ñ> ] [ -b <ÁÖ¼Ò> ] [ -c <ÁÖ¼Ò> ] <ÁÖ¼Ò> [ ... ]\n"
-"       mutt [ -n ] [ -e <¸í·É¾î> ] [ -F <ÆÄÀÏ> ] -p\n"
+"       mutt [ -nR ] [ -e <명령어> ] [ -F <파일> ] -A <알리아스> [ -A <알리아"
+"스> ] [...]\n"
+"       mutt [ -nx ] [ -e <명령어> ] [ -a <파일> ] [ -F <파일> ] [ -H <파일"
+"> ] [ -i <파일> ] [ -s <제목> ] [ -b <주소> ] [ -c <주소> ] <주소> [ ... ]\n"
+"       mutt [ -n ] [ -e <명령어> ] [ -F <파일> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
-"¼±ÅûçÇ×:\n"
-"  -A <¾Ë¸®¾Æ½º>\tÁÖ¾îÁø ¾Ë¸®¾Æ½º È®Àå\n"
-"  -a <ÆÄÀÏ>\t¸ÞÀÏ¿¡ ÆÄÀÏ Ã·ºÎ\n"
-"  -b <ÁÖ¼Ò>\tBCC ÁÖ¼Ò ÁöÁ¤\n"
-"  -c <ÁÖ¼Ò>\tCC ÁÖ¼Ò ÁöÁ¤\n"
-"  -e <¸í·É¾î>\tÃʱâÈ­ ÈÄ ½ÇÇàÇÒ ¸í·É¾î ÁöÁ¤\n"
-"  -f <ÆÄÀÏ>\tÀÐÀ» ¸ÞÀÏÇÔ ÁöÁ¤\n"
-"  -F <ÆÄÀÏ>\tº°µµÀÇ muttrc ÆÄÀÏ ÁöÁ¤\n"
-"  -H <ÆÄÀÏ>\tÇì´õºÎÅÍ ÀÐÀ» ÃÊ¾È ÆÄÀÏ ÁöÁ¤\n"
-"  -i <ÆÄÀÏ>\tMutt °¡ ´äÀå¿¡ Æ÷ÇÔ½Ãų ÆÄÀÏ ÁöÁ¤\n"
-"  -m <À¯Çü>\t±âº» ¸ÞÀÏÇÔ À¯Çü ÁöÁ¤\n"
-"  -n\t\tMutt ½Ã½ºÅÛ Muttrc ÆÄÀÏ ÀÐÁö ¾ÊÀ½\n"
-"  -p\t\t¹ß¼Û ¿¬±âµÈ ¸ÞÀÏ ´Ù½Ã ¿­±â\n"
-"  -Q <º¯¼ö>\t¼³Á¤ º¯¼ö Äõ¸®\n"
-"  -R\t\t¸ÞÀÏÇÔ Àбâ Àü¿ë ¹æ½ÄÀ¸·Î ¿­±â\n"
-"  -s <Á¦¸ñ>\tÁ¦¸ñ ÁöÁ¤ (°ø¹éÀÌ ÀÖÀ» °æ¿ì ÀÎ¿ë ºÎÈ£ »ç¿ë)\n"
-"  -v\t\t¹öÁ¯, ÄÄÆÄÀÏ ¿É¼Ç º¸±â\n"
-"  -x\t\tmailx Àü¼Û ¹æ½Ä Èä³»³»±â\n"
-"  -y\t\t`¸ÞÀÏÇÔ'ÀÇ ¸ñ·Ï Áß ¸ÞÀÏÇÔ ÁöÁ¤\n"
-"  -z\t\t¸ÞÀÏÇÔ¿¡ ¸ÞÀÏÀÌ ¾øÀ¸¸é Áï½Ã ³¡³»±â\n"
-"  -Z\t\t»õ ¸ÞÀÏÀÌ Àִ ù¹ø° ¸ÞÀÏÇÔ ¿­±â, ¾øÀ» °æ¿ì ³¡³¿\n"
-"  -h\t\tÇöÀç µµ¿ò¸»"
-
-#: compose.c:152 compose.c:156
+"선택사항:\n"
+"  -A <알리아스>\t주어진 알리아스 확장\n"
+"  -a <파일>\t메일에 파일 첨부\n"
+"  -b <주소>\tBCC 주소 지정\n"
+"  -c <주소>\tCC 주소 지정\n"
+"  -e <명령어>\t초기화 후 실행할 명령어 지정\n"
+"  -f <파일>\t읽을 메일함 지정\n"
+"  -F <파일>\t별도의 muttrc 파일 지정\n"
+"  -H <파일>\t헤더부터 읽을 초안 파일 지정\n"
+"  -i <파일>\tMutt 가 답장에 포함시킬 파일 지정\n"
+"  -m <유형>\t기본 메일함 유형 지정\n"
+"  -n\t\tMutt 시스템 Muttrc 파일 읽지 않음\n"
+"  -p\t\t발송 연기된 메일 다시 열기\n"
+"  -Q <변수>\t설정 변수 쿼리\n"
+"  -R\t\t메일함 읽기 전용 방식으로 열기\n"
+"  -s <제목>\t제목 지정 (공백이 있을 경우 인용 부호 사용)\n"
+"  -v\t\t버젼, 컴파일 옵션 보기\n"
+"  -x\t\tmailx 전송 방식 흉내내기\n"
+"  -y\t\t`메일함'의 목록 중 메일함 지정\n"
+"  -z\t\t메일함에 메일이 없으면 즉시 끝내기\n"
+"  -Z\t\t새 메일이 있는 첫번째 메일함 열기, 없을 경우 끝냄\n"
+"  -h\t\t현재 도움말"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " »ç¿ë ¼­¸í: "
+msgstr " 사용 서명: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     to %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   from %s"
@@ -155,140 +155,140 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr "(¸ñ·Ï º¸±â '?'): "
+msgstr "(목록 보기 '?'): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
-msgstr "(°è¼Ó)\n"
+msgstr "(계속)\n"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " ¾²±â »óÅ ¹Ù²Ù±â; `%s'¸¦ ´©¸£¼¼¿ä"
+msgstr " 쓰기 상태 바꾸기; `%s'를 누르세요"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " º¸±â Á¦ÇÑ"
+msgstr " 보기 제한"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " Ç¥½ÃµÊ"
+msgstr " 표시됨"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: À߸øµÈ ¸í·É¾î"
+msgstr "%c: 잘못된 명령어"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: ÀÌ ¸ðµå¿¡¼­ Áö¿øµÇÁö ¾ÊÀ½"
+msgstr "%c: 이 모드에서 지원되지 않음"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d°³ º¸°ü, %d°³ »èÁ¦"
+msgstr "%d개 보관, %d개 삭제"
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d°³ º¸°ü, %d°³ À̵¿, %d°³ »èÁ¦"
+msgstr "%d개 보관, %d개 이동, %d개 삭제"
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s ÀÌ Å°¸¦ Á¤¸»·Î »ç¿ëÀ» ÇÏ°Ú½À´Ï±î?"
+msgstr "%s 이 키를 정말로 사용을 하겠습니까?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] º¯°æµÊ. ´Ù½Ã ÀÎÄÚµùÇÒ±î¿ä?"
+msgstr "%s [#%d] 변경됨. 다시 인코딩할까요?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d]´Â ´õ ÀÌ»ó Á¸ÀçÇÏÁö ¾ÊÀ½!"
+msgstr "%s [#%d]는 더 이상 존재하지 않음!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d - %d ¸ÞÀÏ ÀÐÀ½]"
+msgstr "%s [%d - %d 메일 읽음]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s°¡ ¾øÀ½. ¸¸µé±î¿ä?"
+msgstr "%s가 없음. 만들까요?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s´Â À߸øµÈ IMAP ÆнºÀÓ"
+msgstr "%s는 잘못된 IMAP 패스임"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s´Â À߸øµÈ POP Æнº"
+msgstr "%s는 잘못된 POP 패스"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s´Â À߸øµÈ POP Æнº"
+msgstr "%s는 잘못된 POP 패스"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s´Â À߸øµÈ POP Æнº"
+msgstr "%s는 잘못된 POP 패스"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s´Â µð·ºÅ丮°¡ ¾Æ´Õ´Ï´Ù."
+msgstr "%s는 디렉토리가 아닙니다."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s´Â ¸ÞÀÏÇÔÀÌ ¾Æ´Ô!"
+msgstr "%s는 메일함이 아님!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s´Â ¸ÞÀÏÇÔÀÌ ¾Æ´Ô."
+msgstr "%s는 메일함이 아님."
 
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s´Â ¿Ã¹Ù¸¥ ÆÄÀÏÀÌ ¾Æ´Ô."
+msgstr "%s는 올바른 파일이 아님."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s°¡ ´õ ÀÌ»ó Á¸ÀçÄ¡ ¾ÊÀ½!"
+msgstr "%s가 더 이상 존재치 않음!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -302,142 +302,142 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
-msgstr "%s: ¾Ë ¼ö ¾ø´Â Çü½Ä"
+msgstr "%s: 알 수 없는 형식"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: Å͹̳ο¡¼­ Áö¿øµÇÁö ¾Ê´Â »ö."
+msgstr "%s: 터미널에서 지원되지 않는 색."
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: À妽º Ç׸ñ¿¡¼­¸¸ »ç¿ë °¡´ÉÇÑ ¸í·É¾î."
+msgstr "%s: 인덱스 항목에서만 사용 가능한 명령어."
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: ¼Ó¼º ¾øÀ½."
+msgstr "%s: 속성 없음."
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: »ö»ó ¾øÀ½."
+msgstr "%s: 색상 없음."
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
-msgstr "%s: ±×·± ±â´É ¾øÀ½"
+msgstr "%s: 그런 기능 없음"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: ¸Ê¿¡ ±×·± ±â´É ¾øÀ½"
+msgstr "%s: 맵에 그런 기능 없음"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: ±×·± ¸Þ´º ¾øÀ½"
+msgstr "%s: 그런 메뉴 없음"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s: Ç׸ñ ¾øÀ½"
+msgstr "%s: 항목 없음"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: Àμö°¡ ºÎÁ·ÇÔ"
+msgstr "%s: 인수가 부족함"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: ÆÄÀÏÀ» ÷ºÎÇÒ ¼ö ¾øÀ½"
+msgstr "%s: 파일을 첨부할 수 없음"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: ÆÄÀÏÀ» ÷ºÎÇÒ ¼ö ¾øÀ½.\n"
+msgstr "%s: 파일을 첨부할 수 없음.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: ¾Ë ¼ö ¾ø´Â ¸í·É¾î"
+msgstr "%s: 알 수 없는 명령어"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: ¾Ë ¼ö ¾ø´Â Çü½Ä"
+msgstr "%s: 알 수 없는 형식"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: ¾Ë ¼ö ¾ø´Â º¯¼ö"
+msgstr "%s: 알 수 없는 변수"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s´Â À߸øµÈ POP Æнº"
+msgstr "%s는 잘못된 POP 패스"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s´Â À߸øµÈ POP Æнº"
+msgstr "%s는 잘못된 POP 패스"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "('÷ºÎ¹° º¸±â' ±Û¼è Á¤ÀÇ°¡ ÇÊ¿äÇÔ!)"
+msgstr "('첨부물 보기' 글쇠 정의가 필요함!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(¸ÞÀÏÇÔ ¾øÀ½)"
+msgstr "(메일함 없음)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "°ÅºÎ(r), À̹ø¸¸ Çã°¡(o)"
+msgstr "거부(r), 이번만 허가(o)"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "°ÅºÎ(r), À̹ø¸¸ Çã°¡(o), ¾ðÁ¦³ª Çã°¡(a)"
+msgstr "거부(r), 이번만 허가(o), 언제나 허가(a)"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(Å©±â: %s ¹ÙÀÌÆ®) "
+msgstr "(크기: %s 바이트) "
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "('%s' Å°: ºÎºÐ º¸±â)"
+msgstr "('%s' 키: 부분 보기)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- ÷ºÎ¹°"
+msgstr "-- 첨부물"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<¾Ë¼ö ¾øÀ½>"
+msgstr "<알수 없음>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<±âº»°ª>"
+msgstr "<기본값>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -449,122 +449,114 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "APOP ÀÎÁõ¿¡ ½ÇÆÐÇÔ."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Ãë¼Ò"
+msgstr "APOP 인증에 실패함."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "º¯°æµÇÁö ¾ÊÀº ¸ÞÀÏÀ» Ãë¼ÒÇÒ±î¿ä?"
+msgstr "변경되지 않은 메일을 취소할까요?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "º¯°æµÇÁö ¾ÊÀº ¸ÞÀÏ Ãë¼ÒÇÔ."
+msgstr "변경되지 않은 메일 취소함."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "ÁÖ¼Ò: "
+msgstr "주소: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "º°Äª Ãß°¡µÊ."
+msgstr "별칭 추가됨."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "»ç¿ë º°Äª: "
+msgstr "사용 별칭: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "º°Äª"
+msgstr "별칭"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "¸ðµç Å°°¡ ¸¸±â/Ãë¼Ò/»ç¿ë ºÒ°¡ ÀÔ´Ï´Ù."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "÷°¡"
+msgstr "모든 키가 만기/취소/사용 불가 입니다."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "%s¿¡ ¸ÞÀÏÀ» ÷°¡ÇÒ±î¿ä?"
+msgstr "%s에 메일을 첨가할까요?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "¸ÞÀÏÀÇ ¹øÈ£¸¸ °¡´É."
+msgstr "메일의 번호만 가능."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "÷ºÎ¹° ÀúÀåµÊ."
+msgstr "첨부물 저장됨."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "ÆÄÀÏ Ã·ºÎ"
+msgstr "파일 첨부"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "¼±ÅÃµÈ ÆÄÀÏÀ» ÷ºÎÁß..."
+msgstr "선택된 파일을 첨부중..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "÷ºÎ¹° ÇÊÅ͵Ê."
+msgstr "첨부물 필터됨."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "÷ºÎ¹° ÀúÀåµÊ."
+msgstr "첨부물 저장됨."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "÷ºÎ¹°"
+msgstr "첨부물"
 
 #: imap/auth.c:83
 #, c-format
 msgid "Authenticating (%s)..."
-msgstr "ÀÎÁõ Áß (%s)..."
+msgstr "인증 중 (%s)..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "ÀÎÁõ Áß (APOP)..."
+msgstr "인증 중 (APOP)..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "ÀÎÁõ Áß (SASL)..."
+msgstr "인증 중 (SASL)..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "ÀÎÁõ Áß (SASL)..."
+msgstr "인증 중 (SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -573,56 +565,56 @@ msgstr ""
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "À߸øµÈ IDN \"%s\"."
+msgstr "잘못된 IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "resent-fromÀ» ÁغñÇÏ´Â µ¿¾È À߸øµÈ IDN %s"
+msgstr "resent-from을 준비하는 동안 잘못된 IDN %s"
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "À߸øµÈ IDN \"%s\": '%s'"
+msgstr "잘못된 IDN \"%s\": '%s'"
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "À߸øµÈ IDN: '%s'"
+msgstr "잘못된 IDN: '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "À߸øµÈ ¸ÞÀÏÇÔ À̸§"
+msgstr "잘못된 메일함 이름"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "¸Þ¼¼ÁöÀÇ ³¡ÀÔ´Ï´Ù."
+msgstr "메세지의 끝입니다."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "%s¿¡°Ô ¸ÞÀÏ Àü´Þ"
+msgstr "%s에게 메일 전달"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "¸ÞÀÏÀ» Àü´ÞÇÒ ÁÖ¼Ò: "
+msgstr "메일을 전달할 주소: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "%s¿¡°Ô ¸ÞÀÏ Àü´Þ"
+msgstr "%s에게 메일 전달"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "¼±ÅÃÇÑ ¸ÞÀÏÀ» Àü´ÞÇÑ ÁÖ¼Ò: "
+msgstr "선택한 메일을 전달한 주소: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "´Ý±â ½ÇÆÐ"
+msgstr "닫기 실패"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -631,62 +623,62 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Æú´õ¿¡ ÷°¡ÇÒ ¼ö ¾øÀ½: %s"
+msgstr "폴더에 첨가할 수 없음: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "µð·ºÅ丮´Â ÷ºÎÇÒ ¼ö ¾øÀ½!"
+msgstr "디렉토리는 첨부할 수 없음!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "%s¸¦ ¸¸µé ¼ö ¾øÀ½: %s."
+msgstr "%s를 만들 수 없음: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "%s ÆÄÀÏÀ» ¸¸µé ¼ö ¾øÀ½"
+msgstr "%s 파일을 만들 수 없음"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "ÇÊÅ͸¦ ¸¸µé ¼ö ¾øÀ½"
+msgstr "필터를 만들 수 없음"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "ÇÊÅÍ°úÁ¤À» »ý¼ºÇÒ ¼ö ¾øÀ½"
+msgstr "필터과정을 생성할 수 없음"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö ¾øÀ½"
+msgstr "임시 파일을 만들 수 없음"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
-msgstr "Ç¥½ÃµÈ ÷ºÎ¹°À» ¸ðµÎ µðÄÚµùÇÏÁö ¸øÇÔ. ³ª¸ÓÁö´Â MIME ĸ½¶À» »ç¿ëÇÒ±î¿ä?"
+msgstr "표시된 첨부물을 모두 디코딩하지 못함. 나머지는 MIME 캡슐을 사용할까요?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr "Ç¥½ÃµÈ ÷ºÎ¹°À» ¸ðµÎ µðÄÚµùÇÏÁö ¸øÇÔ. ³ª¸ÓÁö´Â MIME Æ÷¿öµù ÇÒ±î¿ä?"
+msgstr "표시된 첨부물을 모두 디코딩하지 못함. 나머지는 MIME 포워딩 할까요?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "¾ÏȣȭµÈ ¸ÞÀÏÀ» Çص¶ÇÒ ¼ö ¾øÀ½!"
+msgstr "암호화된 메일을 해독할 수 없음!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "POP ¼­¹ö¿¡¼­ ÷ºÎ¹°À» »èÁ¦ ÇÒ¼ö ¾øÀ½."
+msgstr "POP 서버에서 첨부물을 삭제 할수 없음."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "POP ¼­¹ö¿¡¼­ ÷ºÎ¹°À» »èÁ¦ ÇÒ¼ö ¾øÀ½."
+msgstr "POP 서버에서 첨부물을 삭제 할수 없음."
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "dotlock %s¸¦ ÇÒ ¼ö ¾øÀ½.\n"
+msgstr "dotlock %s를 할 수 없음.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -694,134 +686,126 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Ç¥½ÃµÈ ¸ÞÀÏÀÌ ¾ø½À´Ï´Ù."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "mixmasterÀÇ type2.list¸¦ ãÁö ¸øÇÔ!"
+msgstr "표시된 메일이 없습니다."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "À̸§ ÅÛÇ÷¹ÀÌÆ®¿Í ÀÏÄ¡ÇÏÁö ¾ÊÀ½. °è¼ÓÇÒ±î¿ä?"
+msgstr "이름 템플레이트와 일치하지 않음. 계속할까요?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "¸Þ¼¼Áö ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s"
+msgstr "메세지 파일을 열 수 없음: %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Æú´õ¿¡ ÷°¡ÇÒ ¼ö ¾øÀ½: %s"
+msgstr "폴더에 첨가할 수 없음: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "%sÀÇ Á¢¼ÓÀÌ ²÷¾îÁü"
+msgstr "%s의 접속이 끊어짐"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "POP ¼­¹ö¿ÍÀÇ ¿¬°áÀ» ´Ý´ÂÁß..."
+msgstr "POP 서버와의 연결을 닫는중..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "%s: %sÀÇ »óŸ¦ ¾Ë¼ö ¾øÀ½."
+msgstr "%s: %s의 상태를 알수 없음."
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "%s¸¦ ¸¸µé ¼ö ¾øÀ½: %s."
+msgstr "%s를 만들 수 없음: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "POP ¸ÞÀÏÇÔ¿¡ ¸ÞÀÏÀ» ÀúÀåÇÒ ¼ö ¾øÀ½."
+msgstr "POP 메일함에 메일을 저장할 수 없음."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "POP ¼­¹öÀÇ ¸ÞÀÏÀ» ¼öÁ¤ÇÒ ¼ö ¾øÀ½."
+msgstr "POP 서버의 메일을 수정할 수 없음."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "%s: %sÀÇ »óŸ¦ ¾Ë¼ö ¾øÀ½."
+msgstr "%s: %s의 상태를 알수 없음."
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "µð·ºÅ丮¸¦ º¼ ¼ö ¾øÀ½"
+msgstr "디렉토리를 볼 수 없음"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "%s¸¦ ¸¸µé ¼ö ¾øÀ½."
+msgstr "%s를 만들 수 없음."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Àӽà ÆÄÀÏ ¸¸µé ¼ö ¾øÀ½"
+msgstr "임시 파일 만들 수 없음"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "¸ÞÀÏÀ» ¾²Áö ¸øÇÔ"
+msgstr "메일을 쓰지 못함"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "¸ÞÀÏÀ» Àӽà ÆÄÀÏ¿¡ ¾µ¼ö ¾øÀ½!"
+msgstr "메일을 임시 파일에 쓸수 없음!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Ç¥½Ã ÇÊÅ͸¦ ¸¸µé ¼ö ¾øÀ½"
+msgstr "표시 필터를 만들 수 없음"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "ÇÊÅ͸¦ ¸¸µé ¼ö ¾øÀ½"
+msgstr "필터를 만들 수 없음"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Àбâ Àü¿ë ¸ÞÀÏÇÔ¿¡ ¾µ¼ö ¾øÀ½!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "읽기 전용 메일함에 쓸수 없음!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "%s ¹ß°ß... Á¾·áÇÔ.\n"
+msgstr "%s 발견... 종료함.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¾ÆÁ÷ À¯È¿ÇÏÁö ¾ÊÀ½ "
+msgstr "서버 인증서가 아직 유효하지 않음 "
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "ÀÎÁõ¼­ ÀúÀåµÊ"
+msgstr "인증서 저장됨"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "º¯°æ »çÇ×Àº Æú´õ¸¦ ´ÝÀ»¶§ ±â·ÏµÊ."
+msgstr "변경 사항은 폴더를 닫을때 기록됨."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "º¯°æ »çÇ×À» ±â·Ï ÇÏÁö ¾ÊÀ½."
+msgstr "변경 사항을 기록 하지 않음."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Char = %s, Octal = %o, Decimal = %d"
@@ -829,171 +813,163 @@ msgstr "Char = %s, Octal = %o, Decimal = %d"
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "¹®ÀÚ¼ÂÀÌ %s¿¡¼­ %s·Î ¹Ù²ñ."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "µð·ºÅ丮 À̵¿"
+msgstr "문자셋이 %s에서 %s로 바뀜."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "À̵¿ÇÒ µð·ºÅ丮: "
+msgstr "이동할 디렉토리: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "»õ ¸ÞÀÏÀ» È®ÀÎÁß..."
-
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "¿­¼è È®ÀÎ  "
+msgstr "새 메일을 확인중..."
 
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "»õ ¸ÞÀÏÀ» È®ÀÎÁß..."
+msgstr "새 메일을 확인중..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "»õ ¸ÞÀÏÀ» È®ÀÎÁß..."
+msgstr "새 메일을 확인중..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "¾øÀ½"
+msgstr "없음"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Ç÷¡±× Áö¿ò"
+msgstr "플래그 지움"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "%s¿ÍÀÇ ¿¬°áÀ» ´Ý´ÂÁß..."
+msgstr "%s와의 연결을 닫는중..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "POP ¼­¹ö¿ÍÀÇ ¿¬°áÀ» ´Ý´ÂÁß..."
+msgstr "POP 서버와의 연결을 닫는중..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "%s·Î ¿¬°á Áß..."
+msgstr "%s로 연결 중..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "¸í·É¾î TOPÀÌ ¼­¹ö¿¡¼­ Áö¿øµÇÁö ¾ÊÀ½."
+msgstr "명령어 TOP이 서버에서 지원되지 않음."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "¸í·É¾î UIDLÀÌ ¼­¹ö¿¡¼­ Áö¿øµÇÁö ¾ÊÀ½."
+msgstr "명령어 UIDL이 서버에서 지원되지 않음."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "¼öÁ¤Áß..."
+msgstr "수정중..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"ÄÄÆÄÀÏ ¼±ÅûçÇ×:"
+"컴파일 선택사항:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "°Ë»ö ÆÐÅÏ ÄÄÆÄÀÏ Áß..."
+msgstr "검색 패턴 컴파일 중..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "%s·Î º¹»ç..."
+msgstr "%s로 복사..."
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "%s·Î º¹»ç..."
+msgstr "%s로 복사..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "%s·Î ¿¬°á Áß..."
+msgstr "%s로 연결 중..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "%s·Î ¿¬°á Áß..."
+msgstr "%s로 연결 중..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "%s·Î ¿¬°á Áß..."
+msgstr "%s로 연결 중..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "¿¬°áÀÌ ²÷¾îÁü. POP ¼­¹ö¿Í ´Ù½Ã ¿¬°á ÇÒ±î¿ä?"
+msgstr "연결이 끊어짐. POP 서버와 다시 연결 할까요?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "¿¬°áÀÌ ²÷¾îÁü. POP ¼­¹ö¿Í ´Ù½Ã ¿¬°á ÇÒ±î¿ä?"
+msgstr "연결이 끊어짐. POP 서버와 다시 연결 할까요?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "%sÀÇ Á¢¼ÓÀÌ ²÷¾îÁü"
+msgstr "%s의 접속이 끊어짐"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "%sÀÇ Á¢¼ÓÀÌ ²÷¾îÁü"
+msgstr "%s의 접속이 끊어짐"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "%s·Î Content-TypeÀÌ ¹Ù²ñ."
+msgstr "%s로 Content-Type이 바뀜."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-TypeÀÌ base/sub Çü½ÄÀÓ."
+msgstr "Content-Type이 base/sub 형식임."
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "°è¼ÓÇÒ±î¿ä?"
+msgstr "계속할까요?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "º¸³¾¶§ %s·Î º¯È¯ÇÒ±î¿ä?"
+msgstr "보낼때 %s로 변환할까요?"
 
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "º¹»ç%s ¸ÞÀÏÇÔÀ¸·Î"
+msgstr "복사%s 메일함으로"
 
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "%d°³ÀÇ ¸Þ¼¼Áö¸¦ %s·Î º¹»ç Áß..."
+msgstr "%d개의 메세지를 %s로 복사 중..."
 
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "¸Þ¼¼Áö %d¸¦ %s·Î º¹»ç Áß..."
+msgstr "메세지 %d를 %s로 복사 중..."
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "%s·Î º¹»ç..."
+msgstr "%s로 복사..."
 
 #: main.c:63
 msgid ""
@@ -1009,712 +985,652 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "%s (%s)·Î ¿¬°áÇÒ ¼ö ¾øÀ½."
+msgstr "%s (%s)로 연결할 수 없음."
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "¸ÞÀÏÀ» º¹»çÇÒ ¼ö ¾øÀ½"
+msgstr "메일을 복사할 수 없음"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö ¾øÀ½!"
+msgstr "임시 파일을 만들 수 없음!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö ¾øÀ½!"
+msgstr "임시 파일을 만들 수 없음!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Á¤·Ä ÇÔ¼ö ãÀ» ¼ö ¾øÀ½! [¹ö±× º¸°í ¹Ù¶÷]"
+msgstr "정렬 함수 찾을 수 없음! [버그 보고 바람]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "%s È£½ºÆ®¸¦ ãÀ» ¼ö ¾øÀ½."
+msgstr "%s 호스트를 찾을 수 없음."
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "¿äûµÈ ¸ðµç ¸ÞÀÏÀ» Æ÷ÇÔÇÒ ¼ö ¾øÀ½!"
+msgstr "요청된 모든 메일을 포함할 수 없음!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "TLS ¿¬°á ÇÒ¼ö ¾øÀ½"
+msgstr "TLS 연결 할수 없음"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "%s¸¦ ¿­ ¼ö ¾øÀ½"
+msgstr "%s를 열 수 없음"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "¸ÞÀÏÇÔÀ» ´Ù½Ã ¿­ ¼ö ¾øÀ½!"
+msgstr "메일함을 다시 열 수 없음!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "¸ÞÀÏÀ» º¸³¾ ¼ö ¾øÀ½."
+msgstr "메일을 보낼 수 없음."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "%s¸¦ Àá±Û ¼ö ¾øÀ½.\n"
+msgstr "%s를 잠글 수 없음.\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "%s¸¦ ¸¸µé±î¿ä?"
+msgstr "%s를 만들까요?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "»ý¼ºÀº IMAP ¸ÞÀÏÇÔ¿¡¼­¸¸ Áö¿øµÊ"
+msgstr "생성은 IMAP 메일함에서만 지원됨"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "¸ÞÀÏÇÔ ¿­±â"
+msgstr "메일함 열기"
 
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "º¹È£È­-º¹»ç%s ¸ÞÀÏÇÔÀ¸·Î"
+msgstr "복호화-복사%s 메일함으로"
 
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "º¹È£È­-ÀúÀå%s ¸ÞÀÏÇÔÀ¸·Î"
+msgstr "복호화-저장%s 메일함으로"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "%s ¼±Åà Áß..."
+msgstr "%s 선택 중..."
 
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Çص¶-º¹»ç%s ¸ÞÀÏÇÔÀ¸·Î"
+msgstr "해독-복사%s 메일함으로"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "Çص¶-ÀúÀå%s ¸ÞÀÏÇÔÀ¸·Î"
+msgstr "해독-저장%s 메일함으로"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
-msgstr "¸Þ¼¼Áö °¡Á®¿À´Â Áß..."
+msgstr "메세지 가져오는 중..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Çص¶ ½ÇÆÐ."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "»èÁ¦"
+msgstr "해독 실패."
 
-#: remailer.c:433
-msgid "Delete"
-msgstr "»èÁ¦"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "»èÁ¦´Â IMAP ¸ÞÀÏÇÔ¿¡¼­¸¸ Áö¿øµÊ"
+msgstr "삭제는 IMAP 메일함에서만 지원됨"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "¼­¹öÀÇ ¸ÞÀÏÀ» »èÁ¦ ÇÒ±î¿ä?"
+msgstr "서버의 메일을 삭제 할까요?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ »èÁ¦: "
+msgstr "일치하는 메일 삭제: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "»èÁ¦"
+msgstr "삭제"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "¾ÏȣȭµÈ ¸ÞÀÏÀÇ Ã·ºÎ¹° »èÁ¦´Â Áö¿øµÇÁö ¾ÊÀ½."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "¼³¸í"
+msgstr "암호화된 메일의 첨부물 삭제는 지원되지 않음."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "ID %s ¹ÌÈ®ÀεÊ. %s¿¡ »ç¿ëÇÒ±î¿ä?"
+msgstr "ID %s 미확인됨. %s에 사용할까요?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s°¡ ¾øÀ½. ¸¸µé±î¿ä?"
+msgstr "%s가 없음. 만들까요?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "µð·ºÅ丮 [%s], ÆÄÀÏ ¸Å½ºÅ©: %s"
+msgstr "디렉토리 [%s], 파일 매스크: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "¿À·ù: ÀÌ ¹ö±×¸¦ º¸°í ÇØÁÖ¼¼¿ä"
+msgstr "오류: 이 버그를 보고 해주세요"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "Æ÷¿öµùµÈ ¸ÞÀÏÀ» ¼öÁ¤ÇÒ±î¿ä?"
+msgstr "포워딩된 메일을 수정할까요?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "Ç¥Çö½Ä ¿À·ù"
+msgstr "표현식 오류"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "¾Ïȣȭ"
+msgstr "암호화"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "¾Ïȣȭ ¹æ½Ä: "
+msgstr "암호화 방식: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "keyID ÀÔ·Â: "
+msgstr "keyID 입력: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "%sÀÇ keyID ÀÔ·Â: "
+msgstr "%s의 keyID 입력: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "Å° ÀÔ·Â (^G Ãë¼Ò): "
+msgstr "키 입력 (^G 취소): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "¸ÞÀÏ ¹Ù¿î½ºÁß ¿À·ù!"
+msgstr "메일 바운스중 오류!"
 
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "¸ÞÀÏ ¹Ù¿î½ºÁß ¿À·ù!"
+msgstr "메일 바운스중 오류!"
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "¸ÞÀÏ º¸³»´Â Áß ¿À·ù."
+msgstr "메일 보내는 중 오류."
 
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "%s ¼­¹ö¿ÍÀÇ ¿¬°á ¿À·ù"
+msgstr "%s 서버와의 연결 오류"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "%s ¼­¹ö¿ÍÀÇ ¿¬°á ¿À·ù"
+msgstr "%s 서버와의 연결 오류"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "%sÀÇ %d¹ø ÁÙ¿¡ ¿À·ù: %s"
+msgstr "%s의 %d번 줄에 오류: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "¸í·É¾î ¿À·ù: %s\n"
+msgstr "명령어 오류: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "Ç¥Çö½Ä¿¡¼­ ¿À·ù: %s"
+msgstr "표현식에서 오류: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "Å͹̳ΠÃʱâÈ­ ¿À·ù."
+msgstr "터미널 초기화 오류."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "Å͹̳ΠÃʱâÈ­ ¿À·ù."
+msgstr "터미널 초기화 오류."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "¸ÞÀÏÇÔ ¿©´ÂÁß ¿À·ù"
+msgstr "메일함 여는중 오류"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "ÁÖ¼Ò ºÐ¼® Áß ¿À·ù!"
+msgstr "주소 분석 중 오류!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "\"%s\" ½ÇÇà ¿À·ù!"
+msgstr "\"%s\" 실행 오류!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "µð·ºÅ丮 °Ë»çÁß ¿À·ù."
+msgstr "디렉토리 검사중 오류."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "¸ÞÀÏÀ» º¸³»´Â Áß ¿À·ù %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "¸ÞÀÏ º¸³»´Â Áß ¿À·ù %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "¸ÞÀÏ º¸³»´Â Áß ¿À·ù."
+msgstr "메일을 보내는 중 오류 %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "%s (%s) ¿À·ù"
+msgstr "%s (%s) 오류"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "ÆÄÀÏ º¸±â ½Ãµµ Áß ¿À·ù"
+msgstr "파일 보기 시도 중 오류"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "¸ÞÀÏÇÔ¿¡ ¾²´Â Áß ¿À·ù!"
+msgstr "메일함에 쓰는 중 오류!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Àӽà ÆÄÀÏÀ» ÀúÀåÇÏ´Â Áß ¿À·ù: %s"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "¿À·ù: %s´Â üÀÎÀÇ ¸¶Áö¸· ¸®¸ÞÀÏ·¯·Î »ç¿ëÇÒ¼ö ¾øÀ½."
+msgstr "임시 파일을 저장하는 중 오류: %s"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "¿À·ù: '%s'´Â À߸øµÈ IDN."
+msgstr "오류: '%s'는 잘못된 IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "¿À·ù: multipart/encrypted ÇÁ·ÎÅäÄÝ º¯¼ö°¡ ¾øÀ½!"
+msgstr "오류: multipart/encrypted 프로토콜 변수가 없음!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "¿À·ù: multipart/signed ÇÁ·ÎÅäÄÝÀÌ ¾øÀ½."
+msgstr "오류: multipart/signed 프로토콜이 없음."
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "¸í·É¾î ¿À·ù: %s\n"
+msgstr "명령어 오류: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "¸Þ¼¼Áö Çì´õ °¡Á®¿À´Â Áß... [%d/%d]"
+msgstr "메세지 헤더 가져오는 중... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "¼±ÅÃµÈ ¸ÞÀÏ¿¡ ¸í·É ½ÇÇàÁß..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Á¾·á"
+msgstr "선택된 메일에 명령 실행중..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "³¡³»±â  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "ÀúÀåÇÏÁö ¾Ê°í MuttÀ» ³¡³¾±î¿ä?"
+msgstr "저장하지 않고 Mutt을 끝낼까요?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "MuttÀ» Á¾·áÇÒ±î¿ä?"
+msgstr "Mutt을 종료할까요?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "»èÁ¦ ½ÇÆÐ"
+msgstr "삭제 실패"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "¼­¹ö¿¡¼­ ¸Þ¼¼Áö »èÁ¦ Áß..."
+msgstr "서버에서 메세지 삭제 중..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Çì´õ¸¦ ºÐ¼®Çϱâ À§ÇÑ ÆÄÀÏ ¿­±â ½ÇÆÐ"
+msgstr "헤더를 분석하기 위한 파일 열기 실패"
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Çì´õ Á¦°Å¸¦ À§ÇÑ ÆÄÀÏ ¿­±â ½ÇÆÐ"
+msgstr "헤더 제거를 위한 파일 열기 실패"
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Çì´õ¸¦ ºÐ¼®Çϱâ À§ÇÑ ÆÄÀÏ ¿­±â ½ÇÆÐ"
+msgstr "헤더를 분석하기 위한 파일 열기 실패"
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Ä¡¸íÀû ¿À·ù! ¸ÞÀÏÇÔÀ» ´Ù½Ã ¿­ ¼ö ¾øÀ½!"
+msgstr "치명적 오류! 메일함을 다시 열 수 없음!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Ä¡¸íÀû ¿À·ù. ¸Þ¼¼Áö ¼ýÀÚ°¡ µ¿±âµÇÁö ¾ÊÀ½!"
+msgstr "치명적 오류. 메세지 숫자가 동기되지 않음!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "¼­¹ö¿¡¼­ ¸Þ¼¼Áö »èÁ¦ Áß..."
+msgstr "서버에서 메세지 삭제 중..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "¸Þ¼¼Áö °¡Á®¿À´Â Áß..."
+msgstr "메세지 가져오는 중..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "¸ÞÀÏÀÇ ¸ñ·ÏÀ» °¡Á®¿À´Â Áß..."
+msgstr "메일의 목록을 가져오는 중..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "¸ÞÀÏÀÇ ¸ñ·ÏÀ» °¡Á®¿À´Â Áß..."
+msgstr "메일의 목록을 가져오는 중..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "¸Þ¼¼Áö Çì´õ °¡Á®¿À´Â Áß... [%d/%d]"
+msgstr "메세지 헤더 가져오는 중... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "¸Þ¼¼Áö Çì´õ °¡Á®¿À´Â Áß... [%d/%d]"
+msgstr "메세지 헤더 가져오는 중... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "¸Þ¼¼Áö °¡Á®¿À´Â Áß..."
+msgstr "메세지 가져오는 중..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "ÆÄÀÏ ¸Å½ºÅ©: "
+msgstr "파일 매스크: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "ÆÄÀÏÀÌ Á¸ÀçÇÔ, µ¤¾î¾²±â(o), ÷°¡(a), Ãë¼Ò(c)?"
+msgstr "파일이 존재함, 덮어쓰기(o), 첨가(a), 취소(c)?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "ÆÄÀÏÀÌ ¾Æ´Ï¶ó µð·ºÅ丮ÀÔ´Ï´Ù, ±× ¾Æ·¡¿¡ ÀúÀåÇÒ±î¿ä?"
+msgstr "파일이 아니라 디렉토리입니다, 그 아래에 저장할까요?"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr ""
-"ÆÄÀÏÀÌ ¾Æ´Ï¶ó µð·ºÅ丮ÀÔ´Ï´Ù, ±× ¾Æ·¡¿¡ ÀúÀåÇÒ±î¿ä? [(y)³×, (n)¾Æ´Ï¿À, (a)¸ð"
-"µÎ]"
+"파일이 아니라 디렉토리입니다, 그 아래에 저장할까요? [(y)네, (n)아니오, (a)모"
+"두]"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "µð·ºÅ丮¾È¿¡ ÀúÀåÇÒ ÆÄÀÏ:"
+msgstr "디렉토리안에 저장할 파일:"
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "ÇÊÅÍ: "
+msgstr "필터: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Fingerprint: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "ÇöÀç ¸ÞÀÏÀ» ÀúÀå ÈÄ ³ªÁß¿¡ º¸³¿"
+msgstr "현재 메일을 저장 후 나중에 보냄"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "%s%s¿¡°Ô ´ñ±Û?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "%s%s¿¡°Ô ´ñ±Û?"
+msgstr "%s%s에게 댓글?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "MIME ĸ½¶¿¡ ³Ö¾î Æ÷¿öµùÇÒ±î¿ä?"
+msgstr "MIME 캡슐에 넣어 포워딩할까요?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "÷ºÎ¹°·Î Æ÷¿öµù?"
+msgstr "첨부물로 포워딩?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "÷ºÎ¹°·Î Æ÷¿öµù?"
+msgstr "첨부물로 포워딩?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "¸ÞÀÏ Ã·ºÎ ¸ðµå¿¡¼­ Çã°¡µÇÁö ¾Ê´Â ±â´ÉÀÓ."
+msgstr "메일 첨부 모드에서 허가되지 않는 기능임."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "Æú´õ ¸ñ·Ï ¹Þ´Â Áß..."
+msgstr "폴더 목록 받는 중..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "³×ÀÓ½ºÆäÀ̽º ¹Þ´Â Áß..."
+msgstr "네임스페이스 받는 중..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "±×·ì"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "µµ¿ò¸»"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "%s µµ¿ò¸»"
+msgstr "%s 도움말"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "ÇöÀç µµ¿ò¸»À» º¸°í ÀÖ½À´Ï´Ù."
+msgstr "현재 도움말을 보고 있습니다."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "¾î¶»°Ô Ãâ·ÂÇÒ Áö ¾Ë ¼ö ¾øÀ½!"
+msgstr "어떻게 출력할 지 알 수 없음!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "÷ºÎ¹° %sÀÇ Ãâ·Â ¹æ¹ýÀ» ¾Ë ¼ö ¾øÀ½!"
+msgstr "첨부물 %s의 출력 방법을 알 수 없음!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "IDÀÇ ÀÎÁõÀÚ°¡ Á¤ÀǵÇÁö ¾ÊÀ½."
+msgstr "ID의 인증자가 정의되지 않음."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "ÀÌ Å°´Â ¸¸±â/»ç¿ëÁßÁö/Ãë¼ÒµÊ."
+msgstr "이 키는 만기/사용중지/취소됨."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "ÀÌ ID´Â È®½ÇÇÏÁö ¾ÊÀ½."
+msgstr "이 ID는 확실하지 않음."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "ÀÌ ID´Â ½Å¿ëµµ°¡ ³·À½"
+msgstr "이 ID는 신용도가 낮음"
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "À߸øµÈ PGP Çì´õ"
+msgstr "잘못된 PGP 헤더"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "À߸øµÈ S/MIME Çì´õ"
+msgstr "잘못된 S/MIME 헤더"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "\"%2$s\" %3$d ¹ø° ÁÙÀÇ %1$s À¯ÇüÀÇ Ç׸ñÀº À߸øµÈ Çü½ÄÀÓ"
+msgstr "\"%2$s\" %3$d 번째 줄의 %1$s 유형의 항목은 잘못된 형식임"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "´äÀå¿¡ ¿øº»À» Æ÷ÇÔ½Ãŵ´Ï±î?"
+msgstr "답장에 원본을 포함시킵니까?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "ÀÎ¿ë ¸ÞÀÏ Æ÷ÇÔ Áß..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "»ðÀÔ"
+msgstr "인용 메일 포함 중..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "À߸øµÈ ³¯Â¥ ÀÔ·Â: %s"
+msgstr "잘못된 날짜 입력: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "À߸øµÈ ÀÎÄÚµù"
+msgstr "잘못된 인코딩"
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "À߸øµÈ »öÀÎ ¹øÈ£."
+msgstr "잘못된 색인 번호."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "À߸øµÈ ¸ÞÀÏ ¹øÈ£."
+msgstr "잘못된 메일 번호."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "À߸øµÈ ´Þ ÀÔ·Â: %s"
+msgstr "잘못된 달 입력: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "À߸øµÈ ³¯Â¥ ÀÔ·Â: %s"
+msgstr "잘못된 날짜 입력: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "PGP¸¦ ±¸µ¿ÇÕ´Ï´Ù..."
+msgstr "PGP를 구동합니다..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "PGP¸¦ ±¸µ¿ÇÕ´Ï´Ù..."
+msgstr "PGP를 구동합니다..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "ÀÚµ¿ º¸±â ¸í·É ½ÇÇà: %s"
+msgstr "자동 보기 명령 실행: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "À̵¿: "
+msgstr "이동: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "À̵¿ÇÒ À§Ä¡: "
+msgstr "이동할 위치: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "¼±ÅÃâ¿¡´Â ¹Ù·Î °¡±â ±â´ÉÀÌ ¾ø½À´Ï´Ù."
+msgstr "선택창에는 바로 가기 기능이 없습니다."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "¿­¼è ID: 0x%s"
+msgstr "열쇠 ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Á¤ÀǵÇÁö ¾ÊÀº ±Û¼è."
+msgstr "정의되지 않은 글쇠."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Á¤ÀǵÇÁö ¾ÊÀº ±Û¼è. µµ¿ò¸» º¸±â´Â '%s'"
+msgstr "정의되지 않은 글쇠. 도움말 보기는 '%s'"
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "ÆÐÅÏ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ: "
+msgstr "패턴과 일치하는 메일: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "ÆÐÅÏ: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "패턴: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "Á¢¼Ó Áß..."
+msgstr "접속 중..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1722,742 +1638,666 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Àá±Ý ¼ö°¡ Çѵµ¸¦ ³Ñ¾úÀ½, %sÀÇ Àá±ÝÀ» ¾ø¾Ù±î¿ä?"
+msgstr "잠금 수가 한도를 넘었음, %s의 잠금을 없앨까요?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "Á¢¼Ó Áß..."
+msgstr "접속 중..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "Á¢¼Ó ½ÇÆÐ."
+msgstr "접속 실패."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "\"%s\"¿Í ÀÏÄ¡ÇÏ´Â Å°¸¦ ã´Â Áß..."
+msgstr "\"%s\"와 일치하는 키를 찾는 중..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "%s¸¦ ã´Â Áß..."
+msgstr "%s를 찾는 중..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Fingerprint: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "Á¤ÀǵÇÁö ¾ÊÀº MIME Çü½Ä. ÷ºÎ¹°À» º¼ ¼ö ¾øÀ½."
+msgstr "정의되지 않은 MIME 형식. 첨부물을 볼 수 없음."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "¸ÅÅ©·Î ·çÇÁ°¡ ¹ß»ý."
+msgstr "매크로 루프가 발생."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "¸ÞÀÏ"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "º¸³»Áö ¾ÊÀ½."
+msgstr "보내지 않음."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "¸ÞÀÏ º¸³¿."
+msgstr "메일 보냄."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "¸ÞÀÏÇÔÀÌ Ç¥½ÃµÊ."
+msgstr "메일함이 표시됨."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "¸ÞÀÏÇÔÀÌ ´ÝÈû"
+msgstr "메일함이 닫힘"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "¸ÞÀÏÇÔÀÌ »ý¼ºµÊ."
+msgstr "메일함이 생성됨."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "¸ÞÀÏÇÔ »èÁ¦µÊ."
+msgstr "메일함 삭제됨."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "¸ÞÀÏÇÔÀÌ ºñ¾úÀ½"
+msgstr "메일함이 비었음"
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "¸ÞÀÏÇÔÀÌ ¾²±â ºÒ°¡´ÉÀ¸·Î Ç¥½Ã µÇ¾úÀ½. %s"
+msgstr "메일함이 쓰기 불가능으로 표시 되었음. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "Àбâ Àü¿ë ¸ÞÀÏÇÔ."
+msgstr "읽기 전용 메일함."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "¸ÞÀÏÇÔÀÌ º¯°æµÇÁö ¾ÊÀ½."
+msgstr "메일함이 변경되지 않음."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "¸ÞÀÏÇÔÀº À̸§À» °¡Á®¾ß ÇÔ."
+msgstr "메일함은 이름을 가져야 함."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "¸ÞÀÏÇÔÀÌ »èÁ¦µÇÁö ¾ÊÀ½."
+msgstr "메일함이 삭제되지 않음."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "¸ÞÀÏÇÔÀÌ »ý¼ºµÊ."
+msgstr "메일함이 생성됨."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "¸ÞÀÏÇÔÀÌ ¼Õ»óµÇ¾úÀ½!"
+msgstr "메일함이 손상되었음!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "¿ÜºÎ¿¡¼­ ¸ÞÀÏÇÔÀÌ º¯°æµÊ."
+msgstr "외부에서 메일함이 변경됨."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "¿ÜºÎ¿¡¼­ ¸ÞÀÏÇÔÀÌ º¯°æµÊ. Ç÷¡±×°¡ Ʋ¸± ¼ö ÀÖÀ½"
+msgstr "외부에서 메일함이 변경됨. 플래그가 틀릴 수 있음"
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "¸ÞÀÏÇÔ [%d]"
+msgstr "메일함 [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Mailcap ÆíÁý Ç׸ñÀº %%s°¡ ÇÊ¿äÇÔ"
+msgstr "Mailcap 편집 항목은 %%s가 필요함"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Mailcap ÀÛ¼º Ç׸ñÀº %%s°¡ ÇÊ¿äÇÔ"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "º°Äª ¸¸µé±â"
+msgstr "Mailcap 작성 항목은 %%s가 필요함"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "%d°³ÀÇ ¸ÞÀÏÀ» »èÁ¦ Ç¥½ÃÇÔ..."
+msgstr "%d개의 메일을 삭제 표시함..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "¸Å½ºÅ©"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "¸ÞÀÏÀÌ Àü´ÞµÊ."
+msgstr "메일이 전달됨."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "¸ÞÀÏÀ» ÇÁ¸°Æ® ÇÒ ¼ö ¾øÀ½"
+msgstr "메일을 프린트 할 수 없음"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "¸Þ¼¼Áö ÆÄÀÏÀÌ ºñ¾úÀ½!"
+msgstr "메세지 파일이 비었음!"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "¸ÞÀÏÀÌ Àü´Þ µÇÁö ¾ÊÀ½."
+msgstr "메일이 전달 되지 않음."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "¸Þ¼¼Áö°¡ º¯°æµÇÁö ¾ÊÀ½!"
+msgstr "메세지가 변경되지 않음!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Á¦ÇÑµÈ º¸±â·Î ºÎ¸ð ¸ÞÀÏÀº º¸ÀÌÁö ¾Ê´Â »óÅÂÀÓ."
+msgstr "제한된 보기로 부모 메일은 보이지 않는 상태임."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "¹ß¼Û ¿¬±âµÊ."
+msgstr "발송 연기됨."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "¸ÞÀÏÀ» ÇÁ¸°Æ®ÇÔ"
+msgstr "메일을 프린트함"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "¸ÞÀÏ ¾²±â ¿Ï·á."
+msgstr "메일 쓰기 완료."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "¸ÞÀϵéÀÌ Àü´ÞµÊ."
+msgstr "메일들이 전달됨."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "¸ÞÀϵéÀ» ÇÁ¸°Æ® ÇÒ ¼ö ¾øÀ½"
+msgstr "메일들을 프린트 할 수 없음"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "¸ÞÀϵéÀÌ Àü´Þ µÇÁö ¾ÊÀ½."
+msgstr "메일들이 전달 되지 않음."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "¸ÞÀϵéÀ» ÇÁ¸°Æ®ÇÔ"
+msgstr "메일들을 프린트함"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Àμö°¡ ºüÁ³À½."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Mixmaster üÀÎÀº %d°³ÀÇ Á¦ÇÑÀÌ ÀÖÀ½."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster´Â Cc ¶Ç´Â Bcc Çì´õ¸¦ Çã¿ëÇÏÁö ¾ÊÀ½."
+msgstr "인수가 빠졌음."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "ÀÐÀº ¸ÞÀÏÀ» %s·Î ¿Å±æ±î¿ä?"
+msgstr "읽은 메일을 %s로 옮길까요?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "ÀÐÀº ¸ÞÀÏÀ» %s·Î ¿Å±â´Â Áß..."
+msgstr "읽은 메일을 %s로 옮기는 중..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "»õ Áú¹®"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "»õ ÆÄÀÏ À̸§: "
+msgstr "새 파일 이름: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "»õ ÆÄÀÏ: "
+msgstr "새 파일: "
 
 #: buffy.cpkg:330
 msgid "New mail in "
-msgstr "»õ ¸ÞÀÏ µµÂø "
+msgstr "새 메일 도착 "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "ÇöÀç ¸ÞÀÏÇÔ¿¡ »õ ¸ÞÀÏ µµÂø."
+msgstr "현재 메일함에 새 메일 도착."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "´ÙÀ½"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "´ÙÀ½ÆäÀÌÁö"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "ÀÎÁõÀÚ°¡ ¾øÀ½."
+msgstr "인증자가 없음."
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "ÇÑ°è º¯¼ö ¾øÀ½! [¿À·ù º¸°í ¹Ù¶÷]"
+msgstr "한계 변수 없음! [오류 보고 바람]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "Ç׸ñÀÌ ¾øÀ½."
+msgstr "항목이 없음."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "ÆÄÀÏ ¸Å½ºÅ©¿Í ÀÏÄ¡ÇÏ´Â ÆÄÀÏ ¾øÀ½."
+msgstr "파일 매스크와 일치하는 파일 없음."
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "¼ö½Å ¸ÞÀÏÇÔÀÌ Á¤ÀǵÇÁö ¾ÊÀ½."
+msgstr "수신 메일함이 정의되지 않음."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Á¦ÇÑ ÆÐÅÏÀÌ ¾øÀ½."
+msgstr "제한 패턴이 없음."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "¿­¸° ¸ÞÀÏÇÔÀÌ ¾øÀ½."
+msgstr "열린 메일함이 없음."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "»õ ¸ÞÀÏÀÌ µµÂøÇÑ ¸ÞÀÏÇÔ ¾øÀ½."
+msgstr "새 메일이 도착한 메일함 없음."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "%sÀÇ mailcap ÀÛ¼º Ç׸ñÀÌ ¾øÀ½, ºó ÆÄÀÏ »ý¼º."
+msgstr "%s의 mailcap 작성 항목이 없음, 빈 파일 생성."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "ÆíÁýÀ» À§ÇÑ %sÀÇ mailcap Ç׸ñÀÌ ¾øÀ½"
+msgstr "편집을 위한 %s의 mailcap 항목이 없음"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "¸ÞÀϸµ ¸®½ºÆ®¸¦ ãÀ» ¼ö ¾øÀ½!"
+msgstr "메일링 리스트를 찾을 수 없음!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "mailcap Ç׸ñ¿¡¼­ ÀÏÄ¡ÇÏ´Â °ÍÀ» ãÀ» ¼ö ¾øÀ½. text·Î º¸±â."
+msgstr "mailcap 항목에서 일치하는 것을 찾을 수 없음. text로 보기."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Æú´õ¿¡ ¸ÞÀÏÀÌ ¾øÀ½."
+msgstr "폴더에 메일이 없음."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "±âÁØ°ú ÀÏÄ¡ÇÏ´Â ¸ÞÀÏÀÌ ¾øÀ½."
+msgstr "기준과 일치하는 메일이 없음."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "´õ ÀÌ»óÀÇ Àο빮 ¾øÀ½."
+msgstr "더 이상의 인용문 없음."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "´õ ÀÌ»ó ±ÛŸ·¡ ¾øÀ½."
+msgstr "더 이상 글타래 없음."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Àο빮 ÀÌÈÄ¿¡ ´õ ÀÌ»óÀÇ ºñ Àο빮 ¾øÀ½."
+msgstr "인용문 이후에 더 이상의 비 인용문 없음."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "POP ¸ÞÀÏÇÔ¿¡ »õ ¸ÞÀÏÀÌ ¾øÀ½."
+msgstr "POP 메일함에 새 메일이 없음."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "»õ ¸ÞÀÏ ¾øÀ½"
+msgstr "새 메일 없음"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Á¦¸ñÀÌ ÁöÁ¤µÇÁö ¾ÊÀ½."
+msgstr "제목이 지정되지 않음."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "ÆÄÀÏ ¸Å½ºÅ©¿Í ÀÏÄ¡ÇÏ´Â ÆÄÀÏ ¾øÀ½."
+msgstr "파일 매스크와 일치하는 파일 없음."
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "»õ ¸ÞÀÏÀÌ µµÂøÇÑ ¸ÞÀÏÇÔ ¾øÀ½."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "¹ß¼Û ¿¬±âµÈ ¸ÞÀÏ ¾øÀ½."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "»õ ¸ÞÀÏÀÌ µµÂøÇÑ ¸ÞÀÏÇÔ ¾øÀ½."
+msgstr "발송 연기된 메일 없음."
 
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "ÇÁ¸°Æ® ¸í·ÉÀÌ Á¤ÀǵÇÁö ¾ÊÀ½."
+msgstr "프린트 명령이 정의되지 않음."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "¼ö½ÅÀÚ°¡ ÁöÁ¤µÇÁö ¾ÊÀ½!"
+msgstr "수신자가 지정되지 않음!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "¼ö½ÅÀÚ°¡ ÁöÁ¤µÇÁö ¾ÊÀ½.\n"
+msgstr "수신자가 지정되지 않음.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "¼ö½ÅÀÚ°¡ ÁöÁ¤µÇÁö ¾ÊÀ½."
+msgstr "수신자가 지정되지 않음."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "ÆÐÅÏÀ» ãÀ» ¼ö ¾øÀ½."
+msgstr "패턴을 찾을 수 없음."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Á¦¸ñÀÌ ÁöÁ¤µÇÁö ¾ÊÀ½."
+msgstr "제목이 지정되지 않음."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Á¦¸ñ ¾øÀ½, º¸³»±â¸¦ Ãë¼ÒÇÒ±î¿ä?"
+msgstr "제목 없음, 보내기를 취소할까요?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Á¦¸ñ ¾øÀ½. ³¡³¾±î¿ä?"
+msgstr "제목 없음. 끝낼까요?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "Á¦¸ñ ¾øÀ½. ³¡³À´Ï´Ù."
+msgstr "제목 없음. 끝냅니다."
 
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "Æú´õ ¾øÀ½"
+msgstr "폴더 없음"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "űװ¡ ºÙÀº Ç׸ñ ¾øÀ½."
+msgstr "태그가 붙은 항목 없음."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "űװ¡ ºÙÀº ¸ÞÀÏÀ» º¼ ¼ö ¾øÀ½!"
+msgstr "태그가 붙은 메일을 볼 수 없음!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Ç¥½ÃµÈ ¸ÞÀÏÀÌ ¾øÀ½."
+msgstr "표시된 메일이 없음."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "»èÁ¦ Ãë¼ÒµÈ ¸ÞÀÏ ¾øÀ½."
+msgstr "삭제 취소된 메일 없음."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "ÀÐÁö ¾ÊÀº ¸ÞÀÏ ¾øÀ½"
+msgstr "읽지 않은 메일 없음"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "¸ÞÀÏ ¾øÀ½."
+msgstr "메일 없음."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "ÀÌ ¸Þ´º¿¡¼± À¯È¿ÇÏÁö ¾ÊÀ½."
+msgstr "이 메뉴에선 유효하지 않음."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "ãÀ» ¼ö ¾øÀ½."
+msgstr "찾을 수 없음."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
-msgstr "¾Æ¹«°Íµµ ÇÏÁö ¾ÊÀ½."
-
-#: remailer.c:435
-msgid "OK"
-msgstr "È®ÀÎ"
+msgstr "아무것도 하지 않음."
 
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "´ÙÁßü°è ÷ºÎ¹°ÀÇ »èÁ¦¸¸ÀÌ Áö¿øµË´Ï´Ù."
+msgstr "다중체계 첨부물의 삭제만이 지원됩니다."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "¸ÞÀÏÇÔ ¿­±â"
+msgstr "메일함 열기"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Àбâ Àü¿ëÀ¸·Î ¸ÞÀÏÇÔ ¿­±â"
+msgstr "읽기 전용으로 메일함 열기"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "¸ÞÀÏÀ» ÷ºÎÇϱâ À§ÇØ ¸ÞÀÏÇÔÀ» ¿°"
+msgstr "메일을 첨부하기 위해 메일함을 염"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Àбâ Àü¿ëÀ¸·Î ¸ÞÀÏÇÔ ¿­±â"
+msgstr "읽기 전용으로 메일함 열기"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "¸ÞÀÏÀ» ÷ºÎÇϱâ À§ÇØ ¸ÞÀÏÇÔÀ» ¿°"
+msgstr "메일을 첨부하기 위해 메일함을 염"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "¹è´Þ ÇÁ·Î¼¼½ºÀÇ Ãâ·Â"
+msgstr "배달 프로세스의 출력"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "PGP ¾Ïȣȭ(e), ¼­¸í(s), »ç¿ë ¼­¸í(a), µÑ ´Ù(b), (i)nline, Ãë¼Ò(f)? "
+msgstr "PGP 암호화(e), 서명(s), 사용 서명(a), 둘 다(b), (i)nline, 취소(f)? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP°¡ ¼±ÅõÊ. Áö¿ì°í °è¼ÓÇÒ±î¿ä? "
+msgstr "PGP가 선택됨. 지우고 계속할까요? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP Å°°¡ <%s>¿Í ÀÏÄ¡ÇÔ."
+msgstr "PGP 키가 <%s>와 일치함."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "PGP Å°°¡ <%s>¿Í ÀÏÄ¡ÇÔ."
+msgstr "PGP 키가 <%s>와 일치함."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP ¼­¸í °ËÁõ¿¡ ½ÇÆÐÇÔ."
+msgstr "PGP 서명 검증에 실패함."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP ¼­¸í È®Àο¡ ¼º°øÇÔ."
+msgstr "PGP 서명 확인에 성공함."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "POP ¼­¹ö°¡ ÁöÁ¤µÇÁö ¾ÊÀ½."
+msgstr "POP 서버가 지정되지 않음."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "ºÎ¸ð ¸ÞÀÏÀÌ Á¸ÀçÇÏÁö ¾ÊÀ½."
+msgstr "부모 메일이 존재하지 않음."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Á¦ÇÑµÈ º¸±â·Î ºÎ¸ð ¸ÞÀÏÀº º¸ÀÌÁö ¾Ê´Â »óÅÂÀÓ."
+msgstr "제한된 보기로 부모 메일은 보이지 않는 상태임."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "%s@%sÀÇ ¾ÏÈ£: "
+msgstr "%s@%s의 암호: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "À̸§: "
-
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "¿¬°á"
+msgstr "이름: "
 
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "¸í·É¾î·Î ¿¬°á: "
+msgstr "명령어로 연결: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "¿¬°á: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "mixmaster¸¦ »ç¿ëÇϱâ À§ÇÑ Àû´çÇÑ È£½ºÆ® º¯¼ö¸¦ »ç¿ëÇϼ¼¿ä!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "연결: "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "ÀÌ ¸ÞÀÏÀ» ³ªÁß¿¡ º¸³¾±î¿ä?"
+msgstr "이 메일을 나중에 보낼까요?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "¹ß¼Û ¿¬±â µÊ"
+msgstr "발송 연기 됨"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "Ãʱâ Á¢¼Ó(preconnect) ¸í·É ½ÇÆÐ."
+msgstr "초기 접속(preconnect) 명령 실패."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "¸ÞÀÏ Æ÷¿öµùÀ» Áغñ Áß..."
+msgstr "메일 포워딩을 준비 중..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "¾Æ¹«Å°³ª ´©¸£¸é °è¼ÓÇÕ´Ï´Ù..."
-
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "ÀÌÀüÆäÀÌÁö"
+msgstr "아무키나 누르면 계속합니다..."
 
-#: recvattach.c:34
-msgid "Print"
-msgstr "Ãâ·Â"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "÷ºÎ¹° Ãâ·Â?"
+msgstr "첨부물 출력?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "¸ÞÀÏÀ» ÇÁ¸°Æ® ÇÒ±î¿ä?"
+msgstr "메일을 프린트 할까요?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "űװ¡ ºÙÀº ÷ºÎ¹° Ãâ·Â?"
+msgstr "태그가 붙은 첨부물 출력?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Ç¥½ÃÇÑ ¸ÞÀÏÀ» ÇÁ¸°Æ® ÇÒ±î¿ä?"
+msgstr "표시한 메일을 프린트 할까요?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "»èÁ¦ Ç¥½ÃµÈ ¸ÞÀÏ(%d)À» »èÁ¦ÇÒ±î¿ä?"
+msgstr "삭제 표시된 메일(%d)을 삭제할까요?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "»èÁ¦ Ç¥½ÃµÈ ¸ÞÀϵé(%d)À» »èÁ¦ÇÒ±î¿ä?"
+msgstr "삭제 표시된 메일들(%d)을 삭제할까요?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "ÁúÀÇ"
+msgstr "질의"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "ÁúÀÇ '%s'"
+msgstr "질의 '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "ÁúÀÇ ¸í·ÉÀÌ Á¤ÀǵÇÁö ¾ÊÀ½."
+msgstr "질의 명령이 정의되지 않음."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "ÁúÀÇ: "
-
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Á¾·á"
+msgstr "질의: "
 
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "MuttÀ» Á¾·áÇÒ±î¿ä?"
+msgstr "Mutt을 종료할까요?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "³×ÀÓ½ºÆäÀ̽º ¹Þ´Â Áß..."
+msgstr "네임스페이스 받는 중..."
 
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "%s Àд Áß..."
+msgstr "%s 읽는 중..."
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "%s Àд Áß... %d"
+msgstr "%s 읽는 중... %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "%s Àд Áß... %d (%d%%)"
+msgstr "%s 읽는 중... %d (%d%%)"
 
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "»õ ¸ÞÀÏ Àд Áß (%d ¹ÙÀÌÆ®)..."
+msgstr "새 메일 읽는 중 (%d 바이트)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Á¤¸»·Î \"%s\" ¸ÞÀÏÇÔÀ» Áö¿ï±î¿ä?"
+msgstr "정말로 \"%s\" 메일함을 지울까요?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "¹ß¼Û ¿¬±âµÈ ¸ÞÀÏÀ» ´Ù½Ã ºÎ¸¦±î¿ä?"
+msgstr "발송 연기된 메일을 다시 부를까요?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "ÀúÀåÀº ÅؽºÆ® ÷ºÎ¹°¿¡¸¸ Àû¿ëµÊ."
+msgstr "저장은 텍스트 첨부물에만 적용됨."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
-msgstr "SSL ½ÇÆÐ: %s"
+msgstr "SSL 실패: %s"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "»ý¼ºÀº IMAP ¸ÞÀÏÇÔ¿¡¼­¸¸ Áö¿øµÊ"
+msgstr "생성은 IMAP 메일함에서만 지원됨"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "¸ÞÀÏÇÔ ¿­±â"
+msgstr "메일함 열기"
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "À̸§ ¹Ù²Ù±â: "
+msgstr "이름 바꾸기: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "¸ÞÀÏÇÔÀ» ´Ù½Ã ¿©´Â Áß..."
+msgstr "메일함을 다시 여는 중..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "´äÀå"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "%s%s¿¡°Ô ´äÀå?"
+msgstr "%s%s에게 답장?"
 
 #: commands.c:403
 #, fuzzy
@@ -2465,55 +2305,55 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"¿ª¼øÁ¤·Ä: (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
+"역순정렬: (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "¹Ý´ë ¹æÇâÀ¸·Î ã¾Æº¸±â: "
+msgstr "반대 방향으로 찾아보기: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "°Å²Ù·Î ã±â: "
+msgstr "거꾸로 찾기: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "¿ª¼øÁ¤·Ä ¹æ¹ý: ³¯Â¥(d), ³¹¸»(a), Å©±â(z), ¾ÈÇÔ(n)?"
+msgstr "역순정렬 방법: 날짜(d), 낱말(a), 크기(z), 안함(n)?"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "PGP ¾Ïȣȭ(e), ¼­¸í(s), »ç¿ë ¼­¸í(a), µÑ ´Ù(b), (i)nline, Ãë¼Ò(f)? "
+msgstr "PGP 암호화(e), 서명(s), 사용 서명(a), 둘 다(b), (i)nline, 취소(f)? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "ÀÌ¹Ì S/MIMEÀÌ ¼±ÅõÊ. Áö¿ì°í °è¼ÓÇÒ±î¿ä? "
+msgstr "이미 S/MIME이 선택됨. 지우고 계속할까요? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "S/MIME ÀÎÁõ¼­ ¼ÒÀ¯ÀÚ¿Í º¸³½ÀÌ°¡ ÀÏÄ¡ÇÏÁö ¾ÊÀ½."
+msgstr "S/MIME 인증서 소유자와 보낸이가 일치하지 않음."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
-msgstr "S/MIME ÀÎÁõ¼­°¡ \"%s\"¿Í ÀÏÄ¡."
+msgstr "S/MIME 인증서가 \"%s\"와 일치."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "³»¿ë¿¡ S/MIME Ç¥½Ã°¡ ¾ø´Â °æ¿ì´Â Áö¿øÇÏÁö ¾ÊÀ½."
+msgstr "내용에 S/MIME 표시가 없는 경우는 지원하지 않음."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME ¼­¸í °ËÁõ¿¡ ½ÇÆÐÇÔ."
+msgstr "S/MIME 서명 검증에 실패함."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "S/MIME ¼­¸í È®Àο¡ ¼º°øÇÔ."
+msgstr "S/MIME 서명 확인에 성공함."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "SASL ÀÎÁõ¿¡ ½ÇÆÐÇÔ."
+msgstr "SASL 인증에 실패함."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Fingerprint: %s"
@@ -2521,137 +2361,113 @@ msgstr "Fingerprint: %s"
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "%s¸¦ »ç¿ëÇØ SSL ¿¬°á (%s)"
-
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "ÀúÀå"
+msgstr "%s를 사용해 SSL 연결 (%s)"
 
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "ÀÌ ¸ÞÀÏÀÇ º¹»çº»À» ÀúÀåÇÒ±î¿ä?"
+msgstr "이 메일의 복사본을 저장할까요?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "ÆÄÀÏ·Î ÀúÀå: "
+msgstr "파일로 저장: "
 
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "ÀúÀå%s ¸ÞÀÏÇÔÀ¸·Î"
+msgstr "저장%s 메일함으로"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "¸Þ¼¼Áö »óÅ Ç÷¡±× ÀúÀå... [%d/%d]"
+msgstr "메세지 상태 플래그 저장... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "ÀúÀåÁß..."
+msgstr "저장중..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "ã±â"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "ã¾Æº¸±â: "
+msgstr "찾아보기: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "ÀÏÄ¡ÇÏ´Â °á°ú°¡ ¾Æ·¡¿¡ ¾øÀ½"
+msgstr "일치하는 결과가 아래에 없음"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "ÀÏÄ¡ÇÏ´Â °á°ú°¡ À§¿¡ ¾øÀ½"
+msgstr "일치하는 결과가 위에 없음"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "ã´Â µµÁß ÁߴܵÊ."
+msgstr "찾는 도중 중단됨."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "ÀÌ ¸Þ´º¿¡´Â °Ë»ö ±â´ÉÀÌ ¾ø½À´Ï´Ù."
+msgstr "이 메뉴에는 검색 기능이 없습니다."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "¾Æ·¡ºÎÅÍ ´Ù½Ã °Ë»ö."
+msgstr "아래부터 다시 검색."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "À§ºÎÅÍ ´Ù½Ã °Ë»ö."
+msgstr "위부터 다시 검색."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "ã±â: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "¼±ÅÃ"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "¼±Åà  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "¸®¸ÞÀÏ·¯ üÀÎ ¼±ÅÃ."
+msgstr "찾기: "
 
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "%s ¼±Åà Áß..."
+msgstr "%s 선택 중..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "º¸³¿"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "¹é±×¶ó¿îµå·Î º¸³¿."
+msgstr "백그라운드로 보냄."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "¸ÞÀÏ º¸³»´Â Áß..."
+msgstr "메일 보내는 중..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "¼­¹ö¿Í ¿¬°áÀÌ ²÷¾îÁü!"
+msgstr "서버와 연결이 끊어짐!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Ç÷¡±× ¼³Á¤"
+msgstr "플래그 설정"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "½© ¸í·É¾î: "
+msgstr "쉘 명령어: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "¼­¸í"
+msgstr "서명"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "»ç¿ë ¼­¸í: "
+msgstr "사용 서명: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "¼­¸í, ¾Ïȣȭ"
+msgstr "서명, 암호화"
 
 #: commands.c:406
 #, fuzzy
@@ -2659,169 +2475,165 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Á¤·Ä: (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
+"정렬: (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Á¤·Ä ¹æ¹ý: ³¯Â¥(d), ±ÛÀÚ(a), Å©±â(z), ¾ÈÇÔ(n)?"
+msgstr "정렬 방법: 날짜(d), 글자(a), 크기(z), 안함(n)?"
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "¸ÞÀÏÇÔ Á¤·Ä Áß..."
+msgstr "메일함 정렬 중..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "¿­¼è ID: 0x%s"
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
+msgstr "열쇠 ID: 0x%s"
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "°¡ÀÔ [%s], ÆÄÀÏ ¸Å½ºÅ©: %s"
+msgstr "가입 [%s], 파일 매스크: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "%s¿¡ °¡ÀÔ Áß..."
+msgstr "%s에 가입 중..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "SSL ÀÎÁõ¼­ °Ë»ç"
+msgstr "SSL 인증서 검사"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "ÀÏÄ¡ÇÏ´Â ¸ÞÀÏ¿¡ Ç¥½ÃÇÔ: "
+msgstr "일치하는 메일에 표시함: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "÷ºÎÇÏ°íÀÚ ÇÏ´Â ¸ÞÀÏÀ» Ç¥½ÃÇϼ¼¿ä."
+msgstr "첨부하고자 하는 메일을 표시하세요."
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "ű׸¦ ºÙÀÌ´Â °ÍÀ» Áö¿øÇÏÁö ¾ÊÀ½."
+msgstr "태그를 붙이는 것을 지원하지 않음."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "¸ÞÀÏÀÌ º¼ ¼ö ¾ø´Â »óÅÂÀÓ."
+msgstr "메일이 볼 수 없는 상태임."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL »ç¿ë ºÒ°¡."
+msgstr "SSL 사용 불가."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "ÇöÀç ÷ºÎ¹°Àº º¯È¯ °¡´ÉÇÔ."
+msgstr "현재 첨부물은 변환 가능함."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "ÇöÀç ÷ºÎ¹°Àº º¯È¯ÇÒ¼ö ¾øÀ½."
+msgstr "현재 첨부물은 변환할수 없음."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "À߸øµÈ ¸ÞÀÏ À妽º. ¸ÞÀÏÇÔ ¿­±â Àç½Ãµµ."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "¸®¸ÞÀÏ·¯ üÀÎÀÌ ÀÌ¹Ì ºñ¾î ÀÖÀ½."
+msgstr "잘못된 메일 인덱스. 메일함 열기 재시도."
 
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "÷ºÎ¹°ÀÌ ¾øÀ½."
+msgstr "첨부물이 없음."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "¸ÞÀÏÀÌ ¾øÀ½."
+msgstr "메일이 없음."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "´õ ÀÌ»ó ÷ºÎ¹°ÀÌ ¾ø½À´Ï´Ù."
+msgstr "더 이상 첨부물이 없습니다."
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "¿À·¡µÈ ¹öÁ¯ÀÇ IMAP ¼­¹ö·Î Mutt¿Í »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù."
+msgstr "오래된 버젼의 IMAP 서버로 Mutt와 사용할 수 없습니다."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "ÀÌ ÀÎÁõ¼­´Â ´ÙÀ½¿¡ ¼ÓÇÔ:"
+msgstr "이 인증서는 다음에 속함:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "ÀÌ ÀÎÁõ¼­´Â À¯È¿ÇÔ"
+msgstr "이 인증서는 유효함"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "ÀÌ ÀÎÁõ¼­ÀÇ ¹ßÇàÀÎÀº:"
+msgstr "이 인증서의 발행인은:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "ÀÌ Å°´Â »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù: ¸¸±â/»ç¿ëÁßÁö/Ãë¼ÒµÊ."
+msgstr "이 키는 사용할 수 없습니다: 만기/사용중지/취소됨."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "±ÛŸ·¡¿¡ ÀÐÁö ¾ÊÀº ¸Þ¼¼Áö ÀÖÀ½."
+msgstr "글타래에 읽지 않은 메세지 있음."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "±ÛŸ·¡ ¸ðµå°¡ ¾Æ´Ô."
+msgstr "글타래 모드가 아님."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "fcntl Àá±Ý ½Ãµµ Áß ½Ã°£ Á¦ÇÑÀ» ÃÊ°úÇÔ!"
+msgstr "fcntl 잠금 시도 중 시간 제한을 초과함!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "flock Àá±Ý ½Ãµµ Áß ½Ã°£ Á¦ÇÑÀ» ÃÊ°úÇÔ!"
+msgstr "flock 잠금 시도 중 시간 제한을 초과함!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "¸Þ¼¼ÁöÀÇ Ã³À½ÀÔ´Ï´Ù."
+msgstr "메세지의 처음입니다."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "PGP ¿­¼è¸¦ ÃßÃâÇÏ´Â Áß...\n"
+msgstr "PGP 열쇠를 추출하는 중...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "S/MIME ÀÎÁõ¼­ ÃßÃâÇÏ´Â Áß...\n"
+msgstr "S/MIME 인증서 추출하는 중...\n"
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "%s (%s) ¿À·ù"
+msgstr "%s (%s) 오류"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2831,140 +2643,123 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "SASL ÀÎÁõ¿¡ ½ÇÆÐÇÔ."
+msgstr "SASL 인증에 실패함."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "%s¸¦ ÷ºÎÇÒ ¼ö ¾øÀ½!"
+msgstr "%s를 첨부할 수 없음!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "÷ºÎÇÒ ¼ö ¾øÀ½!"
+msgstr "첨부할 수 없음!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "ÀÌ ¹öÁ¯ÀÇ IAMP ¼­¹ö¿¡¼­ Çì´õ¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
+msgstr "이 버젼의 IAMP 서버에서 헤더를 가져올 수 없습니다."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "ÁöÁ¤ÇÑ °÷¿¡¼­ ÀÎÁõ¼­¸¦ °¡Á®¿Ã ¼ö ¾øÀ½"
+msgstr "지정한 곳에서 인증서를 가져올 수 없음"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "¼­¹ö¿¡ ¸ÞÀÏÀ» ³²°Ü µÑ ¼ö ¾øÀ½."
+msgstr "서버에 메일을 남겨 둘 수 없음."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "%s¸¦ ÷ºÎÇÒ ¼ö ¾øÀ½!"
+msgstr "%s를 첨부할 수 없음!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "¸ÞÀÏÇÔÀ» Àá±Û ¼ö ¾øÀ½!"
+msgstr "메일함을 잠글 수 없음!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Àӽà ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½!"
+msgstr "임시 파일을 열 수 없음!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Àӽà ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½!"
+msgstr "임시 파일을 열 수 없음!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Àӽà ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½!"
+msgstr "임시 파일을 열 수 없음!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "º¹±¸"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "ÀÏÄ¡ÇÏ´Â ¸ÞÀÏÀ» »èÁ¦ Ãë¼Ò: "
+msgstr "일치하는 메일을 삭제 취소: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "º¹±¸"
+msgstr "복구"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "¾Ë ¼ö ¾ø´Â Content-Type %s"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "%s¿¡¼­ °¡ÀÔ Å»Åð Áß..."
+msgstr "알 수 없는 Content-Type %s"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "%s¿¡¼­ °¡ÀÔ Å»Åð Áß..."
+msgstr "%s에서 가입 탈퇴 중..."
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "%s¿¡¼­ °¡ÀÔ Å»Åð Áß..."
+msgstr "%s에서 가입 탈퇴 중..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "ÀÏÄ¡ÇÏ´Â ¸ÞÀÏÀ» Ç¥½Ã ÇØÁ¦: "
+msgstr "일치하는 메일을 표시 해제: "
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "¸ÞÀÏÀ» ¾÷·Îµå ÇÏ´Â Áß..."
+msgstr "메일을 업로드 하는 중..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "´Ù½Ã ¾²±â¸¦ °¡´ÉÇÏ°Ô ÇÏ·Á¸é 'toggle-write'¸¦ »ç¿ëÇϼ¼¿ä!"
+msgstr "다시 쓰기를 가능하게 하려면 'toggle-write'를 사용하세요!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "keyID = \"%s\"¸¦ %s¿¡ »ç¿ëÇÒ±î¿ä?"
+msgstr "keyID = \"%s\"를 %s에 사용할까요?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "À̸§ ¹Ù²Ù±â (%s): "
+msgstr "이름 바꾸기 (%s): "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "À߸øµÈ ´Þ ÀÔ·Â: %s"
+msgstr "잘못된 달 입력: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "À߸øµÈ ´Þ ÀÔ·Â: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "잘못된 달 입력: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "PGP ¼­¸íÀ» È®ÀÎÇÒ±î¿ä?"
+msgstr "PGP 서명을 확인할까요?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "¸ÞÀÏ À妽º¸¦ È®ÀÎÁß..."
-
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "÷ºÎ¹°º¸±â"
+msgstr "메일 인덱스를 확인중..."
 
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "ÁÖÀÇ! %s¸¦ µ¤¾î ¾º¿ó´Ï´Ù, °è¼ÓÇÒ±î¿ä?"
+msgstr "주의! %s를 덮어 씌웁니다, 계속할까요?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2972,29 +2767,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¸¸±âµÊ"
+msgstr "서버 인증서가 만기됨"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¸¸±âµÊ"
+msgstr "서버 인증서가 만기됨"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¾ÆÁ÷ À¯È¿ÇÏÁö ¾ÊÀ½ "
+msgstr "서버 인증서가 아직 유효하지 않음 "
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¾ÆÁ÷ À¯È¿ÇÏÁö ¾ÊÀ½ "
+msgstr "서버 인증서가 아직 유효하지 않음 "
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3009,35 +2804,35 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "fcntl Àá±ÝÀ» ±â´Ù¸®´Â Áß... %d"
+msgstr "fcntl 잠금을 기다리는 중... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "flock ½Ãµµ¸¦ ±â´Ù¸®´Â Áß... %d"
+msgstr "flock 시도를 기다리는 중... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "ÀÀ´äÀ» ±â´Ù¸®´Â Áß..."
+msgstr "응답을 기다리는 중..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "°æ°í: '%s' À߸øµÈ IDN."
+msgstr "경고: '%s' 잘못된 IDN."
 
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "¼­¹ö ÀÎÁõ¼­°¡ ¸¸±âµÊ"
+msgstr "서버 인증서가 만기됨"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "°æ°í: À߸øµÈ IDN '%s' ¾Ë¸®¾Æ½º '%s'.\n"
+msgstr "경고: 잘못된 IDN '%s' 알리아스 '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "°æ°í: ÀÎÁõ¼­¸¦ ÀúÀåÇÏÁö ¸øÇÔ"
+msgstr "경고: 인증서를 저장하지 못함"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
@@ -3055,471 +2850,629 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "¿©±â¿¡ ÀÖ´Â °ÍµéÀº ÷ºÎ °úÁ¤¿¡¼­ ½ÇÆÐÇÑ °ÍµéÀÔ´Ï´Ù."
+msgstr "여기에 있는 것들은 첨부 과정에서 실패한 것들입니다."
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "¾²±â ½ÇÆÐ! ¸ÞÀÏÇÔÀÇ ÀϺΰ¡ %s¿¡ ÀúÀåµÇ¾úÀ½"
+msgstr "쓰기 실패! 메일함의 일부가 %s에 저장되었음"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "¾²±â ½ÇÆÐ!"
+msgstr "쓰기 실패!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "¸ÞÀÏÇÔ¿¡ ¸ÞÀÏ ¾²±â"
+msgstr "메일함에 메일 쓰기"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "%s ¾²´Â Áß..."
+msgstr "%s 쓰는 중..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "%s¿¡ ¸ÞÀÏ ¾²´ÂÁß..."
+msgstr "%s에 메일 쓰는중..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "¸ÞÀÏ ¾²´Â Áß... %d (%d%%)"
+msgstr "메일 쓰는 중... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "¸í·É¾î ¿À·ù: %s\n"
+msgstr "명령어 오류: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "°°Àº À̸§ÀÇ º°ÄªÀÌ ÀÌ¹Ì ÀÖÀ½!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "ÀÌ¹Ì Ã¹¹ø° üÀÎÀ» ¼±ÅÃÇßÀ½."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "ÀÌ¹Ì ¸¶Áö¸· üÀÎÀ» ¼±ÅÃÇßÀ½."
+msgstr "같은 이름의 별칭이 이미 있음!"
 
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "ù¹ø° Ç׸ñ¿¡ À§Ä¡ÇÏ°í ÀÖ½À´Ï´Ù."
+msgstr "첫번째 항목에 위치하고 있습니다."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "ù¹ø° ÆäÀÌÁöÀÔ´Ï´Ù."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "ù¹ø° ¸Þ¼¼ÁöÀÔ´Ï´Ù."
+msgstr "첫번째 메세지입니다."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "ù¹ø° ÆäÀÌÁöÀÔ´Ï´Ù."
+msgstr "첫번째 페이지입니다."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "óÀ½ ±ÛŸ·¡ÀÔ´Ï´Ù."
+msgstr "처음 글타래입니다."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "¸¶Áö¸· Ç׸ñ¿¡ À§Ä¡ÇÏ°í ÀÖ½À´Ï´Ù."
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "¸¶Áö¸· ÆäÀÌÁöÀÔ´Ï´Ù."
+msgstr "마지막 항목에 위치하고 있습니다."
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "¸¶Áö¸· ¸Þ¼¼ÁöÀÔ´Ï´Ù."
+msgstr "마지막 메세지입니다."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "¸¶Áö¸· ÆäÀÌÁöÀÔ´Ï´Ù."
+msgstr "마지막 페이지입니다."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "´õ ÀÌ»ó ³»·Á°¥ ¼ö ¾øÀ½."
+msgstr "더 이상 내려갈 수 없음."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "´õ ÀÌ»ó ¿Ã¶ó°¥ ¼ö ¾øÀ½."
+msgstr "더 이상 올라갈 수 없음."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "º°ÄªÀÌ ¾øÀ½!"
+msgstr "별칭이 없음!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "÷ºÎ¹°¸¸À» »èÁ¦ÇÒ ¼ö´Â ¾ø½À´Ï´Ù."
+msgstr "첨부물만을 삭제할 수는 없습니다."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "message/rfc822 ºÎºÐ¸¸ Àü´ÞÇÒ ¼ö ÀÖ½À´Ï´Ù."
+msgstr "message/rfc822 부분만 전달할 수 있습니다."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] Ãß°¡ÇÒ±î¿ä?"
+msgstr "[%s = %s] 추가할까요?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- '%s/%s'´Â Áö¿øµÇÁö ¾ÊÀ½ "
+msgstr "[-- '%s/%s'는 지원되지 않음 "
 
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- ÷ºÎ¹° #%d"
+msgstr "[-- 첨부물 #%d"
 
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- %sÀÇ ÀÚµ¿ º¸±â ¿À·ù --]\n"
+msgstr "[-- %s의 자동 보기 오류 --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- %s¸¦ »ç¿ëÇÑ ÀÚµ¿ º¸±â --]\n"
+msgstr "[-- %s를 사용한 자동 보기 --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP ¸ÞÀÏ ½ÃÀÛ --]\n"
+"[-- PGP 메일 시작 --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP °ø°³ ¿­¼è ºÎºÐ ½ÃÀÛ --]\n"
+msgstr "[-- PGP 공개 열쇠 부분 시작 --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP ¼­¸í ¸ÞÀÏ ½ÃÀÛ --]\n"
+"[-- PGP 서명 메일 시작 --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- %s¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½. --]\n"
+msgstr "[-- %s를 실행할 수 없음. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- PGP ¸ÞÀÏ ³¡ --]\n"
+msgstr "[-- PGP 메일 끝 --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP °ø°³ ¿­¼è ºÎºÐ ³¡--]\n"
+msgstr "[-- PGP 공개 열쇠 부분 끝--]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- PGP ¼­¸í ¸ÞÀÏ ³¡ --]\n"
+msgstr "[-- PGP 서명 메일 끝 --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- PGP/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]\n"
+msgstr "[-- PGP/MIME 암호화 자료 끝 --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- PGP/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]\n"
+msgstr "[-- PGP/MIME 암호화 자료 끝 --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- S/MIME ¾Ïȣȭ ÀÚ·á ³¡ --]\n"
+"[-- S/MIME 암호화 자료 끝 --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- S/MIME ¼­¸í ÀÚ·á ³¡ --]\n"
+"[-- S/MIME 서명 자료 끝 --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- ¼­¸í ÀÚ·áÀÇ ³¡ --]\n"
+"[-- 서명 자료의 끝 --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[-- ¿À·ù:  Multipart/Alternative ºÎºÐÀ» Ç¥½Ã ¼ö ¾øÀ½! --]\n"
+msgstr "[-- 오류:  Multipart/Alternative 부분을 표시 수 없음! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- ¿À·ù: ÀÏÄ¡ÇÏÁö ¾Ê´Â multipart/signed ±¸Á¶! --]\n"
+"[-- 오류: 일치하지 않는 multipart/signed 구조! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- ¿À·ù: ¾Ë ¼ö ¾ø´Â multipart/signed ÇÁ·ÎÅäÄÝ %s! --]\n"
+"[-- 오류: 알 수 없는 multipart/signed 프로토콜 %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ¿À·ù: Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö°¡ ¾øÀ½! --]\n"
+msgstr "[-- 오류: 임시 파일을 만들 수가 없음! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- ¿À·ù: PGP ¸ÞÀÏÀÇ ½ÃÀÛÀ» ãÀ» ¼ö ¾øÀ½! --]\n"
+"[-- 오류: PGP 메일의 시작을 찾을 수 없음! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- ¿À·ù: Àӽà ÆÄÀÏÀ» ¸¸µé ¼ö°¡ ¾øÀ½! --]\n"
+msgstr "[-- 오류: 임시 파일을 만들 수가 없음! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- ¿À·ù: À߸ø ¸¸µé¾îÁø PGP/MIME Çü½ÄÀÇ ¸ÞÀÏ! --]\n"
+"[-- 오류: 잘못 만들어진 PGP/MIME 형식의 메일! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- ¿À·ù: message/external-body¿¡ access-type º¯¼ö°¡ ¾øÀ½ --]\n"
+msgstr "[-- 오류: message/external-body에 access-type 변수가 없음 --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â PGP/MIME ¾Ïȣȭ µÇ¾úÀ½ --]\n"
+"[-- 아래의 자료는 PGP/MIME 암호화 되었음 --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â PGP/MIME ¾Ïȣȭ µÇ¾úÀ½ --]\n"
+"[-- 아래의 자료는 PGP/MIME 암호화 되었음 --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â S/MIME ¾Ïȣȭ µÇ¾úÀ½ --]\n"
+"[-- 아래의 자료는 S/MIME 암호화 되었음 --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â S/MIME ¼­¸í µÇ¾úÀ½ --]\n"
+"[-- 아래의 자료는 S/MIME 서명 되었음 --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- ¾Æ·¡ÀÇ ÀÚ·á´Â ¼­¸í µÇ¾úÀ½ --]\n"
+"[-- 아래의 자료는 서명 되었음 --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[ -- %s/%s ÷ºÎ¹° "
+msgstr "[ -- %s/%s 첨부물 "
 
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- ÀÌ %s/%s ÷ºÎ¹°Àº Æ÷ÇÔµÇÁö ¾ÊÀ½, --]\n"
+msgstr "[-- 이 %s/%s 첨부물은 포함되지 않음, --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Á¾·ù: %s/%s, ÀÎÄÚµù ¹æ½Ä: %s, Å©±â: %s --]\n"
+msgstr "[-- 종류: %s/%s, 인코딩 방식: %s, 크기: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- °æ°í: ¼­¸íÀ» ãÀ» ¼ö ¾øÀ½. --]\n"
+"[-- 경고: 서명을 찾을 수 없음. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Warning: %s/%s ¼­¸íÀ» È®ÀÎ ÇÒ ¼ö ¾øÀ½ --]\n"
+"[-- Warning: %s/%s 서명을 확인 할 수 없음 --]\n"
 "\n"
 
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- ÁöÁ¤µÈ access-type %s´Â Áö¿øµÇÁö ¾ÊÀ½ --]\n"
+msgstr "[-- 지정된 access-type %s는 지원되지 않음 --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
-msgstr "[-- ÁöÁ¤µÈ ¿ÜºÎ ¼Ò½º°¡ ¸¸±âµÊ --]\n"
+msgstr "[-- 지정된 외부 소스가 만기됨 --]\n"
 
 #: handler.c:1201
 #, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- À̸§: %s --]\n"
+msgstr "[-- 이름: %s --]\n"
 
 #: handler.c:1197
 #, c-format
 msgid "[-- on %s --]\n"
-msgstr "[-- %s¿¡ --]\n"
+msgstr "[-- %s에 --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "¸¸±âµÊ  "
+msgstr "만기됨  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "¹«È¿   "
+msgstr "무효   "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
-msgstr "Ãë¼ÒµÊ   "
+msgstr "취소됨   "
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[À߸øµÈ ³¯Â¥]"
+msgstr "[잘못된 날짜]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[°è»êÇÒ ¼ö ¾øÀ½]"
+msgstr "[계산할 수 없음]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "º°Äª: ÁÖ¼Ò ¾øÀ½"
+msgstr "별칭: 주소 없음"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "표시된 메일이 없습니다."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "표시된 메일이 없습니다."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "이 메일의 복사본을 저장할까요?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
 
-#: init.c:654
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "÷ºÎ¹° ¼³¸í ÆíÁý"
+msgstr "첨부물 설명 편집"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "÷ºÎ¹° ¼³¸í ÆíÁý"
+msgstr "첨부물 설명 편집"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: Àμö°¡ ³Ê¹« ¸¹À½"
+msgstr "bind: 인수가 너무 많음"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "디렉토리 검사중 오류."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "새 메일이 도착한 메일함 없음."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: Àμö°¡ ºÎÁ·ÇÔ"
+msgstr "color: 인수가 부족함"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "새 메일 없음"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
-msgstr "º¯È¯Áß"
+msgstr "변환중"
+
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "메일함에 메일 쓰기"
 
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "Àӽà Æú´õ¸¦ ¸¸µé ¼ö ¾øÀ½: %s"
+msgstr "임시 폴더를 만들 수 없음: %s"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "Àӽà ¸ÞÀÏ Æú´õ¸¦ »èÁ¦ ÇÒ ¼ö ¾øÀ½: %s"
+msgstr "임시 메일 폴더를 삭제 할 수 없음: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Àӽà ¸ÞÀÏ Æú´õ¸¦ ¾µ ¼ö ¾øÀ½: %s"
+msgstr "임시 메일 폴더를 쓸 수 없음: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "수신 메일함이 정의되지 않음."
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "dazn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "±âº» »ö»óµéÀÌ Áö¿øµÇÁö ¾ÊÀ½"
+msgstr "기본 색상들이 지원되지 않음"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "서버의 메일을 삭제 할까요?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "일치하는 메일을 삭제 취소: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "일치하는 메일을 삭제 취소: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "포워딩된 메일을 수정할까요?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3528,36 +3481,123 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "%s·Î º¹»ç..."
+msgstr "%s로 복사..."
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "%s ¼±Åà Áß..."
+msgstr "%s 선택 중..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "현재 첨부물은 변환할수 없음."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "첨부물 설명 편집"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "메일을 쓰지 못함"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "메세지 헤더 가져오는 중... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "포워딩된 메일을 수정할까요?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "이 메일의 복사본을 저장할까요?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "ºó ÆÐÅÏ"
+msgstr "빈 패턴"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "¾Ïȣȭ"
+msgstr "암호화"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "이 메일의 복사본을 저장할까요?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3572,36 +3612,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "Ç¥Çö½Ä ¿À·ù"
+msgstr "표현식 오류"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3611,26 +3651,82 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "ÆÐÅÏ ¿À·ù: %s"
+msgstr "패턴 오류: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "¿À·ù: ¾Ë ¼ö ¾ø´Â ÀÛµ¿ %d (¿À·ù º¸°í ¹Ù¶÷)."
+msgstr "오류: 알 수 없는 작동 %d (오류 보고 바람)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "esabif"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "esabif"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
-msgstr "exec: Àμö°¡ ¾øÀ½"
+msgstr "exec: 인수가 없음"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "%s%s에게 댓글?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "첨부물로 포워딩?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "새 메일을 확인중..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "첫번째 메세지입니다."
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -3652,133 +3748,623 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "마지막 페이지입니다."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "새 메일이 도착한 메일함 없음."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "메일함 여는중 오류"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "새 메일이 도착한 메일함 없음."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "»èÁ¦ µÇ¾úÀ½ --]\n"
+msgstr "삭제 되었음 --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbox: »èÁ¦ ½ÇÆÐ"
+msgstr "imap_sync_mailbox: 삭제 실패"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "À߸øµÈ Çì´õ Çʵå"
+msgstr "잘못된 헤더 필드"
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
 #, fuzzy
-msgid "keys matching"
-msgstr "PGP Å°°¡ <%s>¿Í ÀÏÄ¡ÇÔ."
+msgid "jump to an index number"
+msgstr "잘못된 색인 번호."
 
-#: keymap.c:789
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "이동: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "이동: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "글타래에 읽지 않은 메세지 있음."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "처음 글타래입니다."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "읽지 않은 메일 없음"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "읽지 않은 메일 없음"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "이 메일의 복사본을 저장할까요?"
+
+#: crypt.cpkg:3108
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP 키가 <%s>와 일치함."
+
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "선택한 메일을 전달한 주소: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "새 메일이 도착한 메일함 없음."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: ºó ±Û¼è ½ÃÄö½º"
+msgstr "macro: 빈 글쇠 시퀀스"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: Àμö°¡ ³Ê¹« ¸¹À½"
+msgstr "macro: 인수가 너무 많음"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "%s Çü½ÄÀ» mailcap Ç׸ñ¿¡¼­ ãÀ» ¼ö ¾øÀ½"
+msgstr "%s 형식을 mailcap 항목에서 찾을 수 없음"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): ÆÄÀÏ ½Ã°£À» ¼³Á¤ÇÒ ¼ö ¾øÀ½"
+msgstr "maildir_commit_message(): 파일 시간을 설정할 수 없음"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "¸ÞÀϵéÀÌ Àü´Þ µÇÁö ¾ÊÀ½."
+msgstr "메일들이 전달 되지 않음."
 
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "»ðÀÔ ¾î±¸°¡ ¸ÂÁö ¾ÊÀ½: %s"
+msgstr "삽입 어구가 맞지 않음: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "º¯¼ö°¡ ºüÁü"
+msgstr "변수가 빠짐"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: Àμö°¡ ºÎÁ·ÇÔ"
+msgstr "mono: 인수가 부족함"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "첫번째 항목에 위치하고 있습니다."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "첫번째 메세지입니다."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "마지막 항목에 위치하고 있습니다."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "마지막 메세지입니다."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "마지막 항목에 위치하고 있습니다."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "마지막 페이지입니다."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "삭제 취소된 메일 없음."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "첫번째 항목에 위치하고 있습니다."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "첫번째 페이지입니다."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "삭제 취소된 메일 없음."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "첫번째 페이지입니다."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "´ÙÁß ÆÄÆ® ¸ÞÀÏ¿¡ °æ°è º¯¼ö°¡ ¾øÀ½!"
+msgstr "다중 파트 메일에 경계 변수가 없음!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "no"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(¸ÞÀÏÇÔ ¾øÀ½)"
+msgstr "(메일함 없음)"
 
 #: commands.c:788
 msgid "not converting"
-msgstr "º¯È¯ÇÏÁö ¾ÊÀ½"
+msgstr "변환하지 않음"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "°ø¹é ±Û¼è ½ÃÄö½º"
+msgstr "공백 글쇠 시퀀스"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "oac"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "읽기 전용으로 메일함 열기"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "읽기 전용으로 메일함 열기"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "메일함을 다시 여는 중..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "%s에게 메일 전달"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "À߸øµÈ Á¢µÎ»ç"
+msgstr "잘못된 접두사"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "첫번째 항목에 위치하고 있습니다."
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: Àμö°¡ ³Ê¹« ¸¹À½"
+msgstr "push: 인수가 너무 많음"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "발송 연기된 메일을 다시 부를까요?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "글타래에 읽지 않은 메세지 있음."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "POP 서버의 메일을 수정할 수 없음."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: 파일을 첨부할 수 없음"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "이동: "
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "서버의 메일을 삭제 할까요?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ro"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "roa"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "저장%s 메일함으로"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "저장%s 메일함으로"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "POP 서버의 메일을 수정할 수 없음."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "표현식 오류"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "찾아보기: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "메일을 보낼 수 없음."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "첨부물로 포워딩?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "패턴과 일치하는 메일: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "더 이상의 인용문 없음."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "메일을 프린트 할까요?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "폴더에 메일이 없음."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source: %s¿¡ ¿À·ù"
+msgstr "source: %s에 오류"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
-msgstr "source: %s¿¡ ¿À·ù"
+msgstr "source: %s에 오류"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: %s¿¡ ¿À·ù°¡ ¸¹À¸¹Ç·Î Àбâ Ãë¼Ò"
+msgstr "source: %s에 오류가 많으므로 읽기 취소"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "파일 매스크와 일치하는 파일 없음."
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "sync: mbox°¡ ¼öÁ¤µÇ¾úÀ¸³ª, ¼öÁ¤µÈ ¸ÞÀÏ´Â ¾øÀ½! (¹ö±× º¸°í ¹Ù¶÷)"
+msgstr "sync: mbox가 수정되었으나, 수정된 메일는 없음! (버그 보고 바람)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "일치하는 메일을 표시 해제: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "처음 글타래입니다."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3790,41 +4376,130 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "더 이상의 인용문 없음."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "저장은 텍스트 첨부물에만 적용됨."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "패턴을 찾을 수 없음."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "읽지 않은 메일 없음"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "Àμö°¡ ºÎÁ·ÇÔ"
+msgstr "인수가 부족함"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "Àμö°¡ ³Ê¹« ¸¹À½"
+msgstr "인수가 너무 많음"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "÷ºÎ¹° ¼³¸í ÆíÁý"
+msgstr "첨부물 설명 편집"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "일치하는 메일을 삭제 취소: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "일치하는 메일을 삭제 취소: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "일치하는 메일을 삭제 취소: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: %s¸¦ %s¿¡¼­ Áö¿ï ¼ö ¾øÀ½."
+msgstr "unhook: %s를 %s에서 지울 수 없음."
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: unhook * ÇÒ ¼ö ¾øÀ½."
+msgstr "unhook: unhook * 할 수 없음."
 
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: ¾Ë ¼ö ¾ø´Â hook À¯Çü: %s"
+msgstr "unhook: 알 수 없는 hook 유형: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù"
+msgstr "알 수 없는 오류"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "일치하는 메일을 표시 해제: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "첨부물 설명 편집"
 
 #: main.c:82
 msgid ""
@@ -3837,12 +4512,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "À߸øµÈ º¯¼ö°ª"
+msgstr "잘못된 변수값"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "첨부물 저장됨."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "새 파일: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "메일함에 메일 쓰기"
 
-#: lib-ui/curs_lib.c:155
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "yes"
 
@@ -3850,3 +4556,6 @@ msgstr "yes"
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/lt.po b/po/lt.po
index 9dd17c2..ca4465b 100644 (file)
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.3.12i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2000-11-29 21:22+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-13\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Bendri susiejimai:\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -34,14 +34,14 @@ msgstr ""
 "\n"
 "Nesusietos funkcijos:\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Pasiraðytø duomenø pabaiga --]\n"
+"[-- Pasirašytų duomenų pabaiga --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -75,38 +75,38 @@ msgstr ""
 "       mutt -v[v]\n"
 "\n"
 "parinktys:\n"
-"  -a <byla>\tprisegti bylà prie laiðko\n"
-"  -b <adresas>\tnurodyti blind carbon-copy (BCC) adresà\n"
-"  -c <adresas>\tnurodyti carbon-copy (CC) adresà\n"
-"  -e <komanda>\tnurodyti komandà, kurià ávykdyti po inicializacijos\n"
-"  -f <byla>\tnurodyti, kurià dëþutæ perskaityti\n"
-"  -F <byla>\tnurodyti alternatyvià muttrc bylà\n"
-"  -H <byla>\tnurodyti juodraðèio bylà, ið kurios skaityti antraðtæ\n"
-"  -i <byla>\tnurodyti bylà, kurià Mutt turëtø átraukti á atsakymà\n"
-"  -m <tipas>\tnurodyti áprastà dëþutës tipà\n"
-"  -n\t\tpriverèia Mutt neskaityti sistemos Muttrc\n"
-"  -p\t\ttæsti atidëtà laiðkà\n"
-"  -R\t\tatidaryti dëþutæ tik skaitymo reþime\n"
-"  -s <tema>\tnurodyti temà (turi bûti kabutëse, jei yra tarpø)\n"
-"  -v\t\trodyti versijà ir kompiliavimo apibrëþimus\n"
-"  -x\t\tsimuliuoti mailx siuntimo bûdà\n"
-"  -y\t\tpasirinkti dëþutæ, nurodytà tavo 'mailboxes' sàraðe\n"
-"  -z\t\tiðkart iðeiti, jei dëþutëje nëra laiðkø\n"
-"  -Z\t\tatidaryti pirmà aplankà su naujais laiðkais, iðkart iðeiti, jei "
-"nëra\n"
-"  -h\t\tði pagalbos þinutë"
-
-#: compose.c:152 compose.c:156
+"  -a <byla>\tprisegti bylą prie laiško\n"
+"  -b <adresas>\tnurodyti blind carbon-copy (BCC) adresą\n"
+"  -c <adresas>\tnurodyti carbon-copy (CC) adresą\n"
+"  -e <komanda>\tnurodyti komandą, kurią įvykdyti po inicializacijos\n"
+"  -f <byla>\tnurodyti, kurią dėžutę perskaityti\n"
+"  -F <byla>\tnurodyti alternatyvią muttrc bylą\n"
+"  -H <byla>\tnurodyti juodraščio bylą, iš kurios skaityti antraštę\n"
+"  -i <byla>\tnurodyti bylą, kurią Mutt turėtų įtraukti į atsakymą\n"
+"  -m <tipas>\tnurodyti įprastą dėžutės tipą\n"
+"  -n\t\tpriverčia Mutt neskaityti sistemos Muttrc\n"
+"  -p\t\ttęsti atidėtą laišką\n"
+"  -R\t\tatidaryti dėžutę tik skaitymo režime\n"
+"  -s <tema>\tnurodyti temą (turi būti kabutėse, jei yra tarpų)\n"
+"  -v\t\trodyti versiją ir kompiliavimo apibrėžimus\n"
+"  -x\t\tsimuliuoti mailx siuntimo būdą\n"
+"  -y\t\tpasirinkti dėžutę, nurodytą tavo 'mailboxes' sąraše\n"
+"  -z\t\tiškart išeiti, jei dėžutėje nėra laiškų\n"
+"  -Z\t\tatidaryti pirmą aplanką su naujais laiškais, iškart išeiti, jei "
+"nėra\n"
+"  -h\t\tši pagalbos žinutė"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " pasiraðyti kaip: "
+msgstr " pasirašyti kaip: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "    iki %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "    nuo %s"
@@ -149,35 +149,35 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr "('?' parodo sàraðà): "
+msgstr "('?' parodo sąrašą): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
-msgstr "(tæsti)\n"
+msgstr "(tęsti)\n"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr "Spausk '%s', kad perjungtum raðymà"
+msgstr "Spausk '%s', kad perjungtum rašymą"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " ðiame apribotame vaizde"
+msgstr " šiame apribotame vaizde"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " paþymëtus"
+msgstr " pažymėtus"
 
 #: pattern.c:716
 #, c-format
@@ -187,44 +187,44 @@ msgstr "%c: bloga komanda"
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: nepalaikomas ðiame reþime"
+msgstr "%c: nepalaikomas šiame režime"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d palikti, %d iðtrinti."
+msgstr "%d palikti, %d ištrinti."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d palikti, %d perkelti, %d iðtrinti."
+msgstr "%d palikti, %d perkelti, %d ištrinti."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s [%s]\n"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s [%s]\n"
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, fuzzy, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Ar tikrai nori já naudoti?"
+msgstr "%s Ar tikrai nori jį naudoti?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] pasikeitë. Atnaujinti koduotæ?"
+msgstr "%s [#%d] pasikeitė. Atnaujinti koduotę?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] nebeegzistuoja!"
@@ -232,12 +232,12 @@ msgstr "%s [#%d] nebeegzistuoja!"
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d ið %d laiðkø perskaityti]"
+msgstr "%s [%d iš %d laiškų perskaityti]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s neegzistuoja. Sukurti jà?"
+msgstr "%s neegzistuoja. Sukurti ją?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
@@ -249,35 +249,35 @@ msgstr ""
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr ""
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s nëra katalogas."
+msgstr "%s nėra katalogas."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s nëra paðto dëþutë!"
+msgstr "%s nėra pašto dėžutė!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s nëra paðto dëþutë."
+msgstr "%s nėra pašto dėžutė."
 
 #: sendlib.c:748
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
-msgstr "%s nëra paðto dëþutë."
+msgstr "%s nėra pašto dėžutė."
 
 #: sendlib.c:372
 #, c-format
@@ -296,142 +296,142 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
-msgstr "%s: neþinomas tipas"
+msgstr "%s: nežinomas tipas"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s: spalva nepalaikoma terminalo"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s: komanda teisinga tik indekso objektams"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: tokio atributo nëra"
+msgstr "%s: tokio atributo nėra"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: nëra tokios spalvos"
+msgstr "%s: nėra tokios spalvos"
 
-#: keymap.c:847
+#: keymap.c:839
 #, fuzzy, c-format
 msgid "%s: no such function"
-msgstr "%s: èia nëra tokios funkcijos"
+msgstr "%s: čia nėra tokios funkcijos"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: èia nëra tokios funkcijos"
+msgstr "%s: čia nėra tokios funkcijos"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: nëra tokio meniu"
+msgstr "%s: nėra tokio meniu"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s: nëra tokio objekto"
+msgstr "%s: nėra tokio objekto"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: per maþai argumentø"
+msgstr "%s: per mažai argumentų"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: negalëjau prisegti bylos"
+msgstr "%s: negalėjau prisegti bylos"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: negaliu prisegti bylos.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: neþinoma komanda"
+msgstr "%s: nežinoma komanda"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: neþinomas tipas"
+msgstr "%s: nežinomas tipas"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: neþinomas kintamasis"
+msgstr "%s: nežinomas kintamasis"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
 msgstr ""
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr ""
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "('view-attachments' turi bûti susietas su klaviðu!)"
+msgstr "('view-attachments' turi būti susietas su klavišu!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(nëra dëþutës)"
+msgstr "(nėra dėžutės)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(a)tmesti, (p)riimti ðákart"
+msgstr "(a)tmesti, (p)riimti šįkart"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(a)tmesti, (p)riimti ðákart, (v)isada priimti"
+msgstr "(a)tmesti, (p)riimti šįkart, (v)isada priimti"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(dydis %s baitø)"
+msgstr "(dydis %s baitų)"
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(naudok '%s' ðiai daliai perþiûrëti)"
+msgstr "(naudok '%s' šiai daliai peržiūrėti)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Priedai"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<NEÞINOMAS>"
+msgstr "<NEŽINOMAS>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<áprastas>"
+msgstr "<įprastas>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -445,35 +445,31 @@ msgstr ""
 msgid "APOP authentication failed."
 msgstr "APOP autentikacija nepavyko."
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Nutraukti"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Nutraukti nepakeistà laiðkà?"
+msgstr "Nutraukti nepakeistą laišką?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Nutrauktas nepakeistas laiðkas."
+msgstr "Nutrauktas nepakeistas laiškas."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adresas:"
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Aliasas ádëtas."
+msgstr "Aliasas įdėtas."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Aliase kaip:"
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Aliasai"
 
@@ -481,64 +477,60 @@ msgstr "Aliasai"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Ðis raktas negali bûti naudojamas: jis pasenæs/uþdraustas/atðauktas."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Pridurti"
+msgstr "Šis raktas negali būti naudojamas: jis pasenęs/uždraustas/atšauktas."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Pridurti laiðkus prie %s?"
+msgstr "Pridurti laiškus prie %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Argumentas turi bûti laiðko numeris."
+msgstr "Argumentas turi būti laiško numeris."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "Priedas iðsaugotas."
+msgstr "Priedas išsaugotas."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "Prisegti bylà"
+msgstr "Prisegti bylą"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Prisegu parinktas bylas..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Priedas perfiltruotas."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "Priedas iðsaugotas."
+msgstr "Priedas išsaugotas."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Priedai"
 
@@ -569,12 +561,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -587,31 +579,31 @@ msgstr ""
 #: imap/imap.c:1342
 #, fuzzy
 msgid "Bad mailbox name"
-msgstr "Sukurti dëþutæ: "
+msgstr "Sukurti dėžutę: "
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "Rodoma laiðko apaèia."
+msgstr "Rodoma laiško apačia."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Nukreipti laiðkà á %s"
+msgstr "Nukreipti laišką į %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Nukreipti laiðkà kam: "
+msgstr "Nukreipti laišką kam: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Nukreipti laiðkus á %s"
+msgstr "Nukreipti laiškus į %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Nukreipti paþymëtus laiðkus kam: "
+msgstr "Nukreipti pažymėtus laiškus kam: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -627,18 +619,18 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Negaliu pridurti laiðko prie aplanko: %s"
+msgstr "Negaliu pridurti laiško prie aplanko: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "Negaliu prisegti katalogo!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Negaliu sukurti %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Negaliu sukurti bylos %s"
@@ -652,40 +644,40 @@ msgstr "Negaliu sukurti filtro"
 msgid "Can't create filter process"
 msgstr "Negaliu sukurti filtro"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "Negaliu sukurti laikinos bylos"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Negaliu dekoduoti visø paþymëtø priedø.  Enkapsuliuoti kitus MIME formatu?"
+"Negaliu dekoduoti visų pažymėtų priedų.  Enkapsuliuoti kitus MIME formatu?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr "Negaliu dekoduoti visø paþymëtø priedø.  Persiøsti kitus MIME formatu?"
+msgstr "Negaliu dekoduoti visų pažymėtų priedų.  Persiųsti kitus MIME formatu?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
-msgstr "Negaliu rasti në vieno paþymëto laiðko."
+msgstr "Negaliu rasti nė vieno pažymėto laiško."
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "Negaliu iðtrinti priedo ið POP serverio."
+msgstr "Negaliu ištrinti priedo iš POP serverio."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "Negaliu iðtrinti priedo ið POP serverio."
+msgstr "Negaliu ištrinti priedo iš POP serverio."
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Negaliu taðku uþrakinti %s.\n"
+msgstr "Negaliu tašku užrakinti %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -693,89 +685,85 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Negaliu rasti në vieno paþymëto laiðko."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Negaliu gauti mixmaster'io type2.list!"
+msgstr "Negaliu rasti nė vieno pažymėto laiško."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Negaliu rasti tinkanèio vardo, tæsti?"
+msgstr "Negaliu rasti tinkančio vardo, tęsti?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Negaliu atidaryti laiðko bylos: %s"
+msgstr "Negaliu atidaryti laiško bylos: %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Negaliu pridurti laiðko prie aplanko: %s"
+msgstr "Negaliu pridurti laiško prie aplanko: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "Jungiuosi prie %s..."
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Uþdarau jungtá su POP serveriu..."
+msgstr "Uždarau jungtį su POP serveriu..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "Negalëjau stat'inti: %s"
+msgstr "Negalėjau stat'inti: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "Negaliu sukurti %s: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Negaliu iðsaugoti laiðko á POP dëþutæ."
+msgstr "Negaliu išsaugoti laiško į POP dėžutę."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Negaliu taisyti laiðko POP serveryje."
+msgstr "Negaliu taisyti laiško POP serveryje."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
-msgstr "Negalëjau stat'inti: %s"
+msgstr "Negalėjau stat'inti: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Negaliu þiûrëti katalogo"
+msgstr "Negaliu žiūrėti katalogo"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "Negaliu sukurti %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Negaliu áraðyti antraðtës á laikinà bylà!"
+msgstr "Negaliu įrašyti antraštės į laikiną bylą!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Negaliu áraðyti laiðko"
+msgstr "Negaliu įrašyti laiško"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Negaliu áraðyti laiðko á laikinà bylà!"
+msgstr "Negaliu įrašyti laiško į laikiną bylą!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
@@ -785,42 +773,38 @@ msgstr "Negaliu sukurti ekrano filtro"
 msgid "Cannot create filter"
 msgstr "Negaliu sukurti filtro"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Negaliu perjungti tik skaitomos dëþutës raðomumo!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Negaliu perjungti tik skaitomos dėžutės rašomumo!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "Sugavau %s...  Iðeinu.\n"
+msgstr "Sugavau %s...  Išeinu.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "Serverio sertifikatas dar negalioja"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "Sertifikatas iðsaugotas"
+msgstr "Sertifikatas išsaugotas"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Aplanko pakeitimai bus áraðyti iðeinant ið aplanko."
+msgstr "Aplanko pakeitimai bus įrašyti išeinant iš aplanko."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Aplanko pakeitimai nebus áraðyti."
+msgstr "Aplanko pakeitimai nebus įrašyti."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -828,56 +812,48 @@ msgstr ""
 #: commands.c:786
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Character set pakeistas á %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Pereiti"
+msgstr "Character set pakeistas į %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "Pereiti á katalogà: "
+msgstr "Pereiti į katalogą: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "Tikrinu, ar yra naujø laiðkø..."
-
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Tikrinti raktà  "
+msgstr "Tikrinu, ar yra naujų laiškų..."
 
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "Tikrinu, ar yra naujø laiðkø..."
+msgstr "Tikrinu, ar yra naujų laiškų..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "Tikrinu, ar yra naujø laiðkø..."
+msgstr "Tikrinu, ar yra naujų laiškų..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "Iðvalyti"
+msgstr "Išvalyti"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Iðvalyti flagà"
+msgstr "Išvalyti flagą"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Uþdarau jungtá su %s..."
+msgstr "Uždarau jungtį su %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "Uþdarau jungtá su POP serveriu..."
+msgstr "Uždarau jungtį su POP serveriu..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Jungiuosi prie %s..."
@@ -895,9 +871,9 @@ msgstr "Serveris nepalaiko komandos UIDL."
 #: lib-mx/mbox.c:547
 #, fuzzy
 msgid "Committing changes..."
-msgstr "Kompiliuoju paieðkos pattern'à..."
+msgstr "Kompiliuoju paieškos pattern'ą..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -906,24 +882,24 @@ msgstr ""
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Kompiliuoju paieðkos pattern'à..."
+msgstr "Kompiliuoju paieškos pattern'ą..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "Kopijuoju á %s..."
+msgstr "Kopijuoju į %s..."
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "Kopijuoju á %s..."
+msgstr "Kopijuoju į %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Jungiuosi prie %s..."
@@ -941,18 +917,18 @@ msgstr "Jungiuosi prie %s..."
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Jungtis prarasta. Vël prisijungti prie POP serverio?"
+msgstr "Jungtis prarasta. Vėl prisijungti prie POP serverio?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Jungtis prarasta. Vël prisijungti prie POP serverio?"
+msgstr "Jungtis prarasta. Vėl prisijungti prie POP serverio?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, fuzzy, c-format
 msgid "Connection to %s closed"
 msgstr "Jungiuosi prie %s..."
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "Jungiuosi prie %s..."
@@ -960,15 +936,15 @@ msgstr "Jungiuosi prie %s..."
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Content-Type pakeistas á %s."
+msgstr "Content-Type pakeistas į %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-Type pavidalas yra rûðis/porûðis"
+msgstr "Content-Type pavidalas yra rūšis/porūšis"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "Tæsti?"
+msgstr "Tęsti?"
 
 #: commands.c:772
 #, c-format
@@ -978,22 +954,22 @@ msgstr ""
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
-msgstr "%s%s á dëþutæ"
+msgstr "%s%s į dėžutę"
 
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "Kopijuoju %d laiðkus á %s..."
+msgstr "Kopijuoju %d laiškus į %s..."
 
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "Kopijuoju laiðkà %d á %s..."
+msgstr "Kopijuoju laišką %d į %s..."
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "Kopijuoju á %s..."
+msgstr "Kopijuoju į %s..."
 
 #: main.c:63
 msgid ""
@@ -1009,15 +985,15 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Negalëjau prisijungti prie %s (%s)."
+msgstr "Negalėjau prisijungti prie %s (%s)."
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "Negalëjau kopijuoti laiðko"
+msgstr "Negalėjau kopijuoti laiško"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
 msgstr "Negaliu sukurti laikinos bylos!"
@@ -1028,16 +1004,16 @@ msgstr "Negaliu sukurti laikinos bylos!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Negalëjau rasti rikiavimo funkcijos! [praneðk ðià klaidà]"
+msgstr "Negalėjau rasti rikiavimo funkcijos! [pranešk šią klaidą]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Negalëjau rasti hosto \"%s\""
+msgstr "Negalėjau rasti hosto \"%s\""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Negalëjau átraukti visø praðytø laiðkø!"
+msgstr "Negalėjau įtraukti visų prašytų laiškų!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
@@ -1046,43 +1022,43 @@ msgstr ""
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "Negalëjau atidaryti %s"
+msgstr "Negalėjau atidaryti %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Negaliu vël atidaryti dëþutës!"
+msgstr "Negaliu vėl atidaryti dėžutės!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Negalëjau iðsiøsti laiðko."
+msgstr "Negalėjau išsiųsti laiško."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Nepavyko uþrakinti %s\n"
+msgstr "Nepavyko užrakinti %s\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
 msgstr "Sukurti %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Kol kas sukurti gali tik IMAP paðto dëþutes"
+msgstr "Kol kas sukurti gali tik IMAP pašto dėžutes"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Sukurti dëþutæ: "
+msgstr "Sukurti dėžutę: "
 
 #: commands.c:597
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "%s%s á dëþutæ"
+msgstr "%s%s į dėžutę"
 
 #: commands.c:596
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "%s%s á dëþutæ"
+msgstr "%s%s į dėžutę"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
@@ -1092,58 +1068,45 @@ msgstr "Parenku %s..."
 #: commands.c:599
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "%s%s á dëþutæ"
+msgstr "%s%s į dėžutę"
 
 #: commands.c:598
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "%s%s á dëþutæ"
+msgstr "%s%s į dėžutę"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
-msgstr "Paimu laiðkà..."
+msgstr "Paimu laišką..."
 
-#: postpone.c:517
+#: postpone.c:482
 #, fuzzy
 msgid "Decryption failed."
 msgstr "Nepavyko pasisveikinti."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Trint"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Trinti"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Kol kas iðtrinti gali tik IMAP paðto dëþutes"
+msgstr "Kol kas ištrinti gali tik IMAP pašto dėžutes"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "Iðtrinti laiðkus ið serverio?"
+msgstr "Ištrinti laiškus iš serverio?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "Iðtrinti laiðkus, tenkinanèius: "
+msgstr "Ištrinti laiškus, tenkinančius: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Trinti"
 
-#: recvattach.c:993
+#: recvattach.c:981
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "PGP laiðkø priedø iðtrynimas nepalaikomas."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Aprað"
+msgstr "PGP laiškų priedų ištrynimas nepalaikomas."
 
 #: lib-lua/madmutt.cpkg:106
 #, c-format
@@ -1153,73 +1116,73 @@ msgstr ""
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s neegzistuoja. Sukurti jà?"
+msgstr "%s neegzistuoja. Sukurti ją?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Katalogas [%s], Bylø kaukë: %s"
+msgstr "Katalogas [%s], Bylų kaukė: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "KLAIDA: praðau praneðti ðià klaidà"
+msgstr "KLAIDA: prašau pranešti šią klaidą"
 
-#: send.c:1387
+#: send.c:1381
 #, fuzzy
 msgid "Edit forwarded message?"
-msgstr "Paruoðiu persiunèiamà laiðkà..."
+msgstr "Paruošiu persiunčiamą laišką..."
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "klaida iðraiðkoje"
+msgstr "klaida išraiškoje"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Uþðifruoti"
+msgstr "Užšifruoti"
 
-#: compose.c:163
+#: compose.c:135
 #, fuzzy
 msgid "Encrypt with: "
-msgstr "Uþðifruoti"
+msgstr "Užšifruoti"
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "Ávesk rakto ID, skirtà %s: "
+msgstr "Įvesk rakto ID, skirtą %s: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "Ávesk rakto ID, skirtà %s: "
+msgstr "Įvesk rakto ID, skirtą %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
-msgstr "Ávesk rakto ID, skirtà %s: "
+msgstr "Įvesk rakto ID, skirtą %s: "
 
 #: recvcmd.c:198
 #, fuzzy
 msgid "Error bouncing message!"
-msgstr "Klaida siunèiant laiðkà."
+msgstr "Klaida siunčiant laišką."
 
 #: recvcmd.c:199
 #, fuzzy
 msgid "Error bouncing messages!"
-msgstr "Klaida siunèiant laiðkà."
+msgstr "Klaida siunčiant laišką."
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "Klaida siunèiant laiðkà."
+msgstr "Klaida siunčiant laišką."
 
 #: pop.c:142
 #, c-format
@@ -1231,7 +1194,7 @@ msgstr "Klaida jungiantis prie IMAP serverio: %s"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Klaida jungiantis prie IMAP serverio: %s"
@@ -1240,104 +1203,89 @@ msgstr "Klaida jungiantis prie IMAP serverio: %s"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "Klaida %s, eilutë %d: %s"
+msgstr "Klaida %s, eilutė %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Klaida komandinëje eilutëje: %s\n"
+msgstr "Klaida komandinėje eilutėje: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "Klaida iðraiðkoje: %s"
+msgstr "Klaida išraiškoje: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "Klaida inicializuojant terminalà."
+msgstr "Klaida inicializuojant terminalą."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "Klaida inicializuojant terminalà."
+msgstr "Klaida inicializuojant terminalą."
 
 #: imap/imap.c:620
 #, fuzzy
 msgid "Error opening mailbox"
-msgstr "Klaida raðant á paðto dëþutæ!"
+msgstr "Klaida rašant į pašto dėžutę!"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "Klaida nagrinëjant adresà!"
+msgstr "Klaida nagrinėjant adresą!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Klaida vykdant \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Klaida skaitant katalogà."
+msgstr "Klaida skaitant katalogą."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Klaida siunèiant laiðkà, klaidos kodas %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Klaida siunèiant laiðkà, klaidos kodas %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Klaida siunèiant laiðkà."
+msgstr "Klaida siunčiant laišką, klaidos kodas %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Klaida jungiantis prie IMAP serverio: %s"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "Klaida bandant þiûrëti bylà"
+msgstr "Klaida bandant žiūrėti bylą"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "Klaida raðant á paðto dëþutæ!"
+msgstr "Klaida rašant į pašto dėžutę!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Klaida. Iðsaugau laikinà bylà: %s"
+msgstr "Klaida. Išsaugau laikiną bylą: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr ""
-"Klaida: %s negali bûti naudojamas kaip galutinis persiuntëjas grandinëje."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1354,38 +1302,29 @@ msgstr "Klaida: multipart/signed neturi protokolo."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Klaida komandinëje eilutëje: %s\n"
+msgstr "Klaida komandinėje eilutėje: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Paimu laiðkø antraðtes... [%d/%d]"
+msgstr "Paimu laiškų antraštes... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Vykdau komandà tinkantiems laiðkams..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Iðeit"
+msgstr "Vykdau komandą tinkantiems laiškams..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Iðeiti  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Iðeiti ið Mutt neiðsaugojus pakeitimø?"
+msgstr "Išeiti iš Mutt neišsaugojus pakeitimų?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Iðeiti ið Mutt?"
+msgstr "Išeiti iš Mutt?"
 
 #: imap/imap.c:898
 #, fuzzy
@@ -1394,69 +1333,69 @@ msgstr "Nepavyko pasisveikinti."
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Iðtuðtinu laiðkus ið serverio..."
+msgstr "Ištuštinu laiškus iš serverio..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Nepavyko atidaryti bylos antraðtëms nuskaityti."
+msgstr "Nepavyko atidaryti bylos antraštėms nuskaityti."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Nepavyko atidaryti bylos antraðtëms iðmesti."
+msgstr "Nepavyko atidaryti bylos antraštėms išmesti."
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Nepavyko atidaryti bylos antraðtëms nuskaityti."
+msgstr "Nepavyko atidaryti bylos antraštėms nuskaityti."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Baisi klaida!  Negaliu vël atidaryti dëþutës!"
+msgstr "Baisi klaida!  Negaliu vėl atidaryti dėžutės!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Mirtina klaida.  Nesutampa laiðkø skaièius!"
+msgstr "Mirtina klaida.  Nesutampa laiškų skaičius!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "Iðtuðtinu laiðkus ið serverio..."
+msgstr "Ištuštinu laiškus iš serverio..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "Paimu laiðkà..."
+msgstr "Paimu laišką..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Paimu laiðkø sàraðà..."
+msgstr "Paimu laiškų sąrašą..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "Paimu laiðkø sàraðà..."
+msgstr "Paimu laiškų sąrašą..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Paimu laiðkø antraðtes... [%d/%d]"
+msgstr "Paimu laiškų antraštes... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Paimu laiðkø antraðtes... [%d/%d]"
+msgstr "Paimu laiškų antraštes... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "Paimu laiðkà..."
+msgstr "Paimu laišką..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Bylø kaukë:"
+msgstr "Bylų kaukė:"
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Byla egzistuoja, (u)þraðyti, (p)ridurti, arba (n)utraukti?"
+msgstr "Byla egzistuoja, (u)žrašyti, (p)ridurti, arba (n)utraukti?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
@@ -1471,265 +1410,241 @@ msgstr "Byla yra katalogas, saugoti joje?"
 msgid "File under directory: "
 msgstr "Byla kataloge: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filtruoti per: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
-msgstr "Pirðtø antspaudas: %s"
+msgstr "Pirštų antspaudas: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "iðsaugoti ðá laiðkà vëlesniam siuntimui"
+msgstr "išsaugoti šį laišką vėlesniam siuntimui"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "Pratæsti-á %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Pratæsti-á %s%s?"
+msgstr "Pratęsti-į %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Persiøsti MIME enkapsuliuotà?"
+msgstr "Persiųsti MIME enkapsuliuotą?"
 
-#: send.c:828
+#: send.c:826
 #, fuzzy
 msgid "Forward as attachment?"
-msgstr "Spausdinti priedà?"
+msgstr "Spausdinti priedą?"
 
 #: recvcmd.c:475
 #, fuzzy
 msgid "Forward as attachments?"
 msgstr "rodyti MIME priedus"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Funkcija neleistina laiðko prisegimo reþime."
+msgstr "Funkcija neleistina laiško prisegimo režime."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "Gaunu aplankø sàraðà..."
+msgstr "Gaunu aplankų sąrašą..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "Gaunu vardø erdves..."
+msgstr "Gaunu vardų erdves..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Grupei"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Pagalba"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Pagalba apie %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "Ðiuo metu rodoma pagalba."
+msgstr "Šiuo metu rodoma pagalba."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Að neþinau, kaip tai atspausdinti!"
+msgstr "Aš nežinau, kaip tai atspausdinti!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Að neþinau kaip spausdinti %s priedus!"
+msgstr "Aš nežinau kaip spausdinti %s priedus!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
-msgstr "Ðis raktas negali bûti naudojamas: jis pasenæs/uþdraustas/atðauktas."
+msgstr "Šis raktas negali būti naudojamas: jis pasenęs/uždraustas/atšauktas."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 #, fuzzy
 msgid "ID is not valid."
-msgstr "Ðis ID yra nepatikimas."
+msgstr "Šis ID yra nepatikimas."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 #, fuzzy
 msgid "ID is only marginally valid."
-msgstr "Ðis ID yra tik vos vos patikimas."
+msgstr "Šis ID yra tik vos vos patikimas."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Neleistina PGP antraðtë"
+msgstr "Neleistina PGP antraštė"
 
-#: postpone.c:434
+#: postpone.c:399
 #, fuzzy
 msgid "Illegal S/MIME header"
-msgstr "Neleistina PGP antraðtë"
+msgstr "Neleistina PGP antraštė"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Blogai suformuotas tipo %s áraðas \"%s\" %d eilutëje"
+msgstr "Blogai suformuotas tipo %s įrašas \"%s\" %d eilutėje"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Átraukti laiðkà á atsakymà?"
+msgstr "Įtraukti laišką į atsakymą?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "Átraukiu cituojamà laiðkà..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "Áterpti"
+msgstr "Įtraukiu cituojamą laišką..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Bloga mënesio diena: %s"
+msgstr "Bloga mėnesio diena: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Bloga koduotë."
+msgstr "Bloga koduotė."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "Blogas indekso numeris."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Blogas laiðko numeris."
+msgstr "Blogas laiško numeris."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Blogas mënuo: %s"
+msgstr "Blogas mėnuo: %s"
 
 #: pattern.c:486
 #, fuzzy, c-format
 msgid "Invalid relative date: %s"
-msgstr "Blogas mënuo: %s"
+msgstr "Blogas mėnuo: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "Kvieèiu PGP..."
+msgstr "Kviečiu PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "Kvieèiu PGP..."
+msgstr "Kviečiu PGP..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Kvieèiu autom. perþiûros komandà: %s"
+msgstr "Kviečiu autom. peržiūros komandą: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Ðokti á laiðkà: "
+msgstr "Šokti į laišką: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Ðokti á: "
+msgstr "Šokti į: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Ðokinëjimas dialoguose neágyvendintas."
+msgstr "Šokinėjimas dialoguose neįgyvendintas."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Rakto ID: ox%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Klaviðas nëra susietas."
+msgstr "Klavišas nėra susietas."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Klaviðas nëra susietas.  Spausk '%s' dël pagalbos."
+msgstr "Klavišas nėra susietas.  Spausk '%s' dėl pagalbos."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Riboti iki laiðkø, tenkinanèiø: "
+msgstr "Riboti iki laiškų, tenkinančių: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Riba: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Pasisveikinu..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1737,290 +1652,257 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Uþraktø skaièius virðytas, paðalinti uþraktà nuo %s?"
+msgstr "Užraktų skaičius viršytas, pašalinti užraktą nuo %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Pasisveikinu..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Nepavyko pasisveikinti."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Ieðkau raktø, tenkinanèiø \"%s\"..."
+msgstr "Ieškau raktų, tenkinančių \"%s\"..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "Ieðkau %s..."
+msgstr "Ieškau %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "Pirðtø antspaudas: %s"
+msgstr "Pirštų antspaudas: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "MIME tipas neapibrëþtas.  Negaliu parodyti priedo."
+msgstr "MIME tipas neapibrėžtas.  Negaliu parodyti priedo."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "Rastas ciklas makrokomandoje."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Raðyt"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "Laiðkas neiðsiøstas."
+msgstr "Laiškas neišsiųstas."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "Laiðkas iðsiøstas."
+msgstr "Laiškas išsiųstas."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "Dëþutë sutikrinta."
+msgstr "Dėžutė sutikrinta."
 
 #: imap/command.c:235
 #, fuzzy
 msgid "Mailbox closed"
-msgstr "Paðto dëþutë iðtrinta."
+msgstr "Pašto dėžutė ištrinta."
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Dëþutë sukurta."
+msgstr "Dėžutė sukurta."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Paðto dëþutë iðtrinta."
+msgstr "Pašto dėžutė ištrinta."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "Dëþutë yra tuðèia."
+msgstr "Dėžutė yra tuščia."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "Dëþutë yra padaryta neáraðoma. %s"
+msgstr "Dėžutė yra padaryta neįrašoma. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "Dëþutë yra tik skaitoma."
+msgstr "Dėžutė yra tik skaitoma."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Dëþutë yra nepakeista."
+msgstr "Dėžutė yra nepakeista."
 
 #: imap/browse.c:253 imap/browse.c:294
 #, fuzzy
 msgid "Mailbox must have a name."
-msgstr "Dëþutë yra nepakeista."
+msgstr "Dėžutė yra nepakeista."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Paðto dëþutë neiðtrinta."
+msgstr "Pašto dėžutė neištrinta."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Dëþutë sukurta."
+msgstr "Dėžutė sukurta."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Dëþutë buvo sugadinta!"
+msgstr "Dėžutė buvo sugadinta!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 #, fuzzy
 msgid "Mailbox was externally modified."
-msgstr "Dëþutë buvo iðoriðkai pakeista.  Flagai gali bûti neteisingi."
+msgstr "Dėžutė buvo išoriškai pakeista.  Flagai gali būti neteisingi."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Dëþutë buvo iðoriðkai pakeista.  Flagai gali bûti neteisingi."
+msgstr "Dėžutė buvo išoriškai pakeista.  Flagai gali būti neteisingi."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Paðto dëþutës [%d]"
+msgstr "Pašto dėžutės [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Mailcap Taisymo áraðui reikia %%s"
+msgstr "Mailcap Taisymo įrašui reikia %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Mailcap kûrimo áraðui reikia %%s"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Padaryti aliasà"
+msgstr "Mailcap kūrimo įrašui reikia %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Paþymiu %d laiðkus iðtrintais..."
+msgstr "Pažymiu %d laiškus ištrintais..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Kaukë"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Laiðkas nukreiptas."
+msgstr "Laiškas nukreiptas."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "Laiðkas negalëjo bûti atspausdintas"
+msgstr "Laiškas negalėjo būti atspausdintas"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "Laiðkø byla yra tuðèia!"
+msgstr "Laiškų byla yra tuščia!"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
 msgid "Message not bounced."
-msgstr "Laiðkas nukreiptas."
+msgstr "Laiškas nukreiptas."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Laiðkas nepakeistas!"
+msgstr "Laiškas nepakeistas!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Tëvinis laiðkas nematomas ribotame vaizde"
+msgstr "Tėvinis laiškas nematomas ribotame vaizde"
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Laiðkas atidëtas."
+msgstr "Laiškas atidėtas."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "Laiðkas atspausdintas"
+msgstr "Laiškas atspausdintas"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "Laiðkas áraðytas."
+msgstr "Laiškas įrašytas."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Laiðkai nukreipti."
+msgstr "Laiškai nukreipti."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "Laiðkai negalëjo bûti atspausdinti"
+msgstr "Laiškai negalėjo būti atspausdinti"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
 msgid "Messages not bounced."
-msgstr "Laiðkai nukreipti."
+msgstr "Laiškai nukreipti."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Laiðkai atspausdinti"
+msgstr "Laiškai atspausdinti"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Trûksta argumentø."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Mixmaster'io grandinës turi bûti ne ilgesnës nei %d elementø."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster'is nepriima Cc bei Bcc antraðèiø."
+msgstr "Trūksta argumentų."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Perkelti skaitytus laiðkus á %s?"
+msgstr "Perkelti skaitytus laiškus į %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Perkeliu skaitytus laiðkus á %s..."
+msgstr "Perkeliu skaitytus laiškus į %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nauja uþklausa"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Naujos bylos vardas: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Nauja byla:"
 
 #: buffy.cpkg:330
 #, fuzzy
 msgid "New mail in "
-msgstr "Naujas paðtas dëþutëje %s."
+msgstr "Naujas paštas dėžutėje %s."
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Naujas paðtas ðioje dëþutëje."
+msgstr "Naujas paštas šioje dėžutėje."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Kitas"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "KitPsl"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2031,391 +1913,352 @@ msgstr "SASL autentikacija nepavyko."
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Trûksta boundary parametro! [praneðk ðià klaidà]"
+msgstr "Trūksta boundary parametro! [pranešk šią klaidą]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "Nëra áraðø."
+msgstr "Nėra įrašų."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "Në viena byla netinka bylø kaukei"
+msgstr "Nė viena byla netinka bylų kaukei"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Neapibrëþta në viena paðtà gaunanti dëþutë."
+msgstr "Neapibrėžta nė viena paštą gaunanti dėžutė."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Joks ribojimo pattern'as nëra naudojamas."
+msgstr "Joks ribojimo pattern'as nėra naudojamas."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Jokia dëþutë neatidaryta."
+msgstr "Jokia dėžutė neatidaryta."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Nëra dëþutës su nauju paðtu."
+msgstr "Nėra dėžutės su nauju paštu."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "Nëra mailcap kûrimo áraðo %s, sukuriu tuðèià bylà."
+msgstr "Nėra mailcap kūrimo įrašo %s, sukuriu tuščią bylą."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "Nëra mailcap taisymo áraðo tipui %s"
+msgstr "Nėra mailcap taisymo įrašo tipui %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "Nerasta jokia konferencija!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "Neradau tinkamo mailcap áraðo.  Rodau kaip tekstà."
+msgstr "Neradau tinkamo mailcap įrašo.  Rodau kaip tekstą."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Nëra laiðkø tame aplanke."
+msgstr "Nėra laiškų tame aplanke."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "Jokie laiðkai netenkina kriterijaus."
+msgstr "Jokie laiškai netenkina kriterijaus."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "Cituojamo teksto nebëra."
+msgstr "Cituojamo teksto nebėra."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Daugiau gijø nëra."
+msgstr "Daugiau gijų nėra."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Nëra daugiau necituojamo teksto uþ cituojamo."
+msgstr "Nėra daugiau necituojamo teksto už cituojamo."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Nëra naujø laiðkø POP dëþutëje."
+msgstr "Nėra naujų laiškų POP dėžutėje."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "Nëra naujø laiðkø"
+msgstr "Nėra naujų laiškų"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Nenurodyta jokia tema."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "Në viena byla netinka bylø kaukei"
+msgstr "Nė viena byla netinka bylų kaukei"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Nëra dëþutës su nauju paðtu."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "Nëra atidëtø laiðkø."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Nëra dëþutës su nauju paðtu."
+msgstr "Nėra atidėtų laiškų."
 
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Spausdinimo komanda nebuvo apibrëþta."
+msgstr "Spausdinimo komanda nebuvo apibrėžta."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Nenurodyti jokie gavëjai!"
+msgstr "Nenurodyti jokie gavėjai!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Nenurodyti jokie gavëjai.\n"
+msgstr "Nenurodyti jokie gavėjai.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Nebuvo nurodyti jokie gavëjai."
+msgstr "Nebuvo nurodyti jokie gavėjai."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Jokio paieðkos pattern'o."
+msgstr "Jokio paieškos pattern'o."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Nenurodyta jokia tema."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Nëra temos, nutraukti siuntimà?"
+msgstr "Nėra temos, nutraukti siuntimą?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Nëra temos, nutraukti?"
+msgstr "Nėra temos, nutraukti?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "Nëra temos, nutraukiu."
+msgstr "Nėra temos, nutraukiu."
 
 #: imap/browse.c:193
 #, fuzzy
 msgid "No such folder"
-msgstr "%s: nëra tokios spalvos"
+msgstr "%s: nėra tokios spalvos"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "Nëra paþymëtø áraðø."
+msgstr "Nėra pažymėtų įrašų."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Në vienas paþymëtas laiðkas nëra matomas!"
+msgstr "Nė vienas pažymėtas laiškas nėra matomas!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Nëra paþymëtø laiðkø."
+msgstr "Nėra pažymėtų laiškų."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Nëra iðtrintø laiðkø."
+msgstr "Nėra ištrintų laiškų."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Nëra neskaitytø laiðkø"
+msgstr "Nėra neskaitytų laiškų"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 #, fuzzy
 msgid "No visible messages."
-msgstr "Nëra naujø laiðkø"
+msgstr "Nėra naujų laiškų"
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Neprieinama ðiame meniu."
+msgstr "Neprieinama šiame meniu."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Nerasta."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Jungiuosi prie %s..."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "Gerai"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Palaikomas trynimas tik ið keleto daliø priedø."
+msgstr "Palaikomas trynimas tik iš keleto dalių priedų."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Atidaryti dëþutæ"
+msgstr "Atidaryti dėžutę"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Atidaryti dëþutæ tik skaitymo reþimu."
+msgstr "Atidaryti dėžutę tik skaitymo režimu."
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Atidaryti dëþutæ, ið kurios prisegti laiðkà"
+msgstr "Atidaryti dėžutę, iš kurios prisegti laišką"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Atidaryti dëþutæ tik skaitymo reþimu."
+msgstr "Atidaryti dėžutę tik skaitymo režimu."
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Atidaryti dëþutæ, ið kurios prisegti laiðkà"
+msgstr "Atidaryti dėžutę, iš kurios prisegti laišką"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Pristatymo proceso iðvestis"
+msgstr "Pristatymo proceso išvestis"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
-"(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, (l)aiðke, ar (p)amirðti?"
+"(u)žšifruot, pa(s)irašyt, pasirašyt k(a)ip, a(b)u, (l)aiške, ar (p)amiršti?"
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP raktai, tenkinantys <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP raktai, tenkinantys <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP paraðas NEGALI bûti patikrintas."
+msgstr "PGP parašas NEGALI būti patikrintas."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP paraðas patikrintas sëkmingai."
+msgstr "PGP parašas patikrintas sėkmingai."
 
 #: pop.c:1216
 msgid "POP host is not defined."
 msgstr "POP hostas nenurodytas."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Nëra prieinamo tëvinio laiðko."
+msgstr "Nėra prieinamo tėvinio laiško."
 
-#: thread.c:980
+#: thread.c:976
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
-msgstr "Tëvinis laiðkas nematomas ribotame vaizde"
+msgstr "Tėvinis laiškas nematomas ribotame vaizde"
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "%s@%s slaptaþodis: "
+msgstr "%s@%s slaptažodis: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Asmens vardas:"
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Pipe"
-
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Filtruoti per komandà: "
+msgstr "Filtruoti per komandą: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Pipe á: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "Teisingai nustatyk hostname kintamàjá, kai naudoji mixmaster'á!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "Pipe į: "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Atidëti ðá laiðkà?"
+msgstr "Atidėti šį laišką?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "Atidëti laiðkai"
+msgstr "Atidėti laiškai"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "Nepavyko komanda prieð jungimàsi"
+msgstr "Nepavyko komanda prieš jungimąsi"
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Paruoðiu persiunèiamà laiðkà..."
+msgstr "Paruošiu persiunčiamą laišką..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Spausk bet koká klaviðà..."
-
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "PraPsl"
+msgstr "Spausk bet kokį klavišą..."
 
-#: recvattach.c:34
-msgid "Print"
-msgstr "Spausdinti"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Spausdinti priedà?"
+msgstr "Spausdinti priedą?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "Spausdinti laiðkà?"
+msgstr "Spausdinti laišką?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Spausdinti paþymëtus priedus?"
+msgstr "Spausdinti pažymėtus priedus?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Spausdinti paþymëtus laiðkus?"
+msgstr "Spausdinti pažymėtus laiškus?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Sunaikinti %d iðtrintà laiðkà?"
+msgstr "Sunaikinti %d ištrintą laišką?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Sunaikinti %d iðtrintus laiðkus?"
+msgstr "Sunaikinti %d ištrintus laiškus?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Uþklausa"
+msgstr "Užklausa"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "Uþklausa '%s''"
+msgstr "Užklausa '%s''"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Uþklausos komanda nenurodyta."
+msgstr "Užklausos komanda nenurodyta."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Uþklausa: "
-
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Iðeit"
+msgstr "Užklausa: "
 
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Iðeiti ið Mutt?"
+msgstr "Išeiti iš Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "Gaunu vardø erdves..."
+msgstr "Gaunu vardų erdves..."
 
 #: lib-mx/mx.c:494
 #, c-format
@@ -2435,53 +2278,49 @@ msgstr "Skaitau %s... %d (%d%%)"
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "Skaitau naujus laiðkus (%d baitø)..."
+msgstr "Skaitau naujus laiškus (%d baitų)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Tikrai iðtrinti paðto dëþutæ \"%s\"?"
+msgstr "Tikrai ištrinti pašto dėžutę \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Tæsti atidëtà laiðkà?"
+msgstr "Tęsti atidėtą laišką?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Perkodavimas keièia tik tekstinius priedus."
+msgstr "Perkodavimas keičia tik tekstinius priedus."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "Nepavyko pasisveikinti."
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Kol kas sukurti gali tik IMAP paðto dëþutes"
+msgstr "Kol kas sukurti gali tik IMAP pašto dėžutes"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Sukurti dëþutæ: "
+msgstr "Sukurti dėžutę: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "Pervadinti á:"
+msgstr "Pervadinti į:"
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Vël atidarau dëþutæ..."
+msgstr "Vėl atidarau dėžutę..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Atsakyt"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Atsakyti %s%s?"
@@ -2492,27 +2331,27 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Atv-Rik (d)ata/n(u)o/g(a)uta/(t)ema/(k)am/(g)ija/(n)erik/d(y)dis/(v)ertë?: "
+"Atv-Rik (d)ata/n(u)o/g(a)uta/(t)ema/(k)am/(g)ija/(n)erik/d(y)dis/(v)ertė?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Atgal ieðkoti ko: "
+msgstr "Atgal ieškoti ko: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Atvirkðèia paieðka: "
+msgstr "Atvirkščia paieška: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Atvirkðèiai rikiuoti pagal (d)atà, (v)ardà, d(y)dá ar (n)erikiuoti?"
+msgstr "Atvirkščiai rikiuoti pagal (d)atą, (v)ardą, d(y)dį ar (n)erikiuoti?"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
-"(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, (l)aiðke, ar (p)amirðti?"
+"(u)žšifruot, pa(s)irašyt, pasirašyt k(a)ip, a(b)u, (l)aiške, ar (p)amiršti?"
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
@@ -2520,7 +2359,7 @@ msgstr ""
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "PGP raktai, tenkinantys \"%s\"."
@@ -2532,156 +2371,132 @@ msgstr ""
 #: commands.c:143
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
-msgstr "PGP paraðas NEGALI bûti patikrintas."
+msgstr "PGP parašas NEGALI būti patikrintas."
 
 #: commands.c:135
 #, fuzzy
 msgid "S/MIME signature successfully verified."
-msgstr "PGP paraðas patikrintas sëkmingai."
+msgstr "PGP parašas patikrintas sėkmingai."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
 msgstr "SASL autentikacija nepavyko."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "Pirðtø antspaudas: %s"
+msgstr "Pirštų antspaudas: %s"
 
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "SSL jungtis, naudojant %s"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Saugoti"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "Iðsaugoti ðio laiðko kopijà?"
+msgstr "Išsaugoti šio laiško kopiją?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "Iðsaugoti á bylà:"
+msgstr "Išsaugoti į bylą:"
 
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
-msgstr "%s%s á dëþutæ"
+msgstr "%s%s į dėžutę"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "Iðsaugau laiðko bûsenos flagus... [%d/%d]"
+msgstr "Išsaugau laiško būsenos flagus... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "Iðsaugau..."
+msgstr "Išsaugau..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Ieðkoti"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "Ieðkoti ko: "
+msgstr "Ieškoti ko: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Paieðka pasiekë apaèià nieko neradusi"
+msgstr "Paieška pasiekė apačią nieko neradusi"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Paieðka pasiekë virðø nieko neradusi"
+msgstr "Paieška pasiekė viršų nieko neradusi"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Paieðka pertraukta."
+msgstr "Paieška pertraukta."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Paieðka ðiam meniu neágyvendinta."
+msgstr "Paieška šiam meniu neįgyvendinta."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Paieðka perðoko á apaèià."
+msgstr "Paieška peršoko į apačią."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Paieðka perðoko á virðø."
+msgstr "Paieška peršoko į viršų."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "Paieðka: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Pasirinkti"
+msgstr "Paieška: "
 
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Pasirink  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Pasirink persiuntëjø grandinæ."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "Parenku %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Siøsti"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "Siunèiu fone."
+msgstr "Siunčiu fone."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "Siunèiu laiðkà..."
+msgstr "Siunčiu laišką..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Serveris uþdarë jungtá!"
+msgstr "Serveris uždarė jungtį!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Uþdëti flagà"
+msgstr "Uždėti flagą"
 
 #: commands.c:463
 msgid "Shell command: "
 msgstr "Shell komanda: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "Pasiraðyti"
+msgstr "Pasirašyti"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "Pasiraðyti kaip: "
+msgstr "Pasirašyti kaip: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Pasiraðyti, Uþðifruoti"
+msgstr "Pasirašyti, Užšifruoti"
 
 #: commands.c:406
 #, fuzzy
@@ -2689,163 +2504,159 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Rik (d)ata/n(u)o/g(a)uta/(t)ema/(k)am/(g)ija/(n)erik/d(y)dis/(v)ertë?: "
+"Rik (d)ata/n(u)o/g(a)uta/(t)ema/(k)am/(g)ija/(n)erik/d(y)dis/(v)ertė?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Rikiuoti pagal (d)atà, (v)ardà, d(y)dá ar (n)erikiuoti? "
+msgstr "Rikiuoti pagal (d)atą, (v)ardą, d(y)dį ar (n)erikiuoti? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Rikiuoju dëþutæ..."
+msgstr "Rikiuoju dėžutę..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Rakto ID: ox%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Uþsakytos [%s], Bylø kaukë: %s"
+msgstr "Užsakytos [%s], Bylų kaukė: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "Uþsakau %s..."
+msgstr "Užsakau %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "SSL sertifikato patikrinimas"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Paþymëti laiðkus, tenkinanèius: "
+msgstr "Pažymėti laiškus, tenkinančius: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Paþymëk laiðkus, kuriuos nori prisegti!"
+msgstr "Pažymėk laiškus, kuriuos nori prisegti!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Þymëjimas nepalaikomas."
+msgstr "Žymėjimas nepalaikomas."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Tas laiðkas yra nematomas."
+msgstr "Tas laiškas yra nematomas."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
 msgstr "SSL nepasiekiamas."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr "Esamas priedas bus konvertuotas."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr "Esamas priedas nebus konvertuotas."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "Laiðkø indeksas yra neteisingas. Bandyk ið naujo atidaryti dëþutæ."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "Persiuntëjø grandinë jau tuðèia."
+msgstr "Laiškų indeksas yra neteisingas. Bandyk iš naujo atidaryti dėžutę."
 
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "Nëra jokiø priedø."
+msgstr "Nėra jokių priedų."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "Ten nëra laiðkø."
+msgstr "Ten nėra laiškų."
 
-#: recvattach.c:918
+#: recvattach.c:906
 #, fuzzy
 msgid "There are no subparts to show!"
-msgstr "Nëra jokiø priedø."
+msgstr "Nėra jokių priedų."
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Ðis IMAP serveris yra senoviðkas. Mutt su juo neveikia."
+msgstr "Šis IMAP serveris yra senoviškas. Mutt su juo neveikia."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Ðis sertifikatas priklauso: "
+msgstr "Šis sertifikatas priklauso: "
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Ðis sertifikatas galioja"
+msgstr "Šis sertifikatas galioja"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Ðis sertifikatas buvo iðduotas:"
+msgstr "Šis sertifikatas buvo išduotas:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Ðis raktas negali bûti naudojamas: jis pasenæs/uþdraustas/atðauktas."
+msgstr "Šis raktas negali būti naudojamas: jis pasenęs/uždraustas/atšauktas."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Gijoje yra neskaitytø laiðkø."
+msgstr "Gijoje yra neskaitytų laiškų."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Skirstymas gijomis neleidþiamas."
+msgstr "Skirstymas gijomis neleidžiamas."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Virðytas leistinas laikas siekiant fcntl uþrakto!"
+msgstr "Viršytas leistinas laikas siekiant fcntl užrakto!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Virðytas leistinas laikas siekiant flock uþrakto!"
+msgstr "Viršytas leistinas laikas siekiant flock užrakto!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Rodomas laiðko virðus."
+msgstr "Rodomas laiško viršus."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -2864,28 +2675,28 @@ msgstr ""
 msgid "USER authentication failed."
 msgstr "SASL autentikacija nepavyko."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Negaliu prisegti %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "Negaliu prisegti!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Negaliu paimti antraðèiø ið ðios IMAP serverio versijos."
+msgstr "Negaliu paimti antraščių iš šios IMAP serverio versijos."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "Nepavyko gauti sertifikato ið peer'o"
+msgstr "Nepavyko gauti sertifikato iš peer'o"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Negaliu palikti laiðkø serveryje."
+msgstr "Negaliu palikti laiškų serveryje."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "Negaliu prisegti %s!"
@@ -2893,14 +2704,14 @@ msgstr "Negaliu prisegti %s!"
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Negaliu uþrakinti dëþutës!"
+msgstr "Negaliu užrakinti dėžutės!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
 msgstr "Negaliu atidaryti laikinos bylos!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
 msgstr "Negaliu atidaryti laikinos bylos!"
@@ -2909,31 +2720,22 @@ msgstr "Negaliu atidaryti laikinos bylos!"
 msgid "Unable to open temporary file!"
 msgstr "Negaliu atidaryti laikinos bylos!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Gràþint"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Sugràþinti laiðkus, tenkinanèius: "
+msgstr "Sugrąžinti laiškus, tenkinančius: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "Gràþint"
+msgstr "Grąžint"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "Neþinomas Content-Type %s"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Atsisakau %s..."
+msgstr "Nežinomas Content-Type %s"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Atsisakau %s..."
@@ -2943,59 +2745,51 @@ msgstr "Atsisakau %s..."
 msgid "Unsubscribing to %s..."
 msgstr "Atsisakau %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Atþymëti laiðkus, tenkinanèius: "
+msgstr "Atžymėti laiškus, tenkinančius: "
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "Nusiunèiu laiðkà..."
+msgstr "Nusiunčiu laišką..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "Naudok 'toggle-write', kad vël galëtum raðyti!"
+msgstr "Naudok 'toggle-write', kad vėl galėtum rašyti!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Naudoti rakto ID = \"%s\", skirtà %s?"
+msgstr "Naudoti rakto ID = \"%s\", skirtą %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
 msgstr "%s vartotojo vardas: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Blogas mënuo: %s"
+msgstr "Blogas mėnuo: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Blogas mënuo: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Blogas mėnuo: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Tikrinti PGP paraðà?"
+msgstr "Tikrinti PGP parašą?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Tikrinu laiðkø indeksus..."
+msgstr "Tikrinu laiškų indeksus..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Priedai"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "DËMESIO!  Tu þadi uþraðyti ant seno %s, tæsti"
+msgstr "DĖMESIO!  Tu žadi užrašyti ant seno %s, tęsti"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -3003,26 +2797,26 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "Serverio sertifikatas paseno"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "Serverio sertifikatas paseno"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "Serverio sertifikatas dar negalioja"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "Serverio sertifikatas dar negalioja"
@@ -3040,18 +2834,18 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "Laukiu fcntl uþrakto... %d"
+msgstr "Laukiu fcntl užrakto... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "Laukiu fcntl uþrakto... %d"
+msgstr "Laukiu fcntl užrakto... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Laukiu atsakymo..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3061,14 +2855,14 @@ msgstr ""
 msgid "Warning: At least one certification key has expired\n"
 msgstr "Serverio sertifikatas paseno"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "Áspëju: Negalëjau iðsaugoti sertifikato"
+msgstr "Įspėju: Negalėjau išsaugoti sertifikato"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
@@ -3086,124 +2880,106 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Èia turëtø bûti priedas, taèiau jo nepavyko padaryti"
+msgstr "Čia turėtų būti priedas, tačiau jo nepavyko padaryti"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Áraðyti nepavyko!  Dëþutë dalinai iðsaugota á %s"
+msgstr "Įrašyti nepavyko!  Dėžutė dalinai išsaugota į %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "Raðymo nesëkmë!"
+msgstr "Rašymo nesėkmė!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Áraðyti laiðkà á dëþutæ"
+msgstr "Įrašyti laišką į dėžutę"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "Raðau %s..."
+msgstr "Rašau %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "Raðau laiðkà á %s ..."
+msgstr "Rašau laišką į %s ..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "Raðau laiðkus... %d (%d%%)"
+msgstr "Rašau laiškus... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Klaida komandinëje eilutëje: %s\n"
+msgstr "Klaida komandinėje eilutėje: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Tu jau apibrëþei aliasà tokiu vardu!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Tu jau pasirinkai pirmà grandinës elementà."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Tu jau pasirinkai paskutiná grandinës elementà."
+msgstr "Tu jau apibrėžei aliasą tokiu vardu!"
 
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Tu esi ties pirmu áraðu."
+msgstr "Tu esi ties pirmu įrašu."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Tu esi pirmame puslapyje."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Tu esi ties pirmu laiðku."
+msgstr "Tu esi ties pirmu laišku."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr "Tu esi pirmame puslapyje."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
 msgstr "Tu esi ties pirma gija."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Tu esi ties paskutiniu áraðu."
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Tu esi paskutiniame puslapyje."
+msgstr "Tu esi ties paskutiniu įrašu."
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Tu esi ties paskutiniu laiðku."
+msgstr "Tu esi ties paskutiniu laišku."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr "Tu esi paskutiniame puslapyje."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Tu negali slinkti þemyn daugiau."
+msgstr "Tu negali slinkti žemyn daugiau."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Tu negali slinkti aukðtyn daugiau."
+msgstr "Tu negali slinkti aukštyn daugiau."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Tu neturi aliasø!"
+msgstr "Tu neturi aliasų!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Tu negali iðtrinti vienintelio priedo."
+msgstr "Tu negali ištrinti vienintelio priedo."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
 msgstr "Tu gali nukreipti tik message/rfc822 priedus."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Tinka?"
@@ -3221,34 +2997,34 @@ msgstr "[-- Priedas #%d"
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Automatinës perþiûros %s klaidos --]\n"
+msgstr "[-- Automatinės peržiūros %s klaidos --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Automatinë perþiûra su %s --]\n"
+msgstr "[-- Automatinė peržiūra su %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP LAIÐKO PRADÞIA --]\n"
+"[-- PGP LAIŠKO PRADŽIA --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP VIEÐO RAKTO BLOKO PRADÞIA --]\n"
+msgstr "[-- PGP VIEŠO RAKTO BLOKO PRADŽIA --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP PASIRAÐYTO LAIÐKO PRADÞIA --]\n"
+"[-- PGP PASIRAŠYTO LAIŠKO PRADŽIA --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3257,108 +3033,108 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- %s --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
-"[-- PGP LAIÐKO PABAIGA --]\n"
+"[-- PGP LAIŠKO PABAIGA --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP VIEÐO RAKTO BLOKO PABAIGA --]\n"
+msgstr "[-- PGP VIEŠO RAKTO BLOKO PABAIGA --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
-"[-- PGP PASIRAÐYTO LAIÐKO PABAIGA --]\n"
+"[-- PGP PASIRAŠYTO LAIŠKO PABAIGA --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- PGP/MIME uþðifruotø duomenø pabaiga --]\n"
+"[-- PGP/MIME užšifruotų duomenų pabaiga --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- PGP/MIME uþðifruotø duomenø pabaiga --]\n"
+"[-- PGP/MIME užšifruotų duomenų pabaiga --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- PGP/MIME uþðifruotø duomenø pabaiga --]\n"
+"[-- PGP/MIME užšifruotų duomenų pabaiga --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- Pasiraðytø duomenø pabaiga --]\n"
+"[-- Pasirašytų duomenų pabaiga --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Pasiraðytø duomenø pabaiga --]\n"
+"[-- Pasirašytų duomenų pabaiga --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- Klaida:  Nepavyko parodyti në vienos Multipart/Alternative dalies! --]\n"
+"[-- Klaida:  Nepavyko parodyti nė vienos Multipart/Alternative dalies! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- Klaida: Neteisinga multipart/signed struktûra! --]\n"
+"[-- Klaida: Neteisinga multipart/signed struktūra! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- Klaida: Neþinomas multipart/signed protokolas %s! --]\n"
+"[-- Klaida: Nežinomas multipart/signed protokolas %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Klaida: negalëjau sukurti laikinos bylos! --]\n"
+msgstr "[-- Klaida: negalėjau sukurti laikinos bylos! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Klaida: neradau PGP laiðko pradþios! --]\n"
+"[-- Klaida: neradau PGP laiško pradžios! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- Klaida: negalëjau sukurti laikinos bylos! --]\n"
+msgstr "[-- Klaida: negalėjau sukurti laikinos bylos! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- Klaida: blogai suformuotas PGP/MIME laiðkas! --]\n"
+"[-- Klaida: blogai suformuotas PGP/MIME laiškas! --]\n"
 "\n"
 
 #: handler.c:1168
@@ -3366,87 +3142,87 @@ msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Klaida: message/external-body dalis neturi access-type parametro --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Toliau einantys duomenys yra uþðifruoti su PGP/MIME --]\n"
+"[-- Toliau einantys duomenys yra užšifruoti su PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Toliau einantys duomenys yra uþðifruoti su PGP/MIME --]\n"
+"[-- Toliau einantys duomenys yra užšifruoti su PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Toliau einantys duomenys yra uþðifruoti su PGP/MIME --]\n"
+"[-- Toliau einantys duomenys yra užšifruoti su PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- Toliau einantys duomenys yra pasiraðyti --]\n"
+"[-- Toliau einantys duomenys yra pasirašyti --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Toliau einantys duomenys yra pasiraðyti --]\n"
+"[-- Toliau einantys duomenys yra pasirašyti --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- Ðis %s/%s priedas "
+msgstr "[-- Šis %s/%s priedas "
 
 #: handler.c:1212 handler.c:1225
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- Ðis %s/%s priedas "
+msgstr "[-- Šis %s/%s priedas "
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Tipas: %s/%s, Koduotë: %s, Dydis: %s --]\n"
+msgstr "[-- Tipas: %s/%s, Koduotė: %s, Dydis: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Dëmesio: Negaliu rasti jokiø paraðø --]\n"
+"[-- Dėmesio: Negaliu rasti jokių parašų --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Dëmesio: Negaliu patikrinti %s/%s paraðo. --]\n"
+"[-- Dėmesio: Negaliu patikrinti %s/%s parašo. --]\n"
 "\n"
 
 #: handler.c:1230
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
-"[-- Ðis %s/%s priedas neátrauktas, --]\n"
+"[-- Šis %s/%s priedas neįtrauktas, --]\n"
 "[-- o nurodytas pasiekimo tipas %s yra nepalaikomas. --]\n"
 
 #: handler.c:1214
@@ -3455,8 +3231,8 @@ msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- Ðis %s/%s priedas neátrauktas, --]\n"
-"[-- o nurodytas iðorinis ðaltinis iðseko. --]\n"
+"[-- Šis %s/%s priedas neįtrauktas, --]\n"
+"[-- o nurodytas išorinis šaltinis išseko. --]\n"
 
 #: handler.c:1201
 #, c-format
@@ -3468,33 +3244,33 @@ msgstr "[-- vardas: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Iðeiti  "
+msgstr "Išeiti  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Blogas mënuo: %s"
+msgstr "Blogas mėnuo: %s"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
@@ -3505,70 +3281,246 @@ msgstr "[bloga data]"
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[negaliu suskaièiuoti]"
+msgstr "[negaliu suskaičiuoti]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "alias: nëra adreso"
+msgstr "alias: nėra adreso"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Negaliu rasti nė vieno pažymėto laiško."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Negaliu rasti nė vieno pažymėto laiško."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Išsaugoti šio laiško kopiją?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
 
-#: init.c:654
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "taisyti priedo apraðymà"
+msgstr "taisyti priedo aprašymą"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "taisyti priedo apraðymà"
+msgstr "taisyti priedo aprašymą"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: per daug argumentø"
+msgstr "bind: per daug argumentų"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Klaida skaitant katalogą."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Nėra dėžutės su nauju paštu."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: per maþai argumentø"
+msgstr "color: per mažai argumentų"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Nėra naujų laiškų"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr ""
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Įrašyti laišką į dėžutę"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "negalëjau sukurti laikino aplanko: %s"
+msgstr "negalėjau sukurti laikino aplanko: %s"
 
 #: editmsg.c:89
 #, fuzzy, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "negalëjau áraðyti laikino paðto aplanko: %s"
+msgstr "negalėjau įrašyti laikino pašto aplanko: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "negalëjau áraðyti laikino paðto aplanko: %s"
+msgstr "negalėjau įrašyti laikino pašto aplanko: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Neapibrėžta nė viena paštą gaunanti dėžutė."
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "dvyn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "áprastos spalvos nepalaikomos"
+msgstr "įprastos spalvos nepalaikomos"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Ištrinti laiškus iš serverio?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Sugrąžinti laiškus, tenkinančius: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Sugrąžinti laiškus, tenkinančius: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "duatkgnyv"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Paruošiu persiunčiamą laišką..."
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3577,28 +3529,115 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "Kopijuoju á %s..."
+msgstr "Kopijuoju į %s..."
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
 msgstr "Parenku %s..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Esamas priedas nebus konvertuotas."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "taisyti priedo aprašymą"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Negaliu įrašyti laiško"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Paimu laiškų antraštes... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Paruošiu persiunčiamą laišką..."
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Išsaugoti šio laiško kopiją?"
+
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "tuðèias pattern'as"
+msgstr "tuščias pattern'as"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "Uþðifruoti"
+msgstr "Užšifruoti"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Išsaugoti šio laiško kopiją?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
 msgstr "klaida pattern'e: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "klaida pattern'e: %s"
@@ -3628,14 +3667,14 @@ msgstr "klaida pattern'e: %s"
 msgid "error getting secret key `%s': %s\n"
 msgstr "klaida pattern'e: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "klaida pattern'e: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "klaida iðraiðkoje"
+msgstr "klaida išraiškoje"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
@@ -3665,22 +3704,78 @@ msgstr "klaida pattern'e: %s"
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "klaida: neþinoma operacija %d (praneðkite ðià klaidà)."
+msgstr "klaida: nežinoma operacija %d (praneškite šią klaidą)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "usablp"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "usablp"
 
-#: keymap.c:829
+#: keymap.c:821
 #, fuzzy
 msgid "exec: no arguments"
-msgstr "exec: per maþai argumentø"
+msgstr "exec: per mažai argumentų"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Pratęsti-į %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "rodyti MIME priedus"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Tikrinu, ar yra naujų laiškų..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Tu esi ties pirmu laišku."
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -3702,133 +3797,623 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
-msgstr ""
-
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Tu esi paskutiniame puslapyje."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Nėra dėžutės su nauju paštu."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Klaida rašant į pašto dėžutę!"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Nėra dėžutės su nauju paštu."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "buvo iðtrintas --]\n"
+msgstr "buvo ištrintas --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "blogas antraðtës laukas"
+msgstr "blogas antraštės laukas"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Blogas indekso numeris."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Šokti į laišką: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Šokti į laišką: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Gijoje yra neskaitytų laiškų."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Tu esi ties pirma gija."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Nėra neskaitytų laiškų"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Nėra neskaitytų laiškų"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Išsaugoti šio laiško kopiją?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP raktai, tenkinantys <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Nukreipti pažymėtus laiškus kam: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Nėra dėžutės su nauju paštu."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: tuðèia klaviðø seka"
+msgstr "macro: tuščia klavišų seka"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: per daug argumentø"
+msgstr "macro: per daug argumentų"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "mailcap áraðas tipui %s nerastas"
+msgstr "mailcap įrašas tipui %s nerastas"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "Laiðkai nukreipti."
+msgstr "Laiškai nukreipti."
 
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "trûkstami skliausteliai: %s"
+msgstr "trūkstami skliausteliai: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "trûksta parametro"
+msgstr "trūksta parametro"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: per maþai argumentø"
+msgstr "mono: per mažai argumentų"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Tu esi ties pirmu įrašu."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Tu esi ties pirmu laišku."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Tu esi ties paskutiniu įrašu."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Tu esi ties paskutiniu laišku."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Tu esi ties paskutiniu įrašu."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Tu esi paskutiniame puslapyje."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Nėra ištrintų laiškų."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Tu esi ties pirmu įrašu."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Tu esi pirmame puslapyje."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Nėra ištrintų laiškų."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Tu esi pirmame puslapyje."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "keliø daliø laiðkas neturi boundary parametro!"
+msgstr "kelių dalių laiškas neturi boundary parametro!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "ne"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(nëra dëþutës)"
+msgstr "(nėra dėžutės)"
 
 #: commands.c:788
 msgid "not converting"
 msgstr ""
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "nulinë klaviðø seka"
+msgstr "nulinė klavišų seka"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "upn"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Atidaryti dėžutę tik skaitymo režimu."
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Atidaryti dėžutę tik skaitymo režimu."
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Vėl atidarau dėžutę..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Nukreipti laišką į %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "negalima vartoti prieðdëlio su reset"
+msgstr "negalima vartoti priešdėlio su reset"
+
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Tu esi ties pirmu įrašu."
 
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: per daug argumentø"
+msgstr "push: per daug argumentų"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Tęsti atidėtą laišką?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Gijoje yra neskaitytų laiškų."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Negaliu taisyti laiško POP serveryje."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: negalėjau prisegti bylos"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Šokti į laišką: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Ištrinti laiškus iš serverio?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ap"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "apv"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "%s%s į dėžutę"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "%s%s į dėžutę"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Negaliu taisyti laiško POP serveryje."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "klaida išraiškoje"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Ieškoti ko: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Negalėjau išsiųsti laiško."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "rodyti MIME priedus"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Riboti iki laiškų, tenkinančių: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Cituojamo teksto nebėra."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Spausdinti laišką?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Nėra laiškų tame aplanke."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: klaida %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: klaidos %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: skaitymas nutrauktas, nes %s yra per daug klaidø."
+msgstr "source: skaitymas nutrauktas, nes %s yra per daug klaidų."
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Nė viena byla netinka bylų kaukei"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "sync: mbox pakeista, bet nëra pakeistø laiðkø! (praneðk ðià klaidà)"
+msgstr "sync: mbox pakeista, bet nėra pakeistų laiškų! (pranešk šią klaidą)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Atžymėti laiškus, tenkinančius: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Tu esi ties pirma gija."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3840,22 +4425,93 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Cituojamo teksto nebėra."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Perkodavimas keičia tik tekstinius priedus."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Jokio paieškos pattern'o."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Nėra neskaitytų laiškų"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "per maþai argumentø"
+msgstr "per mažai argumentų"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "per daug argumentø"
+msgstr "per daug argumentų"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "taisyti priedo apraðymà"
+msgstr "taisyti priedo aprašymą"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Sugrąžinti laiškus, tenkinančius: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Sugrąžinti laiškus, tenkinančius: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Sugrąžinti laiškus, tenkinančius: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
@@ -3870,11 +4526,29 @@ msgstr ""
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: neþinomas hook tipas: %s"
+msgstr "unhook: nežinomas hook tipas: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "neþinoma klaida"
+msgstr "nežinoma klaida"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Atžymėti laiškus, tenkinančius: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "taisyti priedo aprašymą"
 
 #: main.c:82
 msgid ""
@@ -3887,12 +4561,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "reikðmë neleistina reset komandoje"
+msgstr "reikšmė neleistina reset komandoje"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Priedas išsaugotas."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Nauja byla:"
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Įrašyti laišką į dėžutę"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "taip"
 
@@ -3900,3 +4605,6 @@ msgstr "taip"
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/madmutt.pot b/po/madmutt.pot
index 60d056c..193f215 100644 (file)
--- a/po/madmutt.pot
+++ b/po/madmutt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:10+0200\n"
+"POT-Creation-Date: 2007-08-12 01:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,71 +26,46 @@ msgstr ""
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr ""
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr ""
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr ""
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr ""
-
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr ""
-
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr ""
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr ""
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr ""
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr ""
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr ""
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
 msgstr ""
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr ""
 
@@ -103,7 +78,7 @@ msgstr ""
 msgid "Mailcap compose entry requires %%s"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr ""
@@ -159,139 +134,115 @@ msgstr ""
 msgid "I don't know how to print that!"
 msgstr ""
 
-#: browser.c:35
-msgid "Chdir"
-msgstr ""
-
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr ""
-
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:46
-msgid "Unsubscribe"
-msgstr ""
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
-
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr ""
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr ""
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr ""
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr ""
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
 msgstr ""
 
-#: browser.c:1020
+#: browser.c:991
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr ""
 
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr ""
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr ""
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
 msgstr ""
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr ""
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr ""
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr ""
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr ""
 
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr ""
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr ""
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:1379
+#: browser.c:1350
 #, c-format
 msgid "Unsubscribe pattern: "
 msgstr ""
 
-#: browser.c:1396
+#: browser.c:1367
 msgid "No newsgroups match the mask"
 msgstr ""
 
@@ -500,192 +451,180 @@ msgstr ""
 msgid "converting"
 msgstr ""
 
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr ""
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr ""
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr ""
-
-#: compose.c:95 compose.c:107 compose.c:675
-msgid "Attach file"
-msgstr ""
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr ""
-
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr ""
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr ""
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr ""
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 msgid "     sign as: "
 msgstr ""
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr ""
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
 msgstr ""
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr ""
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr ""
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
 
-#: compose.c:691
+#: compose.c:608
+msgid "Attach file"
+msgstr ""
+
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr ""
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr ""
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
 msgstr ""
 
-#: compose.c:734
+#: compose.c:667
 msgid "Open newsgroup to attach message from"
 msgstr ""
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr ""
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
 msgstr ""
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr ""
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr ""
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr ""
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr ""
 
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr ""
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr ""
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr ""
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr ""
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr ""
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr ""
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr ""
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr ""
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr ""
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr ""
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
@@ -704,14 +643,14 @@ msgstr ""
 msgid "error creating gpgme data object: %s\n"
 msgstr ""
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr ""
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, c-format
 msgid "error allocating data object: %s\n"
 msgstr ""
@@ -787,7 +726,7 @@ msgstr ""
 msgid "A system error occurred"
 msgstr ""
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 msgid "Fingerprint: "
 msgstr ""
 
@@ -831,399 +770,387 @@ msgstr ""
 msgid "Error checking signature"
 msgstr ""
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, c-format
 msgid "Error: verification failed: %s\n"
 msgstr ""
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr ""
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr ""
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr ""
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 msgid "[Invalid]"
 msgstr ""
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, c-format
 msgid "Valid From : %s\n"
 msgstr ""
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, c-format
 msgid "Valid To ..: %s\n"
 msgstr ""
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 msgid "encryption"
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, c-format
 msgid "Subkey ....: 0x%s"
 msgstr ""
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 msgid "[Expired]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 msgid "Collecting data..."
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 msgid "All matching keys are marked expired/revoked."
 msgstr ""
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr ""
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr ""
-
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr ""
-
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 msgid "PGP and S/MIME keys matching"
 msgstr ""
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 msgid "PGP keys matching"
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 msgid "S/MIME keys matching"
 msgstr ""
 
-#: crypt.cpkg:3122
+#: crypt.cpkg:3108
 msgid "keys matching"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr ""
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
 msgstr ""
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
 msgstr ""
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr ""
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr ""
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr ""
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr ""
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 msgid "esabpc"
 msgstr ""
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 msgid "esabmc"
 msgstr ""
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr ""
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, c-format
 msgid "error importing gpg data: %s\n"
 msgstr ""
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr ""
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 msgid "Invoking S/MIME..."
 msgstr ""
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 msgid "Could not create temporary file"
 msgstr ""
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -1267,9 +1194,9 @@ msgstr ""
 msgid "Error. Preserving temporary file: %s"
 msgstr ""
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
 msgstr ""
 
@@ -1390,38 +1317,38 @@ msgstr ""
 msgid "%s: unable to attach file"
 msgstr ""
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr ""
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr ""
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
 msgstr ""
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr ""
 
@@ -1500,8 +1427,8 @@ msgstr ""
 msgid "Mailbox renamed."
 msgstr ""
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
 msgstr ""
 
@@ -1513,7 +1440,7 @@ msgstr ""
 msgid "Fatal error.  Message count is out of sync!"
 msgstr ""
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
 msgstr ""
@@ -1534,7 +1461,7 @@ msgstr ""
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr ""
@@ -1611,7 +1538,7 @@ msgstr ""
 msgid "Fetching message headers... [%d/%d]"
 msgstr ""
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr ""
 
@@ -1637,528 +1564,1371 @@ msgstr ""
 msgid "Continue?"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr ""
 
-#: init.c:617
+#: init.c:614
 msgid "attachments: no disposition"
 msgstr ""
 
-#: init.c:654
+#: init.c:651
 msgid "attachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 msgid "unattachments: no disposition"
 msgstr ""
 
-#: init.c:690
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr ""
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
 msgstr ""
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
 msgstr ""
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr ""
 
-#: init.c:1065
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr ""
 
-#: init.c:1070
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
 msgstr ""
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr ""
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr ""
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr ""
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
-#: init.c:1289
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr ""
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr ""
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
 msgstr ""
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr ""
 
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr ""
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr ""
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr ""
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr ""
 
-#: keymap.c:789
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr ""
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr ""
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr ""
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr ""
 
-#: keymap.c:868
-msgid "Enter keys (^G to abort): "
+#: keymap_defs.h:7
+msgid "null operation"
 msgstr ""
 
-#: keymap.c:872
-#, c-format
-msgid "Char = %s, Octal = %o, Decimal = %d"
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
 msgstr ""
 
-#: lib-lua/madmutt.cpkg:94
-#, c-format
-msgid "Directory %s not exist. Create it?"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
 msgstr ""
 
-#: lib-lua/madmutt.cpkg:101
-msgid "Cache directory not created!"
+#: keymap_defs.h:10
+msgid "view attachment as text"
 msgstr ""
 
-#: lib-lua/madmutt.cpkg:106
-#, c-format
-msgid "Directory %s is unsafe, do you want to use it ?"
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
 msgstr ""
 
-#: lib-mime/crypt.c:180
-msgid "S/MIME messages with no hints on content are unsupported."
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
 msgstr ""
 
-#: lib-mime/rfc1524.c:197
-#, c-format
-msgid "Improperly formated entry for type %s in \"%s\" line %d"
+#: keymap_defs.h:13
+msgid "remail a message to another user"
 msgstr ""
 
-#: lib-mime/rfc1524.c:382
-#, c-format
-msgid "mailcap entry for type %s not found"
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
 msgstr ""
 
-#: lib-mime/rfc822parse.c:517
-msgid "multipart message has no boundary parameter!"
+#: keymap_defs.h:15
+msgid "view file"
 msgstr ""
 
-#: lib-mx/compress.c:170 lib-mx/mbox.c:339
-msgid "Mailbox was corrupted!"
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
 msgstr ""
 
-#: lib-mx/compress.c:212
-#, c-format
-msgid "Decompressing %s..."
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
 msgstr ""
 
-#: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
-#: lib-mx/mbox.c:407
-msgid "Unable to lock mailbox!"
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
 msgstr ""
 
-#: lib-mx/compress.c:235
-#, c-format
-msgid "echo Decompressing %s..."
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
 msgstr ""
 
-#: lib-mx/compress.c:246
-#, c-format
-msgid "Error executing: %s : unable to open the mailbox!\n"
+#: keymap_defs.h:20
+msgid "list mailboxes with new mail"
 msgstr ""
 
-#: lib-mx/compress.c:327 lib-mx/compress.c:392
-#, c-format
-msgid "Compressing %s..."
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
 msgstr ""
 
-#: lib-mx/compress.c:352 lib-mx/compress.c:420
-#, c-format
-msgid "echo Compressing %s..."
+#: keymap_defs.h:22
+msgid "change directories"
 msgstr ""
 
-#: lib-mx/compress.c:357
-#, c-format
-msgid ""
-"%s: Error compressing mailbox! Original mailbox deleted, uncompressed one "
-"kept!\n"
+#: keymap_defs.h:23
+msgid "check mailboxes for new mail"
 msgstr ""
 
-#: lib-mx/compress.c:394
-#, c-format
-msgid "Compressed-appending to %s..."
+#: keymap_defs.h:24
+msgid "attach a file(s) to this message"
 msgstr ""
 
-#: lib-mx/compress.c:422
-#, c-format
-msgid "echo Compressed-appending to %s..."
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
 msgstr ""
 
-#: lib-mx/compress.c:428
-#, c-format
-msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
 msgstr ""
 
-#: lib-mx/mbox.c:123
-#, c-format
-msgid "Reading %s... %d (%d%%)"
+#: keymap_defs.h:27
+msgid "edit the BCC list"
 msgstr ""
 
-#: lib-mx/mbox.c:398 lib-mx/mbox.c:591
-msgid "Fatal error!  Could not reopen mailbox!"
+#: keymap_defs.h:28
+msgid "edit the CC list"
 msgstr ""
 
-#: lib-mx/mbox.c:443
-msgid "sync: mbox modified, but no modified messages! (report this bug)"
+#: keymap_defs.h:29
+msgid "edit attachment description"
 msgstr ""
 
-#: lib-mx/mbox.c:473
-#, c-format
-msgid "Writing messages... %d (%d%%)"
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
 msgstr ""
 
-#: lib-mx/mbox.c:547
-msgid "Committing changes..."
+#: keymap_defs.h:31
+msgid "enter a file to save a copy of this message in"
 msgstr ""
 
-#: lib-mx/mbox.c:576
-#, c-format
-msgid "Write failed!  Saved partial mailbox to %s"
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
 msgstr ""
 
-#: lib-mx/mbox.c:634
-msgid "Could not reopen mailbox!"
+#: keymap_defs.h:33
+msgid "edit the from field"
 msgstr ""
 
-#: lib-mx/mbox.c:674
-msgid "Reopening mailbox..."
+#: keymap_defs.h:34
+msgid "edit the message with headers"
 msgstr ""
 
-#: lib-mx/mbox.c:864
-msgid "Can't write message"
+#: keymap_defs.h:35
+msgid "edit the message"
 msgstr ""
 
-#: lib-mx/mh.c:594 lib-mx/mh.c:746
-#, c-format
-msgid "Reading %s... %d"
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
 msgstr ""
 
-#: lib-mx/mh.c:995
-msgid "maildir_commit_message(): unable to set time on file"
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
 msgstr ""
 
-#: lib-mx/mx.c:94
-#, c-format
-msgid "Lock count exceeded, remove lock for %s?"
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
 msgstr ""
 
-#: lib-mx/mx.c:103
-#, c-format
-msgid "Can't dotlock %s.\n"
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
 msgstr ""
 
-#: lib-mx/mx.c:183
-msgid "Timeout exceeded while attempting fcntl lock!"
+#: keymap_defs.h:40
+msgid "edit the subject of this message"
 msgstr ""
 
-#: lib-mx/mx.c:190
-#, c-format
-msgid "Waiting for fcntl lock... %d"
+#: keymap_defs.h:41
+msgid "edit the TO list"
 msgstr ""
 
-#: lib-mx/mx.c:217
-msgid "Timeout exceeded while attempting flock lock!"
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
 msgstr ""
 
-#: lib-mx/mx.c:225
-#, c-format
-msgid "Waiting for flock attempt... %d"
+#: keymap_defs.h:43
+msgid "edit attachment content type"
 msgstr ""
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
-#, c-format
-msgid "%s is not a mailbox."
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
 msgstr ""
 
-#: lib-mx/mx.c:407
-#, c-format
-msgid "Couldn't lock %s\n"
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
 msgstr ""
 
-#: lib-mx/mx.c:494
-#, c-format
-msgid "Reading %s..."
+#: keymap_defs.h:46
+msgid "toggle recoding of this attachment"
 msgstr ""
 
-#: lib-mx/mx.c:555
-#, c-format
-msgid "Writing %s..."
+#: keymap_defs.h:47
+msgid "save this message to send later"
 msgstr ""
 
-#: lib-mx/mx.c:584
-msgid "message(s) not deleted"
+#: keymap_defs.h:48
+msgid "rename/move an attached file"
 msgstr ""
 
-#: lib-mx/mx.c:605
-msgid "Can't open trash folder"
+#: keymap_defs.h:49
+msgid "send the message"
 msgstr ""
 
-#: lib-mx/mx.c:672
-#, c-format
-msgid "Move read messages to %s?"
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
 msgstr ""
 
-#: lib-mx/mx.c:686 lib-mx/mx.c:935
-#, c-format
-msgid "Purge %d deleted message?"
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
 msgstr ""
 
-#: lib-mx/mx.c:687 lib-mx/mx.c:936
-#, c-format
-msgid "Purge %d deleted messages?"
+#: keymap_defs.h:52
+msgid "update an attachment's encoding info"
 msgstr ""
 
-#: lib-mx/mx.c:704
-#, c-format
-msgid "Moving read messages to %s..."
+#: keymap_defs.h:53
+msgid "write the message to a folder"
 msgstr ""
 
-#: lib-mx/mx.c:755 lib-mx/mx.c:926
-msgid "Mailbox is unchanged."
+#: keymap_defs.h:54
+msgid "copy a message to a file/mailbox"
 msgstr ""
 
-#: lib-mx/mx.c:792
-#, c-format
-msgid "%d kept, %d moved, %d deleted."
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
 msgstr ""
 
-#: lib-mx/mx.c:795 lib-mx/mx.c:972
-#, c-format
-msgid "%d kept, %d deleted."
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
 msgstr ""
 
-#: lib-mx/mx.c:912
-#, c-format
-msgid " Press '%s' to toggle write"
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
 msgstr ""
 
-#: lib-mx/mx.c:914
-msgid "Use 'toggle-write' to re-enable write!"
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
 msgstr ""
 
-#: lib-mx/mx.c:916
-#, c-format
-msgid "Mailbox is marked unwritable. %s"
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
 msgstr ""
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
-msgid "Mailbox is read-only."
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
 msgstr ""
 
-#: lib-mx/mx.c:970
-msgid "Mailbox checkpointed."
+#: keymap_defs.h:61
+msgid "delete the current entry"
 msgstr ""
 
-#: lib-mx/mx.h:55
-#, c-format
-msgid "%s not permitted by ACL."
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
 msgstr ""
 
-#: lib-sys/mutt_signal.c:27
-#, c-format
-msgid "Caught %s...  Exiting.\n"
+#: keymap_defs.h:63
+msgid "delete all messages in subthread"
 msgstr ""
 
-#: lib-sys/mutt_socket.c:44
-msgid "Preconnect command failed."
+#: keymap_defs.h:64
+msgid "delete all messages in thread"
 msgstr ""
 
-#: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
-#, c-format
-msgid "Connection to %s closed"
+#: keymap_defs.h:65
+msgid "display full address of sender"
 msgstr ""
 
-#: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
-#, c-format
-msgid "Error talking to %s (%s)"
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
 msgstr ""
 
-#: lib-sys/mutt_socket.c:334
-#, c-format
-msgid "Bad IDN \"%s\"."
+#: keymap_defs.h:67
+msgid "display a message"
 msgstr ""
 
-#: lib-sys/mutt_socket.c:341
-#, c-format
-msgid "Looking up %s..."
+#: keymap_defs.h:68
+msgid "edit the raw message"
 msgstr ""
 
-#: lib-sys/mutt_socket.c:350
-#, c-format
-msgid "Could not find the host \"%s\""
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
 msgstr ""
 
-#: lib-sys/mutt_socket.c:355
-#, c-format
-msgid "Connecting to %s..."
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
 msgstr ""
 
-#: lib-sys/mutt_socket.c:374
-#, c-format
-msgid "Could not connect to %s (%s)."
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
 msgstr ""
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
-msgid "unknown error"
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:73
+msgid "cycle among incoming mailboxes"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
-msgid "Error: no TLS socket open"
+#: keymap_defs.h:74
+msgid "complete filename or alias"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:151
-#, c-format
-msgid "tls_socket_read (%s)"
+#: keymap_defs.h:75
+msgid "complete address with query"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:171
-#, c-format
-msgid "tls_socket_write (%s)"
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:248
-msgid "All available protocols for TLS/SSL connection disabled"
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:304
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:95
+msgid "move to the first entry"
+msgstr ""
+
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:97
+msgid "followup to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:99
+msgid "forward a message with comments"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:101
+msgid "get all children of the current message"
+msgstr ""
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+msgid "get parent of the current message"
+msgstr ""
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
+#: keymap_defs.h:108
+msgid "jump to an index number"
+msgstr ""
+
+#: keymap_defs.h:109
+msgid "move to the last entry"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:113
+msgid "compose a new mail message"
+msgstr ""
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+msgid "open a different folder in read only mode"
+msgstr ""
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+msgid "open a different newsgroup in read only mode"
+msgstr ""
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:120
+msgid "delete messages matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:121
+msgid "reconstruct thread containing current message"
+msgstr ""
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:123
+msgid "retrieve mail from POP server"
+msgstr ""
+
+#: keymap_defs.h:124
+msgid "move to the first message"
+msgstr ""
+
+#: keymap_defs.h:125
+msgid "move to the last message"
+msgstr ""
+
+#: keymap_defs.h:126
+msgid "show only messages matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:127
+msgid "link tagged message to the current one"
+msgstr ""
+
+#: keymap_defs.h:128
+msgid "jump to the next new message"
+msgstr ""
+
+#: keymap_defs.h:129
+msgid "jump to the next new or unread message"
+msgstr ""
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+msgid "jump to the next thread"
+msgstr ""
+
+#: keymap_defs.h:132
+msgid "move to the next undeleted message"
+msgstr ""
+
+#: keymap_defs.h:133
+msgid "jump to the next unread message"
+msgstr ""
+
+#: keymap_defs.h:134
+msgid "jump to parent message in thread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:137
+msgid "move to the previous undeleted message"
+msgstr ""
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+msgid "jump to the previous unread message"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:144
+msgid "save changes to mailbox"
+msgstr ""
+
+#: keymap_defs.h:145
+msgid "tag messages matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:146
+msgid "undelete messages matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:147
+msgid "untag messages matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+msgid "move to the next entry"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:151
+msgid "move to the next page"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:153
+msgid "toggle display of quoted text"
+msgstr ""
+
+#: keymap_defs.h:154
+msgid "skip beyond quoted text"
+msgstr ""
+
+#: keymap_defs.h:155
+msgid "jump to the top of the message"
+msgstr ""
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+msgid "post message to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:158
+msgid "move to the previous entry"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:160
+msgid "move to the previous page"
+msgstr ""
+
+#: keymap_defs.h:161
+msgid "print the current entry"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:165
+msgid "save changes to mailbox and quit"
+msgstr ""
+
+#: keymap_defs.h:166
+msgid "recall a postponed message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:170
+msgid "reply to a message"
+msgstr ""
+
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:173
+msgid "search for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:175
+msgid "search for next match"
+msgstr ""
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:177
+msgid "toggle search pattern coloring"
+msgstr ""
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:179
+msgid "sort messages"
+msgstr ""
+
+#: keymap_defs.h:180
+msgid "sort messages in reverse order"
+msgstr ""
+
+#: keymap_defs.h:181
+msgid "subscribe to newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:183
+msgid "apply next function to tagged messages"
+msgstr ""
+
+#: keymap_defs.h:184
+msgid "apply next function ONLY to tagged messages"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+msgid "tag the current thread"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:188
+msgid "toggle view of read messages"
+msgstr ""
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:191
+msgid "move to the top of the page"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
+#: keymap_defs.h:194
+msgid "undelete all messages in thread"
+msgstr ""
+
+#: keymap_defs.h:195
+msgid "undelete all messages in subthread"
+msgstr ""
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:199
+msgid "show MIME attachments"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:206
+msgid "go down to next mailbox"
+msgstr ""
+
+#: keymap_defs.h:207
+msgid "go down to next mailbox with new mail"
+msgstr ""
+
+#: keymap_defs.h:208
+msgid "go to previous mailbox"
+msgstr ""
+
+#: keymap_defs.h:209
+msgid "go to previous mailbox with new mail"
+msgstr ""
+
+#: keymap_defs.h:210
+msgid "open hilighted mailbox"
+msgstr ""
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: lib-lua/madmutt.cpkg:94
+#, c-format
+msgid "Directory %s not exist. Create it?"
+msgstr ""
+
+#: lib-lua/madmutt.cpkg:101
+msgid "Cache directory not created!"
+msgstr ""
+
+#: lib-lua/madmutt.cpkg:106
+#, c-format
+msgid "Directory %s is unsafe, do you want to use it ?"
+msgstr ""
+
+#: lib-mime/crypt.c:180
+msgid "S/MIME messages with no hints on content are unsupported."
+msgstr ""
+
+#: lib-mime/rfc1524.c:197
+#, c-format
+msgid "Improperly formated entry for type %s in \"%s\" line %d"
+msgstr ""
+
+#: lib-mime/rfc1524.c:382
+#, c-format
+msgid "mailcap entry for type %s not found"
+msgstr ""
+
+#: lib-mime/rfc822parse.c:517
+msgid "multipart message has no boundary parameter!"
+msgstr ""
+
+#: lib-mx/compress.c:170 lib-mx/mbox.c:339
+msgid "Mailbox was corrupted!"
+msgstr ""
+
+#: lib-mx/compress.c:212
+#, c-format
+msgid "Decompressing %s..."
+msgstr ""
+
+#: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
+#: lib-mx/mbox.c:407
+msgid "Unable to lock mailbox!"
+msgstr ""
+
+#: lib-mx/compress.c:235
+#, c-format
+msgid "echo Decompressing %s..."
+msgstr ""
+
+#: lib-mx/compress.c:246
+#, c-format
+msgid "Error executing: %s : unable to open the mailbox!\n"
+msgstr ""
+
+#: lib-mx/compress.c:327 lib-mx/compress.c:392
+#, c-format
+msgid "Compressing %s..."
+msgstr ""
+
+#: lib-mx/compress.c:352 lib-mx/compress.c:420
+#, c-format
+msgid "echo Compressing %s..."
+msgstr ""
+
+#: lib-mx/compress.c:357
+#, c-format
+msgid ""
+"%s: Error compressing mailbox! Original mailbox deleted, uncompressed one "
+"kept!\n"
+msgstr ""
+
+#: lib-mx/compress.c:394
+#, c-format
+msgid "Compressed-appending to %s..."
+msgstr ""
+
+#: lib-mx/compress.c:422
+#, c-format
+msgid "echo Compressed-appending to %s..."
+msgstr ""
+
+#: lib-mx/compress.c:428
+#, c-format
+msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
+msgstr ""
+
+#: lib-mx/mbox.c:123
+#, c-format
+msgid "Reading %s... %d (%d%%)"
+msgstr ""
+
+#: lib-mx/mbox.c:398 lib-mx/mbox.c:591
+msgid "Fatal error!  Could not reopen mailbox!"
+msgstr ""
+
+#: lib-mx/mbox.c:443
+msgid "sync: mbox modified, but no modified messages! (report this bug)"
+msgstr ""
+
+#: lib-mx/mbox.c:473
+#, c-format
+msgid "Writing messages... %d (%d%%)"
+msgstr ""
+
+#: lib-mx/mbox.c:547
+msgid "Committing changes..."
+msgstr ""
+
+#: lib-mx/mbox.c:576
+#, c-format
+msgid "Write failed!  Saved partial mailbox to %s"
+msgstr ""
+
+#: lib-mx/mbox.c:634
+msgid "Could not reopen mailbox!"
+msgstr ""
+
+#: lib-mx/mbox.c:674
+msgid "Reopening mailbox..."
+msgstr ""
+
+#: lib-mx/mbox.c:864
+msgid "Can't write message"
+msgstr ""
+
+#: lib-mx/mh.c:594 lib-mx/mh.c:746
+#, c-format
+msgid "Reading %s... %d"
+msgstr ""
+
+#: lib-mx/mh.c:995
+msgid "maildir_commit_message(): unable to set time on file"
+msgstr ""
+
+#: lib-mx/mx.c:94
+#, c-format
+msgid "Lock count exceeded, remove lock for %s?"
+msgstr ""
+
+#: lib-mx/mx.c:103
+#, c-format
+msgid "Can't dotlock %s.\n"
+msgstr ""
+
+#: lib-mx/mx.c:183
+msgid "Timeout exceeded while attempting fcntl lock!"
+msgstr ""
+
+#: lib-mx/mx.c:190
+#, c-format
+msgid "Waiting for fcntl lock... %d"
+msgstr ""
+
+#: lib-mx/mx.c:217
+msgid "Timeout exceeded while attempting flock lock!"
+msgstr ""
+
+#: lib-mx/mx.c:225
+#, c-format
+msgid "Waiting for flock attempt... %d"
+msgstr ""
+
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
+#, c-format
+msgid "%s is not a mailbox."
+msgstr ""
+
+#: lib-mx/mx.c:407
+#, c-format
+msgid "Couldn't lock %s\n"
+msgstr ""
+
+#: lib-mx/mx.c:494
+#, c-format
+msgid "Reading %s..."
+msgstr ""
+
+#: lib-mx/mx.c:555
+#, c-format
+msgid "Writing %s..."
+msgstr ""
+
+#: lib-mx/mx.c:584
+msgid "message(s) not deleted"
+msgstr ""
+
+#: lib-mx/mx.c:605
+msgid "Can't open trash folder"
+msgstr ""
+
+#: lib-mx/mx.c:672
+#, c-format
+msgid "Move read messages to %s?"
+msgstr ""
+
+#: lib-mx/mx.c:686 lib-mx/mx.c:935
+#, c-format
+msgid "Purge %d deleted message?"
+msgstr ""
+
+#: lib-mx/mx.c:687 lib-mx/mx.c:936
+#, c-format
+msgid "Purge %d deleted messages?"
+msgstr ""
+
+#: lib-mx/mx.c:704
+#, c-format
+msgid "Moving read messages to %s..."
+msgstr ""
+
+#: lib-mx/mx.c:755 lib-mx/mx.c:926
+msgid "Mailbox is unchanged."
+msgstr ""
+
+#: lib-mx/mx.c:792
+#, c-format
+msgid "%d kept, %d moved, %d deleted."
+msgstr ""
+
+#: lib-mx/mx.c:795 lib-mx/mx.c:972
+#, c-format
+msgid "%d kept, %d deleted."
+msgstr ""
+
+#: lib-mx/mx.c:912
+#, c-format
+msgid " Press '%s' to toggle write"
+msgstr ""
+
+#: lib-mx/mx.c:914
+msgid "Use 'toggle-write' to re-enable write!"
+msgstr ""
+
+#: lib-mx/mx.c:916
+#, c-format
+msgid "Mailbox is marked unwritable. %s"
+msgstr ""
+
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
+msgid "Mailbox is read-only."
+msgstr ""
+
+#: lib-mx/mx.c:970
+msgid "Mailbox checkpointed."
+msgstr ""
+
+#: lib-mx/mx.h:55
+#, c-format
+msgid "%s not permitted by ACL."
+msgstr ""
+
+#: lib-sys/mutt_signal.c:27
+#, c-format
+msgid "Caught %s...  Exiting.\n"
+msgstr ""
+
+#: lib-sys/mutt_socket.c:44
+msgid "Preconnect command failed."
+msgstr ""
+
+#: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
+#, c-format
+msgid "Connection to %s closed"
+msgstr ""
+
+#: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
+#, c-format
+msgid "Error talking to %s (%s)"
+msgstr ""
+
+#: lib-sys/mutt_socket.c:334
+#, c-format
+msgid "Bad IDN \"%s\"."
+msgstr ""
+
+#: lib-sys/mutt_socket.c:341
+#, c-format
+msgid "Looking up %s..."
+msgstr ""
+
+#: lib-sys/mutt_socket.c:350
+#, c-format
+msgid "Could not find the host \"%s\""
+msgstr ""
+
+#: lib-sys/mutt_socket.c:355
+#, c-format
+msgid "Connecting to %s..."
+msgstr ""
+
+#: lib-sys/mutt_socket.c:374
+#, c-format
+msgid "Could not connect to %s (%s)."
+msgstr ""
+
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
+msgid "unknown error"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:151
+#, c-format
+msgid "tls_socket_read (%s)"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:171
+#, c-format
+msgid "tls_socket_write (%s)"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:248
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:304
 #, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr ""
@@ -2172,105 +2942,105 @@ msgstr ""
 msgid "[invalid date]"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 msgid "Certificate is not X.509"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 msgid "Error initialising gnutls certificate data"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 msgid "WARNING: Server certificate is not yet valid"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 msgid "WARNING: Server certificate has expired"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 msgid "WARNING: Server certificate has been revoked"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 msgid "TLS/SSL Certificate check"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr ""
 
@@ -2289,469 +3059,418 @@ msgstr ""
 msgid "Tunnel error talking to %s: %s"
 msgstr ""
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr ""
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr ""
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr ""
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr ""
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
 msgstr ""
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
 msgstr ""
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
 msgstr ""
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr ""
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
 msgstr ""
 
-#: lib-ui/curs_lib.c:155
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr ""
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr ""
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 msgid "Exit Madmutt?"
 msgstr ""
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:317
+msgid "Enter keys (^G to abort): "
+msgstr ""
+
+#: lib-ui/curs_lib.c:321
+#, c-format
+msgid "Char = %s, Octal = %o, Decimal = %d"
+msgstr ""
+
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr ""
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr ""
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
 msgstr ""
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr ""
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
 msgstr ""
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
 msgstr ""
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr ""
-
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr ""
-
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr ""
-
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr ""
-
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr ""
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-msgid "Followup"
-msgstr ""
-
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr ""
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
 msgstr ""
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr ""
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 msgid "Enter Message-ID: "
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 msgid "Message not visible in limited view."
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 msgid "Check for children of message..."
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr ""
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
 msgstr ""
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr ""
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
 msgstr ""
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 msgid "Deletion"
 msgstr ""
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr ""
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
 msgstr ""
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr ""
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 msgid "Quit Madmutt?"
 msgstr ""
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 msgid "Undeletion"
 msgstr ""
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
 msgstr ""
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 msgid "Open newsgroup in read-only mode"
 msgstr ""
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 msgid "Exit Madmutt without saving?"
 msgstr ""
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 msgid "First, please tag a message to be linked here"
 msgstr ""
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr ""
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr ""
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
 msgstr ""
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
 msgstr ""
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr ""
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr ""
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr ""
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
 msgstr ""
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr ""
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr ""
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr ""
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
 msgstr ""
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
 msgstr ""
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr ""
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr ""
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr ""
 
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr ""
 
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr ""
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr ""
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr ""
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr ""
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr ""
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
 msgstr ""
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
 msgstr ""
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr ""
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr ""
-
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr ""
-
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr ""
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
 msgstr ""
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr ""
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr ""
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr ""
 
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-msgid "You are on the last mailbox."
-msgstr ""
-
-#: lib-ui/sidebar.c:423
-msgid "No next mailboxes with new mail."
-msgstr ""
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-msgid "You are on the first mailbox."
-msgstr ""
-
-#: lib-ui/sidebar.c:440
-msgid "No previous mailbox with new mail."
-msgstr ""
-
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 msgid "no mailbox"
 msgstr ""
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr ""
 
@@ -2826,50 +3545,50 @@ msgid ""
 "  -h\t\tthis help message"
 msgstr ""
 
-#: main.c:171
+#: main.c:169
 msgid "Compile Options:"
 msgstr ""
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr ""
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr ""
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr ""
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr ""
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr ""
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
 msgstr ""
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
 msgstr ""
 
@@ -2915,213 +3634,197 @@ msgstr ""
 msgid "%s is not a mailbox!"
 msgstr ""
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: nntp.c:549
+#: nntp.c:551
 #, c-format
 msgid "Unable to open %s for reading"
 msgstr ""
 
-#: nntp.c:554
+#: nntp.c:556
 #, c-format
 msgid "Unable to lock %s"
 msgstr ""
 
-#: nntp.c:567
+#: nntp.c:569
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr ""
 
-#: nntp.c:632
+#: nntp.c:634
 #, c-format
 msgid "Can't write %s"
 msgstr ""
 
-#: nntp.c:640
+#: nntp.c:642
 #, c-format
 msgid "Can't rename %s to %s"
 msgstr ""
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr ""
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, c-format
 msgid "Connected to %s. Posting ok."
 msgstr ""
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: nntp.c:1632
+#: nntp.c:1634
 msgid "Fetching message headers..."
 msgstr ""
 
-#: nntp.c:1633
+#: nntp.c:1635
 msgid "Fetching headers from cache..."
 msgstr ""
 
-#: nntp.c:1644
+#: nntp.c:1646
 msgid "Fetching list of articles..."
 msgstr ""
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, c-format
 msgid "XOVER command failed: %s"
 msgstr ""
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr ""
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: nntp.c:1952
+#: nntp.c:1954
 msgid "Can't post article. No connection to news server."
 msgstr ""
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, c-format
 msgid "Can't post article: %s"
 msgstr ""
 
-#: nntp.c:2083
+#: nntp.c:2064
 msgid "Quitting newsgroup..."
 msgstr ""
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr ""
 
-#: nntp.c:2196
+#: nntp.c:2177
 msgid "Checking for new newsgroups..."
 msgstr ""
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 msgid "Loading descriptions..."
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, c-format
 msgid "Fetching %s from server..."
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr ""
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr ""
-
-#: pager.c:1308
-msgid "View Attachm."
-msgstr ""
-
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr ""
-
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
 msgstr ""
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
 msgstr ""
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr ""
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
 msgstr ""
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr ""
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr ""
 
@@ -3310,105 +4013,97 @@ msgstr ""
 msgid "Can't write message to temporary file!"
 msgstr ""
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr ""
 
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
 msgstr ""
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
 msgstr ""
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
 msgstr ""
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
 msgstr ""
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr ""
-
-#: recvattach.c:34
-msgid "Print"
-msgstr ""
-
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr ""
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr ""
 
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr ""
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr ""
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr ""
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr ""
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr ""
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
 msgstr ""
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr ""
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
 msgstr ""
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr ""
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr ""
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr ""
 
-#: recvattach.c:985
+#: recvattach.c:973
 msgid "Can't delete attachment from newsserver."
 msgstr ""
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr ""
 
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
 msgstr ""
 
@@ -3440,7 +4135,7 @@ msgstr ""
 msgid "Can't find any tagged messages."
 msgstr ""
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr ""
 
@@ -3448,193 +4143,129 @@ msgstr ""
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
 
-#: remailer.c:431
-msgid "Append"
-msgstr ""
-
-#: remailer.c:432
-msgid "Insert"
-msgstr ""
-
-#: remailer.c:433
-msgid "Delete"
-msgstr ""
-
-#: remailer.c:435
-msgid "OK"
-msgstr ""
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr ""
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr ""
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr ""
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr ""
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr ""
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr ""
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr ""
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr ""
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr ""
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr ""
-
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr ""
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr ""
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr ""
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
 msgstr ""
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr ""
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr ""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
 msgstr ""
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr ""
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr ""
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
 msgstr ""
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
 msgstr ""
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
 msgstr ""
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 msgid "Article not posted."
 msgstr ""
 
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr ""
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr ""
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
 msgstr ""
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
 msgstr ""
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr ""
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr ""
 
-#: send.c:1544
+#: send.c:1538
 msgid "No newsgroup specified."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr ""
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr ""
 
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr ""
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr ""
 
@@ -3657,16 +4288,16 @@ msgstr ""
 msgid "Could not open %s"
 msgstr ""
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr ""
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -3679,10 +4310,10 @@ msgstr ""
 msgid "Could not find sorting function! [report this bug]"
 msgstr ""
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
 msgstr ""
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
 msgstr ""

diff --git a/po/nl.po b/po/nl.po
index 2fd780c..0ddaa98 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,15 +3,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-03-20 15:17+0100\n"
-"Last-Translator: René Clerc <rene@clerc.nl>\n"
-"Language-Team: René Clerc <rene@clerc.nl>\n"
+"Last-Translator: René Clerc <rene@clerc.nl>\n"
+"Language-Team: René Clerc <rene@clerc.nl>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Algemene toetsenbindingen:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Ongebonden functies:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -94,22 +94,22 @@ msgstr ""
 "  -v\t\ttoont het versienummer en opties tijdens het compileren\n"
 "  -x\t\tsimuleert de mailx verzendmodus\n"
 "  -y\t\tselecteert een mailfolder gespecificeerd in de `mailboxes' lijst\n"
-"  -z\t\tbeëindigt meteen als er geen berichten in de mailfolder staan\n"
+"  -z\t\tbeëindigt meteen als er geen berichten in de mailfolder staan\n"
 "  -Z\t\topent de eerste mailfolder met nieuwe berichten, eindigt indien "
 "geen\n"
 "  -h\t\tdit hulp bericht"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " ondertekenen als: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "      tot %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "    van %s"
@@ -152,15 +152,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' voor een overzicht): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr " (traditioneel)"
 
@@ -169,11 +169,11 @@ msgstr " (traditioneel)"
 msgid " Press '%s' to toggle write"
 msgstr " Druk '%s' om schrijfmode aan/uit te schakelen"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr " in deze beperkte weergave."
 
@@ -201,32 +201,32 @@ msgstr "%d bewaard, %d gewist."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d bewaard, %d verschoven, %d gewist."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s Wilt U deze sleutel gebruiken?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] werd veranderd. Codering aanpassen?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] bestaat niet meer!"
@@ -236,7 +236,7 @@ msgstr "%s [#%d] bestaat niet meer!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d van de %d berichten gelezen]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s bestaat niet. Aanmaken?"
@@ -251,17 +251,17 @@ msgstr "%s is een ongeldig IMAP pad"
 msgid "%s is an invalid POP path"
 msgstr "%s is een ongeldig POP pad"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr "%s is een ongeldig POP pad"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr "%s is een ongeldig POP pad"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s is geen directory."
@@ -271,7 +271,7 @@ msgstr "%s is geen directory."
 msgid "%s is not a mailbox!"
 msgstr "%s is geen mailfolder!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s is geen mailfolder."
@@ -298,52 +298,52 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: Onbekend type."
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s: Terminal ondersteunt geen kleur"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s: Commando alleen geldig voor index-objecten"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: Attribuut onbekend"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: onbekende kleur"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: onbekende functie"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: onbekende functie"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: Menu onbekend"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: Object onbekend"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: Te weinig argumenten"
@@ -353,37 +353,37 @@ msgstr "%s: Te weinig argumenten"
 msgid "%s: unable to attach file"
 msgstr "%s: kan bestand niet toevoegen"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: kan bestand niet bijvoegen.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: onbekend commando"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: onbekend type"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: onbekende variable"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
 msgstr "%s is een ongeldig POP pad"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr "%s is een ongeldig POP pad"
@@ -392,15 +392,15 @@ msgstr "%s is een ongeldig POP pad"
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' moet aan een toets gekoppeld zijn!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(geen mailfolder)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(w)eigeren, (e)enmalig toelaten"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(w)eigeren, (e)enmalig toelaten, (a)ltijd toelaten"
 
@@ -418,20 +418,20 @@ msgstr "(gebruik '%s' om dit gedeelte weer te geven)"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Bijlagen"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<onbekend>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<standaard>"
 
@@ -447,35 +447,31 @@ msgstr ""
 msgid "APOP authentication failed."
 msgstr "APOP authenticatie geweigerd."
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Afbreken"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
 msgstr "Uitgesteld bericht afbreken?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
 msgstr "Bericht werd niet veranderd. Operatie afgebroken."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adres: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Adres toegevoegd."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Afkorten als: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Afkortingen"
 
@@ -483,64 +479,60 @@ msgstr "Afkortingen"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "Alle overeenkomende sleutels zijn verlopen/ingetrokken."
 
-#: remailer.c:431
-msgid "Append"
-msgstr "Toevoegen"
-
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Bericht aan %s toevoegen?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
 msgstr "Argument moet een berichtennummer zijn."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Bijlage opgeslagen."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Bijvoegen"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Opgegeven bestanden worden bijgevoegd..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Bijlage gefilterd."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Bijlage opgeslagen."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Bijlagen"
 
@@ -571,12 +563,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr "Ongeldige IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "Ongeldige IDN %s tijdens maken resent-from header."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "Ongeldige IDN in \"%s\": '%s'"
@@ -590,7 +582,7 @@ msgstr "Ongeldig IDN: '%s'"
 msgid "Bad mailbox name"
 msgstr "Verkeerde mailfolder naam"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "Einde van bericht is weergegeven."
 
@@ -612,7 +604,7 @@ msgstr "Berichten doorsturen aan %s"
 msgid "Bounce tagged messages to: "
 msgstr "Gemarkeerde berichten doorsturen naar: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -629,16 +621,16 @@ msgstr ""
 msgid "Can't append to folder: %s"
 msgstr "Kan bericht niet toevoegen aan mailfolder %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "Directory kan niet worden getoond!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan bestand %s niet aanmaken: %s"
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Kan bestand %s niet aanmaken"
@@ -651,10 +643,10 @@ msgstr "Kan filter niet aanmaken"
 msgid "Can't create filter process"
 msgstr "Kan filter proces niet aanmaken"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "Kan tijdelijk bestand niet aanmaken"
 
@@ -666,15 +658,15 @@ msgstr "Kan niet alle bijlagen decoderen. De rest inpakken met MIME?"
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "Kan niet alle bijlagen decoderen. De rest doorsturen met MIME?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
 msgstr "Kan het versleutelde bericht niet ontsleutelen!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "Kan de bijlage niet van de POP server verwijderen."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "Kan de bijlage niet van de POP server verwijderen."
@@ -692,10 +684,6 @@ msgstr ""
 msgid "Can't find any tagged messages."
 msgstr "Kan geen geselecteerde berichten vinden."
 
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Kan type2.list niet lezen van mixmaster."
-
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
 msgstr "Naamsjabloon kan niet worden ingevuld, doorgaan?"
@@ -710,27 +698,27 @@ msgstr "Kan bestand %s niet openen."
 msgid "Can't open trash folder"
 msgstr "Kan bericht niet toevoegen aan mailfolder %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Verbinding met %s beëindigd"
+msgstr "Verbinding met %s beëindigd"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "Verbinding met POP-server wordt gesloten.."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Kan %s niet statten: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "Kan bestand %s niet aanmaken: %s"
@@ -744,7 +732,7 @@ msgstr "Kan het bericht niet opslaan in de POP mailfolder."
 msgid "Can't save message to newsserver."
 msgstr "Kan bericht op POP server niet aanpassen."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Kan %s niet statten: %s"
@@ -753,11 +741,11 @@ msgstr "Kan %s niet statten: %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "Directory kan niet worden getoond."
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "Kan bestand %s niet aanmaken."
@@ -782,43 +770,39 @@ msgstr "Display filter kan niet worden aangemaakt."
 msgid "Cannot create filter"
 msgstr "Filter kan niet worden aangemaakt."
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "Kan niet schrijven in een scrijfbeveiligde mailfolder!"
 
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
-
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "Signaal %s...\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "Certificaat van de server is nog niet geldig"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Certificaat wordt bewaard"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
 msgstr ""
 "Wijzigingen zullen worden weggeschreven bij het verlaten van de mailfolder."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
 msgstr "Wijzigingen worden niet weggeschreven."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Karakter = %s, Octaal = %o, Decimaal = %d"
@@ -828,28 +812,20 @@ msgstr "Karakter = %s, Octaal = %o, Decimaal = %d"
 msgid "Character set changed to %s; %s."
 msgstr "Karakterset veranderd naar %s; %s."
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "Wijzig directory"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Wisselen naar directory: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Controleren op nieuwe berichten..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Controleer sleutel "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Controleren op nieuwe berichten..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Controleren op nieuwe berichten..."
@@ -858,7 +834,7 @@ msgstr "Controleren op nieuwe berichten..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Geen"
 
@@ -866,7 +842,7 @@ msgstr "Geen"
 msgid "Clear flag"
 msgstr "Verwijder markering"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "Verbinding met %s wordt gesloten..."
@@ -875,7 +851,7 @@ msgstr "Verbinding met %s wordt gesloten..."
 msgid "Closing connection to POP server..."
 msgstr "Verbinding met POP-server wordt gesloten.."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Bezig met verbinden met %s..."
@@ -894,7 +870,7 @@ msgstr "Het UIDL commando wordt niet door de server ondersteund."
 msgid "Committing changes..."
 msgstr "Wijzigingen doorvoeren..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -915,12 +891,12 @@ msgstr "Kopieren naar %s..."
 msgid "Compressing %s..."
 msgstr "Kopieren naar %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Bezig met verbinden met %s..."
@@ -947,19 +923,19 @@ msgstr "Verbinging verbroken. Opnieuw verbinden met POP server?"
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "Verbinding met %s beëindigd"
+msgstr "Verbinding met %s beëindigd"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Verbinding met %s beëindigd"
+msgstr "Verbinding met %s beëindigd"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type veranderd naar %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type is van de vorm basis/subtype"
 
@@ -975,7 +951,7 @@ msgstr "Converteren naar %s bij versturen?"
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "Kopiëren%s naar mailfolder"
+msgstr "Kopiëren%s naar mailfolder"
 
 #: imap/message.c:681
 #, c-format
@@ -1010,11 +986,11 @@ msgstr "Kan niet verbinden met %s (%s)."
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "Bericht kon niet gekopiëerd worden."
+msgstr "Bericht kon niet gekopiëerd worden."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
 msgstr "Tijdelijk bestand kon niet worden aangelegd!"
@@ -1032,7 +1008,7 @@ msgstr "Kan 'sorting function' niet vinden! [Meldt deze bug!]"
 msgid "Could not find the host \"%s\""
 msgstr "Kan adres van server \"%s\" niet achterhalen"
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
 msgstr "Kon niet alle berichten citeren!"
 
@@ -1049,7 +1025,7 @@ msgstr "Kan %s niet openen."
 msgid "Could not reopen mailbox!"
 msgstr "Kan mailfolder niet opnieuw openen!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "Bericht kon niet verstuurd worden."
 
@@ -1063,7 +1039,7 @@ msgstr "Kan %s niet claimen.\n"
 msgid "Create %s?"
 msgstr "%s aanmaken?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Alleen IMAP folders kunnen aangemaakt worden"
 
@@ -1074,7 +1050,7 @@ msgstr "Mailfolder aanmaken: "
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "Decoderen-kopiëren%s naar mailfolder"
+msgstr "Decoderen-kopiëren%s naar mailfolder"
 
 #: commands.c:596
 #, c-format
@@ -1089,31 +1065,22 @@ msgstr "%s wordt uitgekozen..."
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Ontsleutelen-kopiëren%s naar mailfolder"
+msgstr "Ontsleutelen-kopiëren%s naar mailfolder"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Ontsleutelen-opslaan%s in mailfolder"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
 msgstr "Bericht wordt ontsleuteld..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
 msgstr "Ontsleuteling mislukt."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Wis"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Verwijderen"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Alleen IMAP folders kunnen verwijderd worden"
 
@@ -1121,25 +1088,21 @@ msgstr "Alleen IMAP folders kunnen verwijderd worden"
 msgid "Delete messages from server?"
 msgstr "Berichten op de server verwijderen?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Wis berichten volgens patroon: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Verwijderen"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr ""
 "Het wissen van bijlagen uit versleutelde berichten is niet ondersteund."
 
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Omschrijving"
-
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
@@ -1150,20 +1113,20 @@ msgstr "ID %s is niet geverifieerd. Wilt u het gebruiken voor %s ?"
 msgid "Directory %s not exist. Create it?"
 msgstr "%s bestaat niet. Aanmaken?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Directory [%s], Bestandsmasker: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "FOUT: Meldt deze bug!"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
 msgstr "Doorgestuurd bericht wijzigen?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1172,11 +1135,11 @@ msgstr ""
 msgid "Empty expression"
 msgstr "Fout in expressie"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Versleutelen"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
 msgstr "Versleutelen met: "
 
@@ -1184,17 +1147,17 @@ msgstr "Versleutelen met: "
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Geef keyID: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "KeyID voor %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
 msgstr "Geef toetsen in (^G om af te breken): "
 
@@ -1221,7 +1184,7 @@ msgstr "Fout tijdens verbinden met server: %s"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Fout tijdens verbinden met server: %s"
@@ -1230,12 +1193,12 @@ msgstr "Fout tijdens verbinden met server: %s"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fout in %s, regel %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fout in opdrachtregel: %s\n"
@@ -1245,12 +1208,12 @@ msgstr "Fout in opdrachtregel: %s\n"
 msgid "Error in expression: %s"
 msgstr "Fout in expressie: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Kan terminal niet initialiseren."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Kan terminal niet initialiseren."
 
@@ -1262,39 +1225,30 @@ msgstr "Er is een fout opgetreden tijdens het openen van de mailfolder"
 msgid "Error parsing address!"
 msgstr "Ongeldig adres!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Fout opgetreden bij het uitvoeren van \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "Fout opgetreden tijdens het analyseren van de directory."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Fout %d opgetreden tijdens versturen van bericht: %s"
 
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Externe fout %d opgetreden tijdens versturen van bericht.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Fout opgetreden tijdens het verzenden van het bericht."
-
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Verbinding met %s mislukt (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Fout opgetreden tijdens het weergeven van bestand"
 
@@ -1307,25 +1261,20 @@ msgstr "Er is een fout opgetreden tijdens het wegschrijven van de mailfolder!"
 msgid "Error. Preserving temporary file: %s"
 msgstr "Fout opgetreden. Tijdelijk bestand opgeslagen als: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Fout: %s kan niet gebruikt worden als laaste remailer van een lijst."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Fout: '%s' is een ongeldige IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1342,7 +1291,7 @@ msgstr "Fout: multipart/signed zonder protocol-parameter."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Fout in opdrachtregel: %s\n"
@@ -1356,21 +1305,12 @@ msgstr "Headercache wordt gelezen... [%d/%d]"
 msgid "Executing command on matching messages..."
 msgstr "Commando wordt uitgevoerd..."
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Afsluiten"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Einde "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
 msgstr "Mutt verlaten zonder op te slaan?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
 msgstr "Mutt afsluiten?"
@@ -1403,17 +1343,17 @@ msgstr "Fatale fout! Kon mailfolder niet opnieuw openen!"
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "Kritieke fout.  Berichtenteller wijkt af!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Berichten op de server worden gewist..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "Bericht wordt gelezen..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "Berichtenlijst ophalen..."
@@ -1422,7 +1362,7 @@ msgstr "Berichtenlijst ophalen..."
 msgid "Fetching list of messages..."
 msgstr "Berichtenlijst ophalen..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "Headers worden opgehaald... [%d/%d]"
@@ -1432,11 +1372,11 @@ msgstr "Headers worden opgehaald... [%d/%d]"
 msgid "Fetching message headers... [%d/%d]"
 msgstr "Headers worden opgehaald... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Bericht wordt gelezen..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "Bestandsmasker: "
 
@@ -1456,39 +1396,34 @@ msgstr "Bestand is een directory, daarin opslaan? [(j)a, (n)ee, (a)llen]"
 msgid "File under directory: "
 msgstr "Bestandsnaam in directory: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filter door: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Handtekening: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "sla dit bericht op om later te verzenden"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Reactie sturen naar %s%s?"
 
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Reactie sturen naar %s%s?"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "Doorsturen als MIME-bijlage?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Doorsturen als bijlage?"
 
@@ -1496,7 +1431,7 @@ msgstr "Doorsturen als bijlage?"
 msgid "Forward as attachments?"
 msgstr "Doorsturen als bijlagen?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
 msgstr "Funktie wordt niet ondersteund in deze modus"
 
@@ -1512,28 +1447,17 @@ msgstr "Namespace wordt overgehaald..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Groep"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Hulp"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Hulp voor %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
 msgstr "Hulp wordt al weergegeven."
 
@@ -1541,36 +1465,36 @@ msgstr "Hulp wordt al weergegeven."
 msgid "I don't know how to print that!"
 msgstr "Ik weet niet hoe dit afgedrukt moet worden!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Kan %s bijlagen niet afdrukken!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "Dit ID heeft ongedefiniëerde geldigheid."
+msgstr "Dit ID heeft ongedefiniëerde geldigheid."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
 msgstr "Dit ID is verlopen/uitgeschakeld/ingetrokken."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
 msgstr "Dit ID is niet geldig."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
 msgstr "Dit ID is slechts marginaal vertrouwd."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
 msgstr "Ongeldige PGP-Header"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
 msgstr "Ongeldige S/MIME header"
 
@@ -1579,39 +1503,35 @@ msgstr "Ongeldige S/MIME header"
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "Ongeldig geformuleerde entry voor type %s in \"%s\", regel %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr "Bericht in antwoord citeren?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Geciteerde bericht wordt toegevoegd..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Invoegen"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Ongeldige dag van de maand: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "Ongeldige codering."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "Ongeldig Indexnummer."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
 msgstr "Ongeldig berichtennummer"
 
@@ -1625,11 +1545,11 @@ msgstr "Ongeldige maand: %s"
 msgid "Invalid relative date: %s"
 msgstr "Ongeldige maand: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "PGP wordt aangeroepen..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "PGP wordt aangeroepen..."
@@ -1639,76 +1559,72 @@ msgstr "PGP wordt aangeroepen..."
 msgid "Invoking autoview command: %s"
 msgstr "Commando wordt aangeroepen: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Ga naar bericht: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Ga naar: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
 msgstr "Verspringen is niet mogelijk in menu."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Sleutel ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
 msgstr "Toets is niet in gebruik."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Toets is niet in gebruik. Toets '%s' voor hulp."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "Limiteer berichten volgens patroon: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Limiet: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Aanmelden..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1718,15 +1634,15 @@ msgstr ""
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "Claim-timeout overschreden, oude claim voor %s verwijderen?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Aanmelden..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Aanmelden mislukt..."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "Zoeken naar sleutels voor \"%s\"..."
@@ -1736,7 +1652,7 @@ msgstr "Zoeken naar sleutels voor \"%s\"..."
 msgid "Looking up %s..."
 msgstr "%s aan het opzoeken..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Handtekening: %s"
@@ -1745,23 +1661,19 @@ msgstr "Handtekening: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME type is niet gedefinieerd. Kan bijlage niet weergeven."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "Macro-lus gedetecteerd."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Sturen"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "Bericht niet verstuurd."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Bericht verstuurd."
 
@@ -1777,11 +1689,11 @@ msgstr "Mailfolder is gesloten."
 msgid "Mailbox created."
 msgstr "Mailfolder is aangemaakt."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr "Mailfolder is verwijderd."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
 msgstr "Mailfolder is leeg."
 
@@ -1790,7 +1702,7 @@ msgstr "Mailfolder is leeg."
 msgid "Mailbox is marked unwritable. %s"
 msgstr "De mailfolder is als schrijfbeveiligd gemarkeerd. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
 msgstr "Mailfolder is schrijfbeveiligd."
 
@@ -1802,7 +1714,7 @@ msgstr "Mailfolder is niet veranderd."
 msgid "Mailbox must have a name."
 msgstr "Mailfolder moet een naam hebben."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
 msgstr "Mailfolder is niet verwijderd."
 
@@ -1814,15 +1726,15 @@ msgstr "Mailfolder is hernoemd."
 msgid "Mailbox was corrupted!"
 msgstr "Mailfolder was beschadigd!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
 msgstr "Mailfolder is extern veranderd."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "Mailfolder is extern veranderd. Markeringen kunnen onjuist zijn."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Mailfolders [%d]"
@@ -1837,11 +1749,7 @@ msgstr "\"edit\"-entry in mailcap vereist %%s."
 msgid "Mailcap compose entry requires %%s"
 msgstr "\"compose\"-entry in mailcap vereist %%s."
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Afkorting maken"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1850,19 +1758,15 @@ msgstr ""
 msgid "Marking %d messages deleted..."
 msgstr "%d berichten worden gemarkeerd voor verwijdering..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Masker"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Bericht doorgestuurd."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1882,12 +1786,12 @@ msgstr "Bericht niet doorgestuurd."
 msgid "Message not modified!"
 msgstr "Bericht niet gewijzigd!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
 msgstr "Vorig bericht niet zichtbaar in gelimiteerd overzicht."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "Bericht uitgesteld."
 
@@ -1895,7 +1799,7 @@ msgstr "Bericht uitgesteld."
 msgid "Message printed"
 msgstr "Bericht afgedrukt"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Bericht opgeslagen."
 
@@ -1915,19 +1819,10 @@ msgstr "Berichten niet doorgestuurd."
 msgid "Messages printed"
 msgstr "Berichten afgedrukt"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Argumenten afwezig."
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Mixmaster lijsten zijn beperkt tot %d items."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster laat geen Cc or Bcc headers toe."
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
@@ -1938,19 +1833,15 @@ msgstr "Gelezen berichten naar %s verplaatsen?"
 msgid "Moving read messages to %s..."
 msgstr "Gelezen berichten worden naar %s verplaatst..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nieuwe query"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nieuwe bestandsnaam: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Nieuw bestand: "
 
@@ -1958,41 +1849,33 @@ msgstr "Nieuw bestand: "
 msgid "New mail in "
 msgstr "Nieuw bericht in "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr "Nieuwe berichten in deze mailfolder."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Volgend ber."
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "Volg.P"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2004,30 +1887,30 @@ msgstr "Geen authenticeerders beschikbaar"
 msgid "No boundary parameter found! [report this error]"
 msgstr "Geen 'boundary parameter' gevonden! [meldt deze fout!]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Geen items"
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Geen bestanden waarop het masker past gevonden."
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
 msgstr "Geen mailfolders opgegeven."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
 msgstr "Er is geen beperkend patroon in werking."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
 msgstr "Er is geen mailfolder geopend."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr "Geen mailfolder met nieuwe berichten."
 
@@ -2041,7 +1924,7 @@ msgstr "Geen \"compose\"-entry voor %s, een leeg bestand wordt aangemaakt."
 msgid "No mailcap edit entry for %s"
 msgstr "Geen \"edit\"-entry voor %s in mailcap."
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "Geen mailing-lists gevonden!"
 
@@ -2049,7 +1932,7 @@ msgstr "Geen mailing-lists gevonden!"
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Geen geschikte mailcap-entry gevonden.  Weergave als normale tekst."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "Geen berichten in deze mailfolder."
 
@@ -2057,15 +1940,15 @@ msgstr "Geen berichten in deze mailfolder."
 msgid "No messages matched criteria."
 msgstr "Geen berichten voldeden aan de criteria."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "Geen verdere geciteerde text."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "Geen verdere threads."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "Geen verdere eigen text na geciteerde text."
 
@@ -2073,71 +1956,61 @@ msgstr "Geen verdere eigen text na geciteerde text."
 msgid "No new mail in POP mailbox."
 msgstr "Geen nieuwe berichten op de POP-server."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Geen nieuwe berichten"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Geen onderwerp."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Geen bestanden waarop het masker past gevonden."
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Geen mailfolder met nieuwe berichten."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "Geen uitgestelde berichten."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Geen mailfolder met nieuwe berichten."
-
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Er is geen print commando gedefiniëerd."
+msgstr "Er is geen print commando gedefiniëerd."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
 msgstr "Er zijn geen geadresseerden opgegeven!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr "Geen ontvangers opgegeven.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
 msgstr "Er werden geen geadresseerden opgegeven!"
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "Geen zoekpatroon."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Geen onderwerp."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "Geen onderwerp. Versturen afbreken?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "Geen onderwerp, afbreken?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Geen onderwerp. Operatie afgebroken."
 
@@ -2145,108 +2018,104 @@ msgstr "Geen onderwerp. Operatie afgebroken."
 msgid "No such folder"
 msgstr "Niet bestaande mailfolder"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "Geen geselecteerde items."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
 msgstr "Geen gemarkeerde berichten zichtbaar!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr "Alle berichten zijn gewist."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "Geen ongelezen berichten"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "Geen zichtbare berichten"
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
 msgstr "Optie niet beschikbaar in dit menu."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Niet gevonden."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
 msgstr "Niets te doen."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
 msgstr "Kan alleen multipart-bijlagen wissen."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
 msgstr "Open mailfolder"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
 msgstr "Open mailfolder in schrijfbeveiligde modus"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
 msgstr "Open mailfolder waaruit een bericht als bijlage toegevoegd wordt"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "Open mailfolder in schrijfbeveiligde modus"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "Open mailfolder waaruit een bericht als bijlage toegevoegd wordt"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Uitvoer van het afleverings proces"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
 "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, %s, of (g)een? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP al geselecteerd. Wissen & doorgaan ? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP-sleutels voor <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP-sleutels voor <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP handtekening kon NIET worden geverifiëerd."
+msgstr "PGP handtekening kon NIET worden geverifiëerd."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
@@ -2256,11 +2125,11 @@ msgstr "PGP handtekening is correct bevonden."
 msgid "POP host is not defined."
 msgstr "Er is geen POP-server gespecificeerd."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
 msgstr "Vorig bericht is niet beschikbaar."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
 msgstr "Vorig bericht niet zichtbaar in gelimiteerd overzicht."
 
@@ -2269,40 +2138,27 @@ msgstr "Vorig bericht niet zichtbaar in gelimiteerd overzicht."
 msgid "Password for %s@%s: "
 msgstr "Wachtwoord voor %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Naam: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Filteren"
-
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "Doorsluizen naar commando: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Doorgeven aan (pipe): "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "De hostname variable moet ingesteld zijn voor mixmaster gebruik!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr "Bericht uitstellen?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Uitgestelde Berichten"
 
@@ -2310,23 +2166,15 @@ msgstr "Uitgestelde Berichten"
 msgid "Preconnect command failed."
 msgstr "Preconnect commando is mislukt."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "Voorbereiden door te sturen bericht..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr "Druk een willekeurige toets in..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "Vorig.P"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Druk af"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "Bijlage afdrukken?"
 
@@ -2334,7 +2182,7 @@ msgstr "Bijlage afdrukken?"
 msgid "Print message?"
 msgstr "Bericht afdrukken?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
 msgstr "Gemarkeerde bericht(en) afdrukken?"
 
@@ -2352,34 +2200,30 @@ msgstr "%d als gewist gemarkeerde berichten verwijderen?"
 msgid "Purge %d deleted messages?"
 msgstr "%d als gewist gemarkeerde berichten verwijderen?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Zoekopdracht"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Zoekopdracht '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
 msgstr "Query-commando niet gedefinieerd."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Zoekopdracht: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Einde"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "Mutt afsluiten?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Namespace wordt overgehaald..."
@@ -2404,16 +2248,16 @@ msgstr "Bezig met het lezen van %s... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Bezig met het lezen van nieuwe berichten (%d bytes)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Mailfolder \"%s\" echt verwijderen?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
 msgstr "Uigesteld bericht hervatten?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr "Codering wijzigen is alleen van toepassing op bijlagen."
 
@@ -2422,7 +2266,7 @@ msgstr "Codering wijzigen is alleen van toepassing op bijlagen."
 msgid "Rename failed: %s"
 msgstr "Hernoemen mislukt: %s"
 
-#: browser.c:1020
+#: browser.c:991
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Alleen IMAP folders kunnen hernoemd worden"
 
@@ -2431,7 +2275,7 @@ msgstr "Alleen IMAP folders kunnen hernoemd worden"
 msgid "Rename mailbox %s to: "
 msgstr "Mailfolder %s hernoemen naar: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Hernoemen naar: "
 
@@ -2439,15 +2283,11 @@ msgstr "Hernoemen naar: "
 msgid "Reopening mailbox..."
 msgstr "Mailfolder wordt heropend.."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Antw."
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Reactie sturen naar %s%s?"
@@ -2460,26 +2300,26 @@ msgstr ""
 "Omgekeerd (d)atum/(v)an/o(n)tv/(o)nd/(a)an/(t)hread/(u)nsort/(g)r/(s)core/s"
 "(p)am?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr "Zoek achteruit naar: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
 msgstr "Achteruit zoeken: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr ""
 "Achteruit sorteren op (d)atum, bestands(g)rootte, (a)lfabet of (n)iet? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
 "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, %s, of (g)een? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME al geselecteerd. Wissen & doorgaan ? "
 
@@ -2487,7 +2327,7 @@ msgstr "S/MIME al geselecteerd. Wissen & doorgaan ? "
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME certificaat eigenaar komt niet overeen met afzender."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME certficiaten voor \"%s\"."
@@ -2499,7 +2339,7 @@ msgstr ""
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME handtekening kon NIET worden geverifiëerd."
+msgstr "S/MIME handtekening kon NIET worden geverifiëerd."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
@@ -2509,7 +2349,7 @@ msgstr "S/MIME handtekening is correct bevonden."
 msgid "SASL authentication failed."
 msgstr "SASL authenticatie geweigerd."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Handtekening: %s"
@@ -2519,20 +2359,16 @@ msgstr "Handtekening: %s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "SSL verbinding via %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Opslaan"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "Een kopie van dit bericht maken?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Opslaan als: "
 
@@ -2546,15 +2382,11 @@ msgstr "Opslaan%s in mailfolder"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Berichten-status wordt opgeslagen... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Bezig met opslaan..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Zoeken"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Zoek naar: "
 
@@ -2570,62 +2402,46 @@ msgstr "Zoeken heeft begin bereikt zonder iets te vinden"
 msgid "Search interrupted."
 msgstr "Zoeken onderbroken."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
 msgstr "In dit menu kan niet worden gezocht."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
 msgstr "Zoekopdracht onderaan begonnen."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
 msgstr "Zoekopdracht bovenaan begonnen."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Zoeken: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Selecteren"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Selecteer  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Selecteer een remailer lijster."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "%s wordt uitgekozen..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Versturen"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Bericht wordt op de achtergrond verstuurd."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Verstuur bericht..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
 msgstr "Server heeft verbinding gesloten!"
 
@@ -2637,15 +2453,15 @@ msgstr "Zet markering"
 msgid "Shell command: "
 msgstr "Shell commando: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Ondertekenen"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Ondertekenen als: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Ondertekenen, Versleutelen"
 
@@ -2657,7 +2473,7 @@ msgstr ""
 "Sorteren (d)atum/(v)an/o(n)tv/(o)nd/(a)an/(t)hread/(u)nsort/(g)r/(s)core/s(p)"
 "am?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sorteren op (d)atum, bestands(g)rootte, (a)lfabet of helemaal (n)iet?"
 
@@ -2665,26 +2481,22 @@ msgstr "Sorteren op (d)atum, bestands(g)rootte, (a)lfabet of helemaal (n)iet?"
 msgid "Sorting mailbox..."
 msgstr "Mailfolder wordt gesorteerd..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Sleutel ID: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Geselecteerd [%s], Bestandsmasker: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2693,24 +2505,24 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "Aanmelden voor %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "SSL certificaat controle"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr "Berichten markeren volgens patroon: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
 msgstr "Selecteer de berichten die u wilt bijvoegen!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
 msgstr "Markeren is niet ondersteund."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr "Dit bericht is niet zichtbaar."
 
@@ -2719,11 +2531,11 @@ msgstr "Dit bericht is niet zichtbaar."
 msgid "The CRL is not available\n"
 msgstr "SSL is niet beschikbaar."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr "Deze bijlage zal geconverteerd worden."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr "Deze bijlage zal niet geconverteerd worden."
 
@@ -2731,19 +2543,15 @@ msgstr "Deze bijlage zal niet geconverteerd worden."
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "De berichtenindex is niet correct. Probeer mailfolder te heropenen."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "De remailer lijst is al leeg."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "Bericht bevat geen bijlage."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Er zijn geen berichten."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "Er zijn geen onderdelen om te laten zien!"
 
@@ -2751,38 +2559,38 @@ msgstr "Er zijn geen onderdelen om te laten zien!"
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Mutt kan niet overweg met deze antieke IMAP server."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr "Dit certificaat behoort aan:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr "Dit certificaat is geldig"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr "Dit certificaat is uitgegeven door:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "Deze sleutel is onbruikbaar: verlopen/ingetrokken."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
 msgstr "Thread bevat ongelezen berichten"
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
 msgstr "Het weergeven van threads is niet ingeschakeld."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
@@ -2794,23 +2602,27 @@ msgstr "De fcntl-claim kon niet binnen de toegestane tijd worden verkregen."
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "de flock-claim kon niet binnen de toegestane tijd worden verkregen."
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
 msgstr "Begin van bericht is weergegeven."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr "PGP sleutels onttrekken...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "S/MIME certificaten onttrekken...\n"
 
@@ -2829,12 +2641,12 @@ msgstr ""
 msgid "USER authentication failed."
 msgstr "SASL authenticatie geweigerd."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Kan %s niet bijvoegen!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "Kan niet bijvoegen!"
 
@@ -2842,7 +2654,7 @@ msgstr "Kan niet bijvoegen!"
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "Kan berichtenoverzicht niet overhalen van deze IMAP server."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "Kan server certificaat niet verkrijgen"
 
@@ -2850,7 +2662,7 @@ msgstr "Kan server certificaat niet verkrijgen"
 msgid "Unable to leave messages on server."
 msgstr "Niet in staat berichten op de server achter te laten."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "Kan %s niet bijvoegen!"
@@ -2860,12 +2672,12 @@ msgstr "Kan %s niet bijvoegen!"
 msgid "Unable to lock mailbox!"
 msgstr "Kan mailfolder niet claimen!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
 msgstr "Tijdelijk bestand kon niet worden geopend!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
 msgstr "Tijdelijk bestand kon niet worden geopend!"
@@ -2874,31 +2686,22 @@ msgstr "Tijdelijk bestand kon niet worden geopend!"
 msgid "Unable to open temporary file!"
 msgstr "Tijdelijk bestand kon niet worden geopend!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Herstel"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "Herstel berichten: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Herstel"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Onbekend Content-Type %s"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Afmelden voor %s..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Afmelden voor %s..."
@@ -2908,7 +2711,7 @@ msgstr "Afmelden voor %s..."
 msgid "Unsubscribing to %s..."
 msgstr "Afmelden voor %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "Verwijder markering volgens patroon: "
 
@@ -2921,7 +2724,7 @@ msgstr "Bericht wordt verstuurd ..."
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "Gebruik 'toggle-write' om schrijven mogelijk te maken!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "KeyID = \"%s\" gebruiken voor %s?"
@@ -2931,33 +2734,25 @@ msgstr "KeyID = \"%s\" gebruiken voor %s?"
 msgid "Username at %s: "
 msgstr "Gebruikersnaam voor %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "Ongeldige maand: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "Ongeldige maand: %s"
 
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
-
 #: commands.c:89
 msgid "Verify PGP signature?"
 msgstr "PGP-handtekening controleren?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Berichten index wordt geverifiëerd..."
+msgstr "Berichten index wordt geverifiëerd..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Bijlagen tonen"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "Waarschuwing! Bestand %s bestaat al. Overschrijven?"
@@ -2968,26 +2763,26 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "Certificaat van de server is verlopen"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "Certificaat van de server is verlopen"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "Certificaat van de server is nog niet geldig"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "Certificaat van de server is nog niet geldig"
@@ -3012,11 +2807,11 @@ msgstr "Wacht op fcntl-claim... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "Wacht op flock-poging... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Wacht op antwoord..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "Waarschuwing: '%s' is een ongeldige IDN."
@@ -3026,12 +2821,12 @@ msgstr "Waarschuwing: '%s' is een ongeldige IDN."
 msgid "Warning: At least one certification key has expired\n"
 msgstr "Certificaat van de server is verlopen"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "Waarschuwing: Ongeldige IDN '%s' in alias '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Waarschuwing: certificaat kan niet bewaard worden"
 
@@ -3052,17 +2847,17 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
 msgstr "De bijlage kan niet worden aangemaakt"
 
@@ -3075,7 +2870,7 @@ msgstr "Opslaan mislukt! Deel-mailfolder opgeslagen als %s"
 msgid "Write fault!"
 msgstr "Fout bij schrijven!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Sla bericht op in mailfolder"
 
@@ -3084,7 +2879,7 @@ msgstr "Sla bericht op in mailfolder"
 msgid "Writing %s..."
 msgstr "Bezig met het schrijven van %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Bericht wordt opgeslagen in %s ..."
@@ -3094,82 +2889,64 @@ msgstr "Bericht wordt opgeslagen in %s ..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Berichten worden opgeslagen ... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Fout in opdrachtregel: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
 msgstr "U heeft al een afkorting onder die naam!"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Het eerste lijst-item is al geselecteerd."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Het laaste lijst-item is al geselecteerd."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr "U bent op het eerste item."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "U bent op de eerste pagina."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr "U bent bij het eerste bericht."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr "U bent op de eerste pagina."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
 msgstr "U bent al bij de eerste thread."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr "U bent op het laatste item."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "U bent op de laatste pagina."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "U bent bij het laatste bericht."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr "U bent op de laatste pagina."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
 msgstr "U kunt niet verder naar beneden gaan."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
 msgstr "U kunt niet verder naar boven gaan."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
 msgstr "Geen afkortingen opgegeven!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Een bericht bestaat uit minimaal één gedeelte."
+msgstr "Een bericht bestaat uit minimaal één gedeelte."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
 msgstr "U kunt alleen message/rfc882-gedeelten doorsturen!"
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Accepteren?"
@@ -3194,7 +2971,7 @@ msgstr "[-- Foutenuitvoer van %s --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatische weergave met %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3202,11 +2979,11 @@ msgstr ""
 "[-- BEGIN PGP BERICHT --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- BEGIN PGP PUBLIC KEY BLOK --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3214,7 +2991,7 @@ msgstr ""
 "[-- BEGIN PGP ONDERTEKEND BERICHT --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3223,42 +3000,42 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- Kan %s niet uitvoeren. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- EINDE PGP BERICHT --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- EINDE PGP PUBLIC KEY BLOK --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- EINDE PGP ONDERTEKEND BERICHT --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- Einde van PGP/MIME versleutelde data --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- Einde van PGP/MIME versleutelde data --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Einde van S/MIME versleutelde data --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Einde van S/MIME ondertekende gegevens --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3272,7 +3049,7 @@ msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
 "[-- Fout: Kon geen enkel multipart/alternative gedeelte weergeven! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3280,7 +3057,7 @@ msgstr ""
 "[-- Fout: Gebroken multipart/signed structuur! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3289,11 +3066,11 @@ msgstr ""
 "[-- Fout: Onbekend multipart/signed protocol: %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- Fout: Kon geen tijdelijk bestand aanmaken! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3301,14 +3078,14 @@ msgstr ""
 "[-- Fout: Kon begin van PGP-bericht niet vinden! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- Fout: Kon geen tijdelijk bestand aanmaken! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3320,7 +3097,7 @@ msgstr ""
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- Fout: message/external-body heeft geen access-type parameter --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -3328,7 +3105,7 @@ msgstr ""
 "[-- De volgende gegevens zijn PGP/MIME versleuteld --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
@@ -3337,7 +3114,7 @@ msgstr ""
 "[-- De volgende gegevens zijn PGP/MIME versleuteld --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
@@ -3346,7 +3123,7 @@ msgstr ""
 "[-- De volgende gegevens zijn S/MIME versleuteld --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
@@ -3355,7 +3132,7 @@ msgstr ""
 "[-- De volgende gegevens zijn S/MIME ondertekend --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -3378,7 +3155,7 @@ msgstr "[-- Deze %s/%s bijlage is niet bijgesloten, --]\n"
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Type: %s/%s, Codering: %s, Grootte: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -3386,7 +3163,7 @@ msgstr ""
 "[-- Waarschuwing: kan geen enkele handtekening vinden --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3418,33 +3195,33 @@ msgstr "[-- naam: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- op %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
 msgstr "Verlopen    "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
 msgstr "Ongeldig    "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
 msgstr "Herroepen    "
@@ -3458,16 +3235,43 @@ msgstr "[ongeldige datum]"
 msgid "[unable to calculate]"
 msgstr "[kan niet berekend worden]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: Geen adres"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Kan geen geselecteerde berichten vinden."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Kan geen geselecteerde berichten vinden."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Een kopie van dit bericht maken?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "bewerk de omschrijving van een bijlage"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "bewerk de omschrijving van een bijlage"
@@ -3476,22 +3280,90 @@ msgstr "bewerk de omschrijving van een bijlage"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: Te veel argumenten"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Fout opgetreden tijdens het analyseren van de directory."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Geen mailfolder met nieuwe berichten."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
 msgstr "color: Te weinig argumenten."
 
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Geen nieuwe berichten"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
+
 #: commands.c:788
 msgid "converting"
 msgstr "converteren"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Sla bericht op in mailfolder"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
@@ -3507,18 +3379,99 @@ msgstr "tijdelijke bestand %s kan niet worden geknot."
 msgid "could not write temporary mail folder: %s"
 msgstr "Tijdelijk bestand %s kan niet worden aangemaakt."
 
-#: browser.c:1206
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Geen mailfolders opgegeven."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dagn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
 msgstr "standaard kleuren niet ondersteund"
 
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Berichten op de server verwijderen?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Herstel berichten: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Herstel berichten: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
+
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "dvnoatugsp"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Doorgestuurd bericht wijzigen?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3534,21 +3487,108 @@ msgstr "Kopieren naar %s..."
 msgid "echo Decompressing %s..."
 msgstr "%s wordt uitgekozen..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Deze bijlage zal niet geconverteerd worden."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "bewerk de omschrijving van een bijlage"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Kan bericht niet wegschrijven"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Headers worden opgehaald... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Doorgestuurd bericht wijzigen?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Een kopie van dit bericht maken?"
+
 #: pattern.c:777
 msgid "empty pattern"
 msgstr "Leeg patroon"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
 msgstr "Versleutelen"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Een kopie van dit bericht maken?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
 msgstr "Fout in expressie bij: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "Fout in expressie bij: %s"
@@ -3578,7 +3618,7 @@ msgstr "Fout in expressie bij: %s"
 msgid "error getting secret key `%s': %s\n"
 msgstr "Fout in expressie bij: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "Fout in expressie bij: %s"
@@ -3617,46 +3657,122 @@ msgstr "Fout in expressie bij: %s"
 msgid "error: unknown op %d (report this error)."
 msgstr "fout: onbekende operatie %d (interne fout)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "voabigg"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "voabigg"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec: geen argumenten"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Reactie sturen naar %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Doorsturen als bijlagen?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Controleren op nieuwe berichten..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "U bent bij het eerste bericht."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
 #, c-format
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "U bent op de laatste pagina."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Geen mailfolder met nieuwe berichten."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Er is een fout opgetreden tijdens het openen van de mailfolder"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Geen mailfolder met nieuwe berichten."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
@@ -3669,23 +3785,117 @@ msgstr "werd gewist --]\n"
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE mislukt"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
 msgstr "my_hdr: Ongeldig veld in berichtenkop"
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Ongeldig Indexnummer."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Ga naar bericht: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Ga naar bericht: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Thread bevat ongelezen berichten"
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "U bent al bij de eerste thread."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Geen ongelezen berichten"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Geen ongelezen berichten"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Een kopie van dit bericht maken?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP-sleutels voor <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Gemarkeerde berichten doorsturen naar: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Geen mailfolder met nieuwe berichten."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: Lege toetsenvolgorde"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro: Te veel argumenten"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
@@ -3695,6 +3905,38 @@ msgstr "Kan geen mailcap-entry voor %s vinden."
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): kan bestandstijd niet zetten"
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
@@ -3710,19 +3952,110 @@ msgstr "Haakjes kloppen niet: %s"
 msgid "missing parameter"
 msgstr "Te weinig parameters"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
 msgstr "mono: Te weinig argumenten."
 
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "U bent op het eerste item."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "U bent bij het eerste bericht."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "U bent op het laatste item."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "U bent bij het laatste bericht."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "U bent op het laatste item."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "U bent op de laatste pagina."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Alle berichten zijn gewist."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "U bent op het eerste item."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "U bent op de eerste pagina."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Alle berichten zijn gewist."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "U bent op de eerste pagina."
+
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
 msgstr "Multi-part bericht heeft geen \"boundary\" parameter."
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "nee"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "(geen mailfolder)"
@@ -3731,54 +4064,307 @@ msgstr "(geen mailfolder)"
 msgid "not converting"
 msgstr "niet converteren"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "lege toetsenvolgorde"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
 msgstr "ota"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Open mailfolder in schrijfbeveiligde modus"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Open mailfolder in schrijfbeveiligde modus"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Mailfolder wordt heropend.."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Bericht doorsturen aan %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "Prefix is niet toegestaan"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "U bent op het eerste item."
+
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push: Te veel argumenten"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Uigesteld bericht hervatten?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Thread bevat ongelezen berichten"
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Kan bericht op POP server niet aanpassen."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: kan bestand niet toevoegen"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Ga naar bericht: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Berichten op de server verwijderen?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "we"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "wea"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Opslaan%s in mailfolder"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Opslaan%s in mailfolder"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Kan bericht op POP server niet aanpassen."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "Fout in expressie"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Zoek naar: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Bericht kon niet verstuurd worden."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Doorsturen als bijlagen?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Limiteer berichten volgens patroon: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Geen verdere geciteerde text."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Bericht afdrukken?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Geen berichten in deze mailfolder."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: fout bij %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: fouten in %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: inlezen gestaakt vanwege te veel fouten in %s"
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Geen bestanden waarop het masker past gevonden."
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "sync: mbox is gewijzigd, maar geen gewijzigde berichten gevonden!"
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Verwijder markering volgens patroon: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "U bent al bij de eerste thread."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3789,23 +4375,94 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Geen verdere geciteerde text."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Codering wijzigen is alleen van toepassing op bijlagen."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Geen zoekpatroon."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Geen ongelezen berichten"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
 msgstr "Te weinig argumenten"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "Te veel argumenten"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "bewerk de omschrijving van een bijlage"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Herstel berichten: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Herstel berichten: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Herstel berichten: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
@@ -3821,10 +4478,28 @@ msgstr "unhook: Kan geen unhook * doen binnen een hook."
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: onbekend type: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "onbekende fout"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Verwijder markering volgens patroon: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "bewerk de omschrijving van een bijlage"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3836,12 +4511,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
 msgstr "Toekenning van een waarde is niet toegestaan"
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Bijlage opgeslagen."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Nieuw bestand: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Sla bericht op in mailfolder"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "ja"
 
@@ -3849,3 +4555,6 @@ msgstr "ja"
 msgid "yna"
 msgstr "jna"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/pl.po b/po/pl.po
index e491973..f562bad 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,22 +1,22 @@
 # Polish messages for Mutt 1.5.xi
 # Polskie teksty dla Mutta 1.5.xi
-# 1998-2004 Pawe³ Dziekoñski <dzieko@pwr.wroc.pl>
-# 1998-2002 Sergiusz Paw³owicz <ser@hyperreal.art.pl>
+# 1998-2004 Paweł Dziekoński <dzieko@pwr.wroc.pl>
+# 1998-2002 Sergiusz Pawłowicz <ser@hyperreal.art.pl>
 # Pre-translation had been done using PePeSza v0.9
 # get your own copy of PePeSza from http://www.ids.pl/~pkollegu/pepesza.html
 msgid ""
 msgstr ""
 "Project-Id-Version: mutt-1.5.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-02-15\n"
-"Last-Translator: Pawe³ Dziekoñski <dzieko@pwr.wroc.pl>\n"
+"Last-Translator: Paweł Dziekoński <dzieko@pwr.wroc.pl>\n"
 "Language-Team: POLISH <pl@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Standardowe przypisania klawiszy:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Nie przypisane klawiszom funkcje:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -68,52 +68,52 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"u¿ycie: mutt [ -nRyzZ ] [ -e <polec> ] [ -F <plik> ] [ -m <typ> ] [ -f "
+"użycie: mutt [ -nRyzZ ] [ -e <polec> ] [ -F <plik> ] [ -m <typ> ] [ -f "
 "<plik> ]\n"
 "        mutt [ -nR ] [ -e <polec> ] [ -F <plik> ] -Q <pytanie> [ -Q "
 "<pytanie> ] [...]\n"
 "        mutt [ -nR ] [ -e <polec> ] [ -F <plik> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
 "        mutt [ -nx ] [ -e <polec> ] [ -F <plik> ] [ -a <plik> ] [ -H "
-"<plik> ] [ -i <plik> ] [ -s <tytu³> ] [ -b <adres> ] [ -c <adres> ] <adres> "
+"<plik> ] [ -i <plik> ] [ -s <tytuł> ] [ -b <adres> ] [ -c <adres> ] <adres> "
 "[ ... ]\n"
 "        mutt [ -n ]  [ -e <polec> ] [ -F <plik> ] -p\n"
 "        mutt -v[v]\n"
 "\n"
 "opcje:\n"
-"  -A <alias>\tu¿yj aliasu\n"
-"  -a <plik>\tdo³±cz plik do listu\n"
+"  -A <alias>\tużyj aliasu\n"
+"  -a <plik>\tdołącz plik do listu\n"
 "  -b <adres>\tpodaj adres blind carbon-copy (BCC)\n"
 "  -c <adres>\tpodaj adres carbon-copy (CC)\n"
 "  -e <polec>\tpodaj polecenie do wykonania po inicjalizacji\n"
-"  -f <plik>\totwórz najpierw t± skrzynkê\n"
-"  -F <plik>\tu¿yj alternatywnego pliku muttrc\n"
-"  -H <plik>\twczytaj szablon nag³ówków i tre¶ci listu z pliku\n"
+"  -f <plik>\totwórz najpierw tą skrzynkę\n"
+"  -F <plik>\tużyj alternatywnego pliku muttrc\n"
+"  -H <plik>\twczytaj szablon nagłówków i treści listu z pliku\n"
 "  -i <plik>\twstaw ten plik w odpowiedzi\n"
 "  -m <typ>\tpodaj typ skrzynki\n"
 "  -n\t\tnie czytaj systemowego Muttrc\n"
 "  -p\t\tponownie edytuj zarzucony list\n"
-"  -Q <zmienna>\tpodaj warto¶æ zmiennej konfiguracyjnej\n"
-"  -R\t\totwórz skrzynkê w trybie tylko do odczytu\n"
-"  -s <tytu³>\tpodaj tytu³ (musi byæ w apostrofach, je¶li zawiera spacje)\n"
-"  -v\t\tpoka¿ wersjê i wkompilowane parametry\n"
+"  -Q <zmienna>\tpodaj wartość zmiennej konfiguracyjnej\n"
+"  -R\t\totwórz skrzynkę w trybie tylko do odczytu\n"
+"  -s <tytuł>\tpodaj tytuł (musi być w apostrofach, jeśli zawiera spacje)\n"
+"  -v\t\tpokaż wersję i wkompilowane parametry\n"
 "  -x\t\tsymuluj zachowanie mailx\n"
-"  -y\t\twybierz skrzynkê podan± w twojej li¶cie `mailboxes'\n"
-"  -z\t\twyjd¼ natychmiast je¶li brak nowych listów w skrzynce\n"
-"  -Z\t\totwórz pierwsz± skrzynkê z nowym listem i wyjd¼ je¶li brak nowych\n"
+"  -y\t\twybierz skrzynkę podaną w twojej liście `mailboxes'\n"
+"  -z\t\twyjdź natychmiast jeśli brak nowych listów w skrzynce\n"
+"  -Z\t\totwórz pierwszą skrzynkę z nowym listem i wyjdź jeśli brak nowych\n"
 "  -h\t\tten tekst"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " podpisz jako: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     do %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   od %s"
@@ -156,30 +156,30 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr " (przyci¶niêcie '?' wy¶wietla listê): "
+msgstr " (przyciśnięcie '?' wyświetla listę): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr " (inline)"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Naci¶nij '%s' aby zezwoliæ na zapisanie"
+msgstr " Naciśnij '%s' aby zezwolić na zapisanie"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " w trybie ograniczonego przegl±dania"
+msgstr " w trybie ograniczonego przeglądania"
 
 #: commands.c:601
 msgid " tagged"
@@ -188,84 +188,84 @@ msgstr " zaznaczone"
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: b³êdne polecenie"
+msgstr "%c: błędne polecenie"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: nie obs³ugiwane w tym trybie"
+msgstr "%c: nie obsługiwane w tym trybie"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d zapisano, %d usuniêto."
+msgstr "%d zapisano, %d usunięto."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d zapisano, %d przeniesiono, %d usuniêto."
+msgstr "%d zapisano, %d przeniesiono, %d usunięto."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Czy naprawdê chcesz u¿yæ tego klucza?"
+msgstr "%s Czy naprawdę chcesz użyć tego klucza?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] zmieniony. Zaktualizowaæ kodowanie?"
+msgstr "%s [#%d] zmieniony. Zaktualizować kodowanie?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] ju¿ nie istnieje!"
+msgstr "%s [#%d] już nie istnieje!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [przeczytano %d spo¶ród %d listów]"
+msgstr "%s [przeczytano %d spośród %d listów]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s nie istnieje. Utworzyæ?"
+msgstr "%s nie istnieje. Utworzyć?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s jest b³êdn± ¶cie¿k± IMAP"
+msgstr "%s jest błędną ścieżką IMAP"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s jest b³êdn± ¶cie¿k± POP"
+msgstr "%s jest błędną ścieżką POP"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s jest b³êdn± ¶cie¿k± POP"
+msgstr "%s jest błędną ścieżką POP"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s jest b³êdn± ¶cie¿k± POP"
+msgstr "%s jest błędną ścieżką POP"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s nie jest katalogiem."
@@ -273,22 +273,22 @@ msgstr "%s nie jest katalogiem."
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s nie jest skrzynk±!"
+msgstr "%s nie jest skrzynką!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s nie jest skrzynk±."
+msgstr "%s nie jest skrzynką."
 
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s nie jest zwyk³ym plikiem."
+msgstr "%s nie jest zwykłym plikiem."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s ju¿ nie istnieje!"
+msgstr "%s już nie istnieje!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -302,142 +302,142 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s: nieznany typ"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: kolor nie jest obs³ugiwany przez Twój terminal"
+msgstr "%s: kolor nie jest obsługiwany przez Twój terminal"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: polecenia mog± dotyczyæ tylko obiektów indeksu"
+msgstr "%s: polecenia mogą dotyczyć tylko obiektów indeksu"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: nie ma takiego atrybutu"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s: nie ma takiego koloru"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: brak takiej funkcji"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: nie ma takiej funkcji"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: nie ma takiego menu"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: nie ma takiego obiektu"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: za ma³o argumentów"
+msgstr "%s: za mało argumentów"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: nie mo¿na do³±czyæ pliku"
+msgstr "%s: nie można dołączyć pliku"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: nie mo¿na do³±czyæ pliku.\n"
+msgstr "%s: nie można dołączyć pliku.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: nieznane polecenie"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: nieprawid³owy typ"
+msgstr "%s: nieprawidłowy typ"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: nieznana zmienna"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s jest b³êdn± ¶cie¿k± POP"
+msgstr "%s jest błędną ścieżką POP"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s jest b³êdn± ¶cie¿k± POP"
+msgstr "%s jest błędną ścieżką POP"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(przypisz 'view-attachments' do klawisza!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(brak skrzynki)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(o)drzuæ, zaakceptuj (r)az"
+msgstr "(o)drzuć, zaakceptuj (r)az"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(o)drzuæ, zaakceptuj (r)az, (a)kceptuj zawsze"
+msgstr "(o)drzuć, zaakceptuj (r)az, (a)kceptuj zawsze"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(o wielko¶ci %s bajtów) "
+msgstr "(o wielkości %s bajtów) "
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(u¿yj '%s' do ogl±dania tego fragmentu)"
+msgstr "(użyj '%s' do oglądania tego fragmentu)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- Za³±czniki"
+msgstr "-- Załączniki"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<NIEZNANY>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<domy¶lnie>"
+msgstr "<domyślnie>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -449,37 +449,33 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "Uwierzytelnianie APOP nie powiod³o siê."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Anuluj"
+msgstr "Uwierzytelnianie APOP nie powiodło się."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "List nie zosta³ zmieniony. Zaniechaæ wys³ania?"
+msgstr "List nie został zmieniony. Zaniechać wysłania?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "List nie zosta³ zmieniony. Zaniechano wys³ania."
+msgstr "List nie został zmieniony. Zaniechano wysłania."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adres: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Alias dodany."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Nazwa aliasu: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Aliasy"
 
@@ -487,66 +483,62 @@ msgstr "Aliasy"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Wszystkie pasuj±ce klucze wygas³y, zosta³y wy³±czone lub wyprowadzone."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Dodaj"
+msgstr "Wszystkie pasujące klucze wygasły, zostały wyłączone lub wyprowadzone."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Dopisaæ listy do %s?"
+msgstr "Dopisać listy do %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
 msgstr "Jako argument wymagany jest numer listu."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "Za³±cznik zosta³ zapisany."
+msgstr "Załącznik został zapisany."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "Do³±cz plik"
+msgstr "Dołącz plik"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "Do³±czanie wybranych listów..."
+msgstr "Dołączanie wybranych listów..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "Za³±cznik przefiltrowany."
+msgstr "Załącznik przefiltrowany."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "Za³±cznik zosta³ zapisany."
+msgstr "Załącznik został zapisany."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "Za³±czniki"
+msgstr "Załączniki"
 
 #: imap/auth.c:83
 #, c-format
@@ -573,56 +565,56 @@ msgstr ""
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "B³êdny IDN \"%s\"."
+msgstr "Błędny IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "B³êdny IDN %s w trakcie przygotowywania resent-from."
+msgstr "Błędny IDN %s w trakcie przygotowywania resent-from."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "B³êdny IDN w \"%s\": '%s'"
+msgstr "Błędny IDN w \"%s\": '%s'"
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "B³êdny IDN: '%s'"
+msgstr "Błędny IDN: '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "B³êdna nazwa skrzynki"
+msgstr "Błędna nazwa skrzynki"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "Pokazany jest koniec listu."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Wy¶lij kopiê listu do %s"
+msgstr "Wyślij kopię listu do %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Wy¶lij kopiê listu do: "
+msgstr "Wyślij kopię listu do: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Wy¶lij kopie listów do %s"
+msgstr "Wyślij kopie listów do %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Wy¶lij kopie zaznaczonych listów do: "
+msgstr "Wyślij kopie zaznaczonych listów do: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "Polecenie CLOSE nie powiod³o siê"
+msgstr "Polecenie CLOSE nie powiodło się"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -631,64 +623,64 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Nie mo¿na dopisaæ do skrzynki: %s"
+msgstr "Nie można dopisać do skrzynki: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Za³±cznikiem nie mo¿e zostaæ katalog!"
+msgstr "Załącznikiem nie może zostać katalog!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "Nie mo¿na utworzyæ %s: %s."
+msgstr "Nie można utworzyć %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "Nie mo¿na utworzyæ %s"
+msgstr "Nie można utworzyć %s"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Nie mo¿na utworzyæ filtra"
+msgstr "Nie można utworzyć filtra"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "Nie mo¿na utworzyæ procesu filtru"
+msgstr "Nie można utworzyć procesu filtru"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Nie mo¿na utworzyæ pliku tymczasowego"
+msgstr "Nie można utworzyć pliku tymczasowego"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Nie mo¿na zdekodowaæ wszystkich wybranych za³. Za³±czyæ (MIME) pozosta³e?"
+"Nie można zdekodować wszystkich wybranych zał. Załączyć (MIME) pozostałe?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Nie mo¿na zdekodowaæ zaznaczonych za³. Przes³aæ pozosta³e dalej (MIME)?"
+"Nie można zdekodować zaznaczonych zał. Przesłać pozostałe dalej (MIME)?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "Nie mo¿na odszyfrowaæ zaszyfrowanego listu!"
+msgstr "Nie można odszyfrować zaszyfrowanego listu!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "Nie mo¿na skasowaæ za³±cznika na serwerze POP."
+msgstr "Nie można skasować załącznika na serwerze POP."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "Nie mo¿na skasowaæ za³±cznika na serwerze POP."
+msgstr "Nie można skasować załącznika na serwerze POP."
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Nie mo¿na za³o¿yæ blokady na %s.\n"
+msgstr "Nie można założyć blokady na %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -696,165 +688,149 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Nie mo¿na znale¼æ ¿adnego z zaznaczonych listów."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Nie mo¿na pobraæ type2.list mixmastera!"
+msgstr "Nie można znaleźć żadnego z zaznaczonych listów."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Nie pasuj±cy szablon nazwy, kontynuowaæ?"
+msgstr "Nie pasujący szablon nazwy, kontynuować?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Nie mo¿na otworzyæ pliku listu: %s"
+msgstr "Nie można otworzyć pliku listu: %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Nie mo¿na dopisaæ do skrzynki: %s"
+msgstr "Nie można dopisać do skrzynki: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Po³±czenie z %s zosta³o zakoñczone"
+msgstr "Połączenie z %s zostało zakończone"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Zamykanie po³±czenia z serwerem POP..."
+msgstr "Zamykanie połączenia z serwerem POP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "Nie mo¿na ustaliæ stanu (stat) %s: %s"
+msgstr "Nie można ustalić stanu (stat) %s: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "Nie mo¿na utworzyæ %s: %s."
+msgstr "Nie można utworzyć %s: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Nie mo¿na zapisaæ listu w skrzynce POP."
+msgstr "Nie można zapisać listu w skrzynce POP."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Nie mo¿na edytowaæ listów na serwerze POP."
+msgstr "Nie można edytować listów na serwerze POP."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "Nie mo¿na ustaliæ stanu (stat) %s: %s"
+msgstr "Nie można ustalić stanu (stat) %s: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Nie mo¿na przegl±daæ tego katalogu"
+msgstr "Nie można przeglądać tego katalogu"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "Nie mo¿na utworzyæ %s."
+msgstr "Nie można utworzyć %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Nie mo¿na zapisaæ nag³ówka do pliku tymczasowego!"
+msgstr "Nie można zapisać nagłówka do pliku tymczasowego!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Nie mo¿na zapisaæ listu"
+msgstr "Nie można zapisać listu"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Nie mo¿na zapisaæ listu do pliku tymczasowego!"
+msgstr "Nie można zapisać listu do pliku tymczasowego!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Nie mo¿na utworzyæ filtru wy¶wietlania"
+msgstr "Nie można utworzyć filtru wyświetlania"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Nie mo¿na utworzyæ filtru"
+msgstr "Nie można utworzyć filtru"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Nie mo¿na zapisaæ do skrzynki oznaczonej jako 'tylko do odczytu'!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Nie można zapisać do skrzynki oznaczonej jako 'tylko do odczytu'!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "Otrzymano sygna³ %s... Koniec pracy.\n"
+msgstr "Otrzymano sygnał %s... Koniec pracy.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "Certyfikat serwera nie uzyska³ jeszcze wa¿no¶ci"
+msgstr "Certyfikat serwera nie uzyskał jeszcze ważności"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "Certyfikat zosta³ zapisany"
+msgstr "Certyfikat został zapisany"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Zmiany zostan± naniesione niezw³ocznie po wyj¶ciu ze skrzynki."
+msgstr "Zmiany zostaną naniesione niezwłocznie po wyjściu ze skrzynki."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Zmiany w skrzynce nie zostan± naniesione."
+msgstr "Zmiany w skrzynce nie zostaną naniesione."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr "Znak = %s, ósemkowo = %o, dziesiêtnie = %d"
+msgstr "Znak = %s, ósemkowo = %o, dziesiętnie = %d"
 
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Zestaw znaków zosta³ zmieniony na %s; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Zmieñ katalog"
+msgstr "Zestaw znaków został zmieniony na %s; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "Zmieñ katalog na: "
+msgstr "Zmień katalog na: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Poszukiwanie nowej poczty..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Sprawd¼ klucz  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Poszukiwanie nowej poczty..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Poszukiwanie nowej poczty..."
@@ -863,43 +839,43 @@ msgstr "Poszukiwanie nowej poczty..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Bez jakiegokolwiek szyfrowania"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Wyczy¶æ flagê"
+msgstr "Wyczyść flagę"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Zamykanie po³±czenia do %s..."
+msgstr "Zamykanie połączenia do %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "Zamykanie po³±czenia z serwerem POP..."
+msgstr "Zamykanie połączenia z serwerem POP..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "£±czenie z %s..."
+msgstr "Łączenie z %s..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Polecenie TOP nie jest obs³ugiwane przez serwer."
+msgstr "Polecenie TOP nie jest obsługiwane przez serwer."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Polecenie UIDL nie jest obs³ugiwane przez serwer."
+msgstr "Polecenie UIDL nie jest obsługiwane przez serwer."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
 msgstr "Wprowadzanie zmian..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -908,7 +884,7 @@ msgstr ""
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Kompilacja wzorca poszukiwañ..."
+msgstr "Kompilacja wzorca poszukiwań..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
@@ -920,62 +896,62 @@ msgstr "Kopiowanie do %s..."
 msgid "Compressing %s..."
 msgstr "Kopiowanie do %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "£±czenie z %s..."
+msgstr "Łączenie z %s..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "£±czenie z %s..."
+msgstr "Łączenie z %s..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "£±czenie z %s..."
+msgstr "Łączenie z %s..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Po³±czenie z serwerem POP zosta³o zerwane. Po³±czyæ ponownie?"
+msgstr "Połączenie z serwerem POP zostało zerwane. Połączyć ponownie?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Po³±czenie z serwerem POP zosta³o zerwane. Po³±czyæ ponownie?"
+msgstr "Połączenie z serwerem POP zostało zerwane. Połączyć ponownie?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "Po³±czenie z %s zosta³o zakoñczone"
+msgstr "Połączenie z %s zostało zakończone"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Po³±czenie z %s zosta³o zakoñczone"
+msgstr "Połączenie z %s zostało zakończone"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Typ \"Content-Type\" zmieniono na %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Typ \"Content-Type\" musi byæ w postaci podstawowy/po¶ledni"
+msgstr "Typ \"Content-Type\" musi być w postaci podstawowy/pośledni"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "Kontynuowaæ?"
+msgstr "Kontynuować?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "Przekonwertowaæ do %s przy wysy³aniu?"
+msgstr "Przekonwertować do %s przy wysyłaniu?"
 
 #: commands.c:600
 #, c-format
@@ -985,7 +961,7 @@ msgstr "Kopiuj%s do skrzynki"
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "Kopiowanie %d listów do %s..."
+msgstr "Kopiowanie %d listów do %s..."
 
 #: imap/message.c:684
 #, c-format
@@ -1011,66 +987,66 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Po³±czenie z %s (%s) nie zosta³o ustanowione."
+msgstr "Połączenie z %s (%s) nie zostało ustanowione."
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "Nie mo¿na skopiowaæ listu"
+msgstr "Nie można skopiować listu"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Nie mo¿na utworzyæ pliku tymczasowego!"
+msgstr "Nie można utworzyć pliku tymczasowego!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Nie mo¿na utworzyæ pliku tymczasowego!"
+msgstr "Nie można utworzyć pliku tymczasowego!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Nie znaleziono funkcji sortowania! (zg³o¶ ten b³±d)"
+msgstr "Nie znaleziono funkcji sortowania! (zgłoś ten błąd)"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Host \"%s\" nie zosta³ znaleziony"
+msgstr "Host \"%s\" nie został znaleziony"
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Nie mo¿na do³±czyæ wszystkich wskazanych listów!"
+msgstr "Nie można dołączyć wszystkich wskazanych listów!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "Po³±czenie TSL nie zosta³o wynegocjowane"
+msgstr "Połączenie TSL nie zostało wynegocjowane"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "Nie mo¿na otworzyæ %s"
+msgstr "Nie można otworzyć %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Nie mo¿na ponownie otworzyæ skrzynki pocztowej!"
+msgstr "Nie można ponownie otworzyć skrzynki pocztowej!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Wys³anie listu nie powiod³o siê."
+msgstr "Wysłanie listu nie powiodło się."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Nie mo¿na zablokowaæ %s\n"
+msgstr "Nie można zablokować %s\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "Utworzyæ %s?"
+msgstr "Utworzyć %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Tworzenie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP"
+msgstr "Tworzenie skrzynek jest obsługiwane tylko dla skrzynek IMAP"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
@@ -1101,255 +1077,228 @@ msgstr "Rozszyfruj-kopiuj%s do skrzynki"
 msgid "Decrypt-save%s to mailbox"
 msgstr "Rozszyfruj-zapisz%s do skrzynki"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
 msgstr "Odszyfrowywanie listu..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "Odszyfrowanie nie powiod³o siê."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Usuñ"
+msgstr "Odszyfrowanie nie powiodło się."
 
-#: remailer.c:433
-msgid "Delete"
-msgstr "Usuñ"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Usuwanie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP"
+msgstr "Usuwanie skrzynek jest obsługiwane tylko dla skrzynek IMAP"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "Usun±æ listy z serwera?"
+msgstr "Usunąć listy z serwera?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "Usuñ listy pasuj±ce do wzorca: "
+msgstr "Usuń listy pasujące do wzorca: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "Usuñ"
+msgstr "Usuń"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Usuwanie za³±czników z zaszyfrowanych listów jest niemo¿liwe."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Opis"
+msgstr "Usuwanie załączników z zaszyfrowanych listów jest niemożliwe."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "Identyfikator %s nie zosta³ zweryfikowany. Mimo to u¿yæ dla %s ?"
+msgstr "Identyfikator %s nie został zweryfikowany. Mimo to użyć dla %s ?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s nie istnieje. Utworzyæ?"
+msgstr "%s nie istnieje. Utworzyć?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Katalog [%s], wzorzec nazw plików: %s"
+msgstr "Katalog [%s], wzorzec nazw plików: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "B£¡D: zg³o¶, proszê, ten b³±d"
+msgstr "BŁĄD: zgłoś, proszę, ten błąd"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "Edytowaæ przesy³any list?"
+msgstr "Edytować przesyłany list?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "b³±d w wyra¿eniu"
+msgstr "błąd w wyrażeniu"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Zaszyfruj"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "Zaszyfruj u¿ywaj±c: "
+msgstr "Zaszyfruj używając: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Podaj numer klucza: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "Wprowad¼ numer klucza dla %s: "
+msgstr "Wprowadź numer klucza dla %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "Wprowad¼ klucze (^G aby przerwaæ): "
+msgstr "Wprowadź klucze (^G aby przerwać): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "B³±d wysy³ania kopii!"
+msgstr "Błąd wysyłania kopii!"
 
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "B³±d wysy³ania kopii!"
+msgstr "Błąd wysyłania kopii!"
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "B³±d podczas wysy³ania listu."
+msgstr "Błąd podczas wysyłania listu."
 
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "B³±d ³±czenia z serwerem: %s"
+msgstr "Błąd łączenia z serwerem: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "B³±d ³±czenia z serwerem: %s"
+msgstr "Błąd łączenia z serwerem: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "B³±d w %s, linia %d: %s"
+msgstr "Błąd w %s, linia %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "B³±d w poleceniu: %s\n"
+msgstr "Błąd w poleceniu: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "B³±d w wyra¿eniu: %s"
+msgstr "Błąd w wyrażeniu: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "B³±d inicjalizacji terminala."
+msgstr "Błąd inicjalizacji terminala."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "B³±d inicjalizacji terminala."
+msgstr "Błąd inicjalizacji terminala."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "B³±d otwarcia skrzynki"
+msgstr "Błąd otwarcia skrzynki"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "B³±d interpretacji adresu!"
+msgstr "Błąd interpretacji adresu!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "B³±d uruchomienia \"%s\"!"
+msgstr "Błąd uruchomienia \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "B³±d przegl±dania katalogu."
+msgstr "Błąd przeglądania katalogu."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "B³±d podczas wysy³ania listu, proces potomny zwróci³ %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "B³±d podczas wysy³ania listu, proces potomny zwróci³ %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "B³±d podczas wysy³ania listu."
+msgstr "Błąd podczas wysyłania listu, proces potomny zwrócił %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "B³±d komunikacji z %s (%s)"
+msgstr "Błąd komunikacji z %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "B³±d podczas próby przegl±dania pliku"
+msgstr "Błąd podczas próby przeglądania pliku"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "B³±d podczas zapisywania skrzynki!"
+msgstr "Błąd podczas zapisywania skrzynki!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "B³±d. Zachowano plik tymczasowy: %s"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "B³±d: nie mo¿na u¿yæ %s jako finalnego remailera ³añcucha."
+msgstr "Błąd. Zachowano plik tymczasowy: %s"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "B³±d: '%s' to b³êdny IDN."
+msgstr "Błąd: '%s' to błędny IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "B³±d: multipart/encrypted nie ma parametru protoko³u!"
+msgstr "Błąd: multipart/encrypted nie ma parametru protokołu!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "B³±d: multipart/signed nie ma protoko³u."
+msgstr "Błąd: multipart/signed nie ma protokołu."
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "B³±d w poleceniu: %s\n"
+msgstr "Błąd w poleceniu: %s\n"
 
 #: imap/message.c:109
 #, c-format
@@ -1358,151 +1307,137 @@ msgstr "Szacowanie bufora... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Wykonywanie polecenia na pasuj±cych do wzorca listach..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Wyj¶cie"
+msgstr "Wykonywanie polecenia na pasujących do wzorca listach..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Wyj¶cie  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Wyj¶æ z Mutta bez zapisywania zmian?"
+msgstr "Wyjść z Mutta bez zapisywania zmian?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Wyj¶æ z Mutta?"
+msgstr "Wyjść z Mutta?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "Skasowanie nie powiod³o siê"
+msgstr "Skasowanie nie powiodło się"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Kasowanie listów na serwerze... "
+msgstr "Kasowanie listów na serwerze... "
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "B³±d otwarcia pliku podczas interpretacji nag³ówków."
+msgstr "Błąd otwarcia pliku podczas interpretacji nagłówków."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "B³±d podczas próby otwarcia pliku w celu eliminacji nag³ówków."
+msgstr "Błąd podczas próby otwarcia pliku w celu eliminacji nagłówków."
 
 #: attach.c:151
 msgid "Failure to rename file."
-msgstr "Zmiana nazwy pliku nie powiod³a siê."
+msgstr "Zmiana nazwy pliku nie powiodła się."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "B³±d! Nie mo¿na ponownie otworzyæ skrzynki!"
+msgstr "Błąd! Nie można ponownie otworzyć skrzynki!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "B³±d krytyczny. Niezidentyfikowana ilo¶æ listów!"
+msgstr "Błąd krytyczny. Niezidentyfikowana ilość listów!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "Kasowanie listów na serwerze... "
+msgstr "Kasowanie listów na serwerze... "
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "Pobieranie listu..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Pobieranie spisu listów..."
+msgstr "Pobieranie spisu listów..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "Pobieranie spisu listów..."
+msgstr "Pobieranie spisu listów..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Pobieranie nag³ówków listów... [%d/%d]"
+msgstr "Pobieranie nagłówków listów... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Pobieranie nag³ówków listów... [%d/%d]"
+msgstr "Pobieranie nagłówków listów... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Pobieranie listu..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Wzorzec nazw plików: "
+msgstr "Wzorzec nazw plików: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Plik istnieje: (n)adpisaæ, (d)o³±czyæ czy (a)nulowaæ?"
+msgstr "Plik istnieje: (n)adpisać, (d)ołączyć czy (a)nulować?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Ten plik jest katalogim, zapisaæ w nim?"
+msgstr "Ten plik jest katalogim, zapisać w nim?"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Ten plik jest katalogim, zapisaæ w nim? [(t)ak, (n)ie, (w)szystkie]"
+msgstr "Ten plik jest katalogim, zapisać w nim? [(t)ak, (n)ie, (w)szystkie]"
 
 #: muttlib.c:249
 msgid "File under directory: "
 msgstr "Plik w katalogu: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Przefiltruj przez: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Odcisk: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "zapisz list aby wys³aæ go pó¼niej"
+msgstr "zapisz list aby wysłać go później"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Follow-up do %s%s?"
 
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Follow-up do %s%s?"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Przes³aæ dalej w trybie MIME?"
+msgstr "Przesłać dalej w trybie MIME?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "Przes³aæ dalej jako za³±cznik?"
+msgstr "Przesłać dalej jako załącznik?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "Przes³aæ dalej jako za³±czniki?"
+msgstr "Przesłać dalej jako załączniki?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Funkcja niedostêpna w trybie za³±czania"
+msgstr "Funkcja niedostępna w trybie załączania"
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
@@ -1516,203 +1451,184 @@ msgstr "Pobieranie przestrzeni nazw..."
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Grupie"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Pomoc"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Pomoc dla menu %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "Pomoc jest w³a¶nie wy¶wietlana."
+msgstr "Pomoc jest właśnie wyświetlana."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Nie wiem jak to wydrukowaæ!"
+msgstr "Nie wiem jak to wydrukować!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Nie wiem jak wydrukowaæ %s za³±czników!"
+msgstr "Nie wiem jak wydrukować %s załączników!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "Poziom wa¿no¶ci tego identyfikatora nie zosta³ okre¶lony."
+msgstr "Poziom ważności tego identyfikatora nie został określony."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "Identyfikator wygas³, zosta³ wy³±czony lub wyprowadzony."
+msgstr "Identyfikator wygasł, został wyłączony lub wyprowadzony."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "Nieprawid³owy identyfikator."
+msgstr "Nieprawidłowy identyfikator."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "Ten identyfikator jest tylko czê¶ciowo wa¿ny."
+msgstr "Ten identyfikator jest tylko częściowo ważny."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Nieprawid³owy nag³ówek PGP"
+msgstr "Nieprawidłowy nagłówek PGP"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "Nieprawid³owy nag³ówek S/MIME"
+msgstr "Nieprawidłowy nagłówek S/MIME"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "B³êdnie sformatowane pole dla typu %s w \"%s\" linii %d"
+msgstr "Błędnie sformatowane pole dla typu %s w \"%s\" linii %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Zacytowaæ oryginalny list w odpowiedzi?"
+msgstr "Zacytować oryginalny list w odpowiedzi?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Wczytywanie cytowanego listu..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Wprowad¼"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Niew³a¶ciwy dzieñ miesi±ca: %s"
+msgstr "Niewłaściwy dzień miesiąca: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "B³êdne kodowanie."
+msgstr "Błędne kodowanie."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Niew³a¶ciwy numer indeksu."
+msgstr "Niewłaściwy numer indeksu."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "B³êdny numer listu."
+msgstr "Błędny numer listu."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Niew³a¶ciwy miesi±c: %s"
+msgstr "Niewłaściwy miesiąc: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "B³êdna data wzglêdna: %s"
+msgstr "Błędna data względna: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "Wywo³ywanie PGP..."
+msgstr "Wywoływanie PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "Wywo³ywanie PGP..."
+msgstr "Wywoływanie PGP..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Wywo³ywanie polecenia podgl±du: %s"
+msgstr "Wywoływanie polecenia podglądu: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Skocz do listu: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Przeskocz do: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Przeskakiwanie nie jest mo¿liwe w oknach dialogowych."
+msgstr "Przeskakiwanie nie jest możliwe w oknach dialogowych."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Identyfikator klucza: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Klawisz nie zosta³ przypisany."
+msgstr "Klawisz nie został przypisany."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Klawisz nie zosta³ przypisany. Aby uzyskaæ pomoc przyci¶nij '%s'."
+msgstr "Klawisz nie został przypisany. Aby uzyskać pomoc przyciśnij '%s'."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Ogranicz do pasuj±cych listów: "
+msgstr "Ogranicz do pasujących listów: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Ograniczenie: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Logowanie..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1720,17 +1636,17 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Licznik blokad przekroczony, usun±æ blokadê %s?"
+msgstr "Licznik blokad przekroczony, usunąć blokadę %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Logowanie..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "Zalogowanie nie powiod³o siê."
+msgstr "Zalogowanie nie powiodło się."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "Wyszukiwanie odpowiednich kluczy dla \"%s\"..."
@@ -1740,34 +1656,30 @@ msgstr "Wyszukiwanie odpowiednich kluczy dla \"%s\"..."
 msgid "Looking up %s..."
 msgstr "Wyszukiwanie %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Odcisk: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "Typ MIME nie zosta³ zdefiniowany. Nie mo¿na wy¶wietliæ za³±cznika."
+msgstr "Typ MIME nie został zdefiniowany. Nie można wyświetlić załącznika."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Wykryto pêtlê w makrze."
+msgstr "Wykryto pętlę w makrze."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Wy¶lij"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "List nie zosta³ wys³any."
+msgstr "List nie został wysłany."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "Poczta zosta³a wys³ana."
+msgstr "Poczta została wysłana."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
@@ -1775,17 +1687,17 @@ msgstr "Zmiany w skrzynce naniesiono."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Skrzynka zosta³a zamkniêta"
+msgstr "Skrzynka została zamknięta"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Skrzynka zosta³a utworzona."
+msgstr "Skrzynka została utworzona."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Skrzynka zosta³a usuniêta."
+msgstr "Skrzynka została usunięta."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
 msgstr "Skrzynka pocztowa jest pusta."
 
@@ -1794,40 +1706,40 @@ msgstr "Skrzynka pocztowa jest pusta."
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Skrzynka jest oznaczona jako niezapisywalna. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
 msgstr "Skrzynka jest tylko do odczytu."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Skrzynka pozosta³a niezmieniona."
+msgstr "Skrzynka pozostała niezmieniona."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "Skrzynka musi zostaæ nazwana."
+msgstr "Skrzynka musi zostać nazwana."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Skrzynka nie zosta³a usuniêta."
+msgstr "Skrzynka nie została usunięta."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Skrzynka zosta³a utworzona."
+msgstr "Skrzynka została utworzona."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Skrzynka pocztowa zosta³a uszkodzona!"
+msgstr "Skrzynka pocztowa została uszkodzona!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Skrzynka zosta³a zmodyfikowana z zewn±trz."
+msgstr "Skrzynka została zmodyfikowana z zewnątrz."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Skrzynka zosta³a zmodyfikowana z zewn±trz. Flagi mog± byæ nieaktualne."
+msgstr "Skrzynka została zmodyfikowana z zewnątrz. Flagi mogą być nieaktualne."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Skrzynki [%d]"
@@ -1842,38 +1754,30 @@ msgstr "Pole \"Edit\" w pliku 'mailcap' wymaga %%s"
 msgid "Mailcap compose entry requires %%s"
 msgstr "Pole \"compose\" w pliku 'mailcap' wymaga %%s"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Utwórz alias"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Zaznaczanie %d listów jako skasowanych..."
+msgstr "Zaznaczanie %d listów jako skasowanych..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Wzorzec"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Kopia zosta³a wys³ana."
+msgstr "Kopia została wysłana."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "List nie zosta³ wydrukowany "
+msgstr "List nie został wydrukowany "
 
 #: editmsg.c:102
 msgid "Message file is empty!"
@@ -1881,82 +1785,69 @@ msgstr "Plik listu jest pusty!"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "Kopia nie zosta³a wys³ana."
+msgstr "Kopia nie została wysłana."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "List nie zosta³ zmieniony!"
+msgstr "List nie został zmieniony!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
 msgstr ""
-"Pierwszy list w±tku nie jest widoczny w trybie ograniczonego przegl±dania."
+"Pierwszy list wątku nie jest widoczny w trybie ograniczonego przeglądania."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "List od³o¿ono."
+msgstr "List odłożono."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "List zosta³ wydrukowany"
+msgstr "List został wydrukowany"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "List zosta³ zapisany."
+msgstr "List został zapisany."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Kopie zosta³y wys³ane."
+msgstr "Kopie zostały wysłane."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "Listy nie zosta³y wydrukowane"
+msgstr "Listy nie zostały wydrukowane"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "Kopie nie zosta³y wys³ane."
+msgstr "Kopie nie zostały wysłane."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Listy zosta³y wydrukowane"
+msgstr "Listy zostały wydrukowane"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Brakuje argumentów."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "£añcuchy mixmasterów mog± mieæ maks. %d elementów."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster nie akceptuje nag³ówków Cc i Bcc."
+msgstr "Brakuje argumentów."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Przenie¶æ przeczytane listy do %s?"
+msgstr "Przenieść przeczytane listy do %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Przenoszenie przeczytanych listów do %s..."
+msgstr "Przenoszenie przeczytanych listów do %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nowe pytanie"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nazwa nowego pliku: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Nowy plik: "
 
@@ -1964,78 +1855,70 @@ msgstr "Nowy plik: "
 msgid "New mail in "
 msgstr "Nowa poczta w "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Uwaga - w bie¿±cej skrzynce pojawi³a siê nowa poczta!"
+msgstr "Uwaga - w bieżącej skrzynce pojawiła się nowa poczta!"
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Nastêpny"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "NastStr"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "¯adna z metod uwierzytelniania nie jest dostêpna"
+msgstr "Żadna z metod uwierzytelniania nie jest dostępna"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Brak parametru granicznego! (zg³o¶ ten b³±d)"
+msgstr "Brak parametru granicznego! (zgłoś ten błąd)"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Brak pozycji."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "¯aden plik nie pasuje do wzorca"
+msgstr "Żaden plik nie pasuje do wzorca"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Nie zdefiniowano po³o¿enia skrzynek z now± poczt±."
+msgstr "Nie zdefiniowano położenia skrzynek z nową pocztą."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Wzorzec ograniczaj±cy nie zosta³ okre¶lony."
+msgstr "Wzorzec ograniczający nie został określony."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Nie otwarto ¿adnej skrzynki."
+msgstr "Nie otwarto żadnej skrzynki."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Brak skrzynki z now± poczt±."
+msgstr "Brak skrzynki z nową pocztą."
 
 #: attach.c:163
 #, c-format
@@ -2047,31 +1930,31 @@ msgstr "Brak pola \"compose\" dla %s w pliku 'mailcap', utworzono pusty plik."
 msgid "No mailcap edit entry for %s"
 msgstr "Brak pola \"Edit\" dla %s w pliku 'mailcap'"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "Nie znaleziono list pocztowych!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "Brak odpowiedniego wpisu w 'mailcap'. Wy¶wietlony jako tekst."
+msgstr "Brak odpowiedniego wpisu w 'mailcap'. Wyświetlony jako tekst."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Brak listów w tej skrzynce."
+msgstr "Brak listów w tej skrzynce."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "¯aden z listów nie spe³nia kryteriów."
+msgstr "Żaden z listów nie spełnia kryteriów."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "Nie ma wiêcej cytowanego tekstu."
+msgstr "Nie ma więcej cytowanego tekstu."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Nie ma wiêcej w±tków."
+msgstr "Nie ma więcej wątków."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "Brak tekstu za cytowanym fragmentem."
 
@@ -2079,313 +1962,274 @@ msgstr "Brak tekstu za cytowanym fragmentem."
 msgid "No new mail in POP mailbox."
 msgstr "Brak nowej poczty w skrzynce POP."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "Brak nowych listów"
+msgstr "Brak nowych listów"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Brak tematu."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "¯aden plik nie pasuje do wzorca"
+msgstr "Żaden plik nie pasuje do wzorca"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Brak skrzynki z now± poczt±."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "Brak od³o¿onych listów."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Brak skrzynki z now± poczt±."
+msgstr "Brak odłożonych listów."
 
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Polecenie drukowania nie zosta³o skonfigurowane."
+msgstr "Polecenie drukowania nie zostało skonfigurowane."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Nie wskazano adresatów!"
+msgstr "Nie wskazano adresatów!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Nie wskazano adresatów listu.\n"
+msgstr "Nie wskazano adresatów listu.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Nie wskazano adresatów!"
+msgstr "Nie wskazano adresatów!"
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Nie ustalono wzorca poszukiwañ."
+msgstr "Nie ustalono wzorca poszukiwań."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Brak tematu."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Brak tematu, zaniechaæ wys³ania?"
+msgstr "Brak tematu, zaniechać wysłania?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Brak tematu, zaniechaæ wys³ania?"
+msgstr "Brak tematu, zaniechać wysłania?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "Brak tematu, zaniechano wys³ania listy."
+msgstr "Brak tematu, zaniechano wysłania listy."
 
 #: imap/browse.c:193
 msgid "No such folder"
 msgstr "Brak skrzynki"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "Brak zaznaczonych pozycji listy."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "¯aden z zaznaczonych listów nie jest widoczny!"
+msgstr "Żaden z zaznaczonych listów nie jest widoczny!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Brak zaznaczonych listów."
+msgstr "Brak zaznaczonych listów."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Brak odtworzonych listów."
+msgstr "Brak odtworzonych listów."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Przeczytano ju¿ wszystkie listy"
+msgstr "Przeczytano już wszystkie listy"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "Brak widocznych listów."
+msgstr "Brak widocznych listów."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
 msgstr "Nie ma takiego polecenia w tym menu."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Nic nie znaleziono."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
 msgstr "Brak akcji do wykonania."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Mo¿liwe jest jedynie usuwanie za³±czników multipart."
+msgstr "Możliwe jest jedynie usuwanie załączników multipart."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Otwórz skrzynkê"
+msgstr "Otwórz skrzynkę"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Otwórz skrzynkê tylko do odczytu"
+msgstr "Otwórz skrzynkę tylko do odczytu"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Otwórz skrzynkê w celu do³±czenia listu"
+msgstr "Otwórz skrzynkę w celu dołączenia listu"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Otwórz skrzynkê tylko do odczytu"
+msgstr "Otwórz skrzynkę tylko do odczytu"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Otwórz skrzynkê w celu do³±czenia listu"
+msgstr "Otwórz skrzynkę w celu dołączenia listu"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Wynik procesu dostarczania"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "Wybrano ju¿ PGP. Anulowaæ wybór PGP i kontynuowaæ? "
+msgstr "Wybrano już PGP. Anulować wybór PGP i kontynuować? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "Klucze PGP dla <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "Klucze PGP dla <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "Podpis PGP NIE mo¿e zostaæ zweryfikowany."
+msgstr "Podpis PGP NIE może zostać zweryfikowany."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "Podpis PGP zosta³ pomy¶lnie zweryfikowany."
+msgstr "Podpis PGP został pomyślnie zweryfikowany."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "Serwer POP nie zosta³ wskazany."
+msgstr "Serwer POP nie został wskazany."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Pierwszy list tego w±tku nie jest dostêpny."
+msgstr "Pierwszy list tego wątku nie jest dostępny."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
 msgstr ""
-"Pierwszy list w±tku nie jest widoczny w trybie ograniczonego przegl±dania."
+"Pierwszy list wątku nie jest widoczny w trybie ograniczonego przeglądania."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "Has³o dla %s@%s: "
+msgstr "Hasło dla %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Nazwisko: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Potok"
-
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Wy¶lij przez potok do polecenia: "
+msgstr "Wyślij przez potok do polecenia: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Wy¶lij przez potok do: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "Ustaw poprawn± warto¶æ hostname je¶li chcesz u¿ywaæ mixmastera!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "Wyślij przez potok do: "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Zachowaæ ten list do pó¼niejszej obróbki i ewentualnej wysy³ki?"
+msgstr "Zachować ten list do późniejszej obróbki i ewentualnej wysyłki?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "Od³o¿one listy"
+msgstr "Odłożone listy"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "Polecenie 'preconnect' nie powiod³o siê."
+msgstr "Polecenie 'preconnect' nie powiodło się."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Przygotowywanie listu do przes³ania dalej..."
+msgstr "Przygotowywanie listu do przesłania dalej..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Naci¶nij dowolny klawisz by kontynuowaæ..."
+msgstr "Naciśnij dowolny klawisz by kontynuować..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "PoprzStr"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Drukuj"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Wydrukowaæ za³±cznik?"
+msgstr "Wydrukować załącznik?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "Wydrukowaæ list?"
+msgstr "Wydrukować list?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Wydrukowaæ zaznaczony(e) za³±cznik(i)?"
+msgstr "Wydrukować zaznaczony(e) załącznik(i)?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Wydrukowaæ zaznaczone listy?"
+msgstr "Wydrukować zaznaczone listy?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Usun±æ NIEODWO£ALNIE %d zaznaczony list?"
+msgstr "Usunąć NIEODWOŁALNIE %d zaznaczony list?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Usun±æ NIEODWO£ALNIE %d zaznaczone listy?"
+msgstr "Usunąć NIEODWOŁALNIE %d zaznaczone listy?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Pytanie"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Pytanie '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Pytanie nie zosta³o okre¶lone."
+msgstr "Pytanie nie zostało określone."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Pytanie:"
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Wyjd¼"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Wyj¶æ z Mutta?"
+msgstr "Wyjść z Mutta?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "Pobieranie przestrzeni nazw..."
@@ -2408,112 +2252,108 @@ msgstr "Czytanie %s... %d (%d%%)"
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "Czytanie nowych listów (%d bajtów)..."
+msgstr "Czytanie nowych listów (%d bajtów)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Naprawdê usun±æ skrzynkê \"%s\"?"
+msgstr "Naprawdę usunąć skrzynkę \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Wywo³aæ od³o¿ony list?"
+msgstr "Wywołać odłożony list?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Tylko tekstowe za³±czniki mo¿na przekodowaæ."
+msgstr "Tylko tekstowe załączniki można przekodować."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
-msgstr "SSL nie powiod³o siê: %s"
+msgstr "SSL nie powiodło się: %s"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Tworzenie skrzynek jest obs³ugiwane tylko dla skrzynek IMAP"
+msgstr "Tworzenie skrzynek jest obsługiwane tylko dla skrzynek IMAP"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Nazwa skrzynki: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "Zmieñ nazwê na: "
+msgstr "Zmień nazwę na: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
 msgstr "Ponowne otwieranie skrzynki..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Odpowiedz"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "Odpowiedzieæ %s%s?"
+msgstr "Odpowiedzieć %s%s?"
 
 #: commands.c:403
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Odwr-Sort (d)ata/(a)ut/o(t)rzym/t(e)m/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)"
+"Odwr-Sort (d)ata/(a)ut/o(t)rzym/t(e)m/d(o)/(w)ąt/(b)ez/ro(z)m/wa(g)a/(s)"
 "pam?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr "Szukaj frazy w przeciwnym kierunku: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
 msgstr "Szukaj w przeciwnym kierunku: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Sortowanie odwrotne wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?"
+msgstr "Sortowanie odwrotne wg (d)aty, (a)lfabetu, (w)ielkości, żad(n)e?"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "Wybrano ju¿ S/MIME. Anulowaæ wybór S/MIME i kontynuowaæ? "
+msgstr "Wybrano już S/MIME. Anulować wybór S/MIME i kontynuować? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "W³a¶ciciel certyfikatu nie odpowiada nadawcy."
+msgstr "Właściciel certyfikatu nie odpowiada nadawcy."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "Certyfikat S/MIME dla \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "Listy S/MIME bez wskazówek co do zawarto¶ci nie s± obs³ugiwane."
+msgstr "Listy S/MIME bez wskazówek co do zawartości nie są obsługiwane."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "Podpis S/MIME NIE mo¿e zostaæ zweryfikowany."
+msgstr "Podpis S/MIME NIE może zostać zweryfikowany."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "Podpis S/MIME zosta³ pomy¶lnie zweryfikowany."
+msgstr "Podpis S/MIME został pomyślnie zweryfikowany."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "Uwierzytelnianie SASL nie powiod³o siê."
+msgstr "Uwierzytelnianie SASL nie powiodło się."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Odcisk: %s"
@@ -2521,22 +2361,18 @@ msgstr "Odcisk: %s"
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "Po³±czenie SSL przy u¿yciu %s (%s)"
+msgstr "Połączenie SSL przy użyciu %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Zapisz"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "Zapisaæ kopiê tego listu?"
+msgstr "Zapisać kopię tego listu?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Zapisz do pliku: "
 
@@ -2548,108 +2384,88 @@ msgstr "Zapisz%s do skrzynki"
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "Zapisywanie stanu flag listów... [%d/%d]"
+msgstr "Zapisywanie stanu flag listów... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Szukaj"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Szukaj frazy: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Poszukiwanie dotar³o do koñca bez znalezienia frazy"
+msgstr "Poszukiwanie dotarło do końca bez znalezienia frazy"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Poszukiwanie dotar³o do pocz±tku bez znalezienia frazy"
+msgstr "Poszukiwanie dotarło do początku bez znalezienia frazy"
 
 #: pattern.c:1320
 msgid "Search interrupted."
 msgstr "Przeszukiwanie przerwano."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Poszukiwanie nie jest mo¿liwe w tym menu."
+msgstr "Poszukiwanie nie jest możliwe w tym menu."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Kontynuacja poszukiwania od koñca."
+msgstr "Kontynuacja poszukiwania od końca."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Kontynuacja poszukiwania od pocz±tku."
+msgstr "Kontynuacja poszukiwania od początku."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Szukaj: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Wybierz"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Wybór  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Wybierz ³añcuch remailera."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "Wybieranie %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Wy¶lij"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "Wysy³anie w tle."
+msgstr "Wysyłanie w tle."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "Wysy³anie listu..."
+msgstr "Wysyłanie listu..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Serwer zamkn±³ po³±czenie!"
+msgstr "Serwer zamknął połączenie!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Ustaw flagê"
+msgstr "Ustaw flagę"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "Polecenie pow³oki: "
+msgstr "Polecenie powłoki: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Podpisz"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Podpisz jako: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Podpisz i zaszyfruj"
 
@@ -2658,36 +2474,32 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Sortuj (d)ata/(a)ut/o(t)rzym/t(e)mat/d(o)/(w)±t/(b)ez/ro(z)m/wa(g)a/(s)pam?: "
+"Sortuj (d)ata/(a)ut/o(t)rzym/t(e)mat/d(o)/(w)ąt/(b)ez/ro(z)m/wa(g)a/(s)pam?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Sortowanie wg (d)aty, (a)lfabetu, (w)ielko¶ci, ¿ad(n)e?"
+msgstr "Sortowanie wg (d)aty, (a)lfabetu, (w)ielkości, żad(n)e?"
 
 #: sort.c:269
 msgid "Sorting mailbox..."
 msgstr "Sortowanie poczty w skrzynce..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Identyfikator klucza: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Zapisane [%s], wzorzec nazw plików: %s"
+msgstr "Zapisane [%s], wzorzec nazw plików: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2696,131 +2508,131 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "Subskrybowanie %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "sprawdzanie certyfikatu SSL"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Zaznacz pasuj±ce listy: "
+msgstr "Zaznacz pasujące listy: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Zaznacz listy do do³±czenia!"
+msgstr "Zaznacz listy do dołączenia!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Zaznaczanie nie jest obs³ugiwane."
+msgstr "Zaznaczanie nie jest obsługiwane."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr "Ten list nie jest widoczny."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "Protokó³ SSL nie jest dostêpny."
+msgstr "Protokół SSL nie jest dostępny."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "Bie¿±cy za³acznik zostanie przekonwertowany."
+msgstr "Bieżący załacznik zostanie przekonwertowany."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "Bie¿±cy za³acznik nie zostanie przekonwertowany."
+msgstr "Bieżący załacznik nie zostanie przekonwertowany."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "B³êdny indeks listów. Spróbuj ponownie otworzyæ skrzynkê."
+msgstr "Błędny indeks listów. Spróbuj ponownie otworzyć skrzynkę."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "£añcuch remailera jest pusty."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "Brak za³±czników."
+msgstr "Brak załączników."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "Brak listów."
+msgstr "Brak listów."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "Brak pod-listów!"
+msgstr "Brak pod-listów!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Zbyt stara wersja serwera IMAP. Praca z tym serwerem nie jest mo¿liwa."
+msgstr "Zbyt stara wersja serwera IMAP. Praca z tym serwerem nie jest możliwa."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Ten certyfikat nale¿y do:"
+msgstr "Ten certyfikat należy do:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Ten certyfikat jest wa¿ny"
+msgstr "Ten certyfikat jest ważny"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Ten certyfikat zosta³ wydany przez:"
+msgstr "Ten certyfikat został wydany przez:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Nie mo¿na u¿yæ tego klucza: wygas³, zosta³ wy³±czony lub wyprowadzony."
+msgstr "Nie można użyć tego klucza: wygasł, został wyłączony lub wyprowadzony."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "W±tek zawiera nieprzeczytane listy."
+msgstr "Wątek zawiera nieprzeczytane listy."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "W±tkowanie nie zosta³o w³±czone."
+msgstr "Wątkowanie nie zostało włączone."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Czas oczekiwania na blokadê typu 'fcntl' zosta³ przekroczony!"
+msgstr "Czas oczekiwania na blokadę typu 'fcntl' został przekroczony!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Czas oczekiwania na blokadê typu 'flock' zosta³ przekroczony!"
+msgstr "Czas oczekiwania na blokadę typu 'flock' został przekroczony!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Pokazany jest pocz±tek listu."
+msgstr "Pokazany jest początek listu."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "Próba skopiowania kluczy PGP...\n"
+msgstr "Próba skopiowania kluczy PGP...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "Próba skopiowania kluczy S/MIME...\n"
+msgstr "Próba skopiowania kluczy S/MIME...\n"
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "B³±d komunikacji z %s (%s)"
+msgstr "Błąd komunikacji z %s (%s)"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2830,78 +2642,69 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "Uwierzytelnianie SASL nie powiod³o siê."
+msgstr "Uwierzytelnianie SASL nie powiodło się."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "Nie mo¿na do³±czyæ %s!"
+msgstr "Nie można dołączyć %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "Nie mo¿na do³±czyæ!"
+msgstr "Nie można dołączyć!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Nie mo¿na pobraæ nag³ówków z serwera IMAP w tej wersji."
+msgstr "Nie można pobrać nagłówków z serwera IMAP w tej wersji."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "Nie mo¿na pobraæ certyfikatu z docelowego hosta"
+msgstr "Nie można pobrać certyfikatu z docelowego hosta"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Nie mo¿na zostawiæ listów na serwerze."
+msgstr "Nie można zostawić listów na serwerze."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "Nie mo¿na do³±czyæ %s!"
+msgstr "Nie można dołączyć %s!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Nie mo¿na zablokowaæ skrzynki pocztowej!"
+msgstr "Nie można zablokować skrzynki pocztowej!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Nie mo¿na otworzyæ pliku tymczasowego!"
+msgstr "Nie można otworzyć pliku tymczasowego!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Nie mo¿na otworzyæ pliku tymczasowego!"
+msgstr "Nie można otworzyć pliku tymczasowego!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Nie mo¿na otworzyæ pliku tymczasowego!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Odtwórz"
+msgstr "Nie można otworzyć pliku tymczasowego!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Odtwórz pasuj±ce listy: "
+msgstr "Odtwórz pasujące listy: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "Odtwórz"
+msgstr "Odtwórz"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Nieznany typ \"Content-Type\" %s"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Odsubskrybowanie %s..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Odsubskrybowanie %s..."
@@ -2911,59 +2714,51 @@ msgstr "Odsubskrybowanie %s..."
 msgid "Unsubscribing to %s..."
 msgstr "Odsubskrybowanie %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Odznacz pasuj±ce listy: "
+msgstr "Odznacz pasujące listy: "
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "£adowanie listu ..."
+msgstr "Ładowanie listu ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "U¿yj 'toggle-write' by ponownie w³±czyæ zapisanie!"
+msgstr "Użyj 'toggle-write' by ponownie włączyć zapisanie!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "U¿yæ klucza numer \"%s\" dla %s?"
+msgstr "Użyć klucza numer \"%s\" dla %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
 msgstr "Nazwa konta na %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Niew³a¶ciwy miesi±c: %s"
+msgstr "Niewłaściwy miesiąc: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Niew³a¶ciwy miesi±c: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Niewłaściwy miesiąc: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Weryfikowaæ podpis PGP?"
+msgstr "Weryfikować podpis PGP?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Sprawdzanie indeksów listów..."
-
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Zobacz za³."
+msgstr "Sprawdzanie indeksów listów..."
 
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "UWAGA! Nadpisujesz plik %s, kontynuowaæ?"
+msgstr "UWAGA! Nadpisujesz plik %s, kontynuować?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2971,29 +2766,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "Certyfikat serwera utraci³ wa¿no¶æ"
+msgstr "Certyfikat serwera utracił ważność"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "Certyfikat serwera utraci³ wa¿no¶æ"
+msgstr "Certyfikat serwera utracił ważność"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "Certyfikat serwera nie uzyska³ jeszcze wa¿no¶ci"
+msgstr "Certyfikat serwera nie uzyskał jeszcze ważności"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "Certyfikat serwera nie uzyska³ jeszcze wa¿no¶ci"
+msgstr "Certyfikat serwera nie uzyskał jeszcze ważności"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3008,44 +2803,44 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "Oczekiwanie na blokadê typu 'fcntl'... %d"
+msgstr "Oczekiwanie na blokadę typu 'fcntl'... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "Oczekiwanie na blokadê typu 'flock'... %d"
+msgstr "Oczekiwanie na blokadę typu 'flock'... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "Oczekiwanie na odpowied¼..."
+msgstr "Oczekiwanie na odpowiedź..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "Ostrze¿enie: '%s' to b³êdny IDN."
+msgstr "Ostrzeżenie: '%s' to błędny IDN."
 
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Certyfikat serwera utraci³ wa¿no¶æ"
+msgstr "Certyfikat serwera utracił ważność"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "Ostrze¿enie: b³êdny IDN '%s' w aliasie '%s'.\n"
+msgstr "Ostrzeżenie: błędny IDN '%s' w aliasie '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "Ostrze¿enie: Nie mo¿na zapisaæ certyfikatu"
+msgstr "Ostrzeżenie: Nie można zapisać certyfikatu"
 
 #: crypt.cpkg:902
 #, fuzzy
 msgid "Warning: One of the keys has been revoked\n"
-msgstr "Ostrze¿enie: fragment tej wiadomo¶ci nie zosta³ podpisany."
+msgstr "Ostrzeżenie: fragment tej wiadomości nie został podpisany."
 
 #: commands.c:141 commands.c:151
 msgid "Warning: Part of this message has not been signed."
-msgstr "Ostrze¿enie: fragment tej wiadomo¶ci nie zosta³ podpisany."
+msgstr "Ostrzeżenie: fragment tej wiadomości nie został podpisany."
 
 #: crypt.cpkg:910
 msgid "Warning: The key used to create the signature expired at: "
@@ -3055,30 +2850,30 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Mamy tu b³±d tworzenia za³±cznika"
+msgstr "Mamy tu błąd tworzenia załącznika"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Zapis niemo¿liwy! Zapisano czê¶æ skrzynki do %s"
+msgstr "Zapis niemożliwy! Zapisano część skrzynki do %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "B³±d zapisu!"
+msgstr "Błąd zapisu!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Zapisz list do skrzynki"
 
@@ -3087,7 +2882,7 @@ msgstr "Zapisz list do skrzynki"
 msgid "Writing %s..."
 msgstr "Zapisywanie %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Zapisywanie listu do %s ..."
@@ -3095,84 +2890,66 @@ msgstr "Zapisywanie listu do %s ..."
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "Zapisywanie listów... %d (%d%%)"
+msgstr "Zapisywanie listów... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "B³±d w poleceniu: %s\n"
+msgstr "Błąd w poleceniu: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Istnieje ju¿ tak nazwany alias!"
+msgstr "Istnieje już tak nazwany alias!"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Ju¿ zdefiniowano pierwszy element ³añcucha."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Ju¿ zdefiniowano ostatni element ³añcucha."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr "To jest pierwsza pozycja."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "To jest pierwsza strona."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr "To jest pierwszy list."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr "To jest pierwsza strona."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "To pierwszy w±tek."
+msgstr "To pierwszy wątek."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr "To jest ostatnia pozycja."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "To jest ostatnia strona."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "To jest ostatni list."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr "To jest ostatnia strona."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Nie mo¿na ni¿ej przewin±æ."
+msgstr "Nie można niżej przewinąć."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Nie mo¿na wy¿ej przewin±æ."
+msgstr "Nie można wyżej przewinąć."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Brak aliasów!"
+msgstr "Brak aliasów!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Nie mo¿esz usun±æ jedynego za³±cznika."
+msgstr "Nie możesz usunąć jedynego załącznika."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Mo¿esz wysy³aæ kopie tylko listów zgodnych z RFC 822."
+msgstr "Możesz wysyłać kopie tylko listów zgodnych z RFC 822."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Potwierdzasz?"
@@ -3180,88 +2957,88 @@ msgstr "[%s = %s] Potwierdzasz?"
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- typ %s/%s nie jest obs³ugiwany "
+msgstr "[-- typ %s/%s nie jest obsługiwany "
 
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- Za³±cznik #%d"
+msgstr "[-- Załącznik #%d"
 
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Komunikaty b³êdów %s --]\n"
+msgstr "[-- Komunikaty błędów %s --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Podgl±d za pomoc± %s --]\n"
+msgstr "[-- Podgląd za pomocą %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- POCZ¡TEK LISTU PGP --]\n"
+"[-- POCZĄTEK LISTU PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- POCZ¡TEK KLUCZA PUBLICZNEGO PGP --]\n"
+msgstr "[-- POCZĄTEK KLUCZA PUBLICZNEGO PGP --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- POCZ¡TEK LISTU PODPISANEGO PGP --]\n"
+"[-- POCZĄTEK LISTU PODPISANEGO PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- Nie mo¿na uruchomiæ %s. --]\n"
+msgstr "[-- Nie można uruchomić %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- KONIEC LISTU PGP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- KONIEC PUBLICZNEGO KLUCZA PGP --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- KONIEC LISTU PODPISANEGO PGP --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- Koniec danych zaszyfrowanych PGP/MIME --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- Koniec danych zaszyfrowanych PGP/MIME --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Koniec danych zaszyfrowanych S/MIME. --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Koniec danych podpisanych S/MIME. --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3273,140 +3050,140 @@ msgstr ""
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[--B³±d: Nie mo¿na wy¶wietliæ ¿adnego z fragmentów Multipart/Alternative! "
+"[--Błąd: Nie można wyświetlić żadnego z fragmentów Multipart/Alternative! "
 "--]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- B³±d: Niespójna struktura multipart/signed ! --]\n"
+"[-- Błąd: Niespójna struktura multipart/signed ! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- B³±d: Nieznany protokó³ multipart/signed %s! --]\n"
+"[-- Błąd: Nieznany protokół multipart/signed %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- B³±d: nie mo¿na utworzyæ pliku tymczasowego! --]\n"
+msgstr "[-- Błąd: nie można utworzyć pliku tymczasowego! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- B³±d: nie mo¿na odnale¼æ pocz±tku listu PGP! --]\n"
+"[-- Błąd: nie można odnaleźć początku listu PGP! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- B³±d: nie mo¿na utworzyæ pliku tymczasowego! --]\n"
+msgstr "[-- Błąd: nie można utworzyć pliku tymczasowego! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- B³±d: uszkodzony list PGP/MIME! --]\n"
+"[-- Błąd: uszkodzony list PGP/MIME! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- B³±d: message/external-body nie ma ustawionego rodzaju dostêpu --]\n"
+"[-- Błąd: message/external-body nie ma ustawionego rodzaju dostępu --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Nastêpuj±ce dane s± zaszyfrowane PGP/MIME --]\n"
+"[-- Następujące dane są zaszyfrowane PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Nastêpuj±ce dane s± zaszyfrowane PGP/MIME --]\n"
+"[-- Następujące dane są zaszyfrowane PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
-msgstr "[-- Nastêpuj±ce dane s± zaszyfrowane S/MIME --]\n"
+msgstr "[-- Następujące dane są zaszyfrowane S/MIME --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
-msgstr "[-- Poni¿sze dane s± podpisane S/MIME --]\n"
+msgstr "[-- Poniższe dane są podpisane S/MIME --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Poni¿sze dane s± podpisane --]\n"
+"[-- Poniższe dane są podpisane --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- Ten za³±cznik typu %s/%s "
+msgstr "[-- Ten załącznik typu %s/%s "
 
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- Ten za³±cznik typu %s/%s nie jest zawarty, --]\n"
+msgstr "[-- Ten załącznik typu %s/%s nie jest zawarty, --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Typ: %s/%s, Kodowanie: %s, Wielko¶æ: %s --]\n"
+msgstr "[-- Typ: %s/%s, Kodowanie: %s, Wielkość: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Ostrze¿enie: Nie znaleziono ¿adnych podpisów. --]\n"
+"[-- Ostrzeżenie: Nie znaleziono żadnych podpisów. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Ostrze¿enie: nie mo¿na zweryfikowaæ podpisów %s/%s --]\n"
+"[-- Ostrzeżenie: nie można zweryfikować podpisów %s/%s --]\n"
 "\n"
 
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- a podany typ dostêpu %s nie jest obs³ugiwany --]\n"
+msgstr "[-- a podany typ dostępu %s nie jest obsługiwany --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- a podane ¼ród³o zewnêtrzne jest --]\n"
+"[-- a podane źródło zewnętrzne jest --]\n"
 "[-- nieaktualne. --]\n"
 
 #: handler.c:1201
@@ -3419,107 +3196,283 @@ msgstr "[-- nazwa: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- na %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Wygas³y   "
+msgstr "Wygasły   "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "B³êdny   "
+msgstr "Błędny   "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
 msgstr "Wyprowadzony   "
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[b³êdna data]"
+msgstr "[błędna data]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[niemo¿liwe do wyznaczenia]"
+msgstr "[niemożliwe do wyznaczenia]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: brak adresu"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Nie można znaleźć żadnego z zaznaczonych listów."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Nie można znaleźć żadnego z zaznaczonych listów."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Zapisać kopię tego listu?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "edytuj opis za³±cznika"
+msgstr "edytuj opis załącznika"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "edytuj opis za³±cznika"
+msgstr "edytuj opis załącznika"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: zbyt wiele argumentów"
+msgstr "bind: zbyt wiele argumentów"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Błąd przeglądania katalogu."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Brak skrzynki z nową pocztą."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: za ma³o argumentów"
+msgstr "color: za mało argumentów"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Brak nowych listów"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr "konwertowanie"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Zapisz list do skrzynki"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "nie mo¿na utworzyæ tymczasowej skrzynki: %s"
+msgstr "nie można utworzyć tymczasowej skrzynki: %s"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "nie mo¿na zmniejszyæ tymczasowej skrzynki: %s"
+msgstr "nie można zmniejszyć tymczasowej skrzynki: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "nie mo¿na zapisaæ tymczasowej skrzynki: %s"
+msgstr "nie można zapisać tymczasowej skrzynki: %s"
 
-#: browser.c:1206
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Nie zdefiniowano położenia skrzynek z nową pocztą."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dawn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "domy¶lnie ustalone kolory nie s± obs³ugiwane"
+msgstr "domyślnie ustalone kolory nie są obsługiwane"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Usunąć listy z serwera?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Odtwórz pasujące listy: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Odtwórz pasujące listy: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "dateowbzgs"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Edytować przesyłany list?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3535,29 +3488,116 @@ msgstr "Kopiowanie do %s..."
 msgid "echo Decompressing %s..."
 msgstr "Wybieranie %s..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Bieżący załacznik nie zostanie przekonwertowany."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "edytuj opis załącznika"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Nie można zapisać listu"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Pobieranie nagłówków listów... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Edytować przesyłany list?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Zapisać kopię tego listu?"
+
 #: pattern.c:777
 msgid "empty pattern"
 msgstr "pusty wzorzec"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
 msgstr "Zaszyfruj"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Zapisać kopię tego listu?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3572,36 +3612,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "b³±d w wyra¿eniu"
+msgstr "błąd w wyrażeniu"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3611,26 +3651,82 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "b³±d we wzorcu: %s"
+msgstr "błąd we wzorcu: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "b³±d: nieznany op %d (zg³o¶ ten b³±d)."
+msgstr "błąd: nieznany op %d (zgłoś ten błąd)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "zsabife"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "zsabife"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
-msgstr "exec: brak argumentów"
+msgstr "exec: brak argumentów"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Follow-up do %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Przesłać dalej jako załączniki?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Poszukiwanie nowej poczty..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "To jest pierwszy list."
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -3652,40 +3748,154 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
-msgstr ""
-
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "To jest ostatnia strona."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Brak skrzynki z nową pocztą."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Błąd otwarcia skrzynki"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Brak skrzynki z nową pocztą."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "zosta³ usuniêty --]\n"
+msgstr "został usunięty --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbox: skasowanie nie powiod³o siê"
+msgstr "imap_sync_mailbox: skasowanie nie powiodło się"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "nieprawid³owy nag³ówek"
+msgstr "nieprawidłowy nagłówek"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Niewłaściwy numer indeksu."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Skocz do listu: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Skocz do listu: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Wątek zawiera nieprzeczytane listy."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "To pierwszy wątek."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Przeczytano już wszystkie listy"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Przeczytano już wszystkie listy"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Zapisać kopię tego listu?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "Klucze PGP dla <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Wyślij kopie zaznaczonych listów do: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Brak skrzynki z nową pocztą."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: pusta sekwencja klawiszy"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: zbyt wiele argumentów"
+msgstr "macro: zbyt wiele argumentów"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
@@ -3694,12 +3904,44 @@ msgstr "brak wpisu w 'mailcap' dla typu %s"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): nie mo¿na nadaæ plikowi daty"
+msgstr "maildir_commit_message(): nie można nadać plikowi daty"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "Kopie nie zosta³y wys³ane."
+msgstr "Kopie nie zostały wysłane."
 
 #: pattern.c:746
 #, c-format
@@ -3709,21 +3951,112 @@ msgstr "niesparowane nawiasy: %s"
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "brakuj±cy parametr"
+msgstr "brakujący parametr"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: za ma³o argumentów"
+msgstr "mono: za mało argumentów"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "To jest pierwsza pozycja."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "To jest pierwszy list."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "To jest ostatnia pozycja."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "To jest ostatni list."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "To jest ostatnia pozycja."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "To jest ostatnia strona."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Brak odtworzonych listów."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "To jest pierwsza pozycja."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "To jest pierwsza strona."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Brak odtworzonych listów."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "To jest pierwsza strona."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "wieloczê¶ciowy list nie posiada wpisu ograniczaj±cego!"
+msgstr "wieloczęściowy list nie posiada wpisu ograniczającego!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "nie"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "(brak skrzynki)"
@@ -3732,55 +4065,308 @@ msgstr "(brak skrzynki)"
 msgid "not converting"
 msgstr "bez konwersji"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "pusta sekwencja klawiszy"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
 msgstr "nda"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Otwórz skrzynkę tylko do odczytu"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Otwórz skrzynkę tylko do odczytu"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Ponowne otwieranie skrzynki..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Wyślij kopię listu do %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "reset: nieprawid³owy prefiks"
+msgstr "reset: nieprawidłowy prefiks"
+
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "To jest pierwsza pozycja."
 
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: zbyt wiele argumentów"
+msgstr "push: zbyt wiele argumentów"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Wywołać odłożony list?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Wątek zawiera nieprzeczytane listy."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Nie można edytować listów na serwerze POP."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: nie można dołączyć pliku"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Skocz do listu: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Usunąć listy z serwera?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "or"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "ora"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Zapisz%s do skrzynki"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Zapisz%s do skrzynki"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Nie można edytować listów na serwerze POP."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "błąd w wyrażeniu"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Szukaj frazy: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Wysłanie listu nie powiodło się."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Przesłać dalej jako załączniki?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Ogranicz do pasujących listów: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Nie ma więcej cytowanego tekstu."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Wydrukować list?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Brak listów w tej skrzynce."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source: b³êdy w %s"
+msgstr "source: błędy w %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
-msgstr "source: b³êdy w %s"
+msgstr "source: błędy w %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: wczytywanie zaniechane z powodu zbyt wielu b³êdów w %s"
+msgstr "source: wczytywanie zaniechane z powodu zbyt wielu błędów w %s"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Żaden plik nie pasuje do wzorca"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: skrzynka zmodyfikowana, ale ¿aden z listów nie zosta³ zmieniony! "
-"(zg³o¶ ten b³±d)"
+"sync: skrzynka zmodyfikowana, ale żaden z listów nie został zmieniony! "
+"(zgłoś ten błąd)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Odznacz pasujące listy: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "To pierwszy wątek."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3792,41 +4378,130 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Nie ma więcej cytowanego tekstu."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Tylko tekstowe załączniki można przekodować."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Nie ustalono wzorca poszukiwań."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Przeczytano już wszystkie listy"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "za ma³o argumentów"
+msgstr "za mało argumentów"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "za du¿o argumentów"
+msgstr "za dużo argumentów"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "edytuj opis za³±cznika"
+msgstr "edytuj opis załącznika"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Odtwórz pasujące listy: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Odtwórz pasujące listy: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Odtwórz pasujące listy: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: Nie mo¿na skasowaæ %s z wewn±trz %s."
+msgstr "unhook: Nie można skasować %s z wewnątrz %s."
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: Nie mo¿na wykonaæ \"unhook *\" wewn±trz innego polecenia hook."
+msgstr "unhook: Nie można wykonać \"unhook *\" wewnątrz innego polecenia hook."
 
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: nieznany typ polecenia hook: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "nieznany b³±d"
+msgstr "nieznany błąd"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Odznacz pasujące listy: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "edytuj opis załącznika"
 
 #: main.c:82
 msgid ""
@@ -3839,12 +4514,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "reset: nieprawid³owa warto¶æ"
+msgstr "reset: nieprawidłowa wartość"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Załącznik został zapisany."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Nowy plik: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Zapisz list do skrzynki"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "tak"
 
@@ -3852,3 +4558,6 @@ msgstr "tak"
 msgid "yna"
 msgstr "tnw"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/pt_BR.po b/po/pt_BR.po
index d4cf281..3f44a41 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,35 +3,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.5i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2000-03-05 01:14-0300\n"
 "Last-Translator: Marcus Brito <marcus@visaotec.com.br>\n"
 "Language-Team: LIE-BR (http://lie-br.conectiva.com.br)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding:\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Associações genéricas:\n"
+"Associações genéricas:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"Funções sem associação:\n"
+"Funções sem associação:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 #, fuzzy
 msgid ""
 "\n"
@@ -70,39 +70,39 @@ msgstr ""
 "       mutt [ -n ] [ -e <cmd> ] [ -F <arq> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
-"opções:\n"
-"  -a <arquivo>\tanexa um arquivo à mensagem\n"
-"  -b <endereço>\tespecifica um endereço de cópia escondica (BCC)\n"
-"  -c <endereço>\tespecifica um endereço de cópia (CC)\n"
+"opções:\n"
+"  -a <arquivo>\tanexa um arquivo à mensagem\n"
+"  -b <endereço>\tespecifica um endereço de cópia escondica (BCC)\n"
+"  -c <endereço>\tespecifica um endereço de cópia (CC)\n"
 "  -e <comando>\tespecifica um comando a ser executado depois a "
-"inicialização\n"
+"inicialização\n"
 "  -f <arquivo>\tespecifica qual caixa de mensagens abrir\n"
 "  -F <arquivo>\tespecifica um arquivo muttrc alternativo\n"
-"  -H <arquivo>\tespecifica um rascunho de onde ler cabeçalhos\n"
+"  -H <arquivo>\tespecifica um rascunho de onde ler cabeçalhos\n"
 "  -i <arquivo>\tespecifica um arquivo que o Mutt deve incluir na resposta\n"
-"  -m <tipo>\tespecifica o tipo padrão de caixa de mensagens\n"
-"  -n\t\tfaz com que o Mutt não leia o Muttrc do sistema\n"
+"  -m <tipo>\tespecifica o tipo padrão de caixa de mensagens\n"
+"  -n\t\tfaz com que o Mutt não leia o Muttrc do sistema\n"
 "  -p\t\tedita uma mensagem adiada\n"
 "  -R\t\tabre a caixa de mensagens em modo de somente leitura\n"
-"  -s <assunto>\tespecifica um assunto (entre aspas se tiver espaços)\n"
-"  -v\t\tmostra a versão e definições de compilação\n"
+"  -s <assunto>\tespecifica um assunto (entre aspas se tiver espaços)\n"
+"  -v\t\tmostra a versão e definições de compilação\n"
 "  -x\t\tsimula o modo de envio do mailx\n"
 "  -y\t\tescolhe uma caixa na sua lista `mailboxes'\n"
-"  -z\t\tsai imediatamente se não houverem mensagens na caixa\n"
-"  -Z\t\tabre a primeira pasta com novas mensagens, sai se não houver\n"
+"  -z\t\tsai imediatamente se não houverem mensagens na caixa\n"
+"  -Z\t\tabre a primeira pasta com novas mensagens, sai se não houver\n"
 "  -h\t\testa mensagem de ajuda"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " assinar como: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr ""
@@ -145,15 +145,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' para uma lista): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
 msgstr "(continuar)\n"
@@ -161,15 +161,15 @@ msgstr "(continuar)\n"
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Pressione '%s' para trocar entre gravar ou não"
+msgstr " Pressione '%s' para trocar entre gravar ou não"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " nesta visão limitada"
+msgstr " nesta visão limitada"
 
 #: commands.c:601
 msgid " tagged"
@@ -178,12 +178,12 @@ msgstr " marcada"
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: comando inválido"
+msgstr "%c: comando inválido"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: não é possível neste modo"
+msgstr "%c: não é possível neste modo"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
@@ -195,45 +195,45 @@ msgstr "%d mantidas, %d apagadas."
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d mantidas, %d movidas, %d apagadas."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s [%s]\n"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s [%s]\n"
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, fuzzy, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Você realmente quer usá-lo?"
+msgstr "%s Você realmente quer usá-lo?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] modificado. Atualizar codificação?"
+msgstr "%s [#%d] modificado. Atualizar codificação?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] não existe mais!"
+msgstr "%s [#%d] não existe mais!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d de %d mensagens lidas]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s não existe. Devo criá-lo?"
+msgstr "%s não existe. Devo criá-lo?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
@@ -245,40 +245,40 @@ msgstr ""
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr ""
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s não é um diretório."
+msgstr "%s não é um diretório."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s não é uma caixa de mensagens!"
+msgstr "%s não é uma caixa de mensagens!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s não é uma caixa de correio."
+msgstr "%s não é uma caixa de correio."
 
 #: sendlib.c:748
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
-msgstr "%s não é uma caixa de correio."
+msgstr "%s não é uma caixa de correio."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s não mais existe!"
+msgstr "%s não mais existe!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -292,52 +292,52 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
-msgstr "%s: tipo inválido"
+msgstr "%s: tipo inválido"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: o terminal não aceita cores"
+msgstr "%s: o terminal não aceita cores"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: comando válido apenas para o objeto índice"
+msgstr "%s: comando válido apenas para o objeto índice"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: não existe tal atributo"
+msgstr "%s: não existe tal atributo"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: não existe tal cor"
+msgstr "%s: não existe tal cor"
 
-#: keymap.c:847
+#: keymap.c:839
 #, fuzzy, c-format
 msgid "%s: no such function"
-msgstr "%s: não existe tal função no mapa"
+msgstr "%s: não existe tal função no mapa"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: não existe tal função no mapa"
+msgstr "%s: não existe tal função no mapa"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: não existe tal menu"
+msgstr "%s: não existe tal menu"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s: não existe tal objeto"
+msgstr "%s: não existe tal objeto"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: poucos argumentos"
@@ -345,39 +345,39 @@ msgstr "%s: poucos argumentos"
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: não foi possível anexar o arquivo"
+msgstr "%s: não foi possível anexar o arquivo"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: não foi possível anexar o arquivo.\n"
+msgstr "%s: não foi possível anexar o arquivo.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: comando desconhecido"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: tipo inválido"
+msgstr "%s: tipo inválido"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: variável desconhecida"
+msgstr "%s: variável desconhecida"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
 msgstr ""
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr ""
@@ -386,15 +386,15 @@ msgstr ""
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "('view-attachments' precisa estar associado a uma tecla!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(nenhuma caixa de mensagens)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(r)ejeitar, (a)ceitar uma vez"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ejeitar, (a)ceitar uma vez, aceitar (s)empre"
 
@@ -412,22 +412,22 @@ msgstr "(use '%s' para ver esta parte)"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Anexos"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<DESCONHECIDO>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<padrão>"
+msgstr "<padrão>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -440,37 +440,33 @@ msgstr ""
 #: pop.c:325
 #, fuzzy
 msgid "APOP authentication failed."
-msgstr "Autenticação GSSAPI falhou."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Cancelar"
+msgstr "Autenticação GSSAPI falhou."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Cancelar mensagem não modificada?"
+msgstr "Cancelar mensagem não modificada?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Mensagem não modificada cancelada."
+msgstr "Mensagem não modificada cancelada."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "Endereço: "
+msgstr "Endereço: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Apelido adicionado."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Apelidar como: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Apelidos"
 
@@ -478,64 +474,60 @@ msgstr "Apelidos"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Anexar"
+msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Anexa mensagens a %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "O argumento deve ser um número de mensagem."
+msgstr "O argumento deve ser um número de mensagem."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Anexo salvo."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Anexar arquivo"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Anexando os arquivos escolhidos..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Anexo filtrado."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Anexo salvo."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Anexos"
 
@@ -568,12 +560,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -588,9 +580,9 @@ msgstr ""
 msgid "Bad mailbox name"
 msgstr "Abrir caixa de correio"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "O fim da mensagem está sendo mostrado."
+msgstr "O fim da mensagem está sendo mostrado."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
@@ -610,7 +602,7 @@ msgstr "Repetir mensagens para %s"
 msgid "Bounce tagged messages to: "
 msgstr "Repetir mensagens marcadas para: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -626,69 +618,69 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Não é possível anexar à pasta: %s"
+msgstr "Não é possível anexar à pasta: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "Não é possível anexar um diretório"
+msgstr "Não é possível anexar um diretório"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "Não é possível criar %s: %s"
+msgstr "Não é possível criar %s: %s"
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "Não é possível criar o arquivo %s"
+msgstr "Não é possível criar o arquivo %s"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Não foi possível criar um filtro"
+msgstr "Não foi possível criar um filtro"
 
 #: commands.c:290 commands.c:317 commands.c:334
 #, fuzzy
 msgid "Can't create filter process"
-msgstr "Não foi possível criar um filtro"
+msgstr "Não foi possível criar um filtro"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Não foi possível criar um arquivo temporário"
+msgstr "Não foi possível criar um arquivo temporário"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Não foi possível decodificar todos os anexos marcados.\n"
-"Encapsular os demais através de MIME?"
+"Não foi possível decodificar todos os anexos marcados.\n"
+"Encapsular os demais através de MIME?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Não foi possível decodificar todos os anexos marcados.\n"
-"Encaminhar os demais através de MIME?"
+"Não foi possível decodificar todos os anexos marcados.\n"
+"Encaminhar os demais através de MIME?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
-msgstr "Não foi encontrada nenhuma mensagem marcada."
+msgstr "Não foi encontrada nenhuma mensagem marcada."
 
-#: recvattach.c:977
+#: recvattach.c:965
 #, fuzzy
 msgid "Can't delete attachment from POP server."
-msgstr "obtém mensagens do servidor POP"
+msgstr "obtém mensagens do servidor POP"
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "obtém mensagens do servidor POP"
+msgstr "obtém mensagens do servidor POP"
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Não é possível travar %s.\n"
+msgstr "Não é possível travar %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -696,50 +688,46 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Não foi encontrada nenhuma mensagem marcada."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Não foi possível obter o type2.list do mixmaster!"
+msgstr "Não foi encontrada nenhuma mensagem marcada."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Não pude casar o nome, continuo?"
+msgstr "Não pude casar o nome, continuo?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Não é possível abrir o arquivo de mensagens: %s"
+msgstr "Não é possível abrir o arquivo de mensagens: %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Não é possível anexar à pasta: %s"
+msgstr "Não é possível anexar à pasta: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "Conectando a %s..."
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Fechando a conexão com o servidor IMAP..."
+msgstr "Fechando a conexão com o servidor IMAP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "Impossível consultar: %s"
+msgstr "Impossível consultar: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "Não é possível criar %s: %s"
+msgstr "Não é possível criar %s: %s"
 
 #: muttlib.c:310
 #, fuzzy
@@ -751,83 +739,79 @@ msgstr "Gravar mensagem na caixa"
 msgid "Can't save message to newsserver."
 msgstr "Apagando mensagens do servidor..."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
-msgstr "Impossível consultar: %s"
+msgstr "Impossível consultar: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Não é possível visualizar um diretório"
+msgstr "Não é possível visualizar um diretório"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "Não é possível criar %s."
+msgstr "Não é possível criar %s."
 
 #: pop.c:888
 #, fuzzy
 msgid "Can't write header to temporary file!"
-msgstr "Não foi possível criar um arquivo temporário"
+msgstr "Não foi possível criar um arquivo temporário"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Não foi possível gravar a mensagem"
+msgstr "Não foi possível gravar a mensagem"
 
 #: pop.c:1420
 #, fuzzy
 msgid "Can't write message to temporary file!"
-msgstr "Não foi possível criar um arquivo temporário"
+msgstr "Não foi possível criar um arquivo temporário"
 
 #: commands.c:71
 #, fuzzy
 msgid "Cannot create display filter"
-msgstr "Não é possível criar o filtro."
+msgstr "Não é possível criar o filtro."
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Não é possível criar o filtro."
+msgstr "Não é possível criar o filtro."
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Não é possível ativar escrita em uma caixa somente para leitura!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Não é possível ativar escrita em uma caixa somente para leitura!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "%s recebido... Saindo.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "Certificado salvo"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Certificado salvo"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Mudanças na pasta serão escritas na saída."
+msgstr "Mudanças na pasta serão escritas na saída."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Mudanças na pasta não serão escritas"
+msgstr "Mudanças na pasta não serão escritas"
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -835,31 +819,23 @@ msgstr ""
 #: commands.c:786
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
-msgstr "O conjunto de caracteres %s é desconhecido."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Diretório"
+msgstr "O conjunto de caracteres %s é desconhecido."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "Mudar para: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Preparando mensagem encaminhada..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Verificar chave  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 #, fuzzy
 msgid "Checking for new messages..."
 msgstr "Preparando mensagem encaminhada..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Preparando mensagem encaminhada..."
@@ -868,7 +844,7 @@ msgstr "Preparando mensagem encaminhada..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Nada"
 
@@ -876,17 +852,17 @@ msgstr "Nada"
 msgid "Clear flag"
 msgstr "Limpa marca"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, fuzzy, c-format
 msgid "Closing connection to %s..."
-msgstr "Fechando a conexão com o servidor IMAP..."
+msgstr "Fechando a conexão com o servidor IMAP..."
 
 #: pop.c:170
 #, fuzzy
 msgid "Closing connection to POP server..."
-msgstr "Fechando a conexão com o servidor IMAP..."
+msgstr "Fechando a conexão com o servidor IMAP..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Conectando a %s..."
@@ -894,28 +870,28 @@ msgstr "Conectando a %s..."
 #: pop.c:600 pop.c:863
 #, fuzzy, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Não é possível marcar."
+msgstr "Não é possível marcar."
 
 #: pop.c:602 pop.c:966
 #, fuzzy, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Não é possível marcar."
+msgstr "Não é possível marcar."
 
 #: lib-mx/mbox.c:547
 #, fuzzy
 msgid "Committing changes..."
-msgstr "Compilando padrão de busca..."
+msgstr "Compilando padrão de busca..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Opções de compilação:"
+"Opções de compilação:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Compilando padrão de busca..."
+msgstr "Compilando padrão de busca..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
@@ -927,12 +903,12 @@ msgstr "Copiando para %s..."
 msgid "Compressing %s..."
 msgstr "Copiando para %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Conectando a %s..."
@@ -950,19 +926,19 @@ msgstr "Conectando a %s..."
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Fechando a conexão com o servidor IMAP..."
+msgstr "Fechando a conexão com o servidor IMAP..."
 
 #: pop.c:808
 #, fuzzy
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Fechando a conexão com o servidor IMAP..."
+msgstr "Fechando a conexão com o servidor IMAP..."
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, fuzzy, c-format
 msgid "Connection to %s closed"
 msgstr "Conectando a %s..."
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "Conectando a %s..."
@@ -972,9 +948,9 @@ msgstr "Conectando a %s..."
 msgid "Content-Type changed to %s."
 msgstr "Conectando a %s..."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-Type é da forma base/sub"
+msgstr "Content-Type é da forma base/sub"
 
 #: imap/util.c:135
 msgid "Continue?"
@@ -1019,37 +995,37 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, fuzzy, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Não foi possível abrir %s"
+msgstr "Não foi possível abrir %s"
 
 #: commands.c:111
 #, fuzzy
 msgid "Could not copy message"
-msgstr "Não foi possível enviar a mensagem."
+msgstr "Não foi possível enviar a mensagem."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Não foi possível criar um arquivo temporário!"
+msgstr "Não foi possível criar um arquivo temporário!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Não foi possível criar um arquivo temporário!"
+msgstr "Não foi possível criar um arquivo temporário!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
 msgstr ""
-"Não foi possível encontrar a função de ordenação! [relate este problema]"
+"Não foi possível encontrar a função de ordenação! [relate este problema]"
 
 #: lib-sys/mutt_socket.c:350
 #, fuzzy, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Não foi possível encontrar o endereço do servidor %s."
+msgstr "Não foi possível encontrar o endereço do servidor %s."
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Não foi possível incluir todas as mensagens solicitadas!"
+msgstr "Não foi possível incluir todas as mensagens solicitadas!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
@@ -1058,30 +1034,30 @@ msgstr ""
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "Não foi possível abrir %s"
+msgstr "Não foi possível abrir %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Não foi possível reabrir a caixa de mensagens!"
+msgstr "Não foi possível reabrir a caixa de mensagens!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Não foi possível enviar a mensagem."
+msgstr "Não foi possível enviar a mensagem."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Não foi possível travar %s\n"
+msgstr "Não foi possível travar %s\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
 msgstr "Criar %s?"
 
-#: browser.c:1000
+#: browser.c:971
 #, fuzzy
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "A remoção só é possível para caixar IMAP"
+msgstr "A remoção só é possível para caixar IMAP"
 
 #: imap/browse.c:249
 #, fuzzy
@@ -1113,52 +1089,39 @@ msgstr "%s%s para caixa de mensagens"
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s para caixa de mensagens"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "Obtendo mensagem..."
 
-#: postpone.c:517
+#: postpone.c:482
 #, fuzzy
 msgid "Decryption failed."
 msgstr "Login falhou."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Apagar"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Remover"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "A remoção só é possível para caixar IMAP"
+msgstr "A remoção só é possível para caixar IMAP"
 
 #: pop.c:1282
 #, fuzzy
 msgid "Delete messages from server?"
 msgstr "Apagando mensagens do servidor..."
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Apagar mensagens que casem com: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Remover"
 
-#: recvattach.c:993
+#: recvattach.c:981
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Deleção de anexos de mensagens PGP não é suportada"
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Descrição"
+msgstr "Deleção de anexos de mensagens PGP não é suportada"
 
 #: lib-lua/madmutt.cpkg:106
 #, c-format
@@ -1168,36 +1131,36 @@ msgstr ""
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s não existe. Devo criá-lo?"
+msgstr "%s não existe. Devo criá-lo?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Diretório [%s], Máscara de arquivos: %s"
+msgstr "Diretório [%s], Máscara de arquivos: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "ERRO: por favor relate este problema"
 
-#: send.c:1387
+#: send.c:1381
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "Preparando mensagem encaminhada..."
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "erro na expressão"
+msgstr "erro na expressão"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Encriptar"
 
-#: compose.c:163
+#: compose.c:135
 #, fuzzy
 msgid "Encrypt with: "
 msgstr "Encriptar"
@@ -1205,19 +1168,19 @@ msgstr "Encriptar"
 #: imap/imap.c:407 pop.c:706
 #, fuzzy
 msgid "Encrypted connection unavailable"
-msgstr "Chave de Sessão Encriptada"
+msgstr "Chave de Sessão Encriptada"
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Entre a keyID para %s: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "Entre a keyID para %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "Entre a keyID para %s: "
@@ -1247,7 +1210,7 @@ msgstr "Conectando a %s"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Conectando a %s"
@@ -1256,12 +1219,12 @@ msgstr "Conectando a %s"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Erro em %s, linha %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Erro na linha de comando: %s\n"
@@ -1269,14 +1232,14 @@ msgstr "Erro na linha de comando: %s\n"
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "Erro na expressão: %s"
+msgstr "Erro na expressão: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Erro ao inicializar terminal."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Erro ao inicializar terminal."
 
@@ -1287,41 +1250,32 @@ msgstr "Erro ao gravar a caixa!"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "Erro ao interpretar endereço!"
+msgstr "Erro ao interpretar endereço!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Erro ao executar \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Erro ao examinar diretório."
+msgstr "Erro ao examinar diretório."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Erro ao enviar a mensagem, processo filho saiu com código %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Erro ao enviar mensagem, processo filho terminou com código %d\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Erro ao enviar mensagem."
+msgstr "Erro ao enviar a mensagem, processo filho saiu com código %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Conectando a %s"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "Erro ao tentar exibir arquivo"
 
@@ -1332,44 +1286,39 @@ msgstr "Erro ao gravar a caixa!"
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Erro. Preservando o arquivo temporário: %s"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Erro: %s não pode ser usado como reenviador final de uma sequência."
+msgstr "Erro. Preservando o arquivo temporário: %s"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "Erro: multipart/encrypted não tem nenhum parâmetro de protocolo!"
+msgstr "Erro: multipart/encrypted não tem nenhum parâmetro de protocolo!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "Erro: multipart/signed não tem protocolo."
+msgstr "Erro: multipart/signed não tem protocolo."
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Erro na linha de comando: %s\n"
@@ -1377,27 +1326,18 @@ msgstr "Erro na linha de comando: %s\n"
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
+msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
 msgstr "Executando comando nas mensagens que casam..."
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Sair"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Sair  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Sair do Mutt sem salvar alterações?"
+msgstr "Sair do Mutt sem salvar alterações?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
 msgstr "Sair do Mutt?"
@@ -1413,36 +1353,36 @@ msgstr "Apagando mensagens do servidor..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Erro ao abrir o arquivo para interpretar os cabeçalhos."
+msgstr "Erro ao abrir o arquivo para interpretar os cabeçalhos."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Erro ao abrir o arquivo para retirar cabeçalhos."
+msgstr "Erro ao abrir o arquivo para retirar cabeçalhos."
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Erro ao abrir o arquivo para interpretar os cabeçalhos."
+msgstr "Erro ao abrir o arquivo para interpretar os cabeçalhos."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Erro fatal! Não foi posssível reabrir a caixa de mensagens!"
+msgstr "Erro fatal! Não foi posssível reabrir a caixa de mensagens!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Erro fatal. O número de mensagens está fora de sincronia!"
+msgstr "Erro fatal. O número de mensagens está fora de sincronia!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Apagando mensagens do servidor..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "Obtendo mensagem..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "Obtendo mensagem..."
@@ -1452,23 +1392,23 @@ msgstr "Obtendo mensagem..."
 msgid "Fetching list of messages..."
 msgstr "Obtendo mensagem..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
+msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
+msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "Obtendo mensagem..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Máscara de arquivos: "
+msgstr "Máscara de arquivos: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
@@ -1476,50 +1416,45 @@ msgstr "Arquivo existe, (s)obrescreve, (a)nexa ou (c)ancela?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "O arquivo é um diretório, salvar lá?"
+msgstr "O arquivo é um diretório, salvar lá?"
 
 #: muttlib.c:226
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "O arquivo é um diretório, salvar lá?"
+msgstr "O arquivo é um diretório, salvar lá?"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "Arquivo no diretório: "
+msgstr "Arquivo no diretório: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "Filtrar através de: "
+msgstr "Filtrar através de: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
-msgstr "Impressão digital: %s"
+msgstr "Impressão digital: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "salva esta mensagem para ser enviada depois"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Responder para %s%s?"
 
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Responder para %s%s?"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "Encaminhar encapsulado em MIME?"
 
-#: send.c:828
+#: send.c:826
 #, fuzzy
 msgid "Forward as attachment?"
 msgstr "Imprimir anexo?"
@@ -1529,9 +1464,9 @@ msgstr "Imprimir anexo?"
 msgid "Forward as attachments?"
 msgstr "mostra anexos MIME"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Função não permitida no modo anexar-mensagem."
+msgstr "Função não permitida no modo anexar-mensagem."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
@@ -1539,134 +1474,119 @@ msgstr "Obtendo lista de pastas..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "Obtendo espaços de nomenclatura..."
+msgstr "Obtendo espaços de nomenclatura..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Grupo"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Ajuda"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Ajuda para %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "A ajuda está sendo mostrada."
+msgstr "A ajuda está sendo mostrada."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Eu não sei como imprimir isto!"
+msgstr "Eu não sei como imprimir isto!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Eu não sei como imprimir anexos %s!"
+msgstr "Eu não sei como imprimir anexos %s!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
-msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
+msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 #, fuzzy
 msgid "ID is not valid."
-msgstr "Este ID não é de confiança."
+msgstr "Este ID não é de confiança."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 #, fuzzy
 msgid "ID is only marginally valid."
-msgstr "Este ID é de baixa confiança."
+msgstr "Este ID é de baixa confiança."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Cabeçalho de PGP ilegal"
+msgstr "Cabeçalho de PGP ilegal"
 
-#: postpone.c:434
+#: postpone.c:399
 #, fuzzy
 msgid "Illegal S/MIME header"
-msgstr "Cabeçalho de PGP ilegal"
+msgstr "Cabeçalho de PGP ilegal"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "Entrada mal formatada para o tipo %s em \"%s\" linha %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr "Incluir mensagem na resposta?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Enviando mensagem citada..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Inserir"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Dia do mês inválido: %s"
+msgstr "Dia do mês inválido: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Codificação inválida"
+msgstr "Codificação inválida"
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Número de índice inválido."
+msgstr "Número de índice inválido."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Número de mensagem inválido."
+msgstr "Número de mensagem inválido."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Mês inválido: %s"
+msgstr "Mês inválido: %s"
 
 #: pattern.c:486
 #, fuzzy, c-format
 msgid "Invalid relative date: %s"
-msgstr "Mês inválido: %s"
+msgstr "Mês inválido: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "Executando PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "Executando PGP..."
@@ -1674,78 +1594,74 @@ msgstr "Executando PGP..."
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Executando comando de autovisualização: %s"
+msgstr "Executando comando de autovisualização: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Pular para mensagem: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Pular para: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "O pulo não está implementado em diálogos."
+msgstr "O pulo não está implementado em diálogos."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Tecla não associada."
+msgstr "Tecla não associada."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Tecla não associada. Pressione '%s' para ajuda."
+msgstr "Tecla não associada. Pressione '%s' para ajuda."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "Limitar a mensagens que casem com: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Limitar: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Efetuando login..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1755,15 +1671,15 @@ msgstr ""
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "Limite de travas excedido, remover a trava para %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Efetuando login..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Login falhou."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "Procurando por chaves que casam com \"%s\"..."
@@ -1773,32 +1689,28 @@ msgstr "Procurando por chaves que casam com \"%s\"..."
 msgid "Looking up %s..."
 msgstr "Copiando para %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "Impressão digital: %s"
+msgstr "Impressão digital: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "Tipo MIME não definido. Não é possível visualizar o anexo."
+msgstr "Tipo MIME não definido. Não é possível visualizar o anexo."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Laço de macro detectado."
+msgstr "Laço de macro detectado."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Msg"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "Mensagem não enviada."
+msgstr "Mensagem não enviada."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Mensagem enviada."
 
@@ -1817,35 +1729,35 @@ msgstr "Caixa de correio removida."
 msgid "Mailbox created."
 msgstr "Caixa de correio removida."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr "Caixa de correio removida."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "A caixa de mensagens está vazia."
+msgstr "A caixa de mensagens está vazia."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "A caixa está marcada como não gravável. %s"
+msgstr "A caixa está marcada como não gravável. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "Esta caixa é somente para leitura."
+msgstr "Esta caixa é somente para leitura."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "A caixa de mensagens não sofreu mudanças"
+msgstr "A caixa de mensagens não sofreu mudanças"
 
 #: imap/browse.c:253 imap/browse.c:294
 #, fuzzy
 msgid "Mailbox must have a name."
-msgstr "A caixa de mensagens não sofreu mudanças"
+msgstr "A caixa de mensagens não sofreu mudanças"
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Caixa de correio não removida."
+msgstr "Caixa de correio não removida."
 
 #: imap/browse.c:306
 #, fuzzy
@@ -1856,16 +1768,16 @@ msgstr "Caixa de correio removida."
 msgid "Mailbox was corrupted!"
 msgstr "A caixa de mensagens foi corrompida!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 #, fuzzy
 msgid "Mailbox was externally modified."
 msgstr "A caixa foi modificada externamente. As marcas podem estar erradas."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "A caixa foi modificada externamente. As marcas podem estar erradas."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Caixas [%d]"
@@ -1873,18 +1785,14 @@ msgstr "Caixas [%d]"
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Entrada de edição no mailcap requer %%s"
+msgstr "Entrada de edição no mailcap requer %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Entrada de composição no mailcap requer %%s"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Criar Apelido"
+msgstr "Entrada de composição no mailcap requer %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1893,19 +1801,15 @@ msgstr ""
 msgid "Marking %d messages deleted..."
 msgstr "Marcando %d mensagens como removidas..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Máscara"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Mensagem repetida."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1916,7 +1820,7 @@ msgstr "Mensagem impressa"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "O arquivo de mensagens está vazio."
+msgstr "O arquivo de mensagens está vazio."
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
@@ -1925,14 +1829,14 @@ msgstr "Mensagem repetida."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Mensagem não modificada!"
+msgstr "Mensagem não modificada!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "A mensagem pai não está visível nesta visão limitada"
+msgstr "A mensagem pai não está visível nesta visão limitada"
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "Mensagem adiada."
 
@@ -1940,7 +1844,7 @@ msgstr "Mensagem adiada."
 msgid "Message printed"
 msgstr "Mensagem impressa"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Mensgem gravada."
 
@@ -1962,19 +1866,10 @@ msgstr "Mensagens repetidas."
 msgid "Messages printed"
 msgstr "Mensagens impressas"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Faltam argumentos."
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Sequências do mixmaster são limitadas a %d elementos."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "O mixmaster não aceita cabeçalhos Cc ou Bcc."
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
@@ -1985,19 +1880,15 @@ msgstr "Mover mensagens lidas para %s?"
 msgid "Moving read messages to %s..."
 msgstr "Movendo mensagens lidas para %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nova Consulta"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nome do novo arquivo: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Novo arquivo: "
 
@@ -2006,77 +1897,69 @@ msgstr "Novo arquivo: "
 msgid "New mail in "
 msgstr "Novas mensagens em %s"
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr "Novas mensagens nesta caixa."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Prox"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "ProxPag"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 #, fuzzy
 msgid "No authenticators available"
-msgstr "Autenticação GSSAPI falhou."
+msgstr "Autenticação GSSAPI falhou."
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Nenhum parâmetro de fronteira encontrado! [relate este erro]"
+msgstr "Nenhum parâmetro de fronteira encontrado! [relate este erro]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Nenhuma entrada."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "Nenhum arquivo casa com a máscara"
+msgstr "Nenhum arquivo casa com a máscara"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
 msgstr "Nenhuma caixa de mensagem para recebimento definida."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Nenhum padrão limitante está em efeito."
+msgstr "Nenhum padrão limitante está em efeito."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
 msgstr "Nenhuma caixa aberta."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr "Nenhuma caixa com novas mensagens."
 
@@ -2084,14 +1967,14 @@ msgstr "Nenhuma caixa com novas mensagens."
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr ""
-"Nenhuma entrada de composição no mailcap para %s, criando entrada vazia."
+"Nenhuma entrada de composição no mailcap para %s, criando entrada vazia."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "Nenhuma entrada de edição no mailcap para %s"
+msgstr "Nenhuma entrada de edição no mailcap para %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "Nenhuma lista de email encontrada!"
 
@@ -2099,202 +1982,188 @@ msgstr "Nenhuma lista de email encontrada!"
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Nenhuma entrada no mailcap de acordo encontrada. Exibindo como texto."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "Nenhuma mensagem naquela pasta."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "Nenhuma mensagem casa com o critério"
+msgstr "Nenhuma mensagem casa com o critério"
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "Não há mais texto citado."
+msgstr "Não há mais texto citado."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Nenhuma discussão restante."
+msgstr "Nenhuma discussão restante."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "Não há mais texto não-citado após o texto citado."
+msgstr "Não há mais texto não-citado após o texto citado."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
 msgstr "Nenhuma mensagem nova no servidor POP."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Nenhuma mensagem nova"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "Nenhum assunto especificado."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "Nenhum arquivo casa com a máscara"
+msgstr "Nenhum arquivo casa com a máscara"
 
-#: nntp.c:357
+#: nntp.c:360
 #, fuzzy
 msgid "No newsserver defined!"
-msgstr "Nenhum nome de usuário POP definido."
-
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Nenhuma caixa com novas mensagens."
+msgstr "Nenhum nome de usuário POP definido."
 
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "Nenhuma mensagem adiada."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Nenhuma caixa com novas mensagens."
-
 #: commands.c:378
 #, fuzzy
 msgid "No printing command has been defined."
 msgstr "Nenhuma caixa de mensagem para recebimento definida."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Nenhum destinatário está especificado!"
+msgstr "Nenhum destinatário está especificado!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Nenhum destinatário foi especificado.\n"
+msgstr "Nenhum destinatário foi especificado.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Nenhum destinatário foi especificado."
+msgstr "Nenhum destinatário foi especificado."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Nenhum padrão de procura."
+msgstr "Nenhum padrão de procura."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "Nenhum assunto especificado."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "Sem assunto, cancelar envio?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "Sem assunto, cancelar?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Sem assunto, cancelado."
 
 #: imap/browse.c:193
 #, fuzzy
 msgid "No such folder"
-msgstr "%s: não existe tal cor"
+msgstr "%s: não existe tal cor"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "Nenhuma entrada marcada."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Nenhuma mensagem marcada está visível!"
+msgstr "Nenhuma mensagem marcada está visível!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "Nenhuma mensagem marcada."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Nenhuma mensagem não removida."
+msgstr "Nenhuma mensagem não removida."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Nenhuma mensagem não lida"
+msgstr "Nenhuma mensagem não lida"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 #, fuzzy
 msgid "No visible messages."
 msgstr "Nenhuma mensagem nova"
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Não disponível neste menu."
+msgstr "Não disponível neste menu."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "Não encontrado."
+msgstr "Não encontrado."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
 msgstr "Conectando a %s..."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Somente a deleção de anexos multiparte é suportada."
+msgstr "Somente a deleção de anexos multiparte é suportada."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
 msgstr "Abrir caixa de correio"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
 msgstr "Abrir caixa somente para leitura"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
 msgstr "Abrir caixa para anexar mensagem de"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "Abrir caixa somente para leitura"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "Abrir caixa para anexar mensagem de"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Saída do processo de entrega"
+msgstr "Saída do processo de entrega"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
 "(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, em l(i)nha, ou es(q)uece? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "Chaves do PGP que casam com <%s>. "
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "Chaves do PGP que casam com <%s>. "
@@ -2310,83 +2179,60 @@ msgstr "Assinatura PGP verificada com sucesso."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "Servidor POP não está definido."
+msgstr "Servidor POP não está definido."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "A mensagem pai não está disponível."
+msgstr "A mensagem pai não está disponível."
 
-#: thread.c:980
+#: thread.c:976
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
-msgstr "A mensagem pai não está visível nesta visão limitada"
+msgstr "A mensagem pai não está visível nesta visão limitada"
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Senha para %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Nome pessoal:"
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Cano"
-
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "Passar por cano ao comando: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Passar por cano a: "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Por favor, defina a variável hostname para um valor adequado quando for\n"
-"usar o mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr "Adiar esta mensagem?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Mensagens Adiadas"
 
 #: lib-sys/mutt_socket.c:44
 #, fuzzy
 msgid "Preconnect command failed."
-msgstr "comando de pré-conexão falhou"
+msgstr "comando de pré-conexão falhou"
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "Preparando mensagem encaminhada..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr "Pressione qualquer tecla para continuar..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "PagAnt"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Imprimir"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "Imprimir anexo?"
 
@@ -2394,7 +2240,7 @@ msgstr "Imprimir anexo?"
 msgid "Print message?"
 msgstr "Imprimir mensagem?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
 msgstr "Imprimir anexo(s) marcado(s)?"
 
@@ -2412,37 +2258,33 @@ msgstr "Remover %d mensagem apagada?"
 msgid "Purge %d deleted messages?"
 msgstr "Remover %d mensagens apagadas?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Consulta"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Consulta '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Comando de consulta não definido."
+msgstr "Comando de consulta não definido."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Consulta: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Sair"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "Sair do Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "Obtendo espaços de nomenclatura..."
+msgstr "Obtendo espaços de nomenclatura..."
 
 #: lib-mx/mx.c:494
 #, c-format
@@ -2464,35 +2306,35 @@ msgstr "Lendo %s... %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Lendo novas mensagens (%d bytes)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Deseja mesmo remover a caixa \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
 msgstr "Editar mensagem adiada?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "A gravação só afeta os anexos de texto."
+msgstr "A gravação só afeta os anexos de texto."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "Login falhou."
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "A remoção só é possível para caixar IMAP"
+msgstr "A remoção só é possível para caixar IMAP"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Abrir caixa de correio"
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Renomear para: "
 
@@ -2500,15 +2342,11 @@ msgstr "Renomear para: "
 msgid "Reopening mailbox..."
 msgstr "Reabrindo caixa de mensagens..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Responder"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Responder para %s%s?"
@@ -2521,25 +2359,25 @@ msgid ""
 msgstr ""
 "Ordem-Rev (d)ata/(f)rm/(r)eceb/(a)sst/(p)ara/dis(c)/de(s)ord/(t)am/r(e)fs?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Procurar de trás para frente por: "
+msgstr "Procurar de trás para frente por: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
 msgstr "Busca reversa: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Ordem inversa por (d)ata, (a)lfa, (t)amanho ou (n)ão ordenar? "
+msgstr "Ordem inversa por (d)ata, (a)lfa, (t)amanho ou (n)ão ordenar? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
 "(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, em l(i)nha, ou es(q)uece? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
@@ -2547,7 +2385,7 @@ msgstr ""
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "Chaves do PGP que casam com \"%s\"."
@@ -2569,32 +2407,28 @@ msgstr "Assinatura PGP verificada com sucesso."
 #: imap/auth.c:158 pop.c:287
 #, fuzzy
 msgid "SASL authentication failed."
-msgstr "Autenticação GSSAPI falhou."
+msgstr "Autenticação GSSAPI falhou."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "Impressão digital: %s"
+msgstr "Impressão digital: %s"
 
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "Conexão SSL usando %s"
+msgstr "Conexão SSL usando %s"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Salvar"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "Salvar uma cópia desta mensagem?"
+msgstr "Salvar uma cópia desta mensagem?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Salvar em arquivo:"
 
@@ -2608,15 +2442,11 @@ msgstr "%s%s para caixa de mensagens"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "Salvando marcas de estado das mensagens... [%d de %d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Salvando..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Busca"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Procurar por: "
 
@@ -2626,70 +2456,54 @@ msgstr "A busca chegou ao fim sem encontrar um resultado"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "A busca chegou ao início sem encontrar um resultado"
+msgstr "A busca chegou ao início sem encontrar um resultado"
 
 #: pattern.c:1320
 msgid "Search interrupted."
 msgstr "Busca interrompida."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "A busca não está implementada neste menu."
+msgstr "A busca não está implementada neste menu."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
 msgstr "A pesquisa passou para o final."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "A pesquisa voltou ao início."
+msgstr "A pesquisa voltou ao início."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Busca: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Escolher"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Escolher  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Escolha uma sequência de reenviadores."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "Selecionando %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Enviar"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Enviando em segundo plano."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Enviando mensagem..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "O servidor fechou a conexão!"
+msgstr "O servidor fechou a conexão!"
 
 #: flags.c:335
 msgid "Set flag"
@@ -2699,15 +2513,15 @@ msgstr "Atribui marca"
 msgid "Shell command: "
 msgstr "Comando do shell: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Assinar"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Assinar como: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Assinar, Encriptar"
 
@@ -2719,34 +2533,30 @@ msgid ""
 msgstr ""
 "Ordem (d)ata/(f)rm/(r)eceb/(a)sst/(p)ara/dis(c)/de(s)ord/(t)am/r(e)fs?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Ordenar por (d)ata, (a)lfa, (t)amanho ou (n)ão ordenar? "
+msgstr "Ordenar por (d)ata, (a)lfa, (t)amanho ou (n)ão ordenar? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
 msgstr "Ordenando caixa..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Key ID: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "[%s] assinada, Máscara de arquivos: %s"
+msgstr "[%s] assinada, Máscara de arquivos: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2755,97 +2565,93 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "Assinando %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "Verificação de certificado SSL"
+msgstr "Verificação de certificado SSL"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr "Marcar mensagens que casem com: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Marque as mensagens que você quer anexar!"
+msgstr "Marque as mensagens que você quer anexar!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Não é possível marcar."
+msgstr "Não é possível marcar."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Aquela mensagem não está visível."
+msgstr "Aquela mensagem não está visível."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "A mensagem pai não está disponível."
+msgstr "A mensagem pai não está disponível."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "O anexo atual será convertido"
+msgstr "O anexo atual será convertido"
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "O anexo atual não será convertido."
+msgstr "O anexo atual não será convertido."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "A sequência de reenviadores já está vazia."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "Não há anexos."
+msgstr "Não há anexos."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "Não há mensagens."
+msgstr "Não há mensagens."
 
-#: recvattach.c:918
+#: recvattach.c:906
 #, fuzzy
 msgid "There are no subparts to show!"
-msgstr "Não há anexos."
+msgstr "Não há anexos."
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Este servidor IMAP é pré-histórico. Mutt não funciona com ele."
+msgstr "Este servidor IMAP é pré-histórico. Mutt não funciona com ele."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr "Este certificado pertence a:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, fuzzy, c-format
 msgid "This certificate is valid"
 msgstr "Este certificado foi emitido por:"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr "Este certificado foi emitido por:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
+msgstr "Esta chave não pode ser usada: expirada/desabilitada/revogada."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "A discussão contém mensagens não lidas."
+msgstr "A discussão contém mensagens não lidas."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Separar discussões não está ativado."
+msgstr "Separar discussões não está ativado."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
@@ -2857,23 +2663,27 @@ msgstr "Limite de tempo excedido durante uma tentativa de trava com fcntl!"
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "Limite de tempo excedido durante uma tentativa trava com flock!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "O início da mensagem está sendo mostrado."
+msgstr "O início da mensagem está sendo mostrado."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -2890,79 +2700,70 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "Autenticação GSSAPI falhou."
+msgstr "Autenticação GSSAPI falhou."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "Não foi possível anexar %s!"
+msgstr "Não foi possível anexar %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "Não foi possível anexar!"
+msgstr "Não foi possível anexar!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Não foi possível obter cabeçalhos da versão deste servidor IMAP."
+msgstr "Não foi possível obter cabeçalhos da versão deste servidor IMAP."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "Não foi possível obter o certificado do servidor remoto"
+msgstr "Não foi possível obter o certificado do servidor remoto"
 
 #: pop.c:598
 #, fuzzy
 msgid "Unable to leave messages on server."
 msgstr "Apagando mensagens do servidor..."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "Não foi possível anexar %s!"
+msgstr "Não foi possível anexar %s!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Não foi possível travar a caixa de mensagens!"
+msgstr "Não foi possível travar a caixa de mensagens!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Não foi possível abrir o arquivo temporário!"
+msgstr "Não foi possível abrir o arquivo temporário!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Não foi possível abrir o arquivo temporário!"
+msgstr "Não foi possível abrir o arquivo temporário!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Não foi possível abrir o arquivo temporário!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Restaurar"
+msgstr "Não foi possível abrir o arquivo temporário!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "Restaurar mensagens que casem com: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Restaurar"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "Content-Type %s desconhecido"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Cancelando assinatura de %s..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "Cancelando assinatura de %s..."
@@ -2972,7 +2773,7 @@ msgstr "Cancelando assinatura de %s..."
 msgid "Unsubscribing to %s..."
 msgstr "Cancelando assinatura de %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "Desmarcar mensagens que casem com: "
 
@@ -2983,9 +2784,9 @@ msgstr "Enviando mensagem ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "Use 'toggle-write' para reabilitar a gravação!"
+msgstr "Use 'toggle-write' para reabilitar a gravação!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "Usar keyID = \"%s\" para %s?"
@@ -2995,19 +2796,15 @@ msgstr "Usar keyID = \"%s\" para %s?"
 msgid "Username at %s: "
 msgstr "Renomear para: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Mês inválido: %s"
+msgstr "Mês inválido: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Mês inválido: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Mês inválido: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
@@ -3018,14 +2815,10 @@ msgstr "Verificar assinatura de PGP?"
 msgid "Verifying message indexes..."
 msgstr "Gravando mensagem em %s..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Ver Anexo"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "AVISO! Você está prestes a sobrescrever %s, continuar?"
+msgstr "AVISO! Você está prestes a sobrescrever %s, continuar?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -3033,26 +2826,26 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "Este certificado foi emitido por:"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "Este certificado foi emitido por:"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "Este certificado foi emitido por:"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr ""
 
@@ -3076,11 +2869,11 @@ msgstr "Esperando pela trava fcntl... %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "Esperando pela tentativa de flock... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Agurdando pela resposta..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3090,14 +2883,14 @@ msgstr ""
 msgid "Warning: At least one certification key has expired\n"
 msgstr "Este certificado foi emitido por:"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "Aviso: Não foi possível salvar o certificado"
+msgstr "Aviso: Não foi possível salvar o certificado"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
@@ -3115,30 +2908,30 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "O que temos aqui é uma falha ao criar um anexo"
+msgstr "O que temos aqui é uma falha ao criar um anexo"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Erro de gravação! Caixa parcial salva em %s"
+msgstr "Erro de gravação! Caixa parcial salva em %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "Erro de gravação!"
+msgstr "Erro de gravação!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Gravar mensagem na caixa"
 
@@ -3147,7 +2940,7 @@ msgstr "Gravar mensagem na caixa"
 msgid "Writing %s..."
 msgstr "Gravando %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Gravando mensagem em %s..."
@@ -3157,82 +2950,64 @@ msgstr "Gravando mensagem em %s..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Gravando mensagens... %d(%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Erro na linha de comando: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Você já tem um apelido definido com aquele nome!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "O primeiro elemento da sequência já está selecionado."
+msgstr "Você já tem um apelido definido com aquele nome!"
 
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "O último elemento da sequência já está selecionado."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Você está na primeira entrada."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Você está na primeira página"
+msgstr "Você está na primeira entrada."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Você está na primeira mensagem."
+msgstr "Você está na primeira mensagem."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Você está na primeira página"
+msgstr "Você está na primeira página"
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Você está na primeira discussão."
+msgstr "Você está na primeira discussão."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Você está na última entrada."
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Você está na última página."
+msgstr "Você está na última entrada."
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Você está na última mensagem."
+msgstr "Você está na última mensagem."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Você está na última página."
+msgstr "Você está na última página."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Você não pode mais descer."
+msgstr "Você não pode mais descer."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Você não pode mais subir"
+msgstr "Você não pode mais subir"
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Você não tem apelidos!"
+msgstr "Você não tem apelidos!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Você não pode apagar o único anexo."
+msgstr "Você não pode apagar o único anexo."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Você só pode repetir partes message/rfc822"
+msgstr "Você só pode repetir partes message/rfc822"
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s =%s] Aceita?"
@@ -3240,7 +3015,7 @@ msgstr "[%s =%s] Aceita?"
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s não é aceito "
+msgstr "[-- %s/%s não é aceito "
 
 #: handler.c:1000
 #, c-format
@@ -3250,34 +3025,34 @@ msgstr "[-- Anexo No.%d"
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Saída de erro da autovisualização de %s --]\n"
+msgstr "[-- Saída de erro da autovisualização de %s --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Autovisualizar usando %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- INÍCIO DE MENSAGEM DO PGP --]\n"
+"[-- INÍCIO DE MENSAGEM DO PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- INÍCIO DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
+msgstr "[-- INÍCIO DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- INÍCIO DE MENSAGEM ASSINADA POR PGP --]\n"
+"[-- INÍCIO DE MENSAGEM ASSINADA POR PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3286,53 +3061,53 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- em %s --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- FIM DE MENSAGEM DO PGP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- FIM DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
+msgstr "[-- FIM DE BLOCO DE CHAVE PÚBLICA DO PGP --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- FIM DE MENSAGEM ASSINADA POR PGP --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Fim dos dados encriptados com PGP/MIME --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Fim dos dados encriptados com PGP/MIME --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- Fim dos dados encriptados com PGP/MIME --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Fim dos dados assinados --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3344,10 +3119,10 @@ msgstr ""
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- Erro: Não foi possível exibir nenhuma parte de Multipart/Aternative! "
+"[-- Erro: Não foi possível exibir nenhuma parte de Multipart/Aternative! "
 "--]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3355,7 +3130,7 @@ msgstr ""
 "[-- Erro: Estrutura multipart/signed inconsistente! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3364,25 +3139,25 @@ msgstr ""
 "[-- Erro: Protocolo multipart/signed %s desconhecido! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Erro: não foi possível criar um arquivo temporário! --]\n"
+msgstr "[-- Erro: não foi possível criar um arquivo temporário! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Erro: não foi possível encontrar o início da mensagem do PGP! --]\n"
+"[-- Erro: não foi possível encontrar o início da mensagem do PGP! --]\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- Erro: fim de arquivo inesperado! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3393,50 +3168,50 @@ msgstr ""
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- Erro: message/external-body não tem nenhum parâmetro access-type --]\n"
+"[-- Erro: message/external-body não tem nenhum parâmetro access-type --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
+"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
+"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
+"[-- Os dados a seguir estão encriptados com PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- Os dados a seguir estão assinados --]\n"
+"[-- Os dados a seguir estão assinados --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Os dados a seguir estão assinados --]\n"
+"[-- Os dados a seguir estão assinados --]\n"
 "\n"
 
 #: handler.c:1185
@@ -3452,31 +3227,31 @@ msgstr "[-- Este anexo %s/%s "
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Tipo: %s/%s, Codificação: %s, Tamanho: %s --]\n"
+msgstr "[-- Tipo: %s/%s, Codificação: %s, Tamanho: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Aviso: Não foi possível encontrar nenhuma assinatura. --]\n"
+"[-- Aviso: Não foi possível encontrar nenhuma assinatura. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Aviso: Não foi possível verificar %s de %s assinaturas. --]\n"
+"[-- Aviso: Não foi possível verificar %s de %s assinaturas. --]\n"
 "\n"
 
 #: handler.c:1230
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
-"[-- Este anexo %s/%s não está incluído, e o --]\n"
-"[-- tipo de acesso %s não é aceito.         --]\n"
+"[-- Este anexo %s/%s não está incluído, e o --]\n"
+"[-- tipo de acesso %s não é aceito.         --]\n"
 
 #: handler.c:1214
 #, fuzzy
@@ -3484,8 +3259,8 @@ msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- Este anexo %s/%s não está includído, e --]\n"
-"[-- a fonte externa indicada já expirou.   --]\n"
+"[-- Este anexo %s/%s não está includído, e --]\n"
+"[-- a fonte externa indicada já expirou.   --]\n"
 
 #: handler.c:1201
 #, fuzzy, c-format
@@ -3497,108 +3272,284 @@ msgstr "[-- em %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- em %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
 msgstr "Sair  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Mês inválido: %s"
+msgstr "Mês inválido: %s"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:439
 #, fuzzy
 msgid "[invalid date]"
-msgstr "%s: valor inválido"
+msgstr "%s: valor inválido"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[impossível calcular]"
+msgstr "[impossível calcular]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "apelido: sem endereço"
+msgstr "apelido: sem endereço"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Não foi encontrada nenhuma mensagem marcada."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Não foi encontrada nenhuma mensagem marcada."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Salvar uma cópia desta mensagem?"
 
-#: init.c:654
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "edita a descrição do anexo"
+msgstr "edita a descrição do anexo"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "edita a descrição do anexo"
+msgstr "edita a descrição do anexo"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind: muitos argumentos"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Erro ao examinar diretório."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Nenhuma caixa com novas mensagens."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
 msgstr "color: poucos argumentos"
 
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Nenhuma mensagem nova"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
+
 #: commands.c:788
 msgid "converting"
 msgstr ""
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Gravar mensagem na caixa"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "Não foi possível criar o arquivo temporário: %s"
+msgstr "Não foi possível criar o arquivo temporário: %s"
 
 #: editmsg.c:89
 #, fuzzy, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "Não foi possível criar a caixa temporária: %s"
+msgstr "Não foi possível criar a caixa temporária: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Não foi possível criar a caixa temporária: %s"
+msgstr "Não foi possível criar a caixa temporária: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Nenhuma caixa de mensagem para recebimento definida."
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "datn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "cores pré-definidas não suportadas"
+msgstr "cores pré-definidas não suportadas"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Apagando mensagens do servidor..."
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Restaurar mensagens que casem com: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Restaurar mensagens que casem com: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrapcste"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Preparando mensagem encaminhada..."
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3614,29 +3565,116 @@ msgstr "Copiando para %s..."
 msgid "echo Decompressing %s..."
 msgstr "Selecionando %s..."
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "O anexo atual não será convertido."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "edita a descrição do anexo"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Não foi possível gravar a mensagem"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Obtendo cabeçalhos das mensagens... [%d de %d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Preparando mensagem encaminhada..."
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Salvar uma cópia desta mensagem?"
+
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "padrão vazio"
+msgstr "padrão vazio"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
 msgstr "Encriptar"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Salvar uma cópia desta mensagem?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3651,36 +3689,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "erro na expressão"
+msgstr "erro na expressão"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3690,59 +3728,135 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "erro no padrão em: %s"
+msgstr "erro no padrão em: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "erro: operação %d desconhecida (relate este erro)."
+msgstr "erro: operação %d desconhecida (relate este erro)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "escaiq"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "escaiq"
 
-#: keymap.c:829
+#: keymap.c:821
 #, fuzzy
 msgid "exec: no arguments"
 msgstr "exec: poucos argumentos"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Responder para %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
-#, c-format
-msgid "gpgme_op_keylist_start failed: %s"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
 msgstr ""
 
-#: handler.c:1193
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "mostra anexos MIME"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Preparando mensagem encaminhada..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Você está na primeira mensagem."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Você está na última página."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Nenhuma caixa com novas mensagens."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Erro ao gravar a caixa!"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Nenhuma caixa com novas mensagens."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: handler.c:1193
 msgid "has been deleted --]\n"
 msgstr "foi apagado --]\n"
 
@@ -3750,32 +3864,158 @@ msgstr "foi apagado --]\n"
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "campo de cabeçalho inválido"
+msgstr "campo de cabeçalho inválido"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Número de índice inválido."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Pular para mensagem: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Pular para mensagem: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "A discussão contém mensagens não lidas."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Você está na primeira discussão."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Nenhuma mensagem não lida"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Nenhuma mensagem não lida"
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Salvar uma cópia desta mensagem?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "Chaves do PGP que casam com <%s>. "
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Repetir mensagens marcadas para: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Nenhuma caixa com novas mensagens."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: seqüência de teclas vazia"
+msgstr "macro: seqüência de teclas vazia"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro: muitos argumentos"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "entrada no mailcap para o tipo %s não foi encontrada."
+msgstr "entrada no mailcap para o tipo %s não foi encontrada."
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
@@ -3784,26 +4024,117 @@ msgstr "Mensagens repetidas."
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "parêntese sem um corresponente: %s"
+msgstr "parêntese sem um corresponente: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "faltam parâmetros"
+msgstr "faltam parâmetros"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
 msgstr "mono: poucos argumentos"
 
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Você está na primeira entrada."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Você está na primeira mensagem."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Você está na última entrada."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Você está na última mensagem."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Você está na última entrada."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Você está na última página."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Nenhuma mensagem não removida."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Você está na primeira entrada."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Você está na primeira página"
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Nenhuma mensagem não removida."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Você está na primeira página"
+
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "mensagem multiparte não tem um parâmetro de fronteiras!"
+msgstr "mensagem multiparte não tem um parâmetro de fronteiras!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
-msgstr "não"
+msgstr "não"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "(nenhuma caixa de mensagens)"
@@ -3812,56 +4143,309 @@ msgstr "(nenhuma caixa de mensagens)"
 msgid "not converting"
 msgstr ""
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "seqüência de teclas nula"
+msgstr "seqüência de teclas nula"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "sac"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Abrir caixa somente para leitura"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Abrir caixa somente para leitura"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Reabrindo caixa de mensagens..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Repetir mensagem para %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "prefixo é ilegal com reset"
+msgstr "prefixo é ilegal com reset"
+
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Você está na primeira entrada."
 
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push: muitos argumentos"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Editar mensagem adiada?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "A discussão contém mensagens não lidas."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Apagando mensagens do servidor..."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: não foi possível anexar o arquivo"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Pular para mensagem: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Apagando mensagens do servidor..."
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ra"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "ras"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "%s%s para caixa de mensagens"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "%s%s para caixa de mensagens"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Apagando mensagens do servidor..."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "erro na expressão"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Procurar por: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Não foi possível enviar a mensagem."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "mostra anexos MIME"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Limitar a mensagens que casem com: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Não há mais texto citado."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Imprimir mensagem?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Nenhuma mensagem naquela pasta."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: erro em %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: erros em %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Nenhum arquivo casa com a máscara"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox modificada, mas nenhuma mensagem modificada! (relate este "
 "problema)"
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Desmarcar mensagens que casem com: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Você está na primeira discussão."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3872,22 +4456,93 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Não há mais texto citado."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "A gravação só afeta os anexos de texto."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Nenhum padrão de procura."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Nenhuma mensagem não lida"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
 msgstr "poucos argumentos"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "muitos argumentos"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "edita a descrição do anexo"
+msgstr "edita a descrição do anexo"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Restaurar mensagens que casem com: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Restaurar mensagens que casem com: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Restaurar mensagens que casem com: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
@@ -3904,10 +4559,28 @@ msgstr ""
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: tipo de gancho desconhecido: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "erro desconhecido"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Desmarcar mensagens que casem com: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "edita a descrição do anexo"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3919,12 +4592,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "valor é ilegal com reset"
+msgstr "valor é ilegal com reset"
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Anexo salvo."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Novo arquivo: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Gravar mensagem na caixa"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "sim"
 
@@ -3932,3 +4636,6 @@ msgstr "sim"
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 1c9bd1b..d7cf175 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,41 +12,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt-1.5.10i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-02-13 11:51+0200\n"
 "Last-Translator: mutt-ru@woe.spb.ru\n"
 "Language-Team: RUSSIAN <mutt-ru@woe.spb.ru>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"óÔÁÎÄÁÒÔÎÙÅ ÎÁÚÎÁÞÅÎÉÑ:\n"
+"Стандартные назначения:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"îÅÎÁÚÎÁÞÅÎÎÙÅ ÆÕÎËÃÉÉ:\n"
+"Неназначенные функции:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- ëÏÎÅà ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]\n"
+"[-- Конец подписанных данных --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -72,7 +72,7 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"ÚÁÐÕÓË: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"запуск: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
 "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
 "[...]\n"
@@ -83,46 +83,46 @@ msgstr ""
 "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
-"ÐÁÒÁÍÅÔÒÙ:\n"
-"  -A <alias>\tÒÁÓËÒÙÔØ ÄÁÎÎÙÊ ÐÓÅ×ÄÏÎÉÍ\n"
-"  -a <file>\t×ÌÏÖÉÔØ ÆÁÊÌ × ÓÏÏÂÝÅÎÉÅ\n"
-"  -b <address>\tÕËÁÚÁÔØ blind carbon-copy (BCC) ÁÄÒÅÓ\n"
-"  -c <address>\tÕËÁÚÁÔØ carbon-copy (CC) ÁÄÒÅÓ\n"
-"  -e <command>\tÕËÁÚÁÔØ ËÏÍÁÎÄÕ, ËÏÔÏÒÁÑ ÂÕÄÅÔ ×ÙÐÏÌÎÅÎÁ ÐÏÓÌÅ "
-"ÉÎÉÃÉÁÌÉÚÁÃÉÉ\n"
-"  -f <file>\tÕËÁÚÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÄÌÑ ÒÁÂÏÔÙ\n"
-"  -F <file>\tÕËÁÚÁÔØ ÁÌØÔÅÒÎÁÔÉ×ÎÙÊ muttrc\n"
-"  -H <file>\tÕËÁÚÁÔØ ÆÁÊÌ, ÓÏÄÅÒÖÁÝÉÊ ÛÁÂÌÏÎ ÚÁÇÏÌÏ×ËÁ É ÔÅÌÁ ÐÉÓØÍÁ\n"
-"  -i <file>\tÕËÁÚÁÔØ ÆÁÊÌ ÄÌÑ ×ÓÔÁ×ËÉ × ÔÅÌÏ ÐÉÓØÍÁ\n"
-"  -m <ÔÉÐ>\tÕËÁÚÁÔØ ÔÉÐ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
-"  -n\t\tÚÁÐÒÅÔÉÔØ ÞÔÅÎÉÅ ÓÉÓÔÅÍÎÏÇÏ Muttrc\n"
-"  -p\t\tÐÒÏÄÏÌÖÉÔØ ÏÔÌÏÖÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ\n"
-"  -Q <ÉÍÑ>\t×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ\n"
-"  -R\t\tÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË × ÒÅÖÉÍÅ \"ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ\"\n"
-"  -s <ÔÅÍÁ>\tÕËÁÚÁÔØ ÔÅÍÕ ÓÏÏÂÝÅÎÉÑ (ÄÏÌÖÎÁ ÂÙÔØ × ËÁ×ÙÞËÁÈ, ÅÓÌÉ "
-"ÐÒÉÓÕÔÓÔ×ÕÀÔ ÐÒÏÂÅÌÙ)\n"
-"  -v\t\t×Ù×ÅÓÔÉ ÎÏÍÅÒ ×ÅÒÓÉÉ É ÐÁÒÁÍÅÔÒÙ ËÏÍÐÉÌÑÃÉÉ\n"
-"  -x\t\tÜÍÕÌÉÒÏ×ÁÔØ ÒÅÖÉÍ ÐÏÓÙÌËÉ ËÏÍÁÎÄÙ mailx\n"
-"  -y\t\t×ÙÂÒÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÉÚ ÓÐÉÓËÁ `mailboxes'\n"
-"  -z\t\t×ÙÊÔÉ ÎÅÍÅÄÌÅÎÎÏ ÅÓÌÉ × ÐÏÞÔÏ×ÏÍ ÑÝÉËÅ ÏÔÓÕÔÓÔ×ÕÅÔ ÎÏ×ÁÑ ÐÏÞÔÁ\n"
-"  -Z\t\tÏÔËÒÙÔØ ÐÅÒ×ÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË Ó ÎÏ×ÏÊ ÐÏÞÔÏÊ, ×ÙÊÔÉ ÎÅÍÅÄÌÅÎÎÏ ÅÓÌÉ "
-"ÔÁËÏ×ÁÑ ÏÔÓÕÔÓÔ×ÕÅÔ\n"
-"  -h\t\tÔÅËÓÔ ÜÔÏÊ ÐÏÄÓËÁÚËÉ"
-
-#: compose.c:152 compose.c:156
+"паÑ\80амеÑ\82Ñ\80Ñ\8b:\n"
+"  -A <alias>\tраскрыть данный псевдоним\n"
+"  -a <file>\tвложить файл в сообщение\n"
+"  -b <address>\tуказать blind carbon-copy (BCC) адрес\n"
+"  -c <address>\tуказать carbon-copy (CC) адрес\n"
+"  -e <command>\tуказать команду, которая будет выполнена после "
+"инициализации\n"
+"  -f <file>\tуказать почтовый ящик для работы\n"
+"  -F <file>\tуказать альтернативный muttrc\n"
+"  -H <file>\tуказать файл, содержащий шаблон заголовка и тела письма\n"
+"  -i <file>\tуказать файл для вставки в тело письма\n"
+"  -m <тип>\tуказать тип почтового ящика по умолчанию\n"
+"  -n\t\tзапретить чтение системного Muttrc\n"
+"  -p\t\tпÑ\80одолжиÑ\82Ñ\8c оÑ\82ложенное Ñ\81ообÑ\89ение\n"
+"  -Q <имя>\tвывести значение переменной конфигурации\n"
+"  -R\t\tоткрыть почтовый ящик в режиме \"только для чтения\"\n"
+"  -s <тема>\tуказать тему сообщения (должна быть в кавычках, если "
+"пÑ\80иÑ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\82 пÑ\80обелÑ\8b)\n"
+"  -v\t\tвывести номер версии и параметры компиляции\n"
+"  -x\t\tэмулировать режим посылки команды mailx\n"
+"  -y\t\tвыбрать почтовый ящик из списка `mailboxes'\n"
+"  -z\t\tвыйти немедленно если в почтовом ящике отсутствует новая почта\n"
+"  -Z\t\tоткрыть первый почтовый ящик с новой почтой, выйти немедленно если "
+"таковая отсутствует\n"
+"  -h\t\tтекст этой подсказки"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " ÐÏÄÐÉÓÁÔØ ËÁË: "
+msgstr " подпиÑ\81аÑ\82Ñ\8c как: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
-msgstr "     ÐÏ %s"
+msgstr "     по %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
-msgstr "   Ó %s"
+msgstr "   с %s"
 
 #: main.c:106
 msgid ""
@@ -162,139 +162,139 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr " ('?' -- ÓÐÉÓÏË): "
+msgstr " ('?' -- список): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
-msgstr "(PGP/ÔÅËÓÔ)"
+msgstr "(PGP/текст)"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " éÓÐÏÌØÚÕÊÔÅ '%s' ÄÌÑ ÒÁÚÒÅÛÅÎÉÑ/ÚÁÐÒÅÝÅÎÉÑ ÚÁÐÉÓÉ"
+msgstr " Используйте '%s' для разрешения/запрещения записи"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " ÐÒÉ ÐÒÏÓÍÏÔÒÅ Ó ÏÇÒÁÎÉÞÅÎÉÅÍ"
+msgstr " пÑ\80и пÑ\80оÑ\81моÑ\82Ñ\80е Ñ\81 огÑ\80аниÑ\87ением"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " ÐÏÍÅÞÅÎÎÏÅ"
+msgstr " помеÑ\87енное"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: ÎÅÄÏÐÕÓÔÉÍÁÑ ËÏÍÁÎÄÁ"
+msgstr "%c: недопустимая команда"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: × ÜÔÏÍ ÒÅÖÉÍÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
+msgstr "%c: в этом режиме не поддерживается"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "ïÓÔÁ×ÌÅÎÏ: %d, ÕÄÁÌÅÎÏ: %d."
+msgstr "Оставлено: %d, удалено: %d."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "ïÓÔÁ×ÌÅÎÏ: %d, ÐÅÒÅÍÅÝÅÎÏ: %d, ÕÄÁÌÅÎÏ: %d."
+msgstr "Оставлено: %d, перемещено: %d, удалено: %d."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s éÓÐÏÌØÚÏ×ÁÔØ ÜÔÏÔ ËÌÀÞ?"
+msgstr "%s Использовать этот ключ?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] ÉÚÍÅÎÅÎ.  ïÂÎÏ×ÉÔØ ËÏÄÉÒÏ×ËÕ?"
+msgstr "%s [#%d] изменен.  Обновить кодировку?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] ÕÖÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ!"
+msgstr "%s [#%d] уже не существует!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [ÓÏÏÂÝÅÎÉÊ ÐÒÏÞÉÔÁÎÏ: %d ÉÚ %d]"
+msgstr "%s [сообщений прочитано: %d из %d]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "ëÁÔÁÌÏÇ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.  óÏÚÄÁÔØ?"
+msgstr "Каталог %s не существует.  Создать?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "îÅ×ÅÒÎÏ ÕËÁÚÁÎÏ ÉÍÑ IMAP-ÑÝÉËÁ: %s"
+msgstr "Неверно указано имя IMAP-ящика: %s"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "îÅ×ÅÒÎÏ ÕËÁÚÁÎÏ ÉÍÑ POP-ÑÝÉËÁ: %s"
+msgstr "Неверно указано имя POP-ящика: %s"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "îÅ×ÅÒÎÏ ÕËÁÚÁÎÏ ÉÍÑ POP-ÑÝÉËÁ: %s"
+msgstr "Неверно указано имя POP-ящика: %s"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "îÅ×ÅÒÎÏ ÕËÁÚÁÎÏ ÉÍÑ POP-ÑÝÉËÁ: %s"
+msgstr "Неверно указано имя POP-ящика: %s"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ."
+msgstr "%s не является каталогом."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÞÔÏ×ÙÍ ÑÝÉËÏÍ!"
+msgstr "%s не является почтовым ящиком!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÞÔÏ×ÙÍ ÑÝÉËÏÍ."
+msgstr "%s не является почтовым ящиком."
 
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ÆÁÊÌÏÍ."
+msgstr "%s не является файлом."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s ÂÏÌØÛÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ!"
+msgstr "%s больше не существует!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -308,142 +308,142 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ."
+msgstr "%s: неизвестный тип."
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: Ã×ÅÔ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÅÒÍÉÎÁÌÏÍ"
+msgstr "%s: цвет не поддерживается терминалом"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: ËÏÍÁÎÄÁ ÄÏÓÔÕÐÎÁ ÔÏÌØËÏ ÄÌÑ ÉÎÄÅËÓÁ"
+msgstr "%s: команда доступна только для индекса"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: ÎÅÔ ÔÁËÏÇÏ ÁÔÒÉÂÕÔÁ"
+msgstr "%s: нет такого атрибута"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: ÎÅÔ ÔÁËÏÇÏ Ã×ÅÔÁ"
+msgstr "%s: нет такого цвета"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
-msgstr "%s: ÎÅÔ ÔÁËÏÊ ÆÕÎËÃÉÉ"
+msgstr "%s: нет такой функции"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: ÎÅÔ ÔÁËÏÊ ÆÕÎËÃÉÉ"
+msgstr "%s: нет такой функции"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: ÎÅÔ ÔÁËÏÇÏ ÍÅÎÀ"
+msgstr "%s: нет такого меню"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s: ÎÅÔ ÔÁËÏÇÏ ÏÂßÅËÔÁ"
+msgstr "%s: нет такого объекта"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: ÓÌÉÛËÏÍ ÍÁÌÏ ÁÒÇÕÍÅÎÔÏ×"
+msgstr "%s: слишком мало аргументов"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: ÎÅ ÕÄÁÌÏÓØ ×ÌÏÖÉÔØ ÆÁÊÌ"
+msgstr "%s: не удалось вложить файл"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: ÎÅ ÕÄÁÌÏÓØ ×ÌÏÖÉÔØ ÆÁÊÌ.\n"
+msgstr "%s: не удалось вложить файл.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ"
+msgstr "%s: неизвестная команда"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ"
+msgstr "%s: неизвестный тип"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ"
+msgstr "%s: неизвестная переменная"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "îÅ×ÅÒÎÏ ÕËÁÚÁÎÏ ÉÍÑ POP-ÑÝÉËÁ: %s"
+msgstr "Неверно указано имя POP-ящика: %s"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "îÅ×ÅÒÎÏ ÕËÁÚÁÎÏ ÉÍÑ POP-ÑÝÉËÁ: %s"
+msgstr "Неверно указано имя POP-ящика: %s"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(ÆÕÎËÃÉÑ 'view-attachments' ÎÅ ÎÁÚÎÁÞÅÎÁ ÎÉ ÏÄÎÏÊ ËÌÁ×ÉÛÅ!)"
+msgstr "(функция 'view-attachments' не назначена ни одной клавише!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(ÎÅÔ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ)"
+msgstr "(нет почтового ящика)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(r)ÏÔ×ÅÒÇÎÕÔØ, (o)ÐÒÉÎÑÔØ"
+msgstr "(r)отвергнуть, (o)принять"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(r)ÏÔ×ÅÒÇÎÕÔØ, (o)ÐÒÉÎÑÔØ, (a)ÐÒÉÎÑÔØ É ÓÏÈÒÁÎÉÔØ"
+msgstr "(r)отвергнуть, (o)принять, (a)принять и сохранить"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(ÒÁÚÍÅÒ %s ÂÁÊÔÏ×) "
+msgstr "(размер %s байтов) "
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(ÉÓÐÏÌØÚÕÊÔÅ '%s' ÄÌÑ ÐÒÏÓÍÏÔÒÁ ÜÔÏÊ ÞÁÓÔÉ)"
+msgstr "(используйте '%s' для просмотра этой части)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- ÷ÌÏÖÅÎÉÑ"
+msgstr "-- Вложения"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<îåéú÷åóôîï>"
+msgstr "<НЕИЗВЕСТНО>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<ÐÏ ÕÍÏÌÞÁÎÉÀ>"
+msgstr "<по Ñ\83молÑ\87аниÑ\8e>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -455,123 +455,115 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "ïÛÉÂËÁ APOP-ÁÕÔÅÎÔÉÆÉËÁÃÉÉ."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "ðÒÅÒ×ÁÔØ"
+msgstr "Ошибка APOP-аутентификации."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "ïÔËÁÚÁÔØÓÑ ÏÔ ÎÅÉÚÍÅÎÅÎÎÏÇÏ ÓÏÏÂÝÅÎÉÑ?"
+msgstr "Отказаться от неизмененного сообщения?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "óÏÏÂÝÅÎÉÅ ÎÅ ÉÚÍÅÎÉÌÏÓØ, ÏÔËÁÚ."
+msgstr "Сообщение не изменилось, отказ."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "áÄÒÅÓ: "
+msgstr "Адрес: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "ðÓÅ×ÄÏÎÉÍ ÓÏÚÄÁÎ."
+msgstr "Псевдоним создан."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "ðÓÅ×ÄÏÎÉÍ: "
+msgstr "Псевдоним: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "ðÓÅ×ÄÏÎÉÍÙ"
+msgstr "Псевдонимы"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr ""
-"÷ÓÅ ÐÏÄÈÏÄÑÝÉÅ ËÌÀÞÉ ÐÏÍÅÞÅÎÙ ËÁË ÐÒÏÓÒÏÞÅÎÎÙÅ, ÏÔÏÚ×ÁÎÎÙÅ ÉÌÉ ÚÁÐÒÅÝ£ÎÎÙÅ."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "äÏÂÁ×ÉÔØ"
+"Все подходящие ключи помечены как просроченные, отозванные или запрещённые."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "äÏÂÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ Ë %s?"
+msgstr "Добавить сообщения к %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "áÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÎÏÍÅÒÏÍ ÓÏÏÂÝÅÎÉÑ."
+msgstr "Аргумент должен быть номером сообщения."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "÷ÌÏÖÅÎÉÅ ÓÏÈÒÁÎÅÎÏ."
+msgstr "Вложение сохранено."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "÷ÌÏÖÉÔØ ÆÁÊÌ"
+msgstr "Вложить файл"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "÷ËÌÁÄÙ×ÁÀÔÓÑ ÐÏÍÅÞÅÎÎÙÅ ÆÁÊÌÙ..."
+msgstr "Вкладываются помеченные файлы..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "÷ÌÏÖÅÎÉÅ ÏÂÒÁÂÏÔÁÎÏ."
+msgstr "Вложение обработано."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "÷ÌÏÖÅÎÉÅ ÓÏÈÒÁÎÅÎÏ."
+msgstr "Вложение сохранено."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "÷ÌÏÖÅÎÉÑ"
+msgstr "Вложения"
 
 #: imap/auth.c:83
 #, c-format
 msgid "Authenticating (%s)..."
-msgstr "áÕÔÅÎÔÉÆÉËÁÃÉÑ (%s)..."
+msgstr "Аутентификация (%s)..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "áÕÔÅÎÔÉÆÉËÁÃÉÑ (ÍÅÔÏÄ APOP)..."
+msgstr "Аутентификация (метод APOP)..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "áÕÔÅÎÔÉÆÉËÁÃÉÑ (ÍÅÔÏÄ SASL)..."
+msgstr "Аутентификация (метод SASL)..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "áÕÔÅÎÔÉÆÉËÁÃÉÑ (ÍÅÔÏÄ SASL)..."
+msgstr "Аутентификация (метод SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -580,56 +572,56 @@ msgstr ""
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "îÅËÏÒÒÅËÔÎÙÊ IDN \"%s\"."
+msgstr "Некорректный IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "îÅËÏÒÒÅËÔÎÙÊ IDN %s ÐÒÉ ÐÏÄÇÏÔÏ×ËÅ Resent-From."
+msgstr "Некорректный IDN %s при подготовке Resent-From."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "îÅËÏÒÒÅËÔÎÙÊ IDN × \"%s\": '%s'."
+msgstr "Некорректный IDN в \"%s\": '%s'."
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "îÅËÏÒÒÅËÔÎÙÊ IDN: '%s'"
+msgstr "Некорректный IDN: '%s'"
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
+msgstr "Недопустимое имя почтового ящика"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "ðÏÓÌÅÄÎÑÑ ÓÔÒÏËÁ ÓÏÏÂÝÅÎÉÑ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
+msgstr "Последняя строка сообщения уже на экране."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ %s"
+msgstr "Перенаправить сообщение %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ: "
+msgstr "Перенаправить сообщение: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ %s"
+msgstr "Перенаправить сообщения %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ: "
+msgstr "Перенаправить сообщения: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "ïÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄÙ CLOSE"
+msgstr "Ошибка выполнения команды CLOSE"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -638,64 +630,64 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÄÏÂÁ×ÉÔØ Ë ÐÏÞÔÏ×ÏÍÕ ÑÝÉËÕ: %s"
+msgstr "Не удалось добавить к почтовому ящику: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "÷ÌÏÖÅÎÉÅ ËÁÔÁÌÏÇÏ× ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ!"
+msgstr "Вложение каталогов не поддерживается!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ %s: %s"
+msgstr "Не удалось создать %s: %s"
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÁÊÌ %s"
+msgstr "Не удалось создать файл %s"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÉÌØÔÒ"
+msgstr "Не удалось создать фильтр"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÐÒÏÃÅÓÓ ÆÉÌØÔÒÁ"
+msgstr "Не удалось создать процесс фильтра"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ"
+msgstr "Не удалось создать временный файл"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"õÄÁÌÏÓØ ÒÁÓËÏÄÉÒÏ×ÁÔØ ÎÅ ×ÓÅ ×ÌÏÖÅÎÉÑ. éÎËÁÐÓÕÌÉÒÏ×ÁÔØ ÏÓÔÁÌØÎÙÅ × MIME?"
+"Удалось раскодировать не все вложения. Инкапсулировать остальные в MIME?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"õÄÁÌÏÓØ ÒÁÓËÏÄÉÒÏ×ÁÔØ ÎÅ ×ÓÅ ×ÌÏÖÅÎÉÑ. ðÅÒÅÓÌÁÔØ ÏÓÔÁÌØÎÙÅ × ×ÉÄÅ MIME?"
+"Удалось раскодировать не все вложения. Переслать остальные в виде MIME?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
-msgstr "îÅ ÕÄÁÌÏÓØ ÒÁÓÛÉÆÒÏ×ÁÔØ ÚÁÛÉÆÒÏ×ÁÎÎÏÅ ÓÏÏÂÝÅÎÉÅ!"
+msgstr "Не удалось расшифровать зашифрованное сообщение!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "õÄÁÌÅÎÉÅ ×ÌÏÖÅÎÉÊ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ POP-ÓÅÒ×ÅÒÏÍ."
+msgstr "Удаление вложений не поддерживается POP-сервером."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "õÄÁÌÅÎÉÅ ×ÌÏÖÅÎÉÊ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ POP-ÓÅÒ×ÅÒÏÍ."
+msgstr "Удаление вложений не поддерживается POP-сервером."
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "dotlock: ÎÅ ÕÄÁÌÏÓØ ÚÁÂÌÏËÉÒÏ×ÁÔØ %s.\n"
+msgstr "dotlock: не удалось заблокировать %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -703,306 +695,290 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "ðÏÍÅÞÅÎÎÙÅ ÓÏÏÂÝÅÎÉÑ ÏÔÓÕÔÓÔ×ÕÀÔ."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ type2.list mixmaster!"
+msgstr "Помеченные сообщения отсутствуют."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "îÅ ÕÄÁÌÏÓØ ÒÁÚÏÂÒÁÔØ ÉÍÑ. ðÒÏÄÏÌÖÉÔØ?"
+msgstr "Не удалось разобрать имя. Продолжить?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÆÁÊÌ ÓÏÏÂÝÅÎÉÑ: %s"
+msgstr "Не удалось открыть файл сообщения: %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "îÅ ÕÄÁÌÏÓØ ÄÏÂÁ×ÉÔØ Ë ÐÏÞÔÏ×ÏÍÕ ÑÝÉËÕ: %s"
+msgstr "Не удалось добавить к почтовому ящику: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "óÏÅÄÉÎÅÎÉÅ Ó %s ÚÁËÒÙÔÏ"
+msgstr "Соединение с %s закрыто"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "úÁËÒÙÔÉÅ ÓÏÅÄÉÎÅÎÉÑ Ó POP-ÓÅÒ×ÅÒÏÍ..."
+msgstr "Закрытие соединения с POP-сервером..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %s"
+msgstr "Не удалось получить информацию о %s: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ %s: %s"
+msgstr "Не удалось создать %s: %s"
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "úÁÐÉÓØ ÓÏÏÂÝÅÎÉÊ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ POP-ÓÅÒ×ÅÒÏÍ."
+msgstr "Запись сообщений не поддерживается POP-сервером."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ POP-ÓÅÒ×ÅÒÏÍ."
+msgstr "Редактирование сообщений не поддерживается POP-сервером."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %s"
+msgstr "Не удалось получить информацию о %s: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÒÏÓÍÏÔÒÅÔØ ËÁÔÁÌÏÇ"
+msgstr "Не удалось просмотреть каталог"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ %s."
+msgstr "Не удалось создать %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÚÁÇÏÌÏ×ËÁ ×Ï ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
+msgstr "Ошибка записи заголовка во временный файл!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÓÏÏÂÝÅÎÉÑ"
+msgstr "Ошибка записи сообщения"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÓÏÏÂÝÅÎÉÑ ×Ï ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
+msgstr "Ошибка записи сообщения во временный файл!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÉÌØÔÒ ÐÒÏÓÍÏÔÒÁ"
+msgstr "Не удалось создать фильтр просмотра"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ÆÉÌØÔÒ"
+msgstr "Не удалось создать фильтр"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "îÅ ÍÏÇÕ ÒÁÚÒÅÛÉÔØ ÚÁÐÉÓØ × ÐÏÞÔÏ×ÙÊ ÑÝÉË, ÏÔËÒÙÔÙÊ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Не могу разрешить запись в почтовый ящик, открытый только для чтения!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "ðÏÌÕÞÅÎ ÓÉÇÎÁÌ %s...  úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
+msgstr "Получен сигнал %s...  Завершение работы.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "óÅÒÔÉÆÉËÁÔ ×ÓÅ ÅÝÅ ÎÅÄÅÊÓÔ×ÉÔÅÌÅÎ"
+msgstr "Сертификат все еще недействителен"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "óÅÒÔÉÆÉËÁÔ ÓÏÈÒÁÎÅÎ"
+msgstr "Сертификат сохранен"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "éÚÍÅÎÅÎÉÑ × ÓÏÓÔÏÑÎÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÂÕÄÕÔ ×ÎÅÓÅÎÙ ÐÒÉ ÅÇÏ ÚÁËÒÙÔÉÉ."
+msgstr "Изменения в состояние почтового ящика будут внесены при его закрытии."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "éÚÍÅÎÅÎÉÑ × ÓÏÓÔÏÑÎÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÎÅ ÂÕÄÕÔ ×ÎÅÓÅÎÙ."
+msgstr "Изменения в состояние почтового ящика не будут внесены."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr "óÉÍ×ÏÌ = %s, ×ÏÓØÍÉÒÉÞÎÙÊ = %o, ÄÅÓÑÔÉÞÎÙÊ = %d"
+msgstr "Символ = %s, восьмиричный = %o, десятичный = %d"
 
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "õÓÔÁÎÏ×ÌÅÎÁ ÎÏ×ÁÑ ËÏÄÉÒÏ×ËÁ: %s; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "ðÅÒÅÊÔÉ ×: "
+msgstr "Установлена новая кодировка: %s; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "ðÅÒÅÊÔÉ ×: "
+msgstr "Перейти в: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "ðÒÏ×ÅÒËÁ ÎÁÌÉÞÉÑ ÎÏ×ÙÈ ÓÏÏÂÝÅÎÉÊ..."
-
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "ôÅÓÔ ËÌÀÞÁ "
+msgstr "Проверка наличия новых сообщений..."
 
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "ðÒÏ×ÅÒËÁ ÎÁÌÉÞÉÑ ÎÏ×ÙÈ ÓÏÏÂÝÅÎÉÊ..."
+msgstr "Проверка наличия новых сообщений..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "ðÒÏ×ÅÒËÁ ÎÁÌÉÞÉÑ ÎÏ×ÙÈ ÓÏÏÂÝÅÎÉÊ..."
+msgstr "Проверка наличия новых сообщений..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "îÅ ÐÒÉÍÅÎÑÔØ"
+msgstr "Не применять"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "óÂÒÏÓÉÔØ ÆÌÁÇ"
+msgstr "Сбросить флаг"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "úÁËÒÙÔÉÅ ÓÏÅÄÉÎÅÎÉÑ Ó ÓÅÒ×ÅÒÏÍ %s..."
+msgstr "Закрытие соединения с сервером %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "úÁËÒÙÔÉÅ ÓÏÅÄÉÎÅÎÉÑ Ó POP-ÓÅÒ×ÅÒÏÍ..."
+msgstr "Закрытие соединения с POP-сервером..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s..."
+msgstr "Устанавливается соединение с %s..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "ëÏÍÁÎÄÁ TOP ÓÅÒ×ÅÒÏÍ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
+msgstr "Команда TOP сервером не поддерживается."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "ëÏÍÁÎÄÁ UIDL ÓÅÒ×ÅÒÏÍ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
+msgstr "Команда UIDL сервером не поддерживается."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "óÏÈÒÁÎÅÎÉÅ ÉÚÍÅÎÅÎÉÊ..."
+msgstr "Сохранение изменений..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"ðÁÒÁÍÅÔÒÙ ËÏÍÐÉÌÑÃÉÉ:"
+"Параметры компиляции:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "ïÂÒÁÚÅà ÐÏÉÓËÁ ËÏÍÐÉÌÉÒÕÅÔÓÑ..."
+msgstr "Образец поиска компилируется..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "ëÏÐÉÒÕÅÔÓÑ × %s..."
+msgstr "Копируется в %s..."
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "ëÏÐÉÒÕÅÔÓÑ × %s..."
+msgstr "Копируется в %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s..."
+msgstr "Устанавливается соединение с %s..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s..."
+msgstr "Устанавливается соединение с %s..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s..."
+msgstr "Устанавливается соединение с %s..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "óÏÅÄÉÎÅÎÉÅ ÐÏÔÅÒÑÎÏ. õÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÐÏ×ÔÏÒÎÏ?"
+msgstr "Соединение потеряно. Установить соединение повторно?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "óÏÅÄÉÎÅÎÉÅ ÐÏÔÅÒÑÎÏ. õÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÐÏ×ÔÏÒÎÏ?"
+msgstr "Соединение потеряно. Установить соединение повторно?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "óÏÅÄÉÎÅÎÉÅ Ó %s ÚÁËÒÙÔÏ"
+msgstr "Соединение с %s закрыто"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "óÏÅÄÉÎÅÎÉÅ Ó %s ÚÁËÒÙÔÏ"
+msgstr "Соединение с %s закрыто"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "úÎÁÞÅÎÉÅ Content-Type ÉÚÍÅÎÅÎÏ ÎÁ %s."
+msgstr "Значение Content-Type изменено на %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "ðÏÌÅ Content-Type ÄÏÌÖÎÏ ÉÍÅÔØ ×ÉÄ ÔÉÐ/ÐÏÄÔÉÐ"
+msgstr "Поле Content-Type должно иметь вид тип/подтип"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "ðÒÏÄÏÌÖÉÔØ?"
+msgstr "Продолжить?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "ðÅÒÅËÏÄÉÒÏ×ÁÔØ × %s ÐÒÉ ÏÔÐÒÁ×ËÅ?"
+msgstr "Перекодировать в %s при отправке?"
 
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "ëÏÐÉÒÏ×ÁÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+msgstr "Копировать%s в почтовый ящик"
 
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "%d ÓÏÏÂÝÅÎÉÊ ËÏÐÉÒÕÀÔÓÑ × %s..."
+msgstr "%d сообщений копируются в %s..."
 
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "óÏÏÂÝÅÎÉÅ %d ËÏÐÉÒÕÅÔÓÑ × %s..."
+msgstr "Сообщение %d копируется в %s..."
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "ëÏÐÉÒÕÅÔÓÑ × %s..."
+msgstr "Копируется в %s..."
 
 #: main.c:63
 msgid ""
@@ -1018,708 +994,648 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ Ó %s (%s)."
+msgstr "Не удалось установить соединение с %s (%s)."
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓËÏÐÉÒÏ×ÁÔØ ÓÏÏÂÝÅÎÉÅ"
+msgstr "Не удалось скопировать сообщение"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
+msgstr "Не удалось создать временный файл!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
+msgstr "Не удалось создать временный файл!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ ÆÕÎËÃÉÀ ÓÏÒÔÉÒÏ×ËÉ! (ÓÏÏÂÝÉÔÅ Ï ÜÔÏÊ ÏÛÉÂËÅ)"
+msgstr "Не удалось найти функцию сортировки! (сообщите об этой ошибке)"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÐÒÅÄÅÌÉÔØ ÁÄÒÅÓ ÓÅÒ×ÅÒÁ \"%s\""
+msgstr "Не удалось определить адрес сервера \"%s\""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "îÅ ÕÄÁÌÏÓØ ×ÓÔÁ×ÉÔØ ×ÓÅ ÚÁÔÒÅÂÏ×ÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ!"
+msgstr "Не удалось вставить все затребованные сообщения!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "îÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ TLS-ÓÏÅÄÉÎÅÎÉÅ"
+msgstr "Не удалось установить TLS-соединение"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ %s"
+msgstr "Не удалось открыть %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÎÏ×Ï ÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË!"
+msgstr "Не удалось заново открыть почтовый ящик!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "óÏÏÂÝÅÎÉÅ ÏÔÐÒÁ×ÉÔØ ÎÅ ÕÄÁÌÏÓØ."
+msgstr "Сообщение отправить не удалось."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÂÌÏËÉÒÏ×ÁÔØ %s\n"
+msgstr "Не удалось заблокировать %s\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "óÏÚÄÁÔØ %s?"
+msgstr "Создать %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "óÏÚÄÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ"
+msgstr "Создание поддерживается только для почтовых ящиков на IMAP-серверах"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "óÏÚÄÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË: "
+msgstr "Создать почтовый ящик: "
 
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "äÅËÏÄÉÒÏ×ÁÔØ É ËÏÐÉÒÏ×ÁÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+msgstr "Декодировать и копировать%s в почтовый ящик"
 
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "äÅËÏÄÉÒÏ×ÁÔØ É ÓÏÈÒÁÎÉÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+msgstr "Декодировать и сохранить%s в почтовый ящик"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "÷ÙÂÉÒÁÅÔÓÑ %s..."
+msgstr "Выбирается %s..."
 
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "òÁÓÛÉÆÒÏ×ÁÔØ É ËÏÐÉÒÏ×ÁÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+msgstr "Расшифровать и копировать%s в почтовый ящик"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "òÁÓÛÉÆÒÏ×ÁÔØ É ÓÏÈÒÁÎÉÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+msgstr "Расшифровать и сохранить%s в почтовый ящик"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
-msgstr "òÁÓÛÉÆÒÏ×ËÁ ÓÏÏÂÝÅÎÉÑ..."
+msgstr "Расшифровка сообщения..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
-msgstr "òÁÓÛÉÆÒÏ×ÁÔØ ÎÅ ÕÄÁÌÁÓØ."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "õÄÁÌÉÔØ"
+msgstr "Расшифровать не удалась."
 
-#: remailer.c:433
-msgid "Delete"
-msgstr "õÄÁÌÉÔØ"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "õÄÁÌÅÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ"
+msgstr "Удаление поддерживается только для почтовых ящиков на IMAP-серверах"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "õÄÁÌÉÔØ ÓÏÏÂÝÅÎÉÑ Ó ÓÅÒ×ÅÒÁ?"
+msgstr "Удалить сообщения с сервера?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "õÄÁÌÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ: "
+msgstr "Удалить сообщения по образцу: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "õÄÁÌÉÔØ"
+msgstr "Удалить"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "õÄÁÌÅÎÉÅ ×ÌÏÖÅÎÉÊ ÉÚ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "ïÐÉÓÁÎÉÅ"
+msgstr "Удаление вложений из зашифрованных сообщений не поддерживается."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "ëÌÀÞ %s ÎÅ ÐÒÏ×ÅÒÅÎ. ÷Ù ÖÅÌÁÅÔÅ ÅÇÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ %s?"
+msgstr "Ключ %s не проверен. Вы желаете его использовать для %s?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "ëÁÔÁÌÏÇ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.  óÏÚÄÁÔØ?"
+msgstr "Каталог %s не существует.  Создать?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "ëÁÔÁÌÏÇ [%s], ÍÁÓËÁ ÆÁÊÌÁ: %s"
+msgstr "Каталог [%s], маска файла: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "ïûéâëá: ÐÏÖÁÌÕÊÓÔÁ. ÓÏÏÂÝÉÔÅ Ï ÎÅÊ"
+msgstr "ОШИБКА: пожалуйста. сообщите о ней"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÐÅÒÅÓÙÌÁÅÍÏÅ ÓÏÏÂÝÅÎÉÅ?"
+msgstr "Редактировать пересылаемое сообщение?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ"
+msgstr "ошибка в выражении"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "úÁÛÉÆÒÏ×ÁÔØ"
+msgstr "Зашифровать"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
-msgstr "úÁÛÉÆÒÏ×ÁÔØ: "
+msgstr "Зашифровать: "
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ: "
+msgstr "Введите идентификатор ключа: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ ÄÌÑ %s: "
+msgstr "Введите идентификатор ключа для %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "÷×ÅÄÉÔÅ ËÌÀÞÉ (^G - ÐÒÅÒÙ×ÁÎÉÅ ××ÏÄÁ): "
+msgstr "Введите ключи (^G - прерывание ввода): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "ïÛÉÂËÁ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÑ ÓÏÏÂÝÅÎÉÑ!"
+msgstr "Ошибка перенаправления сообщения!"
 
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "ïÛÉÂËÁ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÑ ÓÏÏÂÝÅÎÉÊ!"
+msgstr "Ошибка перенаправления сообщений!"
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ ÓÏÏÂÝÅÎÉÑ."
+msgstr "Ошибка отправки сообщения."
 
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "ïÛÉÂËÁ ÐÒÉ ÕÓÔÁÎÏ×ÌÅÎÉÉ ÓÏÅÄÉÎÅÎÉÑ: %s"
+msgstr "Ошибка при установлении соединения: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "ïÛÉÂËÁ ÐÒÉ ÕÓÔÁÎÏ×ÌÅÎÉÉ ÓÏÅÄÉÎÅÎÉÑ: %s"
+msgstr "Ошибка при установлении соединения: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "ïÛÉÂËÁ × %s: ÓÔÒÏËÁ %d: %s"
+msgstr "Ошибка в %s: строка %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "ïÛÉÂËÁ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ: %s\n"
+msgstr "Ошибка в командной строке: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "ïÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ: %s"
+msgstr "Ошибка в выражении: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÔÅÒÍÉÎÁÌÁ."
+msgstr "Ошибка инициализации терминала."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÔÅÒÍÉÎÁÌÁ."
+msgstr "Ошибка инициализации терминала."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
+msgstr "Ошибка открытия почтового ящика"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "ïÛÉÂËÁ ÒÁÚÂÏÒÁ ÁÄÒÅÓÁ!"
+msgstr "Ошибка разбора адреса!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "ïÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ \"%s\"!"
+msgstr "Ошибка выполнения \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "ïÛÉÂËÁ ÐÒÏÓÍÏÔÒÁ ËÁÔÁÌÏÇÁ."
+msgstr "Ошибка просмотра каталога."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "óÏÏÂÝÅÎÉÅ ÏÔÐÒÁ×ÉÔØ ÎÅ ÕÄÁÌÏÓØ, ÐÒÏÃÅÓÓ-ÐÏÔÏÍÏË ×ÅÒÎÕÌ %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "óÏÏÂÝÅÎÉÅ ÏÔÐÒÁ×ÉÔØ ÎÅ ÕÄÁÌÏÓØ, ÐÒÏÃÅÓÓ-ÐÏÔÏÍÏË ×ÅÒÎÕÌ %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ ÓÏÏÂÝÅÎÉÑ."
+msgstr "Сообщение отправить не удалось, процесс-потомок вернул %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "ïÛÉÂËÁ ÐÒÉ ×ÚÁÉÍÏÄÅÊÓÔ×ÉÉ Ó %s (%s)"
+msgstr "Ошибка при взаимодействии с %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "ïÛÉÂËÁ ÐÒÉ ÐÏÐÙÔËÅ ÐÒÏÓÍÏÔÒÁ ÆÁÊÌÁ"
+msgstr "Ошибка при попытке просмотра файла"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ!"
+msgstr "Ошибка записи почтового ящика!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "ïÛÉÂËÁ. ÷ÒÅÍÅÎÎÙÊ ÆÁÊÌ ÏÓÔÁ×ÌÅÎ: %s"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "ïÛÉÂËÁ: %s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ËÁË ÐÏÓÌÅÄÎÉÊ remailer"
+msgstr "Ошибка. Временный файл оставлен: %s"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "ïÛÉÂËÁ: '%s' ÎÅ Ñ×ÌÑÅÔÓÑ ËÏÒÒÅËÔÎÙÍ IDN."
+msgstr "Ошибка: '%s' не является корректным IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "ïÛÉÂËÁ: ÔÉÐ multipart/encrypted ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÑ ÐÁÒÁÍÅÔÒÁ protocol!"
+msgstr "Ошибка: тип multipart/encrypted требует наличия параметра protocol!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "ïÛÉÂËÁ: ÔÉÐ multipart/signed ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÑ ÐÁÒÁÍÅÔÒÁ protocol."
+msgstr "Ошибка: тип multipart/signed требует наличия параметра protocol."
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "ïÛÉÂËÁ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ: %s\n"
+msgstr "Ошибка в командной строке: %s\n"
 
 #: imap/message.c:109
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "úÁÇÒÕÚËÁ ËÜÛÁ... [%d/%d]"
+msgstr "Загрузка кэша... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "éÓÐÏÌÎÑÅÔÓÑ ËÏÍÁÎÄÁ ÄÌÑ ÐÏÄÈÏÄÑÝÉÈ ÓÏÏÂÝÅÎÉÊ..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "÷ÙÈÏÄ"
+msgstr "Исполняется команда для подходящих сообщений..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "÷ÙÈÏÄ "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "÷ÙÊÔÉ ÉÚ Mutt ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ÉÚÍÅÎÅÎÉÊ?"
+msgstr "Выйти из Mutt без сохранения изменений?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "úÁ×ÅÒÛÉÔØ ÒÁÂÏÔÕ Ó Mutt?"
+msgstr "Завершить работу с Mutt?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÞÉÓÔÉÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+msgstr "Не удалось очистить почтовый ящик"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "õÄÁÌÅÎÉÅ ÓÏÏÂÝÅÎÉÊ Ó ÓÅÒ×ÅÒÁ..."
+msgstr "Удаление сообщений с сервера..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÒÁÚÂÏÒÁ ÚÁÇÏÌÏ×ËÏ×."
+msgstr "Не удалось открыть файл для разбора заголовков."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÕÄÁÌÅÎÉÑ ÚÁÇÏÌÏ×ËÏ×."
+msgstr "Не удалось открыть файл для удаления заголовков."
 
 #: attach.c:151
 msgid "Failure to rename file."
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÆÁÊÌ."
+msgstr "Не удалось переименовать файл."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "ëÒÉÔÉÞÅÓËÁÑ ÏÛÉÂËÁ!  îÅ ÕÄÁÌÏÓØ ÚÁÎÏ×Ï ÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË!"
+msgstr "Критическая ошибка!  Не удалось заново открыть почтовый ящик!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "ëÒÉÔÉÞÅÓËÁÑ ÏÛÉÂËÁ.  óÂÏÊ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÓÞÅÔÞÉËÁ ÓÏÏÂÝÅÎÉÊ!"
+msgstr "Критическая ошибка.  Сбой синхронизации счетчика сообщений!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "õÄÁÌÅÎÉÅ ÓÏÏÂÝÅÎÉÊ Ó ÓÅÒ×ÅÒÁ..."
+msgstr "Удаление сообщений с сервера..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÏÏÂÝÅÎÉÑ..."
+msgstr "Получение сообщения..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÓÏÏÂÝÅÎÉÊ..."
+msgstr "Получение списка сообщений..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÓÏÏÂÝÅÎÉÊ..."
+msgstr "Получение списка сообщений..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "ðÏÌÕÞÅÎÉÅ ÚÁÇÏÌÏ×ËÏ× ÓÏÏÂÝÅÎÉÊ... [%d/%d]"
+msgstr "Получение заголовков сообщений... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "ðÏÌÕÞÅÎÉÅ ÚÁÇÏÌÏ×ËÏ× ÓÏÏÂÝÅÎÉÊ... [%d/%d]"
+msgstr "Получение заголовков сообщений... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÏÏÂÝÅÎÉÑ..."
+msgstr "Получение сообщения..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "íÁÓËÁ ÆÁÊÌÁ: "
+msgstr "Маска файла: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ, (o)ÐÅÒÅÐÉÓÁÔØ, (a)ÄÏÂÁ×ÉÔØ, (Ó)ÏÔËÁÚ?"
+msgstr "Файл существует, (o)переписать, (a)добавить, (с)отказ?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "õËÁÚÁÎÎÙÊ ÆÁÊÌ -- ÜÔÏ ËÁÔÁÌÏÇ. óÏÈÒÁÎÉÔØ × ÎÅÍ?"
+msgstr "Указанный файл -- это каталог. Сохранить в нем?"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "õËÁÚÁÎÎÙÊ ÆÁÊÌ -- ÜÔÏ ËÁÔÁÌÏÇ. óÏÈÒÁÎÉÔØ × ÎÅÍ?[(y)ÄÁ, (n)ÎÅÔ, (a)×ÓÅ]"
+msgstr "Указанный файл -- это каталог. Сохранить в нем?[(y)да, (n)нет, (a)все]"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "éÍÑ ÆÁÊÌÁ × ËÁÔÁÌÏÇÅ: "
+msgstr "Имя файла в каталоге: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "ðÒÏÐÕÓÔÉÔØ ÞÅÒÅÚ: "
+msgstr "Пропустить через: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
-msgstr "ïÔÐÅÞÁÔÏË ÐÁÌØÃÁ: %s"
+msgstr "Отпечаток пальца: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "ÓÏÈÒÁÎÉÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÄÌÑ ÏÔÐÒÁ×ËÉ ÐÏÚÄÎÅÅ"
+msgstr "сохранить это сообщение для отправки позднее"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "ïÔ×ÅÞÁÔØ ÐÏ %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "ïÔ×ÅÞÁÔØ ÐÏ %s%s?"
+msgstr "Отвечать по %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "ðÅÒÅÓÌÁÔØ ÉÎËÁÐÓÕÌÉÒÏ×ÁÎÎÙÍ × MIME?"
+msgstr "Переслать инкапсулированным в MIME?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "ðÅÒÅÓÌÁÔØ ËÁË ×ÌÏÖÅÎÉÅ?"
+msgstr "Переслать как вложение?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "ðÅÒÅÓÌÁÔØ ËÁË ×ÌÏÖÅÎÉÑ?"
+msgstr "Переслать как вложения?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "÷ ÒÅÖÉÍÅ \"×ÌÏÖÉÔØ ÓÏÏÂÝÅÎÉÅ\" ÆÕÎËÃÉÑ ÎÅÄÏÓÔÕÐÎÁ."
+msgstr "В режиме \"вложить сообщение\" функция недоступна."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ×..."
+msgstr "Получение списка почтовых ящиков..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÐÒÏÓÔÒÁÎÓÔ× ÉÍÅÎ..."
+msgstr "Получение списка пространств имен..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "÷ÓÅÍ"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "ðÏÍÏÝØ"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "óÐÒÁ×ËÁ ÄÌÑ %s"
+msgstr "Справка для %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "ðÏÄÓËÁÚËÁ ÕÖÅ ÐÅÒÅÄ ×ÁÍÉ."
+msgstr "Подсказка уже перед вами."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "îÅÉÚ×ÅÓÔÎÏ, ËÁË ÜÔÏ ÐÅÞÁÔÁÔØ!"
+msgstr "Неизвестно, как это печатать!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "îÅÉÚ×ÅÓÔÎÏ ËÁË ÐÅÞÁÔÁÔØ %s ×ÌÏÖÅÎÉÑ!"
+msgstr "Неизвестно как печатать %s вложения!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "óÔÅÐÅÎØ ÄÏ×ÅÒÉÑ ÄÌÑ ID ÎÅ ÏÐÒÅÄÅÌÅÎÁ."
+msgstr "Степень доверия для ID не определена."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "ID ÐÒÏÓÒÏÞÅÎ, ÚÁÐÒÅÝÅÎ ÉÌÉ ÏÔÏÚ×ÁÎ."
+msgstr "ID пÑ\80оÑ\81Ñ\80оÑ\87ен, запÑ\80еÑ\89ен или оÑ\82озван."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "ID ÎÅÄÅÊÓÔ×ÉÔÅÌÅÎ."
+msgstr "ID недействителен."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "ID ÄÅÊÓÔ×ÉÔÅÌÅÎ ÔÏÌØËÏ ÞÁÓÔÉÞÎÏ."
+msgstr "ID действителен только частично."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "îÅ×ÅÒÎÙÊ PGP-ÚÁÇÏÌÏ×ÏË"
+msgstr "Неверный PGP-заголовок"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "îÅ×ÅÒÎÙÊ S/MIME-ÚÁÇÏÌÏ×ÏË"
+msgstr "Неверный S/MIME-заголовок"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "îÅËÏÒÒÅËÔÎÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎÎÁÑ ÚÁÐÉÓØ ÄÌÑ ÔÉÐÁ %s × \"%s\", ÓÔÒÏËÁ %d"
+msgstr "Некорректно отформатированная запись для типа %s в \"%s\", строка %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "÷ÓÔÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ × ÏÔ×ÅÔ?"
+msgstr "Вставить сообщение в ответ?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "÷ËÌÀÞÁÅÔÓÑ ÃÉÔÉÒÕÅÍÏÅ ÓÏÏÂÝÅÎÉÅ..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "÷ÓÔÁ×ÉÔØ"
+msgstr "Включается цитируемое сообщение..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "îÅ×ÅÒÎÙÊ ÄÅÎØ ÍÅÓÑÃÁ: %s"
+msgstr "Неверный день месяца: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "îÅ×ÅÒÎÁÑ ËÏÄÉÒÏ×ËÁ."
+msgstr "Неверная кодировка."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "îÅ×ÅÒÎÙÊ ÉÎÄÅËÓ."
+msgstr "Неверный индекс."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÓÏÏÂÝÅÎÉÑ."
+msgstr "Неверный номер сообщения."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "îÅ×ÅÒÎÏÅ ÎÁÚ×ÁÎÉÅ ÍÅÓÑÃÁ: %s"
+msgstr "Неверное название месяца: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "îÅ×ÅÒÎÏ ÕËÁÚÁÎÁ ÏÔÎÏÓÉÔÅÌØÎÁÑ ÄÁÔÁ: %s"
+msgstr "Неверно указана относительная дата: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "úÁÐÕÓËÁÅÔÓÑ ÐÒÏÇÒÁÍÍÁ PGP..."
+msgstr "Запускается программа PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "úÁÐÕÓËÁÅÔÓÑ ÐÒÏÇÒÁÍÍÁ PGP..."
+msgstr "Запускается программа PGP..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "úÁÐÕÓËÁÅÔÓÑ ÐÒÏÇÒÁÍÍÁ Á×ÔÏÐÒÏÓÍÏÔÒÁ: %s"
+msgstr "Запускается программа автопросмотра: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "ðÅÒÅÊÔÉ Ë ÓÏÏÂÝÅÎÉÀ: "
+msgstr "Перейти к сообщению: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "ðÅÒÅÊÔÉ Ë: "
+msgstr "Перейти к: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "äÌÑ ÄÉÁÌÏÇÏ× ÐÅÒÅÈÏÄ ÐÏ ÎÏÍÅÒÕ ÓÏÏÂÝÅÎÉÑ ÎÅ ÒÅÁÌÉÚÏ×ÁÎ."
+msgstr "Для диалогов переход по номеру сообщения не реализован."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "éÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ: 0x%s"
+msgstr "Идентификатор ключа: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "ëÌÁ×ÉÛÅ ÎÅ ÎÁÚÎÁÞÅÎÁ ÎÉËÁËÁÑ ÆÕÎËÃÉÑ."
+msgstr "Клавише не назначена никакая функция."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "ëÌÁ×ÉÛÅ ÎÅ ÎÁÚÎÁÞÅÎÁ ÎÉËÁËÁÑ ÆÕÎËÃÉÑ. äÌÑ ÓÐÒÁ×ËÉ ÉÓÐÏÌØÚÕÊÔÅ '%s'."
+msgstr "Клавише не назначена никакая функция. Для справки используйте '%s'."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "ïÇÒÁÎÉÞÉÔØÓÑ ÓÏÏÂÝÅÎÉÑÍÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍÉ: "
+msgstr "Ограничиться сообщениями, соответствующими: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "ûÁÂÌÏÎ ÏÇÒÁÎÉÞÅÎÉÑ: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Шаблон ограничения: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "òÅÇÉÓÔÒÁÃÉÑ..."
+msgstr "Регистрация..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1727,1111 +1643,1007 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÆÁÊÌ, ÕÄÁÌÉÔØ ÆÁÊÌ ÂÌÏËÉÒÏ×ËÉ ÄÌÑ %s?"
+msgstr "Невозможно заблокировать файл, удалить файл блокировки для %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "òÅÇÉÓÔÒÁÃÉÑ..."
+msgstr "Регистрация..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "òÅÇÉÓÔÒÁÃÉÑ ÎÅ ÕÄÁÌÁÓØ."
+msgstr "Регистрация не удалась."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "ðÏÉÓË ËÌÀÞÅÊ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÈ \"%s\"..."
+msgstr "Поиск ключей, соответствующих \"%s\"..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "ïÐÒÅÄÅÌÑÅÔÓÑ ÁÄÒÅÓ ÓÅÒ×ÅÒÁ %s..."
+msgstr "Определяется адрес сервера %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "ïÔÐÅÞÁÔÏË ÐÁÌØÃÁ: %s"
+msgstr "Отпечаток пальца: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "MIME-ÔÉÐ ÎÅ ÏÐÒÅÄÅÌÅÎ.  îÅ×ÏÚÍÏÖÎÏ ÐÒÏÓÍÏÔÒÅÔØ ×ÌÏÖÅÎÉÅ."
+msgstr "MIME-тип не определен.  Невозможно просмотреть вложение."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "ïÂÎÁÒÕÖÅÎ ÃÉËÌ × ÏÐÒÅÄÅÌÅÎÉÉ ÍÁËÒÏÓÁ."
+msgstr "Обнаружен цикл в определении макроса."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "óÏÚÄÁÔØ"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "ðÉÓØÍÏ ÎÅ ÏÔÐÒÁ×ÌÅÎÏ."
+msgstr "Письмо не отправлено."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "óÏÏÂÝÅÎÉÅ ÏÔÐÒÁ×ÌÅÎÏ."
+msgstr "Сообщение отправлено."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÏÂÎÏ×ÌÅÎ."
+msgstr "Почтовый ящик обновлен."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÚÁËÒÙÔ"
+msgstr "Почтовый ящик закрыт"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÓÏÚÄÁÎ."
+msgstr "Почтовый ящик создан."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÕÄÁÌÅÎ."
+msgstr "Почтовый ящик удален."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÐÕÓÔ."
+msgstr "Почтовый ящик пуст."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÓÔÁÌ ÄÏÓÔÕÐÅÎ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ. %s"
+msgstr "Почтовый ящик стал доступен только для чтения. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÎÅÍÏÄÉÆÉÃÉÒÕÅÍ."
+msgstr "Почтовый ящик немодифицируем."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÎÅ ÉÚÍÅÎÉÌÓÑ."
+msgstr "Почтовый ящик не изменился."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÄÏÌÖÅÎ ÉÍÅÔØ ÉÍÑ."
+msgstr "Почтовый ящик должен иметь имя."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÎÅ ÕÄÁÌÅÎ."
+msgstr "Почтовый ящик не удален."
 
 #: imap/browse.c:306
 msgid "Mailbox renamed."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÐÅÒÅÉÍÅÎÏ×ÁÎ."
+msgstr "Почтовый ящик переименован."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÂÙÌ ÐÏ×ÒÅÖÄÅÎ!"
+msgstr "Почтовый ящик был поврежден!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "ñÝÉË ÂÙÌ ÉÚÍÅÎÅÎ ×ÎÅÛÎÅÊ ÐÒÏÇÒÁÍÍÏÊ."
+msgstr "Ящик был изменен внешней программой."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr ""
-"ñÝÉË ÂÙÌ ÉÚÍÅÎÅÎ ×ÎÅÛÎÅÊ ÐÒÏÇÒÁÍÍÏÊ.  úÎÁÞÅÎÉÑ ÆÌÁÇÏ× ÍÏÇÕÔ ÂÙÔØ ÎÅËÏÒÒÅËÔÎÙ."
+"Ящик был изменен внешней программой.  Значения флагов могут быть некорректны."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "ðÏÞÔÏ×ÙÅ ÑÝÉËÉ [%d]"
+msgstr "Почтовые ящики [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr ""
-"õËÁÚÁÎÎÙÊ × mailcap ÓÐÏÓÏ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÑ ÐÁÒÁÍÅÔÒÁ %%s"
+"Указанный в mailcap способ редактирования требует наличия параметра %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "õËÁÚÁÎÎÙÊ × mailcap ÓÐÏÓÏÂ ÓÏÚÄÁÎÉÑ ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÑ ÐÁÒÁÍÅÔÒÁ %%s"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "óÏÚÄÁÔØ ÐÓÅ×ÄÏÎÉÍ"
+msgstr "Указанный в mailcap способ создания требует наличия параметра %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "%d ÓÏÏÂÝÅÎÉÊ ÐÏÍÅÞÁÀÔÓÑ ËÁË ÕÄÁÌÅÎÎÙÅ..."
+msgstr "%d сообщений помечаются как удаленные..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "íÁÓËÁ"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "óÏÏÂÝÅÎÉÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÏ."
+msgstr "Сообщение перенаправлено."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÐÅÞÁÔÁÔØ ÓÏÏÂÝÅÎÉÅ"
+msgstr "Не удалось напечатать сообщение"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "æÁÊÌ ÓÏÏÂÝÅÎÉÑ ÐÕÓÔ!"
+msgstr "Файл сообщения пуст!"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "óÏÏÂÝÅÎÉÅ ÎÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÏ."
+msgstr "Сообщение не перенаправлено."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "óÏÏÂÝÅÎÉÅ ÎÅ ÉÚÍÅÎÉÌÏÓØ!"
+msgstr "Сообщение не изменилось!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "òÏÄÉÔÅÌØÓËÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅ ×ÉÄÉÍÏ ÐÒÉ ÐÒÏÓÍÏÔÒÅ Ó ÏÇÒÁÎÉÞÅÎÉÅÍ."
+msgstr "Родительское сообщение не видимо при просмотре с ограничением."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "óÏÏÂÝÅÎÉÅ ÏÔÌÏÖÅÎÏ."
+msgstr "Сообщение отложено."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "óÏÏÂÝÅÎÉÅ ÎÁÐÅÞÁÔÁÎÏ"
+msgstr "Сообщение напечатано"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "óÏÏÂÝÅÎÉÅ ÚÁÐÉÓÁÎÏ."
+msgstr "Сообщение записано."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "óÏÏÂÝÅÎÉÑ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÙ."
+msgstr "Сообщения перенаправлены."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÐÅÞÁÔÁÔØ ÓÏÏÂÝÅÎÉÑ"
+msgstr "Не удалось напечатать сообщения"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "óÏÏÂÝÅÎÉÑ ÎÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÙ."
+msgstr "Сообщения не перенаправлены."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "óÏÏÂÝÅÎÉÑ ÎÁÐÅÞÁÔÁÎÙ"
+msgstr "Сообщения напечатаны"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "îÅÏÂÈÏÄÉÍÙÅ ÁÒÇÕÍÅÎÔÙ ÏÔÓÕÔÓÔ×ÕÀÔ."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "ãÅÐÏÞËÉ mixmaster ÉÍÅÀÔ ÏÇÒÁÎÉÞÅÎÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÜÌÅÍÅÎÔÏ×: %d"
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster ÎÅ ÐÏÚ×ÏÌÑÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÚÁÇÏÌÏ×ËÉ Cc É Bcc."
+msgstr "Необходимые аргументы отсутствуют."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "ðÅÒÅÍÅÓÔÉÔØ ÐÒÏÞÉÔÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ × %s?"
+msgstr "Переместить прочитанные сообщения в %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "ðÒÏÞÉÔÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ ÐÅÒÅÍÅÝÁÀÔÓÑ × %s..."
+msgstr "Прочитанные сообщения перемещаются в %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "îÏ×ÙÊ ÚÁÐÒÏÓ"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "îÏ×ÏÅ ÉÍÑ ÆÁÊÌÁ: "
+msgstr "Новое имя файла: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "îÏ×ÙÊ ÆÁÊÌ: "
+msgstr "Новый файл: "
 
 #: buffy.cpkg:330
 msgid "New mail in "
-msgstr "îÏ×ÁÑ ÐÏÞÔÁ × "
+msgstr "Новая почта в "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "îÏ×ÁÑ ÐÏÞÔÁ × ÜÔÏÍ ÑÝÉËÅ."
+msgstr "Новая почта в этом ящике."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "óÌÅÄÕÀÝÉÊ"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "÷ÐÅÒÅÄ"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "îÅÔ ÄÏÓÔÕÐÎÙÈ ÍÅÔÏÄÏ× ÁÕÔÅÎÔÉÆÉËÁÃÉÉ."
+msgstr "Нет доступных методов аутентификации."
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "ðÁÒÁÍÅÔÒ boundary ÎÅ ÎÁÊÄÅÎ! (óÏÏÂÝÉÔÅ Ï ÜÔÏÊ ÏÛÉÂËÅ)"
+msgstr "Параметр boundary не найден! (Сообщите об этой ошибке)"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "úÁÐÉÓÉ ÏÔÓÕÔÓÔ×ÕÀÔ."
+msgstr "Записи отсутствуют."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "îÅÔ ÆÁÊÌÏ×, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÈ ÄÁÎÎÏÊ ÍÁÓËÅ"
+msgstr "Нет файлов, удовлетворяющих данной маске"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "îÅ ÏÐÒÅÄÅÌÅÎÏ ÎÉ ÏÄÎÏÇÏ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÓÏ ×ÈÏÄÑÝÉÍÉ ÐÉÓØÍÁÍÉ."
+msgstr "Не определено ни одного почтового ящика со входящими письмами."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "ûÁÂÌÏÎ ÏÇÒÁÎÉÞÅÎÉÑ ÓÐÉÓËÁ ÏÔÓÕÔÓÔ×ÕÅÔ."
+msgstr "Шаблон ограничения списка отсутствует."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "îÅÔ ÏÔËÒÙÔÏÇÏ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ."
+msgstr "Нет открытого почтового ящика."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "îÅÔ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× Ó ÎÏ×ÏÊ ÐÏÞÔÏÊ."
+msgstr "Нет почтовых ящиков с новой почтой."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "÷ mailcap ÎÅ ÏÐÒÅÄÅÌÅÎ ÓÐÏÓÏÂ ÓÏÚÄÁÎÉÑ ÄÌÑ %s; ÓÏÚÄÁÎ ÐÕÓÔÏÊ ÆÁÊÌ."
+msgstr "В mailcap не определен способ создания для %s; создан пустой файл."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "÷ mailcap ÎÅ ÏÐÒÅÄÅÌÅÎ ÓÐÏÓÏ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÄÌÑ %s"
+msgstr "В mailcap не определен способ редактирования для %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "óÐÉÓËÏ× ÒÁÓÓÙÌËÉ ÎÅ ÎÁÊÄÅÎÏ!"
+msgstr "Списков рассылки не найдено!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "ðÏÄÈÏÄÑÝÁÑ ÚÁÐÉÓØ × mailcap ÎÅ ÎÁÊÄÅÎÁ; ÐÒÏÓÍÏÔÒ ËÁË ÔÅËÓÔÁ."
+msgstr "Подходящая запись в mailcap не найдена; просмотр как текста."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "÷ ÜÔÏÍ ÐÏÞÔÏ×ÏÍ ÑÝÉËÅ/ÆÁÊÌÅ ÎÅÔ ÓÏÏÂÝÅÎÉÊ."
+msgstr "В этом почтовом ящике/файле нет сообщений."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "îÉ ÏÄÎÏ ÓÏÏÂÝÅÎÉÅ ÎÅ ÐÏÄÈÏÄÉÔ ÐÏÄ ËÒÉÔÅÒÉÊ."
+msgstr "Ни одно сообщение не подходит под критерий."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "îÅÔ ÂÏÌØÛÅ ÃÉÔÉÒÕÅÍÏÇÏ ÔÅËÓÔÁ."
+msgstr "Нет больше цитируемого текста."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "îÅÔ ÂÏÌØÛÅ ÄÉÓËÕÓÓÉÊ."
+msgstr "Нет больше дискуссий."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "úÁ ÃÉÔÉÒÕÅÍÙÍ ÔÅËÓÔÏÍ ÂÏÌØÛÅ ÎÅÔ ÏÓÎÏ×ÎÏÇÏ ÔÅËÓÔÁ."
+msgstr "За цитируемым текстом больше нет основного текста."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "îÅÔ ÎÏ×ÏÊ ÐÏÞÔÙ × POP-ÑÝÉËÅ."
+msgstr "Нет новой почты в POP-ящике."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "îÅÔ ÎÏ×ÙÈ ÓÏÏÂÝÅÎÉÊ"
+msgstr "Нет новых сообщений"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "ôÅÍÁ ÓÏÏÂÝÅÎÉÑ ÎÅ ÕËÁÚÁÎÁ."
+msgstr "Тема сообщения не указана."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "îÅÔ ÆÁÊÌÏ×, ÕÄÏ×ÌÅÔ×ÏÒÑÀÝÉÈ ÄÁÎÎÏÊ ÍÁÓËÅ"
+msgstr "Нет файлов, удовлетворяющих данной маске"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "îÅÔ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× Ó ÎÏ×ÏÊ ÐÏÞÔÏÊ."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "îÅÔ ÏÔÌÏÖÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "îÅÔ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× Ó ÎÏ×ÏÊ ÐÏÞÔÏÊ."
+msgstr "Нет отложенных сообщений."
 
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "ëÏÍÁÎÄÁ ÄÌÑ ÐÅÞÁÔÉ ÎÅ ÏÐÒÅÄÅÌÅÎÁ."
+msgstr "Команда для печати не определена."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "îÅ ÕËÁÚÁÎÏ ÎÉ ÏÄÎÏÇÏ ÁÄÒÅÓÁÔÁ!"
+msgstr "Не указано ни одного адресата!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "áÄÒÅÓÁÔÙ ÎÅ ÕËÁÚÁÎÙ.\n"
+msgstr "Адресаты не указаны.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "îÅ ÂÙÌÏ ÕËÁÚÁÎÏ ÎÉ ÏÄÎÏÇÏ ÁÄÒÅÓÁÔÁ."
+msgstr "Не было указано ни одного адресата."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "îÅÔ ÏÂÒÁÚÃÁ ÐÏÉÓËÁ."
+msgstr "Нет образца поиска."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "ôÅÍÁ ÓÏÏÂÝÅÎÉÑ ÎÅ ÕËÁÚÁÎÁ."
+msgstr "Тема сообщения не указана."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "îÅÔ ÔÅÍÙ ÓÏÏÂÝÅÎÉÑ, ÐÒÅÒ×ÁÔØ ÏÔÐÒÁ×ËÕ?"
+msgstr "Нет темы сообщения, прервать отправку?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "îÅÔ ÔÅÍÙ ÐÉÓØÍÁ, ÏÔËÁÚÁÔØÓÑ?"
+msgstr "Нет темы письма, отказаться?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "îÅÔ ÔÅÍÙ ÐÉÓØÍÁ, ÏÔËÁÚ."
+msgstr "Нет темы письма, отказ."
 
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "îÅÔ ÔÁËÏÇÏ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
+msgstr "Нет такого почтового ящика"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "îÅÔ ÏÔÍÅÞÅÎÎÙÈ ÚÁÐÉÓÅÊ."
+msgstr "Нет отмеченных записей."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "îÉ ÏÄÎÏ ÉÚ ÐÏÍÅÞÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ ÎÅ Ñ×ÌÑÅÔÓÑ ×ÉÄÉÍÙÍ!"
+msgstr "Ни одно из помеченных сообщений не является видимым!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "îÅÔ ÏÔÍÅÞÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ."
+msgstr "Нет отмеченных сообщений."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "îÅÔ ×ÏÓÓÔÁÎÏ×ÌÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ."
+msgstr "Нет восстановленных сообщений."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "îÅÔ ÎÅÐÒÏÞÉÔÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ"
+msgstr "Нет непрочитанных сообщений"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "îÅÔ ×ÉÄÉÍÙÈ ÓÏÏÂÝÅÎÉÊ."
+msgstr "Нет видимых сообщений."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "÷ ÜÔÏÍ ÍÅÎÀ ÎÅÄÏÓÔÕÐÎÏ."
+msgstr "В этом меню недоступно."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "îÅ ÎÁÊÄÅÎÏ."
+msgstr "Не найдено."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
-msgstr "îÅÔ ÐÏÍÅÞÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ."
-
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
+msgstr "Нет помеченных сообщений."
 
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "äÌÑ ÓÏÓÔÁ×ÎÙÈ ×ÌÏÖÅÎÉÊ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÕÄÁÌÅÎÉÅ."
+msgstr "Для составных вложений поддерживается только удаление."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "ïÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+msgstr "Открыть почтовый ящик"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "ïÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
+msgstr "Открыть почтовый ящик только для чтения"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "÷ÌÏÖÉÔØ ÓÏÏÂÝÅÎÉÅ ÉÚ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
+msgstr "Вложить сообщение из почтового ящика"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "ïÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
+msgstr "Открыть почтовый ящик только для чтения"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "÷ÌÏÖÉÔØ ÓÏÏÂÝÅÎÉÅ ÉÚ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ"
+msgstr "Вложить сообщение из почтового ящика"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ ÄÏÓÔÁ×ËÉ ÐÏÞÔÙ"
+msgstr "Результат работы программы доставки почты"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "PGP (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, %s, (c)ÏÔËÁÚÁÔØÓÑ? "
+msgstr "PGP (e)шифр, (s)подпись, (a)подпись как, (b)оба, %s, (c)отказаться? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ. ïÞÉÓÔÉÔØ É ÐÒÏÄÏÌÖÉÔØ? "
+msgstr "PGP уже используется. Очистить и продолжить? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP-ËÌÀÞÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ <%s>."
+msgstr "PGP-ключи, соответствующие <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "PGP-ËÌÀÞÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ <%s>."
+msgstr "PGP-ключи, соответствующие <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP-ÐÏÄÐÉÓØ ÐÒÏ×ÅÒÉÔØ îå ÕÄÁÌÏÓØ."
+msgstr "PGP-подпиÑ\81Ñ\8c пÑ\80овеÑ\80иÑ\82Ñ\8c Ð\9dÐ\95 Ñ\83далоÑ\81Ñ\8c."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP-ÐÏÄÐÉÓØ ÐÒÏ×ÅÒÅÎÁ."
+msgstr "PGP-подпиÑ\81Ñ\8c пÑ\80овеÑ\80ена."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "POP-ÓÅÒ×ÅÒ ÎÅ ÏÐÒÅÄÅÌÅÎ."
+msgstr "POP-сервер не определен."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "òÏÄÉÔÅÌØÓËÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅÄÏÓÔÕÐÎÏ."
+msgstr "Родительское сообщение недоступно."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "òÏÄÉÔÅÌØÓËÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅ ×ÉÄÉÍÏ ÐÒÉ ÐÒÏÓÍÏÔÒÅ Ó ÏÇÒÁÎÉÞÅÎÉÅÍ."
+msgstr "Родительское сообщение не видимо при просмотре с ограничением."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "ðÁÒÏÌØ ÄÌÑ %s@%s: "
+msgstr "Пароль для %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "ðÏÌÎÏÅ ÉÍÑ: "
-
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "ðÅÒÅÄÁÔØ ÐÒÏÇÒÁÍÍÅ"
+msgstr "Полное имя: "
 
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "ðÅÒÅÄÁÔØ ÐÒÏÇÒÁÍÍÅ: "
+msgstr "Передать программе: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "ðÅÒÅÄÁÔØ ÐÒÏÇÒÁÍÍÅ: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "õÓÔÁÎÏ×ÉÔÅ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ hostname ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "Передать программе: "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "ïÔÌÏÖÉÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ?"
+msgstr "Отложить это сообщение?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "ïÔÌÏÖÅÎÎÙÅ ÓÏÏÂÝÅÎÉÑ"
+msgstr "Отложенные сообщения"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "ëÏÍÁÎÄÁ, ÐÒÅÄÛÅÓÔ×ÕÀÝÁÑ ÓÏÅÄÉÎÅÎÉÀ, ÚÁ×ÅÒÛÉÌÁÓØ Ó ÏÛÉÂËÏÊ."
+msgstr "Команда, предшествующая соединению, завершилась с ошибкой."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÅÒÅÓÙÌÁÅÍÏÇÏ ÓÏÏÂÝÅÎÉÑ..."
+msgstr "Подготовка пересылаемого сообщения..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "þÔÏÂÙ ÐÒÏÄÏÌÖÉÔØ, ÎÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ..."
-
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "îÁÚÁÄ"
+msgstr "Чтобы продолжить, нажмите любую клавишу..."
 
-#: recvattach.c:34
-msgid "Print"
-msgstr "îÁÐÅÞÁÔÁÔØ"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "îÁÐÅÞÁÔÁÔØ ×ÌÏÖÅÎÉÅ?"
+msgstr "Напечатать вложение?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "îÁÐÅÞÁÔÁÔØ ÓÏÏÂÝÅÎÉÅ?"
+msgstr "Напечатать сообщение?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "îÁÐÅÞÁÔÁÔØ ÏÔÍÅÞÅÎÎÙÅ ×ÌÏÖÅÎÉÑ?"
+msgstr "Напечатать отмеченные вложения?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "îÁÐÅÞÁÔÁÔØ ÏÔÍÅÞÅÎÎÙÅ ÓÏÏÂÝÅÎÉÑ?"
+msgstr "Напечатать отмеченные сообщения?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "÷ÙÞÉÓÔÉÔØ %d ÕÄÁÌÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ?"
+msgstr "Вычистить %d удаленное сообщение?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "÷ÙÞÉÓÔÉÔØ %d ÕÄÁÌÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ?"
+msgstr "Вычистить %d удаленных сообщений?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "úÁÐÒÏÓ"
+msgstr "Запрос"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "úÁÐÒÏÓ '%s'"
+msgstr "Запрос '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "ëÏÍÁÎÄÁ ÚÁÐÒÏÓÁ ÎÅ ÏÐÒÅÄÅÌÅÎÁ."
+msgstr "Команда запроса не определена."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "úÁÐÒÏÓ: "
-
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "÷ÙÈÏÄ"
+msgstr "Запрос: "
 
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "÷ÙÊÔÉ ÉÚ Mutt?"
+msgstr "Выйти из Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÐÒÏÓÔÒÁÎÓÔ× ÉÍÅÎ..."
+msgstr "Получение списка пространств имен..."
 
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "þÉÔÁÅÔÓÑ %s..."
+msgstr "Читается %s..."
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "þÉÔÁÅÔÓÑ %s... %d"
+msgstr "Читается %s... %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "þÉÔÁÅÔÓÑ %s... %d (%d%%)"
+msgstr "Читается %s... %d (%d%%)"
 
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "þÉÔÁÀÔÓÑ ÎÏ×ÙÅ ÓÏÏÂÝÅÎÉÑ (ÂÁÊÔÏ×: %d)..."
+msgstr "Читаются новые сообщения (байтов: %d)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "õÄÁÌÉÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË \"%s\"?"
+msgstr "Удалить почтовый ящик \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "ðÒÏÄÏÌÖÉÔØ ÏÔÌÏÖÅÎÎÏÅ ÓÏÏÂÝÅÎÉÅ?"
+msgstr "Продолжить отложенное сообщение?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "ðÅÒÅËÏÄÉÒÏ×ÁÎÉÅ ÄÏÐÕÓÔÉÍÏ ÔÏÌØËÏ ÄÌÑ ÔÅËÓÔÏ×ÙÈ ×ÌÏÖÅÎÉÊ."
+msgstr "Перекодирование допустимо только для текстовых вложений."
 
 #: imap/browse.c:300
 #, c-format
 msgid "Rename failed: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ: %s"
+msgstr "Не удалось переименовать: %s"
 
-#: browser.c:1020
+#: browser.c:991
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr ""
-"ðÅÒÅÉÍÅÎÏ×ÁÎÉÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÔÏÌØËÏ ÄÌÑ ÐÏÞÔÏ×ÙÈ ÑÝÉËÏ× ÎÁ IMAP-ÓÅÒ×ÅÒÁÈ"
+"Переименование поддерживается только для почтовых ящиков на IMAP-серверах"
 
 #: imap/browse.c:288
 #, c-format
 msgid "Rename mailbox %s to: "
-msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË %s ×: "
+msgstr "Переименовать почтовый ящик %s в: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ×: "
+msgstr "Переименовать в: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "ðÏ×ÔÏÒÎÏÅ ÏÔËÒÙÔÉÅ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ..."
+msgstr "Повторное открытие почтового ящика..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "ïÔ×ÅÔÉÔØ"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "ïÔ×ÅÞÁÔØ ÐÏ %s%s?"
+msgstr "Отвечать по %s%s?"
 
 #: commands.c:403
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"ïÂÒ.ÐÏÒ.:(d)ÄÁÔÁ/(f)ÏÔ/(r)ÐÏÌÕÞ/(s)ÔÅÍÁ/(o)ËÏÍÕ/(t)ÄÉÓË/(u)ÂÅÚ/(z)ÒÁÚÍ/(c)"
-"ËÏÎÔ/(p)ÓÐÁÍ?"
+"Обр.пор.:(d)дата/(f)от/(r)получ/(s)тема/(o)кому/(t)диск/(u)без/(z)разм/(c)"
+"конт/(p)спам?"
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË: "
+msgstr "Обратный поиск: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË: "
+msgstr "Обратный поиск: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "ïÂÒÁÔÎÙÊ ÐÏÒÑÄÏË ÐÏ (d)ÄÁÔÅ, (a)ÉÍÅÎÉ, (z)ÒÁÚÍÅÒÕ ÉÌÉ (n)ÏÔÓÕÔÓÔ×ÕÅÔ?"
+msgstr "Обратный порядок по (d)дате, (a)имени, (z)размеру или (n)отсутствует?"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "PGP (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, %s, (c)ÏÔËÁÚÁÔØÓÑ? "
+msgstr "PGP (e)шифр, (s)подпись, (a)подпись как, (b)оба, %s, (c)отказаться? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ. ïÞÉÓÔÉÔØ É ÐÒÏÄÏÌÖÉÔØ? "
+msgstr "S/MIME уже используется. Очистить и продолжить? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "ïÔÐÒÁ×ÉÔÅÌØ ÓÏÏÂÝÅÎÉÑ ÎÅ Ñ×ÌÑÅÔÓÑ ×ÌÁÄÅÌØÃÅÍ S/MIME-ÓÅÒÔÉÆÉËÁÔÁ."
+msgstr "Отправитель сообщения не является владельцем S/MIME-сертификата."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
-msgstr "S/MIME-ÓÅÒÔÉÆÉËÁÔÙ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ \"%s\"."
+msgstr "S/MIME-сертификаты, соответствующие \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "S/MIME-ÓÏÏÂÝÅÎÉÑ ÂÅÚ ÕËÁÚÁÎÉÑ ÔÉÐÁ ÓÏÄÅÒÖÉÍÏÇÏ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ."
+msgstr "S/MIME-сообщения без указания типа содержимого не поддерживаются."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME-ÐÏÄÐÉÓØ ÐÒÏ×ÅÒÉÔØ îå ÕÄÁÌÏÓØ."
+msgstr "S/MIME-подпиÑ\81Ñ\8c пÑ\80овеÑ\80иÑ\82Ñ\8c Ð\9dÐ\95 Ñ\83далоÑ\81Ñ\8c."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "S/MIME-ÐÏÄÐÉÓØ ÐÒÏ×ÅÒÅÎÁ."
+msgstr "S/MIME-подпиÑ\81Ñ\8c пÑ\80овеÑ\80ена."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "ïÛÉÂËÁ SASL-ÁÕÔÅÎÔÉÆÉËÁÃÉÉ."
+msgstr "Ошибка SASL-аутентификации."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "ïÔÐÅÞÁÔÏË ÐÁÌØÃÁ: %s"
+msgstr "Отпечаток пальца: %s"
 
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "SSL-ÓÏÅÄÉÎÅÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÏ; ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ %s (%s)"
-
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "óÏÈÒÁÎÉÔØ"
+msgstr "SSL-соединение установлено; алгоритм шифрования %s (%s)"
 
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "óÏÈÒÁÎÉÔØ ËÏÐÉÀ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ?"
+msgstr "Сохранить копию этого сообщения?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "óÏÈÒÁÎÉÔØ × ÆÁÊÌ: "
+msgstr "Сохранить в файл: "
 
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "óÏÈÒÁÎÉÔØ%s × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+msgstr "Сохранить%s в почтовый ящик"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "óÏÈÒÁÎÅÎÉÅ ÆÌÁÇÏ× ÓÏÓÔÏÑÎÉÑ ÓÏÏÂÝÅÎÉÊ... [%d ÉÚ %d]"
+msgstr "Сохранение флагов состояния сообщений... [%d из %d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "óÏÈÒÁÎÑÅÔÓÑ..."
+msgstr "Сохраняется..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "éÓËÁÔØ"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "ðÏÉÓË: "
+msgstr "Поиск: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "ðÏÉÓË ÄÏÛÅÌ ÄÏ ËÏÎÃÁ, ÎÅ ÎÁÊÄÑ ÎÉÞÅÇÏ ÐÏÄÈÏÄÑÝÅÇÏ"
+msgstr "Поиск дошел до конца, не найдя ничего подходящего"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "ðÏÉÓË ÄÏÛÅÌ ÄÏ ÎÁÞÁÌÁ, ÎÅ ÎÁÊÄÑ ÎÉÞÅÇÏ ÐÏÄÈÏÄÑÝÅÇÏ"
+msgstr "Поиск дошел до начала, не найдя ничего подходящего"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "ðÏÉÓË ÐÒÅÒ×ÁÎ."
+msgstr "Поиск прерван."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "÷ ÜÔÏÍ ÍÅÎÀ ÐÏÉÓË ÎÅ ÒÅÁÌÉÚÏ×ÁÎ."
+msgstr "В этом меню поиск не реализован."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "äÏÓÔÉÇÎÕÔÏ ÎÁÞÁÌÏ; ÐÒÏÄÏÌÖÁÅÍ ÐÏÉÓË Ó ËÏÎÃÁ."
+msgstr "Достигнуто начало; продолжаем поиск с конца."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "äÏÓÔÉÇÎÕÔ ËÏÎÅÃ; ÐÒÏÄÏÌÖÁÅÍ ÐÏÉÓË Ó ÎÁÞÁÌÁ."
+msgstr "Достигнут конец; продолжаем поиск с начала."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "ðÏÉÓË: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "÷ÙÂÒÁÔØ"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "÷ÙÂÒÁÔØ "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "÷ÙÂÒÁÔØ ÃÅÐÏÞËÕ remailer"
+msgstr "Поиск: "
 
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "÷ÙÂÉÒÁÅÔÓÑ %s..."
+msgstr "Выбирается %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "ïÔÐÒÁ×ÉÔØ"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "óÏÏÂÝÅÎÉÅ ÏÔÐÒÁ×ÌÑÅÔÓÑ × ÆÏÎÏ×ÏÍ ÒÅÖÉÍÅ."
+msgstr "Сообщение отправляется в фоновом режиме."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "óÏÏÂÝÅÎÉÅ ÏÔÐÒÁ×ÌÑÅÔÓÑ..."
+msgstr "Сообщение отправляется..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "óÅÒ×ÅÒ ÚÁËÒÙÌ ÓÏÅÄÉÎÅÎÉÅ!"
+msgstr "Сервер закрыл соединение!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "õÓÔÁÎÏ×ÉÔØ ÆÌÁÇ"
+msgstr "Установить флаг"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "ðÒÏÇÒÁÍÍÁ: "
+msgstr "Программа: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "ðÏÄÐÉÓÁÔØ"
+msgstr "Подписать"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "ðÏÄÐÉÓÁÔØ ËÁË: "
+msgstr "Подписать как: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "ðÏÄÐÉÓÁÔØ É ÚÁÛÉÆÒÏ×ÁÔØ"
+msgstr "Подписать и зашифровать"
 
 #: commands.c:406
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"ðÏÒÑÄÏË:(d)ÄÁÔÁ/(f)ÏÔ/(r)ÐÏÌÕÞ/(s)ÔÅÍÁ/(o)ËÏÍÕ/(t)ÄÉÓË/(u)ÂÅÚ/(z)ÒÁÚÍ/(c)"
-"ËÏÎÔ/(p)ÓÐÁÍ?"
+"Порядок:(d)дата/(f)от/(r)получ/(s)тема/(o)кому/(t)диск/(u)без/(z)разм/(c)"
+"конт/(p)спам?"
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "õÐÏÒÑÄÏÞÉÔØ ÐÏ (d)ÄÁÔÅ, (a)ÉÍÅÎÉ, (z)ÒÁÚÍÅÒÕ ÉÌÉ (n)ÏÔÓÕÔÓÔ×ÕÅÔ?"
+msgstr "Упорядочить по (d)дате, (a)имени, (z)размеру или (n)отсутствует?"
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "ðÏÞÔÏ×ÙÊ ÑÝÉË ÓÏÒÔÉÒÕÅÔÓÑ..."
+msgstr "Почтовый ящик сортируется..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "éÄÅÎÔÉÆÉËÁÔÏÒ ËÌÀÞÁ: 0x%s"
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
+msgstr "Идентификатор ключа: 0x%s"
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "ðÏÄËÌÀÞÅÎÉÅ [%s], ÍÁÓËÁ ÆÁÊÌÁ: %s"
+msgstr "Подключение [%s], маска файла: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "ðÏÄËÌÀÞÅÎÉÅ Ë %s..."
+msgstr "Подключение к %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "ðÒÏ×ÅÒËÁ SSL-ÓÅÒÔÉÆÉËÁÔÁ"
+msgstr "Проверка SSL-сертификата"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "ðÏÍÅÔÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ: "
+msgstr "Пометить сообщения по образцу: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "ðÏÍÅÔØÔÅ ÓÏÏÂÝÅÎÉÑ, ËÏÔÏÒÙÅ ×Ù ÈÏÔÉÔÅ ×ÌÏÖÉÔØ!"
+msgstr "Пометьте сообщения, которые вы хотите вложить!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "÷ÏÚÍÏÖÎÏÓÔØ ÐÏÍÅÔËÉ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ."
+msgstr "Возможность пометки не поддерживается."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "üÔÏ ÓÏÏÂÝÅÎÉÅ ÎÅ×ÉÄÉÍÏ."
+msgstr "Это сообщение невидимо."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL-ÐÒÏÔÏËÏÌ ÎÅÄÏÓÔÕÐÅÎ."
+msgstr "SSL-пÑ\80оÑ\82окол недоÑ\81Ñ\82Ñ\83пен."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "ôÅËÕÝÅÅ ×ÌÏÖÅÎÉÅ ÂÕÄÅÔ ÐÅÒÅËÏÄÉÒÏ×ÁÎÏ."
+msgstr "Текущее вложение будет перекодировано."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "ôÅËÕÝÅÅ ×ÌÏÖÅÎÉÅ ÎÅ ÂÕÄÅÔ ÐÅÒÅËÏÄÉÒÏ×ÁÎÏ."
+msgstr "Текущее вложение не будет перекодировано."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
-"îÕÍÅÒÁÃÉÑ ÓÏÏÂÝÅÎÉÊ ÉÚÍÅÎÉÌÁÓØ. ôÒÅÂÕÅÔÓÑ ÐÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "ãÅÐÏÞËÁ remailer ÕÖÅ ÐÕÓÔÁÑ."
+"Нумерация сообщений изменилась. Требуется повторно открыть почтовый ящик."
 
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "÷ÌÏÖÅÎÉÊ ÎÅÔ."
+msgstr "Вложений нет."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "óÏÏÂÝÅÎÉÊ ÎÅÔ."
+msgstr "Сообщений нет."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "äÁÊÄÖÅÓÔ ÎÅ ÓÏÄÅÒÖÉÔ ÎÉ ÏÄÎÏÊ ÞÁÓÔÉ!"
+msgstr "Дайджест не содержит ни одной части!"
 
-# "mutt ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ×ÅÒÓÉÀ ÐÒÏÔÏËÏÌÁ, ÉÓÐÏÌØÚÕÅÍÙÊ ÎÁ ÜÔÏÍ ÓÅÒ×ÅÒÅ"
+# "mutt не поддерживает версию протокола, используемый на этом сервере"
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr ""
-"üÔÏÔ IMAP-ÓÅÒ×ÅÒ ÉÓÐÏÌØÚÕÅÔ ÕÓÔÁÒÅ×ÛÉÊ ÐÒÏÔÏËÏÌ. Mutt ÎÅ ÓÍÏÖÅÔ ÒÁÂÏÔÁÔØ Ó "
-"ÎÉÍ."
+"Этот IMAP-сервер использует устаревший протокол. Mutt не сможет работать с "
+"ним."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "äÁÎÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÐÒÉÎÁÄÌÅÖÉÔ:"
+msgstr "Данный сертификат принадлежит:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "äÁÎÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÄÅÊÓÔ×ÉÔÅÌÅÎ"
+msgstr "Данный сертификат действителен"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "äÁÎÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÂÙÌ ×ÙÄÁÎ:"
+msgstr "Данный сертификат был выдан:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "üÔÏÔ ËÌÀÞ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ: ÐÒÏÓÒÏÞÅÎ, ÚÁÐÒÅÝÅÎ ÉÌÉ ÏÔÏÚ×ÁÎ."
+msgstr "Этот ключ не может быть использован: просрочен, запрещен или отозван."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "÷ ÄÉÓËÕÓÓÉÉ ÐÒÉÓÕÔÓÔ×ÕÀÔ ÎÅÐÒÏÞÉÔÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ."
+msgstr "В дискуссии присутствуют непрочитанные сообщения."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "çÒÕÐÐÉÒÏ×ËÁ ÐÏ ÄÉÓËÕÓÓÉÑÍ ÎÅ ×ËÌÀÞÅÎÁ."
+msgstr "Группировка по дискуссиям не включена."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "ôÁÊÍ-ÁÕÔ fcntl-ÂÌÏËÉÒÏ×ËÉ!"
+msgstr "Тайм-аут fcntl-блокировки!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "ôÁÊÍ-ÁÕÔ flock-ÂÌÏËÉÒÏ×ËÉ!"
+msgstr "Тайм-аут flock-блокировки!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "ðÅÒ×ÁÑ ÓÔÒÏËÁ ÓÏÏÂÝÅÎÉÑ ÕÖÅ ÎÁ ÜËÒÁÎÅ."
+msgstr "Первая строка сообщения уже на экране."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "ðÏÐÙÔËÁ ÉÚ×ÌÅÞØ PGP ËÌÀÞÉ...\n"
+msgstr "Попытка извлечь PGP ключи...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "ðÏÐÙÔËÁ ÉÚ×ÌÅÞØ S/MIME ÓÅÒÔÉÆÉËÁÔÙ...\n"
+msgstr "Попытка извлечь S/MIME сертификаты...\n"
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "ïÛÉÂËÁ ÐÒÉ ×ÚÁÉÍÏÄÅÊÓÔ×ÉÉ Ó %s (%s)"
+msgstr "Ошибка при взаимодействии с %s (%s)"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2841,141 +2653,124 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "ïÛÉÂËÁ SASL-ÁÕÔÅÎÔÉÆÉËÁÃÉÉ."
+msgstr "Ошибка SASL-аутентификации."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "îÅ ÕÄÁÌÏÓØ ×ÌÏÖÉÔØ %s!"
+msgstr "Не удалось вложить %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÌÏÖÅÎÉÅ!"
+msgstr "Не удалось создать вложение!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÚÁÇÏÌÏ×ËÏ× ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÜÔÉÍ IMAP-ÓÅÒ×ÅÒÏÍ."
+msgstr "Получение списка заголовков не поддерживается этим IMAP-сервером."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÓÅÒÔÉÆÉËÁÔ ÓÅÒ×ÅÒÁ"
+msgstr "Не удалось получить сертификат сервера"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÓÔÁ×ÉÔØ ÓÏÏÂÝÅÎÉÑ ÎÁ ÓÅÒ×ÅÒÅ."
+msgstr "Невозможно оставить сообщения на сервере."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ×ÌÏÖÉÔØ %s!"
+msgstr "Не удалось вложить %s!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "îÅ ÕÄÁÌÏÓØ ÚÁÂÌÏËÉÒÏ×ÁÔØ ÐÏÞÔÏ×ÙÊ ÑÝÉË!"
+msgstr "Не удалось заблокировать почтовый ящик!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
+msgstr "Не удалось открыть временный файл!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
+msgstr "Не удалось открыть временный файл!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ!"
+msgstr "Не удалось открыть временный файл!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÓÏÏÂÝÅÎÉÑ ÐÏ ÏÂÒÁÚÃÕ: "
+msgstr "Восстановить сообщения по образцу: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ"
+msgstr "Восстановить"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÚÎÁÞÅÎÉÅ ÐÏÌÑ Content-Type: %s"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "ïÔËÌÀÞÅÎÉÅ ÏÔ %s..."
+msgstr "Неизвестное значение поля Content-Type: %s"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "ïÔËÌÀÞÅÎÉÅ ÏÔ %s..."
+msgstr "Отключение от %s..."
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "ïÔËÌÀÞÅÎÉÅ ÏÔ %s..."
+msgstr "Отключение от %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "óÎÑÔØ ÐÏÍÅÔËÕ Ó ÓÏÏÂÝÅÎÉÊ ÐÏ ÏÂÒÁÚÃÕ: "
+msgstr "Снять пометку с сообщений по образцу: "
 
-# ÉÌÉ "ÎÁ ÓÅÒ×ÅÒ" ÕÂÒÁÔØ??
+# или "на сервер" убрать??
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "óÏÏÂÝÅÎÉÅ ÚÁÇÒÕÖÁÅÔÓÑ ÎÁ ÓÅÒ×ÅÒ..."
+msgstr "Сообщение загружается на сервер..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "éÓÐÏÌØÚÕÊÔÅ ËÏÍÁÎÄÕ 'toggle-write' ÄÌÑ ÒÁÚÒÅÛÅÎÉÑ ÚÁÐÉÓÉ!"
+msgstr "Используйте команду 'toggle-write' для разрешения записи!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "éÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞ \"%s\" ÄÌÑ %s?"
+msgstr "Использовать ключ \"%s\" для %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ %s: "
+msgstr "Имя пользователя для %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "îÅ×ÅÒÎÏÅ ÎÁÚ×ÁÎÉÅ ÍÅÓÑÃÁ: %s"
+msgstr "Неверное название месяца: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "îÅ×ÅÒÎÏÅ ÎÁÚ×ÁÎÉÅ ÍÅÓÑÃÁ: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Неверное название месяца: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "ðÒÏ×ÅÒÉÔØ PGP-ÐÏÄÐÉÓØ?"
+msgstr "Проверить PGP-подпись?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "ðÒÏ×ÅÒËÁ ÎÏÍÅÒÏ× ÓÏÏÂÝÅÎÉÊ..."
-
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "÷ÌÏÖÅÎÉÑ"
+msgstr "Проверка номеров сообщений..."
 
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "ðòåäõðòåöäåîéå: ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÐÅÒÅÚÁÐÉÓÁÔØ %s. ðÒÏÄÏÌÖÉÔØ?"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: вы собираетесь перезаписать %s. Продолжить?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2983,29 +2778,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "óÒÏË ÄÅÊÓÔ×ÉÑ ÓÅÒÔÉÆÉËÁÔÁ ÉÓÔÅË"
+msgstr "Срок действия сертификата истек"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "óÒÏË ÄÅÊÓÔ×ÉÑ ÓÅÒÔÉÆÉËÁÔÁ ÉÓÔÅË"
+msgstr "Срок действия сертификата истек"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "óÅÒÔÉÆÉËÁÔ ×ÓÅ ÅÝÅ ÎÅÄÅÊÓÔ×ÉÔÅÌÅÎ"
+msgstr "Сертификат все еще недействителен"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "óÅÒÔÉÆÉËÁÔ ×ÓÅ ÅÝÅ ÎÅÄÅÊÓÔ×ÉÔÅÌÅÎ"
+msgstr "Сертификат все еще недействителен"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3020,44 +2815,44 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "ðÏÐÙÔËÁ fcntl-ÂÌÏËÉÒÏ×ËÉ ÆÁÊÌÁ... %d"
+msgstr "Попытка fcntl-блокировки файла... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "ðÏÐÙÔËÁ flock-ÂÌÏËÉÒÏ×ËÉ ÆÁÊÌÁ... %d"
+msgstr "Попытка flock-блокировки файла... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "ïÖÉÄÁÅÔÓÑ ÏÔ×ÅÔ..."
+msgstr "Ожидается ответ..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: '%s' ÎÅ Ñ×ÌÑÅÔÓÑ ËÏÒÒÅËÔÎÙÍ IDN."
+msgstr "Предупреждение: '%s' не является корректным IDN."
 
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "óÒÏË ÄÅÊÓÔ×ÉÑ ÓÅÒÔÉÆÉËÁÔÁ ÉÓÔÅË"
+msgstr "Срок действия сертификата истек"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅËÏÒÒÅËÔÎÙÊ IDN '%s' × ÐÓÅ×ÄÏÎÉÍÅ '%s'.\n"
+msgstr "Предупреждение: некорректный IDN '%s' в псевдониме '%s'.\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÕÄÁÌÏÓØ ÓÏÈÒÁÎÉÔØ ÓÅÒÔÉÆÉËÁÔ"
+msgstr "Предупреждение: не удалось сохранить сертификат"
 
 #: crypt.cpkg:902
 #, fuzzy
 msgid "Warning: One of the keys has been revoked\n"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÞÁÓÔØ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ ÎÅ ÐÏÄÐÉÓÁÎÁ."
+msgstr "Предупреждение: часть этого сообщения не подписана."
 
 #: commands.c:141 commands.c:151
 msgid "Warning: Part of this message has not been signed."
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÞÁÓÔØ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ ÎÅ ÐÏÄÐÉÓÁÎÁ."
+msgstr "Предупреждение: часть этого сообщения не подписана."
 
 #: crypt.cpkg:910
 msgid "Warning: The key used to create the signature expired at: "
@@ -3067,471 +2862,629 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÌÏÖÅÎÉÅ"
+msgstr "Не удалось создать вложение"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "úÁÐÉÓØ ÎÅ ÕÄÁÌÁÓØ!  îÅÐÏÌÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË ÓÏÈÒÁÎÅÎ × %s"
+msgstr "Запись не удалась!  Неполный почтовый ящик сохранен в %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ!"
+msgstr "Ошибка записи!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "úÁÐÉÓÁÔØ ÓÏÏÂÝÅÎÉÅ × ÐÏÞÔÏ×ÙÊ ÑÝÉË"
+msgstr "Записать сообщение в почтовый ящик"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "ðÉÛÅÔÓÑ %s..."
+msgstr "Пишется %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "óÏÏÂÝÅÎÉÅ ÚÁÐÉÓÙ×ÁÅÔÓÑ × %s..."
+msgstr "Сообщение записывается в %s..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "úÁÐÉÓØ... %d (%d%%)"
+msgstr "Запись... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "ïÛÉÂËÁ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ: %s\n"
+msgstr "Ошибка в командной строке: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "ôÁËÏÊ ÐÓÅ×ÄÏÎÉÍ ÕÖÅ ÐÒÉÓÕÔÓÔ×ÕÅÔ!"
-
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "÷Ù ÕÖÅ ÐÏÍÅÔÉÌÉ ÐÅÒ×ÙÊ ÜÌÅÍÅÎÔ ÃÅÐÏÞËÉ."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "÷Ù ÕÖÅ ÐÏÍÅÔÉÌÉ ÐÏÓÌÅÄÎÉÊ ÜÌÅÍÅÎÔ ÃÅÐÏÞËÉ."
+msgstr "Такой псевдоним уже присутствует!"
 
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "÷Ù ÕÖÅ ÎÁ ÐÅÒ×ÏÊ ÚÁÐÉÓÉ."
+msgstr "Вы уже на первой записи."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "÷Ù ÕÖÅ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "üÔÏ ÐÅÒ×ÏÅ ÓÏÏÂÝÅÎÉÅ."
+msgstr "Это первое сообщение."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "÷Ù ÕÖÅ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ."
+msgstr "Вы уже на первой странице."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "üÔÏ ÐÅÒ×ÁÑ ÄÉÓËÕÓÓÉÑ"
+msgstr "Это первая дискуссия"
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "÷Ù ÕÖÅ ÎÁ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ."
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "÷Ù ÕÖÅ ÎÁ ÐÏÓÌÅÄÎÅÊ ÓÔÒÁÎÉÃÅ."
+msgstr "Вы уже на последней записи."
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "üÔÏ ÐÏÓÌÅÄÎÅÅ ÓÏÏÂÝÅÎÉÅ."
+msgstr "Это последнее сообщение."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "÷Ù ÕÖÅ ÎÁ ÐÏÓÌÅÄÎÅÊ ÓÔÒÁÎÉÃÅ."
+msgstr "Вы уже на последней странице."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "äÁÌØÎÅÊÛÁÑ ÐÒÏËÒÕÔËÁ ÎÅ×ÏÚÍÏÖÎÁ."
+msgstr "Дальнейшая прокрутка невозможна."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "äÁÌØÎÅÊÛÁÑ ÐÒÏËÒÕÔËÁ ÎÅ×ÏÚÍÏÖÎÁ."
+msgstr "Дальнейшая прокрутка невозможна."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "óÐÉÓÏË ÐÓÅ×ÄÏÎÉÍÏ× ÏÔÓÕÔÓÔ×ÕÅÔ!"
+msgstr "Список псевдонимов отсутствует!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÅÄÉÎÓÔ×ÅÎÎÏÅ ×ÌÏÖÅÎÉÅ."
+msgstr "Вы не можете удалить единственное вложение."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "÷Ù ÍÏÖÅÔÅ ÐÅÒÅÎÁÐÒÁ×ÌÑÔØ ÔÏÌØËÏ ÞÁÓÔÉ ÔÉÐÁ message/rfc822."
+msgstr "Вы можете перенаправлять только части типа message/rfc822."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] ðÒÉÎÑÔØ?"
+msgstr "[%s = %s] Принять?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- ÔÉÐ %s/%s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ "
+msgstr "[-- тип %s/%s не поддерживается "
 
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- ÷ÌÏÖÅÎÉÅ #%d"
+msgstr "[-- Вложение #%d"
 
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- á×ÔÏÐÒÏÓÍÏÔÒ ÓÔÁÎÄÁÒÔÎÏÇÏ ÐÏÔÏËÁ ÏÛÉÂÏË %s --]\n"
+msgstr "[-- Автопросмотр стандартного потока ошибок %s --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- á×ÔÏÐÒÏÓÍÏÔÒ; ÉÓÐÏÌØÚÕÅÔÓÑ %s --]\n"
+msgstr "[-- Автопросмотр; используется %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- îÁÞÁÌÏ PGP-ÓÏÏÂÝÅÎÉÑ --]\n"
+"[-- Начало PGP-сообщения --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- îÁÞÁÌÏ ÂÌÏËÁ ÏÔËÒÙÔÏÇÏ PGP-ËÌÀÞÁ --]\n"
+msgstr "[-- Начало блока открытого PGP-ключа --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- îÁÞÁÌÏ ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]\n"
+"[-- Начало сообщения, подписанного PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- îÅ ÕÄÁÌÏÓØ ×ÙÐÏÌÎÉÔØ %s. --]\n"
+msgstr "[-- Не удалось выполнить %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- ëÏÎÅà PGP-ÓÏÏÂÝÅÎÉÑ --]\n"
+msgstr "[-- Конец PGP-сообщения --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ëÏÎÅà ÂÌÏËÁ ÏÔËÒÙÔÏÇÏ PGP-ËÌÀÞÁ --]\n"
+msgstr "[-- Конец блока открытого PGP-ключа --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- ëÏÎÅà ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]\n"
+msgstr "[-- Конец сообщения, подписанного PGP --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
+msgstr "[-- Конец данных, зашифрованных в формате PGP/MIME --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
+msgstr "[-- Конец данных, зашифрованных в формате PGP/MIME --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
+"[-- Конец данных, зашифрованных в формате S/MIME --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- ëÏÎÅà ÄÁÎÎÙÈ, ÐÏÄÐÉÓÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
+"[-- Конец данных, подписанных в формате S/MIME --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- ëÏÎÅà ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]\n"
+"[-- Конец подписанных данных --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÐÏËÁÚÁÔØ ÎÉ ÏÄÎÕ ÉÚ ÞÁÓÔÅÊ Multipart/Alternative! "
+"[-- Ошибка: не удалось показать ни одну из частей Multipart/Alternative! "
 "--]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- ïÛÉÂËÁ: ÎÁÒÕÛÅÎÁ ÓÔÒÕËÔÕÒÁ multipart/signed-ÓÏÏÂÝÅÎÉÑ! --]\n"
+"[-- Ошибка: нарушена структура multipart/signed-сообщения! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- ïÛÉÂËÁ: ÎÅÉÚ×ÅÓÔÎÙÊ multipart/signed ÐÒÏÔÏËÏÌ %s! --]\n"
+"[-- Ошибка: неизвестный multipart/signed протокол %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ! --]\n"
+msgstr "[-- Ошибка: не удалось создать временный файл! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÎÁÊÔÉ ÎÁÞÁÌÏ PGP-ÓÏÏÂÝÅÎÉÑ! --]\n"
+"[-- Ошибка: не удалось найти начало PGP-сообщения! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- ïÛÉÂËÁ: ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ! --]\n"
+msgstr "[-- Ошибка: не удалось создать временный файл! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- ïÛÉÂËÁ: ÆÏÒÍÁÔ ÓÏÏÂÝÅÎÉÑ ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÓÔÁÎÄÁÒÔÕ PGP/MIME --]\n"
+"[-- Ошибка: формат сообщения не соответствует стандарту PGP/MIME --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- ïÛÉÂËÁ: ÔÉÐ message/external ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÅ ÐÁÒÁÍÅÔÒÁ access-type --]\n"
+"[-- Ошибка: тип message/external требует наличие параметра access-type --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
+"[-- Начало данных, зашифрованных в формате PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]\n"
+"[-- Начало данных, зашифрованных в формате PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
-msgstr "[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
+msgstr "[-- Начало данных, зашифрованных в формате S/MIME --]\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
-msgstr "[-- îÁÞÁÌÏ ÄÁÎÎÙÈ, ÐÏÄÐÉÓÁÎÎÙÈ × ÆÏÒÍÁÔÅ S/MIME --]\n"
+msgstr "[-- Начало данных, подписанных в формате S/MIME --]\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- îÁÞÁÌÏ ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]\n"
+"[-- Начало подписанных данных --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- üÔÏ ×ÌÏÖÅÎÉÅ ÔÉÐÁ %s/%s "
+msgstr "[-- Это вложение типа %s/%s "
 
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- üÔÏ ×ÌÏÖÅÎÉÅ ÔÉÐÁ %s/%s ÎÅ ÂÙÌÏ ×ËÌÀÞÅÎÏ --]\n"
+msgstr "[-- Это вложение типа %s/%s не было включено --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- ôÉÐ: %s/%s, ËÏÄÉÒÏ×ËÁ: %s, ÒÁÚÍÅÒ: %s --]\n"
+msgstr "[-- Тип: %s/%s, кодировка: %s, размер: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÎÁÊÄÅÎÏ ÎÉ ÏÄÎÏÊ ÐÏÄÐÉÓÉ. --]\n"
+"[-- Предупреждение: не найдено ни одной подписи. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ ÕÄÁÌÏÓØ ÐÒÏ×ÅÒÉÔØ %s/%s ÐÏÄÐÉÓÉ. --]\n"
+"[-- Предупреждение: не удалось проверить %s/%s подписи. --]\n"
 "\n"
 
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- × ÓÏÏÂÝÅÎÉÅ, É ÚÎÁÞÅÎÉÅ access-type %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ --]\n"
+msgstr "[-- в сообщение, и значение access-type %s не поддерживается --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- × ÓÏÏÂÝÅÎÉÅ, É ÂÏÌÅÅ ÎÅ ÓÏÄÅÒÖÉÔÓÑ × ÕËÁÚÁÎÎÏÍ --]\n"
-"[-- ×ÎÅÛÎÅÍ ÉÓÔÏÞÎÉËÅ. --]\n"
+"[-- в сообщение, и более не содержится в указанном --]\n"
+"[-- внешнем источнике. --]\n"
 
 #: handler.c:1201
 #, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- ÉÍÑ: %s --]\n"
+msgstr "[-- имя: %s --]\n"
 
 #: handler.c:1197
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "ðÒÏÓÒÏÞÅÎÎÙÊ "
+msgstr "Просроченный "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "îÅÐÒÁ×ÉÌØÎÙÊ "
+msgstr "Неправильный "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
-msgstr "ïÔÏÚ×ÁÎÎÙÊ   "
+msgstr "Отозванный   "
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[ÎÅÄÏÐÕÓÔÉÍÁÑ ÄÁÔÁ]"
+msgstr "[недопустимая дата]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[ÏÛÉÂËÁ ×ÙÞÉÓÌÅÎÉÊ]"
+msgstr "[ошибка вычислений]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "ÐÓÅ×ÄÏÎÉÍ: ÏÔÓÕÔÓÔ×ÕÅÔ ÁÄÒÅÓ"
+msgstr "псевдоним: отсутствует адрес"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Помеченные сообщения отсутствуют."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Помеченные сообщения отсутствуют."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Сохранить копию этого сообщения?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
 
-#: init.c:654
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "ÉÚÍÅÎÉÔØ ÏÐÉÓÁÎÉÅ ×ÌÏÖÅÎÉÑ"
+msgstr "изменить описание вложения"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "ÉÚÍÅÎÉÔØ ÏÐÉÓÁÎÉÅ ×ÌÏÖÅÎÉÑ"
+msgstr "изменить описание вложения"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
+msgstr "bind: слишком много аргументов"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Ошибка просмотра каталога."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Нет почтовых ящиков с новой почтой."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: ÓÌÉÛËÏÍ ÍÁÌÏ ÁÒÇÕÍÅÎÔÏ×"
+msgstr "color: слишком мало аргументов"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Нет новых сообщений"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
-msgstr "ÐÅÒÅËÏÄÉÒÏ×ÁÔØ"
+msgstr "перекодировать"
+
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Записать сообщение в почтовый ящик"
 
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "ÎÅ ÕÄÁÌÏÓØ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË: %s"
+msgstr "не удалось создать временный почтовый ящик: %s"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "ÎÅ ÕÄÁÌÏÓØ ÕÓÅÞØ ×ÒÅÍÅÎÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË: %s"
+msgstr "не удалось усечь временный почтовый ящик: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ ×Ï ×ÒÅÍÅÎÎÙÊ ÐÏÞÔÏ×ÙÊ ÑÝÉË: %s"
+msgstr "ошибка записи во временный почтовый ящик: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Не определено ни одного почтового ящика со входящими письмами."
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "dazn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "Ã×ÅÔÁ ÐÏ ÕÍÏÌÞÁÎÉÀ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ"
+msgstr "цвета по умолчанию не поддерживаются"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Удалить сообщения с сервера?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Восстановить сообщения по образцу: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Восстановить сообщения по образцу: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzcp"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Редактировать пересылаемое сообщение?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3540,36 +3493,123 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "ëÏÐÉÒÕÅÔÓÑ × %s..."
+msgstr "Копируется в %s..."
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "÷ÙÂÉÒÁÅÔÓÑ %s..."
+msgstr "Выбирается %s..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Текущее вложение не будет перекодировано."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "изменить описание вложения"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Ошибка записи сообщения"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Получение заголовков сообщений... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Редактировать пересылаемое сообщение?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Сохранить копию этого сообщения?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "ÐÕÓÔÏÊ ÏÂÒÁÚÅÃ"
+msgstr "пÑ\83Ñ\81Ñ\82ой обÑ\80азеÑ\86"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "úÁÛÉÆÒÏ×ÁÔØ"
+msgstr "Зашифровать"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Сохранить копию этого сообщения?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3584,36 +3624,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ"
+msgstr "ошибка в выражении"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3623,26 +3663,82 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "ÏÛÉÂËÁ × ÏÂÒÁÚÃÅ: %s"
+msgstr "ошибка в образце: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "ÏÛÉÂËÁ: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÅÒÁÃÉÑ %d (ÓÏÏÂÝÉÔÅ Ï ÜÔÏÊ ÏÛÉÂËÅ)."
+msgstr "ошибка: неизвестная операция %d (сообщите об этой ошибке)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "esabifc"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "esabifc"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
-msgstr "exec: ÎÅÔ ÁÒÇÕÍÅÎÔÏ×"
+msgstr "exec: нет аргументов"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Отвечать по %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Переслать как вложения?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Проверка наличия новых сообщений..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Это первое сообщение."
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -3664,133 +3760,623 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Вы уже на последней странице."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Нет почтовых ящиков с новой почтой."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Ошибка открытия почтового ящика"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Нет почтовых ящиков с новой почтой."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "ÂÙÌÏ ÕÄÁÌÅÎÏ --]\n"
+msgstr "было удалено --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbox: ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄÙ EXPUNGE"
+msgstr "imap_sync_mailbox: ошибка выполнения команды EXPUNGE"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÐÏÌÅ × ÚÁÇÏÌÏ×ËÅ"
+msgstr "недопустимое поле в заголовке"
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
 #, fuzzy
-msgid "keys matching"
-msgstr "PGP-ËÌÀÞÉ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ <%s>."
+msgid "jump to an index number"
+msgstr "Неверный индекс."
 
-#: keymap.c:789
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Перейти к сообщению: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Перейти к сообщению: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "В дискуссии присутствуют непрочитанные сообщения."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Это первая дискуссия"
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Нет непрочитанных сообщений"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Нет непрочитанных сообщений"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Сохранить копию этого сообщения?"
+
+#: crypt.cpkg:3108
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP-ключи, соответствующие <%s>."
+
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Перенаправить сообщения: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Нет почтовых ящиков с новой почтой."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: ÐÕÓÔÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÁ×ÉÛ"
+msgstr "macro: пÑ\83Ñ\81Ñ\82аÑ\8f поÑ\81ледоваÑ\82елÑ\8cноÑ\81Ñ\82Ñ\8c клавиÑ\88"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
+msgstr "macro: слишком много аргументов"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "ÄÌÑ ÔÉÐÁ %s ÎÅ ÎÁÊÄÅÎÏ ÚÁÐÉÓÉ × ÆÁÊÌÅ mailcap"
+msgstr "для типа %s не найдено записи в файле mailcap"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): ÎÅ ÕÄÁÌÏÓØ ÕÓÔÁÎÏ×ÉÔØ ×ÒÅÍÑ ÆÁÊÌÁ"
+msgstr "maildir_commit_message(): не удалось установить время файла"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "óÏÏÂÝÅÎÉÑ ÎÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÙ."
+msgstr "Сообщения не перенаправлены."
 
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "ÐÒÏÐÕÝÅÎÁ ÓËÏÂËÁ: %s"
+msgstr "пÑ\80опÑ\83Ñ\89ена Ñ\81кобка: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "ÐÒÏÐÕÝÅÎ ÐÁÒÁÍÅÔÒ"
+msgstr "пÑ\80опÑ\83Ñ\89ен паÑ\80амеÑ\82Ñ\80"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: ÓÌÉÛËÏÍ ÍÁÌÏ ÁÒÇÕÍÅÎÔÏ×"
+msgstr "mono: слишком мало аргументов"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Вы уже на первой записи."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Это первое сообщение."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Вы уже на последней записи."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Это последнее сообщение."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Вы уже на последней записи."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Вы уже на последней странице."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Нет восстановленных сообщений."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Вы уже на первой записи."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Вы уже на первой странице."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Нет восстановленных сообщений."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Вы уже на первой странице."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "óÏÓÔÁ×ÎÏÅ ÓÏÏÂÝÅÎÉÅ ÔÒÅÂÕÅÔ ÎÁÌÉÞÉÑ ÐÁÒÁÍÅÔÒÁ boundary!"
+msgstr "Составное сообщение требует наличия параметра boundary!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
-msgstr "ÎÅÔ"
+msgstr "нет"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(ÎÅÔ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ)"
+msgstr "(нет почтового ящика)"
 
 #: commands.c:788
 msgid "not converting"
-msgstr "ÎÅ ÐÅÒÅËÏÄÉÒÏ×ÁÔØ"
+msgstr "не перекодировать"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÁ×ÉÛ ÐÕÓÔÁ"
+msgstr "последовательность клавиш пуста"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "oac"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Открыть почтовый ящик только для чтения"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Открыть почтовый ящик только для чтения"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Повторное открытие почтового ящика..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Перенаправить сообщение %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "ÐÒÅÆÉËÓ ÎÅÄÏÐÕÓÔÉÍ ÐÒÉ ÓÂÒÏÓÅ ÚÎÁÞÅÎÉÊ"
+msgstr "пÑ\80еÑ\84икÑ\81 недопÑ\83Ñ\81Ñ\82им пÑ\80и Ñ\81бÑ\80оÑ\81е знаÑ\87ений"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Вы уже на первой записи."
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
+msgstr "push: слишком много аргументов"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Продолжить отложенное сообщение?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "В дискуссии присутствуют непрочитанные сообщения."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Редактирование сообщений не поддерживается POP-сервером."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: не удалось вложить файл"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Перейти к сообщению: "
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Удалить сообщения с сервера?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "ro"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "roa"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Сохранить%s в почтовый ящик"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Сохранить%s в почтовый ящик"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Редактирование сообщений не поддерживается POP-сервером."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "ошибка в выражении"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Поиск: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Сообщение отправить не удалось."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Переслать как вложения?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Ограничиться сообщениями, соответствующими: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Нет больше цитируемого текста."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Напечатать сообщение?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "В этом почтовом ящике/файле нет сообщений."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source: ÏÛÉÂËÁ × %s"
+msgstr "source: ошибка в %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
-msgstr "source: ÏÛÉÂËÉ × %s"
+msgstr "source: ошибки в %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: ÞÔÅÎÉÅ ÐÒÅÒ×ÁÎÏ ÉÚ-ÚÁ ÂÏÌØÛÏÇÏ ËÏÌÉÞÅÓÔ×Á ÏÛÉÂÏË × %s"
+msgstr "source: чтение прервано из-за большого количества ошибок в %s"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Нет файлов, удовлетворяющих данной маске"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "sync: ÐÏÞÔÏ×ÙÊ ÑÝÉË ÉÚÍÅÎÅÎ, ÎÏ ÉÚÍÅÎÅÎÎÙÅ ÓÏÏÂÝÅÎÉÑ ÏÔÓÕÔÓÔ×ÕÀÔ!"
+msgstr "sync: почтовый ящик изменен, но измененные сообщения отсутствуют!"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Снять пометку с сообщений по образцу: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Это первая дискуссия"
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3802,41 +4388,130 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Нет больше цитируемого текста."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Перекодирование допустимо только для текстовых вложений."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Нет образца поиска."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Нет непрочитанных сообщений"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "ÓÌÉÛËÏÍ ÍÁÌÏ ÁÒÇÕÍÅÎÔÏ×"
+msgstr "слишком мало аргументов"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×"
+msgstr "слишком много аргументов"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "ÉÚÍÅÎÉÔØ ÏÐÉÓÁÎÉÅ ×ÌÏÖÅÎÉÑ"
+msgstr "изменить описание вложения"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Восстановить сообщения по образцу: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Восстановить сообщения по образцу: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Восстановить сообщения по образцу: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s ÉÚ ËÏÍÁÎÄÙ %s."
+msgstr "unhook: Невозможно удалить %s из команды %s."
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ unhook * ÉÚ ËÏÍÁÎÄÙ hook."
+msgstr "unhook: Невозможно выполнить unhook * из команды hook."
 
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÓÏÂÙÔÉÑ: %s"
+msgstr "unhook: неизвестный тип события: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
+msgstr "неизвестная ошибка"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Снять пометку с сообщений по образцу: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "изменить описание вложения"
 
 #: main.c:82
 msgid ""
@@ -3849,16 +4524,50 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "ÚÎÁÞÅÎÉÅ ÎÅÄÏÐÕÓÔÉÍÏ ÐÒÉ ÓÂÒÏÓÅ ÚÎÁÞÅÎÉÊ"
+msgstr "значение недопустимо при сбросе значений"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Вложение сохранено."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Новый файл: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Записать сообщение в почтовый ящик"
 
-#: lib-ui/curs_lib.c:155
+#: lib-ui/curs_lib.c:118
 msgid "yes"
-msgstr "ÄÁ"
+msgstr "да"
 
 #: muttlib.c:227
 msgid "yna"
 msgstr "yna"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/sk.po b/po/sk.po
index c30d5f0..2ee0f3d 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,42 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.95.6i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 1999-07-29 00:00+0100\n"
 "Last-Translator: Miroslav Vasko <vasko@ies.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"V¹eobecné väzby:\n"
+"Všeobecné väzby:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"Neviazané funkcie:\n"
+"Neviazané funkcie:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Koniec dát s podpisom PGP/MIME --]\n"
+"[-- Koniec dát s podpisom PGP/MIME --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -67,46 +67,46 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"pou¾itie: mutt [ -nRzZ ] [ -e <prík> ] [ -F <súb> ] [ -m <typ> ] [ -f "
-"<súb> ]\n"
-"       mutt [ -nx ] [ -e <prík> ] [ -a <súb> ] [ -F <súb> ] [ -H <súb> ] [ -"
-"i <súb> ] [ -s <predm> ] [ -b <adr> ] [ -c <adr> ] <adr> [ ... ]\n"
-"       mutt [ -n ] [ -e <prík> ] [ -F <súb> ] -p\n"
+"použitie: mutt [ -nRzZ ] [ -e <prík> ] [ -F <súb> ] [ -m <typ> ] [ -f "
+"<súb> ]\n"
+"       mutt [ -nx ] [ -e <prík> ] [ -a <súb> ] [ -F <súb> ] [ -H <súb> ] [ -"
+"i <súb> ] [ -s <predm> ] [ -b <adr> ] [ -c <adr> ] <adr> [ ... ]\n"
+"       mutt [ -n ] [ -e <prík> ] [ -F <súb> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
-"prepínaèe:\n"
-"  -a <súbor>\tpripoji» súbor do správy\n"
-"  -b <adresa>\tuvies» adresy pre slepé kópie (BCC)\n"
-"  -c <adresa>\tuvies» adresy pre kópie (CC)\n"
-"  -e <príkaz>\tuvies» príkaz, ktorý sa vykoná po inicializácii\n"
-"  -f <súbor>\tuvies», ktorá schránka sa bude èíta»\n"
-"  -F <súbor>\tuvies» alternatívny súbor muttrc\n"
-"  -H <súbor>\tuvies» súbor s návrhom, z ktorého sa preèíta hlavièka\n"
-"  -i <súbor>\tuvies» súbor, ktorý má Mutt vlo¾i» do odpovede\n"
-"  -m <typ>\tuvies» ¹tandardný typ schránky\n"
-"  -n\t\tspôsobuje, ¾e Mutt neèíta systémový súbor Muttrc\n"
-"  -p\t\tvyvola» a odlo¾enú správu\n"
-"  -R\t\totvori» schránku len na èítanie\n"
-"  -s <predm>\tuvies» predmet (musí by» v úvodzovkách, ak obsahuje medzery)\n"
-"  -v\t\tzobrazi» verziu a definície z èasu kompilácie\n"
-"  -x\t\tsimulova» mód posielania typický pre mailx\n"
-"  -y\t\tvybra» schránku uvedenú vo Va¹om zozname 'mailbox'\n"
-"  -z\t\tukonèi» okam¾ite, ak v schránke nie sú ¾iadne správy\n"
-"  -Z\t\totvori» prvú zlo¾ku s novými správami, okam¾ite skonèi», ak ¾iadne "
-"nie sú\n"
-"  -h\t\ttáto pomoc"
-
-#: compose.c:152 compose.c:156
+"prepínače:\n"
+"  -a <súbor>\tpripojiť súbor do správy\n"
+"  -b <adresa>\tuviesť adresy pre slepé kópie (BCC)\n"
+"  -c <adresa>\tuviesť adresy pre kópie (CC)\n"
+"  -e <príkaz>\tuviesť príkaz, ktorý sa vykoná po inicializácii\n"
+"  -f <súbor>\tuviesť, ktorá schránka sa bude čítať\n"
+"  -F <súbor>\tuviesť alternatívny súbor muttrc\n"
+"  -H <súbor>\tuviesť súbor s návrhom, z ktorého sa prečíta hlavička\n"
+"  -i <súbor>\tuviesť súbor, ktorý má Mutt vložiť do odpovede\n"
+"  -m <typ>\tuviesť štandardný typ schránky\n"
+"  -n\t\tspôsobuje, že Mutt nečíta systémový súbor Muttrc\n"
+"  -p\t\tvyvolať a odloženú správu\n"
+"  -R\t\totvoriť schránku len na čítanie\n"
+"  -s <predm>\tuviesť predmet (musí byť v úvodzovkách, ak obsahuje medzery)\n"
+"  -v\t\tzobraziť verziu a definície z času kompilácie\n"
+"  -x\t\tsimulovať mód posielania typický pre mailx\n"
+"  -y\t\tvybrať schránku uvedenú vo Vašom zozname 'mailbox'\n"
+"  -z\t\tukončiť okamžite, ak v schránke nie sú žiadne správy\n"
+"  -Z\t\totvoriÅ¥ prvú zložku s novými správami, okamžite skonÄ\8diÅ¥, ak žiadne "
+"nie sú\n"
+"  -h\t\ttáto pomoc"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " podpí¹ ako: "
+msgstr " podpíš ako: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr ""
@@ -149,92 +149,92 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " ('?' pre zoznam): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
-msgstr "(pokraèova»)\n"
+msgstr "(pokračovať)\n"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Stlaète '%s' na prepnutie zápisu"
+msgstr " Stlačte '%s' na prepnutie zápisu"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " v tomto obmedzenom zobrazení"
+msgstr " v tomto obmedzenom zobrazení"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " oznaèené"
+msgstr " označené"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: neplatný príkaz"
+msgstr "%c: neplatný príkaz"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: nepodporovaný v tomto móde"
+msgstr "%c: nepodporovaný v tomto móde"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d ostalo, %d vymazaných."
+msgstr "%d ostalo, %d vymazaných."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d ostalo, %d presunutých, %d vymazaných."
+msgstr "%d ostalo, %d presunutých, %d vymazaných."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, fuzzy, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Chcete to naozaj pou¾i»?"
+msgstr "%s Chcete to naozaj použiť?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] bolo zmenené. Aktualizova» kódovanie?"
+msgstr "%s [#%d] bolo zmenené. Aktualizovať kódovanie?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] u¾ neexistuje!"
+msgstr "%s [#%d] už neexistuje!"
 
 #: pop.c:1323
 #, fuzzy, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [preèítaných správ: %d]"
+msgstr "%s [prečítaných správ: %d]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr ""
@@ -249,40 +249,40 @@ msgstr ""
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr ""
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s nie je adresár."
+msgstr "%s nie je adresár."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s nie je schránka!"
+msgstr "%s nie je schránka!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s nie je schránka"
+msgstr "%s nie je schránka"
 
 #: sendlib.c:748
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
-msgstr "%s nie je schránka"
+msgstr "%s nie je schránka"
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s u¾ viac neexistuje!"
+msgstr "%s už viac neexistuje!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -296,143 +296,143 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
-msgstr "%s: neznáma hodnota"
+msgstr "%s: neznáma hodnota"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: terminál túto farbu nepodporuje"
+msgstr "%s: terminál túto farbu nepodporuje"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: príkaz je platný iba pre indexovaný objekt"
+msgstr "%s: príkaz je platný iba pre indexovaný objekt"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: vlastnos» nenájdená"
+msgstr "%s: vlastnosť nenájdená"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: nenájdená farba"
+msgstr "%s: nenájdená farba"
 
-#: keymap.c:847
+#: keymap.c:839
 #, fuzzy, c-format
 msgid "%s: no such function"
-msgstr "%s: v tabuµke neexistuje taká funkcia"
+msgstr "%s: v tabuľke neexistuje taká funkcia"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: v tabuµke neexistuje taká funkcia"
+msgstr "%s: v tabuľke neexistuje taká funkcia"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: také menu neexistuje"
+msgstr "%s: také menu neexistuje"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s: nenájdený objekt"
+msgstr "%s: nenájdený objekt"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: príli¹ málo parametrov"
+msgstr "%s: príliš málo parametrov"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: súbor nemo¾no pripoji»"
+msgstr "%s: súbor nemožno pripojiť"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: neschopný pripoji» súbor.\n"
+msgstr "%s: neschopný pripojiť súbor.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: neznámy príkaz"
+msgstr "%s: neznámy príkaz"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: neznáma hodnota"
+msgstr "%s: neznáma hodnota"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: neznáma premenná"
+msgstr "%s: neznáma premenná"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
 msgstr ""
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr ""
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(potrebujem 'view-attachments' priradené na klávesu!)"
+msgstr "(potrebujem 'view-attachments' priradené na klávesu!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(¾iadna schránka)"
+msgstr "(žiadna schránka)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(veµkos» %s bytov) "
+msgstr "(veľkosť %s bytov) "
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(pou¾ite '%s' na prezeranie tejto èasti)"
+msgstr "(použite '%s' na prezeranie tejto časti)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 #, fuzzy
 msgid "-- Attachments"
-msgstr "Prílohy"
+msgstr "Prílohy"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<NEZNÁMY>"
+msgstr "<NEZNÁMY>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<¹td>"
+msgstr "<štd>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -446,107 +446,98 @@ msgstr ""
 msgid "APOP authentication failed."
 msgstr ""
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Preru¹i»"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Zru¹i» nezmenenú správu?"
+msgstr "Zrušiť nezmenenú správu?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Nezmenená správa bola zru¹ená."
+msgstr "Nezmenená správa bola zrušená."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adresa: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "Pridal som zástupcu."
+msgstr "Pridal som zástupcu."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Zástupca ako: "
+msgstr "Zástupca ako: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "Zástupci"
+msgstr "Zástupci"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 msgid "All matching keys are marked expired/revoked."
 msgstr ""
 
-#: remailer.c:431
-#, fuzzy
-msgid "Append"
-msgstr "Posla»"
-
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Prida» správy do %s?"
+msgstr "Pridať správy do %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Parameter musí by» èíslo správy."
+msgstr "Parameter musí byť číslo správy."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "Pripojené dáta boli ulo¾ené."
+msgstr "Pripojené dáta boli uložené."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "Pripoj súbor"
+msgstr "Pripoj súbor"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr ""
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "Príloha bola prefiltrovaná."
+msgstr "Príloha bola prefiltrovaná."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "Pripojené dáta boli ulo¾ené."
+msgstr "Pripojené dáta boli uložené."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "Prílohy"
+msgstr "Prílohy"
 
 #: imap/auth.c:83
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
-msgstr "Vyberám %s..."
+msgstr "Vyberám %s..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
@@ -559,7 +550,7 @@ msgstr ""
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "Vyberám %s..."
+msgstr "Vyberám %s..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -570,12 +561,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -588,31 +579,31 @@ msgstr ""
 #: imap/imap.c:1342
 #, fuzzy
 msgid "Bad mailbox name"
-msgstr "Otvor schránku"
+msgstr "Otvor schránku"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "Spodok správy je zobrazený."
+msgstr "Spodok správy je zobrazený."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Presmerova» správu do %s"
+msgstr "Presmerovať správu do %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Presmerova» správu do: "
+msgstr "Presmerovať správu do: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Presmerova» správy do %s"
+msgstr "Presmerovať správy do %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Presmerova» oznaèené správy do: "
+msgstr "Presmerovať označené správy do: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -628,38 +619,38 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, fuzzy, c-format
 msgid "Can't append to folder: %s"
-msgstr "Nemo¾no vytvori» súbor %s"
+msgstr "Nemožno vytvoriť súbor %s"
 
-#: browser.c:692
+#: browser.c:671
 #, fuzzy
 msgid "Can't attach a directory!"
-msgstr "Nemo¾no prezera» adresár"
+msgstr "Nemožno prezerať adresár"
 
-#: main.c:498
+#: main.c:474
 #, fuzzy, c-format
 msgid "Can't create %s: %s."
-msgstr "Nemo¾no vytvori» súbor %s"
+msgstr "Nemožno vytvoriť súbor %s"
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "Nemo¾no vytvori» súbor %s"
+msgstr "Nemožno vytvoriť súbor %s"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Nemo¾no vytvori» filter"
+msgstr "Nemožno vytvoriť filter"
 
 #: commands.c:290 commands.c:317 commands.c:334
 #, fuzzy
 msgid "Can't create filter process"
-msgstr "Nemo¾no vytvori» filter"
+msgstr "Nemožno vytvoriť filter"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Nemo¾no vytvori» doèasný súbor"
+msgstr "Nemožno vytvoriť dočasný súbor"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
@@ -669,25 +660,25 @@ msgstr ""
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
 
-#: recvattach.c:856
+#: recvattach.c:846
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
-msgstr "pou¾i» ïaµ¹iu funkciu na oznaèené správy"
+msgstr "použiť ďaľšiu funkciu na označené správy"
 
-#: recvattach.c:977
+#: recvattach.c:965
 #, fuzzy
 msgid "Can't delete attachment from POP server."
-msgstr "vybra» po¹tu z POP serveru"
+msgstr "vybrať poštu z POP serveru"
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "vybra» po¹tu z POP serveru"
+msgstr "vybrať poštu z POP serveru"
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Nemo¾no zisti» stav: %s.\n"
+msgstr "Nemožno zistiť stav: %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -696,138 +687,130 @@ msgstr ""
 #: recvcmd.c:724
 #, fuzzy
 msgid "Can't find any tagged messages."
-msgstr "pou¾i» ïaµ¹iu funkciu na oznaèené správy"
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr ""
+msgstr "použiť ďaľšiu funkciu na označené správy"
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Nena¹iel som ¹ablónu názvu, pokraèova»?"
+msgstr "Nenašiel som šablónu názvu, pokračovať?"
 
 #: editmsg.c:115
 #, fuzzy, c-format
 msgid "Can't open message file: %s"
-msgstr "Nemo¾no vytvori» súbor %s"
+msgstr "Nemožno vytvoriť súbor %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Nemo¾no vytvori» súbor %s"
+msgstr "Nemožno vytvoriť súbor %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Zatváram spojenie s IMAP serverom..."
+msgstr "Zatváram spojenie s IMAP serverom..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "Nemo¾no zisti» stav: %s"
+msgstr "Nemožno zistiť stav: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "Nemo¾no vytvori» súbor %s"
+msgstr "Nemožno vytvoriť súbor %s"
 
 #: muttlib.c:310
 #, fuzzy
 msgid "Can't save message to POP mailbox."
-msgstr "Zapísa» správu do schránky"
+msgstr "Zapísať správu do schránky"
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Vymazávam správy zo serveru..."
+msgstr "Vymazávam správy zo serveru..."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
-msgstr "Nemo¾no zisti» stav: %s"
+msgstr "Nemožno zistiť stav: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Nemo¾no prezera» adresár"
+msgstr "Nemožno prezerať adresár"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "Nemo¾no vytvori» súbor %s"
+msgstr "Nemožno vytvoriť súbor %s"
 
 #: pop.c:888
 #, fuzzy
 msgid "Can't write header to temporary file!"
-msgstr "Nemo¾no vytvori» doèasný súbor"
+msgstr "Nemožno vytvoriť dočasný súbor"
 
 #: lib-mx/mbox.c:864
 #, fuzzy
 msgid "Can't write message"
-msgstr "upravi» správu"
+msgstr "upraviť správu"
 
 #: pop.c:1420
 #, fuzzy
 msgid "Can't write message to temporary file!"
-msgstr "Nemo¾no vytvori» doèasný súbor"
+msgstr "Nemožno vytvoriť dočasný súbor"
 
 #: commands.c:71
 #, fuzzy
 msgid "Cannot create display filter"
-msgstr "Nemo¾no vytvori» filter."
+msgstr "Nemožno vytvoriť filter."
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Nemo¾no vytvori» filter."
+msgstr "Nemožno vytvoriť filter."
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Nemo¾no prepnú» zápis na schránke urèenej iba na èítanie!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Nemožno prepnúť zápis na schránke určenej iba na čítanie!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "Zachytené %s... Konèím.\n"
+msgstr "Zachytené %s... Končím.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 msgid "Certificate is not X.509"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Zmeny v zlo¾ke budú zapísané, keï ho opustíte."
+msgstr "Zmeny v zložke budú zapísané, keď ho opustíte."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Zmeny v zlo¾ke nebudú zapísané."
+msgstr "Zmeny v zložke nebudú zapísané."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -835,151 +818,143 @@ msgstr ""
 #: commands.c:786
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Spájam sa s %s..."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Zmena adresára"
+msgstr "Spájam sa s %s..."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "Zmeò adresár na: "
+msgstr "Zmeň adresár na: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "Odsúvam správu ..."
-
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Skontrolova» kµúè  "
+msgstr "Odsúvam správu ..."
 
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 #, fuzzy
 msgid "Checking for new messages..."
-msgstr "Odsúvam správu ..."
+msgstr "Odsúvam správu ..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "Odsúvam správu ..."
+msgstr "Odsúvam správu ..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "Vyèisti»"
+msgstr "Vyčistiť"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Vymaza» príznak"
+msgstr "Vymazať príznak"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, fuzzy, c-format
 msgid "Closing connection to %s..."
-msgstr "Zatváram spojenie s IMAP serverom..."
+msgstr "Zatváram spojenie s IMAP serverom..."
 
 #: pop.c:170
 #, fuzzy
 msgid "Closing connection to POP server..."
-msgstr "Zatváram spojenie s IMAP serverom..."
+msgstr "Zatváram spojenie s IMAP serverom..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
 #: pop.c:600 pop.c:863
 #, fuzzy, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Oznaèovanie nie je podporované."
+msgstr "Označovanie nie je podporované."
 
 #: pop.c:602 pop.c:966
 #, fuzzy, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Oznaèovanie nie je podporované."
+msgstr "Označovanie nie je podporované."
 
 #: lib-mx/mbox.c:547
 #, fuzzy
 msgid "Committing changes..."
-msgstr "Kompilujem vyhµadávací vzor..."
+msgstr "Kompilujem vyhľadávací vzor..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Nastavenia kompilácie:"
+"Nastavenia kompilácie:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Kompilujem vyhµadávací vzor..."
+msgstr "Kompilujem vyhľadávací vzor..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "Kopírujem do %s..."
+msgstr "Kopírujem do %s..."
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "Kopírujem do %s..."
+msgstr "Kopírujem do %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Zatváram spojenie s IMAP serverom..."
+msgstr "Zatváram spojenie s IMAP serverom..."
 
 #: pop.c:808
 #, fuzzy
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Zatváram spojenie s IMAP serverom..."
+msgstr "Zatváram spojenie s IMAP serverom..."
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, fuzzy, c-format
 msgid "Connection to %s closed"
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
 #: commands.c:782
 #, fuzzy, c-format
 msgid "Content-Type changed to %s."
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-Type je formy základ/pod"
+msgstr "Content-Type je formy základ/pod"
 
 #: imap/util.c:135
 #, fuzzy
 msgid "Continue?"
-msgstr "(pokraèova»)\n"
+msgstr "(pokračovať)\n"
 
 #: commands.c:772
 #, c-format
@@ -989,22 +964,22 @@ msgstr ""
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
-msgstr "%s%s do schránky"
+msgstr "%s%s do schránky"
 
 #: imap/message.c:681
 #, fuzzy, c-format
 msgid "Copying %d messages to %s..."
-msgstr "Presúvam preèítané správy do %s..."
+msgstr "Presúvam prečítané správy do %s..."
 
 #: imap/message.c:684
 #, fuzzy, c-format
 msgid "Copying message %d to %s..."
-msgstr "Zapisujem správu do %s ..."
+msgstr "Zapisujem správu do %s ..."
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "Kopírujem do %s..."
+msgstr "Kopírujem do %s..."
 
 #: main.c:63
 msgid ""
@@ -1020,36 +995,36 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, fuzzy, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "Nemo¾no otvori» %s"
+msgstr "Nemožno otvoriť %s"
 
 #: commands.c:111
 #, fuzzy
 msgid "Could not copy message"
-msgstr "Nemo¾no posla» správu."
+msgstr "Nemožno poslať správu."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Nemo¾no vytvori» doèasný súbor!"
+msgstr "Nemožno vytvoriť dočasný súbor!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Nemo¾no vytvori» doèasný súbor!"
+msgstr "Nemožno vytvoriť dočasný súbor!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Nemo¾no nájs» triediacu funkciu! [oznámte túto chybu]"
+msgstr "Nemožno nájsť triediacu funkciu! [oznámte túto chybu]"
 
 #: lib-sys/mutt_socket.c:350
 #, fuzzy, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Nemo¾no nájs» adresu pre hostiteµa %s."
+msgstr "Nemožno nájsť adresu pre hostiteľa %s."
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Nemo¾no pripoji» v¹etky po¾adované správy!"
+msgstr "Nemožno pripojiť všetky požadované správy!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
@@ -1058,109 +1033,95 @@ msgstr ""
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "Nemo¾no otvori» %s"
+msgstr "Nemožno otvoriť %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Nemo¾no znovu otvori» schránku!"
+msgstr "Nemožno znovu otvoriť schránku!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Nemo¾no posla» správu."
+msgstr "Nemožno poslať správu."
 
 #: lib-mx/mx.c:407
 #, fuzzy, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Nemo¾no zisti» stav: %s.\n"
+msgstr "Nemožno zistiť stav: %s.\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "Vytvori» %s?"
+msgstr "Vytvoriť %s?"
 
-#: browser.c:1000
+#: browser.c:971
 #, fuzzy
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Táto operácia nie je podporovaná pre PGP správy."
+msgstr "Táto operácia nie je podporovaná pre PGP správy."
 
 #: imap/browse.c:249
 #, fuzzy
 msgid "Create mailbox: "
-msgstr "Otvor schránku"
+msgstr "Otvor schránku"
 
 #: commands.c:597
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "%s%s do schránky"
+msgstr "%s%s do schránky"
 
 #: commands.c:596
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "%s%s do schránky"
+msgstr "%s%s do schránky"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "Vyberám %s..."
+msgstr "Vyberám %s..."
 
 #: commands.c:599
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "%s%s do schránky"
+msgstr "%s%s do schránky"
 
 #: commands.c:598
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "%s%s do schránky"
+msgstr "%s%s do schránky"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
-msgstr "Vyvolávam správu..."
+msgstr "Vyvolávam správu..."
 
-#: postpone.c:517
+#: postpone.c:482
 #, fuzzy
 msgid "Decryption failed."
 msgstr "Prihlasovanie zlyhalo."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Zma¾"
-
-#: remailer.c:433
-#, fuzzy
-msgid "Delete"
-msgstr "Oznaèi»"
-
-#: browser.c:1041
+#: browser.c:1012
 #, fuzzy
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Táto operácia nie je podporovaná pre PGP správy."
+msgstr "Táto operácia nie je podporovaná pre PGP správy."
 
 #: pop.c:1282
 #, fuzzy
 msgid "Delete messages from server?"
-msgstr "Vymazávam správy zo serveru..."
+msgstr "Vymazávam správy zo serveru..."
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "Zmaza» správy zodpovedajúce: "
+msgstr "Zmazať správy zodpovedajúce: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "Oznaèi»"
+msgstr "Označiť"
 
-#: recvattach.c:993
+#: recvattach.c:981
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Mazanie príloh z PGP správ nie je podporované."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Popísa»"
+msgstr "Mazanie príloh z PGP správ nie je podporované."
 
 #: lib-lua/madmutt.cpkg:106
 #, c-format
@@ -1172,237 +1133,214 @@ msgstr ""
 msgid "Directory %s not exist. Create it?"
 msgstr ""
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Adresár [%s], maska súboru: %s"
+msgstr "Adresár [%s], maska súboru: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "CHYBA: prosím oznámte túto chybu"
+msgstr "CHYBA: prosím oznámte túto chybu"
 
-#: send.c:1387
+#: send.c:1381
 #, fuzzy
 msgid "Edit forwarded message?"
-msgstr "Odsúvam správu ..."
+msgstr "Odsúvam správu ..."
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "chyba vo výraze"
+msgstr "chyba vo výraze"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Za¹ifruj"
+msgstr "Zašifruj"
 
-#: compose.c:163
+#: compose.c:135
 #, fuzzy
 msgid "Encrypt with: "
-msgstr "Za¹ifruj"
+msgstr "Zašifruj"
 
 #: imap/imap.c:407 pop.c:706
 #, fuzzy
 msgid "Encrypted connection unavailable"
-msgstr "Zakódovaný kµúè sedenia"
+msgstr "Zakódovaný kľúč sedenia"
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "Zadajte ID kµúèa pre %s: "
+msgstr "Zadajte ID kľúča pre %s: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "Zadajte ID kµúèa pre %s: "
+msgstr "Zadajte ID kľúča pre %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
-msgstr "Zadajte ID kµúèa pre %s: "
+msgstr "Zadajte ID kľúča pre %s: "
 
 #: recvcmd.c:198
 #, fuzzy
 msgid "Error bouncing message!"
-msgstr "Chyba pri posielaní správy."
+msgstr "Chyba pri posielaní správy."
 
 #: recvcmd.c:199
 #, fuzzy
 msgid "Error bouncing messages!"
-msgstr "Chyba pri posielaní správy."
+msgstr "Chyba pri posielaní správy."
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "Chyba pri posielaní správy."
+msgstr "Chyba pri posielaní správy."
 
 #: pop.c:142
 #, fuzzy, c-format
 msgid "Error connecting to server: %s"
-msgstr "Pripájam sa na %s"
+msgstr "Pripájam sa na %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Pripájam sa na %s"
+msgstr "Pripájam sa na %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Chyba v %s, riadok %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Chyba v príkazovom riadku: %s\n"
+msgstr "Chyba v príkazovom riadku: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "Chyba vo výraze: %s"
+msgstr "Chyba vo výraze: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "Chyba pri inicializácii terminálu."
+msgstr "Chyba pri inicializácii terminálu."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "Chyba pri inicializácii terminálu."
+msgstr "Chyba pri inicializácii terminálu."
 
 #: imap/imap.c:620
 #, fuzzy
 msgid "Error opening mailbox"
-msgstr "Chyba pri zapisovaní do schránky!"
+msgstr "Chyba pri zapisovaní do schránky!"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "Chyba pri analýze adresy!"
+msgstr "Chyba pri analýze adresy!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, fuzzy, c-format
 msgid "Error running \"%s\"!"
-msgstr "Chyba pri analýze adresy!"
+msgstr "Chyba pri analýze adresy!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Chyba pri èítaní adresára."
+msgstr "Chyba pri čítaní adresára."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, fuzzy, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Chyba pri posielaní správy, dcérsky proces vrátil %d (%s).\n"
-
-#: remailer.c:703
-#, fuzzy, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Chyba pri posielaní správy, dcérsky proces vrátil %d (%s).\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Chyba pri posielaní správy."
+msgstr "Chyba pri posielaní správy, dcérsky proces vrátil %d (%s).\n"
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
-msgstr "Pripájam sa na %s"
+msgstr "Pripájam sa na %s"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "Chyba pri prezeraní súboru"
+msgstr "Chyba pri prezeraní súboru"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "Chyba pri zapisovaní do schránky!"
+msgstr "Chyba pri zapisovaní do schránky!"
 
 #: editmsg.c:180
 #, fuzzy, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Nemo¾no vytvori» doèasný súbor"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr ""
+msgstr "Nemožno vytvoriť dočasný súbor"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "Chyba: multipart/encrypted nemá vyplnený parameter protokolu!"
+msgstr "Chyba: multipart/encrypted nemá vyplnený parameter protokolu!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "Chyba: multipart/signed nemá protokol."
+msgstr "Chyba: multipart/signed nemá protokol."
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Chyba v príkazovom riadku: %s\n"
+msgstr "Chyba v príkazovom riadku: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Vyvolávam hlavièky správ... [%d/%d]"
+msgstr "Vyvolávam hlavičky správ... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Vykonávam príkaz na nájdených správach..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Koniec"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Koniec  "
+msgstr "Vykonávam príkaz na nájdených správach..."
 
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Ukonèi» Mutt bey ulo¾enia?"
+msgstr "UkonÄ\8diÅ¥ Mutt bey uloženia?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Opusti» Mutt?"
+msgstr "Opustiť Mutt?"
 
 #: imap/imap.c:898
 #, fuzzy
@@ -1411,129 +1349,124 @@ msgstr "Prihlasovanie zlyhalo."
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Vymazávam správy zo serveru..."
+msgstr "Vymazávam správy zo serveru..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Nemo¾no otvori» súbor na analýzu hlavièiek."
+msgstr "Nemožno otvoriť súbor na analýzu hlavičiek."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Nemo¾no otvori» súbor na odstránenie hlavièiek."
+msgstr "Nemožno otvoriť súbor na odstránenie hlavičiek."
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Nemo¾no otvori» súbor na analýzu hlavièiek."
+msgstr "Nemožno otvoriť súbor na analýzu hlavičiek."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Fatálna chyba! Nemo¾no znovu otvori» schránku!"
+msgstr "Fatálna chyba! Nemožno znovu otvoriť schránku!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Fatálna chyba. Poèet správ nie je zosynchronizovaný!"
+msgstr "Fatálna chyba. Počet správ nie je zosynchronizovaný!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "Vymazávam správy zo serveru..."
+msgstr "Vymazávam správy zo serveru..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "Vyvolávam správu..."
+msgstr "Vyvolávam správu..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Vyvolávam správu..."
+msgstr "Vyvolávam správu..."
 
 #: pop.c:1062
 #, fuzzy
 msgid "Fetching list of messages..."
-msgstr "Vyvolávam správu..."
+msgstr "Vyvolávam správu..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Vyvolávam hlavièky správ... [%d/%d]"
+msgstr "Vyvolávam hlavičky správ... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Vyvolávam hlavièky správ... [%d/%d]"
+msgstr "Vyvolávam hlavičky správ... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "Vyvolávam správu..."
+msgstr "Vyvolávam správu..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Maska súborov: "
+msgstr "Maska súborov: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Súbor existuje, (o)-prepísa», prid(a)» alebo (c)-zru¹i»?"
+msgstr "Súbor existuje, (o)-prepísať, prid(a)ť alebo (c)-zrušiť?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Súbor je adresár, ulo¾i» v òom?"
+msgstr "Súbor je adresár, uložiť v ňom?"
 
 #: muttlib.c:226
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Súbor je adresár, ulo¾i» v òom?"
+msgstr "Súbor je adresár, uložiť v ňom?"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "Súbor v adresári: "
+msgstr "Súbor v adresári: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "Filtrova» cez: "
+msgstr "Filtrovať cez: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 msgid "Fingerprint: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "ulo¾i» túto správu a posla» neskôr"
+msgstr "uložiť túto správu a poslať neskôr"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, fuzzy, c-format
 msgid "Follow-up to %s%s?"
-msgstr "Odpoveda» na adresu %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Odpoveda» na adresu %s%s?"
+msgstr "Odpovedať na adresu %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Posunú» vo formáte MIME encapsulated?"
+msgstr "Posunúť vo formáte MIME encapsulated?"
 
-#: send.c:828
+#: send.c:826
 #, fuzzy
 msgid "Forward as attachment?"
-msgstr "Vytlaèi» prílohu?"
+msgstr "Vytlačiť prílohu?"
 
 #: recvcmd.c:475
 #, fuzzy
 msgid "Forward as attachments?"
-msgstr "zobrazi» prílohy MIME"
+msgstr "zobraziť prílohy MIME"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 #, fuzzy
 msgid "Function not permitted in attach-message mode."
-msgstr "%c: nepodporovaný v tomto móde"
+msgstr "%c: nepodporovaný v tomto móde"
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
@@ -1542,214 +1475,195 @@ msgstr ""
 #: imap/browse.c:75
 #, fuzzy
 msgid "Getting namespaces..."
-msgstr "Vyvolávam správu..."
+msgstr "Vyvolávam správu..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Skupina"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Pomoc"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "Pomoc pre %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "Pomoc sa akurát zobrazuje."
+msgstr "Pomoc sa akurát zobrazuje."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Neviem, ako vytlaèi» dáta!"
+msgstr "Neviem, ako vytlačiť dáta!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "Neviem ako tlaèi» prílohy %s!"
+msgstr "Neviem ako tlačiť prílohy %s!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
 msgstr ""
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 #, fuzzy
 msgid "ID is not valid."
-msgstr "Toto ID nie je dôveryhodné."
+msgstr "Toto ID nie je dôveryhodné."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 #, fuzzy
 msgid "ID is only marginally valid."
-msgstr "Toto ID je dôveryhodné iba nepatrne."
+msgstr "Toto ID je dôveryhodné iba nepatrne."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Neplatná hlavièka PGP"
+msgstr "Neplatná hlavička PGP"
 
-#: postpone.c:434
+#: postpone.c:399
 #, fuzzy
 msgid "Illegal S/MIME header"
-msgstr "Neplatná hlavièka PGP"
+msgstr "Neplatná hlavička PGP"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Nesprávne formátovaná polo¾ka pre typ %s v \"%s\", riadok %d"
+msgstr "Nesprávne formátovaná položka pre typ %s v \"%s\", riadok %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Prilo¾i» správu do odpovede?"
+msgstr "Priložiť správu do odpovede?"
 
-#: send.c:805
+#: send.c:803
 #, fuzzy
 msgid "Including quoted message..."
-msgstr "Posielam správu..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr ""
+msgstr "Posielam správu..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Neplatný deò v mesiaci: %s"
+msgstr "Neplatný deň v mesiaci: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Neplatné kódovanie."
+msgstr "Neplatné kódovanie."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Neplatné èíslo indexu."
+msgstr "Neplatné číslo indexu."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Neplatné èíslo správy."
+msgstr "Neplatné číslo správy."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Neplatný mesiac: %s"
+msgstr "Neplatný mesiac: %s"
 
 #: pattern.c:486
 #, fuzzy, c-format
 msgid "Invalid relative date: %s"
-msgstr "Neplatný mesiac: %s"
+msgstr "Neplatný mesiac: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "Spú¹»am PGP..."
+msgstr "Spúšťam PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "Spú¹»am PGP..."
+msgstr "Spúšťam PGP..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Vyvolávam príkaz na automatické prezeranie: %s"
+msgstr "Vyvolávam príkaz na automatické prezeranie: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Skoèi» na správu: "
+msgstr "Skočiť na správu: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Skoè do: "
+msgstr "Skoč do: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 #, fuzzy
 msgid "Jumping is not implemented for dialogs."
-msgstr "Hµadanie nie je implementované pre toto menu."
+msgstr "Hľadanie nie je implementované pre toto menu."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "ID kµúèa: 0x%s"
+msgstr "ID kľúča: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Klávesa nie je viazaná."
+msgstr "Klávesa nie je viazaná."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Klávesa nie je viazaná. Stlaète '%s' pre nápovedu."
+msgstr "Klávesa nie je viazaná. Stlačte '%s' pre nápovedu."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Limituj správy zodpovedajúce: "
+msgstr "Limituj správy zodpovedajúce: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "Limit: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Prihlasujem sa..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1757,17 +1671,17 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Poèet zámkov prekroèený, vymaza» zámok pre %s?"
+msgstr "Počet zámkov prekročený, vymazať zámok pre %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Prihlasujem sa..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Prihlasovanie zlyhalo."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr ""
@@ -1775,280 +1689,247 @@ msgstr ""
 #: lib-sys/mutt_socket.c:341
 #, fuzzy, c-format
 msgid "Looking up %s..."
-msgstr "Kopírujem do %s..."
+msgstr "Kopírujem do %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr ""
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "MIME typ nie je definovaný. Nemo¾no zobrazi» pripojené dáta."
+msgstr "MIME typ nie je definovaný. Nemožno zobraziť pripojené dáta."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Bola zistená sluèka v makre."
+msgstr "Bola zistená slučka v makre."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Napí¹"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "Po¹ta nebola odoslaná."
+msgstr "Pošta nebola odoslaná."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "Správa bola odoslaná."
+msgstr "Správa bola odoslaná."
 
 #: lib-mx/mx.c:970
 #, fuzzy
 msgid "Mailbox checkpointed."
-msgstr "Bola zistená sluèka v makre."
+msgstr "Bola zistená slučka v makre."
 
 #: imap/command.c:235
 #, fuzzy
 msgid "Mailbox closed"
-msgstr "Bola zistená sluèka v makre."
+msgstr "Bola zistená slučka v makre."
 
 #: imap/browse.c:261
 #, fuzzy
 msgid "Mailbox created."
-msgstr "Bola zistená sluèka v makre."
+msgstr "Bola zistená slučka v makre."
 
-#: browser.c:1061
+#: browser.c:1032
 #, fuzzy
 msgid "Mailbox deleted."
-msgstr "Bola zistená sluèka v makre."
+msgstr "Bola zistená slučka v makre."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "Schránka je prázdna."
+msgstr "Schránka je prázdna."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "Schránka je oznaèená len na èítanie. %s"
+msgstr "Schránka je označená len na čítanie. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "Schránka je iba na èítanie."
+msgstr "Schránka je iba na čítanie."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Schránka nie je zmenená."
+msgstr "Schránka nie je zmenená."
 
 #: imap/browse.c:253 imap/browse.c:294
 #, fuzzy
 msgid "Mailbox must have a name."
-msgstr "Schránka nie je zmenená."
+msgstr "Schránka nie je zmenená."
 
-#: browser.c:1068
+#: browser.c:1039
 #, fuzzy
 msgid "Mailbox not deleted."
-msgstr "Po¹ta nebola odoslaná."
+msgstr "Pošta nebola odoslaná."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Bola zistená sluèka v makre."
+msgstr "Bola zistená slučka v makre."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Schránka bola poru¹ená!"
+msgstr "Schránka bola porušená!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 #, fuzzy
 msgid "Mailbox was externally modified."
-msgstr "Schránka bola zmenená zvonku. Príznaky mô¾u by» nesprávne."
+msgstr "Schránka bola zmenená zvonku. Príznaky môžu byť nesprávne."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Schránka bola zmenená zvonku. Príznaky mô¾u by» nesprávne."
+msgstr "Schránka bola zmenená zvonku. Príznaky môžu byť nesprávne."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Schránky [%d]"
+msgstr "Schránky [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Vstupná polo¾ka mailcap-u vy¾aduje %%s"
+msgstr "Vstupná položka mailcap-u vyžaduje %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Zostavovacia polo¾ka mailcap-u vy¾aduje %%s"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Urobi» alias"
+msgstr "Zostavovacia položka mailcap-u vyžaduje %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, fuzzy, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Èítam %d nových správ (%d bytov)..."
+msgstr "Čítam %d nových správ (%d bytov)..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Maska"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Správa bola presmerovaná."
+msgstr "Správa bola presmerovaná."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 #, fuzzy
 msgid "Message could not be printed"
-msgstr "Správa bola vytlaèené"
+msgstr "Správa bola vytlačené"
 
 #: editmsg.c:102
 #, fuzzy
 msgid "Message file is empty!"
-msgstr "Schránka je prázdna."
+msgstr "Schránka je prázdna."
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
 msgid "Message not bounced."
-msgstr "Správa bola presmerovaná."
+msgstr "Správa bola presmerovaná."
 
 #: editmsg.c:108
 #, fuzzy
 msgid "Message not modified!"
-msgstr "Správa bola vytlaèené"
+msgstr "Správa bola vytlačené"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Táto správa nie je viditeµná."
+msgstr "Táto správa nie je viditeľná."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Správa bola odlo¾ená."
+msgstr "Správa bola odložená."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "Správa bola vytlaèené"
+msgstr "Správa bola vytlačené"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "Správa bola zapísaná."
+msgstr "Správa bola zapísaná."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Správy boli presmerované."
+msgstr "Správy boli presmerované."
 
 #: commands.c:393
 #, fuzzy
 msgid "Messages could not be printed"
-msgstr "Správy boli vytlaèené"
+msgstr "Správy boli vytlačené"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
 msgid "Messages not bounced."
-msgstr "Správy boli presmerované."
+msgstr "Správy boli presmerované."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Správy boli vytlaèené"
+msgstr "Správy boli vytlačené"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Chýbajúce parametre."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr ""
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr ""
+msgstr "Chýbajúce parametre."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Presunú» preèítané správy do %s?"
+msgstr "Presunúť prečítané správy do %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Presúvam preèítané správy do %s..."
+msgstr "Presúvam prečítané správy do %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Nová otázka"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "Nové meno súboru: "
+msgstr "Nové meno súboru: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "Nový súbor: "
+msgstr "Nový súbor: "
 
 #: buffy.cpkg:330
 #, fuzzy
 msgid "New mail in "
-msgstr "Nová po¹ta v %s."
+msgstr "Nová pošta v %s."
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "V tejto schránke je nová po¹ta."
+msgstr "V tejto schránke je nová pošta."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Ïaµ¹í"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "Ïaµ¹St"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2058,253 +1939,239 @@ msgstr ""
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Nenájdený parameter ohranièenia (boundary)! [ohláste túto chybu]"
+msgstr "Nenájdený parameter ohraničenia (boundary)! [ohláste túto chybu]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "®iadne polo¾ky."
+msgstr "Žiadne položky."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "Maske nevyhovujú ¾iadne súbory"
+msgstr "Maske nevyhovujú žiadne súbory"
 
-#: main.c:648
+#: main.c:624
 #, fuzzy
 msgid "No incoming mailboxes defined."
-msgstr "cykluj medzi schránkami s príchodzími správami"
+msgstr "cykluj medzi schránkami s príchodzími správami"
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "®iadny limitovací vzor nie je aktívny."
+msgstr "Žiadny limitovací vzor nie je aktívny."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Nie je otvorená ¾iadna schránka."
+msgstr "Nie je otvorená žiadna schránka."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "®iadna schránka s novými správami."
+msgstr "Žiadna schránka s novými správami."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "®iadna zostavovacia polo¾ka mailcap-u pre %s, vytváram prázdny súbor."
+msgstr "Žiadna zostavovacia položka mailcap-u pre %s, vytváram prázdny súbor."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "®iadna vstupná polo¾ka mailcap-u pre %s"
+msgstr "Žiadna vstupná položka mailcap-u pre %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "Nenájdené ¾iadne po¹tové zoznamy!"
+msgstr "Nenájdené žiadne poštové zoznamy!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "®iadna polo¾ka mailcap-u nebola nájdená. Prezerám ako text."
+msgstr "Žiadna položka mailcap-u nebola nájdená. Prezerám ako text."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "V tejto zlo¾ke nie sú správy."
+msgstr "V tejto zložke nie sú správy."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "®iadne správy nesplnili kritérium."
+msgstr "Žiadne správy nesplnili kritérium."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "Nie je ïaµ¹í citovaný text."
+msgstr "Nie je ďaľší citovaný text."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "®iadne ïaµ¹ie vlákna."
+msgstr "Žiadne ďaľšie vlákna."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "®iadny ïaµ¹í necitovaný text za citátom."
+msgstr "Žiadny ďaľší necitovaný text za citátom."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "®iadna nová po¹ta v schránke POP."
+msgstr "Žiadna nová pošta v schránke POP."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "®iadne nové správy"
+msgstr "Žiadne nové správy"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Nebol uvedený predmet."
+msgstr "Nebol uvedený predmet."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "Maske nevyhovujú ¾iadne súbory"
+msgstr "Maske nevyhovujú žiadne súbory"
 
-#: nntp.c:357
+#: nntp.c:360
 #, fuzzy
 msgid "No newsserver defined!"
-msgstr "Meno pou¾ívateµa POP nie je definované."
-
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "®iadna schránka s novými správami."
+msgstr "Meno používateľa POP nie je definované."
 
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "®iadne odlo¾ené správy."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "®iadna schránka s novými správami."
+msgstr "Žiadne odložené správy."
 
 #: commands.c:378
 #, fuzzy
 msgid "No printing command has been defined."
-msgstr "cykluj medzi schránkami s príchodzími správami"
+msgstr "cykluj medzi schránkami s príchodzími správami"
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Nie sú uvedení ¾iadni príjemcovia!"
+msgstr "Nie sú uvedení žiadni príjemcovia!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Neboli uvedení ¾iadni príjemcovia.\n"
+msgstr "Neboli uvedení žiadni príjemcovia.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Neboli uvedení ¾iadni príjemcovia!"
+msgstr "Neboli uvedení žiadni príjemcovia!"
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "®iadny vzor pre hµadanie."
+msgstr "Žiadny vzor pre hľadanie."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Nebol uvedený predmet."
+msgstr "Nebol uvedený predmet."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "®iadny predmet, zru¹i» posielanie?"
+msgstr "Žiadny predmet, zrušiť posielanie?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "®iadny predmet, ukonèi»?"
+msgstr "Žiadny predmet, ukončiť?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "®iadny predmet, ukonèujem."
+msgstr "Žiadny predmet, ukončujem."
 
 #: imap/browse.c:193
 #, fuzzy
 msgid "No such folder"
-msgstr "%s: nenájdená farba"
+msgstr "%s: nenájdená farba"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "®iadne oznaèené polo¾ky."
+msgstr "Žiadne oznaÄ\8dené položky."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "®iadna z oznaèených správ nie je viditeµná!"
+msgstr "Žiadna z označených správ nie je viditeľná!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "®iadne oznaèené správy."
+msgstr "Žiadne označené správy."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "®iadne odmazané správy."
+msgstr "Žiadne odmazané správy."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "®iadne neèítané správy"
+msgstr "Žiadne nečítané správy"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 #, fuzzy
 msgid "No visible messages."
-msgstr "®iadne nové správy"
+msgstr "Žiadne nové správy"
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, fuzzy, c-format
 msgid "Not available in this menu."
-msgstr "V tejto schránke je nová po¹ta."
+msgstr "V tejto schránke je nová pošta."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "Nenájdené."
+msgstr "Nenájdené."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
-msgstr "Spájam sa s %s..."
-
-#: remailer.c:435
-msgid "OK"
-msgstr ""
+msgstr "Spájam sa s %s..."
 
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "je podporované iba mazanie viaczlo¾kových príloh."
+msgstr "je podporované iba mazanie viaczložkových príloh."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Otvor schránku"
+msgstr "Otvor schránku"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Otvor schránku iba na èítanie"
+msgstr "Otvor schránku iba na čítanie"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Otvor schránku, z ktorej sa bude pridáva» správa"
+msgstr "Otvor schránku, z ktorej sa bude pridávať správa"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Otvor schránku iba na èítanie"
+msgstr "Otvor schránku iba na čítanie"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Otvor schránku, z ktorej sa bude pridáva» správa"
+msgstr "Otvor schránku, z ktorej sa bude pridávať správa"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr ""
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
-"(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudnú» na to? "
+"(e)-šifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudnúť na to? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "Kµúèe PGP zhodujúce sa "
+msgstr "Kľúče PGP zhodujúce sa "
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "Kµúèe PGP zhodujúce sa "
+msgstr "Kľúče PGP zhodujúce sa "
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
@@ -2316,169 +2183,144 @@ msgstr ""
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "Hostiteµ POP nie je definovaný."
+msgstr "Hostiteľ POP nie je definovaný."
 
-#: thread.c:987
+#: thread.c:983
 #, fuzzy
 msgid "Parent message is not available."
-msgstr "Táto správa nie je viditeµná."
+msgstr "Táto správa nie je viditeľná."
 
-#: thread.c:980
+#: thread.c:976
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
-msgstr "Táto správa nie je viditeµná."
+msgstr "Táto správa nie je viditeľná."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Heslo pre %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "Vlastné meno: "
-
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Presmerova»"
+msgstr "Vlastné meno: "
 
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Po¹li do rúry príkazu: "
+msgstr "Pošli do rúry príkazu: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Presmerova» do: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "Presmerovať do: "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Odlo¾i» túto správu?"
+msgstr "Odložiť túto správu?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "Odlo¾ené správy"
+msgstr "Odložené správy"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
 msgstr ""
 
-#: send.c:831
+#: send.c:829
 #, fuzzy
 msgid "Preparing forwarded message..."
-msgstr "Odsúvam správu ..."
+msgstr "Odsúvam správu ..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Stlaète kláves pre pokraèovanie..."
-
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "PredSt"
+msgstr "Stlačte kláves pre pokračovanie..."
 
-#: recvattach.c:34
-msgid "Print"
-msgstr "Tlaèi»"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Vytlaèi» prílohu?"
+msgstr "Vytlačiť prílohu?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "Vytlaèi» správu?"
+msgstr "Vytlačiť správu?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Vytlaèi» oznaèené prílohy?"
+msgstr "Vytlačiť označené prílohy?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Vytlaèi» oznaèené správy?"
+msgstr "Vytlačiť označené správy?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Odstráni» %d zmazané správy?"
+msgstr "Odstrániť %d zmazané správy?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Odstráni» %d zmazaných správ?"
+msgstr "Odstrániť %d zmazaných správ?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Otázka"
+msgstr "Otázka"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "Otázka '%s'"
+msgstr "Otázka '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Príkaz otázky nie je definovaný."
+msgstr "Príkaz otázky nie je definovaný."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Otázka: "
-
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Koniec"
+msgstr "Otázka: "
 
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Ukonèi» Mutt?"
+msgstr "Ukončiť Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "Vyvolávam správu..."
+msgstr "Vyvolávam správu..."
 
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "Èítam %s..."
+msgstr "Čítam %s..."
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "Èítam %s... %d"
+msgstr "Čítam %s... %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "Èítam %s... %d (%d%%)"
+msgstr "Čítam %s... %d (%d%%)"
 
 #: pop.c:1284
 #, fuzzy, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "Èítam %d nových správ (%d bytov)..."
+msgstr "Čítam %d nových správ (%d bytov)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr ""
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Vyvola» odlo¾enú správu?"
+msgstr "Vyvolať odloženú správu?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr ""
 
@@ -2487,36 +2329,32 @@ msgstr ""
 msgid "Rename failed: %s"
 msgstr "Prihlasovanie zlyhalo."
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Táto operácia nie je podporovaná pre PGP správy."
+msgstr "Táto operácia nie je podporovaná pre PGP správy."
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Otvor schránku"
+msgstr "Otvor schránku"
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "Premenova» na: "
+msgstr "Premenovať na: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Znovuotváram schránku..."
+msgstr "Znovuotváram schránku..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Odpovedz"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "Odpoveda» na adresu %s%s?"
+msgstr "Odpovedať na adresu %s%s?"
 
 #: commands.c:403
 #, fuzzy
@@ -2524,28 +2362,28 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Spät.tried.(d)át/(f)-od/p(r)í/(s)-pred/k(o)mu/(t)-re»/(u)-ne/(z)-veµ/(c)-"
-"skóre: "
+"Spät.tried.(d)át/(f)-od/p(r)í/(s)-pred/k(o)mu/(t)-reť/(u)-ne/(z)-veľ/(c)-"
+"skóre: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Hµada» spätne: "
+msgstr "Hľadať spätne: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Spätné hµadanie: "
+msgstr "Spätné hľadanie: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Spätné triedenie podµa (d)átumu, zn(a)kov, (z)-veµkosti, (n)etriedi»? "
+msgstr "Spätné triedenie podľa (d)átumu, zn(a)kov, (z)-veľkosti, (n)etriediť? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
-"(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudnú» na to? "
+"(e)-šifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudnúť na to? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
@@ -2553,10 +2391,10 @@ msgstr ""
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
-msgstr "Kµúèe PGP zhodujúce sa "
+msgstr "Kľúče PGP zhodujúce sa "
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
@@ -2574,7 +2412,7 @@ msgstr ""
 msgid "SASL authentication failed."
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr ""
@@ -2582,138 +2420,113 @@ msgstr ""
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "Pripájam sa na %s"
-
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Ulo¾i»"
+msgstr "Pripájam sa na %s"
 
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "Ulo¾i» kópiu tejto správy?"
+msgstr "Uložiť kópiu tejto správy?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "Ulo¾i» do súboru: "
+msgstr "Uložiť do súboru: "
 
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
-msgstr "%s%s do schránky"
+msgstr "%s%s do schránky"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "Ukladám stavové príznaky správy... [%d/%d]"
+msgstr "Ukladám stavové príznaky správy... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "Ukladám..."
+msgstr "Ukladám..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Hµada»"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "Hµada»: "
+msgstr "Hľadať: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Hµadanie narazilo na spodok bez nájdenia zhody"
+msgstr "Hľadanie narazilo na spodok bez nájdenia zhody"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Hµadanie narazilo na vrchol bez nájdenia zhody"
+msgstr "Hľadanie narazilo na vrchol bez nájdenia zhody"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Hµadanie bolo preru¹ené."
+msgstr "Hľadanie bolo prerušené."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Hµadanie nie je implementované pre toto menu."
+msgstr "Hľadanie nie je implementované pre toto menu."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Vyhµadávanie pokraèuje zo spodu."
+msgstr "Vyhľadávanie pokračuje zo spodu."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Vyhµadávanie pokraèuje z vrchu."
+msgstr "Vyhľadávanie pokračuje z vrchu."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "Hµada»: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Oznaèi»"
+msgstr "Hľadať: "
 
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Oznaèi»  "
-
-#: remailer.c:488
-#, fuzzy
-msgid "Select a remailer chain."
-msgstr "zmaza» v¹etky znaky v riadku"
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "Vyberám %s..."
-
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Posla»"
+msgstr "Vyberám %s..."
 
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr ""
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "Posielam správu..."
+msgstr "Posielam správu..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
 msgstr "Server uzavrel spojenie!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Nastavi» príznak"
+msgstr "Nastaviť príznak"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "Príkaz shell-u: "
+msgstr "Príkaz shell-u: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "Podpísa»"
+msgstr "Podpísať"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "Podpí¹ ako: "
+msgstr "Podpíš ako: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Podpí¹, za¹ifruj"
+msgstr "Podpíš, zašifruj"
 
 #: commands.c:406
 #, fuzzy
@@ -2721,74 +2534,70 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Tried. (d)át/(f)-od/p(r)í/(s)-pred/k(o)mu/(t)-re»/(u)-ne/(z)-veµ/(c)-skó:"
+"Tried. (d)át/(f)-od/p(r)í/(s)-pred/k(o)mu/(t)-reť/(u)-ne/(z)-veľ/(c)-skó:"
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Triedenie podµa (d)átumu, zn(a)kov, (z)-veµkosti, alebo (n)etriedi»? "
+msgstr "Triedenie podľa (d)átumu, zn(a)kov, (z)-veľkosti, alebo (n)etriediť? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Triedim schránku..."
+msgstr "Triedim schránku..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "ID kµúèa: 0x%s"
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
+msgstr "ID kľúča: 0x%s"
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, fuzzy, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Adresár [%s], maska súboru: %s"
+msgstr "Adresár [%s], maska súboru: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, fuzzy, c-format
 msgid "Subscribing to %s..."
-msgstr "Kopírujem do %s..."
+msgstr "Kopírujem do %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 msgid "TLS/SSL Certificate check"
 msgstr ""
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Oznaè správy zodpovedajúce: "
+msgstr "Označ správy zodpovedajúce: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Oznaète správy, ktoré chcete prida»!"
+msgstr "Označte správy, ktoré chcete pridať!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Oznaèovanie nie je podporované."
+msgstr "Označovanie nie je podporované."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Táto správa nie je viditeµná."
+msgstr "Táto správa nie je viditeľná."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "Táto správa nie je viditeµná."
+msgstr "Táto správa nie je viditeľná."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr ""
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr ""
 
@@ -2796,96 +2605,96 @@ msgstr ""
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr ""
-
-#: compose.c:41
+#: compose.c:40
 #, fuzzy
 msgid "There are no attachments."
-msgstr "Vlákno obsahuje neèítané správy."
+msgstr "Vlákno obsahuje nečítané správy."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 #, fuzzy
 msgid "There are no messages."
-msgstr "Vlákno obsahuje neèítané správy."
+msgstr "Vlákno obsahuje nečítané správy."
 
-#: recvattach.c:918
+#: recvattach.c:906
 #, fuzzy
 msgid "There are no subparts to show!"
-msgstr "Vlákno obsahuje neèítané správy."
+msgstr "Vlákno obsahuje nečítané správy."
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Tento IMAP server je starý. Mutt s ním nevie pracova»."
+msgstr "Tento IMAP server je starý. Mutt s ním nevie pracovať."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr ""
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr ""
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Vlákno obsahuje neèítané správy."
+msgstr "Vlákno obsahuje nečítané správy."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Vláknenie nie je povolené."
+msgstr "Vláknenie nie je povolené."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Vypr¹al èas na uzamknutie pomocou fcntl!"
+msgstr "Vypršal čas na uzamknutie pomocou fcntl!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Vypr¹al èas na uzamknutie celého súboru!"
+msgstr "Vypršal čas na uzamknutie celého súboru!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Vrch správy je zobrazený."
+msgstr "Vrch správy je zobrazený."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "Pripájam sa na %s"
+msgstr "Pripájam sa na %s"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2897,141 +2706,124 @@ msgstr ""
 msgid "USER authentication failed."
 msgstr "Prihlasovanie zlyhalo."
 
-#: compose.c:703
+#: compose.c:636
 #, fuzzy, c-format
 msgid "Unable to attach %s!"
-msgstr "Nemo¾no pripoji»!"
+msgstr "Nemožno pripojiť!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "Nemo¾no pripoji»!"
+msgstr "Nemožno pripojiť!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Nemo¾no získa» hlavièky z tejto verzie IMAP serveru."
+msgstr "Nemožno získať hlavičky z tejto verzie IMAP serveru."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 #, fuzzy
 msgid "Unable to get certificate from peer"
-msgstr "nemo¾no urèi» domáci adresár"
+msgstr "nemožno určiť domáci adresár"
 
 #: pop.c:598
 #, fuzzy
 msgid "Unable to leave messages on server."
-msgstr "Vymazávam správy zo serveru..."
+msgstr "Vymazávam správy zo serveru..."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "Nemo¾no pripoji»!"
+msgstr "Nemožno pripojiť!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Nemo¾no uzamknú» schránku!"
+msgstr "Nemožno uzamknúť schránku!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Nemo¾no otvori» doèasný súbor!"
+msgstr "Nemožno otvoriť dočasný súbor!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Nemo¾no otvori» doèasný súbor!"
+msgstr "Nemožno otvoriť dočasný súbor!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Nemo¾no otvori» doèasný súbor!"
+msgstr "Nemožno otvoriť dočasný súbor!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Odma¾"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Odma¾ správy zodpovedajúce: "
+msgstr "Odmaž správy zodpovedajúce: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "Odma¾"
+msgstr "Odmaž"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "Neznáme Content-Type %s"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Spájam sa s %s..."
+msgstr "Neznáme Content-Type %s"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
 #: imap/imap.c:1360
 #, fuzzy, c-format
 msgid "Unsubscribing to %s..."
-msgstr "Spájam sa s %s..."
+msgstr "Spájam sa s %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Odznaè správy zodpovedajúce: "
+msgstr "Odznač správy zodpovedajúce: "
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "Odsúvam správu ..."
+msgstr "Odsúvam správu ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "Pou¾ite 'prepnú»-zápis' na povolenie zápisu!"
+msgstr "Použite 'prepnúť-zápis' na povolenie zápisu!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Pou¾i» ID kµúèa = \"%s\" pre %s?"
+msgstr "Použiť ID kľúča = \"%s\" pre %s?"
 
 #: account.c:133
 #, fuzzy, c-format
 msgid "Username at %s: "
-msgstr "Premenova» na: "
+msgstr "Premenovať na: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Neplatný mesiac: %s"
+msgstr "Neplatný mesiac: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Neplatný mesiac: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Neplatný mesiac: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "Overi» PGP podpis?"
+msgstr "Overiť PGP podpis?"
 
 #: pop.c:786
 #, fuzzy
 msgid "Verifying message indexes..."
-msgstr "Zapisujem správu do %s ..."
-
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Pozri prílohu"
+msgstr "Zapisujem správu do %s ..."
 
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "VAROVANIE! Mô¾ete prepísa» %s, pokraèova»?"
+msgstr "VAROVANIE! Môžete prepísať %s, pokračovať?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -3039,23 +2831,23 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 msgid "WARNING: Server certificate has been revoked"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 msgid "WARNING: Server certificate has expired"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 msgid "WARNING: Server certificate is not yet valid"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr ""
 
@@ -3072,18 +2864,18 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "Èakám na zámok od fcntl... %d"
+msgstr "Čakám na zámok od fcntl... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "Èakám na uzamknutie súboru... %d"
+msgstr "Čakám na uzamknutie súboru... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "Èakám na odpoveï..."
+msgstr "Čakám na odpoveď..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3092,12 +2884,12 @@ msgstr ""
 msgid "Warning: At least one certification key has expired\n"
 msgstr ""
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr ""
 
@@ -3117,170 +2909,151 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Nemo¾no vytvori» pripojené dáta"
+msgstr "Nemožno vytvoriť pripojené dáta"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Zápis zlyhal! Schránka bola èiastoène ulo¾ená do %s"
+msgstr "Zápis zlyhal! Schránka bola čiastočne uložená do %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "Chyba zápisu!"
+msgstr "Chyba zápisu!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Zapísa» správu do schránky"
+msgstr "Zapísať správu do schránky"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
 msgstr "Zapisujem %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "Zapisujem správu do %s ..."
+msgstr "Zapisujem správu do %s ..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "Zapisujem správy... %d (%d%%)"
+msgstr "Zapisujem správy... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Chyba v príkazovom riadku: %s\n"
+msgstr "Chyba v príkazovom riadku: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Zástupcu s týmto menom u¾ máte definovaného!"
-
-#: remailer.c:603
-#, fuzzy
-msgid "You already have the first chain element selected."
-msgstr "Ste na prvej správe."
+msgstr "Zástupcu s týmto menom už máte definovaného!"
 
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr ""
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Ste na prvej polo¾ke."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Ste na prvej stránke."
+msgstr "Ste na prvej položke."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Ste na prvej správe."
+msgstr "Ste na prvej správe."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Ste na prvej stránke."
+msgstr "Ste na prvej stránke."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Ste na prvom vlákne."
+msgstr "Ste na prvom vlákne."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Ste na poslednej polo¾ke."
+msgstr "Ste na poslednej položke."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Ste na poslednej stránke."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Ste na poslednej správe."
+msgstr "Ste na poslednej správe."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Ste na poslednej stránke."
+msgstr "Ste na poslednej stránke."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Nemô¾te rolova» ïalej dolu."
+msgstr "Nemôžte rolovať ďalej dolu."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Nemô¾te rolova» ïalej hore."
+msgstr "Nemôžte rolovať ďalej hore."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Nemáte ¾iadnych zástupcov!"
+msgstr "Nemáte žiadnych zástupcov!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Nemô¾ete zmaza» jediné pridané dáta."
+msgstr "Nemôžete zmazať jediné pridané dáta."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Presmerova» mô¾ete iba èasti message/rfc822."
+msgstr "Presmerovať môžete iba časti message/rfc822."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] Akceptova»?"
+msgstr "[%s = %s] Akceptovať?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s nie je podporovaný "
+msgstr "[-- %s/%s nie je podporovaný "
 
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- Príloha #%d"
+msgstr "[-- Príloha #%d"
 
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Chyba pri automatickom prezeraní (stderr) %s --]\n"
+msgstr "[-- Chyba pri automatickom prezeraní (stderr) %s --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Autoprezeranie pou¾itím %s --]\n"
+msgstr "[-- Autoprezeranie použitím %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ZAÈIATOK SPRÁVY PGP --]\n"
+"[-- ZAČIATOK SPRÁVY PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ZAÈIATOK BLOKU VEREJNÉHO K¥ÚÈA PGP --]\n"
+msgstr "[-- ZAČIATOK BLOKU VEREJNÉHO KĽÚČA PGP --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ZAÈIATOK SPRÁVY PODPÍSANEJ S PGP --]\n"
+"[-- ZAČIATOK SPRÁVY PODPÍSANEJ S PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3289,177 +3062,177 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- na %s --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
-"[-- KONIEC SPRÁVY PGP --]\n"
+"[-- KONIEC SPRÁVY PGP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- KONIEC BLOKU VEREJNÉHO K¥ÚÈA PGP --]\n"
+msgstr "[-- KONIEC BLOKU VEREJNÉHO KĽÚČA PGP --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
-"[-- KONIEC SPRÁVY PODPÍSANEJ S PGP --]\n"
+"[-- KONIEC SPRÁVY PODPÍSANEJ S PGP --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Koniec dát ¹ifrovaných pomocou PGP/MIME --]\n"
+"[-- Koniec dát šifrovaných pomocou PGP/MIME --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Koniec dát ¹ifrovaných pomocou PGP/MIME --]\n"
+"[-- Koniec dát šifrovaných pomocou PGP/MIME --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Koniec dát ¹ifrovaných pomocou PGP/MIME --]\n"
+"[-- Koniec dát šifrovaných pomocou PGP/MIME --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- Koniec dát s podpisom PGP/MIME --]\n"
+"[-- Koniec dát s podpisom PGP/MIME --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Koniec dát s podpisom PGP/MIME --]\n"
+"[-- Koniec dát s podpisom PGP/MIME --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[-- Chyba: Nemo¾no zobrazi» ¾iadnu èas» z Multipart/Alternative! --]\n"
+msgstr "[-- Chyba: Nemožno zobraziť žiadnu časť z Multipart/Alternative! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 #, fuzzy
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
-msgstr "Chyba: multipart/signed nemá protokol."
+msgstr "Chyba: multipart/signed nemá protokol."
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, fuzzy, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
-msgstr "Chyba: multipart/signed nemá protokol."
+msgstr "Chyba: multipart/signed nemá protokol."
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Chyba: nemo¾no vytvori» doèasný súbor! --]\n"
+msgstr "[-- Chyba: nemožno vytvoriť dočasný súbor! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Chyba: nemo¾no nájs» zaèiatok správy PGP! --]\n"
+"[-- Chyba: nemožno nájsť začiatok správy PGP! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- Chyba: neoèakávaný koniec súboru! --]\n"
+msgstr "[-- Chyba: neočakávaný koniec súboru! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- Chyba: poru¹ení správa PGP/MIME! --]\n"
+"[-- Chyba: porušení správa PGP/MIME! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- Chyba: message/external-body nemá vyplnený parameter access-type --]\n"
+"[-- Chyba: message/external-body nemá vyplnený parameter access-type --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Nasledujúce dáta sú ¹ifrované pomocou PGP/MIME --]\n"
+"[-- Nasledujúce dáta sú šifrované pomocou PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Nasledujúce dáta sú ¹ifrované pomocou PGP/MIME --]\n"
+"[-- Nasledujúce dáta sú šifrované pomocou PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Nasledujúce dáta sú ¹ifrované pomocou PGP/MIME --]\n"
+"[-- Nasledujúce dáta sú šifrované pomocou PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- Nasledujúce dáta sú podpísané s PGP/MIME --]\n"
+"[-- Nasledujúce dáta sú podpísané s PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Nasledujúce dáta sú podpísané s PGP/MIME --]\n"
+"[-- Nasledujúce dáta sú podpísané s PGP/MIME --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- Príloha %s/%s "
+msgstr "[-- Príloha %s/%s "
 
 #: handler.c:1212 handler.c:1225
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- Príloha %s/%s "
+msgstr "[-- Príloha %s/%s "
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Typ: %s/%s, Kódovanie: %s, Veµkos»: %s --]\n"
+msgstr "[-- Typ: %s/%s, Kódovanie: %s, Veľkosť: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3470,8 +3243,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
-"[-- Príloha %s/%s nie je vlo¾ená v správe, --]\n"
-"[-- a oznaèený typ prístupu %s nie je podporovaný --]\n"
+"[-- Príloha %s/%s nie je vložená v správe, --]\n"
+"[-- a označený typ prístupu %s nie je podporovaný --]\n"
 
 #: handler.c:1214
 #, fuzzy
@@ -3479,9 +3252,9 @@ msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- Príloha %s/%s nie je vlo¾ená v správe, --]\n"
-"[-- a oznaèenému externému zdroju --]\n"
-"[-- vypr¹ala platnos». --]\n"
+"[-- Príloha %s/%s nie je vložená v správe, --]\n"
+"[-- a označenému externému zdroju --]\n"
+"[-- vypršala platnosť. --]\n"
 
 #: handler.c:1201
 #, fuzzy, c-format
@@ -3493,108 +3266,284 @@ msgstr "[-- na %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- na %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
 msgstr "Koniec  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Neplatný mesiac: %s"
+msgstr "Neplatný mesiac: %s"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:439
 #, fuzzy
 msgid "[invalid date]"
-msgstr "%s: neplatná hodnota"
+msgstr "%s: neplatná hodnota"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, fuzzy, c-format
 msgid "[unable to calculate]"
-msgstr "%s: súbor nemo¾no pripoji»"
+msgstr "%s: súbor nemožno pripojiť"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "zástupca: ¾iadna adresa"
+msgstr "zástupca: žiadna adresa"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "použiť ďaľšiu funkciu na označené správy"
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "použiť ďaľšiu funkciu na označené správy"
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Uložiť kópiu tejto správy?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
 
-#: init.c:654
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "upravi» popis prílohy"
+msgstr "upraviť popis prílohy"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "upravi» popis prílohy"
+msgstr "upraviť popis prílohy"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: príli¹ veµa parametrov"
+msgstr "bind: príliš veľa parametrov"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Chyba pri čítaní adresára."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Žiadna schránka s novými správami."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "farba: príli¹ málo parametrov"
+msgstr "farba: príliš málo parametrov"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Žiadne nové správy"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr ""
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Zapísať správu do schránky"
+
 #: editmsg.c:59
 #, fuzzy, c-format
 msgid "could not create temporary folder: %s"
-msgstr "Nemo¾no vytvori» doèasný súbor!"
+msgstr "Nemožno vytvoriť dočasný súbor!"
 
 #: editmsg.c:89
 #, fuzzy, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "Nemo¾no vytvori» doèasný súbor!"
+msgstr "Nemožno vytvoriť dočasný súbor!"
 
 #: editmsg.c:70
 #, fuzzy, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Nemo¾no vytvori» doèasný súbor!"
+msgstr "Nemožno vytvoriť dočasný súbor!"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "cykluj medzi schránkami s príchodzími správami"
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "dazn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "¹tandardné farby nepodporované"
+msgstr "štandardné farby nepodporované"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Vymazávam správy zo serveru..."
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Odmaž správy zodpovedajúce: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Odmaž správy zodpovedajúce: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "dfrsotuzc"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Odsúvam správu ..."
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3603,28 +3552,114 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "Kopírujem do %s..."
+msgstr "Kopírujem do %s..."
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "Vyberám %s..."
+msgstr "Vyberám %s..."
+
+#: keymap_defs.h:43
+msgid "edit attachment content type"
+msgstr ""
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "upraviť popis prílohy"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "upraviť správu"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Vyvolávam hlavičky správ... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Odsúvam správu ..."
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Uložiť kópiu tejto správy?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "prázdny vzor"
+msgstr "prázdny vzor"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "Za¹ifruj"
+msgstr "Zašifruj"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Uložiť kópiu tejto správy?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
 msgstr "chyba vo vzore na: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "chyba vo vzore na: %s"
@@ -3654,14 +3689,14 @@ msgstr "chyba vo vzore na: %s"
 msgid "error getting secret key `%s': %s\n"
 msgstr "chyba vo vzore na: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "chyba vo vzore na: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "chyba vo výraze"
+msgstr "chyba vo výraze"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
@@ -3691,172 +3726,718 @@ msgstr "chyba vo vzore na: %s"
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "chyba: neznámy operand %d (oznámte túto chybu)."
+msgstr "chyba: neznámy operand %d (oznámte túto chybu)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "esabif"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "esabif"
 
-#: keymap.c:829
+#: keymap.c:821
 #, fuzzy
 msgid "exec: no arguments"
-msgstr "exec: príli¹ málo parametrov"
+msgstr "exec: príliš málo parametrov"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Odpovedať na adresu %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
-#, c-format
-msgid "gpgme_op_keylist_start failed: %s"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
 msgstr ""
 
-#: handler.c:1193
-msgid "has been deleted --]\n"
-msgstr "bola zmazaná --]\n"
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "zobraziť prílohy MIME"
 
-#: imap/imap.c:941
-msgid "imap_sync_mailbox: EXPUNGE failed"
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
 msgstr ""
 
-#: init.c:823
-msgid "invalid header field"
-msgstr "neplatná polo¾ka hlavièky"
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Odsúvam správu ..."
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Ste na prvej správe."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Ste na poslednej stránke."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Žiadna schránka s novými správami."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Chyba pri zapisovaní do schránky!"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Žiadna schránka s novými správami."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: handler.c:1193
+msgid "has been deleted --]\n"
+msgstr "bola zmazaná --]\n"
+
+#: imap/imap.c:941
+msgid "imap_sync_mailbox: EXPUNGE failed"
+msgstr ""
+
+#: init.c:820
+msgid "invalid header field"
+msgstr "neplatná položka hlavičky"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Neplatné číslo indexu."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Skočiť na správu: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Skočiť na správu: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Vlákno obsahuje nečítané správy."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Ste na prvom vlákne."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Žiadne nečítané správy"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Žiadne nečítané správy"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Uložiť kópiu tejto správy?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
-msgstr "Kµúèe PGP zhodujúce sa "
+msgstr "Kľúče PGP zhodujúce sa "
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Presmerovať označené správy do: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Žiadna schránka s novými správami."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: prázdna postupnos» kláves"
+msgstr "macro: prázdna postupnosť kláves"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "makro: príli¹ veµa parametrov"
+msgstr "makro: príliš veľa parametrov"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "polo¾ka mailcap-u pre typ %s nenájdená"
+msgstr "položka mailcap-u pre typ %s nenájdená"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "Správy boli presmerované."
+msgstr "Správy boli presmerované."
 
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "nespárované zátvorky: %s"
+msgstr "nespárované zátvorky: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "chýbajúci parameter"
+msgstr "chýbajúci parameter"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: príli¹ málo parametrov"
+msgstr "mono: príliš málo parametrov"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Ste na prvej položke."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Ste na prvej správe."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Ste na poslednej položke."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Ste na poslednej správe."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Ste na poslednej položke."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Ste na poslednej stránke."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Žiadne odmazané správy."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Ste na prvej položke."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Ste na prvej stránke."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Žiadne odmazané správy."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Ste na prvej stránke."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "viaczlo¾ková správa nemá parameter ohranièenia (boundary)!"
+msgstr "viaczložková správa nemá parameter ohraničenia (boundary)!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "nie"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(¾iadna schránka)"
+msgstr "(žiadna schránka)"
 
 #: commands.c:788
 msgid "not converting"
 msgstr ""
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "prázdna postupnos» kláves"
+msgstr "prázdna postupnosť kláves"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "oac"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Otvor schránku iba na čítanie"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Otvor schránku iba na čítanie"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Znovuotváram schránku..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Presmerovať správu do %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "prefix je neplatný s vynulovaním"
+msgstr "prefix je neplatný s vynulovaním"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Ste na prvej položke."
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: príli¹ veµa parametrov"
+msgstr "push: príliš veľa parametrov"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Vyvolať odloženú správu?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Vlákno obsahuje nečítané správy."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Vymazávam správy zo serveru..."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: súbor nemožno pripojiť"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Skočiť na správu: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Vymazávam správy zo serveru..."
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 #, fuzzy
 msgid "roa"
 msgstr "oac"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "%s%s do schránky"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "%s%s do schránky"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Vymazávam správy zo serveru..."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "chyba vo výraze"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Hľadať: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Nemožno poslať správu."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "zobraziť prílohy MIME"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Limituj správy zodpovedajúce: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Nie je ďaľší citovaný text."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Vytlačiť správu?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "V tejto zložke nie sú správy."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "zdroj: chyba na %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "zdroj: chyby v %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Maske nevyhovujú žiadne súbory"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: schránka zmenená, ale ¾iadne zmenené správy! (oznámte túto chybu)"
+"sync: schránka zmenená, ale žiadne zmenené správy! (oznámte túto chybu)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Odznač správy zodpovedajúce: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Ste na prvom vlákne."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3868,22 +4449,92 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Nie je ďaľší citovaný text."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+msgid "toggle recoding of this attachment"
+msgstr ""
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Žiadny vzor pre hľadanie."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Žiadne nečítané správy"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "príli¹ málo argumentov"
+msgstr "príliš málo argumentov"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "príli¹ veµa argumentov"
+msgstr "príliš veľa argumentov"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "upravi» popis prílohy"
+msgstr "upraviť popis prílohy"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Odmaž správy zodpovedajúce: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Odmaž správy zodpovedajúce: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Odmaž správy zodpovedajúce: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
@@ -3898,11 +4549,29 @@ msgstr ""
 #: hook.c:213
 #, fuzzy, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "%s: neznáma hodnota"
+msgstr "%s: neznáma hodnota"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "neznáma chyba"
+msgstr "neznáma chyba"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Odznač správy zodpovedajúce: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "upraviť popis prílohy"
 
 #: main.c:82
 msgid ""
@@ -3915,16 +4584,50 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "hodnota je neplatná s vynulovaním"
+msgstr "hodnota je neplatná s vynulovaním"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Pripojené dáta boli uložené."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Nový súbor: "
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Zapísať správu do schránky"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
-msgstr "y-áno"
+msgstr "y-áno"
 
 #: muttlib.c:227
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/sv.po b/po/sv.po
index e131372..1dab034 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,25 +4,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.5.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2005-04-09 16:01+0200\n"
 "Last-Translator: Johan Svedberg <johan@svedberg.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"Allmänna knytningar:\n"
+"Allmänna knytningar:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -32,13 +32,13 @@ msgstr ""
 "Oknutna funktioner:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Slut på signerat data --]\n"
+"[-- Slut på signerat data --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -71,7 +71,7 @@ msgstr ""
 "       mutt [ -nR ] [ -e <kommando> ] [ -F <fil> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
 "       mutt [ -nx ] [ -e <kommando> ] [ -a <fil> ] [ -F <fil> ] [ -H <fil> ] "
-"[ -i <fil> ] [ -s <ämne> ] [ -b <adress> ] [ -c <adress> ] <adress> [ ... ]\n"
+"[ -i <fil> ] [ -s <ämne> ] [ -b <adress> ] [ -c <adress> ] <adress> [ ... ]\n"
 "       mutt [ -n ] [ -e <kommando> ] [ -F <fil> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
@@ -80,40 +80,40 @@ msgstr ""
 "  -a <fil>\tbifoga en fil till meddelandet\n"
 "  -b <adress>\tange en \"blind carbon-copy\" (BCC) adress\n"
 "  -c <adress>\tange en \"carbon-copy\" (CC) adress\n"
-"  -e <kommando>\tange ett kommando som ska köras efter initiering\n"
-"  -f <fil>\tange vilken brevlåda som ska läsas\n"
+"  -e <kommando>\tange ett kommando som ska köras efter initiering\n"
+"  -f <fil>\tange vilken brevlåda som ska läsas\n"
 "  -F <fil>\tange en alternativ muttrc-fil\n"
-"  -H <fil>\tange en filmall att läsa huvud från\n"
+"  -H <fil>\tange en filmall att läsa huvud från\n"
 "  -i <fil>\tange en fil som Mutt ska inkludera i svaret\n"
-"  -m <typ>\tange standardtyp för brevlådan\n"
-"  -n\t\tgör så att Mutt inte läser systemets Muttrc\n"
-"  -p\t\tåterkalla ett uppskjutet meddelande\n"
-"  -Q <variabel>\tundersök värdet på en konfigurationsvariabel\n"
-"  -R\t\töppna brevlåda i skrivskyddat läge\n"
-"  -s <ämne>\tange ett ämne (måste vara inom citationstecken om det "
-"innehåller blanksteg)\n"
+"  -m <typ>\tange standardtyp för brevlådan\n"
+"  -n\t\tgör så att Mutt inte läser systemets Muttrc\n"
+"  -p\t\tåterkalla ett uppskjutet meddelande\n"
+"  -Q <variabel>\tundersök värdet på en konfigurationsvariabel\n"
+"  -R\t\töppna brevlåda i skrivskyddat läge\n"
+"  -s <ämne>\tange ett ämne (måste vara inom citationstecken om det "
+"innehåller blanksteg)\n"
 "  -v\t\tvisa version och definitioner vid kompileringen\n"
-"  -x\t\tsimulera mailx's sändläge\n"
-"  -y\t\tvälj en brevlåda specifierad i din \"mailboxes\"-lista\n"
-"  -z\t\tavsluta omedelbart om det inte finns några meddelanden i brevlådan\n"
-"  -Z\t\töppna den första foldern med ett nytt meddelande, avsluta omedelbart "
+"  -x\t\tsimulera mailx's sändläge\n"
+"  -y\t\tvälj en brevlåda specifierad i din \"mailboxes\"-lista\n"
+"  -z\t\tavsluta omedelbart om det inte finns några meddelanden i brevlådan\n"
+"  -Z\t\töppna den första foldern med ett nytt meddelande, avsluta omedelbart "
 "om inget finns\n"
-"  -h\t\tden här hjälptexten"
+"  -h\t\tden här hjälptexten"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " signera som: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     till %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
-msgstr "   från %s"
+msgstr "   från %s"
 
 #: main.c:106
 msgid ""
@@ -153,34 +153,34 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr " (\"?\" för lista): "
+msgstr " (\"?\" för lista): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:143
+#: compose.c:115
 msgid " (inline)"
 msgstr " (infogat)"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Tryck \"%s\" för att växla skrivning"
+msgstr " Tryck \"%s\" för att växla skrivning"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " i den här begränsade vyn"
+msgstr " i den här begränsade vyn"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " märkt"
+msgstr " märkt"
 
 #: pattern.c:716
 #, c-format
@@ -190,54 +190,54 @@ msgstr "%c: ogiltigt kommando"
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: stöds inte i det här läget"
+msgstr "%c: stöds inte i det här läget"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d behölls, %d raderades."
+msgstr "%d behölls, %d raderades."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d behölls, %d flyttades, %d raderades."
+msgstr "%d behölls, %d flyttades, %d raderades."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Vill du verkligen använda nyckeln?"
+msgstr "%s Vill du verkligen använda nyckeln?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] modifierad. Uppdatera kodning?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] existerar inte längre!"
+msgstr "%s [#%d] existerar inte längre!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d av %d meddelanden lästa]"
+msgstr "%s [%d av %d meddelanden lästa]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s finns inte. Skapa den?"
@@ -245,47 +245,47 @@ msgstr "%s finns inte. Skapa den?"
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s är en ogiltig IMAP-sökväg"
+msgstr "%s är en ogiltig IMAP-sökväg"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s är en ogilitig POP-sökväg"
+msgstr "%s är en ogilitig POP-sökväg"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s är en ogilitig POP-sökväg"
+msgstr "%s är en ogilitig POP-sökväg"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s är en ogilitig POP-sökväg"
+msgstr "%s är en ogilitig POP-sökväg"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s är inte en katalog."
+msgstr "%s är inte en katalog."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s är inte en brevlåda!"
+msgstr "%s är inte en brevlåda!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s är inte en brevlåda."
+msgstr "%s är inte en brevlåda."
 
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s är inte en normal fil."
+msgstr "%s är inte en normal fil."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s existerar inte längre!"
+msgstr "%s existerar inte längre!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -299,111 +299,111 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, c-format
 msgid "%s: Unknown type."
-msgstr "%s: Okänd typ."
+msgstr "%s: Okänd typ."
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: färgen stöds inte av terminalen"
+msgstr "%s: färgen stöds inte av terminalen"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: kommandot är endast giltigt för index-objekt"
+msgstr "%s: kommandot är endast giltigt för index-objekt"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s: attributet finns inte"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: färgen saknas"
+msgstr "%s: färgen saknas"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
-msgstr "%s: ingen sådan funktion"
+msgstr "%s: ingen sådan funktion"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: ingen sådan funktion i tabell"
+msgstr "%s: ingen sådan funktion i tabell"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: ingen sådan meny"
+msgstr "%s: ingen sådan meny"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s: objektet finns inte"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: för få parametrar"
+msgstr "%s: för få parametrar"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s: kunde inte bifoga fil"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: kunde inte bifoga fil.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: okänt kommando"
+msgstr "%s: okänt kommando"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: okänd typ"
+msgstr "%s: okänd typ"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: okänd variabel"
+msgstr "%s: okänd variabel"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s är en ogilitig POP-sökväg"
+msgstr "%s är en ogilitig POP-sökväg"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s är en ogilitig POP-sökväg"
+msgstr "%s är en ogilitig POP-sökväg"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(\"view-attachments\" måste knytas till tangent!)"
+msgstr "(\"view-attachments\" måste knytas till tangent!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(ingen brevlåda)"
+msgstr "(ingen brevlåda)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(f)örkasta, (g)odkänn den här gången"
+msgstr "(f)örkasta, (g)odkänn den här gången"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(f)örkasta, (g)odkänn den här gången, godkänn (v)arje gång"
+msgstr "(f)örkasta, (g)odkänn den här gången, godkänn (v)arje gång"
 
 #: handler.c:1191
 #, c-format
@@ -413,26 +413,26 @@ msgstr "(storlek %s byte)"
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(använd \"%s\" för att visa den här delen)"
+msgstr "(använd \"%s\" för att visa den här delen)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Bilagor"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<OKÄND>"
+msgstr "<OKÄND>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<standard>"
 
@@ -448,35 +448,31 @@ msgstr ""
 msgid "APOP authentication failed."
 msgstr "APOP-verifiering misslyckades."
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Avbryt"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Meddelandet har inte ändrats. Avbryt?"
+msgstr "Meddelandet har inte ändrats. Avbryt?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Meddelandet har inte ändrats. Avbröt."
+msgstr "Meddelandet har inte ändrats. Avbröt."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adress: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Lade till alias."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "Alias: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Alias"
 
@@ -484,64 +480,60 @@ msgstr "Alias"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Alla matchande nycklar är utgångna, återkallade, eller inaktiverade."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Lägg till"
+msgstr "Alla matchande nycklar är utgångna, återkallade, eller inaktiverade."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "Lägg till meddelanden till %s?"
+msgstr "Lägg till meddelanden till %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Parametern måste vara ett meddelandenummer."
+msgstr "Parametern måste vara ett meddelandenummer."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Bilaga sparad."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Bifoga fil"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "Bifogar valda filer..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Bilaga filtrerad."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Bilaga sparad."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Bilagor"
 
@@ -570,50 +562,50 @@ msgstr ""
 #: lib-sys/mutt_socket.c:334
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr "Dåligt IDN \"%s\"."
+msgstr "Dåligt IDN \"%s\"."
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr "Dåligt IDN %s vid förberedning av \"resent-from\"."
+msgstr "Dåligt IDN %s vid förberedning av \"resent-from\"."
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr "Dåligt IDN i \"%s\": \"%s\""
+msgstr "Dåligt IDN i \"%s\": \"%s\""
 
 #: commands.c:198 recvcmd.c:149
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr "Dåligt IDN: \"%s\""
+msgstr "Dåligt IDN: \"%s\""
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "Dåligt namn på brevlåda"
+msgstr "Dåligt namn på brevlåda"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "Slutet av meddelande visas."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "Återsänd meddelande till %s"
+msgstr "Återsänd meddelande till %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Återsänd meddelandet till: "
+msgstr "Återsänd meddelandet till: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "Återsänd meddelanden till %s"
+msgstr "Återsänd meddelanden till %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Återsänd märkta meddelanden till: "
+msgstr "Återsänd märkta meddelanden till: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -628,18 +620,18 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "Kan inte lägga till folder: %s"
+msgstr "Kan inte lägga till folder: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "Kan inte bifoga en katalog!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Kan inte skapa %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "Kan inte skapa fil %s"
@@ -652,33 +644,33 @@ msgstr "Kan inte skapa filter"
 msgid "Can't create filter process"
 msgstr "Kan inte skapa filterprocess"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Kan inte skapa tillfällig fil"
+msgstr "Kan inte skapa tillfällig fil"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
-msgstr "Kan inte avkoda alla märkta bilagor. MIME-inkapsla de övriga?"
+msgstr "Kan inte avkoda alla märkta bilagor. MIME-inkapsla de övriga?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr "Kan inte avkoda alla märkta bilagor. MIME-vidarebefordra de övriga?"
+msgstr "Kan inte avkoda alla märkta bilagor. MIME-vidarebefordra de övriga?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 msgid "Can't decrypt encrypted message!"
 msgstr "Kan inte avkryptera krypterat meddelande!"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "Kan inte radera bilaga från POP-server."
+msgstr "Kan inte radera bilaga från POP-server."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "Kan inte radera bilaga från POP-server."
+msgstr "Kan inte radera bilaga från POP-server."
 
 #: lib-mx/mx.c:103
 #, c-format
@@ -691,81 +683,77 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Kan inte hitta några märkta meddelanden."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "Kan inte hämta mixmasters type2.list!"
+msgstr "Kan inte hitta några märkta meddelanden."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "Kan inte para ihop namnmall, fortsätt?"
+msgstr "Kan inte para ihop namnmall, fortsätt?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Kan inte öppna meddelandefil: %s"
+msgstr "Kan inte öppna meddelandefil: %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "Kan inte lägga till folder: %s"
+msgstr "Kan inte lägga till folder: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "Anslutning till %s stängd"
+msgstr "Anslutning till %s stängd"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "Stänger anslutning till POP-server..."
+msgstr "Stänger anslutning till POP-server..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "Kan inte ta status på %s: %s"
+msgstr "Kan inte ta status på %s: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "Kan inte skapa %s: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "Kan inte spara meddelande till POP-brevlåda."
+msgstr "Kan inte spara meddelande till POP-brevlåda."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Kan inte redigera meddelande på POP-servern."
+msgstr "Kan inte redigera meddelande på POP-servern."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "Kan inte ta status på %s: %s"
+msgstr "Kan inte ta status på %s: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "Kan inte visa en katalog"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "Kan inte skapa %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Kan inte skriva huvud till tillfällig fil!"
+msgstr "Kan inte skriva huvud till tillfällig fil!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
@@ -773,52 +761,48 @@ msgstr "Kan inte skriva meddelande"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "Kan inte skriva meddelande till tillfällig fil!"
+msgstr "Kan inte skriva meddelande till tillfällig fil!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Kan inte skapa filter för visning"
+msgstr "Kan inte skapa filter för visning"
 
 #: attach.c:473
 msgid "Cannot create filter"
 msgstr "Kan inte skapa filter"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Kan inte växla till skrivläge på en skrivskyddad brevlåda!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Kan inte växla till skrivläge på en skrivskyddad brevlåda!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "Fångade %s...  Avslutar.\n"
+msgstr "Fångade %s...  Avslutar.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "Servercertifikat är inte giltigt än"
+msgstr "Servercertifikat är inte giltigt än"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Certifikat sparat"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Ändringarna i foldern skrivs när foldern lämnas."
+msgstr "Ändringarna i foldern skrivs när foldern lämnas."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Ändringarna i foldern kommer inte att skrivas."
+msgstr "Ändringarna i foldern kommer inte att skrivas."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr "Tecken = %s, Oktal = %o, Decimal = %d"
@@ -826,30 +810,22 @@ msgstr "Tecken = %s, Oktal = %o, Decimal = %d"
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Teckenuppsättning ändrad till %s; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "Ändra katalog"
+msgstr "Teckenuppsättning ändrad till %s; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "Ändra katalog till: "
+msgstr "Ändra katalog till: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "Kollar efter nya meddelanden..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Kontrollera nyckel "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "Kollar efter nya meddelanden..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "Kollar efter nya meddelanden..."
@@ -858,7 +834,7 @@ msgstr "Kollar efter nya meddelanden..."
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Klartext"
 
@@ -866,16 +842,16 @@ msgstr "Klartext"
 msgid "Clear flag"
 msgstr "Ta bort flagga"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Stänger anslutning till %s..."
+msgstr "Stänger anslutning till %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "Stänger anslutning till POP-server..."
+msgstr "Stänger anslutning till POP-server..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "Ansluter till %s..."
@@ -883,18 +859,18 @@ msgstr "Ansluter till %s..."
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "Kommandot TOP stöds inte av servern."
+msgstr "Kommandot TOP stöds inte av servern."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "Kommandot UIDL stöds inte av servern."
+msgstr "Kommandot UIDL stöds inte av servern."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "Skriver ändringar..."
+msgstr "Skriver ändringar..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -903,7 +879,7 @@ msgstr ""
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "Kompilerar sökmönster..."
+msgstr "Kompilerar sökmönster..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
@@ -915,12 +891,12 @@ msgstr "Kopierar till %s..."
 msgid "Compressing %s..."
 msgstr "Kopierar till %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "Ansluter till %s..."
@@ -938,44 +914,44 @@ msgstr "Ansluter till %s..."
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Anslutning tappad. Återanslut till POP-server?"
+msgstr "Anslutning tappad. Återanslut till POP-server?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Anslutning tappad. Återanslut till POP-server?"
+msgstr "Anslutning tappad. Återanslut till POP-server?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "Anslutning till %s stängd"
+msgstr "Anslutning till %s stängd"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "Anslutning till %s stängd"
+msgstr "Anslutning till %s stängd"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "\"Content-Type\" ändrade till %s."
+msgstr "\"Content-Type\" ändrade till %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "\"Content-Type\" har formen bas/undertyp"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "Fortsätt?"
+msgstr "Fortsätt?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "Konvertera till %s vid sändning?"
+msgstr "Konvertera till %s vid sändning?"
 
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "Kopiera%s till brevlåda"
+msgstr "Kopiera%s till brevlåda"
 
 #: imap/message.c:681
 #, c-format
@@ -1012,157 +988,144 @@ msgstr "Kunde inte ansluta till %s (%s)."
 msgid "Could not copy message"
 msgstr "Kunde inte kopiera meddelande"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Kunde inte skapa tillfällig fil!"
+msgstr "Kunde inte skapa tillfällig fil!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Kunde inte skapa tillfällig fil!"
+msgstr "Kunde inte skapa tillfällig fil!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Kunde inte hitta sorteringsfunktion! [Rapportera det här felet]"
+msgstr "Kunde inte hitta sorteringsfunktion! [Rapportera det här felet]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Kunde inte hitta värden \"%s\""
+msgstr "Kunde inte hitta värden \"%s\""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Kunde inte inkludera alla begärda meddelanden!"
+msgstr "Kunde inte inkludera alla begärda meddelanden!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "Kunde inte förhandla fram TLS-anslutning"
+msgstr "Kunde inte förhandla fram TLS-anslutning"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "Kunde inte öppna %s"
+msgstr "Kunde inte öppna %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Kunde inte återöppna brevlåda!"
+msgstr "Kunde inte återöppna brevlåda!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "Kunde inte skicka meddelandet."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "Kunde inte låsa %s\n"
+msgstr "Kunde inte låsa %s\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
 msgstr "Skapa %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Endast IMAP-brevlådor kan skapas"
+msgstr "Endast IMAP-brevlådor kan skapas"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "Skapa brevlåda: "
+msgstr "Skapa brevlåda: "
 
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "Avkoda-kopiera%s till brevlåda"
+msgstr "Avkoda-kopiera%s till brevlåda"
 
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "Avkoda-spara%s till brevlåda"
+msgstr "Avkoda-spara%s till brevlåda"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "Väljer %s..."
+msgstr "Väljer %s..."
 
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "Dekryptera-kopiera%s till brevlåda"
+msgstr "Dekryptera-kopiera%s till brevlåda"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "Dekryptera-spara%s till brevlåda"
+msgstr "Dekryptera-spara%s till brevlåda"
 
-#: postpone.c:506
+#: postpone.c:471
 msgid "Decrypting message..."
 msgstr "Avkrypterar meddelande..."
 
-#: postpone.c:517
+#: postpone.c:482
 msgid "Decryption failed."
 msgstr "Avkryptering misslyckades."
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Ta bort"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "Radera"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Endast IMAP-brevlådor kan tas bort"
+msgstr "Endast IMAP-brevlådor kan tas bort"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "Radera meddelanden från server?"
+msgstr "Radera meddelanden från server?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Radera meddelanden som matchar: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Radera"
 
-#: recvattach.c:993
+#: recvattach.c:981
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "Radering av bilagor från krypterade meddelanden stöds ej."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Beskriv"
+msgstr "Radering av bilagor från krypterade meddelanden stöds ej."
 
 #: lib-lua/madmutt.cpkg:106
 #, fuzzy, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
-msgstr "ID:t %s är overifierad. Vill du använda det till %s?"
+msgstr "ID:t %s är overifierad. Vill du använda det till %s?"
 
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
 msgstr "%s finns inte. Skapa den?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Katalog [%s], filmask: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "FEL: var vänlig rapportera den här buggen"
+msgstr "FEL: var vänlig rapportera den här buggen"
 
-#: send.c:1387
+#: send.c:1381
 msgid "Edit forwarded message?"
 msgstr "Redigera vidarebefordrat meddelande?"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1171,11 +1134,11 @@ msgstr ""
 msgid "Empty expression"
 msgstr "fel i uttryck"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: compose.c:163
+#: compose.c:135
 msgid "Encrypt with: "
 msgstr "Kryptera med: "
 
@@ -1183,32 +1146,32 @@ msgstr "Kryptera med: "
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "Ange nyckel-ID: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "Ange nyckel-ID för %s: "
+msgstr "Ange nyckel-ID för %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 msgid "Enter keys (^G to abort): "
-msgstr "Ange nycklar (^G för att avbryta): "
+msgstr "Ange nycklar (^G för att avbryta): "
 
 #: recvcmd.c:198
 msgid "Error bouncing message!"
-msgstr "Fel vid återsändning av meddelande!"
+msgstr "Fel vid återsändning av meddelande!"
 
 #: recvcmd.c:199
 msgid "Error bouncing messages!"
-msgstr "Fel vid återsändning av meddelanden!"
+msgstr "Fel vid återsändning av meddelanden!"
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "Fel vid sändning av meddelande."
+msgstr "Fel vid sändning av meddelande."
 
 #: pop.c:142
 #, c-format
@@ -1220,7 +1183,7 @@ msgstr "Fel vid anslutning till server: %s"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "Fel vid anslutning till server: %s"
@@ -1229,12 +1192,12 @@ msgstr "Fel vid anslutning till server: %s"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Fel i %s, rad %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Fel i kommandorad: %s\n"
@@ -1244,87 +1207,73 @@ msgstr "Fel i kommandorad: %s\n"
 msgid "Error in expression: %s"
 msgstr "Fel i uttryck: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "Fel vid initiering av terminalen."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "Fel vid initiering av terminalen."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "Fel vid öppning av brevlåda"
+msgstr "Fel vid öppning av brevlåda"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
 msgstr "Fel vid tolkning av adress!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Fel uppstod vid körning av \"%s\"!"
+msgstr "Fel uppstod vid körning av \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Fel vid läsning av katalog."
+msgstr "Fel vid läsning av katalog."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Fel vid sändning av meddelande, barn returnerade %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Fel vid sändning av meddelande, barn returnerade %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Fel vid sändning av meddelande."
+msgstr "Fel vid sändning av meddelande, barn returnerade %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "Fel uppstod vid förbindelsen till %s (%s)"
+msgstr "Fel uppstod vid förbindelsen till %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "Fel vid försök att visa fil"
+msgstr "Fel vid försök att visa fil"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "Fel vid skrivning av brevlåda!"
+msgstr "Fel vid skrivning av brevlåda!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Fel. Sparar tillfällig fil: %s"
+msgstr "Fel. Sparar tillfällig fil: %s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Fel: %s kan inte användas som den sista återpostaren i en kedja."
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr "Fel: '%s' är ett dåligt IDN."
+msgstr "Fel: '%s' är ett dåligt IDN."
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1341,7 +1290,7 @@ msgstr "Fel: \"multipart/signed\" har inget protokoll."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Fel i kommandorad: %s\n"
@@ -1349,27 +1298,18 @@ msgstr "Fel i kommandorad: %s\n"
 #: imap/message.c:109
 #, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Utvärderar cache... [%d/%d]"
+msgstr "Utvärderar cache... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "Kör kommando på matchande meddelanden..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Avsluta"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Avsluta "
+msgstr "Kör kommando på matchande meddelanden..."
 
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
 msgstr "Avsluta Mutt utan att spara?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
 msgstr "Avsluta Mutt?"
@@ -1380,114 +1320,109 @@ msgstr "Radering misslyckades"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "Raderar meddelanden från server..."
+msgstr "Raderar meddelanden från server..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Misslyckades med att öpppna fil för att tolka huvuden."
+msgstr "Misslyckades med att öpppna fil för att tolka huvuden."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Misslyckades med att öppna fil för att ta bort huvuden."
+msgstr "Misslyckades med att öppna fil för att ta bort huvuden."
 
 #: attach.c:151
 msgid "Failure to rename file."
-msgstr "Misslyckades med att döpa om fil."
+msgstr "Misslyckades med att döpa om fil."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Fatalt fel! Kunde inte öppna brevlådan igen!"
+msgstr "Fatalt fel! Kunde inte öppna brevlådan igen!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Fatalt fel. Meddelandeantalet är ur synk!"
+msgstr "Fatalt fel. Meddelandeantalet är ur synk!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "Raderar meddelanden från server..."
+msgstr "Raderar meddelanden från server..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "Hämtar meddelande..."
+msgstr "Hämtar meddelande..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Hämtar lista över meddelanden..."
+msgstr "Hämtar lista över meddelanden..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "Hämtar lista över meddelanden..."
+msgstr "Hämtar lista över meddelanden..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Hämtar meddelandehuvuden... [%d/%d]"
+msgstr "Hämtar meddelandehuvuden... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Hämtar meddelandehuvuden... [%d/%d]"
+msgstr "Hämtar meddelandehuvuden... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "Hämtar meddelande..."
+msgstr "Hämtar meddelande..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "Filmask: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Filen finns, skriv (ö)ver, (l)ägg till, eller (a)vbryt?"
+msgstr "Filen finns, skriv (ö)ver, (l)ägg till, eller (a)vbryt?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Filen är en katalog, spara i den?"
+msgstr "Filen är en katalog, spara i den?"
 
 #: muttlib.c:226
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Filen är en katalog, spara i den? [(j)a, n(ej), (a)lla]"
+msgstr "Filen är en katalog, spara i den? [(j)a, n(ej), (a)lla]"
 
 #: muttlib.c:249
 msgid "File under directory: "
 msgstr "Fil i katalog: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filtrera genom: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Fingeravtryck: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "spara det här meddelandet för att skicka senare"
+msgstr "spara det här meddelandet för att skicka senare"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Svara till %s%s?"
 
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "Svara till %s%s?"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "Vidarebefordra MIME inkapslat?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Vidarebefordra som bilaga?"
 
@@ -1495,140 +1430,125 @@ msgstr "Vidarebefordra som bilaga?"
 msgid "Forward as attachments?"
 msgstr "Vidarebefordra som bilagor?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Funktionen ej tillåten i \"bifoga-meddelande\"-läge."
+msgstr "Funktionen ej tillåten i \"bifoga-meddelande\"-läge."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "Hämtar folderlista..."
+msgstr "Hämtar folderlista..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "Hämtar namnrymder..."
+msgstr "Hämtar namnrymder..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Grupp"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Hjälp"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "Hjälp för %s"
+msgstr "Hjälp för %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "Hjälp visas just nu."
+msgstr "Hjälp visas just nu."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Jag vet inte hur det där ska skrivas ut!"
+msgstr "Jag vet inte hur det där ska skrivas ut!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Jag vet inte hur %s bilagor ska skrivas ut!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr "ID:t har odefinierad giltighet."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "ID:t är utgånget/inaktiverat/återkallat."
+msgstr "ID:t är utgånget/inaktiverat/återkallat."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "ID:t är inte giltigt."
+msgstr "ID:t är inte giltigt."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "ID:t är endast marginellt giltigt."
+msgstr "ID:t är endast marginellt giltigt."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Otillåtet PGP-huvud"
+msgstr "Otillåtet PGP-huvud"
 
-#: postpone.c:434
+#: postpone.c:399
 msgid "Illegal S/MIME header"
-msgstr "Otillåtet S/MIME-huvud"
+msgstr "Otillåtet S/MIME-huvud"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Felaktigt formatterad post för typ %s i \"%s\", rad %d"
+msgstr "Felaktigt formatterad post för typ %s i \"%s\", rad %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr "Inkludera meddelande i svar?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "Inkluderar citerat meddelande..."
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "Infoga"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Ogiltig dag i månaden: %s"
+msgstr "Ogiltig dag i månaden: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "Ogiltig kodning."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "Ogiltigt indexnummer."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
 msgstr "Ogiltigt meddelandenummer."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Ogiltig månad: %s"
+msgstr "Ogiltig månad: %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "Ogiltigt relativt datum: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "Startar PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "Startar PGP..."
@@ -1636,78 +1556,74 @@ msgstr "Startar PGP..."
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Kommando för automatisk visning: %s"
+msgstr "Kommando för automatisk visning: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "Hoppa till meddelande: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "Hoppa till: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Hoppning är inte implementerad för dialoger."
+msgstr "Hoppning är inte implementerad för dialoger."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Nyckel-ID: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Tangenten är inte knuten."
+msgstr "Tangenten är inte knuten."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Tangenten är inte knuten. Tryck \"%s\" för hjälp."
+msgstr "Tangenten är inte knuten. Tryck \"%s\" för hjälp."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "Visa endast meddelanden som matchar: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "Gräns: %s"
+msgstr "Gräns: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "Loggar in..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1715,27 +1631,27 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Låsningsantal överskridet, ta bort låsning för %s?"
+msgstr "Låsningsantal överskridet, ta bort låsning för %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "Loggar in..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "Inloggning misslyckades."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "Söker efter nycklar som matchar \"%s\"..."
+msgstr "Söker efter nycklar som matchar \"%s\"..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "Slår upp %s..."
+msgstr "Slår upp %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Fingeravtryck: %s"
@@ -1744,124 +1660,112 @@ msgstr "Fingeravtryck: %s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME-typ ej definierad. Kan inte visa bilaga."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "Oändlig slinga i macro upptäckt."
+msgstr "Oändlig slinga i macro upptäckt."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Brev"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "Brevet skickades inte."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "Brevet skickat."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "Brevlåda är synkroniserad."
+msgstr "Brevlåda är synkroniserad."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Brevlåda stängd."
+msgstr "Brevlåda stängd."
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Brevlåda skapad."
+msgstr "Brevlåda skapad."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "Brevlådan har tagits bort."
+msgstr "Brevlådan har tagits bort."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "Brevlådan är tom."
+msgstr "Brevlådan är tom."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "Brevlåda är märkt som ej skrivbar. %s"
+msgstr "Brevlåda är märkt som ej skrivbar. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "Brevlådan är skrivskyddad."
+msgstr "Brevlådan är skrivskyddad."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "Brevlåda är oförändrad."
+msgstr "Brevlåda är oförändrad."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "Brevlådan måste ha ett namn."
+msgstr "Brevlådan måste ha ett namn."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "Brevlådan togs inte bort."
+msgstr "Brevlådan togs inte bort."
 
 #: imap/browse.c:306
 msgid "Mailbox renamed."
-msgstr "Brevlåda omdöpt."
+msgstr "Brevlåda omdöpt."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Brevlådan blev skadad!"
+msgstr "Brevlådan blev skadad!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Brevlådan har ändrats externt."
+msgstr "Brevlådan har ändrats externt."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Brevlådan har ändrats externt. Flaggor kan vara felaktiga."
+msgstr "Brevlådan har ändrats externt. Flaggor kan vara felaktiga."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "Brevlådor [%d]"
+msgstr "Brevlådor [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "\"edit\"-posten i mailcap kräver %%s"
+msgstr "\"edit\"-posten i mailcap kräver %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "\"compose\"-posten i mailcap kräver %%s"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Skapa alias"
+msgstr "\"compose\"-posten i mailcap kräver %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "Märker %d meddelanden som raderade..."
+msgstr "Märker %d meddelanden som raderade..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Mask"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "Meddelande återsänt."
+msgstr "Meddelande återsänt."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1871,22 +1775,22 @@ msgstr "Meddelandet kunde inte skrivas ut"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "Meddelandefilen är tom!"
+msgstr "Meddelandefilen är tom!"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Message not bounced."
-msgstr "Meddelande återsändes inte."
+msgstr "Meddelande återsändes inte."
 
 #: editmsg.c:108
 msgid "Message not modified!"
 msgstr "Meddelandet ej modifierat!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Första meddelandet är inte synligt i den här begränsade vyn"
+msgstr "Första meddelandet är inte synligt i den här begränsade vyn"
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "Meddelande uppskjutet."
 
@@ -1894,13 +1798,13 @@ msgstr "Meddelande uppskjutet."
 msgid "Message printed"
 msgstr "Meddelande har skrivits ut"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "Meddelande skrivet."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "Meddelanden återsända."
+msgstr "Meddelanden återsända."
 
 #: commands.c:393
 msgid "Messages could not be printed"
@@ -1908,48 +1812,35 @@ msgstr "Meddelanden kunde inte skrivas ut"
 
 #: commands.c:224 recvcmd.c:179
 msgid "Messages not bounced."
-msgstr "Meddelanden återsändes inte."
+msgstr "Meddelanden återsändes inte."
 
 #: commands.c:390
 msgid "Messages printed"
 msgstr "Meddelanden har skrivits ut"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "Parametrar saknas."
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Mixmaster-kedjor är begränsade till %d element."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster accepterar inte Cc eller Bcc-huvuden."
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Flytta lästa meddelanden till %s?"
+msgstr "Flytta lästa meddelanden till %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Flyttar lästa meddelanden till %s..."
+msgstr "Flyttar lästa meddelanden till %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Ny sökning"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Nytt filnamn: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Ny fil: "
 
@@ -1957,98 +1848,90 @@ msgstr "Ny fil: "
 msgid "New mail in "
 msgstr "Nytt brev i "
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Nya brev i den här brevlådan."
+msgstr "Nya brev i den här brevlådan."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Nästa"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "Nästa sida"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "Ingen verifieringsmetod tillgänglig"
+msgstr "Ingen verifieringsmetod tillgänglig"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Ingen begränsningsparameter hittad! [Rapportera det här felet]"
+msgstr "Ingen begränsningsparameter hittad! [Rapportera det här felet]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Inga poster."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Inga filer matchar filmasken"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Inga inkommande brevlådor definierade."
+msgstr "Inga inkommande brevlådor definierade."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Inget avgränsande mönster är aktivt."
+msgstr "Inget avgränsande mönster är aktivt."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Ingen brevlåda är öppen."
+msgstr "Ingen brevlåda är öppen."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Ingen brevlåda med nya brev."
+msgstr "Ingen brevlåda med nya brev."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "Ingen \"compose\"-post i mailcap för %s, skapar tom fil."
+msgstr "Ingen \"compose\"-post i mailcap för %s, skapar tom fil."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "Ingen \"edit\"-post i mailcap för %s"
+msgstr "Ingen \"edit\"-post i mailcap för %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "Inga sändlistor hittades!"
+msgstr "Inga sändlistor hittades!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "Ingen matchande mailcap-post hittades. Visar som text."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "Inga meddelanden i den foldern."
 
@@ -2056,188 +1939,174 @@ msgstr "Inga meddelanden i den foldern."
 msgid "No messages matched criteria."
 msgstr "Inga meddelanden matchade kriteriet."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "Ingen mer citerad text."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "Inga fler trådar."
+msgstr "Inga fler trådar."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "Ingen mer ociterad text efter citerad text."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "Inga nya brev i POP-brevlåda."
+msgstr "Inga nya brev i POP-brevlåda."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Inga nya meddelanden"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Inget ärende angivet."
+msgstr "Inget ärende angivet."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Inga filer matchar filmasken"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Ingen brevlåda med nya brev."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "Inga uppskjutna meddelanden."
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Ingen brevlåda med nya brev."
-
 #: commands.c:378
 msgid "No printing command has been defined."
 msgstr "Inget utskriftskommando har definierats."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Inga mottagare är angivna!"
+msgstr "Inga mottagare är angivna!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr "Inga mottagare angivna.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
 msgstr "Inga mottagare blev angivna."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "Inget sökmönster."
+msgstr "Inget sökmönster."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Inget ärende angivet."
+msgstr "Inget ärende angivet."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Inget ärende, avbryt sändning?"
+msgstr "Inget ärende, avbryt sändning?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "Inget ämne, avbryt?"
+msgstr "Inget ämne, avbryt?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "Inget ämne, avbryter."
+msgstr "Inget ämne, avbryter."
 
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "Ingen sådan folder"
+msgstr "Ingen sådan folder"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "Inga märkta poster."
+msgstr "Inga märkta poster."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Inga märkta meddelanden är synliga!"
+msgstr "Inga märkta meddelanden är synliga!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Inga märkta meddelanden."
+msgstr "Inga märkta meddelanden."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Inga återställda meddelanden."
+msgstr "Inga återställda meddelanden."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Inga olästa meddelanden"
+msgstr "Inga olästa meddelanden"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "Inga synliga meddelanden."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Inte tillgänglig i den här menyn."
+msgstr "Inte tillgänglig i den här menyn."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "Hittades inte."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 msgid "Nothing to do."
-msgstr "Ingenting att göra."
-
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
+msgstr "Ingenting att göra."
 
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Endast radering av \"multipart\"-bilagor stöds."
+msgstr "Endast radering av \"multipart\"-bilagor stöds."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "Öppna brevlåda"
+msgstr "Öppna brevlåda"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Öppna brevlåda i skrivskyddat läge"
+msgstr "Öppna brevlåda i skrivskyddat läge"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Öppna brevlåda att bifoga meddelande från"
+msgstr "Öppna brevlåda att bifoga meddelande från"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Öppna brevlåda i skrivskyddat läge"
+msgstr "Öppna brevlåda i skrivskyddat läge"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Öppna brevlåda att bifoga meddelande från"
+msgstr "Öppna brevlåda att bifoga meddelande från"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Utdata från sändprocessen"
+msgstr "Utdata från sändprocessen"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? "
+msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
-msgstr "PGP redan valt. Rensa och fortsätt? "
+msgstr "PGP redan valt. Rensa och fortsätt? "
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP-nycklar som matchar <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP-nycklar som matchar <%s>."
@@ -2248,61 +2117,46 @@ msgstr "PGP-signaturen kunde INTE verifieras."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP-signaturen verifierades framgångsrikt."
+msgstr "PGP-signaturen verifierades framgångsrikt."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "POP-värd är inte definierad."
+msgstr "POP-värd är inte definierad."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Första meddelandet är inte tillgängligt."
+msgstr "Första meddelandet är inte tillgängligt."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "Första meddelandet är inte synligt i den här begränsade vyn"
+msgstr "Första meddelandet är inte synligt i den här begränsade vyn"
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "Lösenord för %s@%s: "
+msgstr "Lösenord för %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "Namn: "
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Rör"
-
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "Öppna rör till kommando: "
+msgstr "Öppna rör till kommando: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "Skicka genom rör till: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"Var vänlig och sätt \"hostname\"-variabeln till ett passande värde vid "
-"användande av mixmaster!"
+msgstr "Skicka genom rör till: "
 
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "Skjut upp det här meddelandet?"
+msgstr "Skjut upp det här meddelandet?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "Uppskjutna meddelanden"
 
@@ -2310,23 +2164,15 @@ msgstr "Uppskjutna meddelanden"
 msgid "Preconnect command failed."
 msgstr "\"Preconnect\"-kommandot misslyckades."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Förbereder vidarebefordrat meddelande..."
+msgstr "Förbereder vidarebefordrat meddelande..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Tryck på valfri tangent för att fortsätta..."
-
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "Föreg. sida"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Skriv ut"
+msgstr "Tryck på valfri tangent för att fortsätta..."
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "Skriv ut bilaga?"
 
@@ -2334,13 +2180,13 @@ msgstr "Skriv ut bilaga?"
 msgid "Print message?"
 msgstr "Skriv ut meddelande?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Skriv ut märkta bilagor?"
+msgstr "Skriv ut märkta bilagor?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Skriv ut märkta meddelanden?"
+msgstr "Skriv ut märkta meddelanden?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
@@ -2352,102 +2198,94 @@ msgstr "Rensa %d raderat meddelande?"
 msgid "Purge %d deleted messages?"
 msgstr "Rensa %d raderade meddelanden?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "Sökning"
+msgstr "Sökning"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "Sökning \"%s\""
+msgstr "Sökning \"%s\""
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Sökkommando ej definierat."
+msgstr "Sökkommando ej definierat."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "Sökning: "
+msgstr "Sökning: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Avsluta"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "Avsluta Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "Hämtar namnrymder..."
+msgstr "Hämtar namnrymder..."
 
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "Läser %s..."
+msgstr "Läser %s..."
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "Läser %s... %d"
+msgstr "Läser %s... %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "Läser %s... %d (%d%%)"
+msgstr "Läser %s... %d (%d%%)"
 
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "Läser nya meddelanden (%d byte)..."
+msgstr "Läser nya meddelanden (%d byte)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "Ta bort brevlådan \"%s\"?"
+msgstr "Ta bort brevlådan \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Återkalla uppskjutet meddelande?"
+msgstr "Återkalla uppskjutet meddelande?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Omkodning påverkar bara textbilagor."
+msgstr "Omkodning påverkar bara textbilagor."
 
 #: imap/browse.c:300
 #, c-format
 msgid "Rename failed: %s"
-msgstr "Kunde ej döpa om: %s"
+msgstr "Kunde ej döpa om: %s"
 
-#: browser.c:1020
+#: browser.c:991
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Endast IMAP-brevlådor kan döpas om"
+msgstr "Endast IMAP-brevlådor kan döpas om"
 
 #: imap/browse.c:288
 #, c-format
 msgid "Rename mailbox %s to: "
-msgstr "Döp om brevlådan %s till: "
+msgstr "Döp om brevlådan %s till: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "Byt namn till: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Återöppnar brevlåda..."
-
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Svara"
+msgstr "Återöppnar brevlåda..."
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Svara till %s%s?"
@@ -2457,42 +2295,42 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Omvänt (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng/sp"
+"Omvänt (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng/sp"
 "(a)m?: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "Sök i omvänd ordning efter: "
+msgstr "Sök i omvänd ordning efter: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Sök i omvänd ordning: "
+msgstr "Sök i omvänd ordning: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Sortera omvänt efter (d)atum, (a)lpha, (s)torlek eller i(n)te alls? "
+msgstr "Sortera omvänt efter (d)atum, (a)lpha, (s)torlek eller i(n)te alls? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? "
+msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "S/MIME redan valt. Rensa och fortsätt? "
+msgstr "S/MIME redan valt. Rensa och fortsätt? "
 
 #: commands.c:137
 msgid "S/MIME certificate owner does not match sender."
-msgstr "Ägarens S/MIME-certifikat matchar inte avsändarens."
+msgstr "Ägarens S/MIME-certifikat matchar inte avsändarens."
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME-certifikat som matchar \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "S/MIME-meddelanden utan ledtrådar till innehållet stöds ej."
+msgstr "S/MIME-meddelanden utan ledtrådar till innehållet stöds ej."
 
 #: commands.c:143
 msgid "S/MIME signature could NOT be verified."
@@ -2500,13 +2338,13 @@ msgstr "S/MIME-signaturen kunde INTE verifieras."
 
 #: commands.c:135
 msgid "S/MIME signature successfully verified."
-msgstr "S/MIME-signaturen verifierades framgångsrikt."
+msgstr "S/MIME-signaturen verifierades framgångsrikt."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
 msgstr "SASL-verifiering misslyckades."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Fingeravtryck: %s"
@@ -2514,135 +2352,111 @@ msgstr "Fingeravtryck: %s"
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "SSL-anslutning använder %s (%s)"
+msgstr "SSL-anslutning använder %s (%s)"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Spara"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "Spara en kopia detta meddelande?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Spara till fil: "
 
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "Spara%s till brevlåda"
+msgstr "Spara%s till brevlåda"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "Sparar statusflaggor för meddelanden... [%d/%d]"
+msgstr "Sparar statusflaggor för meddelanden... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Sök"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "Sök efter: "
+msgstr "Sök efter: "
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "Sökning nådde slutet utan att hitta träff"
+msgstr "Sökning nådde slutet utan att hitta träff"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "Sökning nådde början utan att hitta träff"
+msgstr "Sökning nådde början utan att hitta träff"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "Sökning avbruten."
+msgstr "Sökning avbruten."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Sökning är inte implementerad för den här menyn."
+msgstr "Sökning är inte implementerad för den här menyn."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Sökning fortsatte från slutet."
+msgstr "Sökning fortsatte från slutet."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Sökning fortsatte från början."
+msgstr "Sökning fortsatte från början."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "Sök: "
+msgstr "Sök: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Välj"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Välj  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "Välj en återpostarkedja."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "Väljer %s..."
-
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Skicka"
+msgstr "Väljer %s..."
 
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "Skickar i bakgrunden."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "Skickar meddelande..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Servern stängde förbindelsen!"
+msgstr "Servern stängde förbindelsen!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Sätt flagga"
+msgstr "Sätt flagga"
 
 #: commands.c:463
 msgid "Shell command: "
 msgstr "Skalkommando: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Signera"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "Signera som: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "Signera, Kryptera"
 
@@ -2651,170 +2465,166 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Sortera (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng/sp"
+"Sortera (d)atum/(f)rån/(m)ot./(ä)re./(t)ill/t(r)åd/(o)sor./(s)tor./(p)oäng/sp"
 "(a)m?: "
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "Sortera efter (d)atum, (a)lpha, (s)torlek eller i(n)te alls? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Sorterar brevlåda..."
+msgstr "Sorterar brevlåda..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Nyckel-ID: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "Prenumererar på [%s], filmask: %s"
+msgstr "Prenumererar på [%s], filmask: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "Prenumererar på %s..."
+msgstr "Prenumererar på %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "Kontroll av SSL-certifikat"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Märk meddelanden som matchar: "
+msgstr "Märk meddelanden som matchar: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Märk de meddelanden du vill bifoga!"
+msgstr "Märk de meddelanden du vill bifoga!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Märkning stöds inte."
+msgstr "Märkning stöds inte."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Det meddelandet är inte synligt."
+msgstr "Det meddelandet är inte synligt."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL är otillgängligt."
+msgstr "SSL är otillgängligt."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr "Den aktiva bilagan kommer att bli konverterad."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr "Den aktiva bilagan kommer inte att bli konverterad."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "Brevindexet är fel. Försök att öppna brevlådan igen."
+msgstr "Brevindexet är fel. Försök att öppna brevlådan igen."
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "Återpostarkedjan är redan tom."
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "Det finns inga bilagor."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Inga meddelanden."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "Det finns inga underdelar att visa!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Den här IMAP-servern är uråldrig. Mutt fungerar inte med den."
+msgstr "Den här IMAP-servern är uråldrig. Mutt fungerar inte med den."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Det här certifikatet tillhör:"
+msgstr "Det här certifikatet tillhör:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Det här certifikatet är giltigt"
+msgstr "Det här certifikatet är giltigt"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Det här certifikatet utfärdades av:"
+msgstr "Det här certifikatet utfärdades av:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Den här nyckeln kan inte användas: utgången/inaktiverad/återkallad."
+msgstr "Den här nyckeln kan inte användas: utgången/inaktiverad/återkallad."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Tråden innehåller olästa meddelanden."
+msgstr "Tråden innehåller olästa meddelanden."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Trådning ej aktiverat."
+msgstr "Trådning ej aktiverat."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Maxtiden överskreds när \"fcntl\"-låsning försöktes!"
+msgstr "Maxtiden överskreds när \"fcntl\"-låsning försöktes!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Maxtiden överskreds när \"flock\"-låsning försöktes!"
+msgstr "Maxtiden överskreds när \"flock\"-låsning försöktes!"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Början av meddelande visas."
+msgstr "Början av meddelande visas."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
-msgstr "Försöker att extrahera PGP-nycklar...\n"
+msgstr "Försöker att extrahera PGP-nycklar...\n"
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr "Försöker att extrahera S/MIME-certifikat...\n"
+msgstr "Försöker att extrahera S/MIME-certifikat...\n"
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "Fel uppstod vid förbindelsen till %s (%s)"
+msgstr "Fel uppstod vid förbindelsen till %s (%s)"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2826,28 +2636,28 @@ msgstr ""
 msgid "USER authentication failed."
 msgstr "SASL-verifiering misslyckades."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Kunde inte bifoga %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "Kunde inte bifoga!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Kunde inte hämta huvuden från den versionen av IMAP-servern."
+msgstr "Kunde inte hämta huvuden från den versionen av IMAP-servern."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "Kunde inte hämta certifikat från \"peer\""
+msgstr "Kunde inte hämta certifikat från \"peer\""
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Kunde inte lämna meddelanden på server."
+msgstr "Kunde inte lämna meddelanden på server."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "Kunde inte bifoga %s!"
@@ -2855,57 +2665,48 @@ msgstr "Kunde inte bifoga %s!"
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "Kunde inte låsa brevlåda!"
+msgstr "Kunde inte låsa brevlåda!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Kunde inte öppna tillfällig fil!"
+msgstr "Kunde inte öppna tillfällig fil!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Kunde inte öppna tillfällig fil!"
+msgstr "Kunde inte öppna tillfällig fil!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Kunde inte öppna tillfällig fil!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Återställ"
+msgstr "Kunde inte öppna tillfällig fil!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "Återställ meddelanden som matchar: "
+msgstr "Återställ meddelanden som matchar: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "Återställ"
+msgstr "Återställ"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "Okänd \"Content-Type\" %s"
+msgstr "Okänd \"Content-Type\" %s"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "Avslutar prenumeration på %s..."
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "Avslutar prenumeration på %s..."
+msgstr "Avslutar prenumeration på %s..."
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "Avslutar prenumeration på %s..."
+msgstr "Avslutar prenumeration på %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "Avmarkera meddelanden som matchar: "
 
@@ -2916,31 +2717,27 @@ msgstr "Laddar upp meddelande ..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "Använd \"toggle-write\" för att återaktivera skrivning!"
+msgstr "Använd \"toggle-write\" för att återaktivera skrivning!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "Använd nyckel-ID = \"%s\" för %s?"
+msgstr "Använd nyckel-ID = \"%s\" för %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "Användarnamn på %s: "
+msgstr "Användarnamn på %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Ogiltig månad: %s"
+msgstr "Ogiltig månad: %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Ogiltig månad: %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Ogiltig månad: %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
@@ -2950,14 +2747,10 @@ msgstr "Verifiera PGP-signatur?"
 msgid "Verifying message indexes..."
 msgstr "Verifierar meddelandeindex..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Visa bilaga"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "VARNING! Du är på väg att skriva över %s, fortsätt?"
+msgstr "VARNING! Du är på väg att skriva över %s, fortsätt?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2965,29 +2758,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "Serverertifikat har utgått"
+msgstr "Serverertifikat har utgått"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "Serverertifikat har utgått"
+msgstr "Serverertifikat har utgått"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "Servercertifikat är inte giltigt än"
+msgstr "Servercertifikat är inte giltigt än"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "Servercertifikat är inte giltigt än"
+msgstr "Servercertifikat är inte giltigt än"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3002,33 +2795,33 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "Väntar på fcntl-låsning... %d"
+msgstr "Väntar på fcntl-låsning... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "Väntar på \"flock\"-försök... %d"
+msgstr "Väntar på \"flock\"-försök... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "Väntar på svar..."
+msgstr "Väntar på svar..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr "Varning: \"%s\" är ett dåligt IDN."
+msgstr "Varning: \"%s\" är ett dåligt IDN."
 
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Serverertifikat har utgått"
+msgstr "Serverertifikat har utgått"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "Varning: Dåligt IDN \"%s\" i alias \"%s\".\n"
+msgstr "Varning: Dåligt IDN \"%s\" i alias \"%s\".\n"
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Varning: kunde inte spara certifikat"
 
@@ -3049,39 +2842,39 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Vad vi har här är ett misslyckande att skapa en bilaga."
+msgstr "Vad vi har här är ett misslyckande att skapa en bilaga."
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Skrivning misslyckades! Sparade del av brevlåda i %s"
+msgstr "Skrivning misslyckades! Sparade del av brevlåda i %s"
 
 #: attach.c:731
 msgid "Write fault!"
 msgstr "Fel vid skrivning!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "Skriv meddelande till brevlåda"
+msgstr "Skriv meddelande till brevlåda"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
 msgstr "Skriver %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "Skriver meddelande till %s ..."
@@ -3091,90 +2884,72 @@ msgstr "Skriver meddelande till %s ..."
 msgid "Writing messages... %d (%d%%)"
 msgstr "Skriver meddelanden... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "Fel i kommandorad: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
 msgstr "Du har redan definierat ett alias med det namnet!"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "Du har redan valt det första kedjeelementet."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "Du har redan valt det sista kedjeelementet."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "Du är på den första posten."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Du är på den första sidan."
+msgstr "Du är på den första posten."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "Du är på det första meddelandet."
+msgstr "Du är på det första meddelandet."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Du är på den första sidan."
+msgstr "Du är på den första sidan."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Du är på den första tråden."
+msgstr "Du är på den första tråden."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "Du är på den sista posten."
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Du är på den sista sidan."
+msgstr "Du är på den sista posten."
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "Du är på det sista meddelandet."
+msgstr "Du är på det sista meddelandet."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Du är på den sista sidan."
+msgstr "Du är på den sista sidan."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Du kan inte rulla längre ner."
+msgstr "Du kan inte rulla längre ner."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Du kan inte rulla längre upp."
+msgstr "Du kan inte rulla längre upp."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
 msgstr "Du saknar alias!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Du får inte ta bort den enda bilagan."
+msgstr "Du får inte ta bort den enda bilagan."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Du kan bara återsända \"message/rfc822\"-delar."
+msgstr "Du kan bara återsända \"message/rfc822\"-delar."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] Godkänn?"
+msgstr "[%s = %s] Godkänn?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s stöds inte "
+msgstr "[-- %s/%s stöds inte "
 
 #: handler.c:1000
 #, c-format
@@ -3184,91 +2959,91 @@ msgstr "[-- Bilaga #%d"
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Automatisk visning av standardfel gällande %s --]\n"
+msgstr "[-- Automatisk visning av standardfel gällande %s --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- Automatisk visning med %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP-MEDDELANDE BÖRJAR --]\n"
+"[-- PGP-MEDDELANDE BÖRJAR --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- START PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
+msgstr "[-- START PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- START PÅ PGP-SIGNERAT MEDDELANDE --]\n"
+"[-- START PÅ PGP-SIGNERAT MEDDELANDE --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- Kan inte köra %s. --]\n"
+msgstr "[-- Kan inte köra %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- PGP-MEDDELANDE SLUTAR --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- SLUT PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
+msgstr "[-- SLUT PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- SLUT PÅ PGP-SIGNERAT MEDDELANDE --]\n"
+msgstr "[-- SLUT PÅ PGP-SIGNERAT MEDDELANDE --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- Slut på PGP/MIME-krypterad data --]\n"
+msgstr "[-- Slut på PGP/MIME-krypterad data --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- Slut på PGP/MIME-krypterad data --]\n"
+msgstr "[-- Slut på PGP/MIME-krypterad data --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- Slut på S/MIME-krypterad data. --]\n"
+"[-- Slut på S/MIME-krypterad data. --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- Slut på S/MIME-signerad data. --]\n"
+"[-- Slut på S/MIME-signerad data. --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Slut på signerat data --]\n"
+"[-- Slut på signerat data --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[-- Fel : Kan inte visa någon del av \"Multipart/Alternative\"! --]\n"
+msgstr "[-- Fel : Kan inte visa någon del av \"Multipart/Alternative\"! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3276,35 +3051,35 @@ msgstr ""
 "[-- Fel: Inkonsekvent \"multipart/signed\" struktur! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- Fel: Okänt \"multipart/signed\" protokoll %s! --]\n"
+"[-- Fel: Okänt \"multipart/signed\" protokoll %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n"
+msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Fel: kunde inte hitta början av PGP-meddelande! --]\n"
+"[-- Fel: kunde inte hitta början av PGP-meddelande! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n"
+msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3315,75 +3090,75 @@ msgstr ""
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
-"[-- Fel: \"message/external-body\" har ingen åtkomsttypsparameter --]\n"
+"[-- Fel: \"message/external-body\" har ingen åtkomsttypsparameter --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Följande data är PGP/MIME-krypterad --]\n"
+"[-- Följande data är PGP/MIME-krypterad --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Följande data är PGP/MIME-krypterad --]\n"
+"[-- Följande data är PGP/MIME-krypterad --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Följande data är S/MIME-krypterad --]\n"
+"[-- Följande data är S/MIME-krypterad --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- Följande data är S/MIME-signerad --]\n"
+"[-- Följande data är S/MIME-signerad --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Följande data är signerat --]\n"
+"[-- Följande data är signerat --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- Den här %s/%s bilagan "
+msgstr "[-- Den här %s/%s bilagan "
 
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- Den här %s/%s bilagan är inte inkluderad, --]\n"
+msgstr "[-- Den här %s/%s bilagan är inte inkluderad, --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Typ: %s/%s, Kodning: %s, Storlek: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Varning: Kan inte hitta några signaturer. --]\n"
+"[-- Varning: Kan inte hitta några signaturer. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3395,15 +3170,15 @@ msgstr ""
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- och den angivna åtkomsttypen %s stöds inte --]\n"
+msgstr "[-- och den angivna åtkomsttypen %s stöds inte --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- och den angivna externa källan har --]\n"
-"[-- utgått. --]\n"
+"[-- och den angivna externa källan har --]\n"
+"[-- utgått. --]\n"
 
 #: handler.c:1201
 #, c-format
@@ -3413,38 +3188,38 @@ msgstr "[-- namn: %s --]\n"
 #: handler.c:1197
 #, c-format
 msgid "[-- on %s --]\n"
-msgstr "[-- på %s --]\n"
+msgstr "[-- på %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Utgången   "
+msgstr "Utgången   "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
 msgstr "Ogiltig   "
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 #, fuzzy
 msgid "[Revoked]"
-msgstr "Återkallad   "
+msgstr "Återkallad   "
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
@@ -3453,18 +3228,45 @@ msgstr "[ogiltigt datum]"
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[kan inte beräkna]"
+msgstr "[kan inte beräkna]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: ingen adress"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Kan inte hitta några märkta meddelanden."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Kan inte hitta några märkta meddelanden."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Spara en kopia detta meddelande?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "redigera bilagebeskrivning"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "redigera bilagebeskrivning"
@@ -3473,48 +3275,197 @@ msgstr "redigera bilagebeskrivning"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: för många parametrar"
+msgstr "bind: för många parametrar"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Fel vid läsning av katalog."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Ingen brevlåda med nya brev."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: för få parametrar"
+msgstr "color: för få parametrar"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Inga nya meddelanden"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr "konverterar"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Skriv meddelande till brevlåda"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "kunde inte skapa tillfällig folder: %s"
+msgstr "kunde inte skapa tillfällig folder: %s"
 
 #: editmsg.c:89
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "kunde inte avkorta tillfällig brevfolder: %s"
+msgstr "kunde inte avkorta tillfällig brevfolder: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "kunde inte skriva tillfällig brevfolder: %s"
+msgstr "kunde inte skriva tillfällig brevfolder: %s"
 
-#: browser.c:1206
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Inga inkommande brevlådor definierade."
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "dasn"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "standardfärgerna stöds inte"
+msgstr "standardfärgerna stöds inte"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Radera meddelanden från server?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Återställ meddelanden som matchar: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Återställ meddelanden som matchar: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 msgid "dfrsotuzcp"
-msgstr "dfmätrospa"
+msgstr "dfmätrospa"
+
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Redigera vidarebefordrat meddelande?"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
 
 #: lib-mx/compress.c:422
 #, c-format
@@ -3529,31 +3480,118 @@ msgstr "Kopierar till %s..."
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "Väljer %s..."
+msgstr "Väljer %s..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Den aktiva bilagan kommer inte att bli konverterad."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "redigera bilagebeskrivning"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Kan inte skriva meddelande"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Hämtar meddelandehuvuden... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Redigera vidarebefordrat meddelande?"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Spara en kopia detta meddelande?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "tomt mönster"
+msgstr "tomt mönster"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
 msgstr "Kryptera"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Spara en kopia detta meddelande?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3568,17 +3606,17 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
 #: pattern.c:499
 msgid "error in expression"
@@ -3587,17 +3625,17 @@ msgstr "fel i uttryck"
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3607,95 +3645,297 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "fel i mönster vid: %s"
+msgstr "fel i mönster vid: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "fel: okänd operation %d (rapportera det här felet)."
+msgstr "fel: okänd operation %d (rapportera det här felet)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "ksobir"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "ksobir"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec: inga parametrar"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Svara till %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
-#, c-format
-msgid "gpgme_op_keylist_start failed: %s"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
 msgstr ""
 
-#: handler.c:1193
-msgid "has been deleted --]\n"
-msgstr "har raderats --]\n"
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Vidarebefordra som bilagor?"
 
-#: imap/imap.c:941
-msgid "imap_sync_mailbox: EXPUNGE failed"
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Kollar efter nya meddelanden..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Du är på det första meddelandet."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Du är på den sista sidan."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Ingen brevlåda med nya brev."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Fel vid öppning av brevlåda"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Ingen brevlåda med nya brev."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: handler.c:1193
+msgid "has been deleted --]\n"
+msgstr "har raderats --]\n"
+
+#: imap/imap.c:941
+msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE misslyckades"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "ogiltigt huvudfält"
+msgstr "ogiltigt huvudfält"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Ogiltigt indexnummer."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Hoppa till meddelande: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Hoppa till meddelande: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Tråden innehåller olästa meddelanden."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Du är på den första tråden."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Inga olästa meddelanden"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Inga olästa meddelanden"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Spara en kopia detta meddelande?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP-nycklar som matchar <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Återsänd märkta meddelanden till: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Ingen brevlåda med nya brev."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro: tom tangentsekvens"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: för många parametrar"
+msgstr "macro: för många parametrar"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "\"mailcap\"-post för typ %s hittades inte"
+msgstr "\"mailcap\"-post för typ %s hittades inte"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): kunde inte sätta tid på fil"
+msgstr "maildir_commit_message(): kunde inte sätta tid på fil"
+
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
 
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "Meddelanden återsändes inte."
+msgstr "Meddelanden återsändes inte."
 
 #: pattern.c:746
 #, c-format
@@ -3707,77 +3947,421 @@ msgstr "missmatchande parentes: %s"
 msgid "missing parameter"
 msgstr "saknar parameter"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: för få parametrar"
+msgstr "mono: för få parametrar"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Du är på den första posten."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Du är på det första meddelandet."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Du är på den sista posten."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Du är på det sista meddelandet."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Du är på den sista posten."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Du är på den sista sidan."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Inga återställda meddelanden."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Du är på den första posten."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Du är på den första sidan."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Inga återställda meddelanden."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Du är på den första sidan."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "\"multipart\"-meddelande har ingen avgränsningsparameter!"
+msgstr "\"multipart\"-meddelande har ingen avgränsningsparameter!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr "nej"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(ingen brevlåda)"
+msgstr "(ingen brevlåda)"
 
 #: commands.c:788
 msgid "not converting"
 msgstr "konverterar inte"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "tom tangentsekvens"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
-msgstr "öla"
+msgstr "öla"
+
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Öppna brevlåda i skrivskyddat läge"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Öppna brevlåda i skrivskyddat läge"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Återöppnar brevlåda..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
 
-#: init.c:1065
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Återsänd meddelande till %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "prefix är otillåtet med \"reset\""
+msgstr "prefix är otillåtet med \"reset\""
+
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Du är på den första posten."
 
-#: keymap.c:626
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: för många parametrar"
+msgstr "push: för många parametrar"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Återkalla uppskjutet meddelande?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Tråden innehåller olästa meddelanden."
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Kan inte redigera meddelande på POP-servern."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: kunde inte bifoga fil"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Hoppa till meddelande: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Radera meddelanden från server?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "fg"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "fgv"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Spara%s till brevlåda"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Spara%s till brevlåda"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Kan inte redigera meddelande på POP-servern."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "fel i uttryck"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Sök efter: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Kunde inte skicka meddelandet."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Vidarebefordra som bilagor?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Visa endast meddelanden som matchar: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Ingen mer citerad text."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Skriv ut meddelande?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Inga meddelanden i den foldern."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: fel vid %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: fel i %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: läsningen avbruten pga för många fel i %s"
+msgstr "source: läsningen avbruten pga för många fel i %s"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Inga filer matchar filmasken"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
-"sync: mbox modifierad, men inga modifierade meddelanden! (rapportera det här "
+"sync: mbox modifierad, men inga modifierade meddelanden! (rapportera det här "
 "felet)"
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Avmarkera meddelanden som matchar: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Du är på den första tråden."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3788,41 +4372,130 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Ingen mer citerad text."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Omkodning påverkar bara textbilagor."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Inget sökmönster."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Inga olästa meddelanden"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "för få parametrar"
+msgstr "för få parametrar"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "för många parametrar"
+msgstr "för många parametrar"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "redigera bilagebeskrivning"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Återställ meddelanden som matchar: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Återställ meddelanden som matchar: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Återställ meddelanden som matchar: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "\"unhook\": Kan inte ta bort en %s inifrån en %s."
+msgstr "\"unhook\": Kan inte ta bort en %s inifrån en %s."
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "\"unhook\": Kan inte göra \"unhook *\" inifrån en \"hook\"."
+msgstr "\"unhook\": Kan inte göra \"unhook *\" inifrån en \"hook\"."
 
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "\"unhook\": okänd \"hook\"-typ: %s"
+msgstr "\"unhook\": okänd \"hook\"-typ: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "okänt fel"
+msgstr "okänt fel"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Avmarkera meddelanden som matchar: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "redigera bilagebeskrivning"
 
 #: main.c:82
 msgid ""
@@ -3835,12 +4508,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "värde är otillåtet med \"reset\""
+msgstr "värde är otillåtet med \"reset\""
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Bilaga sparad."
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Ny fil: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Skriv meddelande till brevlåda"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "ja"
 
@@ -3848,3 +4552,6 @@ msgstr "ja"
 msgid "yna"
 msgstr "jna"
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/tr.po b/po/tr.po
index ac7ef79..63c42e1 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,36 +6,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutt 1.4i\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2001-06-12 12:47+0200\n"
 "Last-Translator: Fatih Demir <kabalak@gtranslator.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-9\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Imzalanmýþ bilginin sonu --]\n"
+"[-- Imzalanmış bilginin sonu --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -61,45 +61,45 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"yardým:mutt [ -nRyzZ ] [ -e <komuta> ] [ -F <dosya> ] [ -m <tip> ] [ -f "
+"yardım:mutt [ -nRyzZ ] [ -e <komuta> ] [ -F <dosya> ] [ -m <tip> ] [ -f "
 "<dosya ]\n"
 "\tmutt [ -nx ] [ -e <komuta> ] [ -a <dosya> ] [ -F <dosya> ] [ -H <dosya> ] "
 "[-i <dosya> ] [ -s <konu> ] [ -b <adres> ] [ -c <adres> ] <adres> [ ... ]\n"
 "\tmutt [ -n ] [ -e  <komuta> ] [ -F <dosya> ] -p\n"
 "\tmutt -v[v]\n"
 "\n"
-"seçenekler:\n"
+"seçenekler:\n"
 "  -a <dosya>\tiletiye bir dosya ekle\n"
-"  -b <adres>\tbir görünmez kopya adresi (BCC) belirler\n"
+"  -b <adres>\tbir görünmez kopya adresi (BCC) belirler\n"
 "  -c <adres>\tbir kopya adresi (CC) belirler\n"
-"  -e <komuta>\tbaþlangýçta çalýþtýrýlacak bir komuta belirler\n"
+"  -e <komuta>\tbaşlangıçta çalıştırılacak bir komuta belirler\n"
 "  -f <dosya>\tokunacak eposta kutusunu belirler\n"
-"  -F <dosya>\tvarsayýlan muttrc dosyasýna rakip bir dosya belirler\n"
-"  -H <dosya>\tbaþlýðýn okunacak olduðu örnek bir dosya\n"
-"  -i <dosya>\ther cevapta içerilecek bir eklentiyi belirler\n"
-"  -m <tip>\teposta kutularýnýn varsayýlan tipini belirler\n"
-"  -n\t\tMutt'ý sistemdeki Muttrc dosyasýný okumasýndan men eder\n"
-"  -p\t\tbir kaydedilmiþ/býrakýlmýþ iletiyi belirtler\n"
-"  -R\t\teposta kutusunu salt-okunur açar\n"
+"  -F <dosya>\tvarsayılan muttrc dosyasına rakip bir dosya belirler\n"
+"  -H <dosya>\tbaşlığın okunacak olduğu örnek bir dosya\n"
+"  -i <dosya>\ther cevapta içerilecek bir eklentiyi belirler\n"
+"  -m <tip>\teposta kutularının varsayılan tipini belirler\n"
+"  -n\t\tMutt'ı sistemdeki Muttrc dosyasını okumasından men eder\n"
+"  -p\t\tbir kaydedilmiş/bırakılmış iletiyi belirtler\n"
+"  -R\t\teposta kutusunu salt-okunur açar\n"
 "  -s <konu>\tkonuyu belirler\n"
-"  -v\t\tnesil ve denetleme bilgilerini gösterir\n"
-"  -x\t\tmailx gönderme modüsünü taklit et\n"
+"  -v\t\tnesil ve denetleme bilgilerini gösterir\n"
+"  -x\t\tmailx gönderme modüsünü taklit et\n"
 "  -y\t\t'mailboxes' listesinde belirtilen bir eposta kutusunu belirler\n"
-"  -z\t\teposta kutusunda ileti yoksa, hemen çýk\n"
-"  -Z\t\tyeni ileti içeren ilk klasörü göster, yeni ileti yoksa hemen çýk\n"
-"  -h\t\tbu yardým iletisini göster"
+"  -z\t\teposta kutusunda ileti yoksa, hemen çık\n"
+"  -Z\t\tyeni ileti içeren ilk klasörü göster, yeni ileti yoksa hemen çık\n"
+"  -h\t\tbu yardım iletisini göster"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " farklý imzala: "
+msgstr " farklı imzala: "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     %s'e"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   %s'den"
@@ -142,15 +142,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr " (sýralama için '?' iye bas): "
+msgstr " (sıralama için '?' iye bas): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
 msgstr "(devam et)\n"
@@ -158,66 +158,66 @@ msgstr "(devam et)\n"
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Yazabilir yapmak icýn '%s'e basýlýr"
+msgstr " Yazabilir yapmak icın '%s'e basılır"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " bu sýnýrlandýrýlmýþ bakýþta"
+msgstr " bu sınırlandırılmış bakışta"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " iþaretli "
+msgstr " işaretli "
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c : geçersiz komuta"
+msgstr "%c : geçersiz komuta"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c : bu türde desteklenmiyor"
+msgstr "%c : bu türde desteklenmiyor"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d kaldý, %d silindi."
+msgstr "%d kaldı, %d silindi."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d kaldý, %d taþýndý, %d silindi."
+msgstr "%d kaldı, %d taşındı, %d silindi."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s [%s]\n"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s [%s]\n"
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Gerçekten bu anahtarý kullanmak ister misiniz?"
+msgstr "%s Gerçekten bu anahtarı kullanmak ister misiniz?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] deðiþtirildi. Þekillenmeyi yenileyim mi?"
+msgstr "%s [#%d] değiştirildi. Şekillenmeyi yenileyim mi?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] yok!"
@@ -227,10 +227,10 @@ msgstr "%s [#%d] yok!"
 msgid "%s [%d of %d messages read]"
 msgstr "%1$s [ %3$d iletiden %2$d ileti okundu]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s yok. Yaratýlsýn mý?"
+msgstr "%s yok. Yaratılsın mı?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
@@ -242,35 +242,35 @@ msgstr ""
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr ""
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s bir dizin deðil."
+msgstr "%s bir dizin değil."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s bir eposta kutusu deðil!"
+msgstr "%s bir eposta kutusu değil!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s bir eposta kutusu deðildir!"
+msgstr "%s bir eposta kutusu değildir!"
 
 #: sendlib.c:748
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
-msgstr "%s bir eposta kutusu deðildir!"
+msgstr "%s bir eposta kutusu değildir!"
 
 #: sendlib.c:372
 #, c-format
@@ -289,92 +289,92 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s: bilinmeyen tip"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s : renk komuta tarafýndan desteklenmiyor"
+msgstr "%s : renk komuta tarafından desteklenmiyor"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s : komuta sadece indeks nesneleri için geçerlidir"
+msgstr "%s : komuta sadece indeks nesneleri için geçerlidir"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "böyle bir ayar yok : %s"
+msgstr "böyle bir ayar yok : %s"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s : böyle bir renk yok"
+msgstr "%s : böyle bir renk yok"
 
-#: keymap.c:847
+#: keymap.c:839
 #, fuzzy, c-format
 msgid "%s: no such function"
-msgstr "%s: haritada öyle bir iþlev yoktur"
+msgstr "%s: haritada öyle bir işlev yoktur"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s: haritada öyle bir iþlev yoktur"
+msgstr "%s: haritada öyle bir işlev yoktur"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s: böyle bir mönü yoktur"
+msgstr "%s: böyle bir mönü yoktur"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s : böyle bir þey yok"
+msgstr "%s : böyle bir şey yok"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s : çok az argüman verilmiþ"
+msgstr "%s : çok az argüman verilmiş"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: dosyayý eklenemiyor"
+msgstr "%s: dosyayı eklenemiyor"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: dosya eklenemedi.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: bilinmeyen komuta"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: bilinmeyen tip"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s: bilinmeyen veri"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
 msgstr ""
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr ""
@@ -383,15 +383,15 @@ msgstr ""
 msgid "(need 'view-attachments' bound to key!)"
 msgstr ""
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "(eposta kutusu yok)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(r)ed'et, (s)adece bu defalýðýna kabul et"
+msgstr "(r)ed'et, (s)adece bu defalığına kabul et"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(r)ed'et, (s)adece bu defa , (h)erzaman kabul et"
 
@@ -403,28 +403,28 @@ msgstr "(boyut %s bayt) "
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "('%s' ile bu bölüme bakabilirsiniz)"
+msgstr "('%s' ile bu bölüme bakabilirsiniz)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- Eklentiler"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<BILINMIYOR>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<varsayýlan>"
+msgstr "<varsayılan>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -436,37 +436,33 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "APOP doðrulamasý baþarýsýz oldu."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "Iptal"
+msgstr "APOP doğrulaması başarısız oldu."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "Deðiþtirilmemiþ ileti iptal edilsin mi?"
+msgstr "Değiştirilmemiş ileti iptal edilsin mi?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "Deðiþtirilmemiþ ileti iptal edildi."
+msgstr "Değiştirilmemiş ileti iptal edildi."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "Adres:"
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "Lakap eklendi."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "Farklý lakap yarat: "
+msgstr "Farklı lakap yarat: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "Lakaplar"
 
@@ -474,84 +470,80 @@ msgstr "Lakaplar"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Yekin uyan anahtarlarýn süresi bitti yada geri alýndý."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "Ekle"
+msgstr "Yekin uyan anahtarların süresi bitti yada geri alındı."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Iletiler %s'e eklensin mi?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "Argüman bir ileti numarasý olmak zorunda."
+msgstr "Argüman bir ileti numarası olmak zorunda."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "Eklenti kaydedildi."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "Dosya ekle"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "Seçili dosyalar ekleniyor..."
+msgstr "Seçili dosyalar ekleniyor..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "Eklentiler filtra edildi."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "Eklenti kaydedildi."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "Eklentiler"
 
 #: imap/auth.c:83
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
-msgstr "Doðrulanýyor (APOP)..."
+msgstr "Doğrulanıyor (APOP)..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "Doðrulanýyor (APOP)..."
+msgstr "Doğrulanıyor (APOP)..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "Doðrulanýyor (SASL)..."
+msgstr "Doğrulanıyor (SASL)..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "Doðrulanýyor (SASL)..."
+msgstr "Doğrulanıyor (SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -562,12 +554,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -582,9 +574,9 @@ msgstr ""
 msgid "Bad mailbox name"
 msgstr "Eposta kutusunu yarat:"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "Iletinin sonu gösteriliyor."
+msgstr "Iletinin sonu gösteriliyor."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
@@ -602,15 +594,15 @@ msgstr "Iletileri %s'e ilet"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "Iþaretli iletileri ilet:"
+msgstr "Işaretli iletileri ilet:"
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "CLOSE baþarýsýz oldu"
+msgstr "CLOSE başarısız oldu"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -621,58 +613,58 @@ msgstr ""
 msgid "Can't append to folder: %s"
 msgstr "%s dizinine eklenemiyor"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "Bir dizini topyekun ekleyenmiyor!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "%s: %s yaratýlanamadý."
+msgstr "%s: %s yaratılanamadı."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "Dosya %s yaratýlamadý"
+msgstr "Dosya %s yaratılamadı"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "Filtrayý yaratamadým"
+msgstr "Filtrayı yaratamadım"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "Filtra iþlemi yaratýlamadý"
+msgstr "Filtra işlemi yaratılamadı"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "Geçici dosyayý yaratamadým"
+msgstr "Geçici dosyayı yaratamadım"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Yekin iþaretlenmiþ eklentiler çözülemiyor. Geriye kalanlar MIME'yle "
-"þekillendirilsin mi?"
+"Yekin işaretlenmiş eklentiler çözülemiyor. Geriye kalanlar MIME'yle "
+"şekillendirilsin mi?"
 
 #: recvcmd.c:489
 #, fuzzy
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Yekin iþaretlenmiþ eklentiler çözülemiyor. Geriye kalanlar MIME'yle "
-"þekillendirilsin mi?"
+"Yekin işaretlenmiş eklentiler çözülemiyor. Geriye kalanlar MIME'yle "
+"şekillendirilsin mi?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
-msgstr "Iþaretli hýc bir ileti yok."
+msgstr "Işaretli hıc bir ileti yok."
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "Eklenti POP sunucusundan silinemiyor."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "Eklenti POP sunucusundan silinemiyor."
@@ -688,11 +680,7 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "Iþaretli hýc bir ileti yok."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr ""
+msgstr "Işaretli hıc bir ileti yok."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
@@ -701,37 +689,37 @@ msgstr ""
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "Ileti dosyasý %s'yi açamadým"
+msgstr "Ileti dosyası %s'yi açamadım"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
 msgstr "%s dizinine eklenemiyor"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "%s'ye varolan baðlantý kapatýldý"
+msgstr "%s'ye varolan bağlantı kapatıldı"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "POP sunucuya varolan baðlantý kapatýlýyor..."
+msgstr "POP sunucuya varolan bağlantı kapatılıyor..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "Stat edemedim : %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "%s: %s yaratýlanamadý."
+msgstr "%s: %s yaratılanamadı."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
@@ -740,9 +728,9 @@ msgstr "Ileti POP eposta kutusuna kaydedilmiyor."
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "Ileti POP sunucusunda deðiþtirilenemedi."
+msgstr "Ileti POP sunucusunda değiştirilenemedi."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "Stat edemedim : %s"
@@ -751,71 +739,67 @@ msgstr "Stat edemedim : %s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "Bir dizini gösterilmiyor"
+msgstr "Bir dizini gösterilmiyor"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "%s yaratýlamadý."
+msgstr "%s yaratılamadı."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "Baþlýðý geçici bir dosyaya yazamadým!"
+msgstr "Başlığı geçici bir dosyaya yazamadım!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "Iletiyi yazamadým"
+msgstr "Iletiyi yazamadım"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "iletiyi geçici bir dosyaya yazýlamadý!"
+msgstr "iletiyi geçici bir dosyaya yazılamadı!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "Gösterim filtrasýný yaratamadým"
+msgstr "Gösterim filtrasını yaratamadım"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "Filtrayý yaratamadým"
+msgstr "Filtrayı yaratamadım"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Salt-okunur bir eposta kutusu yazýlabilir yapýlamaz!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Salt-okunur bir eposta kutusu yazılabilir yapılamaz!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "%s yakalýnýyor... Çýkýlýyor.\n"
+msgstr "%s yakalınıyor... Çıkılıyor.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "Sunucu sertifikasý daha geçerli deðildir"
+msgstr "Sunucu sertifikası daha geçerli değildir"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "Sertifika kaydedildi"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "Klasöre olan deðiþiklikler çýkýþta kaydedilecektir."
+msgstr "Klasöre olan değişiklikler çıkışta kaydedilecektir."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "Klasöre olan deðiþiklikler kaydedilmeyecektir."
+msgstr "Klasöre olan değişiklikler kaydedilmeyecektir."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -823,81 +807,73 @@ msgstr ""
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "Karakter kümesi deðiþtirildi: %s -> %s"
+msgstr "Karakter kümesi değiştirildi: %s -> %s"
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "Dizine geç"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "Dizine geç: "
+msgstr "Dizine geç: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "Yeni ileti için bakýlýyor..."
+msgstr "Yeni ileti için bakılıyor..."
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "Anahtarý kontrol et  "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "Yeni ileti için bakýlýyor..."
+msgstr "Yeni ileti için bakılıyor..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "Yeni ileti için bakýlýyor..."
+msgstr "Yeni ileti için bakılıyor..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "Temizle"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Iþareti temizle"
+msgstr "Işareti temizle"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "Baðlantý %s kapatýlýyor..."
+msgstr "Bağlantı %s kapatılıyor..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "POP sunucuya varolan baðlantý kapatýlýyor..."
+msgstr "POP sunucuya varolan bağlantı kapatılıyor..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "%s'e baðlanýlýyor..."
+msgstr "%s'e bağlanılıyor..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "TOP komutasý sunucu tarafýndan desteklenmiyor."
+msgstr "TOP komutası sunucu tarafından desteklenmiyor."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "UIDL komutasý sunucu tarafýndan desteklenmiyor."
+msgstr "UIDL komutası sunucu tarafından desteklenmiyor."
 
 #: lib-mx/mbox.c:547
 #, fuzzy
 msgid "Committing changes..."
 msgstr "Arama tabiri denetleniyor..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"Denetleme seçenekleri:"
+"Denetleme seçenekleri:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
@@ -906,60 +882,60 @@ msgstr "Arama tabiri denetleniyor..."
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "%s'e kopyalanýyor..."
+msgstr "%s'e kopyalanıyor..."
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "%s'e kopyalanýyor..."
+msgstr "%s'e kopyalanıyor..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "%s'e baðlanýlýyor..."
+msgstr "%s'e bağlanılıyor..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "%s'e baðlanýlýyor..."
+msgstr "%s'e bağlanılıyor..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "%s'e baðlanýlýyor..."
+msgstr "%s'e bağlanılıyor..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "Baðlantý kayboldu. Yeniden POP sunucusuna baðlanýlsýn mý?"
+msgstr "Bağlantı kayboldu. Yeniden POP sunucusuna bağlanılsın mı?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Baðlantý kayboldu. Yeniden POP sunucusuna baðlanýlsýn mý?"
+msgstr "Bağlantı kayboldu. Yeniden POP sunucusuna bağlanılsın mı?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "%s'ye varolan baðlantý kapatýldý"
+msgstr "%s'ye varolan bağlantı kapatıldı"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "%s'ye varolan baðlantý kapatýldý"
+msgstr "%s'ye varolan bağlantı kapatıldı"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "Içerik tipi %s iye deðiþtirildi."
+msgstr "Içerik tipi %s iye değiştirildi."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Içerik-tipi temel/altçeþit þeklindedir"
+msgstr "Içerik-tipi temel/altçeşit şeklindedir"
 
 #: imap/util.c:135
 msgid "Continue?"
@@ -968,7 +944,7 @@ msgstr "Devam edilsin mi?"
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "Gönderirken %s'ye dönüþtürülsün mü?"
+msgstr "Gönderirken %s'ye dönüştürülsün mü?"
 
 #: commands.c:600
 #, fuzzy, c-format
@@ -978,17 +954,17 @@ msgstr "eposta kutusuna %s%s"
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "%d ileti %s'e kopyalanýyor..."
+msgstr "%d ileti %s'e kopyalanıyor..."
 
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "%d ileti %s'e kopyalanýyor..."
+msgstr "%d ileti %s'e kopyalanıyor..."
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "%s'e kopyalanýyor..."
+msgstr "%s'e kopyalanıyor..."
 
 #: main.c:63
 msgid ""
@@ -1004,52 +980,52 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "%s (%s)'e baðlanýlýnamadý."
+msgstr "%s (%s)'e bağlanılınamadı."
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "Iletiyi kopyalamayadým."
+msgstr "Iletiyi kopyalamayadım."
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "Geçici dosyayý yaratamadým!"
+msgstr "Geçici dosyayı yaratamadım!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "Geçici dosyayý yaratamadým!"
+msgstr "Geçici dosyayı yaratamadım!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "Sýralama iþlevi bulunamadý! [hata raporu yaz]"
+msgstr "Sıralama işlevi bulunamadı! [hata raporu yaz]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "Sunucu \"%s\" bulunamýyor."
+msgstr "Sunucu \"%s\" bulunamıyor."
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "Istenilen her ileti içerilenemedi!"
+msgstr "Istenilen her ileti içerilenemedi!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "TLS baðlantýsý kurulamadý"
+msgstr "TLS bağlantısı kurulamadı"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "%s açýlanamadý"
+msgstr "%s açılanamadı"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "Eposta kutusu yeniden açýlanamadý!"
+msgstr "Eposta kutusu yeniden açılanamadı!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "Ileti gönderilemedi."
+msgstr "Ileti gönderilemedi."
 
 #: lib-mx/mx.c:407
 #, c-format
@@ -1059,11 +1035,11 @@ msgstr "%s kilitlenemedi\n"
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "%s yaratýlsýn mý?"
+msgstr "%s yaratılsın mı?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Yaratma sadece IMAP eposta kutularý için destekleniyor"
+msgstr "Yaratma sadece IMAP eposta kutuları için destekleniyor"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
@@ -1082,7 +1058,7 @@ msgstr "eposta kutusuna %s%s"
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "%s seçiliyor..."
+msgstr "%s seçiliyor..."
 
 #: commands.c:599
 #, fuzzy, c-format
@@ -1094,52 +1070,39 @@ msgstr "eposta kutusuna %s%s"
 msgid "Decrypt-save%s to mailbox"
 msgstr "eposta kutusuna %s%s"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
-msgstr "Ileti alýnýyor..."
+msgstr "Ileti alınıyor..."
 
-#: postpone.c:517
+#: postpone.c:482
 #, fuzzy
 msgid "Decryption failed."
-msgstr "Giriþ baþarýsýz oldu."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "Sil"
+msgstr "Giriş başarısız oldu."
 
-#: remailer.c:433
-msgid "Delete"
-msgstr "Sil"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Silme sadece IMAP eposta kutularý için destekleniyor"
+msgstr "Silme sadece IMAP eposta kutuları için destekleniyor"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
 msgstr "Iletiler sunucudan silinsin mi?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "Tabire uyan iletileri sil: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "Sil"
 
-#: recvattach.c:993
+#: recvattach.c:981
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "PGP iletilerinin eklentilerinin silinmesi desteklenmiyor."
 
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "Anlatým"
-
 #: lib-lua/madmutt.cpkg:106
 #, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
@@ -1148,23 +1111,23 @@ msgstr ""
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s yok. Yaratýlsýn mý?"
+msgstr "%s yok. Yaratılsın mı?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Dizin [%s], Dosya maskesi: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "HATA: bu hatayý lütfen rapor edin"
+msgstr "HATA: bu hatayı lütfen rapor edin"
 
-#: send.c:1387
+#: send.c:1381
 #, fuzzy
 msgid "Edit forwarded message?"
-msgstr "Iletilmiþ ileti hazýrlanýyor..."
+msgstr "Iletilmiş ileti hazırlanıyor..."
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1173,91 +1136,91 @@ msgstr ""
 msgid "Empty expression"
 msgstr "tabirde hata var"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "Þifrele"
+msgstr "Şifrele"
 
-#: compose.c:163
+#: compose.c:135
 #, fuzzy
 msgid "Encrypt with: "
-msgstr "Þifrele"
+msgstr "Şifrele"
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "%s için anahtar numarasýný belirleyin: "
+msgstr "%s için anahtar numarasını belirleyin: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "%s için anahtar numarasýný belirleyin: "
+msgstr "%s için anahtar numarasını belirleyin: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
-msgstr "%s için anahtar numarasýný belirleyin: "
+msgstr "%s için anahtar numarasını belirleyin: "
 
 #: recvcmd.c:198
 #, fuzzy
 msgid "Error bouncing message!"
-msgstr "Iletiyi gönderirken hata oldu."
+msgstr "Iletiyi gönderirken hata oldu."
 
 #: recvcmd.c:199
 #, fuzzy
 msgid "Error bouncing messages!"
-msgstr "Iletiyi gönderirken hata oldu."
+msgstr "Iletiyi gönderirken hata oldu."
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "Iletiyi gönderirken hata oldu."
+msgstr "Iletiyi gönderirken hata oldu."
 
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "%s'e baðlanýlýrken hata oldu"
+msgstr "%s'e bağlanılırken hata oldu"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "%s'e baðlanýlýrken hata oldu"
+msgstr "%s'e bağlanılırken hata oldu"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "%s'de hata var, satýr %d: %s"
+msgstr "%s'de hata var, satır %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Komuta satrýnda hata: %s\n"
+msgstr "Komuta satrında hata: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
 msgstr "Tabirde hata var: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "Komutayý baþlatýrken hata oldu."
+msgstr "Komutayı başlatırken hata oldu."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "Komutayý baþlatýrken hata oldu."
+msgstr "Komutayı başlatırken hata oldu."
 
 #: imap/imap.c:620
 #, fuzzy
@@ -1268,41 +1231,32 @@ msgstr "Eposta kutusunu yazarken hata oldu!"
 msgid "Error parsing address!"
 msgstr "Adresi tararken hata oldu!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "\"%s\" çalýþtýrýlýrken bir hata oluþtu!"
+msgstr "\"%s\" çalıştırılırken bir hata oluştu!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "Dizin taranýrken hata oldu."
+msgstr "Dizin taranırken hata oldu."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "Ileti gönderilirken hata oldu, altiþlem %d ile iptal bitirildi (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "Iletiyi gönderirken hata oldu, altiþlem %d ile bitirildi.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "Iletiyi gönderirken hata oldu."
+msgstr "Ileti gönderilirken hata oldu, altişlem %d ile iptal bitirildi (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "%s'le konuþurken hata oldu (%s)"
+msgstr "%s'le konuşurken hata oldu (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "Dosyayý göstermeye uðraþýrken hata oldu"
+msgstr "Dosyayı göstermeye uğraşırken hata oldu"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
@@ -1311,27 +1265,22 @@ msgstr "Eposta kutusunu yazarken hata oldu!"
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Hata. Geçici dosya %s korunmaya alýndý"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr ""
+msgstr "Hata. Geçici dosya %s korunmaya alındı"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1348,44 +1297,35 @@ msgstr "Hata: multipart/signed protokolu yok."
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Komuta satrýnda hata: %s\n"
+msgstr "Komuta satrında hata: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "Ileti baþlýklarýný alýnýyor... [%d/%d]"
+msgstr "Ileti başlıklarını alınıyor... [%d/%d]"
 
 #: pattern.c:1145
 #, fuzzy
 msgid "Executing command on matching messages..."
-msgstr "Yeni ileti için bakýlýyor..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "Çýk"
+msgstr "Yeni ileti için bakılıyor..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "Çýk  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "Mutt'tan kaydedilmeden çýkýlsýn mý?"
+msgstr "Mutt'tan kaydedilmeden çıkılsın mı?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "Mutt'tan çýkýlsýn mý?"
+msgstr "Mutt'tan çıkılsın mı?"
 
 #: imap/imap.c:898
 #, fuzzy
 msgid "Expunge failed"
-msgstr "CLOSE baþarýsýz oldu"
+msgstr "CLOSE başarısız oldu"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
@@ -1393,112 +1333,107 @@ msgstr "Iletileri sunucudan sil..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "Dosyayý baþlýklarýný taramak için açamadým."
+msgstr "Dosyayı başlıklarını taramak için açamadım."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "Dosyayý baþlýklarýný ayýrmak için açamadým."
+msgstr "Dosyayı başlıklarını ayırmak için açamadım."
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "Dosyayý baþlýklarýný taramak için açamadým."
+msgstr "Dosyayı başlıklarını taramak için açamadım."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "Aðýr hata! Eposta kutusunu yeniden açamadým!"
+msgstr "Ağır hata! Eposta kutusunu yeniden açamadım!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "Aðýr hata. Ileti sayýlarý karýþtý!"
+msgstr "Ağır hata. Ileti sayıları karıştı!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "Iletileri sunucudan sil..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "Ileti alýnýyor..."
+msgstr "Ileti alınıyor..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "Ileti listesi alýnýyor..."
+msgstr "Ileti listesi alınıyor..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "Ileti listesi alýnýyor..."
+msgstr "Ileti listesi alınıyor..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "Ileti baþlýklarýný alýnýyor... [%d/%d]"
+msgstr "Ileti başlıklarını alınıyor... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "Ileti baþlýklarýný alýnýyor... [%d/%d]"
+msgstr "Ileti başlıklarını alınıyor... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "Ileti alýnýyor..."
+msgstr "Ileti alınıyor..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "Dosya aðý: "
+msgstr "Dosya ağı: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "Dosya zaten var, ü(s)tüne yaz, (e)kle yoksa i(p)tal mý?"
+msgstr "Dosya zaten var, ü(s)tüne yaz, (e)kle yoksa i(p)tal mı?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "Dosya bir dizin, dizin altýnda kaydedilsin mi?"
+msgstr "Dosya bir dizin, dizin altında kaydedilsin mi?"
 
 #: muttlib.c:226
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "Dosya bir dizin, dizin altýnda kaydedilsin mi?"
+msgstr "Dosya bir dizin, dizin altında kaydedilsin mi?"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "Dosyayý dizin altýnda kaydet: "
+msgstr "Dosyayı dizin altında kaydet: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "Filtra: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "Parmak izi: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "bu iletiyi sonra göndermek üzere kaydet"
+msgstr "bu iletiyi sonra göndermek üzere kaydet"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "%s%s iye cevap gönderilsin mi?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "%s%s iye cevap gönderilsin mi?"
+msgstr "%s%s iye cevap gönderilsin mi?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr ""
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "Eklenti olarak iletilsin mi?"
 
@@ -1506,223 +1441,204 @@ msgstr "Eklenti olarak iletilsin mi?"
 msgid "Forward as attachments?"
 msgstr "Eklenti olarak iletilsin mi?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "Iþlev ileti eklentie mödüsünde yasaktýr."
+msgstr "Işlev ileti eklentie mödüsünde yasaktır."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "Dizin listesi alýnýyor..."
+msgstr "Dizin listesi alınıyor..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "Isim yüzeyleri alýnýyor..."
+msgstr "Isim yüzeyleri alınıyor..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "K. Cevap"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "Yardým"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "%s yardýmý"
+msgstr "%s yardımı"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "Yardým þu an gösteriliyor."
+msgstr "Yardım şu an gösteriliyor."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "Bunu nasýl yazdýracaðýmý bilinmiyor!"
+msgstr "Bunu nasıl yazdıracağımı bilinmiyor!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "%s eklentilerinin nasýl yazdýrýlacaðý bilinmiyor!"
+msgstr "%s eklentilerinin nasıl yazdırılacağı bilinmiyor!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
-msgstr "Bu anahtarýn süresi bitti/kapalý/geriye alýndý."
+msgstr "Bu anahtarın süresi bitti/kapalı/geriye alındı."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 #, fuzzy
 msgid "ID is not valid."
-msgstr "Bu anahtar numarasýna güvenilmiyor."
+msgstr "Bu anahtar numarasına güvenilmiyor."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 #, fuzzy
 msgid "ID is only marginally valid."
-msgstr "Bu anahtar numarasýna çok az güveniliyor."
+msgstr "Bu anahtar numarasına çok az güveniliyor."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "Geçersiz PGP baþlýðý"
+msgstr "Geçersiz PGP başlığı"
 
-#: postpone.c:434
+#: postpone.c:399
 #, fuzzy
 msgid "Illegal S/MIME header"
-msgstr "Geçersiz PGP baþlýðý"
+msgstr "Geçersiz PGP başlığı"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "\"%2$s\"'de satýr %3$d'de tip %1$s için hatalý birim vardýr"
+msgstr "\"%2$s\"'de satır %3$d'de tip %1$s için hatalı birim vardır"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "Ileti cevap da içerilsin mi?"
+msgstr "Ileti cevap da içerilsin mi?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "Esas metin cevap bazý olarak kullanýlýyor..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "Içer"
+msgstr "Esas metin cevap bazı olarak kullanılıyor..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "Geçersiz ay günü: %s"
+msgstr "Geçersiz ay günü: %s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "Geçersiz þekillendirme."
+msgstr "Geçersiz şekillendirme."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "Geçersiz sýralama numarasý."
+msgstr "Geçersiz sıralama numarası."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "Geçersiz ileti numarasý."
+msgstr "Geçersiz ileti numarası."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "Geçersiz ay : %s"
+msgstr "Geçersiz ay : %s"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "Geçersiz rölatif tarih: %s"
+msgstr "Geçersiz rölatif tarih: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "PGP'yi çaðýrýlýyor..."
+msgstr "PGP'yi çağırılıyor..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "PGP'yi çaðýrýlýyor..."
+msgstr "PGP'yi çağırılıyor..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Otomatik gösterme komuatasý: %s"
+msgstr "Otomatik gösterme komuatası: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Iletiye geç: "
+msgstr "Iletiye geç: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Geç: "
+msgstr "Geç: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "Diyaloklar için hýzlý geçiþ þimdilik mümkün deðildir."
+msgstr "Diyaloklar için hızlı geçiş şimdilik mümkün değildir."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Anahtar numara: 0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Tuþ ayarlanmamýþ."
+msgstr "Tuş ayarlanmamış."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Tuþ ayarlanmamýþ. Yardým için lütfen '%s' basýnýz."
+msgstr "Tuş ayarlanmamış. Yardım için lütfen '%s' basınız."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "Tabire uyan iletilere sýnýrla: "
+msgstr "Tabire uyan iletilere sınırla: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "Sýnýr : %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Sınır : %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "Giriþ yapýlýyor..."
+msgstr "Giriş yapılıyor..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1730,55 +1646,51 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Kilit sýnýrlandýrmasý aþýldý, %s için varolan kilit silinsin mi?"
+msgstr "Kilit sınırlandırması aşıldı, %s için varolan kilit silinsin mi?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "Giriþ yapýlýyor..."
+msgstr "Giriş yapılıyor..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "Giriþ baþarýsýz oldu."
+msgstr "Giriş başarısız oldu."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "\"%s\" tabirine uyan anahtarlar aranýyor..."
+msgstr "\"%s\" tabirine uyan anahtarlar aranıyor..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "%s aranýyor..."
+msgstr "%s aranıyor..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "Parmak izi: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "MIME tipi belirlenmemiþ. Eklenti gösterilemiyor."
+msgstr "MIME tipi belirlenmemiş. Eklenti gösterilemiyor."
 
-#: keymap.c:407
+#: keymap.c:406
 #, fuzzy
 msgid "Macro loop detected."
 msgstr "eposta kutusu silindi."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Gönder"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "eposta gönderilmedi."
+msgstr "eposta gönderilmedi."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "eposta gönderildi."
+msgstr "eposta gönderildi."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
@@ -1786,59 +1698,59 @@ msgstr "Eposta kutusu kontrol edildi."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "Eposta kutusu kapatýldý"
+msgstr "Eposta kutusu kapatıldı"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "Eposta kutusu yaratýldý."
+msgstr "Eposta kutusu yaratıldı."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr "eposta kutusu silindi."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "Eposta kutusu boþtur."
+msgstr "Eposta kutusu boştur."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "eposta kutusu yazýlamayabilir yapýldý. %s"
+msgstr "eposta kutusu yazılamayabilir yapıldı. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
 msgstr "eposta kutusu salt-okunur."
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "eposta kutusu deðiþtirilmedi."
+msgstr "eposta kutusu değiştirilmedi."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
 msgstr "Her eposta kutusunun ismi olmak zorunda."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
 msgstr "eposta kutusu silinmedi."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "Eposta kutusu yaratýldý."
+msgstr "Eposta kutusu yaratıldı."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "Eposta kutusu bozulmuþtur!"
+msgstr "Eposta kutusu bozulmuştur!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "Eposta kutusu deðiþtirilmiþ."
+msgstr "Eposta kutusu değiştirilmiş."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "Eposta kutusu deðiþtirilmiþ. Bazý iþaretlet hatalý olabilir."
+msgstr "Eposta kutusu değiştirilmiş. Bazı işaretlet hatalı olabilir."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "%d eposta kutusu "
@@ -1846,49 +1758,41 @@ msgstr "%d eposta kutusu "
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Mailcap düzenleme birimi %%s gerektiriyor"
+msgstr "Mailcap düzenleme birimi %%s gerektiriyor"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Mailcap düzenleme birimi %%s gerektiriyor"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "Lakap yarat"
+msgstr "Mailcap düzenleme birimi %%s gerektiriyor"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "%d ileti silinmek için iþaretlenmiþ..."
+msgstr "%d ileti silinmek için işaretlenmiş..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "Maske"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "Ileti iletildi."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "Ileti yazdýrýlýmadý"
+msgstr "Ileti yazdırılımadı"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "Ileti dosyasý boþ!"
+msgstr "Ileti dosyası boş!"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
@@ -1897,24 +1801,24 @@ msgstr "Ileti iletildi."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "Ileti deðiþtirilmedi!"
+msgstr "Ileti değiştirilmedi!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "Sýnýrlandýrýlmýþ bakýþta ana ileti görünemez."
+msgstr "Sınırlandırılmış bakışta ana ileti görünemez."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "Ileti kaydedildi."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "Ileti yazdýrýldi"
+msgstr "Ileti yazdırıldi"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "Ileti yazýldý."
+msgstr "Ileti yazıldı."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
@@ -1922,7 +1826,7 @@ msgstr "Iletiler iletildi."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "Iletiler yazdýrýlýmadý"
+msgstr "Iletiler yazdırılımadı"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
@@ -1931,44 +1835,31 @@ msgstr "Iletiler iletildi."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "Iletiler yazdýrýldi"
+msgstr "Iletiler yazdırıldi"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "Eksik argümanlar."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr ""
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster Cc yada Bcc baþlýklarý kabul etmez."
+msgstr "Eksik argümanlar."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "Okunan iletiler %s'e taþýnsýn mý?"
+msgstr "Okunan iletiler %s'e taşınsın mı?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "Okunan iletiler %s'e taþýnýyor..."
+msgstr "Okunan iletiler %s'e taşınıyor..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "Yeni sorgulama"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "Yeni dosya ismi: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "Yeni dosya: "
 
@@ -1977,115 +1868,107 @@ msgstr "Yeni dosya: "
 msgid "New mail in "
 msgstr "%s'de yeni eposta var."
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr "Yeni eposta var!"
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "Ileri"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "Sa. Ileri"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "Doðrulamacýlar eriþilir deðil"
+msgstr "Doğrulamacılar erişilir değil"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "Sýnýrlandýrma verisi bulunamadý! [bu hata rapor edilmesi gerek]"
+msgstr "Sınırlandırma verisi bulunamadı! [bu hata rapor edilmesi gerek]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "Birim yok."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "Dosya maskesine uyan dosya yok"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "Gelen kutularý belirlenmedi."
+msgstr "Gelen kutuları belirlenmedi."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "Sýnýrlandýrma tabiri kullanýmda deðildir."
+msgstr "Sınırlandırma tabiri kullanımda değildir."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "Hiç bir eposta kutusu açýk deðil."
+msgstr "Hiç bir eposta kutusu açık değil."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "Yeni epostalý eposta kutusu yoktur."
+msgstr "Yeni epostalı eposta kutusu yoktur."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "%s için mailcap yazma birimi yok, boþ dosya yaratýlýyor."
+msgstr "%s için mailcap yazma birimi yok, boş dosya yaratılıyor."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "%s için mailcap düzenleme birimi yok"
+msgstr "%s için mailcap düzenleme birimi yok"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "Eposta listesi bulunamadý!"
+msgstr "Eposta listesi bulunamadı!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "Uyan mailcap birimi bulunamadý. Metin olarak gösteriliyor."
+msgstr "Uyan mailcap birimi bulunamadı. Metin olarak gösteriliyor."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Bu klasörde ileti yok."
+msgstr "Bu klasörde ileti yok."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
 msgstr "Tabire uygun ileti yok."
 
-#: pager.c:1955
+#: pager.c:1880
 #, fuzzy
 msgid "No more quoted text."
 msgstr "Daha fazla konum yok."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "Daha fazla konum yok."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr ""
 
@@ -2093,320 +1976,281 @@ msgstr ""
 msgid "No new mail in POP mailbox."
 msgstr "POP eposta kutusunda yeni eposta yok."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "Yeni ileti yok"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "Konu belirlenmemiþ."
+msgstr "Konu belirlenmemiş."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "Dosya maskesine uyan dosya yok"
 
-#: nntp.c:357
+#: nntp.c:360
 msgid "No newsserver defined!"
 msgstr ""
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "Yeni epostalý eposta kutusu yoktur."
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "Kaydedilmiþ ileti yok."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "Yeni epostalý eposta kutusu yoktur."
+msgstr "Kaydedilmiş ileti yok."
 
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "Yazdýrma komutasý belirlenmemiþ."
+msgstr "Yazdırma komutası belirlenmemiş."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "Alýcý belirlenmemiþ!"
+msgstr "Alıcı belirlenmemiş!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "Alýcýlar belirlenmedi.\n"
+msgstr "Alıcılar belirlenmedi.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "Alýcýlar belirlenmemiþ."
+msgstr "Alıcılar belirlenmemiş."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "Arama tabiri yok."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "Konu belirlenmemiþ."
+msgstr "Konu belirlenmemiş."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "Konu yok, gönderme iptal edilsin mi?"
+msgstr "Konu yok, gönderme iptal edilsin mi?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "Konu yok, iptal edilsin mi?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "Konu yok, iptal ediliyor."
 
 #: imap/browse.c:193
 #, fuzzy
 msgid "No such folder"
-msgstr "%s : böyle bir renk yok"
+msgstr "%s : böyle bir renk yok"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "Iþaretlenmiþ birim yok."
+msgstr "Işaretlenmiş birim yok."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "Hiç bir iþaretlenmiþ ileti gözükmüyor ki!"
+msgstr "Hiç bir işaretlenmiş ileti gözükmüyor ki!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "Iþaretli ileti yok."
+msgstr "Işaretli ileti yok."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "Kurtarýlan ileti yok."
+msgstr "Kurtarılan ileti yok."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "Okunmamýþ ileti yok"
+msgstr "Okunmamış ileti yok"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "Görünebilir ileti yok."
+msgstr "Görünebilir ileti yok."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "Bu mönüde yoktur."
+msgstr "Bu mönüde yoktur."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "Bulunmadý."
+msgstr "Bulunmadı."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
-msgstr "%s'e baðlanýlýyor..."
+msgstr "%s'e bağlanılıyor..."
 
-#: remailer.c:435
-msgid "OK"
-msgstr "Oldu"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
 msgstr ""
-"Sadece birden fazla bölümden oluþan eklentilerin silinmesi destekleniyor."
+"Sadece birden fazla bölümden oluşan eklentilerin silinmesi destekleniyor."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "eposta kutusunu aç"
+msgstr "eposta kutusunu aç"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "Eposta kutusunu salt-okunur aç"
+msgstr "Eposta kutusunu salt-okunur aç"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "Iletiye eklenecek iletiyi seçilecek eposta kutusunu seç"
+msgstr "Iletiye eklenecek iletiyi seçilecek eposta kutusunu seç"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "Eposta kutusunu salt-okunur aç"
+msgstr "Eposta kutusunu salt-okunur aç"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "Iletiye eklenecek iletiyi seçilecek eposta kutusunu seç"
+msgstr "Iletiye eklenecek iletiyi seçilecek eposta kutusunu seç"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Gönderme iþleminin geri verisi"
+msgstr "Gönderme işleminin geri verisi"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr ""
-"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, (i)nline, yoksa i(p)talmý? "
+"ş(i)frele, i(m)zala, (f)arklı imzala, i(k)isi de, (i)nline, yoksa i(p)talmı? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "<%s>'e uyan PGP anahtarlarý."
+msgstr "<%s>'e uyan PGP anahtarları."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "<%s>'e uyan PGP anahtarlarý."
+msgstr "<%s>'e uyan PGP anahtarları."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "PGP imzasý doðrulanamadý."
+msgstr "PGP imzası doğrulanamadı."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP imzasý baþarýyla doðrulandý."
+msgstr "PGP imzası başarıyla doğrulandı."
 
 #: pop.c:1216
 msgid "POP host is not defined."
 msgstr "POP sunucusu belirlenmedi."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Kök iletisi yok."
+msgstr "Kök iletisi yok."
 
-#: thread.c:980
+#: thread.c:976
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
-msgstr "Sýnýrlandýrýlmýþ bakýþta ana ileti görünemez."
+msgstr "Sınırlandırılmış bakışta ana ileti görünemez."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "%s@%s için parola: "
+msgstr "%s@%s için parola: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "Þahsi isim: "
-
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "Boru"
+msgstr "Şahsi isim: "
 
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "Komutaya ver: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "Borula: "
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "Mixmaster kullanýrken yerel makina adý doðru belirtilmesi lazým!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr "Iletiyi kaydediyem mi?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "Kaydedilmiþ iletiler"
+msgstr "Kaydedilmiş iletiler"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "Önceden baðlanma komutasý baþarýsýz oldu."
+msgstr "Önceden bağlanma komutası başarısız oldu."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "Iletilmiþ ileti hazýrlanýyor..."
+msgstr "Iletilmiş ileti hazırlanıyor..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "Devam etmek için bir tuþa bas..."
+msgstr "Devam etmek için bir tuşa bas..."
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "Sa. Geri"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "Yazdýr"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "Eklenti yazdýrýlsýn mý?"
+msgstr "Eklenti yazdırılsın mı?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "Ileti yazdýrýlsýn mý?"
+msgstr "Ileti yazdırılsın mı?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "Iþaretli ileti(leri) yazýlsýn mý?"
+msgstr "Işaretli ileti(leri) yazılsın mı?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "Iþaretli iletiler yazdýrýlsýn mý?"
+msgstr "Işaretli iletiler yazdırılsın mı?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Silmek için iþaretlenmiþ %d ileti silinsin mi?"
+msgstr "Silmek için işaretlenmiş %d ileti silinsin mi?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Silmek için iþaretlenmiþ %d ileti silinsin mi?"
+msgstr "Silmek için işaretlenmiş %d ileti silinsin mi?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "Sorgula"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "Sorgulama '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "Sorgulama komutasý belirlenmedi."
+msgstr "Sorgulama komutası belirlenmedi."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "Sorgulama: "
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "Çýk"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "Mutt'tan çýkýlsýn mý?"
+msgstr "Mutt'tan çıkılsın mı?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "Isim yüzeyleri alýnýyor..."
+msgstr "Isim yüzeyleri alınıyor..."
 
 #: lib-mx/mx.c:494
 #, c-format
@@ -2428,51 +2272,47 @@ msgstr "%s okunuyor... %d (%%%d)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "Yeni iletileri okunuyor (%d bayt)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Vallahi mi eposta kutusu \"%s\"'yi sileyim mi?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Kaydedilmiþ ileti açýlsýn mý?"
+msgstr "Kaydedilmiş ileti açılsın mı?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr ""
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
-msgstr "CLOSE baþarýsýz oldu"
+msgstr "CLOSE başarısız oldu"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Yaratma sadece IMAP eposta kutularý için destekleniyor"
+msgstr "Yaratma sadece IMAP eposta kutuları için destekleniyor"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "Eposta kutusunu yarat:"
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "Adýný deðiþtir: "
+msgstr "Adını değiştir: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "Eposta kutusu yeniden açýlýyor..."
-
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "Cevap"
+msgstr "Eposta kutusu yeniden açılıyor..."
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "%s%s iye cevap verilsin mi?"
@@ -2483,28 +2323,28 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"Ters sýralama tipi: (t)arih/(g)önderen/(a)lan/(k)onu/gönder(i)len/k(o)num/dü"
-"(z)enmemiþ/(b)oyut/(p)uan: "
+"Ters sıralama tipi: (t)arih/(g)önderen/(a)lan/(k)onu/gönder(i)len/k(o)num/dü"
+"(z)enmemiş/(b)oyut/(p)uan: "
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr "Ters ara: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "Geriye dönük ara: "
+msgstr "Geriye dönük ara: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "(t)arih, (a)lfabetik,(b)oyuta yada (h)iç mi terse sýralayým?"
+msgstr "(t)arih, (a)lfabetik,(b)oyuta yada (h)iç mi terse sıralayım?"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr ""
-"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, (i)nline, yoksa i(p)talmý? "
+"ş(i)frele, i(m)zala, (f)arklı imzala, i(k)isi de, (i)nline, yoksa i(p)talmı? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
@@ -2512,10 +2352,10 @@ msgstr ""
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
-msgstr "\"%s\"'e uyan PGP anahtarlarý."
+msgstr "\"%s\"'e uyan PGP anahtarları."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
@@ -2524,18 +2364,18 @@ msgstr ""
 #: commands.c:143
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
-msgstr "PGP imzasý doðrulanamadý."
+msgstr "PGP imzası doğrulanamadı."
 
 #: commands.c:135
 #, fuzzy
 msgid "S/MIME signature successfully verified."
-msgstr "PGP imzasý baþarýyla doðrulandý."
+msgstr "PGP imzası başarıyla doğrulandı."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "SASL doðrulamasý baþarasýz oldu."
+msgstr "SASL doğrulaması başarasız oldu."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "Parmak izi: %s"
@@ -2543,22 +2383,18 @@ msgstr "Parmak izi: %s"
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "%s (%s) kullanarak SSL baðlantýsý kuruluyor"
+msgstr "%s (%s) kullanarak SSL bağlantısı kuruluyor"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "Kaydet"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "Bu iletinin bir kopyasýný kaydedeyim mi?"
+msgstr "Bu iletinin bir kopyasını kaydedeyim mi?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "Dosyaya kaydet: "
 
@@ -2570,17 +2406,13 @@ msgstr "eposta kutusuna %s%s"
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "Ileti durum iþaretleri kaydediliyor... [%d/%d]"
+msgstr "Ileti durum işaretleri kaydediliyor... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "Ara"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "Ara: "
 
@@ -2596,84 +2428,68 @@ msgstr ""
 msgid "Search interrupted."
 msgstr "Arama iptal edildi."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Bu mönüde arama þimdilik mümkün deðildir."
+msgstr "Bu mönüde arama şimdilik mümkün değildir."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "Arama sona ulaþtý."
+msgstr "Arama sona ulaştı."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "Arama baþa döndü."
+msgstr "Arama başa döndü."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "Ara: "
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Seç"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Seç  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr ""
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "%s seçiliyor..."
+msgstr "%s seçiliyor..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "Gönder"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "Ardalanda gönderiliyor."
+msgstr "Ardalanda gönderiliyor."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "Ileti gönderiliyor..."
+msgstr "Ileti gönderiliyor..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "Sunucu baðlantýyý kesti!"
+msgstr "Sunucu bağlantıyı kesti!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "Iþareti otur"
+msgstr "Işareti otur"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "Komuta komutasý: "
+msgstr "Komuta komutası: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "Imzala"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "Farklý imzala: "
+msgstr "Farklı imzala: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Imzala ve þifrele"
+msgstr "Imzala ve şifrele"
 
 #: commands.c:406
 #, fuzzy
@@ -2681,37 +2497,33 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"Sýralama tipi: (t)arih/(g)önderen/(a)lan/(k)onu/gönder(i)len/k(o)num/dü(z)"
-"enlenmemiþ/(b)oyut/(p)uan?"
+"Sıralama tipi: (t)arih/(g)önderen/(a)lan/(k)onu/gönder(i)len/k(o)num/dü(z)"
+"enlenmemiş/(b)oyut/(p)uan?"
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "(t)arih, (a)lfabetik,(b)oyuta yada (h)iç mi sýralayým? "
+msgstr "(t)arih, (a)lfabetik,(b)oyuta yada (h)iç mi sıralayım? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "Eposta kutusu sýralanýyor..."
+msgstr "Eposta kutusu sıralanıyor..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Anahtar numara: 0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Abone [%s], Dosya maskesi: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2720,96 +2532,92 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "%s'e abone olunuyor..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "SSL sertifika doðrulamasý"
+msgstr "SSL sertifika doğrulaması"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "Tabire uyan iletileri iþaretle: "
+msgstr "Tabire uyan iletileri işaretle: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Eklemek istediðin iletiler iþaretlenecektir!"
+msgstr "Eklemek istediğin iletiler işaretlenecektir!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "Iþaretleme desteklenmiyor."
+msgstr "Işaretleme desteklenmiyor."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Bu ileti görünemez."
+msgstr "Bu ileti görünemez."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL eriþilir deðil."
+msgstr "SSL erişilir değil."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "Geçerli eklenti dönüþtürülecektir."
+msgstr "Geçerli eklenti dönüştürülecektir."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "Geçerli eklenti dönüþtürülmeyecektir."
+msgstr "Geçerli eklenti dönüştürülmeyecektir."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "Ileti sayýsý yanlýþtýr. Eposta kutusu yeniden açilmasý denenebilir."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr ""
+msgstr "Ileti sayısı yanlıştır. Eposta kutusu yeniden açilması denenebilir."
 
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "Eklemler yok."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "Ileti yok."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "Gösterilecek altbölümler yok!"
+msgstr "Gösterilecek altbölümler yok!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Bu IMAP sunucusu çok eski. Mutt bu sunucuyla çalýþmaz."
+msgstr "Bu IMAP sunucusu çok eski. Mutt bu sunucuyla çalışmaz."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "Sertifikanýn sahibi kuruluþ:"
+msgstr "Sertifikanın sahibi kuruluş:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "Bu sertifika geçerlidir"
+msgstr "Bu sertifika geçerlidir"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "Sertifikayý veren kuruluþ:"
+msgstr "Sertifikayı veren kuruluş:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Bu anahtar kullanýlamaz: süresi bitti/kapalý/geriye alýndý."
+msgstr "Bu anahtar kullanılamaz: süresi bitti/kapalı/geriye alındı."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "Konum okunmamýþ ileti içeriyor."
+msgstr "Konum okunmamış ileti içeriyor."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "Konumlaþtýrma kapalýdýr."
+msgstr "Konumlaştırma kapalıdır."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
@@ -2821,30 +2629,34 @@ msgstr ""
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr ""
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "Iletinin baþý gösteriliyor."
+msgstr "Iletinin başı gösteriliyor."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "%s'le konuþurken hata oldu (%s)"
+msgstr "%s'le konuşurken hata oldu (%s)"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2854,31 +2666,31 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "SASL doðrulamasý baþarasýz oldu."
+msgstr "SASL doğrulaması başarasız oldu."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "%s'yi ekleyemedim!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "Eklenemedi!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "Bu IMAP sunucu neslinden baþlýklarý alýnamýyor."
+msgstr "Bu IMAP sunucu neslinden başlıkları alınamıyor."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 #, fuzzy
 msgid "Unable to get certificate from peer"
-msgstr "baþlangýç dizini belirlenemedi"
+msgstr "başlangıç dizini belirlenemedi"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "Iletiler sunucuda býrakýlamýyor."
+msgstr "Iletiler sunucuda bırakılamıyor."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "%s'yi ekleyemedim!"
@@ -2888,45 +2700,36 @@ msgstr "%s'yi ekleyemedim!"
 msgid "Unable to lock mailbox!"
 msgstr "Eposta kutusunu kilitleyemedim!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "Geçici dosyayý açamadým!"
+msgstr "Geçici dosyayı açamadım!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "Geçici dosyayý açamadým!"
+msgstr "Geçici dosyayı açamadım!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "Geçici dosyayý açamadým!"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "Kurtar"
+msgstr "Geçici dosyayı açamadım!"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "Tabire uyan iletileri kurtar: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "Kurtar"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "Bilinmeyen içerik tipi %s"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "%s'deki abonelik feshediliyor..."
+msgstr "Bilinmeyen içerik tipi %s"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "%s'deki abonelik feshediliyor..."
@@ -2936,59 +2739,51 @@ msgstr "%s'deki abonelik feshediliyor..."
 msgid "Unsubscribing to %s..."
 msgstr "%s'deki abonelik feshediliyor..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "Tabire uyan iletilerden iþareti sil: "
+msgstr "Tabire uyan iletilerden işareti sil: "
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "Ileti yükleniyor..."
+msgstr "Ileti yükleniyor..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "'toggle-write' ile yeniden yazýlabilir yapabilinir!"
+msgstr "'toggle-write' ile yeniden yazılabilir yapabilinir!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "%s için anahtar numara = \"%s\" kullanýlsýn mý?"
+msgstr "%s için anahtar numara = \"%s\" kullanılsın mı?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "%s'deki kullanýcý adý: "
+msgstr "%s'deki kullanıcı adı: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "Geçersiz ay : %s"
+msgstr "Geçersiz ay : %s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Geçersiz ay : %s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Geçersiz ay : %s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "PGP imzasý doðrulansýn mý?"
+msgstr "PGP imzası doğrulansın mı?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "Ileti sayýsýný doðrula..."
+msgstr "Ileti sayısını doğrula..."
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "Eklenti göster"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "IKAZ!   %s'nin üstüne yazmak üzeresin, devam edilsin mi?"
+msgstr "IKAZ!   %s'nin üstüne yazmak üzeresin, devam edilsin mi?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2996,29 +2791,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "Sunucu sertifikasýnýn süresi bitmiþtir"
+msgstr "Sunucu sertifikasının süresi bitmiştir"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "Sunucu sertifikasýnýn süresi bitmiþtir"
+msgstr "Sunucu sertifikasının süresi bitmiştir"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "Sunucu sertifikasý daha geçerli deðildir"
+msgstr "Sunucu sertifikası daha geçerli değildir"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "Sunucu sertifikasý daha geçerli deðildir"
+msgstr "Sunucu sertifikası daha geçerli değildir"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3040,11 +2835,11 @@ msgstr "Cevap bekleniyor..."
 msgid "Waiting for flock attempt... %d"
 msgstr "Cevap bekleniyor..."
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "Cevap bekleniyor..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3052,14 +2847,14 @@ msgstr ""
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "Sunucu sertifikasýnýn süresi bitmiþtir"
+msgstr "Sunucu sertifikasının süresi bitmiştir"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "Ikaz: Sertifika kaydedilemedi"
 
@@ -3079,125 +2874,106 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "Eklenti yaparak burada bir hata oluþtu"
+msgstr "Eklenti yaparak burada bir hata oluştu"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "Yazma baþarýsýz oldu! Eposta kutusunun bir bölümü %s'ye yazýlmýþtýr"
+msgstr "Yazma başarısız oldu! Eposta kutusunun bir bölümü %s'ye yazılmıştır"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "Yazma hatasý!"
+msgstr "Yazma hatası!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "Iletiye eposta kutuma yaz"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "%s yazýlýyor..."
+msgstr "%s yazılıyor..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "Ileti %s iye yazýlýyor..."
+msgstr "Ileti %s iye yazılıyor..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "Iletiler yazýlýyor... %d (%%%d)"
+msgstr "Iletiler yazılıyor... %d (%%%d)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Komuta satrýnda hata: %s\n"
+msgstr "Komuta satrında hata: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "Bu isimli bir lakap zaten tanýmlanmýþ!"
-
-#: remailer.c:603
-#, fuzzy
-msgid "You already have the first chain element selected."
-msgstr "Ilk iletidesiniz."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr ""
+msgstr "Bu isimli bir lakap zaten tanımlanmış!"
 
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr "Ilk birimdesiniz."
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "Ilk sayfadasýnýz."
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr "Ilk iletidesiniz."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "Ilk sayfadasýnýz."
+msgstr "Ilk sayfadasınız."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "Ilk konumdasýnýz."
+msgstr "Ilk konumdasınız."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr "Son birimdesiniz."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "Son sayfadasýnýz."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "Son iletidesiniz."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "Son sayfadasýnýz."
+msgstr "Son sayfadasınız."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "Daha alta geçmek mümkün deðildir."
+msgstr "Daha alta geçmek mümkün değildir."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "Daga yukarýya geçmek mümkün deðildir."
+msgstr "Daga yukarıya geçmek mümkün değildir."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "Hýc bir lakabýn yok!"
+msgstr "Hıc bir lakabın yok!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
 msgstr "Geriye kalan tek eklentii silemezsin."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Sadece ileti yada RFC822 bölümleri iletilebilir."
+msgstr "Sadece ileti yada RFC822 bölümleri iletilebilir."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[ %s = %s] Kabul ediliyor mu?"
@@ -3215,112 +2991,112 @@ msgstr "[-- Eklenti #%d"
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- %s ile otomatik gösterme hatasý --]\n"
+msgstr "[-- %s ile otomatik gösterme hatası --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- %s ile gösteriliyor --]\n"
+msgstr "[-- %s ile gösteriliyor --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP ILETISI BAÞI --]\n"
+"[-- PGP ILETISI BAŞI --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP RESMI ANAHTAR BÖLÜMÜ BAÞI --]\n"
+msgstr "[-- PGP RESMI ANAHTAR BÖLÜMÜ BAŞI --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP IMZALANMIÞ ILETI BAÞI --]\n"
+"[-- PGP IMZALANMIŞ ILETI BAŞI --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- %s çalýþtýrýlamadý --]\n"
+msgstr "[-- %s çalıştırılamadı --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP ILETI SONU --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP RESMI ANAHTAR BÖLÜMÜ SONU --]\n"
+msgstr "[-- PGP RESMI ANAHTAR BÖLÜMÜ SONU --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
-"[-- PGP IMZALANMIÞ ILETI SONU --]\n"
+"[-- PGP IMZALANMIŞ ILETI SONU --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- PGP/MIME ile þifrelenmiþ bilgi sonu --]\n"
+"[-- PGP/MIME ile şifrelenmiş bilgi sonu --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- PGP/MIME ile þifrelenmiþ bilgi sonu --]\n"
+"[-- PGP/MIME ile şifrelenmiş bilgi sonu --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- PGP/MIME ile þifrelenmiþ bilgi sonu --]\n"
+"[-- PGP/MIME ile şifrelenmiş bilgi sonu --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- Imzalanmýþ bilginin sonu --]\n"
+"[-- Imzalanmış bilginin sonu --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Imzalanmýþ bilginin sonu --]\n"
+"[-- Imzalanmış bilginin sonu --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- Hata:  Multipart/Alternative bölümlerinin hiç bir bölümü gösterilemiyor! "
+"[-- Hata:  Multipart/Alternative bölümlerinin hiç bir bölümü gösterilemiyor! "
 "--]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- Hata: Hatalý multipart/signed þekili! --]\n"
+"[-- Hata: Hatalı multipart/signed şekili! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3329,79 +3105,79 @@ msgstr ""
 "[-- Hata: Bilinmeyen multipart/signed protokolu %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Hata: geçici dosya yaratýlamýyor! --]\n"
+msgstr "[-- Hata: geçici dosya yaratılamıyor! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- Hata: PGP iletisinin baþýný bulamadým! --]\n"
+"[-- Hata: PGP iletisinin başını bulamadım! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- Hata: geçici dosya yaratýlamýyor! --]\n"
+msgstr "[-- Hata: geçici dosya yaratılamıyor! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- Hata: Hatalý PGP/MIME iletisi! --]\n"
+"[-- Hata: Hatalı PGP/MIME iletisi! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- Hata: message/external-bods hiç bir eriþim tipi belirlemiyor --]\n"
+msgstr "[-- Hata: message/external-bods hiç bir erişim tipi belirlemiyor --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Bu bilgi PGP/MIME ile þifrelenmiþtir --]\n"
+"[-- Bu bilgi PGP/MIME ile şifrelenmiştir --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Bu bilgi PGP/MIME ile þifrelenmiþtir --]\n"
+"[-- Bu bilgi PGP/MIME ile şifrelenmiştir --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- Bu bilgi PGP/MIME ile þifrelenmiþtir --]\n"
+"[-- Bu bilgi PGP/MIME ile şifrelenmiştir --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- Bu bilgi imzalanmýþtýr --]\n"
+"[-- Bu bilgi imzalanmıştır --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- Bu bilgi imzalanmýþtýr --]\n"
+"[-- Bu bilgi imzalanmıştır --]\n"
 "\n"
 
 #: handler.c:1185
@@ -3417,31 +3193,31 @@ msgstr "[-- Bu %s/%s eklentisi"
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- Tip: %s/%s, Þekillendirme: %s, Boyut: %s --]\n"
+msgstr "[-- Tip: %s/%s, Şekillendirme: %s, Boyut: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Ikaz: Hiç bir imza bulunmamýþtýr. --]\n"
+"[-- Ikaz: Hiç bir imza bulunmamıştır. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- Ikaz: %s/%s imzalarý doðrulanamýyor. --]\n"
+"[-- Ikaz: %s/%s imzaları doğrulanamıyor. --]\n"
 "\n"
 
 #: handler.c:1230
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
-"[-- Bu %s/%s eklentisi içerilmiyor, --]\n"
-"[-- ve ima edilen eriþme tipi %s de desteklenmiyor --]\n"
+"[-- Bu %s/%s eklentisi içerilmiyor, --]\n"
+"[-- ve ima edilen erişme tipi %s de desteklenmiyor --]\n"
 
 #: handler.c:1214
 #, fuzzy
@@ -3449,8 +3225,8 @@ msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- Bu %s/%s eklentisi içerilmiyor, --]\n"
-"[-- ve ima edilen kaynaðýn geçerliliði --]\n"
+"[-- Bu %s/%s eklentisi içerilmiyor, --]\n"
+"[-- ve ima edilen kaynağın geçerliliği --]\n"
 "[-- de bitti. --]\n"
 
 #: handler.c:1201
@@ -3463,107 +3239,283 @@ msgstr "[-- isim: %s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- %s'de --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "Çýk  "
+msgstr "Çık  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "Geçersiz ay : %s"
+msgstr "Geçersiz ay : %s"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[geçersiz tarih]"
+msgstr "[geçersiz tarih]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[hesaplanamýyor]"
+msgstr "[hesaplanamıyor]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "alias: adres yok"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Işaretli hıc bir ileti yok."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Işaretli hıc bir ileti yok."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Bu iletinin bir kopyasını kaydedeyim mi?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "eklenti anlatýmýný düzenle"
+msgstr "eklenti anlatımını düzenle"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "eklenti anlatýmýný düzenle"
+msgstr "eklenti anlatımını düzenle"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: çok fazla argüman"
+msgstr "bind: çok fazla argüman"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Dizin taranırken hata oldu."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Yeni epostalı eposta kutusu yoktur."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "renkli : eksik argüman"
+msgstr "renkli : eksik argüman"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Yeni ileti yok"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
-msgstr "dönüþtürülüyor"
+msgstr "dönüştürülüyor"
+
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Iletiye eposta kutuma yaz"
 
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "geçici dizini yaratamadým : %s"
+msgstr "geçici dizini yaratamadım : %s"
 
 #: editmsg.c:89
 #, fuzzy, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "geçici eposta dizinini yaratamadým : %s"
+msgstr "geçici eposta dizinini yaratamadım : %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "geçici eposta dizinini yaratamadým : %s"
+msgstr "geçici eposta dizinini yaratamadım : %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Gelen kutuları belirlenmedi."
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr "tabh"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "varsayýlan renkler desteklenmiyor"
+msgstr "varsayılan renkler desteklenmiyor"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Iletiler sunucudan silinsin mi?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Tabire uyan iletileri kurtar: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Tabire uyan iletileri kurtar: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "tgakiozbp"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Iletilmiş ileti hazırlanıyor..."
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3572,28 +3524,115 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "%s'e kopyalanýyor..."
+msgstr "%s'e kopyalanıyor..."
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "%s seçiliyor..."
+msgstr "%s seçiliyor..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Geçerli eklenti dönüştürülmeyecektir."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "eklenti anlatımını düzenle"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Iletiyi yazamadım"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Ileti başlıklarını alınıyor... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Iletilmiş ileti hazırlanıyor..."
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Bu iletinin bir kopyasını kaydedeyim mi?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "boþ tabir"
+msgstr "boş tabir"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "Þifrele"
+msgstr "Şifrele"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Bu iletinin bir kopyasını kaydedeyim mi?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
 msgstr "tabirde %s'de hata var"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "tabirde %s'de hata var"
@@ -3623,7 +3662,7 @@ msgstr "tabirde %s'de hata var"
 msgid "error getting secret key `%s': %s\n"
 msgstr "tabirde %s'de hata var"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "tabirde %s'de hata var"
@@ -3662,85 +3701,287 @@ msgstr "tabirde %s'de hata var"
 msgid "error: unknown op %d (report this error)."
 msgstr ""
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "imfkip"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "imfkip"
 
-#: keymap.c:829
+#: keymap.c:821
 #, fuzzy
 msgid "exec: no arguments"
-msgstr "exec: yetersiz argüman sayýsý"
+msgstr "exec: yetersiz argüman sayısı"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
-msgstr ""
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "%s%s iye cevap gönderilsin mi?"
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
-#, c-format
-msgid "gpgme_op_keylist_start failed: %s"
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
 msgstr ""
 
-#: handler.c:1193
-msgid "has been deleted --]\n"
-msgstr "silinmiþtir --]\n"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Eklenti olarak iletilsin mi?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Yeni ileti için bakılıyor..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Ilk iletidesiniz."
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Son sayfadasınız."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Yeni epostalı eposta kutusu yoktur."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Eposta kutusunu yazarken hata oldu!"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Yeni epostalı eposta kutusu yoktur."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: handler.c:1193
+msgid "has been deleted --]\n"
+msgstr "silinmiştir --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "geçersiz baþlýk birimi"
+msgstr "geçersiz başlık birimi"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Geçersiz sıralama numarası."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Iletiye geç: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Iletiye geç: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Konum okunmamış ileti içeriyor."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Ilk konumdasınız."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Okunmamış ileti yok"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Okunmamış ileti yok"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Bu iletinin bir kopyasını kaydedeyim mi?"
 
-#: crypt.cpkg:3122
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
-msgstr "<%s>'e uyan PGP anahtarlarý."
+msgstr "<%s>'e uyan PGP anahtarları."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Işaretli iletileri ilet:"
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Yeni epostalı eposta kutusu yoktur."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: boþ tuþ metni"
+msgstr "macro: boş tuş metni"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: çok fazla argüman"
+msgstr "macro: çok fazla argüman"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "%s için mailcap birimi bulunamadý"
+msgstr "%s için mailcap birimi bulunamadı"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
@@ -3749,83 +3990,427 @@ msgstr "Iletiler iletildi."
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "hatalý parantez : %s"
+msgstr "hatalı parantez : %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "eksik argüman"
+msgstr "eksik argüman"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "siyah-beyaz : eksik argüman"
+msgstr "siyah-beyaz : eksik argüman"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Ilk birimdesiniz."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Ilk iletidesiniz."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Son birimdesiniz."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Son iletidesiniz."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Son birimdesiniz."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Son sayfadasınız."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Kurtarılan ileti yok."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Ilk birimdesiniz."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Ilk sayfadasınız."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Kurtarılan ileti yok."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Ilk sayfadasınız."
 
 #: lib-mime/rfc822parse.c:517
 #, fuzzy
 msgid "multipart message has no boundary parameter!"
 msgstr "Hata: multipart/encrypted protokol verisi yok!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
-msgstr "hayýr"
+msgstr "hayır"
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "(eposta kutusu yok)"
 
 #: commands.c:788
 msgid "not converting"
-msgstr "dönüþtürülmüyor"
+msgstr "dönüştürülmüyor"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "boþ tuþ metni"
+msgstr "boş tuş metni"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr "sep"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Eposta kutusunu salt-okunur aç"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Eposta kutusunu salt-okunur aç"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Eposta kutusu yeniden açılıyor..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Iletiyi %s'e ilet"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr ""
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Ilk birimdesiniz."
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: çok fazla argüman"
+msgstr "push: çok fazla argüman"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Kaydedilmiş ileti açılsın mı?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Konum okunmamış ileti içeriyor."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Ileti POP sunucusunda değiştirilenemedi."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: dosyayı eklenemiyor"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Iletiye geç: "
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Iletiler sunucudan silinsin mi?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "rs"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "rsh"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "eposta kutusuna %s%s"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "eposta kutusuna %s%s"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Ileti POP sunucusunda değiştirilenemedi."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "tabirde hata var"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Ara: "
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Ileti gönderilemedi."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Eklenti olarak iletilsin mi?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Tabire uyan iletilere sınırla: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Daha fazla konum yok."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Ileti yazdırılsın mı?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Bu klasörde ileti yok."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source: %s'de hata var"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source: %s'de hatalar var"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: %s'de oluþan çok fazla hatadan dolayý okuma iptal edildi"
+msgstr "source: %s'de oluşan çok fazla hatadan dolayı okuma iptal edildi"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Dosya maskesine uyan dosya yok"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Tabire uyan iletilerden işareti sil: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Ilk konumdasınız."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3836,22 +4421,92 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Daha fazla konum yok."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+msgid "toggle recoding of this attachment"
+msgstr ""
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Arama tabiri yok."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Okunmamış ileti yok"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "çok az seçenek"
+msgstr "çok az seçenek"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "çok fazla seçenek"
+msgstr "çok fazla seçenek"
+
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
 
-#: init.c:690
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "eklenti anlatýmýný düzenle"
+msgstr "eklenti anlatımını düzenle"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Tabire uyan iletileri kurtar: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Tabire uyan iletileri kurtar: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Tabire uyan iletileri kurtar: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
@@ -3868,10 +4523,28 @@ msgstr ""
 msgid "unhook: unknown hook type: %s"
 msgstr "%s: bilinmeyen tip"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Tabire uyan iletilerden işareti sil: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "eklenti anlatımını düzenle"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3883,12 +4556,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
 msgstr ""
 
-#: lib-ui/curs_lib.c:155
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Eklenti kaydedildi."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Yeni dosya: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Iletiye eposta kutuma yaz"
+
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr "evet"
 
@@ -3896,3 +4600,6 @@ msgstr "evet"
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/uk.po b/po/uk.po
index 8bf10ba..e32c004 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,40 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.3.27/1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2002-01-23 15:14+0200\n"
 "Last-Translator: Andrej N. Gritsenko <andrej@lucky.net>\n"
 "Language-Team: mutt-dev <mutt-dev@mutt.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-u\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"âÁÚÏצ ÐÒÉÚÎÁÞÅÎÎÑ:\n"
+"Базові призначення:\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"îÅ ÐÒÉÚÎÁÞÅΦ ÆÕÎËæ§:\n"
+"Не призначені функції:\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
-msgstr "[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]\n"
+msgstr "[-- Кінець підписаних даних --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -65,48 +65,48 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"×ÉËÏÒÉÓÔÁÎÎÑ: mutt [ -nRyzZ ] [ -e <ËÍÄ> ] [ -F <ÆÁÊÌ> ] [ -m <ÔÉÐ> ] [ -f "
-"<ÆÁÊÌ> ]\n"
-"       mutt [ -nx ] [ -e <ËÍÄ> ] [ -a <ÆÁÊÌ> ] [ -F <ÆÁÊÌ> ] [ -H <ÆÁÊÌ> ] "
-"[ -i <ÆÁÊÌ> ] [ -s <ÔÅÍÁ> ] [ -b <ÁÄÒ> ] [ -c <ÁÄÒ> ] <ÁÄÒ> [ ... ]\n"
-"       mutt [ -n ] [ -e <ËÍÄ> ] [ -F <ÆÁÊÌ> ] -p\n"
+"використання: mutt [ -nRyzZ ] [ -e <кмд> ] [ -F <файл> ] [ -m <тип> ] [ -f "
+"<файл> ]\n"
+"       mutt [ -nx ] [ -e <кмд> ] [ -a <файл> ] [ -F <файл> ] [ -H <файл> ] "
+"[ -i <файл> ] [ -s <тема> ] [ -b <адр> ] [ -c <адр> ] <адр> [ ... ]\n"
+"       mutt [ -n ] [ -e <кмд> ] [ -F <файл> ] -p\n"
 "       mutt -v[v]\n"
 "\n"
-"ÐÁÒÁÍÅÔÒÉ:\n"
-"  -a <ÆÁÊÌ>\tÐÒɤÄÎÁÔÉ ÆÁÊÌ ÄÏ ÌÉÓÔÁ\n"
-"  -b <ÁÄÒÅÓÉ>\t×ËÁÚÁÔÉ ÁÄÒÅÓÉ ÏÔÒÉÍÕ×ÁÞ¦× ÎÅÐÏͦÔÎÉÈ ËÏÐ¦Ê (Bcc)\n"
-"  -c <ÁÄÒÅÓÉ>\t×ËÁÚÁÔÉ ÁÄÒÅÓÉ ÏÔÒÉÍÕ×ÁÞ¦× ËÏÐ¦Ê (Cc)\n"
-"  -e <ËÏÍÁÎÄÁ>\t×ËÁÚÁÔÉ ËÏÍÁÎÄÕ, ÝÏ §§ ×ÉËÏÎÁÔÉ Ð¦ÓÌÑ ¦Î¦Ã¦Á̦ÚÁæ§\n"
-"  -f <ÆÁÊÌ>\t×ËÁÚÁÔÉ, ÑËÕ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÞÉÔÁÔÉ\n"
-"  -F <ÆÁÊÌ>\t×ËÁÚÁÔÉ ÁÌØÔÅÒÎÁÔÉ×ÎÉÊ ÆÁÊÌ muttrc\n"
-"  -H <ÆÁÊÌ>\t×ËÁÚÁÔÉ ÆÁÊÌ, ÝÏ Í¦ÓÔÉÔØ ÛÁÂÌÏÎ ÚÁÇÏÌÏ×ËÕ\n"
-"  -i <ÆÁÊÌ>\t×ËÁÚÁÔÉ ÆÁÊÌ, ÝÏ ÊÏÇÏ ÔÒÅÂÁ ×ËÌÀÞÉÔÉ Õ ×¦ÄÐÏצÄØ\n"
-"  -m <ÔÉÐ>\t×ËÁÚÁÔÉ ÔÉÐ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ\n"
-"  -n\t\t×ËÁÚÕ¤ Mutt ÎÅ ÞÉÔÁÔÉ ÓÉÓÔÅÍÎÉÊ Muttrc\n"
-"  -p\t\t×ÉËÌÉËÁÔÉ ÚÁÌÉÛÅÎÉÊ ÌÉÓÔ\n"
-"  -R\t\tצÄËÒÉÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ\n"
-"  -s <ÔÅÍÁ>\t×ËÁÚÁÔÉ ÔÅÍÕ (× ÐÏÄצÊÎÉÈ ÌÁÐËÁÈ, ÑËÝÏ Í¦ÓÔÉÔØ ÐÒϦÌÉ)\n"
-"  -v\t\tÐÏËÁÚÁÔÉ ×ÅÒÓ¦À ÔÁ ÐÁÒÁÍÅÔÒÉ ËÏÍЦÌÑæ§\n"
-"  -x\t\tÓÉÍÕÌÀ×ÁÔÉ ×¦ÄÐÒÁ×ËÕ mailx\n"
-"  -y\t\t×ÉÂÒÁÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ Ú-ÐÏÍ¦Ö ×ËÁÚÁÎÉÈ Õ `mailboxes'\n"
-"  -z\t\tÏÄÒÁÚÕ ×ÉÊÔÉ, ÑËÝÏ × ÐÏÛÔÏ×¦Ê ÓËÒÉÎØæ ÎÅÍÁ¤ ÖÏÄÎÏÇÏ ÌÉÓÔÁ\n"
-"  -Z\t\tצÄËÒÉÔÉ ÐÅÒÛÕ ÓËÒÉÎØËÕ Ú ÎÏ×ÉÍ ÌÉÓÔÏÍ, ÑËÝÏ ÎÅÍÁ¤ - ÏÄÒÁÚÕ ×ÉÊÔÉ\n"
-"  -h\t\tÃÑ Ð¦ÄËÁÚËÁ"
-
-#: compose.c:152 compose.c:156
+"паÑ\80амеÑ\82Ñ\80и:\n"
+"  -a <файл>\tприєднати файл до листа\n"
+"  -b <адреси>\tвказати адреси отримувачів непомітних копій (Bcc)\n"
+"  -c <адреси>\tвказати адреси отримувачів копій (Cc)\n"
+"  -e <команда>\tвказати команду, що її виконати після ініціалізації\n"
+"  -f <файл>\tвказати, яку поштову скриньку читати\n"
+"  -F <файл>\tвказати альтернативний файл muttrc\n"
+"  -H <файл>\tвказати файл, що містить шаблон заголовку\n"
+"  -i <файл>\tвказати файл, що його треба включити у відповідь\n"
+"  -m <тип>\tвказати тип поштової скриньки\n"
+"  -n\t\tвказує Mutt не читати системний Muttrc\n"
+"  -p\t\tвикликати залишений лист\n"
+"  -R\t\tвідкрити поштову скриньку тільки для читання\n"
+"  -s <тема>\tвказати тему (в подвійних лапках, якщо містить пробіли)\n"
+"  -v\t\tпоказаÑ\82и веÑ\80Ñ\81Ñ\96Ñ\8e Ñ\82а паÑ\80амеÑ\82Ñ\80и компÑ\96лÑ\8fÑ\86Ñ\96Ñ\97\n"
+"  -x\t\tсимулювати відправку mailx\n"
+"  -y\t\tвибрати поштову скриньку з-поміж вказаних у `mailboxes'\n"
+"  -z\t\tодразу вийти, якщо в поштовій скриньці немає жодного листа\n"
+"  -Z\t\tвідкрити першу скриньку з новим листом, якщо немає - одразу вийти\n"
+"  -h\t\tця підказка"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " ЦÄÐÉÓ ÑË:"
+msgstr " пÑ\96дпиÑ\81 Ñ\8fк:"
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
-msgstr "     ÄÏ %s"
+msgstr "     до %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
-msgstr "   ×¦Ä %s"
+msgstr "   від %s"
 
 #: main.c:106
 msgid ""
@@ -146,140 +146,140 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr " ('?' - ÐÅÒÅ̦Ë): "
+msgstr " ('?' - пеÑ\80елÑ\96к): "
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
-msgstr "(ÄÁ̦)\n"
+msgstr "(далі)\n"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr "îÁÔÉÓΦÔØ '%s' ÄÌÑ ÚͦÎÉ ÍÏÖÌÉ×ÏÓÔ¦ ÚÁÐÉÓÕ"
+msgstr "Натисніть '%s' для зміни можливості запису"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " Õ ÃÉÈ ÍÅÖÁÈ ÏÇÌÑÄÕ"
+msgstr " у цих межах огляду"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " ×ÉĦÌÅΦ"
+msgstr " виділені"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c: ÎÅצÒÎÁ ËÏÍÁÎÄÁ"
+msgstr "%c: невірна команда"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "× ÃØÏÍÕ ÒÅÖÉÍÏצ '%c' ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
+msgstr "в цьому режимові '%c' не підтримується"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d ÚÂÅÒÅÖÅÎÏ, %d ÚÎÉÝÅÎÏ."
+msgstr "%d збережено, %d знищено."
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d ÚÂÅÒÅÖÅÎÏ, %d ÐÅÒÅÎÅÓÅÎÏ, %d ÚÎÉÝÅÎÏ."
+msgstr "%d збережено, %d перенесено, %d знищено."
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s ÷É ÓÐÒÁ×Ħ ÂÁÖÁ¤ÔÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ËÌÀÞ?"
+msgstr "%s Ви справді бажаєте використовувати ключ?"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] ÚͦÎÅÎÏ. úͦÎÉÔÉ ËÏÄÕ×ÁÎÎÑ?"
+msgstr "%s [#%d] змінено. Змінити кодування?"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] ¦ÌØÛÅ ÎÅ ¦ÓÎÕ¤!"
+msgstr "%s [#%d] більше не існує!"
 
 #: pop.c:1323
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [%d Ú %d ÌÉÓÔ¦× ÐÒÏÞÉÔÁÎÏ]"
+msgstr "%s [%d з %d листів прочитано]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s ÎÅ ¦ÓÎÕ¤. óÔ×ÏÒÉÔÉ ÊÏÇÏ?"
+msgstr "%s не існує. Створити його?"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s - ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÛÌÑÈ IMAP"
+msgstr "%s - неприпустимий шлях IMAP"
 
 #: pop.c:1034 pop.c:1231
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s - ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÛÌÑÈ POP"
+msgstr "%s - неприпустимий шлях POP"
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, fuzzy, c-format
 msgid "%s is an invalid newsgroup specification!"
-msgstr "%s - ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÛÌÑÈ POP"
+msgstr "%s - неприпустимий шлях POP"
 
-#: nntp.c:371
+#: nntp.c:373
 #, fuzzy, c-format
 msgid "%s is an invalid newsserver specification!"
-msgstr "%s - ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÛÌÑÈ POP"
+msgstr "%s - неприпустимий шлях POP"
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s ÎÅ ¤ ËÁÔÁÌÏÇÏÍ."
+msgstr "%s не є каталогом."
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s ÎÅ ¤ ÐÏÛÔÏ×ÏÀ ÓËÒÉÎØËÏÀ!"
+msgstr "%s не є поштовою скринькою!"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s ÎÅ ¤ ÐÏÛÔÏ×ÏÀ ÓËÒÉÎØËÏÀ."
+msgstr "%s не є поштовою скринькою."
 
 #: sendlib.c:748
 #, c-format
 msgid "%s isn't a regular file."
-msgstr "%s ÎÅ ¤ Ú×ÉÞÁÊÎÉÍ ÆÁÊÌÏÍ."
+msgstr "%s не є звичайним файлом."
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s ¦ÌØÛÅ ÎÅ ¦ÓÎÕ¤!"
+msgstr "%s більше не існує!"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -293,142 +293,142 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
-msgstr "%s: ÎÅצÄÏÍÉÊ ÔÉÐ"
+msgstr "%s: невідомий тип"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: ËÏÌ¦Ò ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ term"
+msgstr "%s: колір не підтримується term"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s: ËÏÍÁÎÄÁ ÍÏÖÌÉ×Á Ô¦ÌØËÉ Õ ÓÐÉÓËÏצ ÌÉÓÔ¦×"
+msgstr "%s: команда можлива тільки у спискові листів"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: ÔÁËÏÇÏ ÁÔÒ¦ÂÕÔÕ ÎÅÍÁ¤"
+msgstr "%s: такого атрібуту немає"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s: ÔÁËÏÇÏ ËÏÌØÏÒÕ ÎÅÍÁ¤"
+msgstr "%s: такого кольору немає"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
-msgstr "ÆÕÎËÃ¦Ñ '%s' ÎÅ ¦ÓÎÕ¤"
+msgstr "функція '%s' не існує"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "ÆÕÎËÃ¦Ñ '%s' ÎÅ ¦ÓÎÕ¤ × ËÁÒÔ¦"
+msgstr "функція '%s' не існує в карті"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "ÍÅÎÀ '%s' ÎÅ ¦ÓÎÕ¤"
+msgstr "меню '%s' не існує"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s: ÔÁËÏÇÏ ÏÂ'¤ËÔÕ ÎÅÍÁ¤"
+msgstr "%s: такого об'єкту немає"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s: ÄÕÖÅ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦×"
+msgstr "%s: дуже мало аргументів"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: ÎÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ÆÁÊÌ"
+msgstr "%s: неможливо додати файл"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s: ÎÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ÆÁÊÌ.\n"
+msgstr "%s: неможливо додати файл.\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s: ÎÅצÄÏÍÁ ËÏÍÁÎÄÁ"
+msgstr "%s: невідома команда"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s: ÎÅצÄÏÍÉÊ ÔÉÐ"
+msgstr "%s: невідомий тип"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: ÎÅצÄÏÍÁ ÚͦÎÎÁ"
+msgstr "%s: невідома змінна"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s"
-msgstr "%s - ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÛÌÑÈ POP"
+msgstr "%s - неприпустимий шлях POP"
 
-#: init.c:1175
+#: init.c:1172
 #, fuzzy, c-format
 msgid "'%s' is invalid for $%s\n"
-msgstr "%s - ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÛÌÑÈ POP"
+msgstr "%s - неприпустимий шлях POP"
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(ÔÒÅÂÁ ÐÒÉÚÎÁÞÉÔÉ ËÌÁצÛÕ ÄÏ 'view-attachments'!)"
+msgstr "(треба призначити клавішу до 'view-attachments'!)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "(ÓËÒÉÎØËÉ ÎÅÍÁ¤)"
+msgstr "(скриньки немає)"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
-msgstr "(r)ÎÅ ÐÒÉÊÍÁÔÉ, (o)ÐÒÉÊÎÑÔÉ ÏÄÎÏÒÁÚÏ×Ï"
+msgstr "(r)не приймати, (o)прийняти одноразово"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr "(r)ÎÅ ÐÒÉÊÍÁÔÉ, ÐÒÉÊÎÑÔÉ (o)ÏÄÎÏÒÁÚÏ×Ï ÁÂÏ (a)ÚÁ×ÖÄÉ"
+msgstr "(r)не приймати, прийняти (o)одноразово або (a)завжди"
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(ÒÏÚÍ. %s ÂÁÊÔ) "
+msgstr "(розм. %s байт) "
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "(×ÉËÏÒÉÓÔÏ×ÕÊÔÅ '%s' ÄÌÑ Ã¦¤§ ÞÁÓÔÉÎÉ)"
+msgstr "(використовуйте '%s' для цієї частини)"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- äÏÄÁÔËÉ"
+msgstr "-- Додатки"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr ""
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<ÚÁ ÚÍÏ×ÞÁÎÎÑÍ>"
+msgstr "<за змовчанням>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -440,122 +440,114 @@ msgstr ""
 
 #: pop.c:325
 msgid "APOP authentication failed."
-msgstr "ðÏÍÉÌËÁ ÁÕÔÅÎÔÉƦËÁæ§ APOP."
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "÷¦ÄͦÎÁ"
+msgstr "Помилка аутентифікації APOP."
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "÷¦ÄͦÎÉÔÉ ×¦ÄÐÒÁ×ËÕ ÎÅ ÚͦÎÅÎÏÇÏ ÌÉÓÔÁ?"
+msgstr "Відмінити відправку не зміненого листа?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "ìÉÓÔ ÎÅ ÚͦÎÅÎÏ, ÔÏÍÕ ×¦ÄÐÒÁ×ËÕ ×¦ÄͦÎÅÎÏ."
+msgstr "Лист не змінено, тому відправку відмінено."
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "áÄÒÅÓÁ: "
+msgstr "Адреса: "
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "ðÓÅ×ÄÏÎ¦Í ÄÏÄÁÎÏ."
+msgstr "Псевдонім додано."
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "ðÓÅ×ÄÏÎ¦Í ÑË: "
+msgstr "Псевдонім як: "
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "ðÓÅ×ÄÏΦÍÉ"
+msgstr "Псевдоніми"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "÷Ó¦ צÄÐÏצÄΦ ËÌÀÞ¦ ÄÁ×Φ/ÚÁͦÎÅΦ."
-
-#: remailer.c:431
-msgid "Append"
-msgstr "äÏÄÁÔÉ"
+msgstr "Всі відповідні ключі давні/замінені."
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "äÏÄÁÔÉ ÌÉÓÔÉ ÄÏ %s?"
+msgstr "Додати листи до %s?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "áÒÇÕÍÅÎÔ ÐÏ×ÉÎÅÎ ÂÕÔÉ ÎÏÍÅÒÏÍ ÌÉÓÔÁ."
+msgstr "Аргумент повинен бути номером листа."
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "äÏÄÁÔÏË ÚÁÐÉÓÁÎÏ."
+msgstr "Додаток записано."
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "äÏÄÁÔÉ ÆÁÊÌ"
+msgstr "Додати файл"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "äÏÄÁ×ÁÎÎÑ ×ÉÂÒÁÎÉÈ ÆÁÊ̦×..."
+msgstr "Додавання вибраних файлів..."
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "äÏÄÁÔÏË ÏÔƦÌØÔÒÏ×ÁÎÏ."
+msgstr "Додаток отфільтровано."
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "äÏÄÁÔÏË ÚÁÐÉÓÁÎÏ."
+msgstr "Додаток записано."
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "äÏÄÁÔËÉ"
+msgstr "Додатки"
 
 #: imap/auth.c:83
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
-msgstr "áÕÔÅÎÔÉƦËÁÃ¦Ñ (APOP)..."
+msgstr "Аутентифікація (APOP)..."
 
 #: pop.c:304
 msgid "Authenticating (APOP)..."
-msgstr "áÕÔÅÎÔÉƦËÁÃ¦Ñ (APOP)..."
+msgstr "Аутентифікація (APOP)..."
 
 #: pop.c:221
 msgid "Authenticating (SASL)..."
-msgstr "áÕÔÅÎÔÉƦËÁÃ¦Ñ (SASL)..."
+msgstr "Аутентифікація (SASL)..."
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "áÕÔÅÎÔÉƦËÁÃ¦Ñ (SASL)..."
+msgstr "Аутентифікація (SASL)..."
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -566,12 +558,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -583,37 +575,37 @@ msgstr ""
 
 #: imap/imap.c:1342
 msgid "Bad mailbox name"
-msgstr "ðÏÇÁÎÅ ¦Í'Ñ ÄÌÑ ÓËÒÉÎØËÉ"
+msgstr "Погане ім'я для скриньки"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "÷É ÂÁÞÉÔŠ˦ÎÅÃØ ÌÉÓÔÁ."
+msgstr "Ви бачите кінець листа."
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "îÁĦÓÌÁÔÉ ËÏЦÀ ÌÉÓÔÁ %s"
+msgstr "Надіслати копію листа %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "îÁĦÓÌÁÔÉ ËÏЦÀ ÌÉÓÔÁ: "
+msgstr "Надіслати копію листа: "
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "îÁĦÓÌÁÔÉ ËÏЦ§ ÌÉÓÔ¦× %s"
+msgstr "Надіслати копії листів %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "îÁĦÓÌÁÔÉ ËÏЦ§ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×: "
+msgstr "Надіслати копії виділених листів: "
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 msgid "CLOSE failed"
-msgstr "ðÏÍÉÌËÁ CLOSE"
+msgstr "Помилка CLOSE"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -622,63 +614,63 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, c-format
 msgid "Can't append to folder: %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ÄÏ ÓËÒÉÎØËÉ: %s"
+msgstr "Неможливо додати до скриньки: %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ËÁÔÁÌÏÇ!"
+msgstr "Неможливо додати каталог!"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ %s: %s."
+msgstr "Неможливо створити %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÆÁÊÌ %s"
+msgstr "Неможливо створити файл %s"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ"
+msgstr "Неможливо створити фільтр"
 
 #: commands.c:290 commands.c:317 commands.c:334
 msgid "Can't create filter process"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÐÒÏÃÅÓ Æ¦ÌØÔÒÕ"
+msgstr "Неможливо створити процес фільтру"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ"
+msgstr "Неможливо створити тимчасовий файл"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÅËÏÄÕ×ÁÔÉ ×Ó¦ ×ÉĦÌÅΦ ÄÏÄÁÔËÉ. ëÁÐÓÕÌÀ×ÁÔÉ §È Õ MIME?"
+msgstr "Неможливо декодувати всі виділені додатки. Капсулювати їх у MIME?"
 
 #: recvcmd.c:489
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÅËÏÄÕ×ÁÔÉ ×Ó¦ ×ÉĦÌÅΦ ÄÏÄÁÔËÉ. ðÅÒÅÓÉÌÁÔÉ §È MIME?"
+msgstr "Неможливо декодувати всі виділені додатки. Пересилати їх MIME?"
 
-#: recvattach.c:856
+#: recvattach.c:846
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
-msgstr "îÅ ÚÎÁÊÄÅÎÏ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×."
+msgstr "Не знайдено виділених листів."
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
-msgstr "îÅÍÏÖÌÉ×Ï ×ÉÄÁÌÉÔÉ ÄÏÄÁÔÏË Ú ÓÅÒ×ÅÒÁ POP."
+msgstr "Неможливо видалити додаток з сервера POP."
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "îÅÍÏÖÌÉ×Ï ×ÉÄÁÌÉÔÉ ÄÏÄÁÔÏË Ú ÓÅÒ×ÅÒÁ POP."
+msgstr "Неможливо видалити додаток з сервера POP."
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "îÅ ×ÉÊÛÌÏ ÚÁÂÌÏËÕ×ÁÔÉ %s.\n"
+msgstr "Не вийшло заблокувати %s.\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -686,134 +678,126 @@ msgstr ""
 
 #: recvcmd.c:724
 msgid "Can't find any tagged messages."
-msgstr "îÅ ÚÎÁÊÄÅÎÏ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×."
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ type2.list mixmaster'Á!"
+msgstr "Не знайдено виділених листів."
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "îÅÍÁ¤ צÄÐÏצÄÎÏÇÏ ¦ÍÅΦ, ÄÁ̦?"
+msgstr "Немає відповідного імені, далі?"
 
 #: editmsg.c:115
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ ÐÏצÄÏÍÌÅÎÎÑ: %s"
+msgstr "Неможливо відкрити файл повідомлення: %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ ÄÏ ÓËÒÉÎØËÉ: %s"
+msgstr "Неможливо додати до скриньки: %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "ú'¤ÄÎÁÎÎÑ Ú %s ÚÁËÒÉÔÏ"
+msgstr "З'єднання з %s закрито"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ POP..."
+msgstr "Закриття з'єднання з сервером POP..."
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÄÁΦ: %s"
+msgstr "Неможливо отримати дані: %s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ %s: %s."
+msgstr "Неможливо створити %s: %s."
 
 #: muttlib.c:310
 msgid "Can't save message to POP mailbox."
-msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÌÉÓÔ ÄÏ ÓËÒÉÎØËÉ POP."
+msgstr "Неможливо записати лист до скриньки POP."
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "îÅÍÏÖÌÉ×Ï ÒÅÄÁÇÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÎÁ POP ÓÅÒ×ÅÒ¦."
+msgstr "Неможливо редагувати повідомлення на POP сервері."
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, c-format
 msgid "Can't stat %s: %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÄÁΦ %s: %s"
+msgstr "Неможливо отримати дані %s: %s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ËÁÔÁÌÏÇ"
+msgstr "Неможливо побачити каталог"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ %s."
+msgstr "Неможливо створити %s."
 
 #: pop.c:888
 msgid "Can't write header to temporary file!"
-msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÚÁÇÏÌÏ×ÏË ÄÏ ÔÉÍÞÁÓÏ×ÏÇÏ ÆÁÊÌÕ!"
+msgstr "Неможливо записати заголовок до тимчасового файлу!"
 
 #: lib-mx/mbox.c:864
 msgid "Can't write message"
-msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÌÉÓÔ"
+msgstr "Неможливо записати лист"
 
 #: pop.c:1420
 msgid "Can't write message to temporary file!"
-msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÄÏ ÔÉÍÞÁÓÏ×ÏÇÏ ÆÁÊÌÕ!"
+msgstr "Неможливо записати повідомлення до тимчасового файлу!"
 
 #: commands.c:71
 msgid "Cannot create display filter"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ ×¦ÄÏÂÒÁÖÅÎÎÑ"
+msgstr "Неможливо створити фільтр відображення"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Æ¦ÌØÔÒ"
+msgstr "Неможливо створити фільтр"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "÷צÍËÎÕÔÉ ÚÁÐÉÓ ÓËÒÉÎØËÉ, ÝÏ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ, ÎÅÍÏÖÌÉ×Ï!"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "Ввімкнути запис скриньки, що тільки для читання, неможливо!"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "ïÔÒÉÍÁÎÏ %s...  ÷ÉÈÏÄÖÕ.\n"
+msgstr "Отримано %s...  Виходжу.\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
-msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ÝŠΊĦÊÓÎÉÊ"
+msgstr "Сертифікат серверу ще не дійсний"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
-msgstr "óÅÒÔÉƦËÁÔ ÚÂÅÒÅÖÅÎÏ"
+msgstr "Сертифікат збережено"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "úͦÎÉ Õ ÓËÒÉÎØæ ÂÕÄÅ ÚÁÐÉÓÁÎÏ ÐÏ ×ÉÈÏÄÕ Ú Îŧ."
+msgstr "Зміни у скриньці буде записано по виходу з неї."
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "úͦÎÉ Õ ÓËÒÉÎØæ ÎÅ ÂÕÄÅ ÚÁÐÉÓÁÎÏ."
+msgstr "Зміни у скриньці не буде записано."
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -821,171 +805,163 @@ msgstr ""
 #: commands.c:786
 #, c-format
 msgid "Character set changed to %s; %s."
-msgstr "ëÏÄÕ×ÁÎÎÑ ÚͦÎÅÎÏ ÎÁ %s; %s."
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "ëÁÔÁÌÏÇ"
+msgstr "Кодування змінено на %s; %s."
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "ðÅÒÅÊÔÉ ÄÏ: "
+msgstr "Перейти до: "
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "ðÅÒÅצÒËÁ ÎÁÑ×ÎÏÓÔ¦ ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ..."
-
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "ðÅÒÅצÒËÁ  "
+msgstr "Перевірка наявності нових повідомлень..."
 
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
-msgstr "ðÅÒÅצÒËÁ ÎÁÑ×ÎÏÓÔ¦ ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ..."
+msgstr "Перевірка наявності нових повідомлень..."
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "ðÅÒÅצÒËÁ ÎÁÑ×ÎÏÓÔ¦ ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ..."
+msgstr "Перевірка наявності нових повідомлень..."
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "îÅ ÚÁÓÔÏÓÏ×Õ×ÁÔÉ"
+msgstr "Не застосовувати"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "úÎÑÔÉ ÆÌÁÇ"
+msgstr "Зняти флаг"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
-msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú %s..."
+msgstr "Закриття з'єднання з %s..."
 
 #: pop.c:170
 msgid "Closing connection to POP server..."
-msgstr "úÁËÒÉÔÔÑ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ POP..."
+msgstr "Закриття з'єднання з сервером POP..."
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
+msgstr "З'єднання з %s..."
 
 #: pop.c:600 pop.c:863
 #, c-format
 msgid "Command TOP is not supported by server."
-msgstr "ëÏÍÁÎÄÁ TOP ΊЦÄÔÒÉÍÕ¤ÔØÓÑ ÓÅÒ×ÅÒÏÍ."
+msgstr "Команда TOP не підтримується сервером."
 
 #: pop.c:602 pop.c:966
 #, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "ëÏÍÁÎÄÁ UIDL ΊЦÄÔÒÉÍÕ¤ÔØÓÑ ÓÅÒ×ÅÒÏÍ."
+msgstr "Команда UIDL не підтримується сервером."
 
 #: lib-mx/mbox.c:547
 msgid "Committing changes..."
-msgstr "÷ÎÅÓÅÎÎÑ ÚͦÎ..."
+msgstr "Внесення змін..."
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"ðÁÒÁÍÅÔÒÉ ËÏÍЦÌÑæ§:"
+"Параметри компіляції:"
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "ëÏÍЦÌÑÃ¦Ñ ×ÉÒÁÚÕ ÐÏÛÕËÕ..."
+msgstr "Компіляція виразу пошуку..."
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "ëÏЦÀ×ÁÎÎÑ ÄÏ %s..."
+msgstr "Копіювання до %s..."
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "ëÏЦÀ×ÁÎÎÑ ÄÏ %s..."
+msgstr "Копіювання до %s..."
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
+msgstr "З'єднання з %s..."
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
+msgstr "З'єднання з %s..."
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
+msgstr "З'єднання з %s..."
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "ú'¤ÄÎÁÎÎÑ ÚÁÇÕÂÌÅÎÏ. ÷¦ÄÎÏ×ÉÔÉ Ú×'ÑÚÏË Ú ÓÅÒ×ÅÒÏÍ POP?"
+msgstr "З'єднання загублено. Відновити зв'язок з сервером POP?"
 
 #: pop.c:808
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "ú'¤ÄÎÁÎÎÑ ÚÁÇÕÂÌÅÎÏ. ÷¦ÄÎÏ×ÉÔÉ Ú×'ÑÚÏË Ú ÓÅÒ×ÅÒÏÍ POP?"
+msgstr "З'єднання загублено. Відновити зв'язок з сервером POP?"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, c-format
 msgid "Connection to %s closed"
-msgstr "ú'¤ÄÎÁÎÎÑ Ú %s ÚÁËÒÉÔÏ"
+msgstr "З'єднання з %s закрито"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "ú'¤ÄÎÁÎÎÑ Ú %s ÚÁËÒÉÔÏ"
+msgstr "З'єднання з %s закрито"
 
 #: commands.c:782
 #, c-format
 msgid "Content-Type changed to %s."
-msgstr "ôÉÐ ÄÏÄÁÔËÕ ÚͦÎÅÎÏ ÎÁ %s."
+msgstr "Тип додатку змінено на %s."
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-Type ÐÏ ÆÏÒͦ base/sub"
+msgstr "Content-Type по Ñ\84оÑ\80мÑ\96 base/sub"
 
 #: imap/util.c:135
 msgid "Continue?"
-msgstr "äÁ̦?"
+msgstr "Далі?"
 
 #: commands.c:772
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr "ðÅÒÅÔ×ÏÒÉÔÉ ÎÁ %s ÐÒÉ ÎÁÄÓÉÌÁÎΦ?"
+msgstr "Перетворити на %s при надсиланні?"
 
 #: commands.c:600
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "ëÏЦÀ×ÁÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
+msgstr "Копіювати%s до скриньки"
 
 #: imap/message.c:681
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "ëÏЦÀ×ÁÎÎÑ %d ÌÉÓÔ¦× ÄÏ %s..."
+msgstr "Копіювання %d листів до %s..."
 
 #: imap/message.c:684
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "ëÏЦÀ×ÁÎÎÑ %d ÌÉÓÔÁ ÄÏ %s..."
+msgstr "Копіювання %d листа до %s..."
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "ëÏЦÀ×ÁÎÎÑ ÄÏ %s..."
+msgstr "Копіювання до %s..."
 
 #: main.c:63
 msgid ""
@@ -1001,141 +977,128 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "îÅ ×ÉÊÛÌÏ Ú'¤ÄÎÁÔÉÓÑ Ú %s (%s)."
+msgstr "Не вийшло з'єднатися з %s (%s)."
 
 #: commands.c:111
 msgid "Could not copy message"
-msgstr "îÅ ×ÉÊÛÌÏ ÓËÏЦÀ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
+msgstr "Не вийшло скопіювати повідомлення"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "îÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
+msgstr "Не вийшло створити тимчасовий файл!"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "îÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
+msgstr "Не вийшло створити тимчасовий файл!"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "îÅ ÚÎÁÊÄÅÎÏ ÆÕÎËæÀ ÓÏÒÔÕ×ÁÎÎÑ! [ÓÐÏצÓÔÉÔØ ÐÒÏ ÃÅ]"
+msgstr "Не знайдено функцію сортування! [сповістить про це]"
 
 #: lib-sys/mutt_socket.c:350
 #, c-format
 msgid "Could not find the host \"%s\""
-msgstr "îÅ ×ÉÊÛÌÏ ÚÎÁÊÔÉ ÁÄÒÅÓÕ \"%s\"."
+msgstr "Не вийшло знайти адресу \"%s\"."
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "îÅ ×ÉÊÛÌÏ ÄÏÄÁÔÉ ×Ó¦ ÂÁÖÁΦ ÌÉÓÔÉ!"
+msgstr "Не вийшло додати всі бажані листи!"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
-msgstr "îÅ ×ÉÊÛÌÏ ÄÏÍÏ×ÉÔÉÓØ ÐÒÏ TLS Ú'¤ÄÎÁÎÎÑ"
+msgstr "Не вийшло домовитись про TLS з'єднання"
 
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ %s"
+msgstr "Не вийшло відкрити %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚÎÏ×Õ!"
+msgstr "Не вийшло відкрити поштову скриньку знову!"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄÐÒÁ×ÉÔÉ ÌÉÓÔ."
+msgstr "Не вийшло відправити лист."
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "îÅ ×ÉÊÛÌÏ ÚÁÂÌÏËÕ×ÁÔÉ %s\n"
+msgstr "Не вийшло заблокувати %s\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "óÔ×ÏÒÉÔÉ %s?"
+msgstr "Створити %s?"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "óÔ×ÏÒÅÎÎÑ Ð¦ÄÔÒÉÍÕ¤ÔØÓÑ ÌÉÛÅ ÄÌÑ ÓËÒÉÎØÏË IMAP"
+msgstr "Створення підтримується лише для скриньок IMAP"
 
 #: imap/browse.c:249
 msgid "Create mailbox: "
-msgstr "óÔ×ÏÒÉÔÉ ÓËÒÉÎØËÕ: "
+msgstr "Створити скриньку: "
 
 #: commands.c:597
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "òÏÚËÏÄÕ×ÁÔÉ-ËÏЦÀ×ÁÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
+msgstr "Розкодувати-копіювати%s до скриньки"
 
 #: commands.c:596
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "òÏÚËÏÄÕ×ÁÔÉ-ÐÅÒÅÎÅÓÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
+msgstr "Розкодувати-перенести%s до скриньки"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "÷ÉÂ¦Ò %s..."
+msgstr "Вибір %s..."
 
 #: commands.c:599
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "òÏÚÛÉÆÒÕ×ÁÔÉ-ËÏЦÀ×ÁÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
+msgstr "Розшифрувати-копіювати%s до скриньки"
 
 #: commands.c:598
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "òÏÚÛÉÆÒÕ×ÁÔÉ-ÐÅÒÅÎÅÓÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
+msgstr "Розшифрувати-перенести%s до скриньки"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
-msgstr "ïÔÒÉÍÁÎÎÑ ÌÉÓÔÁ..."
+msgstr "Отримання листа..."
 
-#: postpone.c:517
+#: postpone.c:482
 #, fuzzy
 msgid "Decryption failed."
-msgstr "ðÏÍÉÌËÁ ÒŤÓÔÒÁæ§."
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "÷ÉÄ."
+msgstr "Помилка реєстрації."
 
-#: remailer.c:433
-msgid "Delete"
-msgstr "÷ÉÄÁÌ."
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "÷ÉÄÁÌÅÎÎÑ Ð¦ÄÔÒÉÍÕ¤ÔØÓÑ ÌÉÛÅ ÄÌÑ ÓËÒÉÎØÏË IMAP"
+msgstr "Видалення підтримується лише для скриньок IMAP"
 
 #: pop.c:1282
 msgid "Delete messages from server?"
-msgstr "÷ÉÄÁÌÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÓÅÒ×ÅÒÕ?"
+msgstr "Видалити повідомлення з серверу?"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "÷ÉÄÁÌÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
+msgstr "Видалити листи за шаблоном: "
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "÷ÉÄÁÌ."
+msgstr "Видал."
 
-#: recvattach.c:993
+#: recvattach.c:981
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "÷ÉÄÁÌÅÎÎÑ ÄÏÄÁÔË¦× Ú ÌÉÓÔ¦× Ú PGP ΊЦÄÔÒÉÍÕ¤ÔØÓÑ."
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "ðÏÑÓÎ."
+msgstr "Видалення додатків з листів з PGP не підтримується."
 
 #: lib-lua/madmutt.cpkg:106
 #, c-format
@@ -1145,575 +1108,528 @@ msgstr ""
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s ÎÅ ¦ÓÎÕ¤. óÔ×ÏÒÉÔÉ ÊÏÇÏ?"
+msgstr "%s не існує. Створити його?"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "ëÁÔÁÌÏÇ [%s] Ú ÍÁÓËÏÀ: %s"
+msgstr "Каталог [%s] з маскою: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "ðïíéìëá: ÂÕÄØ ÌÁÓËÁ, ÐÏצÄÏÍÔÅ ÐÒÏ ÃÅÊ ÎÅÄÏ̦Ë"
+msgstr "ПОМИЛКА: будь ласка, повідомте про цей недолік"
 
-#: send.c:1387
+#: send.c:1381
 #, fuzzy
 msgid "Edit forwarded message?"
-msgstr "ð¦ÄÇÏÔÕ×ÁÎÎÑ ÌÉÓÔÁ ÄÌÑ ÐÅÒÅÓÉÌÁÎÎÑ..."
+msgstr "Підготування листа для пересилання..."
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "ûÉÆÒÕ×ÁÎÎÑ"
+msgstr "Шифрування"
 
-#: compose.c:163
+#: compose.c:135
 #, fuzzy
 msgid "Encrypt with: "
-msgstr "ûÉÆÒÕ×ÁÎÎÑ"
+msgstr "Шифрування"
 
 #: imap/imap.c:407 pop.c:706
 msgid "Encrypted connection unavailable"
 msgstr ""
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "÷×ÅĦÔØ keyID ÄÌÑ %s: "
+msgstr "Введіть keyID для %s: "
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "÷×ÅĦÔØ keyID ÄÌÑ %s: "
+msgstr "Введіть keyID для %s: "
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
-msgstr "÷×ÅĦÔØ keyID ÄÌÑ %s: "
+msgstr "Введіть keyID для %s: "
 
 #: recvcmd.c:198
 #, fuzzy
 msgid "Error bouncing message!"
-msgstr "ðÏÍÉÌËÁ ÐÒÉ ×¦ÄÐÒÁ×æ."
+msgstr "Помилка при відправці."
 
 #: recvcmd.c:199
 #, fuzzy
 msgid "Error bouncing messages!"
-msgstr "ðÏÍÉÌËÁ ÐÒÉ ×¦ÄÐÒÁ×æ."
+msgstr "Помилка при відправці."
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "ðÏÍÉÌËÁ ÐÒÉ ×¦ÄÐÒÁ×æ."
+msgstr "Помилка при відправці."
 
 #: pop.c:142
 #, c-format
 msgid "Error connecting to server: %s"
-msgstr "ðÏÍÉÌËÁ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ: %s"
+msgstr "Помилка з'єднання з сервером: %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "ðÏÍÉÌËÁ Ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ: %s"
+msgstr "Помилка з'єднання з сервером: %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "ðÏÍÉÌËÁ × %s, ÒÑÄÏË %d: %s"
+msgstr "Помилка в %s, рядок %d: %s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "ðÏÍÉÌËÁ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÕ: %s\n"
+msgstr "Помилка командного рядку: %s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "ðÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "Помилка у виразу: %s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "ðÏÍÉÌËÁ ¦Î¦Ã¦Á̦ÚÁæ§ ÔÅÒͦÎÁÌÕ."
+msgstr "Помилка ініціалізації терміналу."
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "ðÏÍÉÌËÁ ¦Î¦Ã¦Á̦ÚÁæ§ ÔÅÒͦÎÁÌÕ."
+msgstr "Помилка ініціалізації терміналу."
 
 #: imap/imap.c:620
 msgid "Error opening mailbox"
-msgstr "ðÏÍÉÌËÁ צÄËÒÉÔÔÑ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ"
+msgstr "Помилка відкриття поштової скриньки"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "ðÏÍÉÌËÁ ÒÏÚÂÏÒÕ ÁÄÒÅÓÉ!"
+msgstr "Помилка розбору адреси!"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"%s\"!"
+msgstr "Помилка виконання \"%s\"!"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "ëÁÔÁÌÏÇ ÎÅ ÓËÁÎÕ¤ÔØÓÑ."
+msgstr "Каталог не сканується."
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "ðÏÍÉÌËÁ צÄÐÒÁ×ËÉ, ËÏÄ ÐÏ×ÅÒÎÅÎÎÑ %d (%s)."
-
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "ðÏÍÉÌËÁ צÄÐÒÁ×ËÉ, ËÏÄ ÐÏ×ÅÒÎÅÎÎÑ %d.\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "ðÏÍÉÌËÁ ÐÒÉ ×¦ÄÐÒÁ×æ."
+msgstr "Помилка відправки, код повернення %d (%s)."
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
-msgstr "ðÏÍÉÌËÁ Õ Ú'¤ÄÎÁÎΦ Ú ÓÅÒ×ÅÒÏÍ %s (%s)"
+msgstr "Помилка у з'єднанні з сервером %s (%s)"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ÆÁÊÌ"
+msgstr "Неможливо побачити файл"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚÁÐÉÓÕ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ!"
+msgstr "Помилка під час запису поштової скриньки!"
 
 #: editmsg.c:180
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "ðÏÍÉÌËÁ. òÅÚÅÒ×Õ×ÁÎÎÑ ÔÉÍÞÁÓÏ×ÏÇÏ ÆÁÊÌÕ: %s"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "ðÏÍÉÌËÁ: %s ÎÅÍÏÖÌÉ×Ï ×ÉËÏÒÉÓÔÁÔÉ ÑË ÏÓÔÁÎÎ¦Ê remailer ÌÁÎÃÀÖËÕ."
+msgstr "Помилка. Резервування тимчасового файлу: %s"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "ðÏÍÉÌËÁ: ÎÅÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÐÒÏÔÏËÏÌÕ ÄÌÑ multipart/encrypted!"
+msgstr "Помилка: немає параметру протоколу для multipart/encrypted!"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "ðÏÍÉÌËÁ: ÎÅÍÁ¤ ÐÒÏÔÏËÏÌÕ ÄÌÑ multipart/signed."
+msgstr "Помилка: немає протоколу для multipart/signed."
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "ðÏÍÉÌËÁ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÕ: %s\n"
+msgstr "Помилка командного рядку: %s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "ïÔÒÉÍÁÎÎÑ ÚÁÇÏÌÏ×Ë¦× ÌÉÓÔ¦×... [%d/%d]"
+msgstr "Отримання заголовків листів... [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "÷ÉËÏÎÁÎÎÑ ËÏÍÁÎÄÉ ÄÏ ×¦ÄÐÏצÄÎÉÈ ÌÉÓÔ¦×..."
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "÷ÉȦÄ"
+msgstr "Виконання команди до відповідних листів..."
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "÷ÉÈ¦Ä  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "ðÏËÉÎÕÔÉ Mutt ÂÅÚ ÚÂÅÒÅÖÅÎÎÑ ÚͦÎ?"
+msgstr "Покинути Mutt без збереження змін?"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "ðÏËÉÎÕÔÉ Mutt?"
+msgstr "Покинути Mutt?"
 
 #: imap/imap.c:898
 msgid "Expunge failed"
-msgstr "ðÏÍÉÌËÁ ×ÉÄÁÌÅÎÎÑ"
+msgstr "Помилка видалення"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "÷ÉÄÁÌÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÓÅÒ×ÅÒÕ..."
+msgstr "Видалення повідомлень з серверу..."
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÒÏÚÂÏÒÕ ÚÁÇÏÌÏ×ËÕ."
+msgstr "Не вийшло відкрити файл для розбору заголовку."
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÕÒ¦ÚÁÎÎÑ ÚÁÇÏÌÏ×ËÕ."
+msgstr "Не вийшло відкрити файл для урізання заголовку."
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÒÏÚÂÏÒÕ ÚÁÇÏÌÏ×ËÕ."
+msgstr "Не вийшло відкрити файл для розбору заголовку."
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ! îÅ ×ÉÊÛÌÏ ×¦ÄËÒÉÔÉ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚÎÏ×Õ!"
+msgstr "Фатальна помилка! Не вийшло відкрити поштову скриньку знову!"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ. ì¦ÞÉÌØÎÉË ÌÉÓÔ¦× ÎÅÍÏÖÌÉ×Ï Ó¦ÎÈÒÏΦÚÕ×ÁÔÉ!"
+msgstr "Фатальна помилка. Лічильник листів неможливо сінхронізувати!"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "÷ÉÄÁÌÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÓÅÒ×ÅÒÕ..."
+msgstr "Видалення повідомлень з серверу..."
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "ïÔÒÉÍÁÎÎÑ ÌÉÓÔÁ..."
+msgstr "Отримання листа..."
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÅÒÅ̦ËÕ ÐÏצÄÏÍÌÅÎØ..."
+msgstr "Отримання переліку повідомлень..."
 
 #: pop.c:1062
 msgid "Fetching list of messages..."
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÅÒÅ̦ËÕ ÐÏצÄÏÍÌÅÎØ..."
+msgstr "Отримання переліку повідомлень..."
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "ïÔÒÉÍÁÎÎÑ ÚÁÇÏÌÏ×Ë¦× ÌÉÓÔ¦×... [%d/%d]"
+msgstr "Отримання заголовків листів... [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "ïÔÒÉÍÁÎÎÑ ÚÁÇÏÌÏ×Ë¦× ÌÉÓÔ¦×... [%d/%d]"
+msgstr "Отримання заголовків листів... [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
-msgstr "ïÔÒÉÍÁÎÎÑ ÌÉÓÔÁ..."
+msgstr "Отримання листа..."
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "íÁÓËÁ: "
+msgstr "Маска: "
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "æÁÊÌ ¦ÓÎÕ¤, (o)ÐÅÒÅÐÉÓÁÔÉ, (a)ÄÏÄÁÔÉ ÄÏ ÎØÏÇÏ ÞÉ (c)צÄÍÏ×ÉÔÉ?"
+msgstr "Файл існує, (o)переписати, (a)додати до нього чи (c)відмовити?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "æÁÊÌ ¤ ËÁÔÁÌÏÇÏÍ, ÚÂÅÒÅÇÔÉ Õ ÎØÏÍÕ?"
+msgstr "Файл є каталогом, зберегти у ньому?"
 
 #: muttlib.c:226
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "æÁÊÌ ¤ ËÁÔÁÌÏÇÏÍ, ÚÂÅÒÅÇÔÉ Õ ÎØÏÍÕ?"
+msgstr "Файл є каталогом, зберегти у ньому?"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "æÁÊÌ Õ ËÁÔÁÌÏÚ¦: "
+msgstr "Файл у каталозі: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "æ¦ÌØÔÒÕ×ÁÔÉ ÞÅÒÅÚ: "
+msgstr "Фільтрувати через: "
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
-msgstr "÷¦ÄÂÉÔÏË: %s"
+msgstr "Відбиток: %s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "ÚÂÅÒÅÇÔÉ ÃÅÊ ÌÉÓÔ, ÁÂÉ ×¦Ä¦ÓÌÁÔÉ Ð¦ÚΦÛÅ"
+msgstr "зберегти цей лист, аби відіслати пізніше"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "ðÅÒÅÓÌÁÔÉ %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "ðÅÒÅÓÌÁÔÉ %s%s?"
+msgstr "Переслати %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "ðÅÒÅÓÌÁÔÉ ÅÎËÁÐÓÕÌØÏ×ÁÎÉÍ Õ ×¦ÄÐÏצÄÎÏÓÔ¦ ÄÏ MIME?"
+msgstr "Переслати енкапсульованим у відповідності до MIME?"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
-msgstr "ðÅÒÅÓÌÁÔÉ ÑË ÄÏÄÁÔÏË?"
+msgstr "Переслати як додаток?"
 
 #: recvcmd.c:475
 msgid "Forward as attachments?"
-msgstr "ðÅÒÅÓÌÁÔÉ ÑË ÄÏÄÁÔËÉ?"
+msgstr "Переслати як додатки?"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "æÕÎËæÀ ÎÅ ÄÏÚ×ÏÌÅÎÏ × ÒÅÖÉͦ ÄÏÄÁ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ."
+msgstr "Функцію не дозволено в режимі додавання повідомлення."
 
 #: imap/browse.c:85
 msgid "Getting folder list..."
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÅÒÅ̦ËÕ ÓËÒÉÎØÏË..."
+msgstr "Отримання переліку скриньок..."
 
 #: imap/browse.c:75
 msgid "Getting namespaces..."
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÒÏÓÔÏÒÕ ¦ÍÅÎ..."
+msgstr "Отримання простору імен..."
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "÷Ó¦Í"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "ð¦ÄËÁÚËÁ"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "ð¦ÄËÁÚËÁ ÄÏ %s"
+msgstr "Підказка до %s"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "ð¦ÄËÁÚËÕ ÚÁÒÁÚ ÐÏËÁÚÁÎÏ."
+msgstr "Підказку зараз показано."
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "îÅ ÚÎÁÀ, ÑË ÃÅ ÄÒÕËÕ×ÁÔÉ!"
+msgstr "Не знаю, як це друкувати!"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "ñ ÎÅ ÚÎÁÀ, ÑË ÄÒÕËÕ×ÁÔÉ ÄÏÄÁÔËÉ ÔÉÐÕ %s!"
+msgstr "Я не знаю, як друкувати додатки типу %s!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
-msgstr "ä¦ÊÓΦÓÔØ ID ÎÅ ×ÉÚÎÁÞÅÎÁ."
+msgstr "Дійсність ID не визначена."
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 msgid "ID is expired/disabled/revoked."
-msgstr "ID ÄÁ×ΦÊ/×ÉÍËÎÅÎÉÊ/ÚÁͦÎÅÎÉÊ."
+msgstr "ID давній/вимкнений/замінений."
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 msgid "ID is not valid."
-msgstr "ID ÎÅĦÊÓÎÉÊ."
+msgstr "ID недійсний."
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 msgid "ID is only marginally valid."
-msgstr "ID ĦÊÓÎÉÊ ÌÉÛÅ ÞÁÓÔËÏ×Ï."
+msgstr "ID дійсний лише частково."
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "îÅצÒÎÉÊ ÚÁÇÏÌÏ×ÏË PGP"
+msgstr "Невірний заголовок PGP"
 
-#: postpone.c:434
+#: postpone.c:399
 #, fuzzy
 msgid "Illegal S/MIME header"
-msgstr "îÅצÒÎÉÊ ÚÁÇÏÌÏ×ÏË PGP"
+msgstr "Невірний заголовок PGP"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "îÅצÒÎÏ ÆÏÒÍÁÔÏ×ÁÎÉÊ ÚÁÐÉÓ ÄÌÑ ÔÉÐÕ %s × \"%s\", ÒÑÄÏË %d"
+msgstr "Невірно форматований запис для типу %s в \"%s\", рядок %d"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "äÏÄÁÔÉ ÌÉÓÔ ÄÏ ×¦ÄÐÏצĦ?"
+msgstr "Додати лист до відповіді?"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "ãÉÔÕ¤ÔØÓÑ ÐÏצÄÏÍÌÅÎÎÑ..."
-
-#: remailer.c:432
-msgid "Insert"
-msgstr "÷ÓÔÁ×."
+msgstr "Цитується повідомлення..."
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "äÅÎØ '%s' × Í¦ÓÑæ ÎÅ ¦ÓÎÕ¤"
+msgstr "День '%s' в місяці не існує"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "îÅצÒÎÅ ËÏÄÕ×ÁÎÎÑ."
+msgstr "Невірне кодування."
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "îÅצÒÎÉÊ ÎÏÍÅÒ ÐÅÒÅ̦ËÕ."
+msgstr "Невірний номер переліку."
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "îÅצÒÎÉÊ ÎÏÍÅÒ ÌÉÓÔÁ."
+msgstr "Невірний номер листа."
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
+msgstr "Місяць '%s' не існує"
 
 #: pattern.c:486
 #, c-format
 msgid "Invalid relative date: %s"
-msgstr "îÅÍÏÖÌÉ×Á צÄÎÏÓÎÁ ÄÁÔÁ: %s"
+msgstr "Неможлива відносна дата: %s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "÷ÉËÌÉË PGP..."
+msgstr "Виклик PGP..."
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "÷ÉËÌÉË PGP..."
+msgstr "Виклик PGP..."
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "÷ÉËÌÉË ËÏÍÁÎÄÉ Á×ÔÏÍÁÔÉÞÎÏÇÏ ÐÒÏÇÌÑÄÁÎÎÑ: %s"
+msgstr "Виклик команди автоматичного проглядання: %s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÌÉÓÔÁ: "
+msgstr "Перейти до листа: "
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "ðÅÒÅÊÔÉ ÄÏ: "
+msgstr "Перейти до: "
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "ðÅÒÅÈ¦Ä Õ ÃØÏÍÕ Ä¦ÁÌÏÚ¦ ΊЦÄÒÉÍÕ¤ÔØÓÑ."
+msgstr "Перехід у цьому діалозі не підримується."
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr ""
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "ëÌÁצÛÕ ÎÅ ÐÒÉÚÎÁÞÅÎÏ."
+msgstr "Клавішу не призначено."
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "ëÌÁצÛÕ ÎÅ ÐÒÉÚÎÁÞÅÎÏ. îÁÔÉÓΦÔØ '%s' ÄÌÑ Ð¦ÄËÁÚËÉ."
+msgstr "Клавішу не призначено. Натисніть '%s' для підказки."
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "ïÂÍÅÖÉÔÉÓØ ÐÏצÄÏÍÌÅÎÎÑÍÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
+msgstr "Обмежитись повідомленнями за шаблоном: "
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "ïÂÍÅÖÅÎÎÑ: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "Обмеження: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "òŤÓÔÒÁæÑ..."
+msgstr "Реєстрація..."
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1721,748 +1637,671 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "÷Ó¦ ÓÐÒÏÂÉ ÂÌÏËÕ×ÁÎÎÑ ×ÉÞÅÒÐÁÎÏ, ÚÎÁÔÉ ÂÌÏËÕ×ÁÎÎÑ Ú %s?"
+msgstr "Всі спроби блокування вичерпано, знати блокування з %s?"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "òŤÓÔÒÁæÑ..."
+msgstr "Реєстрація..."
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "ðÏÍÉÌËÁ ÒŤÓÔÒÁæ§."
+msgstr "Помилка реєстрації."
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "ðÏÛÕË ËÌÀÞ¦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"..."
+msgstr "Пошук ключів, що відповідають \"%s\"..."
 
 #: lib-sys/mutt_socket.c:341
 #, c-format
 msgid "Looking up %s..."
-msgstr "ðÏÛÕË %s..."
+msgstr "Пошук %s..."
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr "÷¦ÄÂÉÔÏË: %s"
+msgstr "Відбиток: %s"
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "ôÉÐ MIME ÎÅ ×ÉÚÎÁÞÅÎÏ. îÅÍÏÖÌÉ×Ï ÐÏÂÁÞÉÔÉ ÄÏÄÁÔÏË."
+msgstr "Тип MIME не визначено. Неможливо побачити додаток."
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "úÎÁÊÄÅÎÏ ÚÁÃÉËÌÅÎÎÑ ÍÁËÒÏÓÕ."
+msgstr "Знайдено зациклення макросу."
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "ìÉÓÔ"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "ìÉÓÔ ÎŠצÄÐÒÁ×ÌÅÎÏ."
+msgstr "Лист не відправлено."
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "ìÉÓÔ ÐÏÓÌÁÎÏ."
+msgstr "Лист послано."
 
 #: lib-mx/mx.c:970
 msgid "Mailbox checkpointed."
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÐÅÒÅצÒÅÎÏ."
+msgstr "Поштову скриньку перевірено."
 
 #: imap/command.c:235
 msgid "Mailbox closed"
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚÁËÒÉÔÏ"
+msgstr "Поштову скриньку закрито"
 
 #: imap/browse.c:261
 msgid "Mailbox created."
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÓÔ×ÏÒÅÎÏ."
+msgstr "Поштову скриньку створено."
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ×ÉÄÁÌÅÎÏ."
+msgstr "Поштову скриньку видалено."
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÐÏÒÏÖÎÑ."
+msgstr "Поштова скринька порожня."
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "óËÒÉÎØËÕ ÐÏͦÞÅÎÏ ÎÅÚͦÎÀ×ÁÎÏÀ. %s"
+msgstr "Скриньку помічено незмінюваною. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ צÄËÒÉÔÁ Ô¦ÌØËÉ ÄÌÑ ÞÉÔÁÎÎÑ"
+msgstr "Поштова скринька відкрита тільки для читання"
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÎÅ ÚͦÎÅÎÏ."
+msgstr "Поштову скриньку не змінено."
 
 #: imap/browse.c:253 imap/browse.c:294
 msgid "Mailbox must have a name."
-msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÍÕÓÉÔØ ÍÁÔÉ ¦Í'Ñ."
+msgstr "Поштова скринька мусить мати ім'я."
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÎÅ ×ÉÄÁÌÅÎÏ."
+msgstr "Поштову скриньку не видалено."
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÓÔ×ÏÒÅÎÏ."
+msgstr "Поштову скриньку створено."
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÂÕÌÏ Ú¦ÐÓÏ×ÁÎÏ!"
+msgstr "Поштову скриньку було зіпсовано!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚͦÎÉÌÁ ÚÏ×ΦÛÎÑ ÐÒÏÇÒÁÍÁ."
+msgstr "Поштову скриньку змінила зовнішня програма."
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "ðÏÛÔÏ×Õ ÓËÒÉÎØËÕ ÚͦÎÉÌÁ ÚÏ×ΦÛÎÑ ÐÒÏÇÒÁÍÁ. æÌÁÇÉ ÍÏÖÕÔØ ÂÕÔÉ ÚͦÎÅΦ."
+msgstr "Поштову скриньку змінила зовнішня програма. Флаги можуть бути змінені."
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "ðÏÛÔÏצ ÓËÒÉÎØËÉ [%d]"
+msgstr "Поштові скриньки [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "òÅÄÁÇÕ×ÁÎÎÑ, ×ËÁÚÁÎÅ Õ mailcap, ÐÏÔÒÅÂÕ¤ %%s"
+msgstr "Редагування, вказане у mailcap, потребує %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "ëÏÍÐÏÎÕ×ÁÎÎÑ, ×ËÁÚÁÎÅ Õ mailcap, ÐÏÔÒÅÂÕ¤ %%s"
-
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "óÔ×ÏÒÉÔÉ Á̦ÁÓ"
+msgstr "Компонування, вказане у mailcap, потребує %%s"
 
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "íÁÒËÕ×ÁÎÎÑ %d ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ ×ÉÄÁÌÅÎÉÍÉ..."
+msgstr "Маркування %d нових повідомлень видаленими..."
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "íÁÓËÁ"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "ëÏЦÀ ÌÉÓÔÁ ÐÅÒÅÓÌÁÎÏ."
+msgstr "Копію листа переслано."
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 msgid "Message could not be printed"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÅ ÍÏÖÅ ÂÕÔÉ ÎÁÄÒÕËÏ×ÁÎÏ"
+msgstr "Повідомлення не може бути надруковано"
 
 #: editmsg.c:102
 msgid "Message file is empty!"
-msgstr "æÁÊÌ ÐÏצÄÏÍÌÅÎØ ÐÏÒÏÖΦÊ!"
+msgstr "Файл повідомлень порожній!"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
 msgid "Message not bounced."
-msgstr "ëÏЦÀ ÌÉÓÔÁ ÐÅÒÅÓÌÁÎÏ."
+msgstr "Копію листа переслано."
 
 #: editmsg.c:108
 msgid "Message not modified!"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÅ ÚͦÎÅÎÏ!"
+msgstr "Повідомлення не змінено!"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "\"âÁÔØ˦×ÓØËÉÊ\" ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ ÐÒÉ ÃØÏÍÕ ÏÂÍÅÖÅÎΦ."
+msgstr "\"Батьківський\" лист не можна побачити при цьому обмеженні."
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "ìÉÓÔ ÚÁÌÉÛÅÎÏ ÄÌÑ ÐÏÄÁÌØÛϧ צÄÐÒÁ×ËÉ.."
+msgstr "Лист залишено для подальшої відправки.."
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÁÄÒÕËÏ×ÁÎÏ"
+msgstr "Повідомлення надруковано"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "ìÉÓÔ ÚÁÐÉÓÁÎÏ."
+msgstr "Лист записано."
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "ëÏЦ§ ÌÉÓÔ¦× ÐÅÒÅÓÌÁÎÏ."
+msgstr "Копії листів переслано."
 
 #: commands.c:393
 msgid "Messages could not be printed"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÅ ÍÏÖÕÔØ ÂÕÔÉ ÎÁÄÒÕËÏ×ÁΦ"
+msgstr "Повідомлення не можуть бути надруковані"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
 msgid "Messages not bounced."
-msgstr "ëÏЦ§ ÌÉÓÔ¦× ÐÅÒÅÓÌÁÎÏ."
+msgstr "Копії листів переслано."
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ ÎÁÄÒÕËÏ×ÁÎÏ"
+msgstr "Повідомлення надруковано"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "îÅÄÏÓÔÁÔÎØÏ ÁÒÇÕÍÅÎÔ¦×."
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "ìÁÎÃÀÖÏË ÎÅ ÍÏÖÅ ÂÕÔÉ Â¦ÌØÛÉÍ ÚÁ %d ÅÌÅÍÅÎÔ¦×."
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster ÎÅ ÐÒÉÊÍÁ¤ ÚÁÇÏÌÏ×ËÉ Cc ÔÁ Bcc."
+msgstr "Недостатньо аргументів."
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "ðÅÒÅÎÅÓÔÉ ÞÉÔÁΦ ÌÉÓÔÉ ÄÏ %s?"
+msgstr "Перенести читані листи до %s?"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "ðÅÒÅÎÏÓ ÞÉÔÁÎÉÈ ÌÉÓÔ¦× ÄÏ %s..."
+msgstr "Перенос читаних листів до %s..."
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "îÏ×ÉÊ ÚÁÐÉÔ"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "¶Í'Ñ ÎÏ×ÏÇÏ ÆÁÊÌÕ: "
+msgstr "Ім'я нового файлу: "
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "îÏ×ÉÊ ÆÁÊÌ: "
+msgstr "Новий файл: "
 
 #: buffy.cpkg:330
 #, fuzzy
 msgid "New mail in "
-msgstr "îÏ×Á ÐÏÛÔÁ × %s."
+msgstr "Нова пошта в %s."
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "îÏ×Á ÐÏÛÔÁ Õ Ã¦Ê ÐÏÛÔÏ×¦Ê ÓËÒÉÎØæ."
+msgstr "Нова пошта у цій поштовій скриньці."
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "îÁÓÔ"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "îÁÓÔóÔ"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 msgid "No authenticators available"
-msgstr "áÕÔÅÎÔÉƦËÁÔÏÒ¦× ÎÅÍÁ¤."
+msgstr "Аутентифікаторів немає."
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "îÅÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÍÅÖ¦! [ÓÐÏצÓÔ¦ÔØ ÐÒÏ ÃÀ ÐÏÍÉÌËÕ]"
+msgstr "Немає параметру межі! [сповістіть про цю помилку]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "öÏÄÎϧ ÐÏÚÉç§."
+msgstr "Жодної позицїї."
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "îÅÍÁ¤ ÆÁÊ̦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ ÍÁÓæ"
+msgstr "Немає файлів, що відповідають масці"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
-msgstr "÷ȦÄÎÉÈ ÐÏÛÔÏ×ÉÈ ÓËÒÉÎØÏË ÎÅ ×ËÁÚÁÎÏ."
+msgstr "Вхідних поштових скриньок не вказано."
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "îÅ ×ÓÔÁÎÏ×ÌÅÎÏ ÏÂÍÅÖÅÎØ."
+msgstr "Не встановлено обмежень."
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "îÅÍÁ¤ צÄËÒÉÔϧ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ."
+msgstr "Немає відкритої поштової скриньки."
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "îÅÍÁ¤ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ Ú ÎÏ×ÏÀ ÐÏÛÔÏÀ."
+msgstr "Немає поштової скриньки з новою поштою."
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "÷ mailcap ÎÅ ×ÉÚÎÁÞÅÎÏ ËÏÍÐÏÎÕ×ÁÎÎÑ %s, ÓÔ×ÏÒÅÎÏ ÐÏÒÏÖÎ¦Ê ÆÁÊÌ."
+msgstr "В mailcap не визначено компонування %s, створено порожній файл."
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "÷ mailcap ÎÅ ×ÉÚÎÁÞÅÎÏ ÒÅÄÁÇÕ×ÁÎÎÑ %s"
+msgstr "В mailcap не визначено редагування %s"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "îÅ ÚÎÁÊÄÅÎÏ ÓÐÉÓË¦× ÒÏÚÓÉÌËÉ!"
+msgstr "Не знайдено списків розсилки!"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "îÅ ÚÎÁÊÄÅÎÏ ×¦ÄÏÍÏÓÔÅÊ Õ mailcap. ðÏËÁÚÁÎÏ ÑË ÔÅËÓÔ."
+msgstr "Не знайдено відомостей у mailcap. Показано як текст."
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "ãÑ ÓËÒÉÎØËÁ ÚÏ×Ó¦Í ÐÏÒÏÖÎÑ."
+msgstr "Ця скринька зовсім порожня."
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "ìÉÓÔ¦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ ËÒÉÔÅÒ¦À, ÎÅ ÚÎÁÊÄÅÎÏ."
+msgstr "Листів, що відповідають критерію, не знайдено."
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "ãÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ Â¦ÌØÛ ÎÅÍÁ¤."
+msgstr "Цитованого тексту більш немає."
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "âÅÓ¦Ä Â¦ÌØÛ ÎÅÍÁ."
+msgstr "Бесід більш нема."
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "ð¦ÓÌÑ ÃÉÔÏ×ÁÎÏÇÏ ÔÅËÓÔÕ Î¦ÞÏÇÏ ÎÅÍÁ¤."
+msgstr "Після цитованого тексту нічого немає."
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "÷ ÐÏÛÔÏ×¦Ê ÓËÒÉÎØæ POP ÎÅÍÁ¤ ÎÏ×ÉÈ ÌÉÓÔ¦×."
+msgstr "В поштовій скриньці POP немає нових листів."
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "îÅÍÁ¤ ÎÏ×ÉÈ ÌÉÓÔ¦×"
+msgstr "Немає нових листів"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "ôÅÍÉ ÎÅ ×ËÁÚÁÎÏ."
+msgstr "Теми не вказано."
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "îÅÍÁ¤ ÆÁÊ̦×, ÝÏ ×¦ÄÐÏצÄÁÀÔØ ÍÁÓæ"
+msgstr "Немає файлів, що відповідають масці"
 
-#: nntp.c:357
+#: nntp.c:360
 #, fuzzy
 msgid "No newsserver defined!"
-msgstr "¶Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ POP ÎÅ ×ÉÚÎÁÞÅÎÏ."
-
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "îÅÍÁ¤ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ Ú ÎÏ×ÏÀ ÐÏÛÔÏÀ."
+msgstr "Ім'я користувача POP не визначено."
 
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "öÏÄÎÏÇÏ ÌÉÓÔÁ ÎÅ ÚÁÌÉÛÅÎÏ."
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "îÅÍÁ¤ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ Ú ÎÏ×ÏÀ ÐÏÛÔÏÀ."
+msgstr "Жодного листа не залишено."
 
 #: commands.c:378
 msgid "No printing command has been defined."
-msgstr "ëÏÍÁÎÄÕ ÄÌÑ ÄÒÕËÕ ÎÅ ×ÉÚÎÁÞÅÎÏ."
+msgstr "Команду для друку не визначено."
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "îÅ ×ËÁÚÁÎÏ ÏÔÒÉÍÕ×ÁÞ¦×!"
+msgstr "Не вказано отримувачів!"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "ïÔÒÉÍÕ×ÁÞ¦× ÎÅ ×ËÁÚÁÎÏ.\n"
+msgstr "Отримувачів не вказано.\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "ïÔÒÉÍÕ×ÁÞ¦× ÎÅ ÂÕÌÏ ×ËÁÚÁÎÏ."
+msgstr "Отримувачів не було вказано."
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "îÅÍÁ¤ ×ÉÒÁÚÕ ÐÏÛÕËÕ."
+msgstr "Немає виразу пошуку."
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "ôÅÍÉ ÎÅ ×ËÁÚÁÎÏ."
+msgstr "Теми не вказано."
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "ôÅÍÉ ÎÅÍÁ¤, צÄͦÎÉÔÉ ×¦ÄÐÒÁ×ËÕ?"
+msgstr "Теми немає, відмінити відправку?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "ôÅÍÉ ÎÅÍÁ¤, צÄͦÎÉÔÉ?"
+msgstr "Теми немає, відмінити?"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "ôÅÍÉ ÎÅÍÁ¤, צÄͦÎÅÎÏ."
+msgstr "Теми немає, відмінено."
 
 #: imap/browse.c:193
 msgid "No such folder"
-msgstr "ôÁËϧ ÓËÒÉÎØËÉ ÎÅÍÁ¤"
+msgstr "Такої скриньки немає"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "öÏÄÎϧ ÐÏÚÉæ§ ÎÅ ×ÉÂÒÁÎÏ."
+msgstr "Жодної позиції не вибрано."
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "îÅ ×ÉÄÎÏ ×ÉĦÌÅÎÉÈ ÌÉÓÔ¦×!"
+msgstr "Не видно виділених листів!"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "öÏÄÎÏÇÏ ÌÉÓÔÁ ÎÅ ×ÉĦÌÅÎÏ."
+msgstr "Жодного листа не виділено."
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "÷Ó¦ ÌÉÓÔÉ ×ÉÄÁÌÅÎÏ."
+msgstr "Всі листи видалено."
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "îÅÍÁ¤ ÎÅÞÉÔÁÎÉÈ ÌÉÓÔ¦×"
+msgstr "Немає нечитаних листів"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
-msgstr "öÏÄÎÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ ÎÅ ×ÉÄÎÏ."
+msgstr "Жодного повідомлення не видно."
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "îÅÍÏÖÌÉ×Ï Õ ÃØÏÍÕ ÍÅÎÀ."
+msgstr "Неможливо у цьому меню."
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "îÅ ÚÎÁÊÄÅÎÏ."
+msgstr "Не знайдено."
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
-msgstr "ú'¤ÄÎÁÎÎÑ Ú %s..."
-
-#: remailer.c:435
-msgid "OK"
-msgstr ""
+msgstr "З'єднання з %s..."
 
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "ð¦ÄÔÒÉÍÕ¤ÔØÓÑ Ô¦ÌØËÉ ×ÉÄÁÌÅÎÎÑ × ÂÁÇÁÔÏÞÁÓÔÉÎÎÉÈ ÌÉÓÔÁÈ."
+msgstr "Підтримується тільки видалення в багаточастинних листах."
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "÷¦ÄËÒÉÔÉ ÓËÒÉÎØËÕ"
+msgstr "Відкрити скриньку"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "÷¦ÄËÒÉÔÉ ÓËÒÉÎØËÕ ÌÉÛÅ ÄÌÑ ÞÉÔÁÎÎÑ"
+msgstr "Відкрити скриньку лише для читання"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "óËÒÉÎØËÁ, Ú ÑËϧ ÄÏÄÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
+msgstr "Скринька, з якої додати повідомлення"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "÷¦ÄËÒÉÔÉ ÓËÒÉÎØËÕ ÌÉÛÅ ÄÌÑ ÞÉÔÁÎÎÑ"
+msgstr "Відкрити скриньку лише для читання"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "óËÒÉÎØËÁ, Ú ÑËϧ ÄÏÄÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
+msgstr "Скринька, з якої додати повідомлення"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "÷ÉÈ¦Ä ÐÒÏÃÅÓÕ ÄÏÓÔÁ×ËÉ"
+msgstr "Вихід процесу доставки"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
+msgstr "шифр.(e), підп.(s), підп. як(a), усе(b), (i)nline чи відміна(f)? "
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ <%s>."
+msgstr "PGP ключі, що відповідають <%s>."
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ <%s>."
+msgstr "PGP ключі, що відповідають <%s>."
 
 #: commands.c:153
 msgid "PGP signature could NOT be verified."
-msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÉÔÉ ÎÅÍÏÖÌÉ×Ï."
+msgstr "Підпис PGP перевірити неможливо."
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÅÎÏ."
+msgstr "Підпис PGP перевірено."
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "POP host ÎÅ ×ÉÚÎÁÞÅÎÏ."
+msgstr "POP host не визначено."
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "\"âÁÔØ˦×ÓØËÉÊ\" ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ."
+msgstr "\"Батьківський\" лист не можна побачити."
 
-#: thread.c:980
+#: thread.c:976
 msgid "Parent message is not visible in this limited view."
-msgstr "\"âÁÔØ˦×ÓØËÉÊ\" ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ ÐÒÉ ÃØÏÍÕ ÏÂÍÅÖÅÎΦ."
+msgstr "\"Батьківський\" лист не можна побачити при цьому обмеженні."
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "ðÁÒÏÌØ ÄÌÑ %s@%s: "
+msgstr "Пароль для %s@%s: "
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "ðÏ×ÎÅ ¦Í'Ñ: "
-
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "ëÏÎ×."
+msgstr "Повне ім'я: "
 
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "ðÅÒÅÄÁÔÉ ÄÏ ÐÒÏÇÒÁÍÉ: "
+msgstr "Передати до програми: "
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "ðÅÒÅÄÁÔÉ Õ ËÏÎ×Å¤Ò ËÏÍÁÎĦ: "
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-"ôÒÅÂÁ ×ÓÔÁÎÏ×ÉÔÉ ×¦ÄÐÏצÄÎÅ ÚÎÁÞÅÎÎÑ hostname ÄÌÑ ×ÉËÏÒÉÓÔÁÎÎÑ mixmaster!"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "Передати у конвеєр команді: "
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "úÁÌÉÛÉÔÉ ÌÉÓÔ ÄÏ ÐÏÄÁÌØÛÏÇÏ ÒÅÄÁÇÕ×ÁÎÎÑ ÔÁ צÄÐÒÁ×ËÉ?"
+msgstr "Залишити лист до подальшого редагування та відправки?"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "úÁÌÉÛÅΦ ÌÉÓÔÉ"
+msgstr "Залишені листи"
 
 #: lib-sys/mutt_socket.c:44
 msgid "Preconnect command failed."
-msgstr "ðÏÍÉÌËÁ ËÏÍÁÎÄÉ, ÐÏÐÅÒÅÄÎØϧ Ú'¤ÄÎÁÎÎÀ."
+msgstr "Помилка команди, попередньої з'єднанню."
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "ð¦ÄÇÏÔÕ×ÁÎÎÑ ÌÉÓÔÁ ÄÌÑ ÐÅÒÅÓÉÌÁÎÎÑ..."
+msgstr "Підготування листа для пересилання..."
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "îÁÔÉÓΦÔØ ÂÕÄØ-ÑËÕ ËÌÁצÛÕ..."
-
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "ðÏÐóÔ"
+msgstr "Натисніть будь-яку клавішу..."
 
-#: recvattach.c:34
-msgid "Print"
-msgstr "äÒÕË"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "äÒÕËÕ×ÁÔÉ ÄÏÄÁÔÏË?"
+msgstr "Друкувати додаток?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "äÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ?"
+msgstr "Друкувати повідомлення?"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "äÒÕËÕ×ÁÔÉ ×ÉĦÌÅΦ ÄÏÄÁÔËÉ?"
+msgstr "Друкувати виділені додатки?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "äÒÕËÕ×ÁÔÉ ×ÉĦÌÅΦ ÐÏצÄÏÍÌÅÎÎÑ?"
+msgstr "Друкувати виділені повідомлення?"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "úÎÉÝÉÔÉ %d ×ÉÄÁÌÅÎÉÊ ÌÉÓÔ?"
+msgstr "Знищити %d видалений лист?"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "úÎÉÝÉÔÉ %d ×ÉÄÁÌÅÎÉÈ ÌÉÓÔ¦×?"
+msgstr "Знищити %d видалених листів?"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "úÁÐÉÔ"
+msgstr "Запит"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "úÁÐÉÔ '%s'"
+msgstr "Запит '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "ëÏÍÁÎÄÕ ÚÁÐÉÔÕ ÎÅ ×ÉÚÎÁÞÅÎÏ."
+msgstr "Команду запиту не визначено."
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "úÁÐÉÔ:"
-
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "÷ÉÊÔÉ"
+msgstr "Запит:"
 
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "÷ÉÊÔÉ Ú Mutt?"
+msgstr "Вийти з Mutt?"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÒÏÓÔÏÒÕ ¦ÍÅÎ..."
+msgstr "Отримання простору імен..."
 
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "þÉÔÁÎÎÑ %s..."
+msgstr "Читання %s..."
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "þÉÔÁÎÎÑ %s... %d"
+msgstr "Читання %s... %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "þÉÔÁÎÎÑ %s... %d (%d%%)"
+msgstr "Читання %s... %d (%d%%)"
 
 #: pop.c:1284
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "þÉÔÁÎÎÑ ÎÏ×ÉÈ ÐÏצÄÏÍÌÅÎØ (%d ÂÁÊÔ)..."
+msgstr "Читання нових повідомлень (%d байт)..."
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "÷ÐÅ×ÎÅΦ Õ ×ÉÄÁÌÅÎΦ ÓËÒÉÎØËÉ \"%s\"?"
+msgstr "Впевнені у видаленні скриньки \"%s\"?"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "÷ÉËÌÉËÁÔÉ ÚÁÌÉÛÅÎÉÊ ÌÉÓÔ?"
+msgstr "Викликати залишений лист?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "ðÅÒÅËÏÄÕ×ÁÎÎÑ ÍÏÖÅ ÂÕÔÉ ÚÁÓÔÏÓÏ×ÁÎÅ Ô¦ÌØËÉ ÄÏ ÔÅËÓÔÏ×ÉÈ ÄÏÄÁÔ˦×."
+msgstr "Перекодування може бути застосоване тільки до текстових додатків."
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
-msgstr "ðÏÍÉÌËÁ SSL: %s"
+msgstr "Помилка SSL: %s"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "óÔ×ÏÒÅÎÎÑ Ð¦ÄÔÒÉÍÕ¤ÔØÓÑ ÌÉÛÅ ÄÌÑ ÓËÒÉÎØÏË IMAP"
+msgstr "Створення підтримується лише для скриньок IMAP"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "óÔ×ÏÒÉÔÉ ÓËÒÉÎØËÕ: "
+msgstr "Створити скриньку: "
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ Õ: "
+msgstr "Перейменувати у: "
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "ðÏ×ÔÏÒΊצÄËÒÉÔÔÑ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ..."
+msgstr "Повторне відкриття поштової скриньки..."
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "÷¦ÄÐ."
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "÷¦ÄÐÏצÓÔÉ %s%s?"
+msgstr "Відповісти %s%s?"
 
 #: commands.c:403
 msgid ""
@@ -2470,24 +2309,24 @@ msgid ""
 "(p)am?: "
 msgstr ""
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË ×ÉÒÁÚÕ: "
+msgstr "Зворотній пошук виразу: "
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "ú×ÏÒÏÔÎ¦Ê ÐÏÛÕË: "
+msgstr "Зворотній пошук: "
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "ú×ÏÒÏÔÎØÏ ÓÏÒÔÕ×ÁÔÉ ÚÁ ÄÁÔÏÀ(d), ̦ÔÅÒÏÀ(a), ÒÏÚͦÒÏÍ(s), ÞÉ Î¦(n)?"
+msgstr "Зворотньо сортувати за датою(d), літерою(a), розміром(s), чи ні(n)?"
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
+msgstr "шифр.(e), підп.(s), підп. як(a), усе(b), (i)nline чи відміна(f)? "
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
@@ -2495,10 +2334,10 @@ msgstr ""
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
-msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ \"%s\"."
+msgstr "PGP ключі, що відповідають \"%s\"."
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
@@ -2507,156 +2346,132 @@ msgstr ""
 #: commands.c:143
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
-msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÉÔÉ ÎÅÍÏÖÌÉ×Ï."
+msgstr "Підпис PGP перевірити неможливо."
 
 #: commands.c:135
 #, fuzzy
 msgid "S/MIME signature successfully verified."
-msgstr "ð¦ÄÐÉÓ PGP ÐÅÒÅצÒÅÎÏ."
+msgstr "Підпис PGP перевірено."
 
 #: imap/auth.c:158 pop.c:287
 msgid "SASL authentication failed."
-msgstr "ðÏÍÉÌËÁ ÁÕÔÅÎÔÉƦËÁæ§ SASL."
+msgstr "Помилка аутентифікації SASL."
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr "÷¦ÄÂÉÔÏË: %s"
+msgstr "Відбиток: %s"
 
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "ú'¤ÄÎÁÎÎÑ SSL Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ %s (%s)"
-
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "úÂÅÒ."
+msgstr "З'єднання SSL з використанням %s (%s)"
 
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "úÂÅÒÅÇÔÉ ËÏЦÀ ÃØÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ?"
+msgstr "Зберегти копію цього повідомлення?"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "÷ÎÅÓÔÉ ÄÏ ÆÁÊÌÕ: "
+msgstr "Внести до файлу: "
 
 #: commands.c:600
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "ðÅÒÅÎÅÓÔÉ%s ÄÏ ÓËÒÉÎØËÉ"
+msgstr "Перенести%s до скриньки"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "úÂÅÒÅÖÅÎÎÑ ÆÌÁÇ¦× ÓÔÁÔÕÓÕ ÌÉÓÔÁ... [%d/%d]"
+msgstr "Збереження флагів статусу листа... [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "úÂÅÒÅÖÅÎÎÑ..."
+msgstr "Збереження..."
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "ðÏÛÕË"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "ûÕËÁÔÉ ×ÉÒÁÚ:"
+msgstr "Шукати вираз:"
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "ðÏÛÕË Ä¦ÊÛÏ× ÄÏ Ë¦ÎÃÑ, ÁÌÅ ÎÅ ÚÎÁÊÄÅÎÏ Î¦ÞÏÇÏ"
+msgstr "Пошук дійшов до кінця, але не знайдено нічого"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "ðÏÛÕË Ä¦ÊÛÏ× ÄÏ ÐÏÞÁÔËÕ, ÁÌÅ ÎÅ ÚÎÁÊÄÅÎÏ Î¦ÞÏÇÏ"
+msgstr "Пошук дійшов до початку, але не знайдено нічого"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "ðÏÛÕË ÐÅÒÅÒ×ÁÎÏ."
+msgstr "Пошук перервано."
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "ðÏÛÕË Õ ÃØÏÍÕ ÍÅÎÀ ΊЦÄÔÒÉÍÕ¤ÔØÓÑ."
+msgstr "Пошук у цьому меню не підтримується."
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "äÏÓÑÇÎÕÔÏ ÐÏÞÁÔÏË. ðÏÛÕË ÐÅÒÅÎÅÓÅÎÏ ÎÁ ˦ÎÅÃØ."
+msgstr "Досягнуто початок. Пошук перенесено на кінець."
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "äÏÓÑÇÎÕÔÏ Ë¦ÎÅÃØ. ðÏÛÕË ÐÅÒÅÎÅÓÅÎÏ ÎÁ ÐÏÞÁÔÏË."
+msgstr "Досягнуто кінець. Пошук перенесено на початок."
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "ðÏÛÕË: "
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "÷ɦÒ"
+msgstr "Пошук: "
 
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "÷ÉÂ¦Ò  "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "÷ÅÂÅÒ¦ÔØ ÌÁÎÃÀÖÏË remailer."
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "÷ÉÂ¦Ò %s..."
+msgstr "Вибір %s..."
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "óÌÁÔÉ"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "æÏÎÏ×Á צÄÐÒÁ×ËÁ."
+msgstr "Фонова відправка."
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "ìÉÓÔ ×¦ÄÐÒÁ×ÌѤÔØÓÑ..."
+msgstr "Лист відправляється..."
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "óÅÒ×ÅÒ ÚÁËÒÉ× Ú'¤ÄÎÁÎÎÑ!"
+msgstr "Сервер закрив з'єднання!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÆÌÁÇ"
+msgstr "Встановити флаг"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "ëÏÍÁÎÄÁ ÓÉÓÔÅÍÉ: "
+msgstr "Команда системи: "
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "ð¦ÄÐÉÓ"
+msgstr "Підпис"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "ð¦ÄÐÉÓ ÑË: "
+msgstr "Підпис як: "
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "ð¦ÄÐÉÓ, ÛÉÆÒÕ×ÁÎÎÑ"
+msgstr "Підпис, шифрування"
 
 #: commands.c:406
 msgid ""
@@ -2664,167 +2479,163 @@ msgid ""
 "am?: "
 msgstr ""
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ ÄÁÔÏÀ(d), ̦ÔÅÒÏÀ(a), ÒÏÚͦÒÏÍ(s), ÞÉ Î¦(n)?"
+msgstr "Сортувати за датою(d), літерою(a), розміром(s), чи ні(n)?"
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "óÏÒÔÕ×ÁÎÎÑ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ..."
+msgstr "Сортування поштової скриньки..."
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, c-format
 msgid "Subkey ....: 0x%s"
 msgstr ""
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "ð¦ÄÐÉÓÁΦ [%s] Ú ÍÁÓËÏÀ: %s"
+msgstr "Підписані [%s] з маскою: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "ð¦ÄÐÉÓÕ×ÁÎÎÑ ÄÏ %s..."
+msgstr "Підписування до %s..."
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
-msgstr "ðÅÒÅצÒËÁ ÓÅÒÔÉƦËÁÔÕ SSL"
+msgstr "Перевірка сертифікату SSL"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "÷ÉĦÌÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
+msgstr "Виділити листи за шаблоном: "
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "÷ÉĦ̦ÔØ ÐÏצÄÏÍÌÅÎÎÑ, ÝÏ ÄÏÄÁ¤ÔÅ!"
+msgstr "Виділіть повідомлення, що додаєте!"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "÷ÉĦÌÅÎÎÑ ÎŠЦÄÔÒÉÍÕ¤ÔØÓÑ."
+msgstr "Виділення не підтримується."
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "ãÅÊ ÌÉÓÔ ÎÅ ÍÏÖÎÁ ÐÏÂÁÞÉÔÉ."
+msgstr "Цей лист не можна побачити."
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "SSL ÎÅÄÏÓÑÖÎÅ."
+msgstr "SSL недосяжне."
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "ðÏÔÏÞÎÉÊ ÄÏÄÁÔÏË ÂÕÄÅ ÐÅÒÅÔ×ÏÒÅÎÏ."
+msgstr "Поточний додаток буде перетворено."
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "ðÏÔÏÞÎÉÊ ÄÏÄÁÔÏË ÎÅ ÂÕÄÅ ÐÅÒÅÔ×ÏÒÅÎÏ."
+msgstr "Поточний додаток не буде перетворено."
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "îÅËÏÒÅËÔÎÉÊ ÎÏÍÅÒ ÐÏצÄÏÍÌÅÎÎÑ. óÐÒÏÂÕÊÔŠצÄËÒÉÔÉ ÓËÒÉÎØËÕ ÝÅ ÒÁÚ."
-
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "ìÁÎÃÀÖÏË remailer'Á ×ÖÅ ÐÏÒÏÖΦÊ."
+msgstr "Некоректний номер повідомлення. Спробуйте відкрити скриньку ще раз."
 
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "äÏÄÁÔË¦× ÎÅÍÁ¤."
+msgstr "Додатків немає."
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "öÏÄÎÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ ÎÅÍÁ¤."
+msgstr "Жодного повідомлення немає."
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
-msgstr "îÅÍÁ¤ ЦÄÞÁÓÔÉÎ ÄÌÑ ÐÒÏÇÌÑÄÁÎÎÑ!"
+msgstr "Немає підчастин для проглядання!"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "ãÅÊ ÓÅÒ×ÅÒ IMAP ÎÁÄÔÏ ÄÁ×ΦÊ. Mutt ÎÅ ÍÏÖÅ ÐÒÁÃÀ×ÁÔÉ Ú ÎÉÍ."
+msgstr "Цей сервер IMAP надто давній. Mutt не може працювати з ним."
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
-msgstr "ãÅÊ ÓÅÒÔÉƦËÁÔ ÎÁÌÅÖÉÔØ:"
+msgstr "Цей сертифікат належить:"
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
-msgstr "ãÅÊ ÓÅÒÔÉƦËÁÔ Ä¦ÊÓÎÉÊ"
+msgstr "Цей сертифікат дійсний"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
-msgstr "ãÅÊ ÓÅÒÔÉƦËÁÔ ×ÉÄÁÎÏ:"
+msgstr "Цей сертифікат видано:"
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "ãÅÊ ËÌÀÞ ÎÅÍÏÖÌÉ×Ï ×ÉËÏÒÉÓÔÁÔÉ: ÄÁ×ΦÊ/×ÉÍËÎÅÎÉÊ/ÚÁͦÎÅÎÉÊ."
+msgstr "Цей ключ неможливо використати: давній/вимкнений/замінений."
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "âÅÓ¦ÄÁ ÍÁ¤ ÎÅÞÉÔÁΦ ÌÉÓÔÉ."
+msgstr "Бесіда має нечитані листи."
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "óÛÉ×ÁÎÎÑ ÎÅÄÏÓÔÕÐÎÅ."
+msgstr "Сшивання недоступне."
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "÷ÉÞÅÒÐÁÎÏ ÞÁÓ ÓÐÒÏÂÉ ÂÌÏËÕ×ÁÎÎÑ ÞÅÒÅÚ fctnl!"
+msgstr "Вичерпано час спроби блокування через fctnl!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "÷ÉÞÅÒÐÁÎÏ ÞÁÓ ÓÐÒÏÂÉ ÂÌÏËÕ×ÁÎÎÑ ÞÅÒÅÚ flock"
+msgstr "Вичерпано час спроби блокування через flock"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "÷É ÂÁÞÉÔÅ ÐÏÞÁÔÏË ÌÉÓÔÁ."
+msgstr "Ви бачите початок листа."
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "ðÏÍÉÌËÁ Õ Ú'¤ÄÎÁÎΦ Ú ÓÅÒ×ÅÒÏÍ %s (%s)"
+msgstr "Помилка у з'єднанні з сервером %s (%s)"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2834,140 +2645,123 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "ðÏÍÉÌËÁ ÁÕÔÅÎÔÉƦËÁæ§ SASL."
+msgstr "Помилка аутентифікації SASL."
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ %s!"
+msgstr "Неможливо додати %s!"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ!"
+msgstr "Неможливо додати!"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "ú ÓÅÒ×ÅÒÕ IMAP 椧 ×ÅÒÓ¦§ ÏÔÒÉÍÁÔÉ ÚÁÇÏÌÏ×ËÉ ÎÅÍÏÖÌÉ×Ï."
+msgstr "З серверу IMAP цієї версії отримати заголовки неможливо."
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
-msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÓÅÒÔÉƦËÁÔ"
+msgstr "Неможливо отримати сертифікат"
 
 #: pop.c:598
 msgid "Unable to leave messages on server."
-msgstr "îÅÍÏÖÌÉ×Ï ÚÁÌÉÛÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÎÁ ÓÅÒ×ÅÒ¦."
+msgstr "Неможливо залишити повідомлення на сервері."
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "îÅÍÏÖÌÉ×Ï ÄÏÄÁÔÉ %s!"
+msgstr "Неможливо додати %s!"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "ðÏÛÔÏ×Á ÓËÒÉÎØËÁ ÎÅ ÂÌÏËÕ¤ÔØÓÑ!"
+msgstr "Поштова скринька не блокується!"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
+msgstr "Неможливо відкрити тимчасовий файл!"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
+msgstr "Неможливо відкрити тимчасовий файл!"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
+msgstr "Неможливо відкрити тимчасовий файл!"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "÷¦ÄÎ."
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "÷¦ÄÎÏ×ÉÔÉ ÌÉÓÔÉ ÚÁ ÛÁÂÌÏÎÏÍ: "
+msgstr "Відновити листи за шаблоном: "
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "÷¦ÄÎ."
+msgstr "Відн."
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "îÅצÄÏÍÉÊ Content-Type %s"
-
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "÷¦ÄÐÉÓÕ×ÁÎÎÑ ×¦Ä %s..."
+msgstr "Невідомий Content-Type %s"
 
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "÷¦ÄÐÉÓÕ×ÁÎÎÑ ×¦Ä %s..."
+msgstr "Відписування від %s..."
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "÷¦ÄÐÉÓÕ×ÁÎÎÑ ×¦Ä %s..."
+msgstr "Відписування від %s..."
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "úÎÑÔÉ ×ÉĦÌÅÎÎÑ Ú ÌÉÓÔ¦× ÚÁ ÛÁÂÌÏÎÏÍ: "
+msgstr "Зняти виділення з листів за шаблоном: "
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "÷¦ÄÐÒÁ×ÌÅÎÎÑ ÌÉÓÔÁ..."
+msgstr "Відправлення листа..."
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "úÒϦÔØ 'toggle-write' ÄÌÑ ×צÍËÎÅÎÎÑ ÚÁÐÉÓÕ!"
+msgstr "Зробіть 'toggle-write' для ввімкнення запису!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ keyID = \"%s\" ÄÌÑ %s?"
+msgstr "Використовувати keyID = \"%s\" для %s?"
 
 #: account.c:133
 #, c-format
 msgid "Username at %s: "
-msgstr "ëÏÒÉÓÔÕ×ÁÞ Õ %s: "
+msgstr "Користувач у %s: "
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
+msgstr "Місяць '%s' не існує"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "Місяць '%s' не існує"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "ðÅÒÅצÒÉÔÉ Ð¦ÄÐÉÓ PGP?"
+msgstr "Перевірити підпис PGP?"
 
 #: pop.c:786
 msgid "Verifying message indexes..."
-msgstr "ðÅÒÅצÒËÁ ¦ÎÄÅËÓ¦× ÐÏצÄÏÍÌÅÎØ..."
-
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "äÏÄÁÔËÉ"
+msgstr "Перевірка індексів повідомлень..."
 
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "ïâåòåöîï! ÷É ÚÎÉÝÉÔÅ ¦ÓÎÕÀÞÉÊ %s ÐÒÉ ÚÁÐÉÓÕ. ÷É ÐÅ×Φ?"
+msgstr "ОБЕРЕЖНО! Ви знищите існуючий %s при запису. Ви певні?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -2975,29 +2769,29 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
-msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
+msgstr "Сертифікат серверу видалено за давністю"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
-msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
+msgstr "Сертифікат серверу видалено за давністю"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
-msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ÝŠΊĦÊÓÎÉÊ"
+msgstr "Сертифікат серверу ще не дійсний"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ÝŠΊĦÊÓÎÉÊ"
+msgstr "Сертифікат серверу ще не дійсний"
 
 #: crypt.cpkg:1054
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
@@ -3012,18 +2806,18 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "þÅËÁÎÎÑ ÂÌÏËÕ×ÁÎÎÑ ÞÅÒÅÚ fctnl... %d"
+msgstr "Чекання блокування через fctnl... %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "þÅËÁÎÎÑ ÂÌÏËÕ×ÁÎÎÑ ÞÅÒÅÚ flock... %d"
+msgstr "Чекання блокування через flock... %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "þÅËÁÊÔŠצÄÐÏצĦ..."
+msgstr "Чекайте відповіді..."
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3031,16 +2825,16 @@ msgstr ""
 #: crypt.cpkg:916
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
-msgstr "óÅÒÔÉƦËÁÔ ÓÅÒ×ÅÒÕ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ"
+msgstr "Сертифікат серверу видалено за давністю"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
-msgstr "ðÏÐÅÒÅÄÖÅÎÎÑ: ÎÅÍÏÖÌÉ×Ï ÚÂÅÒÅÇÔÉ ÓÅÒÔÉƦËÁÔ"
+msgstr "Попередження: неможливо зберегти сертифікат"
 
 #: crypt.cpkg:902
 msgid "Warning: One of the keys has been revoked\n"
@@ -3058,465 +2852,623 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "îÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÄÏÄÁÔÏË"
+msgstr "Не вийшло створити додаток"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "úÂ¦Ê ÚÁÐÉÓÕ! þÁÓÔËÏ×Õ ÓËÒÉÎØËÕ ÚÂÅÒÅÖÅÎÏ Õ %s"
+msgstr "Збій запису! Часткову скриньку збережено у %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "úÂ¦Ê ÚÁÐÉÓÕ!"
+msgstr "Збій запису!"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "úÁÐÉÓÁÔÉ ÌÉÓÔ ÄÏ ÐÏÛÔÏ×ϧ ÓËÒÉÎØËÉ"
+msgstr "Записати лист до поштової скриньки"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "úÁÐÉÓ %s..."
+msgstr "Запис %s..."
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "úÁÐÉÓ ÌÉÓÔÁ ÄÏ %s..."
+msgstr "Запис листа до %s..."
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "úÁÐÉÓ ÌÉÓÔ¦×... %d (%d%%)"
+msgstr "Запис листів... %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "ðÏÍÉÌËÁ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÕ: %s\n"
+msgstr "Помилка командного рядку: %s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "÷É ×ÖÅ ÍÁ¤ÔÅ ÐÓÅ×ÄÏÎ¦Í ÎÁ ÃÅ ¦Í'Ñ!"
+msgstr "Ви вже маєте псевдонім на це ім'я!"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "ðÅÒÛÉÊ ÅÌÅÍÅÎÔ ÌÁÎÃÀÖËÕ ×ÖÅ ×ÉÂÒÁÎÏ."
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "ïÓÔÁÎÎ¦Ê ÅÌÅÍÅÎÔ ÌÁÎÃÀÖËÕ ×ÖÅ ×ÉÂÒÁÎÏ."
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "ãÅ ÐÅÒÛÁ ÐÏÚÉæÑ."
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "ãÅ ÐÅÒÛÁ ÓÔÏÒ¦ÎËÁ."
+msgstr "Це перша позиція."
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "ãÅ ÐÅÒÛÉÊ ÌÉÓÔ."
+msgstr "Це перший лист."
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "ãÅ ÐÅÒÛÁ ÓÔÏÒ¦ÎËÁ."
+msgstr "Це перша сторінка."
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "ãÅ ÐÅÒÛÁ ÂÅÓ¦ÄÁ."
+msgstr "Це перша бесіда."
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "ãÅ ÏÓÔÁÎÎÑ ÐÏÚÉæÑ."
+msgstr "Це остання позиція."
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "ãÅ ÏÓÔÁÎÎÑ ÓÔÏÒ¦ÎËÁ."
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "ãÅ ÏÓÔÁÎÎ¦Ê ÌÉÓÔ."
+msgstr "Це останній лист."
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "ãÅ ÏÓÔÁÎÎÑ ÓÔÏÒ¦ÎËÁ."
+msgstr "Це остання сторінка."
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "äÁ̦ ÎÉÖÞÅ ÐÒÏËÒÕÞÕ×ÁÔÉ ÎÅ ÍÏÖÎÁ."
+msgstr "Далі нижче прокручувати не можна."
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "äÁ̦ ×ÉÝÅ ÐÒÏËÒÕÞÕ×ÁÔÉ ÎÅ ÍÏÖÎÁ."
+msgstr "Далі вище прокручувати не можна."
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "÷É ÎÅ ÍÁ¤ÔÅ ÖÏÄÎÏÇÏ ÐÓÅ×ÄÏΦÍÕ!"
+msgstr "Ви не маєте жодного псевдоніму!"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "ãÅ ¤ÄÉÎÁ ÞÁÓÔÉÎÁ ÌÉÓÔÁ, §§ ÎÅ ÍÏÖÎÁ ×ÉÄÁÌÑÔÉ."
+msgstr "Це єдина частина листа, її не можна видаляти."
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "÷É ÍÏÖÅÔÅ ÎÁÄÓÉÌÁÔÉ Ô¦ÌØËÉ ËÏЦ§ ÞÁÓÔÉÎ message/rfc822."
+msgstr "Ви можете надсилати тільки копії частин message/rfc822."
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] ÷¦ÒÎÏ?"
+msgstr "[%s = %s] Вірно?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ "
+msgstr "[-- %s/%s не підтримується "
 
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- äÏÄÁÔÏË ÎÏÍÅÒ %d"
+msgstr "[-- Додаток номер %d"
 
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- ðÒÏÇÒÁÍÍÁ ÐÒÏÇÌÑÄÁÎÎÑ %s ÐÏצÄÏÍÉÌÁ ÐÏÍÉÌËÕ --]\n"
+msgstr "[-- Программа проглядання %s повідомила помилку --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- á×ÔÏÐÒÏÇÌÑÄÁÎÎÑ ÚÁ ÄÏÐÏÍÏÇÏÀ %s --]\n"
+msgstr "[-- Автопроглядання за допомогою %s --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ PGP --]\n"
+"[-- Початок повідомлення PGP --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ðÏÞÁÔÏË ÂÌÏËÕ ×¦ÄËÒÉÔÏÇÏ ËÌÀÞÁ PGP --]\n"
+msgstr "[-- Початок блоку відкритого ключа PGP --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]\n"
+"[-- Початок повідомлення з PGP підписом --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- îÅÍÏÖÌÉ×Ï ×ÉËÏÎÁÔÉ %s. --]\n"
+msgstr "[-- Неможливо виконати %s. --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ PGP --]\n"
+msgstr "[-- Кінець повідомлення PGP --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÂÌÏËÕ ×¦ÄËÒÉÔÏÇÏ ËÌÀÞÁ PGP --]\n"
+msgstr "[-- Кінець блоку відкритого ключа PGP --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]\n"
+msgstr "[-- Кінець повідомлення з PGP підписом --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
+msgstr "[-- Кінець даних, зашифрованих PGP/MIME --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
+msgstr "[-- Кінець даних, зашифрованих PGP/MIME --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
-msgstr "[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]\n"
+msgstr "[-- Кінець даних, зашифрованих PGP/MIME --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
-msgstr "[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]\n"
+msgstr "[-- Кінець підписаних даних --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
-msgstr "[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]\n"
+msgstr "[-- Кінець підписаних даних --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr ""
-"[-- ðÏÍÉÌËÁ: ÖÏÄÎÕ ÞÁÓÔÉÎÕ Multipart/Alternative ÎÅ ×ÉÊÛÌÏ ÐÏÂÁÞÉÔÉ! --]\n"
+"[-- Помилка: жодну частину Multipart/Alternative не вийшло побачити! --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- ðÏÍÉÌËÁ: ÎÅÓÕͦÓÎÁ ÓÔÒÕËÔÕÒÁ multipart/signed! --]\n"
+"[-- Помилка: несумісна структура multipart/signed! --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- ðÏÍÉÌËÁ: ÎÅצÄÏÍÉÊ ÐÒÏÔÏËÏÌ multipart/signed %s! --]\n"
+"[-- Помилка: невідомий протокол multipart/signed %s! --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ! --]\n"
+msgstr "[-- Помилка: не вийшло створити тимчасовий файл! --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- ðÏÍÉÌËÁ: ÎÅ ×ÉÊÛÌÏ ÚÎÁÊÔÉ ÐÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ PGP! --]\n"
+"[-- Помилка: не вийшло знайти початок повідомлення PGP! --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- ðÏÍÉÌËÁ: ˦ÎÅÃØ ÆÁÊÌÕ ÎÅ ÚÎÁÊÄÅÎÏ! --]\n"
+msgstr "[-- Помилка: кінець файлу не знайдено! --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- ðÏÍÉÌËÁ: ÎÅÓÆÏÒÍÏ×ÁÎÉÊ ÌÉÓÔ PGP/MIME! --]\n"
+"[-- Помилка: несформований лист PGP/MIME! --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- ðÏÍÉÌËÁ: message/external-body ÎÅ ÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÔÉÐÕ ÄÏÓÔÕÐÕ --]\n"
+msgstr "[-- Помилка: message/external-body не має параметру типу доступу --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
+"[-- Наступні дані зашифровано PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
+"[-- Наступні дані зашифровано PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- îÁÓÔÕÐΦ ÄÁΦ ÚÁÛÉÆÒÏ×ÁÎÏ PGP/MIME --]\n"
+"[-- Наступні дані зашифровано PGP/MIME --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- îÁÓÔÕÐΦ ÄÁΦ ЦÄÐÉÓÁÎÏ --]\n"
+"[-- Наступні дані підписано --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- îÁÓÔÕÐΦ ÄÁΦ ЦÄÐÉÓÁÎÏ --]\n"
+"[-- Наступні дані підписано --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- ãÅÊ %s/%s ÄÏÄÁÔÏË "
+msgstr "[-- Цей %s/%s додаток "
 
 #: handler.c:1212 handler.c:1225
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- ãÅÊ %s/%s ÄÏÄÁÔÏË ÎÅ ×ËÌÀÞÅÎÏ, --]\n"
+msgstr "[-- Цей %s/%s додаток не включено, --]\n"
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- ôÉÐ: %s/%s, ËÏÄÕ×ÁÎÎÑ: %s, ÒÏÚͦÒ: %s --]\n"
+msgstr "[-- Тип: %s/%s, кодування: %s, розмір: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ðÏÐÅÒÅÄÖÅÎÎÑ: ÎÅÍÏÖÌÉ×Ï ÚÎÁÊÔÉ ÖÏÄÎÏÇÏ Ð¦ÄÐÉÓÕ. --]\n"
+"[-- Попередження: неможливо знайти жодного підпису. --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ðÏÐÅÒÅÄÖÅÎÎÑ: ÎÅÍÏÖÌÉ×Ï ÐÅÒÅצÒÑÔÉ %s/%s ЦÄÐÉÓÉ. --]\n"
+"[-- Попередження: неможливо перевіряти %s/%s підписи. --]\n"
 "\n"
 
 #: handler.c:1230
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr "[-- צÄÐÏצÄÎÉÊ ÔÉÐ ÄÏÓÔÕÐÕ %s ΊЦÄÔÒÉÍÕ¤ÔØÓÑ --]\n"
+msgstr "[-- відповідний тип доступу %s не підтримується --]\n"
 
 #: handler.c:1214
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
-msgstr "[-- צÄÐÏצÄÎÅ ÚÏ×ΦÛΤ ÄÖÅÒÅÌÏ ×ÉÄÁÌÅÎÏ ÚÁ ÄÁ×ΦÓÔÀ. --]\n"
+msgstr "[-- відповідне зовнішнє джерело видалено за давністю. --]\n"
 
 #: handler.c:1201
 #, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- ¦Í'Ñ: %s --]\n"
+msgstr "[-- ім'я: %s --]\n"
 
 #: handler.c:1197
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "÷ÉÈ¦Ä  "
+msgstr "Вихід  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "í¦ÓÑÃØ '%s' ÎÅ ¦ÓÎÕ¤"
+msgstr "Місяць '%s' не існує"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:439
 msgid "[invalid date]"
-msgstr "[ÐÏÍÉÌËÏ×Á ÄÁÔÁ]"
+msgstr "[помилкова даÑ\82а]"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[ÎÅÍÏÖÌÉ×Ï ÏÂÞÉÓÌÉÔÉ]"
+msgstr "[неможливо обчислити]"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "alias: ÁÄÒÅÓÉ ÎÅÍÁ¤"
+msgstr "alias: адреси немає"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "Не знайдено виділених листів."
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "Не знайдено виділених листів."
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "Зберегти копію цього повідомлення?"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
 
-#: init.c:654
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "ÚͦÎÉÔÉ ÐÏÑÓÎÅÎÎÑ ÄÏ ÄÏÄÁÔËÕ"
+msgstr "змінити пояснення до додатку"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "ÚͦÎÉÔÉ ÐÏÑÓÎÅÎÎÑ ÄÏ ÄÏÄÁÔËÕ"
+msgstr "змінити пояснення до додатку"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
+msgstr "bind: дуже багато аргументів"
+
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "Каталог не сканується."
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "Немає поштової скриньки з новою поштою."
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "color: ÄÕÖÅ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦×"
+msgstr "color: дуже мало аргументів"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "Немає нових листів"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
-msgstr "ÐÅÒÅÔ×ÏÒÅÎÏ"
+msgstr "перетворено"
+
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "Записати лист до поштової скриньки"
 
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "ÎÅ ×ÉÊÛÌÏ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×Õ ÓËÒÉÎØËÕ: %s"
+msgstr "не вийшло створити тимчасову скриньку: %s"
 
 #: editmsg.c:89
 #, fuzzy, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "ÎÅ ×ÉÊÛÌÏ ÚÁÐÉÓÁÔÉ ÔÉÍÞÁÓÏ×Õ ÓËÒÉÎØËÕ: %s"
+msgstr "не вийшло записати тимчасову скриньку: %s"
 
 #: editmsg.c:70
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "ÎÅ ×ÉÊÛÌÏ ÚÁÐÉÓÁÔÉ ÔÉÍÞÁÓÏ×Õ ÓËÒÉÎØËÕ: %s"
+msgstr "не вийшло записати тимчасову скриньку: %s"
+
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "Вхідних поштових скриньок не вказано."
 
-#: browser.c:1206
+#: browser.c:1177
 msgid "dazn"
 msgstr ""
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "ËÏÌ¦Ò default ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
+msgstr "колір default не підтримується"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "Видалити повідомлення з серверу?"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "Відновити листи за шаблоном: "
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "Відновити листи за шаблоном: "
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr ""
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "Підготування листа для пересилання..."
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3525,36 +3477,123 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "ëÏЦÀ×ÁÎÎÑ ÄÏ %s..."
+msgstr "Копіювання до %s..."
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "÷ÉÂ¦Ò %s..."
+msgstr "Вибір %s..."
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "Поточний додаток не буде перетворено."
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "змінити пояснення до додатку"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "Неможливо записати лист"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "Отримання заголовків листів... [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "Підготування листа для пересилання..."
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "Зберегти копію цього повідомлення?"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "ÐÏÒÏÖÎ¦Ê ×ÉÒÁÚ"
+msgstr "поÑ\80ожнÑ\96й виÑ\80аз"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "ûÉÆÒÕ×ÁÎÎÑ"
+msgstr "Шифрування"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "Зберегти копію цього повідомлення?"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3569,36 +3608,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3608,26 +3647,82 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "ÐÏÍÉÌËÁ Õ ×ÉÒÁÚÕ: %s"
+msgstr "помилка Ñ\83 виÑ\80азÑ\83: %s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "ÐÏÍÉÌËÁ: ÎÅצÄÏÍÅ op %d (ÐÏצÄÏÍØÔÅ ÃÀ ÐÏÍÉÌËÕ)."
+msgstr "помилка: невÑ\96доме op %d (повÑ\96домÑ\8cÑ\82е Ñ\86Ñ\8e помилкÑ\83)."
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "esabif"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "esabif"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
-msgstr "exec: ÎÅÍÁ¤ ÁÒÇÕÍÅÎÔ¦×"
+msgstr "exec: немає аргументів"
+
+#: keymap_defs.h:112
+msgid "execute a macro"
+msgstr ""
+
+#: keymap_defs.h:93
+msgid "exit this menu"
+msgstr ""
+
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "Переслати %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "Переслати як додатки?"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "Перевірка наявності нових повідомлень..."
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "Це перший лист."
 
 #: lib-sys/mutt_ssl.cpkg:220
 #, c-format
@@ -3649,133 +3744,623 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "Це остання сторінка."
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "Немає поштової скриньки з новою поштою."
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "Помилка відкриття поштової скриньки"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "Немає поштової скриньки з новою поштою."
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #: handler.c:1193
 msgid "has been deleted --]\n"
-msgstr "ÂÕÌÏ ×ÉÄÁÌÅÎÏ --]\n"
+msgstr "було видалено --]\n"
 
 #: imap/imap.c:941
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbox: ÐÏÍÉÌËÁ EXPUNGE"
+msgstr "imap_sync_mailbox: помилка EXPUNGE"
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
-msgstr "ÎÅצÒÎÅ ÐÏÌÅ ÚÁÇÏÌÏ×ËÕ"
+msgstr "невірне поле заголовку"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "Невірний номер переліку."
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "Перейти до листа: "
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "Перейти до листа: "
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "Бесіда має нечитані листи."
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "Це перша бесіда."
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "Немає нечитаних листів"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "Немає нечитаних листів"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "Зберегти копію цього повідомлення?"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
-msgstr "PGP ËÌÀÞ¦, ÝÏ ×¦ÄÐÏצÄÁÀÔØ <%s>."
+msgstr "PGP ключі, що відповідають <%s>."
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "Надіслати копії виділених листів: "
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "Немає поштової скриньки з новою поштою."
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro: ÐÏÒÏÖÎÑ ÐÏÓ̦ÄÏ×ΦÓÔØ ËÌÁצÛ"
+msgstr "macro: поÑ\80ожнÑ\8f поÑ\81лÑ\96довнÑ\96Ñ\81Ñ\82Ñ\8c клавÑ\96Ñ\88"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
+msgstr "macro: дуже багато аргументів"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "ÚÁÐÉÓÕ ÄÌÑ ÔÉÐÕ %s × mailcap ÎÅ ÚÎÁÊÄÅÎÏ"
+msgstr "запису для типу %s в mailcap не знайдено"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "ëÏЦ§ ÌÉÓÔ¦× ÐÅÒÅÓÌÁÎÏ."
+msgstr "Копії листів переслано."
 
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "צÄÓÕÔÎÑ ÄÕÖËÁ: %s"
+msgstr "відсутня дужка: %s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "צÄÓÕÔÎ¦Ê ÐÁÒÁÍÅÔÒ"
+msgstr "відсутній параметр"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "mono: ÄÕÖÅ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦×"
+msgstr "mono: дуже мало аргументів"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "Це перша позиція."
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "Це перший лист."
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "Це остання позиція."
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "Це останній лист."
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "Це остання позиція."
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "Це остання сторінка."
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "Всі листи видалено."
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "Це перша позиція."
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "Це перша сторінка."
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "Всі листи видалено."
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "Це перша сторінка."
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "âÁÇÁÔÏÞÁÓÔÉÎÎÉÊ ÌÉÓÔ ÎÅ ÍÁ¤ ÐÁÒÁÍÅÔÒÕ ÍÅÖ¦!"
+msgstr "Багаточастинний лист не має параметру межі!"
 
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr ""
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "(ÓËÒÉÎØËÉ ÎÅÍÁ¤)"
+msgstr "(скриньки немає)"
 
 #: commands.c:788
 msgid "not converting"
-msgstr "ÎÅ ÐÅÒÅÔ×ÏÒÅÎÏ"
+msgstr "не перетворено"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "ÐÏÒÏÖÎÑ ÐÏÓ̦ÄÏ×ΦÓÔØ ËÌÁצÛ"
+msgstr "порожня послідовність клавіш"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr ""
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "Відкрити скриньку лише для читання"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "Відкрити скриньку лише для читання"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "Повторне відкриття поштової скриньки..."
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "Надіслати копію листа %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "ÐÒÅƦËÓ ÎÅÐÒÉÐÕÓÔÉÍÉÊ ÄÌÑ ÓËÉÄÁÎÎÑ"
+msgstr "пÑ\80еÑ\84Ñ\96кÑ\81 непÑ\80ипÑ\83Ñ\81Ñ\82имий длÑ\8f Ñ\81киданнÑ\8f"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "Це перша позиція."
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push: ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
+msgstr "push: дуже багато аргументів"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "Викликати залишений лист?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "Бесіда має нечитані листи."
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "Неможливо редагувати повідомлення на POP сервері."
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s: неможливо додати файл"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "Перейти до листа: "
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "Видалити повідомлення з серверу?"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr ""
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "Перенести%s до скриньки"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "Перенести%s до скриньки"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "Неможливо редагувати повідомлення на POP сервері."
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "помилка у виразу"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "Шукати вираз:"
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "Не вийшло відправити лист."
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "Переслати як додатки?"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "Обмежитись повідомленнями за шаблоном: "
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "Цитованого тексту більш немає."
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "Друкувати повідомлення?"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "Ця скринька зовсім порожня."
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source: ÐÏÍÉÌËÁ × %s"
+msgstr "source: помилка в %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
-msgstr "source: ÐÏÍÉÌËÉ × %s"
+msgstr "source: помилки в %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr "source: ÞÉÔÁÎÎÑ ÚÁ×ÅÒÛÅÎÏ, ÄÕÖÅ ÂÁÇÁÔÏ ÐÏÍÉÌÏË Õ %s"
+msgstr "source: читання завершено, дуже багато помилок у %s"
+
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "Немає файлів, що відповідають масці"
 
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "sync: ÓËÒÉÎØËÕ ÚͦÎÅÎÏ, ÁÌÅ ÎÅÍÁ¤ ÚͦÎÅÎÉÈ ÌÉÓÔ¦×! (ÐÏצÄÏÍØÔÅ ÐÒÏ ÃÅ)"
+msgstr "sync: скриньку змінено, але немає змінених листів! (повідомьте про це)"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "Зняти виділення з листів за шаблоном: "
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "Це перша бесіда."
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3787,41 +4372,130 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "Цитованого тексту більш немає."
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "Перекодування може бути застосоване тільки до текстових додатків."
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "Немає виразу пошуку."
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Немає нечитаних листів"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "ÄÕÖÅ ÍÁÌÏ ÁÒÇÕÍÅÎÔ¦×"
+msgstr "дуже мало аргументів"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "ÄÕÖÅ ÂÁÇÁÔÏ ÁÒÇÕÍÅÎÔ¦×"
+msgstr "дуже багато аргументів"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "ÚͦÎÉÔÉ ÐÏÑÓÎÅÎÎÑ ÄÏ ÄÏÄÁÔËÕ"
+msgstr "змінити пояснення до додатку"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "Відновити листи за шаблоном: "
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "Відновити листи за шаблоном: "
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "Відновити листи за шаблоном: "
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr "unhook: îÅÍÏÖÌÉ×Ï ×ÉÄÁÌÉÔÉ %s Ú %s."
+msgstr "unhook: Неможливо видалити %s з %s."
 
 #: hook.c:204
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr "unhook: îÅÍÏÖÌÉ×Ï ÚÒÏÂÉÔÉ unhook * Ú hook."
+msgstr "unhook: Неможливо зробити unhook * з hook."
 
 #: hook.c:213
 #, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "unhook: ÎÅצÄÏÍÉÊ ÔÉÐ hook: %s"
+msgstr "unhook: невідомий тип hook: %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "ÎÅצÄÏÍÁ ÐÏÍÉÌËÁ"
+msgstr "невідома помилка"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "Зняти виділення з листів за шаблоном: "
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "змінити пояснення до додатку"
 
 #: main.c:82
 msgid ""
@@ -3834,12 +4508,43 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "ÚÎÁÞÅÎÎÑ ÎÅÐÒÉÐÕÓÔÉÍÅ ÄÌÑ ÓËÉÄÁÎÎÑ"
+msgstr "значення неприпустиме для скидання"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "Додаток записано."
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "Новий файл: "
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "Записати лист до поштової скриньки"
 
-#: lib-ui/curs_lib.c:155
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr ""
 
@@ -3847,3 +4552,6 @@ msgstr ""
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 14a4f43..87d6a62 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,42 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 1999-12-20 20:41+0800\n"
 "Last-Translator: Anthony Wong <ypwong@debian.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
 "\n"
 msgstr ""
 "\n"
-"±ê×¼¹¦Äܶ¨Ò壺\n"
+"标准功能定义：\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
 "\n"
 msgstr ""
 "\n"
-"δ±»¶¨ÒåµÄ¹¦ÄÜ£º\n"
+"未被定义的功能：\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 #, fuzzy
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+"[-- 签署的资料结束 --]\n"
 
 #: crypt.cpkg:1141
 msgid "                aka: "
@@ -67,45 +67,45 @@ msgid ""
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address"
 msgstr ""
-"Ó÷¨: mutt [ -nRzZ ] [ -e <ÃüÁî> ] [ -F <Îļþ> ] [ -m <ÀàÐÍ> ] [ -f <Îļþ"
+"用法: mutt [ -nRzZ ] [ -e <命令> ] [ -F <文件> ] [ -m <类型> ] [ -f <文件"
 "> ]\n"
-"        mutt [ -nx ] [ -e <ÃüÁî> ] [ -a <Îļþ> ] [ -F <Îļþ> ] [ -H <Îļþ> ] "
-"[ -i <Îļþ> ] [ -s <Ö÷Ìâ> ] [ -b <µØÖ·> ] [ -c <µØÖ·> ] <µØÖ·> [ ... ]\n"
-"        mutt [ -n ] [ -e <ÃüÁî> ] [ -F <Îļþ> ] -p\n"
+"        mutt [ -nx ] [ -e <命令> ] [ -a <文件> ] [ -F <文件> ] [ -H <文件> ] "
+"[ -i <文件> ] [ -s <主题> ] [ -b <地址> ] [ -c <地址> ] <地址> [ ... ]\n"
+"        mutt [ -n ] [ -e <命令> ] [ -F <文件> ] -p\n"
 "        mutt -v[v]\n"
 "\n"
-"²ÎÊý£º\n"
-"  -a <Îļþ>     ½«Îļþ¸½ÔÚÐżþÖÐ\n"
-"  -b <µØÖ·>     Ö¸¶¨Ò»¸ö ÃØÃܸ´ÖÆ (BCC) µÄµØÖ·\n"
-"  -c <µØÖ·>     Ö¸¶¨Ò»¸ö ¸´ÖÆ (CC) µÄµØÖ·\n"
-"  -e <ÃüÁî>     Ö¸¶¨Ò»¸ö³õʼ»¯ºóÒª±»Ö´ÐеÄÃüÁî\n"
-"  -f <Îļþ>     Ö¸¶¨ÒªÔĶÁÄÇÒ»¸öÓÊͲ\n"
-"  -F <Îļþ>     Ö¸¶¨ÁíÒ»¸ö muttrc Îļþ\n"
-"  -H <Îļþ>     Ö¸¶¨Ò»¸öÄ£°åÎļþÒÔ¶ÁÈ¡±êÌâÀ´Ô´\n"
-"  -i <Îļþ>     Ö¸¶¨Ò»¸ö°üÀ¨Ôڻظ²ÖеÄÎļþ\n"
-"  -m <ÀàÐÍ>     Ö¸¶¨Ò»¸öÔ¤ÉèµÄÓÊͲÀàÐÍ\n"
-"  -n            ʹ Mutt ²»È¥¶ÁȡϵͳµÄ Muttrc µµ\n"
-"  -p            ½Ð»ØÒ»¸öÑÓºó¼ÄË͵ÄÐżþ\n"
-"  -R            ÒÔÖ»¶Áģʽ´ò¿ªÓÊͲ\n"
-"  -s <Ö÷Ìâ>     Ö¸¶¨Ò»¸öÖ÷Ìâ (Èç¹ûÓпհ׵Ļ°±ØÐë±»°üÀ¨ÔÚÒýÑÔÖÐ)\n"
-"  -v            ÏÔʾ°æ±¾ºÍ±àÒëʱËù¶¨ÒåµÄ²ÎÊý\n"
-"  -x            Ä£Äâ mailx ¼ÄËÍģʽ\n"
-"  -y            Ñ¡ÔñÒ»¸ö±»Ö¸¶¨ÔÚÄúÓÊͲÇåµ¥ÖеÄÓÊͲ\n"
-"  -z            Èç¹ûûÓÐѶϢÔÚÓÊͲÖеĻ°£¬Á¢¼´À뿪\n"
-"  -Z            ´ò¿ªµÚÒ»¸ö¸½ÓÐÐÂÓʼþµÄ×ÊÁϼУ¬Èç¹ûûÓеĻ°Á¢¼´À뿪\n"
-"  -h            Õâ¸ö˵Ã÷ѶϢ"
-
-#: compose.c:152 compose.c:156
+"参数：\n"
+"  -a <文件>     将文件附在信件中\n"
+"  -b <地址>     指定一个 秘密复制 (BCC) 的地址\n"
+"  -c <地址>     指定一个 复制 (CC) 的地址\n"
+"  -e <命令>     指定一个初始化后要被执行的命令\n"
+"  -f <文件>     指定要阅读那一个邮筒\n"
+"  -F <文件>     指定另一个 muttrc 文件\n"
+"  -H <文件>     指定一个模板文件以读取标题来源\n"
+"  -i <文件>     指定一个包括在回覆中的文件\n"
+"  -m <类型>     指定一个预设的邮筒类型\n"
+"  -n            使 Mutt 不去读取系统的 Muttrc 档\n"
+"  -p            叫回一个延后寄送的信件\n"
+"  -R            以只读模式打开邮筒\n"
+"  -s <主题>     指定一个主题 (如果有空白的话必须被包括在引言中)\n"
+"  -v            显示版本和编译时所定义的参数\n"
+"  -x            模拟 mailx 寄送模式\n"
+"  -y            选择一个被指定在您邮筒清单中的邮筒\n"
+"  -z            如果没有讯息在邮筒中的话，立即离开\n"
+"  -Z            打开第一个附有新邮件的资料夹，如果没有的话立即离开\n"
+"  -h            这个说明讯息"
+
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
-msgstr " Ç©ÃûµÄÉí·ÝÊÇ£º "
+msgstr " 签名的身份是： "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr ""
@@ -148,95 +148,95 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
-msgstr " (Óà '?' ÏÔʾÁбí)£º"
+msgstr " (用 '?' 显示列表)："
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
-msgstr "£¨¼ÌÐø£©\n"
+msgstr "（继续）\n"
 
 #: lib-mx/mx.c:912
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Çë°´Ï '%s' À´Çл»Ð´Èëģʽ"
+msgstr " 请按下 '%s' 来切换写入模式"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
-msgstr " ÔÚÕâÏÞ¶¨µÄä¯ÀÀÖÐ"
+msgstr " 在这限定的浏览中"
 
 #: commands.c:601
 msgid " tagged"
-msgstr " Òѱê¼Ç"
+msgstr " 已标记"
 
 #: pattern.c:716
 #, c-format
 msgid "%c: invalid command"
-msgstr "%c£ºÎÞЧµÄÖ¸Áî"
+msgstr "%c：无效的指令"
 
 #: pattern.c:721
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c£ºÔÚÕâ¸öģʽ²»Ö§³Ö"
+msgstr "%c：在这个模式不支持"
 
 #: lib-mx/mx.c:795 lib-mx/mx.c:972
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»É¾³ý¡£"
+msgstr "%d 封信件被保留, %d 封信件被删除。"
 
 #: lib-mx/mx.c:792
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»°áÒÆ, %d ·âÐżþ±»É¾³ý¡£"
+msgstr "%d 封信件被保留, %d 封信件被搬移, %d 封信件被删除。"
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, fuzzy, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s ÄúÕæµÄҪʹÓÃËü£¿"
+msgstr "%s 您真的要使用它？"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] ÒÑÐ޸ġ£¸üбàÂ룿"
+msgstr "%s [#%d] 已修改。更新编码？"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] ÒѲ»´æÔÚ!"
+msgstr "%s [#%d] 已不存在!"
 
 #: pop.c:1323
 #, fuzzy, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [ÒÑÔĶÁ %2d ·âÐżþÖÐµÄ %1d ·â]"
+msgstr "%s [已阅读 %2d 封信件中的 %1d 封]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s ²»´æÔÚ¡£ÖÆÔìÂð£¿"
+msgstr "%s 不存在。制造吗？"
 
 #: imap/browse.c:59 imap/imap.c:489
 #, c-format
@@ -248,40 +248,40 @@ msgstr ""
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr ""
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s ²»ÊÇÒ»¸öĿ¼"
+msgstr "%s 不是一个目录"
 
 #: muttlib.c:337
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s ²»ÊÇÐÅÏ䣡"
+msgstr "%s 不是信箱！"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s ²»ÊÇÐÅÏä¡£"
+msgstr "%s 不是信箱。"
 
 #: sendlib.c:748
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
-msgstr "%s ²»ÊÇÐÅÏä¡£"
+msgstr "%s 不是信箱。"
 
 #: sendlib.c:372
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s ÒѾ­²»´æÔÚ£¡"
+msgstr "%s 已经不存在！"
 
 #: lib-mx/mx.h:55
 #, c-format
@@ -295,142 +295,142 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
-msgstr "%s£º²»Ã÷µÄÖÖÀà"
+msgstr "%s：不明的种类"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s£ºÖն˻úÎÞ·¨ÏÔʾɫ²Ê"
+msgstr "%s：终端机无法显示色彩"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
-msgstr "%s£ºÃüÁîÖ»ÌṩË÷ÒýÎï¼þ"
+msgstr "%s：命令只提供索引物件"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s£ºÃ»ÓÐÕâ¸öÊôÐÔ"
+msgstr "%s：没有这个属性"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
-msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
+msgstr "%s：没有这种颜色"
 
-#: keymap.c:847
+#: keymap.c:839
 #, fuzzy, c-format
 msgid "%s: no such function"
-msgstr "%s£ºÔÚ¶ÔÓ³±íÖÐûÓÐÕâÑùµÄº¯Êý"
+msgstr "%s：在对映表中没有这样的函数"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s£ºÔÚ¶ÔÓ³±íÖÐûÓÐÕâÑùµÄº¯Êý"
+msgstr "%s：在对映表中没有这样的函数"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s£ºÃ»ÓÐÕâ¸öÑ¡µ¥"
+msgstr "%s：没有这个选单"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
-msgstr "%s£ºÃ»ÓÐÕâ¸öÎï¼þ"
+msgstr "%s：没有这个物件"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s£ºÌ«ÉÙ²ÎÊý"
+msgstr "%s：太少参数"
 
 #: headers.c:148
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
+msgstr "%s：无法附带文件"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s£ºÎÞ·¨¸½´øÎļþ¡£\n"
+msgstr "%s：无法附带文件。\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s£º²»Ã÷µÄÖ¸Áî"
+msgstr "%s：不明的指令"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s£º²»Ã÷µÄÖÖÀà"
+msgstr "%s：不明的种类"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s£º²»Ã÷µÄ±äÁ¿"
+msgstr "%s：不明的变量"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
 msgstr ""
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr ""
 
 #: handler.c:1450
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "£¨ÐèÒª¶¨ÒåÒ»¸ö¼ü¸ø 'view-attachments' lä¯ÀÀ¸½¼þ)£¡)"
+msgstr "（需要定义一个键给 'view-attachments' l浏览附件)！)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
-msgstr "£¨Ã»ÓÐÐÅÏ䣩"
+msgstr "（没有信箱）"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 
 #: handler.c:1191
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(%s λԪ×é) "
+msgstr "(%s 位元组) "
 
 #: handler.c:1448
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "£¨Ê¹Óà '%s' À´ÏÔʾÕⲿ·Ý£©"
+msgstr "（使用 '%s' 来显示这部份）"
 
 #: crypt.cpkg:1153
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
-msgstr "-- ¸½¼þ"
+msgstr "-- 附件"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
-msgstr "<²»Ã÷µÄ>"
+msgstr "<不明的>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
-msgstr "<Ô¤ÉèÖµ>"
+msgstr "<预设值>"
 
 #: crypt.cpkg:950
 msgid "A policy requirement was not met\n"
@@ -443,125 +443,116 @@ msgstr ""
 #: pop.c:325
 #, fuzzy
 msgid "APOP authentication failed."
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
-
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "ÖжÏ"
+msgstr "GSSAPI 验证失败。"
 
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
-msgstr "ÊÇ·ñÒªÖжÏδÐ޸ĹýµÄÐżþ?"
+msgstr "是否要中断未修改过的信件?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
-msgstr "ÖжÏûÓÐÐ޸ĹýµÄÐżþ"
+msgstr "中断没有修改过的信件"
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
-msgstr "µØÖ·£º"
+msgstr "地址："
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
-msgstr "±ðÃûÒѾ­Ôö¼Ó¡£"
+msgstr "别名已经增加。"
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
-msgstr "È¡±ðÃûΪ£º"
+msgstr "取别名为："
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
-msgstr "±ðÃû"
+msgstr "别名"
 
 #: lib-sys/mutt_ssl.cpkg:248
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
-
-#: remailer.c:431
-#, fuzzy
-msgid "Append"
-msgstr "¼Ä³ö"
+msgstr "这个钥匙不能使用：过期/无效/已取消。"
 
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
-msgstr "¸½¼ÓÐżþµ½ %s ?"
+msgstr "附加信件到 %s ?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
-msgstr "ÐèÒªÒ»¸öÐżþ±àºÅµÄ²ÎÊý¡£"
+msgstr "需要一个信件编号的参数。"
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
-msgstr "¸½¼þÒѱ»´¢´æ¡£"
+msgstr "附件已被储存。"
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
-msgstr "¸½¼ÓÎļþ"
+msgstr "附加文件"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
-msgstr "ÕýÔÚ¸½¼ÓÑ¡È¡Á˵ÄÎļþ¡­"
+msgstr "正在附加选取了的文件…"
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
-msgstr "¸½¼þ±»¹ýÂ˵ô¡£"
+msgstr "附件被过滤掉。"
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
-msgstr "¸½¼þÒѱ»´¢´æ¡£"
+msgstr "附件已被储存。"
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
-msgstr "¸½¼þ"
+msgstr "附件"
 
 #: imap/auth.c:83
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
-msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
+msgstr "验证中 (GSSAPI)…"
 
 #: pop.c:304
 #, fuzzy
 msgid "Authenticating (APOP)..."
-msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
+msgstr "验证中 (GSSAPI)…"
 
 #: pop.c:221
 #, fuzzy
 msgid "Authenticating (SASL)..."
-msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
+msgstr "验证中 (GSSAPI)…"
 
 #: pop.c:339
 #, fuzzy
 msgid "Authenticating (USER)..."
-msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
+msgstr "验证中 (GSSAPI)…"
 
 #: crypt.cpkg:945
 msgid "Available CRL is too old\n"
@@ -572,12 +563,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -590,38 +581,38 @@ msgstr ""
 #: imap/imap.c:1342
 #, fuzzy
 msgid "Bad mailbox name"
-msgstr "´ò¿ªÐÅÏä"
+msgstr "打开信箱"
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
-msgstr "ÏÖÕýÏÔʾ×îÏÂÃæµÄÐżþ¡£"
+msgstr "现正显示最下面的信件。"
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce message to %s"
-msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
+msgstr "把邮件直接传送至 %s"
 
 #: commands.c:175 recvcmd.c:131
 msgid "Bounce message to: "
-msgstr "Ö±½Ó´«ËÍÓʼþµ½£º"
+msgstr "直接传送邮件到："
 
 #: commands.c:208 recvcmd.c:162
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
+msgstr "把邮件直接传送至 %s"
 
 #: commands.c:177 recvcmd.c:133
 msgid "Bounce tagged messages to: "
-msgstr "ÎÞ·¨´«ËÍÒѱê¼ÇµÄÓʼþÖÁ£º"
+msgstr "无法传送已标记的邮件至："
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
 #: imap/imap.c:949 imap/imap.c:980
 #, fuzzy
 msgid "CLOSE failed"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "登入失败。"
 
 #: lib-lua/madmutt.cpkg:101
 msgid "Cache directory not created!"
@@ -630,37 +621,37 @@ msgstr ""
 #: editmsg.c:121 editmsg.c:149
 #, fuzzy, c-format
 msgid "Can't append to folder: %s"
-msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
+msgstr "无法建立文件 %s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
-msgstr "ÎÞ·¨¸½´øĿ¼£¡"
+msgstr "无法附带目录！"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "ÎÞ·¨½¨Á¢ %s: %s."
+msgstr "无法建立 %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
-msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
+msgstr "无法建立文件 %s"
 
 #: attach.c:579 attach.c:603 attach.c:874 attach.c:925 handler.c:1098
 msgid "Can't create filter"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
+msgstr "无法建立过滤"
 
 #: commands.c:290 commands.c:317 commands.c:334
 #, fuzzy
 msgid "Can't create filter process"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
+msgstr "无法建立过滤"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+msgstr "无法建立暂存档"
 
 #: recvcmd.c:833
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
@@ -670,25 +661,25 @@ msgstr ""
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
 
-#: recvattach.c:856
+#: recvattach.c:846
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
-msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
+msgstr "应用下一个功能到已标记的讯息"
 
-#: recvattach.c:977
+#: recvattach.c:965
 #, fuzzy
 msgid "Can't delete attachment from POP server."
-msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
+msgstr "取回 POP 伺服器上的信件"
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
-msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
+msgstr "取回 POP 伺服器上的信件"
 
 #: lib-mx/mx.c:103
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "ÎÞ·¨Óà dotlock Ëøס %s¡£\n"
+msgstr "无法用 dotlock 锁住 %s。\n"
 
 #: pop.c:894
 msgid "Can't fetch header: Not connected!"
@@ -697,138 +688,130 @@ msgstr ""
 #: recvcmd.c:724
 #, fuzzy
 msgid "Can't find any tagged messages."
-msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
-
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr ""
+msgstr "应用下一个功能到已标记的讯息"
 
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
-msgstr "ÎÞ·¨Æ¥ÅäÃû³ÆÄ£°å£¬¼ÌÐø£¿"
+msgstr "无法匹配名称模板，继续？"
 
 #: editmsg.c:115
 #, fuzzy, c-format
 msgid "Can't open message file: %s"
-msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
+msgstr "无法建立文件 %s"
 
 #: lib-mx/mx.c:605
 #, fuzzy
 msgid "Can't open trash folder"
-msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
+msgstr "无法建立文件 %s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正连接到 %s…"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
-msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+msgstr "正在关闭与 IMAP 伺服器的连线…"
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
-msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
+msgstr "无法读取：%s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
-msgstr "ÎÞ·¨½¨Á¢ %s: %s."
+msgstr "无法建立 %s: %s."
 
 #: muttlib.c:310
 #, fuzzy
 msgid "Can't save message to POP mailbox."
-msgstr "½«ÐżþдÈëµ½ÐÅÏä"
+msgstr "将信件写入到信箱"
 
 #: muttlib.c:317
 #, fuzzy
 msgid "Can't save message to newsserver."
-msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+msgstr "正在删除伺服器上的信件…"
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
-msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
+msgstr "无法读取：%s"
 
 #: crypt.cpkg:936
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
-msgstr "ÎÞ·¨ÏÔʾĿ¼"
+msgstr "无法显示目录"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
-msgstr "ÎÞ·¨½¨Á¢ %s: %s."
+msgstr "无法建立 %s: %s."
 
 #: pop.c:888
 #, fuzzy
 msgid "Can't write header to temporary file!"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+msgstr "无法建立暂存档"
 
 #: lib-mx/mbox.c:864
 #, fuzzy
 msgid "Can't write message"
-msgstr "±à¼­ÐżþÄÚÈÝ"
+msgstr "编辑信件内容"
 
 #: pop.c:1420
 #, fuzzy
 msgid "Can't write message to temporary file!"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+msgstr "无法建立暂存档"
 
 #: commands.c:71
 #, fuzzy
 msgid "Cannot create display filter"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
+msgstr "无法建立过滤器"
 
 #: attach.c:473
 msgid "Cannot create filter"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
+msgstr "无法建立过滤器"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "ÎÞ·¨Ð´Èëµ½Ò»¸öÖ»¶ÁµÄÐÅÏ䣡"
-
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
+msgstr "无法写入到一个只读的信箱！"
 
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "²¶×¥µ½ %s¡­ ÕýÔÚÀ뿪¡£\n"
+msgstr "捕抓到 %s… 正在离开。\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 msgid "Certificate is not X.509"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
-msgstr "ÔÚÀ뿪֮ºó½«»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
+msgstr "在离开之后将会把改变写入资料夹。"
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
-msgstr "½«²»»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
+msgstr "将不会把改变写入资料夹。"
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -836,151 +819,143 @@ msgstr ""
 #: commands.c:786
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
-msgstr "²»Ã÷µÄ×Ö·û¼¯ %s¡£"
-
-#: browser.c:35
-msgid "Chdir"
-msgstr "¸Ä±äĿ¼"
+msgstr "不明的字符集 %s。"
 
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
-msgstr "¸Ä±äĿ¼µ½£º"
+msgstr "改变目录到："
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
-msgstr "×¼±¸×ª¼ÄÐżþ¡­"
-
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "¼ì²éÔ¿³×   "
+msgstr "准备转寄信件…"
 
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 #, fuzzy
 msgid "Checking for new messages..."
-msgstr "×¼±¸×ª¼ÄÐżþ¡­"
+msgstr "准备转寄信件…"
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
-msgstr "×¼±¸×ª¼ÄÐżþ¡­"
+msgstr "准备转寄信件…"
 
 #: imap/imap.c:352
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
-msgstr "Çå³ý"
+msgstr "清除"
 
 #: flags.c:335
 msgid "Clear flag"
-msgstr "Çå³ýÆì±ê"
+msgstr "清除旗标"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, fuzzy, c-format
 msgid "Closing connection to %s..."
-msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+msgstr "正在关闭与 IMAP 伺服器的连线…"
 
 #: pop.c:170
 #, fuzzy
 msgid "Closing connection to POP server..."
-msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+msgstr "正在关闭与 IMAP 伺服器的连线…"
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正连接到 %s…"
 
 #: pop.c:600 pop.c:863
 #, fuzzy, c-format
 msgid "Command TOP is not supported by server."
-msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
+msgstr "不支持标记功能。"
 
 #: pop.c:602 pop.c:966
 #, fuzzy, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
+msgstr "不支持标记功能。"
 
 #: lib-mx/mbox.c:547
 #, fuzzy
 msgid "Committing changes..."
-msgstr "±àÒëËÑÑ°ÑùʽÖС­"
+msgstr "编译搜寻样式中…"
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
 "\n"
-"±àÒëÑ¡Ï"
+"编译选项："
 
 #: pattern.c:1129 pattern.c:1249
 msgid "Compiling search pattern..."
-msgstr "±àÒëËÑÑ°ÑùʽÖС­"
+msgstr "编译搜寻样式中…"
 
 #: lib-mx/compress.c:394
 #, fuzzy, c-format
 msgid "Compressed-appending to %s..."
-msgstr "¿½±´µ½ %s¡­"
+msgstr "拷贝到 %s…"
 
 #: lib-mx/compress.c:327 lib-mx/compress.c:392
 #, fuzzy, c-format
 msgid "Compressing %s..."
-msgstr "¿½±´µ½ %s¡­"
+msgstr "拷贝到 %s…"
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正连接到 %s…"
 
 #: lib-sys/mutt_socket.c:355
 #, c-format
 msgid "Connecting to %s..."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正连接到 %s…"
 
 #: lib-sys/mutt_tunnel.c:61
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正连接到 %s…"
 
 #: imap/imap.c:1539
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
-msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+msgstr "正在关闭与 IMAP 伺服器的连线…"
 
 #: pop.c:808
 #, fuzzy
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+msgstr "正在关闭与 IMAP 伺服器的连线…"
 
 #: lib-sys/mutt_socket.c:77 lib-sys/mutt_socket.c:117
 #, fuzzy, c-format
 msgid "Connection to %s closed"
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正连接到 %s…"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正连接到 %s…"
 
 #: commands.c:782
 #, fuzzy, c-format
 msgid "Content-Type changed to %s."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正连接到 %s…"
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-Type µÄ¸ñʽÊÇ base/sub"
+msgstr "Content-Type 的格式是 base/sub"
 
 #: imap/util.c:135
 #, fuzzy
 msgid "Continue?"
-msgstr "£¨¼ÌÐø£©\n"
+msgstr "（继续）\n"
 
 #: commands.c:772
 #, c-format
@@ -990,22 +965,22 @@ msgstr ""
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "%s%s 到信箱"
 
 #: imap/message.c:681
 #, fuzzy, c-format
 msgid "Copying %d messages to %s..."
-msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
+msgstr "正在搬移已经读取的信件到 %s …"
 
 #: imap/message.c:684
 #, fuzzy, c-format
 msgid "Copying message %d to %s..."
-msgstr "дÈëÐżþµ½ %s ¡­"
+msgstr "写入信件到 %s …"
 
 #: commands.c:658
 #, c-format
 msgid "Copying to %s..."
-msgstr "¿½±´µ½ %s¡­"
+msgstr "拷贝到 %s…"
 
 #: main.c:63
 msgid ""
@@ -1021,36 +996,36 @@ msgstr ""
 #: lib-sys/mutt_socket.c:374
 #, fuzzy, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "ÎÞ·¨´ò¿ª %s"
+msgstr "无法打开 %s"
 
 #: commands.c:111
 #, fuzzy
 msgid "Could not copy message"
-msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
+msgstr "无法寄出信件。"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法建立暂存档！"
 
 #: commands.c:60 lib-mx/mbox.c:427
 msgid "Could not create temporary file!"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法建立暂存档！"
 
 #: sort.c:301
 msgid "Could not find sorting function! [report this bug]"
-msgstr "ÕÒ²»µ½ÅÅÐòµÄº¯Êý£¡[Çë»Ø±¨Õâ¸öÎÊÌâ]"
+msgstr "找不到排序的函数！[请回报这个问题]"
 
 #: lib-sys/mutt_socket.c:350
 #, fuzzy, c-format
 msgid "Could not find the host \"%s\""
-msgstr "ÕÒ²»µ½Ö÷»ú %s µÄλַ¡£"
+msgstr "找不到主机 %s 的位址。"
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
-msgstr "ÎÞ·¨°üº¬ËùÓÐÒªÇóµÄÐżþ£¡"
+msgstr "无法包含所有要求的信件！"
 
 #: imap/imap.c:393 pop.c:688
 msgid "Could not negotiate TLS connection"
@@ -1059,108 +1034,94 @@ msgstr ""
 #: sendlib.c:908
 #, c-format
 msgid "Could not open %s"
-msgstr "ÎÞ·¨´ò¿ª %s"
+msgstr "无法打开 %s"
 
 #: lib-mx/mbox.c:634
 msgid "Could not reopen mailbox!"
-msgstr "ÎÞ·¨ÖØ¿ªÐÅÏ䣡"
+msgstr "无法重开信箱！"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
-msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
+msgstr "无法寄出信件。"
 
 #: lib-mx/mx.c:407
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "ÎÞ·¨Ëøס %s¡£\n"
+msgstr "无法锁住 %s。\n"
 
 #: imap/imap.c:668 imap/message.c:711 muttlib.c:348
 #, c-format
 msgid "Create %s?"
-msgstr "½¨Á¢ %s£¿"
+msgstr "建立 %s？"
 
-#: browser.c:1000
+#: browser.c:971
 #, fuzzy
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
+msgstr "只有 IMAP 邮箱才支持删除"
 
 #: imap/browse.c:249
 #, fuzzy
 msgid "Create mailbox: "
-msgstr "´ò¿ªÐÅÏä"
+msgstr "打开信箱"
 
 #: commands.c:597
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "%s%s 到信箱"
 
 #: commands.c:596
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "%s%s 到信箱"
 
 #: lib-mx/compress.c:212
 #, fuzzy, c-format
 msgid "Decompressing %s..."
-msgstr "Ñ¡Ôñ %s ÖС­"
+msgstr "选择 %s 中…"
 
 #: commands.c:599
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "%s%s 到信箱"
 
 #: commands.c:598
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "%s%s 到信箱"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "寄出信件中…"
 
-#: postpone.c:517
+#: postpone.c:482
 #, fuzzy
 msgid "Decryption failed."
-msgstr "µÇÈëʧ°Ü¡£"
-
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "ɾ³ý"
+msgstr "登入失败。"
 
-#: remailer.c:433
-#, fuzzy
-msgid "Delete"
-msgstr "Ñ¡Ôñ"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
+msgstr "只有 IMAP 邮箱才支持删除"
 
 #: pop.c:1282
 #, fuzzy
 msgid "Delete messages from server?"
-msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+msgstr "正在删除伺服器上的信件…"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
-msgstr "ɾ³ý·ûºÏÕâÑùʽµÄÐżþ£º"
+msgstr "删除符合这样式的信件："
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
-msgstr "Ñ¡Ôñ"
+msgstr "选择"
 
-#: recvattach.c:993
+#: recvattach.c:981
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "δ֧³Öɾ³ý PGP ÐżþËù¸½´øµÄ¸½¼þ¡£"
-
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "ÐðÊö"
+msgstr "未支持删除 PGP 信件所附带的附件。"
 
 #: lib-lua/madmutt.cpkg:106
 #, c-format
@@ -1170,586 +1131,539 @@ msgstr ""
 #: lib-lua/madmutt.cpkg:94
 #, fuzzy, c-format
 msgid "Directory %s not exist. Create it?"
-msgstr "%s ²»´æÔÚ¡£ÖÆÔìÂð£¿"
+msgstr "%s 不存在。制造吗？"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Ŀ¼ [%s], ÎļþÕÚÕÖ: %s"
+msgstr "目录 [%s], 文件遮罩: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
-msgstr "´íÎó£ºÇë»Ø±¨Õâ¸öÎÊÌâ"
+msgstr "错误：请回报这个问题"
 
-#: send.c:1387
+#: send.c:1381
 #, fuzzy
 msgid "Edit forwarded message?"
-msgstr "×¼±¸×ª¼ÄÐżþ¡­"
+msgstr "准备转寄信件…"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
 #: pattern.c:222
 #, fuzzy, c-format
 msgid "Empty expression"
-msgstr "±í´ïʽÓдíÎó"
+msgstr "表达式有错误"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
-msgstr "¼ÓÃÜ"
+msgstr "加密"
 
-#: compose.c:163
+#: compose.c:135
 #, fuzzy
 msgid "Encrypt with: "
-msgstr "¼ÓÃÜ"
+msgstr "加密"
 
 #: imap/imap.c:407 pop.c:706
 #, fuzzy
 msgid "Encrypted connection unavailable"
-msgstr "¼ÓÃܵÄÔ¿³×"
+msgstr "加密的钥匙"
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
-msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
+msgstr "请输入 %s 的钥匙 ID："
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
+msgstr "请输入 %s 的钥匙 ID："
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
-msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
+msgstr "请输入 %s 的钥匙 ID："
 
 #: recvcmd.c:198
 #, fuzzy
 msgid "Error bouncing message!"
-msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+msgstr "寄信途中发生错误。"
 
 #: recvcmd.c:199
 #, fuzzy
 msgid "Error bouncing messages!"
-msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+msgstr "寄信途中发生错误。"
 
 #: crypt.cpkg:1175
 #, fuzzy
 msgid "Error checking signature"
-msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+msgstr "寄信途中发生错误。"
 
 #: pop.c:142
 #, fuzzy, c-format
 msgid "Error connecting to server: %s"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "正连线到 %s"
 
 #: lib-mx/compress.c:246
 #, c-format
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "正连线到 %s"
 
 #: crypt.cpkg:1126
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "%s ·¢Éú´íÎó£¬ÐкŠ%d£º%s"
+msgstr "%s 发生错误，行号 %d：%s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
+msgstr "指令行有错：%s\n"
 
 #: pattern.c:217
 #, c-format
 msgid "Error in expression: %s"
-msgstr "±í´ïʽÓдíÎó£º%s"
+msgstr "表达式有错误：%s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
-msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
+msgstr "无法初始化终端机。"
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
-msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
+msgstr "无法初始化终端机。"
 
 #: imap/imap.c:620
 #, fuzzy
 msgid "Error opening mailbox"
-msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
+msgstr "写入信箱时发生错误！"
 
 #: commands.c:190 recvcmd.c:141
 msgid "Error parsing address!"
-msgstr "ÎÞ·¨·ÖÎöλַ£¡"
+msgstr "无法分析位址！"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Ö´ÐÐ \"%s\" ʱ·¢Éú´íÎó£¡"
+msgstr "执行 \"%s\" 时发生错误！"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
-msgstr "ÎÞ·¨É¨ÃèĿ¼¡£"
+msgstr "无法扫描目录。"
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
-
-#: remailer.c:703
-#, fuzzy, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+msgstr "寄送讯息出现错误，子程序已结束 %d (%s)。"
 
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "正连线到 %s"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
-msgstr "ÎÞ·¨ÊÔÖøÏÔʾÎļþ"
+msgstr "无法试著显示文件"
 
 #: pop.c:1318
 msgid "Error while writing mailbox!"
-msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
+msgstr "写入信箱时发生错误！"
 
 #: editmsg.c:180
 #, fuzzy, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
-
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr ""
+msgstr "无法建立暂存档"
 
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #: handler.c:1356
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "´íÎó£ºmultipart/encrypted ûÓÐÈκÎͨѶЭ¶¨²ÎÊý£¡"
+msgstr "错误：multipart/encrypted 没有任何通讯协定参数！"
 
 #: handler.c:1347
 msgid "Error: multipart/signed has no protocol."
-msgstr "´íÎó£ºmultipart/signed ûÓÐͨѶЭ¶¨¡£"
+msgstr "错误：multipart/signed 没有通讯协定。"
 
 #: lib-sys/mutt_ssl.cpkg:144 lib-sys/mutt_ssl.cpkg:164
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
+msgstr "指令行有错：%s\n"
 
 #: imap/message.c:109
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
-msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
+msgstr "正在取回信件标头… [%d/%d]"
 
 #: pattern.c:1145
 msgid "Executing command on matching messages..."
-msgstr "ÕýÔÚ¶Ô·ûºÏµÄÓʼþÖ´ÐÐÃüÁî¡­"
-
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "À뿪"
+msgstr "正在对符合的邮件执行命令…"
 
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "À뿪  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
-msgstr "²»´¢´æ±ãÀ뿪 Mutt Âð£¿"
+msgstr "不储存便离开 Mutt 吗？"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
-msgstr "À뿪 Mutt£¿"
+msgstr "离开 Mutt？"
 
 #: imap/imap.c:898
 #, fuzzy
 msgid "Expunge failed"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "登入失败。"
 
 #: imap/imap.c:936
 msgid "Expunging messages from server..."
-msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+msgstr "正在删除伺服器上的信件…"
 
 #: attach.c:113
 msgid "Failure to open file to parse headers."
-msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
+msgstr "打开文件来分析文件头失败。"
 
 #: attach.c:143
 msgid "Failure to open file to strip headers."
-msgstr "´ò¿ªÎļþʱȥ³ýÎļþ±êͷʧ°Ü¡£"
+msgstr "打开文件时去除文件标头失败。"
 
 #: attach.c:151
 #, fuzzy
 msgid "Failure to rename file."
-msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
+msgstr "打开文件来分析文件头失败。"
 
 #: lib-mx/mbox.c:398 lib-mx/mbox.c:591
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "ÑÏÖØ´íÎó£¡ÎÞ·¨ÖØдò¿ªÐÅÏ䣡"
+msgstr "严重错误！无法重新打开信箱！"
 
 #: imap/command.c:274
 msgid "Fatal error.  Message count is out of sync!"
-msgstr "ÑÏÖØ´íÎó¡£ÐżþÊýÁ¿²»Ð­µ÷£¡"
+msgstr "严重错误。信件数量不协调！"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
-msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+msgstr "正在删除伺服器上的信件…"
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "寄出信件中…"
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "寄出信件中…"
 
 #: pop.c:1062
 #, fuzzy
 msgid "Fetching list of messages..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "寄出信件中…"
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
-msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
+msgstr "正在取回信件标头… [%d/%d]"
 
 #: imap/message.c:173 pop.c:976
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
-msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
+msgstr "正在取回信件标头… [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 #, fuzzy
 msgid "Fetching message..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "寄出信件中…"
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
-msgstr "ÎļþÕÚÕÖ£º"
+msgstr "文件遮罩："
 
 #: muttlib.c:260
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "ÎļþÒѾ­´æÔÚ, (o)¸²¸Ç, (a)¸½¼Ó, »òÊÇ (c)È¡Ïû ?"
+msgstr "文件已经存在, (o)覆盖, (a)附加, 或是 (c)取消 ?"
 
 #: muttlib.c:243
 msgid "File is a directory, save under it?"
-msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
+msgstr "文件是一个目录, 储存在它下面 ?"
 
 #: muttlib.c:226
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
+msgstr "文件是一个目录, 储存在它下面 ?"
 
 #: muttlib.c:249
 msgid "File under directory: "
-msgstr "ÔÚĿ¼µ×ϵÄÎļþ£º"
+msgstr "在目录底下的文件："
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
-msgstr "¾­¹ý¹ýÂË£º"
+msgstr "经过过滤："
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 msgid "Fingerprint: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
-msgstr "´¢´æÐżþÒÔ±ãÉÔºó¼Ä³ö"
+msgstr "储存信件以便稍后寄出"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "ÒÔºóµÄ»Ø¸²¶¼¼ÄÖÁ %s%s?"
-
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "ÒÔºóµÄ»Ø¸²¶¼¼ÄÖÁ %s%s?"
+msgstr "以后的回覆都寄至 %s%s?"
 
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
-msgstr "Óà MIME µÄ·½Ê½À´×ª¼Ä£¿"
+msgstr "用 MIME 的方式来转寄？"
 
-#: send.c:828
+#: send.c:826
 #, fuzzy
 msgid "Forward as attachment?"
-msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
+msgstr "是否要打印附件?"
 
 #: recvcmd.c:475
 #, fuzzy
 msgid "Forward as attachments?"
-msgstr "ÏÔʾ MIME ¸½¼þ"
+msgstr "显示 MIME 附件"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
-msgstr "¹¦ÄÜÔÚ attach-message ģʽϲ»±»Ö§³Ö¡£"
+msgstr "功能在 attach-message 模式下不被支持。"
 
 #: imap/browse.c:85
 #, fuzzy
 msgid "Getting folder list..."
-msgstr "ÒѽӴ¥ËÅ·þÆ÷£¬ÕýÄÃȡĿ¼±í¡­"
+msgstr "已接触伺服器，正拿取目录表…"
 
 #: imap/browse.c:75
 #, fuzzy
 msgid "Getting namespaces..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "寄出信件中…"
 
 #: crypt.cpkg:1132 crypt.cpkg:1162
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "Ⱥ×é"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "°ïÖú"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
-msgstr "%s µÄÇóÖú"
+msgstr "%s 的求助"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
-msgstr "ÏÖÕýÏÔʾ˵Ã÷Îļþ¡£"
+msgstr "现正显示说明文件。"
 
 #: attach.c:944
 msgid "I don't know how to print that!"
-msgstr "ÎÒ²»ÖªµÀÒªÈçºÎ´òÓ¡Ëü£¡"
+msgstr "我不知道要如何打印它！"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "ÎÒ²»ÖªµÀÒªÔõô´òÓ¡ %s ¸½¼þ!"
+msgstr "我不知道要怎么打印 %s 附件!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+msgstr "这个钥匙不能使用：过期/无效/已取消。"
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 #, fuzzy
 msgid "ID is not valid."
-msgstr "Õâ¸ö ID ²»±»ÐÅÈΡ£"
+msgstr "这个 ID 不被信任。"
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 #, fuzzy
 msgid "ID is only marginally valid."
-msgstr "´Ë ID Ö»ÊÇÃãÇ¿±»ÐÅÈΡ£"
+msgstr "此 ID 只是勉强被信任。"
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
-msgstr "²»ºÏ¹æ¶¨µÄ PGP ±êÍ·"
+msgstr "不合规定的 PGP 标头"
 
-#: postpone.c:434
+#: postpone.c:399
 #, fuzzy
 msgid "Illegal S/MIME header"
-msgstr "²»ºÏ¹æ¶¨µÄ PGP ±êÍ·"
+msgstr "不合规定的 PGP 标头"
 
 #: lib-mime/rfc1524.c:197
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "ÔÚ \"%2$s\" µÄµÚ %3$d Ðз¢ÏÖÀà±ð %1$s Ϊ´íÎóµÄ¸ñʽ¼Í¼"
+msgstr "在 \"%2$s\" 的第 %3$d 行发现类别 %1$s 为错误的格式纪录"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
-msgstr "»ØÐÅʱÊÇ·ñÒª°üº¬Ô­±¾µÄÐżþÄÚÈÝ£¿"
+msgstr "回信时是否要包含原本的信件内容？"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
-msgstr "ÕýÒýÈëÒýÑÔ²¿·Ö¡­"
-
-#: remailer.c:432
-msgid "Insert"
-msgstr ""
+msgstr "正引入引言部分…"
 
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "ÎÞЧµÄÈÕ×Ó£º%s"
+msgstr "无效的日子：%s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
-msgstr "ÎÞЧµÄ±àÂë¡£"
+msgstr "无效的编码。"
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
-msgstr "ÎÞЧµÄË÷Òý±àºÅ¡£"
+msgstr "无效的索引编号。"
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
-msgstr "ÎÞЧµÄÐżþ±àºÅ¡£"
+msgstr "无效的信件编号。"
 
 #: pattern.c:343
 #, c-format
 msgid "Invalid month: %s"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "无效的月份：%s"
 
 #: pattern.c:486
 #, fuzzy, c-format
 msgid "Invalid relative date: %s"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "无效的月份：%s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
-msgstr "Æô¶¯ PGP¡­"
+msgstr "启动 PGP…"
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "Æô¶¯ PGP¡­"
+msgstr "启动 PGP…"
 
 #: handler.c:1075
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Ö´ÐÐ×Ô¶¯ÏÔʾָÁ%s"
+msgstr "执行自动显示指令：%s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
-msgstr "Ìøµ½Ðżþ£º"
+msgstr "跳到信件："
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
-msgstr "Ìøµ½£º"
+msgstr "跳到："
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
-msgstr "¶Ô»°Ä£Ê½Öв»Ö§³ÖÌøÔ¾¹¦ÄÜ¡£"
+msgstr "对话模式中不支持跳跃功能。"
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "Ô¿³× ID£º0x%s"
+msgstr "钥匙 ID：0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
-msgstr "Õâ¸ö¼ü»¹Î´±»¶¨Ò幦ÄÜ¡£"
+msgstr "这个键还未被定义功能。"
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Õâ¸ö¼ü»¹Î´±»¶¨Ò幦ÄÜ¡£ °´ '%s' ÒÔÈ¡µÃ˵Ã÷¡£"
+msgstr "这个键还未被定义功能。 按 '%s' 以取得说明。"
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
-msgstr "ÏÞÖÆÖ»·ûºÏÕâÑùʽµÄÐżþ£º"
+msgstr "限制只符合这样式的信件："
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
-msgstr "ÏÞÖÆ: %s"
-
-#: browser.c:44
-msgid "List"
-msgstr ""
+msgstr "限制: %s"
 
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
-msgstr "µÇÈëÖС­"
+msgstr "登入中…"
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1757,764 +1671,688 @@ msgstr ""
 #: lib-mx/mx.c:94
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Ëø½øÊýÁ¿³¬¹ýÏ޶½« %s µÄËøÒƳý£¿"
+msgstr "锁进数量超过限额，将 %s 的锁移除？"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
-msgstr "µÇÈëÖС­"
+msgstr "登入中…"
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "登入失败。"
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "ÕýÑ°ÕÒÆ¥Åä \"%s\" µÄÔ¿³×¡­"
+msgstr "正寻找匹配 \"%s\" 的钥匙…"
 
 #: lib-sys/mutt_socket.c:341
 #, fuzzy, c-format
 msgid "Looking up %s..."
-msgstr "¿½±´µ½ %s¡­"
+msgstr "拷贝到 %s…"
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr ""
 
 #: attach.c:395
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "MIME ÐÎʽδ±»¶¨Òå. ÎÞ·¨ÏÔʾ¸½¼þÄÚÈÝ¡£"
+msgstr "MIME 形式未被定义. 无法显示附件内容。"
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
-msgstr "¼ì²âµ½¾Þ¼¯ÖÐÓлØȦ¡£"
+msgstr "检测到巨集中有回圈。"
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "Ðżþ"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
-msgstr "ÐżþûÓмijö¡£"
+msgstr "信件没有寄出。"
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
-msgstr "ÐżþÒѾ­¼Ä³ö¡£"
+msgstr "信件已经寄出。"
 
 #: lib-mx/mx.c:970
 #, fuzzy
 msgid "Mailbox checkpointed."
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "邮箱已删除。"
 
 #: imap/command.c:235
 #, fuzzy
 msgid "Mailbox closed"
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "邮箱已删除。"
 
 #: imap/browse.c:261
 #, fuzzy
 msgid "Mailbox created."
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "邮箱已删除。"
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "邮箱已删除。"
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
-msgstr "ÐÅÏäÄÚ¿ÕÎÞÒ»Îï¡£"
+msgstr "信箱内空无一物。"
 
 #: lib-mx/mx.c:916
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "ÐÅÏä±»±ê¼Ç³ÉΪÎÞ·¨Ð´ÈëµÄ. %s"
+msgstr "信箱被标记成为无法写入的. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
-msgstr "ÐÅÏäÊÇÖ»¶ÁµÄ¡£"
+msgstr "信箱是只读的。"
 
 #: lib-mx/mx.c:755 lib-mx/mx.c:926
 msgid "Mailbox is unchanged."
-msgstr "ÐÅÏäûÓиı䡣"
+msgstr "信箱没有改变。"
 
 #: imap/browse.c:253 imap/browse.c:294
 #, fuzzy
 msgid "Mailbox must have a name."
-msgstr "ÐÅÏäûÓиı䡣"
+msgstr "信箱没有改变。"
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
-msgstr "ÓÊÏäδ±»É¾³ý¡£"
+msgstr "邮箱未被删除。"
 
 #: imap/browse.c:306
 #, fuzzy
 msgid "Mailbox renamed."
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "邮箱已删除。"
 
 #: lib-mx/compress.c:170 lib-mx/mbox.c:339
 msgid "Mailbox was corrupted!"
-msgstr "ÐÅÏäÒÑËð»µ!"
+msgstr "信箱已损坏!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 #, fuzzy
 msgid "Mailbox was externally modified."
-msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
+msgstr "信箱已被其他途径改变过。旗标可能有错误。"
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
+msgstr "信箱已被其他途径改变过。旗标可能有错误。"
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "ÐÅÏä [%d]"
+msgstr "信箱 [%d]"
 
 #: attach.c:218
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "±à¼­ Mailcap ÏîĿʱÐèÒª %%s"
+msgstr "编辑 Mailcap 项目时需要 %%s"
 
 #: attach.c:100
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Mailcap ±à¼­ÏîÄ¿ÐèÒª %%s"
+msgstr "Mailcap 编辑项目需要 %%s"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "ÖÆ×÷±ðÃû"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
 #: imap/imap.c:890 pop.c:1154
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "±êÇ©Á赀 %d ·âÐżþɾȥÁË¡­"
+msgstr "标签了的 %d 封信件删去了…"
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "ÕÚÕÖ"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
-msgstr "ÓʼþÒѱ»´«ËÍ¡£"
+msgstr "邮件已被传送。"
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
 #: commands.c:392
 #, fuzzy
 msgid "Message could not be printed"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件已印出"
 
 #: editmsg.c:102
 #, fuzzy
 msgid "Message file is empty!"
-msgstr "ÐÅÏäÄÚ¿ÕÎÞÒ»Îï¡£"
+msgstr "信箱内空无一物。"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
 msgid "Message not bounced."
-msgstr "ÓʼþÒѱ»´«ËÍ¡£"
+msgstr "邮件已被传送。"
 
 #: editmsg.c:108
 #, fuzzy
 msgid "Message not modified!"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件已印出"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
-msgstr "ÔÚÏÞÖÆÔÄÀÀģʽÏÂÎÞ·¨ÏÔʾÖ÷Ðżþ¡£"
+msgstr "在限制阅览模式下无法显示主信件。"
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
-msgstr "Ðżþ±»Ñӳټijö¡£"
+msgstr "信件被延迟寄出。"
 
 #: commands.c:390
 msgid "Message printed"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件已印出"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
-msgstr "ÐżþÒÑдÈë¡£"
+msgstr "信件已写入。"
 
 #: commands.c:234 recvcmd.c:196
 msgid "Messages bounced."
-msgstr "ÓʼþÒÑ´«ËÍ¡£"
+msgstr "邮件已传送。"
 
 #: commands.c:393
 #, fuzzy
 msgid "Messages could not be printed"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件已印出"
 
 #: commands.c:224 recvcmd.c:179
 #, fuzzy
 msgid "Messages not bounced."
-msgstr "ÓʼþÒÑ´«ËÍ¡£"
+msgstr "邮件已传送。"
 
 #: commands.c:390
 msgid "Messages printed"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件已印出"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
-msgstr "ȱÉÙ²ÎÊý¡£"
-
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr ""
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr ""
+msgstr "缺少参数。"
 
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "°áÒÆÒѶÁÈ¡µÄÐżþµ½ %s£¿"
+msgstr "搬移已读取的信件到 %s？"
 
 #: lib-mx/mx.c:704
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
+msgstr "正在搬移已经读取的信件到 %s …"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "еIJéѯ"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
-msgstr "еµÃû£º"
+msgstr "新档名："
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
-msgstr "½¨Á¢Ðµµ£º"
+msgstr "建立新档："
 
 #: buffy.cpkg:330
 #, fuzzy
 msgid "New mail in "
-msgstr "ÔÚ %s ÓÐÐÂÐżþ¡£"
+msgstr "在 %s 有新信件。"
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
-msgstr "Õâ¸öÐÅÏäÖÐÓÐÐÂÐżþ¡£"
+msgstr "这个信箱中有新信件。"
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "ÏÂÒ»¸ö"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "ÏÂÒ»Ò³"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
 #: imap/auth.c:192 pop.c:440
 #, fuzzy
 msgid "No authenticators available"
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "GSSAPI 验证失败。"
 
 #: sendlib.c:347
 msgid "No boundary parameter found! [report this error]"
-msgstr "ûÓз¢ÏÖ·Ö½ç±äÁ¿£¡[»Ø±¨´íÎó]"
+msgstr "没有发现分界变量！[回报错误]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
-msgstr "ûÓÐ×ÊÁÏ¡£"
+msgstr "没有资料。"
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
-msgstr "ûÓÐÎļþÓëÎļþÕÚÕÖÏà·û"
+msgstr "没有文件与文件遮罩相符"
 
-#: main.c:648
+#: main.c:624
 #, fuzzy
 msgid "No incoming mailboxes defined."
-msgstr "Ȧѡ½øÈëµÄÓÊͲ"
+msgstr "圈选进入的邮筒"
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
-msgstr "ûÓÐÏÞÖÆÑùʽÊÇÓÐЧµÄ¡£"
+msgstr "没有限制样式是有效的。"
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
-msgstr "ûÓÐÒÑ´ò¿ªÐÅÏä¡£"
+msgstr "没有已打开信箱。"
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
-msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
+msgstr "没有信箱有新信件。"
 
 #: attach.c:163
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "ûÓÐ %s µÄ mailcap ×é³ÉµÇ¼£¬ÕýÔÚ½¨Á¢¿ÕµÄÎļþ¡£"
+msgstr "没有 %s 的 mailcap 组成登录，正在建立空的文件。"
 
 #: attach.c:234
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "ûÓÐ %s µÄ mailcap ±à¼­µÇ¼"
+msgstr "没有 %s 的 mailcap 编辑登录"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
-msgstr "ûÓÐÕÒµ½ÓʼÄÂÛ̳£¡"
+msgstr "没有找到邮寄论坛！"
 
 #: attach.c:383
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "ûÓз¢ÏÖÅäºÏ mailcap µÄµÇ¼¡£½«ÒÔÎÄ×Öµµ·½Ê½ä¯ÀÀ¡£"
+msgstr "没有发现配合 mailcap 的登录。将以文字档方式浏览。"
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
-msgstr "Îļþ¼ÐÖÐûÓÐÐżþ¡£"
+msgstr "文件夹中没有信件。"
 
 #: pattern.c:1204
 msgid "No messages matched criteria."
-msgstr "ûÓÐÓʼþ·ûºÏÒªÇó¡£"
+msgstr "没有邮件符合要求。"
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
-msgstr "²»ÄÜÓÐÔÙ¶àµÄÒýÑÔ¡£"
+msgstr "不能有再多的引言。"
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
-msgstr "ûÓиü¶àµÄÐòÁÐ"
+msgstr "没有更多的序列"
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
-msgstr "ÔÚÒýÑÔºóÓйý¶àµÄ·ÇÒýÑÔÎÄ×Ö¡£"
+msgstr "在引言后有过多的非引言文字。"
 
 #: pop.c:1273
 msgid "No new mail in POP mailbox."
-msgstr "POP ÐÅÏäÖÐûÓÐеÄÐżþ"
+msgstr "POP 信箱中没有新的信件"
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
-msgstr "ûÓÐÐÂÐżþ"
+msgstr "没有新信件"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
-msgstr "ûÓÐÖ¸¶¨±êÌâ¡£"
+msgstr "没有指定标题。"
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
-msgstr "ûÓÐÎļþÓëÎļþÕÚÕÖÏà·û"
+msgstr "没有文件与文件遮罩相符"
 
-#: nntp.c:357
+#: nntp.c:360
 #, fuzzy
 msgid "No newsserver defined!"
-msgstr "ûÓỶ¨ÒåµÄ POP ʹÓÃÕßÃû³Æ¡£"
-
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
+msgstr "没有被定义的 POP 使用者名称。"
 
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
-msgstr "ûÓб»ÑӳټijöµÄÐżþ¡£"
-
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
+msgstr "没有被延迟寄出的信件。"
 
 #: commands.c:378
 #, fuzzy
 msgid "No printing command has been defined."
-msgstr "Ȧѡ½øÈëµÄÓÊͲ"
+msgstr "圈选进入的邮筒"
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
-msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕߣ¡"
+msgstr "没有指定接受者！"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
-msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£\n"
+msgstr "没有指定接受者。\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
-msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£"
+msgstr "没有指定接受者。"
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
-msgstr "ûÓÐËÑÑ°¸ñʽ¡£"
+msgstr "没有搜寻格式。"
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
-msgstr "ûÓÐÖ¸¶¨±êÌâ¡£"
+msgstr "没有指定标题。"
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
-msgstr "ûÓÐÐżþ±êÌ⣬ҪÖжϼÄÐŵŤ×÷?"
+msgstr "没有信件标题，要中断寄信的工作?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
-msgstr "ûÓбêÌ⣬Ҫ²»ÒªÖжϣ¿"
+msgstr "没有标题，要不要中断？"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
-msgstr "ûÓбêÌ⣬ÕýÔÚÖжÏÖС£"
+msgstr "没有标题，正在中断中。"
 
 #: imap/browse.c:193
 #, fuzzy
 msgid "No such folder"
-msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
+msgstr "%s：没有这种颜色"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
-msgstr "ûÓÐÒѱê¼ÇµÄ¼Ç¼¡£"
+msgstr "没有已标记的记录。"
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
-msgstr "ûÓб»±ê¼ÇÁ˵ÄÐżþÔÚÏÔʾ£¡"
+msgstr "没有被标记了的信件在显示！"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
-msgstr "ûÓбê¼ÇÁ˵ÄÐżþ¡£"
+msgstr "没有标记了的信件。"
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
-msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
+msgstr "没有要反删除的信件。"
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
-msgstr "ûÓÐÉÐδ¶ÁÈ¡µÄÐżþ"
+msgstr "没有尚未读取的信件"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 #, fuzzy
 msgid "No visible messages."
-msgstr "ûÓÐÐÂÐżþ"
+msgstr "没有新信件"
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
-msgstr "ÔÚÕâ¸ö²Ëµ¥ÖÐûÓÐÕâ¸ö¹¦ÄÜ¡£"
+msgstr "在这个菜单中没有这个功能。"
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
-msgstr "ûÓÐÕÒµ½¡£"
+msgstr "没有找到。"
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正连接到 %s…"
 
-#: remailer.c:435
-msgid "OK"
-msgstr ""
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
-msgstr "Ö»Ö§³Öɾ³ý¶àÖظ½¼þ"
+msgstr "只支持删除多重附件"
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
-msgstr "´ò¿ªÐÅÏä"
+msgstr "打开信箱"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
-msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÐÅÏä"
+msgstr "用只读模式打开信箱"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
-msgstr "´ò¿ªÐÅÏä²¢´ÓËüÑ¡Ôñ¸½¼ÓµÄÐżþ"
+msgstr "打开信箱并从它选择附加的信件"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
-msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÐÅÏä"
+msgstr "用只读模式打开信箱"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
-msgstr "´ò¿ªÐÅÏä²¢´ÓËüÑ¡Ôñ¸½¼ÓµÄÐżþ"
+msgstr "打开信箱并从它选择附加的信件"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
-msgstr "Delivery process µÄÊä³ö"
+msgstr "Delivery process 的输出"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·ÅÆú£¿"
+msgstr "(e)加密, (s)签名, (a)用别的身份签, (b)两者皆要, (i)nline, 或 (f)放弃？"
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+msgstr "PGP 钥匙符合 <%s>。"
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
-msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+msgstr "PGP 钥匙符合 <%s>。"
 
 #: commands.c:153
 #, fuzzy
 msgid "PGP signature could NOT be verified."
-msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
+msgstr "PGP 签名验证成功。"
 
 #: commands.c:148
 msgid "PGP signature successfully verified."
-msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
+msgstr "PGP 签名验证成功。"
 
 #: pop.c:1216
 msgid "POP host is not defined."
-msgstr "POP Ö÷»úûÓỶ¨Òå¡£"
+msgstr "POP 主机没有被定义。"
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
-msgstr "Ö÷Ðżþ²»´æÔÚ¡£"
+msgstr "主信件不存在。"
 
-#: thread.c:980
+#: thread.c:976
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
-msgstr "ÔÚÏÞÖÆÔÄÀÀģʽÏÂÎÞ·¨ÏÔʾÖ÷Ðżþ¡£"
+msgstr "在限制阅览模式下无法显示主信件。"
 
 #: account.c:184
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "%s@%s µÄÃÜÂ룺"
+msgstr "%s@%s 的密码："
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
-msgstr "¸öÈËÐÕÃû£º"
-
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "¹ÜÏß"
+msgstr "个人姓名："
 
 #: commands.c:364
 msgid "Pipe to command: "
-msgstr "ÓùܵÀÊä³öÖÁÃüÁ"
+msgstr "用管道输出至命令："
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
-msgstr "µ¼ÒýÖÁ£º"
-
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
+msgstr "导引至："
 
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
-msgstr "ÑӳټijöÕâ·âÐżþ£¿"
+msgstr "延迟寄出这封信件？"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
-msgstr "ÐżþÒѾ­±»Ñӳټijö"
+msgstr "信件已经被延迟寄出"
 
 #: lib-sys/mutt_socket.c:44
 #, fuzzy
 msgid "Preconnect command failed."
-msgstr "Ô¤ÏÈÁ¬½ÓÖ¸Áîʧ°Ü"
+msgstr "预先连接指令失败"
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
-msgstr "×¼±¸×ª¼ÄÐżþ¡­"
+msgstr "准备转寄信件…"
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
-msgstr "°´ÏÂÈκÎÒ»¸ö¼ü¼ÌÐø¡­"
+msgstr "按下任何一个键继续…"
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "ÉÏÒ»Ò³"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "ÏÔʾ"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
-msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
+msgstr "是否要打印附件?"
 
 #: commands.c:383
 msgid "Print message?"
-msgstr "´òÓ¡Ðżþ£¿"
+msgstr "打印信件？"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
-msgstr "ÊÇ·ñÒª´òÓ¡±ê¼ÇÆðÀ´µÄ¸½¼þ?"
+msgstr "是否要打印标记起来的附件?"
 
 #: commands.c:383
 msgid "Print tagged messages?"
-msgstr "´òÓ¡Òѱê¼ÇµÄÐżþ£¿"
+msgstr "打印已标记的信件？"
 
 #: lib-mx/mx.c:686 lib-mx/mx.c:935
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Çå³ý %d ·âÒѾ­±»É¾³ýµÄÐżþ£¿"
+msgstr "清除 %d 封已经被删除的信件？"
 
 #: lib-mx/mx.c:687 lib-mx/mx.c:936
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Çå³ý %d ·âÒѱ»É¾³ýµÄÐżþ£¿"
+msgstr "清除 %d 封已被删除的信件？"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
-msgstr "²éѯ"
+msgstr "查询"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
-msgstr "²éѯ '%s'"
+msgstr "查询 '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
-msgstr "²éѯָÁîÉÐ䶨Òå¡£"
+msgstr "查询指令尚未定义。"
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
-msgstr "²éѯ£º"
+msgstr "查询："
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "À뿪"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
-msgstr "À뿪 Mutt£¿"
+msgstr "离开 Mutt？"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "寄出信件中…"
 
 #: lib-mx/mx.c:494
 #, c-format
 msgid "Reading %s..."
-msgstr "¶ÁÈ¡ %s ÖС­"
+msgstr "读取 %s 中…"
 
 #: lib-mx/mh.c:594 lib-mx/mh.c:746
 #, c-format
 msgid "Reading %s... %d"
-msgstr "¶ÁÈ¡ %s¡­ %d"
+msgstr "读取 %s… %d"
 
 #: lib-mx/mbox.c:123
 #, c-format
 msgid "Reading %s... %d (%d%%)"
-msgstr "¶ÁÈ¡ %s ÖС­ %d (%d%%)"
+msgstr "读取 %s 中… %d (%d%%)"
 
 #: pop.c:1284
 #, fuzzy, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "¶ÁÈ¡ÐÂÐżþ (%d λԪ×é)¡­"
+msgstr "读取新信件 (%d 位元组)…"
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "ÕæµÄҪɾ³ý \"%s\" ÓÊÏ䣿"
+msgstr "真的要删除 \"%s\" 邮箱？"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
-msgstr "Òª½Ð³ö±»ÑÓ³ÙµÄÐżþ?"
+msgstr "要叫出被延迟的信件?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
-msgstr "Ö»ÖØбàÂëÊÜÓ°ÏìµÄÎÄ×Ö¸½¼þ"
+msgstr "只重新编码受影响的文字附件"
 
 #: imap/browse.c:300
 #, fuzzy, c-format
 msgid "Rename failed: %s"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "登入失败。"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
+msgstr "只有 IMAP 邮箱才支持删除"
 
 #: imap/browse.c:288
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
-msgstr "´ò¿ªÐÅÏä"
+msgstr "打开信箱"
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
-msgstr "¸ü¸ÄÃû³ÆΪ£º"
+msgstr "更改名称为："
 
 #: lib-mx/mbox.c:674
 msgid "Reopening mailbox..."
-msgstr "ÖØдò¿ªÐÅÏäÖС­"
-
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "»Ø¸²"
+msgstr "重新打开信箱中…"
 
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "Òª»Ø¸²¸ø %s%s?"
+msgstr "要回覆给 %s%s?"
 
 #: commands.c:403
 #, fuzzy
@@ -2522,27 +2360,27 @@ msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"·´·½Ïò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅ,z)´óС,c)·Ö"
-"Êý:"
+"反方向 d)日期,f)发信人,r)收信时间,s)标题,o)收信人,t)序列,u)不排,z)大小,c)分"
+"数:"
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
-msgstr "·µÏòËÑÑ°£º"
+msgstr "返向搜寻："
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
-msgstr "·´ÏòËÑÑ°£º"
+msgstr "反向搜寻："
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "·´ÏòÅÅÐò (d)ÈÕÆÚ, (a)×ÖÔª, (z)´óС »ò (n)²»ÅÅÐò ? "
+msgstr "反向排序 (d)日期, (a)字元, (z)大小 或 (n)不排序 ? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·ÅÆú£¿"
+msgstr "(e)加密, (s)签名, (a)用别的身份签, (b)两者皆要, (i)nline, 或 (f)放弃？"
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
@@ -2550,10 +2388,10 @@ msgstr ""
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
-msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+msgstr "PGP 钥匙符合 <%s>。"
 
 #: lib-mime/crypt.c:180
 msgid "S/MIME messages with no hints on content are unsupported."
@@ -2562,19 +2400,19 @@ msgstr ""
 #: commands.c:143
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
-msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
+msgstr "PGP 签名验证成功。"
 
 #: commands.c:135
 #, fuzzy
 msgid "S/MIME signature successfully verified."
-msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
+msgstr "PGP 签名验证成功。"
 
 #: imap/auth.c:158 pop.c:287
 #, fuzzy
 msgid "SASL authentication failed."
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "GSSAPI 验证失败。"
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr ""
@@ -2582,138 +2420,113 @@ msgstr ""
 #: lib-sys/mutt_ssl.cpkg:304
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "正连线到 %s"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "´¢´æ"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
-msgstr "´¢´æÕâ·âÐżþµÄ¿½±´Âð£¿"
+msgstr "储存这封信件的拷贝吗？"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
-msgstr "´æµ½Îļþ£º"
+msgstr "存到文件："
 
 #: commands.c:600
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "%s%s 到信箱"
 
 #: imap/imap.c:910
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
-msgstr "ÕýÔÚ´¢´æÐżþ״̬Æì±ê¡­ [%d/%d]"
+msgstr "正在储存信件状态旗标… [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
-msgstr "´¢´æÖС­"
-
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "ËÑÑ°"
+msgstr "储存中…"
 
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
-msgstr "ËÑÑ°£º"
+msgstr "搜寻："
 
 #: pattern.c:1287
 msgid "Search hit bottom without finding match"
-msgstr "ÒÑËÑÑ°ÖÁ½á⣬²¢Ã»Óз¢ÏÖÈκηûºÏ"
+msgstr "已搜寻至结尾，并没有发现任何符合"
 
 #: pattern.c:1298
 msgid "Search hit top without finding match"
-msgstr "ÒÑËÑÑ°ÖÁ¿ªÍ·£¬²¢Ã»Óз¢ÏÖÈκηûºÏ"
+msgstr "已搜寻至开头，并没有发现任何符合"
 
 #: pattern.c:1320
 msgid "Search interrupted."
-msgstr "ËÑÑ°Òѱ»Öжϡ£"
+msgstr "搜寻已被中断。"
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
-msgstr "Õâ¸öÑ¡µ¥ÖÐûÓÐËÑÑ°¹¦ÄÜ¡£"
+msgstr "这个选单中没有搜寻功能。"
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
-msgstr "ËÑÑ°ÖÁ½áβ¡£"
+msgstr "搜寻至结尾。"
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
-msgstr "ËÑÑ°ÖÁ¿ªÍ·¡£"
+msgstr "搜寻至开头。"
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
-msgstr "ËÑÑ°£º"
-
-#: alias.cpkg:151
-msgid "Select"
-msgstr "Ñ¡Ôñ"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "Ñ¡Ôñ    "
+msgstr "搜寻："
 
-#: remailer.c:488
-#, fuzzy
-msgid "Select a remailer chain."
-msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
-msgstr "Ñ¡Ôñ %s ÖС­"
+msgstr "选择 %s 中…"
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "¼Ä³ö"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
-msgstr "ÕýÔÚºǫ́´«ËÍ¡£"
+msgstr "正在后台传送。"
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "寄出信件中…"
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
-msgstr "ÓëËÅ·þÆ÷µÄÁª½áÖжÏÁË!"
+msgstr "与伺服器的联结中断了!"
 
 #: flags.c:335
 msgid "Set flag"
-msgstr "É趨Æì±ê"
+msgstr "设定旗标"
 
 #: commands.c:463
 msgid "Shell command: "
-msgstr "Shell Ö¸Á"
+msgstr "Shell 指令："
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
-msgstr "Ç©Ãû"
+msgstr "签名"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
-msgstr "Ç©ÃûµÄÉí·ÝÊÇ£º"
+msgstr "签名的身份是："
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
-msgstr "Ç©Ãû£¬¼ÓÃÜ"
+msgstr "签名，加密"
 
 #: commands.c:406
 #, fuzzy
@@ -2721,170 +2534,166 @@ msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"ÅÅÐò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅÐò,z)´óС,c)·Ö"
-"Êý:"
+"排序 d)日期,f)发信人,r)收信时间,s)标题,o)收信人,t)序列,u)不排序,z)大小,c)分"
+"数:"
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "ÒÀÕÕ (d)ÈÕÆÚ (a)×ÖÔª (z)´óС À´ÅÅÐò£¬»ò(n)²»ÅÅÐò ? "
+msgstr "依照 (d)日期 (a)字元 (z)大小 来排序，或(n)不排序 ? "
 
 #: sort.c:269
 msgid "Sorting mailbox..."
-msgstr "ÐÅÏäÅÅÐòÖС­"
+msgstr "信箱排序中…"
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "Ô¿³× ID£º0x%s"
-
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
+msgstr "钥匙 ID：0x%s"
 
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "ÒѶ©ÔÄ [%s], ÎļþÕÚÕÖ: %s"
+msgstr "已订阅 [%s], 文件遮罩: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
 #: imap/imap.c:1358
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "¶©ÔÄ %s¡­"
+msgstr "订阅 %s…"
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 msgid "TLS/SSL Certificate check"
 msgstr ""
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
-msgstr "±ê¼ÇÐżþµÄÌõ¼þ£º"
+msgstr "标记信件的条件："
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
-msgstr "Çë±ê¼ÇÄúÒª¸½¼ÓµÄÐżþ£¡"
+msgstr "请标记您要附加的信件！"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
-msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
+msgstr "不支持标记功能。"
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
-msgstr "Õâ·âÐżþÎÞ·¨ÏÔʾ¡£"
+msgstr "这封信件无法显示。"
 
 #: crypt.cpkg:940
 #, fuzzy
 msgid "The CRL is not available\n"
-msgstr "Ö÷Ðżþ²»´æÔÚ¡£"
+msgstr "主信件不存在。"
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
-msgstr "Õâ¸ö¸½¼þ»á±»×ª»»¡£"
+msgstr "这个附件会被转换。"
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
-msgstr "Õâ¸ö¸½¼þ²»»á±»×ª»»¡£"
+msgstr "这个附件不会被转换。"
 
 #: imap/message.c:408 pop.c:1389
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr ""
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
-msgstr "ûÓи½¼þ¡£"
+msgstr "没有附件。"
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
-msgstr "ûÓÐÐżþ¡£"
+msgstr "没有信件。"
 
-#: recvattach.c:918
+#: recvattach.c:906
 #, fuzzy
 msgid "There are no subparts to show!"
-msgstr "ûÓи½¼þ¡£"
+msgstr "没有附件。"
 
 #: imap/imap.c:285
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Õâ¸ö IMAP ËÅ·þÆ÷Òѹýʱ£¬Mutt ÎÞ·¨Ê¹ÓÃËü¡£"
+msgstr "这个 IMAP 伺服器已过时，Mutt 无法使用它。"
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr ""
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+msgstr "这个钥匙不能使用：过期/无效/已取消。"
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
-msgstr "ÐòÁÐÖÐÓÐÉÐδ¶ÁÈ¡µÄÐżþ¡£"
+msgstr "序列中有尚未读取的信件。"
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
-msgstr "ÐòÁй¦ÄÜÉÐδÆô¶¯¡£"
+msgstr "序列功能尚未启动。"
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
 #: lib-mx/mx.c:183
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "³¢ÊÔ fcntl µÄËø¶¨Ê±³¬¹ýʱ¼ä!"
+msgstr "尝试 fcntl 的锁定时超过时间!"
 
 #: lib-mx/mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "³¢ÊÔ flock ʱ³¬¹ýʱ¼ä£¡"
+msgstr "尝试 flock 时超过时间！"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
-msgstr "ÏÖÕýÏÔʾ×îÉÏÃæµÄÐżþ¡£"
+msgstr "现正显示最上面的信件。"
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
 #: lib-sys/mutt_tunnel.c:139 lib-sys/mutt_tunnel.c:155
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "正连线到 %s"
 
 #: lib-sys/mutt_tunnel.c:123
 #, c-format
@@ -2894,143 +2703,126 @@ msgstr ""
 #: pop.c:361
 #, fuzzy
 msgid "USER authentication failed."
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "GSSAPI 验证失败。"
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "ÎÞ·¨¸½¼Ó %s£¡"
+msgstr "无法附加 %s！"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
-msgstr "ÎÞ·¨¸½¼Ó£¡"
+msgstr "无法附加！"
 
 #: imap/message.c:74
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "ÎÞ·¨È¡»ØʹÓÃÕâ¸ö IMAP ËÅ·þÆ÷°æ±¾µÄÓʼþµÄ±êÍ·¡£"
+msgstr "无法取回使用这个 IMAP 伺服器版本的邮件的标头。"
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 #, fuzzy
 msgid "Unable to get certificate from peer"
-msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
+msgstr "无法决定 home 目录"
 
 #: pop.c:598
 #, fuzzy
 msgid "Unable to leave messages on server."
-msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+msgstr "正在删除伺服器上的信件…"
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
-msgstr "ÎÞ·¨¸½¼Ó %s£¡"
+msgstr "无法附加 %s！"
 
 #: lib-mx/compress.c:227 lib-mx/compress.c:342 lib-mx/compress.c:410
 #: lib-mx/mbox.c:407
 msgid "Unable to lock mailbox!"
-msgstr "ÎÞ·¨ËøסÐÅÏ䣡"
+msgstr "无法锁住信箱！"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
-msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
+msgstr "无法打开暂存档！"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
-msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
+msgstr "无法打开暂存档！"
 
 #: handler.c:1387
 msgid "Unable to open temporary file!"
-msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
-
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "·´É¾³ý"
+msgstr "无法打开暂存档！"
 
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
-msgstr "·´É¾³ýÐżþµÄÌõ¼þ£º"
+msgstr "反删除信件的条件："
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
-msgstr "·´É¾³ý"
+msgstr "反删除"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "²»Ã÷µÄ Content-Type %s"
+msgstr "不明的 Content-Type %s"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "È¡Ïû¶©ÔÄ %s¡­"
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
-msgstr "È¡Ïû¶©ÔÄ %s¡­"
+msgstr "取消订阅 %s…"
 
 #: imap/imap.c:1360
 #, c-format
 msgid "Unsubscribing to %s..."
-msgstr "È¡Ïû¶©ÔÄ %s¡­"
+msgstr "取消订阅 %s…"
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
-msgstr "·´±ê¼ÇÐżþµÄÌõ¼þ£º"
+msgstr "反标记信件的条件："
 
 #: imap/message.c:546
 #, fuzzy
 msgid "Uploading message..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "寄出信件中…"
 
 #: lib-mx/mx.c:914
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "ÇëʹÓà 'toggle-write' À´ÖØÐÂÆô¶¯Ð´È빦ÄÜ!"
+msgstr "请使用 'toggle-write' 来重新启动写入功能!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
+msgstr "要为 %2$s 使用钥匙 ID = \"%1$s\"？"
 
 #: account.c:133
 #, fuzzy, c-format
 msgid "Username at %s: "
-msgstr "¸ü¸ÄÃû³ÆΪ£º"
+msgstr "更改名称为："
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "无效的月份：%s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
-
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
+msgstr "无效的月份：%s"
 
 #: commands.c:89
 msgid "Verify PGP signature?"
-msgstr "¼ì²é PGP Ç©Ãû?"
+msgstr "检查 PGP 签名?"
 
 #: pop.c:786
 #, fuzzy
 msgid "Verifying message indexes..."
-msgstr "дÈëÐżþµ½ %s ¡­"
+msgstr "写入信件到 %s …"
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "ÏÔʾ¸½¼þ¡£"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "¾¯¸æ! ÄúÕýÔÚ¸²¸Ç %s, ÊÇ·ñÒª¼ÌÐø?"
+msgstr "警告! 您正在覆盖 %s, 是否要继续?"
 
 #: crypt.cpkg:1058
 msgid ""
@@ -3038,23 +2830,23 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 msgid "WARNING: Server certificate has been revoked"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 msgid "WARNING: Server certificate has expired"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 msgid "WARNING: Server certificate is not yet valid"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr ""
 
@@ -3071,18 +2863,18 @@ msgstr ""
 #: lib-mx/mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "ÕýÔڵȴý fcntl µÄËø¶¨¡­ %d"
+msgstr "正在等待 fcntl 的锁定… %d"
 
 #: lib-mx/mx.c:225
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "ÕýÔڵȴý flock Ö´Ðгɹ¦¡­ %d"
+msgstr "正在等待 flock 执行成功… %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
-msgstr "µÈ´ý»ØÓ¦ÖС­"
+msgstr "等待回应中…"
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3091,12 +2883,12 @@ msgstr ""
 msgid "Warning: At least one certification key has expired\n"
 msgstr ""
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr ""
 
@@ -3116,368 +2908,349 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
-msgstr "ÎÒÃÇÎÞ·¨¼ÓÉϸ½¼þ"
+msgstr "我们无法加上附件"
 
 #: lib-mx/mbox.c:576
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "дÈëʧ°Ü£¡ÒѰѲ¿·ÖµÄÐÅÏä´¢´æÖÁ %s"
+msgstr "写入失败！已把部分的信箱储存至 %s"
 
 #: attach.c:731
 msgid "Write fault!"
-msgstr "дÈëʧ°Ü£¡"
+msgstr "写入失败！"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
-msgstr "½«ÐżþдÈëµ½ÐÅÏä"
+msgstr "将信件写入到信箱"
 
 #: lib-mx/mx.c:555
 #, c-format
 msgid "Writing %s..."
-msgstr "дÈë %s ÖС­"
+msgstr "写入 %s 中…"
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "дÈëÐżþµ½ %s ¡­"
+msgstr "写入信件到 %s …"
 
 #: lib-mx/mbox.c:473
 #, c-format
 msgid "Writing messages... %d (%d%%)"
-msgstr "дÈëÐżþÖС­ %d (%d%%)"
+msgstr "写入信件中… %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
-msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
+msgstr "指令行有错：%s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
-msgstr "ÄúÒѾ­ÎªÕâ¸öÃû×Ö¶¨ÒåÁ˱ðÃûÀ²£¡"
-
-#: remailer.c:603
-#, fuzzy
-msgid "You already have the first chain element selected."
-msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr ""
+msgstr "您已经为这个名字定义了别名啦！"
 
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
-msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ïî¡£"
-
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ò³¡£"
+msgstr "您现在在第一项。"
 
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
-msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
+msgstr "您已经在第一封信了。"
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
-msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ò³¡£"
+msgstr "您现在在第一页。"
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
-msgstr "ÄúÒѾ­ÔÚµÚÒ»¸öÐòÁÐÉÏ¡£"
+msgstr "您已经在第一个序列上。"
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
-msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ïî¡£"
-
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ò³¡£"
+msgstr "您现在在最后一项。"
 
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
-msgstr "ÄúÒѾ­ÔÚ×îºóÒ»·âÐÅÁË¡£"
+msgstr "您已经在最后一封信了。"
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
-msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ò³¡£"
+msgstr "您现在在最后一页。"
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
-msgstr "ÄúÎÞ·¨ÔÙÏòÏÂ¾í¶¯ÁË¡£"
+msgstr "您无法再向下卷动了。"
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
-msgstr "ÄúÎÞ·¨ÔÙÏòÉÏ¾í¶¯ÁË¡£"
+msgstr "您无法再向上卷动了。"
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
-msgstr "ÄúûÓбðÃû×ÊÁÏ£¡"
+msgstr "您没有别名资料！"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
-msgstr "Äú²»¿ÉÒÔɾ³ýΨһµÄ¸½¼þ¡£"
+msgstr "您不可以删除唯一的附件。"
 
 #: recvcmd.c:37
 msgid "You may only bounce message/rfc822 parts."
-msgstr "ÄúÖ»ÄÜÖ±½Ó´«ËÍ message/rfc822 µÄ²¿·Ö¡£"
+msgstr "您只能直接传送 message/rfc822 的部分。"
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] ½ÓÊÜ?"
+msgstr "[%s = %s] 接受?"
 
 #: handler.c:1443
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s ÉÐδ֧³Ö "
+msgstr "[-- %s/%s 尚未支持 "
 
 #: handler.c:1000
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- ¸½¼þ #%d"
+msgstr "[-- 附件 #%d"
 
 #: handler.c:1117 handler.c:1133
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- ×Ô¶¯ÏÔʾµÄ %s µÄ stderr ÄÚÈÝ --]\n"
+msgstr "[-- 自动显示的 %s 的 stderr 内容 --]\n"
 
 #: handler.c:1074
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- ʹÓà %s ×Ô¶¯ÏÔʾ --]\n"
+msgstr "[-- 使用 %s 自动显示 --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP Ðżþ¿ªÊ¼ --]\n"
+"[-- PGP 信件开始 --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î¿ªÊ¼ --]\n"
+msgstr "[-- PGP 公共钥匙区段开始 --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]\n"
+"[-- PGP 签名的信件开始 --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 #: handler.c:1102
 #, fuzzy, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- ÔÚ %s --]\n"
+msgstr "[-- 在 %s --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
-"[-- PGP Ðżþ½áÊø --]\n"
+"[-- PGP 信件结束 --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î½áÊø --]\n"
+msgstr "[-- PGP 公共钥匙区段结束 --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
-"[-- PGP Ç©ÃûµÄÐżþ½áÊø --]\n"
+"[-- PGP 签名的信件结束 --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+"[-- PGP/MIME 加密资料结束 --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+"[-- PGP/MIME 加密资料结束 --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
-"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+"[-- PGP/MIME 加密资料结束 --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
-"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+"[-- 签署的资料结束 --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
 "\n"
-"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+"[-- 签署的资料结束 --]\n"
 
 #: handler.c:891
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[-- ´íÎó£º ÎÞ·¨ÏÔʾ Multipart/Alternative£¡ --]\n"
+msgstr "[-- 错误： 无法显示 Multipart/Alternative！ --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 #, fuzzy
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- ´íÎ󣺲»Ò»Ö嵀 multipart/signed ½á¹¹£¡ --]\n"
+"[-- 错误：不一致的 multipart/signed 结构！ --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- ´íÎ󣺲»Ã÷µÄ multipart/signed Э¶¨ %s£¡ --]\n"
+"[-- 错误：不明的 multipart/signed 协定 %s！ --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ÔÝ´æµµ£¡ --]\n"
+msgstr "[-- 错误：无法建立暂存档！ --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- ´íÎó£ºÕÒ²»µ½ PGP ÐżþµÄ¿ªÍ·£¡ --]\n"
+"[-- 错误：找不到 PGP 信件的开头！ --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- ´íÎó£ºÍ»·¢µÄµµÎ²£¡ --]\n"
+msgstr "[-- 错误：突发的档尾！ --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- ´íÎ󣺲»ÕýÈ·µÄ PGP/MIME Ðżþ£¡ --]\n"
+"[-- 错误：不正确的 PGP/MIME 信件！ --]\n"
 "\n"
 
 #: handler.c:1168
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- ´íÎó: message/external-body ûÓдæÈ¡ÀàÐ͵IJÎÊý --]\n"
+msgstr "[-- 错误: message/external-body 没有存取类型的参数 --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"[-- 下面是 PGP/MIME 加密资料 --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"[-- 下面是 PGP/MIME 加密资料 --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"[-- 下面是 PGP/MIME 加密资料 --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
+"[-- 以下的资料已被签署 --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
+"[-- 以下的资料已被签署 --]\n"
 "\n"
 
 #: handler.c:1185
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- %s/%s ¸½¼þ "
+msgstr "[-- %s/%s 附件 "
 
 #: handler.c:1212 handler.c:1225
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- %s/%s ¸½¼þ "
+msgstr "[-- %s/%s 附件 "
 
 #: handler.c:1011
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- ÐÎ̬:  %s%s, ±àÂë: %s, ´óС: %s --]\n"
+msgstr "[-- 形态:  %s%s, 编码: %s, 大小: %s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ¾¯¸æ£ºÕÒ²»µ½ÈκεÄÇ©Ãû¡£ --]\n"
+"[-- 警告：找不到任何的签名。 --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ¾¯¸æ£ºÎÒÃDz»ÄÜ֤ʵ %s/%s Ç©Ãû¡£ --]\n"
+"[-- 警告：我们不能证实 %s/%s 签名。 --]\n"
 "\n"
 
 #: handler.c:1230
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
-"[-- %s/%s ¸½¼þÎÞ·¨±»¸½ÉÏ, --]\n"
-"[-- ²¢ÇÒ±»Ö¸Ê¾µÄ´æÈ¡ÀàÐÍ %s ²»±»Ö§³Ö --]\n"
+"[-- %s/%s 附件无法被附上, --]\n"
+"[-- 并且被指示的存取类型 %s 不被支持 --]\n"
 
 #: handler.c:1214
 #, fuzzy
@@ -3485,121 +3258,297 @@ msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- %s/%s ¸½¼þÎÞ·¨±»¸½ÉÏ, --]\n"
-"[-- ²¢ÇÒ±»Ö¸Ê¾µÄÍⲿԭʼµµÒÑ --]\n"
-"[-- ¹ýÆÚ¡£ --]\n"
+"[-- %s/%s 附件无法被附上, --]\n"
+"[-- 并且被指示的外部原始档已 --]\n"
+"[-- 过期。 --]\n"
 
 #: handler.c:1201
 #, fuzzy, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- ÔÚ %s --]\n"
+msgstr "[-- 在 %s --]\n"
 
 #: handler.c:1197
 #, c-format
 msgid "[-- on %s --]\n"
-msgstr "[-- ÔÚ %s --]\n"
+msgstr "[-- 在 %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
-msgstr "À뿪  "
+msgstr "离开  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "无效的月份：%s"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:439
 #, fuzzy
 msgid "[invalid date]"
-msgstr "%s£ºÎÞЧµÄÖµ"
+msgstr "%s：无效的值"
 
 #: lib-sys/mutt_ssl.cpkg:417
 #, fuzzy, c-format
 msgid "[unable to calculate]"
-msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
+msgstr "%s：无法附带文件"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
-msgstr "±ðÃû£ºÃ»Óеç×ÓÓʼþλַ"
+msgstr "别名：没有电子邮件位址"
+
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "应用下一个功能到已标记的讯息"
 
-#: init.c:654
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "应用下一个功能到已标记的讯息"
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "储存这封信件的拷贝吗？"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
-msgstr "±à¼­¼ÐµµµÄ˵Ã÷"
+msgstr "编辑夹档的说明"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
-msgstr "±à¼­¼ÐµµµÄ˵Ã÷"
+msgstr "编辑夹档的说明"
 
 #: hook.c:87
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
-msgstr "bind£ºÌ«¶à²ÎÊý"
+msgstr "bind：太多参数"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "无法扫描目录。"
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "没有信箱有新信件。"
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
-msgstr "É«²Ê£ºÌ«ÉÙ²ÎÊý"
+msgstr "色彩：太少参数"
+
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "没有新信件"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
 
 #: commands.c:788
 msgid "converting"
 msgstr ""
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "将信件写入到信箱"
+
 #: editmsg.c:59
 #, fuzzy, c-format
 msgid "could not create temporary folder: %s"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法建立暂存档！"
 
 #: editmsg.c:89
 #, fuzzy, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法建立暂存档！"
 
 #: editmsg.c:70
 #, fuzzy, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法建立暂存档！"
 
-#: browser.c:1206
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "圈选进入的邮筒"
+
+#: browser.c:1177
 msgid "dazn"
 msgstr ""
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
-msgstr "²»Ö§³ÖÔ¤ÉèµÄÉ«²Ê"
+msgstr "不支持预设的色彩"
+
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "正在删除伺服器上的信件…"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "反删除信件的条件："
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "反删除信件的条件："
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
 
 #: commands.c:407
 msgid "dfrsotuzcp"
 msgstr ""
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "准备转寄信件…"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3608,36 +3557,123 @@ msgstr ""
 #: lib-mx/compress.c:352 lib-mx/compress.c:420
 #, fuzzy, c-format
 msgid "echo Compressing %s..."
-msgstr "¿½±´µ½ %s¡­"
+msgstr "拷贝到 %s…"
 
 #: lib-mx/compress.c:235
 #, fuzzy, c-format
 msgid "echo Decompressing %s..."
-msgstr "Ñ¡Ôñ %s ÖС­"
+msgstr "选择 %s 中…"
+
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "这个附件不会被转换。"
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "编辑夹档的说明"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "编辑信件内容"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "正在取回信件标头… [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "准备转寄信件…"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "储存这封信件的拷贝吗？"
 
 #: pattern.c:777
 msgid "empty pattern"
-msgstr "¿ÕµÄ¸ñʽ"
+msgstr "空的格式"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
-msgstr "¼ÓÃÜ"
+msgstr "加密"
+
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "储存这封信件的拷贝吗？"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
 
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
 #: crypt.cpkg:328
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
 #: crypt.cpkg:354
 #, c-format
@@ -3652,36 +3688,36 @@ msgstr ""
 #: crypt.cpkg:655
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
 #: crypt.cpkg:604
 #, fuzzy, c-format
 msgid "error getting secret key `%s': %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
 #: pattern.c:499
 msgid "error in expression"
-msgstr "±í´ïʽÓдíÎó"
+msgstr "表达式有错误"
 
 #: pattern.c:667 pattern.c:771
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
 #: crypt.cpkg:462 crypt.cpkg:500
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
 #: crypt.cpkg:443
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
 #: crypt.cpkg:613
 #, c-format
@@ -3691,176 +3727,722 @@ msgstr ""
 #: crypt.cpkg:739
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "在样式上有错误：%s"
 
 #: pattern.c:1063
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "´íÎ󣺲»Ã÷µÄ op %d (Çë»Ø±¨Õâ¸ö´íÎó)¡£"
+msgstr "错误：不明的 op %d (请回报这个错误)。"
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "esabif"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "esabif"
 
-#: keymap.c:829
+#: keymap.c:821
 #, fuzzy
 msgid "exec: no arguments"
-msgstr "exec£º²ÎÊýÌ«ÉÙ"
+msgstr "exec：参数太少"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
-msgid "gnutls_handshake: %s"
+#: keymap_defs.h:219
+msgid "extract supported public keys"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:286
-#, c-format
-msgid "gnutls_handshake: %s(%s)"
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
-#, c-format
-msgid "gpgme_op_keylist_next failed: %s"
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "以后的回覆都寄至 %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
-#, c-format
-msgid "gpgme_op_keylist_start failed: %s"
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
 msgstr ""
 
-#: handler.c:1193
-msgid "has been deleted --]\n"
-msgstr "ÒѾ­±»É¾³ýÁË --]\n"
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "显示 MIME 附件"
 
-#: imap/imap.c:941
-msgid "imap_sync_mailbox: EXPUNGE failed"
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
 msgstr ""
 
-#: init.c:823
-msgid "invalid header field"
-msgstr "ÎÞЧµÄ±êÍ·À¸Î»"
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "准备转寄信件…"
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "您已经在第一封信了。"
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:286
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "您现在在最后一页。"
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "没有信箱有新信件。"
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "写入信箱时发生错误！"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "没有信箱有新信件。"
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt.cpkg:2955 crypt.cpkg:2991
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: handler.c:1193
+msgid "has been deleted --]\n"
+msgstr "已经被删除了 --]\n"
+
+#: imap/imap.c:941
+msgid "imap_sync_mailbox: EXPUNGE failed"
+msgstr ""
+
+#: init.c:820
+msgid "invalid header field"
+msgstr "无效的标头栏位"
+
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "无效的索引编号。"
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "跳到信件："
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "跳到信件："
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "序列中有尚未读取的信件。"
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "您已经在第一个序列上。"
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "没有尚未读取的信件"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "没有尚未读取的信件"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "储存这封信件的拷贝吗？"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
-msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+msgstr "PGP 钥匙符合 <%s>。"
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "无法传送已标记的邮件至："
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "没有信箱有新信件。"
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
-msgstr "macro£º¿ÕµÄ¼üÖµÐòÁÐ"
+msgstr "macro：空的键值序列"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
-msgstr "macro£º²ÎÊýÌ«¶à"
+msgstr "macro：参数太多"
+
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
 
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "ûÓз¢ÏÖÀàÐÍ %s µÄ mailcap ¼Í¼"
+msgstr "没有发现类型 %s 的 mailcap 纪录"
 
 #: lib-mx/mh.c:995
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
-msgstr "ÓʼþÒÑ´«ËÍ¡£"
+msgstr "邮件已传送。"
 
 #: pattern.c:746
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "²»¶Ô³ÆµÄÀ¨»¡£º%s"
+msgstr "不对称的括弧：%s"
 
 #: pattern.c:732
 #, c-format
 msgid "missing parameter"
-msgstr "´íʧ²ÎÊý"
+msgstr "错失参数"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
-msgstr "µ¥É«£ºÌ«ÉÙ²ÎÊý"
+msgstr "单色：太少参数"
+
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "您现在在第一项。"
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "您已经在第一封信了。"
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "您现在在最后一项。"
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "您已经在最后一封信了。"
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "您现在在最后一项。"
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "您现在在最后一页。"
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "没有要反删除的信件。"
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "您现在在第一项。"
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "您现在在第一页。"
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "没有要反删除的信件。"
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "您现在在第一页。"
 
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
-msgstr "¶à²¿·ÝÓʼþûÓзָôµÄ²ÎÊý!"
+msgstr "多部份邮件没有分隔的参数!"
 
 # Don't translate this!!
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr ""
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
-msgstr "£¨Ã»ÓÐÐÅÏ䣩"
+msgstr "（没有信箱）"
 
 #: commands.c:788
 msgid "not converting"
 msgstr ""
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
-msgstr "¿ÕµÄ¼üÖµÐòÁÐ"
+msgstr "空的键值序列"
+
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
 
 #: muttlib.c:260
 msgid "oac"
 msgstr ""
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "用只读模式打开信箱"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "用只读模式打开信箱"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "重新打开信箱中…"
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "把邮件直接传送至 %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "ÖØÐÂÉèÖúó×ÖÊ×ÈÔ²»ºÏ¹æ¶¨"
+msgstr "重新设置后字首仍不合规定"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "您现在在第一项。"
+
+#: keymap.c:620
 msgid "push: too many arguments"
-msgstr "push£ºÌ«¶à²ÎÊý"
+msgstr "push：太多参数"
+
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "要叫出被延迟的信件?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "序列中有尚未读取的信件。"
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "正在删除伺服器上的信件…"
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s：无法附带文件"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "跳到信件："
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "正在删除伺服器上的信件…"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr ""
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "%s%s 到信箱"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "%s%s 到信箱"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "正在删除伺服器上的信件…"
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "表达式有错误"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "搜寻："
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "无法寄出信件。"
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "显示 MIME 附件"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "限制只符合这样式的信件："
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "不能有再多的引言。"
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "打印信件？"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "文件夹中没有信件。"
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
-msgstr "source£º´íÎó·¢ÉúÔÚ %s"
+msgstr "source：错误发生在 %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
-msgstr "source£º´íÎó·¢ÉúÔÚ %s"
+msgstr "source：错误发生在 %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "没有文件与文件遮罩相符"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "ͬ²½£ºÐÅÏäÒѱ»Ð޸ģ¬µ«Ã»Óб»Ð޸ĹýµÄÐżþ£¡£¨Çë»Ø±¨Õâ¸ö´íÎó£©"
+msgstr "同步：信箱已被修改，但没有被修改过的信件！（请回报这个错误）"
+
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "反标记信件的条件："
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "您已经在第一个序列上。"
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
 
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
@@ -3872,22 +4454,93 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "不能有再多的引言。"
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "只重新编码受影响的文字附件"
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "没有搜寻格式。"
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "没有尚未读取的信件"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
-msgstr "Ì«ÉÙ²ÎÊý"
+msgstr "太少参数"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
-msgstr "Ì«¶à²ÎÊý"
+msgstr "太多参数"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
-msgstr "±à¼­¼ÐµµµÄ˵Ã÷"
+msgstr "编辑夹档的说明"
+
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "反删除信件的条件："
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "反删除信件的条件："
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "反删除信件的条件："
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
 
 #: hook.c:218
 #, c-format
@@ -3902,11 +4555,29 @@ msgstr ""
 #: hook.c:213
 #, fuzzy, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "%s£º²»Ã÷µÄÖÖÀà"
+msgstr "%s：不明的种类"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
-msgstr "²»Ã÷µÄ´íÎó"
+msgstr "不明的错误"
+
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "反标记信件的条件："
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "编辑夹档的说明"
 
 #: main.c:82
 msgid ""
@@ -3919,13 +4590,44 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
-msgstr "ÖØÐÂÉèÖúóÖµÈÔ²»ºÏ¹æ¶¨"
+msgstr "重新设置后值仍不合规定"
+
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "附件已被储存。"
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "建立新档："
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "将信件写入到信箱"
 
 # Don't translate this!!
-#: lib-ui/curs_lib.c:155
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr ""
 
@@ -3933,3 +4635,6 @@ msgstr ""
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""

diff --git a/po/zh_TW.po b/po/zh_TW.po
index b7c7aed..2e347c2 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.3.22.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-28 19:08+0200\n"
+"POT-Creation-Date: 2007-08-12 01:55+0200\n"
 "PO-Revision-Date: 2001-09-06 18:25+0800\n"
 "Last-Translator: Anthony Wong <ypwong@debian.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: help.c:287
+#: help.c:254
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -24,7 +24,7 @@ msgstr ""
 "標準功能定義：\n"
 "\n"
 
-#: help.c:291
+#: help.c:258
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -34,7 +34,7 @@ msgstr ""
 "未被定義的功能：\n"
 "\n"
 
-#: crypt.cpkg:4040
+#: crypt.cpkg:4026
 #, fuzzy
 msgid ""
 "\n"
@@ -95,17 +95,17 @@ msgstr ""
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 
-#: compose.c:152 compose.c:156
+#: compose.c:124 compose.c:128
 #, fuzzy
 msgid "     sign as: "
 msgstr " 簽名的身份是： "
 
-#: lib-sys/mutt_ssl.cpkg:740
+#: lib-sys/mutt_ssl.cpkg:738
 #, c-format
 msgid "     to %s"
 msgstr "     至 %s"
 
-#: lib-sys/mutt_ssl.cpkg:736
+#: lib-sys/mutt_ssl.cpkg:734
 #, c-format
 msgid "   from %s"
 msgstr "   由 %s"
@@ -148,15 +148,15 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: lib-ui/curs_lib.c:387
+#: lib-ui/curs_lib.c:365
 msgid " ('?' for list): "
 msgstr " (用 '?' 顯示列表)："
 
-#: compose.c:145
+#: compose.c:117
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:143
+#: compose.c:115
 #, fuzzy
 msgid " (inline)"
 msgstr "（繼續）\n"
@@ -166,11 +166,11 @@ msgstr "（繼續）\n"
 msgid " Press '%s' to toggle write"
 msgstr " 請按下 '%s' 來切換寫入模式"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid " aka ......: "
 msgstr ""
 
-#: lib-ui/curs_main.c:1584
+#: lib-ui/curs_main.c:1532
 msgid " in this limited view"
 msgstr " 在這限定的瀏覽中"
 
@@ -198,32 +198,32 @@ msgstr "%d 封信件被保留, %d 封信件被刪除。"
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d 封信件被保留, %d 封信件被搬移, %d 封信件被刪除。"
 
-#: crypt.cpkg:3127
+#: crypt.cpkg:3113
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s 【%s】\n"
 
-#: nntp.c:1334
+#: nntp.c:1336
 #, c-format
 msgid "%s (tagged: %d) %d"
 msgstr ""
 
-#: crypt.cpkg:3125
+#: crypt.cpkg:3111
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s 【%s】\n"
 
-#: crypt.cpkg:3194
+#: crypt.cpkg:3180
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s 您真的要使用這個鑰匙？"
 
-#: compose.c:214
+#: compose.c:157
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] 已修改。更新編碼？"
 
-#: compose.c:208
+#: compose.c:151
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] 已不存在!"
@@ -233,7 +233,7 @@ msgstr "%s [#%d] 已不存在!"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [已閱讀 %2d 封信件中的 %1d 封]"
 
-#: main.c:494
+#: main.c:470
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s 不存在。製造嗎？"
@@ -248,17 +248,17 @@ msgstr ""
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: nntp.c:1777
+#: nntp.c:1779
 #, c-format
 msgid "%s is an invalid newsgroup specification!"
 msgstr ""
 
-#: nntp.c:371
+#: nntp.c:373
 #, c-format
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: browser.c:492 browser.c:1125
+#: browser.c:471 browser.c:1096
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s 不是一個目錄"
@@ -268,7 +268,7 @@ msgstr "%s 不是一個目錄"
 msgid "%s is not a mailbox!"
 msgstr "%s 不是信箱！"
 
-#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1196
+#: lib-mx/mx.c:337 lib-mx/mx.c:474 lib-ui/curs_main.c:1152
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s 不是信箱。"
@@ -295,52 +295,52 @@ msgid ""
 "kept!\n"
 msgstr ""
 
-#: init.c:250
+#: init.c:247
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s：不明的種類"
 
-#: lib-ui/color.c:279
+#: lib-ui/color.c:227
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s：終端機無法顯示色彩"
 
-#: lib-ui/color.c:328
+#: lib-ui/color.c:276
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s：命令只提供索引物件"
 
-#: lib-ui/color.c:560
+#: lib-ui/color.c:508
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s：沒有這個屬性"
 
-#: lib-ui/color.c:285
+#: lib-ui/color.c:233
 #, c-format
 msgid "%s: no such color"
 msgstr "%s：沒有這種顏色"
 
-#: keymap.c:847
+#: keymap.c:839
 #, c-format
 msgid "%s: no such function"
 msgstr "%s：沒有這個功能"
 
-#: keymap.c:761
+#: keymap.c:753
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s：在對映表中沒有這樣的功能"
 
-#: keymap.c:654
+#: keymap.c:648
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s：沒有這個選單"
 
-#: lib-ui/color.c:322 lib-ui/color.c:483 lib-ui/color.c:493
+#: lib-ui/color.c:270 lib-ui/color.c:431 lib-ui/color.c:441
 #, c-format
 msgid "%s: no such object"
 msgstr "%s：沒有這個物件"
 
-#: lib-ui/color.c:335
+#: lib-ui/color.c:283
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s：太少參數"
@@ -350,37 +350,37 @@ msgstr "%s：太少參數"
 msgid "%s: unable to attach file"
 msgstr "%s：無法附帶檔案"
 
-#: main.c:613
+#: main.c:589
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s：無法附帶檔案。\n"
 
-#: init.c:1341
+#: init.c:1338
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s：不明的指令"
 
-#: init.c:1191
+#: init.c:1188
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s：不明的種類"
 
-#: init.c:1058
+#: init.c:1055
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s：不明的變數"
 
-#: init.c:965
+#: init.c:962
 #, c-format
 msgid "'%d' is invalid for $%s"
 msgstr ""
 
-#: init.c:141 init.c:870
+#: init.c:138 init.c:867
 #, c-format
 msgid "'%s' is invalid for $%s"
 msgstr ""
 
-#: init.c:1175
+#: init.c:1172
 #, c-format
 msgid "'%s' is invalid for $%s\n"
 msgstr ""
@@ -389,15 +389,15 @@ msgstr ""
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "（需要定義一個鍵給 'view-attachments' 來瀏覽附件！)"
 
-#: lib-ui/status.c:114
+#: lib-ui/status.c:113
 msgid "(no mailbox)"
 msgstr "（沒有信箱）"
 
-#: lib-sys/mutt_ssl.cpkg:787
+#: lib-sys/mutt_ssl.cpkg:785
 msgid "(r)eject, accept (o)nce"
 msgstr "(1)不接受，(2)只是這次接受"
 
-#: lib-sys/mutt_ssl.cpkg:783
+#: lib-sys/mutt_ssl.cpkg:781
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(1)不接受，(2)只是這次接受，(3)永遠接受"
 
@@ -415,20 +415,20 @@ msgstr "（按 '%s' 來顯示這部份）"
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
-#: crypt.cpkg:2720 crypt.cpkg:2724 crypt.cpkg:2728 crypt.cpkg:2843
-#: crypt.cpkg:2847 crypt.cpkg:2851
+#: crypt.cpkg:2719 crypt.cpkg:2723 crypt.cpkg:2727 crypt.cpkg:2842
+#: crypt.cpkg:2846 crypt.cpkg:2850
 msgid ", "
 msgstr ""
 
-#: compose.c:264
+#: compose.c:206
 msgid "-- Attachments"
 msgstr "-- 附件"
 
-#: help.c:276
+#: help.c:243
 msgid "<UNKNOWN>"
 msgstr "<不明的>"
 
-#: compose.c:153 compose.c:157
+#: compose.c:125 compose.c:129
 msgid "<default>"
 msgstr "<預設值>"
 
@@ -444,35 +444,31 @@ msgstr ""
 msgid "APOP authentication failed."
 msgstr "APOP 驗證失敗。"
 
-#: compose.c:91 compose.c:104 remailer.c:434
-msgid "Abort"
-msgstr "中斷"
-
-#: send.c:1419
+#: send.c:1413
 msgid "Abort unmodified message?"
 msgstr "是否要中斷未修改過的信件?"
 
-#: send.c:1420
+#: send.c:1414
 msgid "Aborted unmodified message."
 msgstr "中斷沒有修改過的信件"
 
-#: nntp.c:2211
+#: nntp.c:2192
 msgid "Adding new newsgroups..."
 msgstr ""
 
-#: alias.cpkg:346
+#: alias.cpkg:337
 msgid "Address: "
 msgstr "地址："
 
-#: alias.cpkg:405
+#: alias.cpkg:396
 msgid "Alias added."
 msgstr "別名已經增加。"
 
-#: alias.cpkg:321
+#: alias.cpkg:312
 msgid "Alias as: "
 msgstr "取別名為："
 
-#: alias.cpkg:692
+#: alias.cpkg:682
 msgid "Aliases"
 msgstr "別名"
 
@@ -480,64 +476,60 @@ msgstr "別名"
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: crypt.cpkg:3065
+#: crypt.cpkg:3064
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "所有符合的鑰匙經已過期或取消。"
 
-#: remailer.c:431
-msgid "Append"
-msgstr "加上"
-
 #: muttlib.c:327
 #, c-format
 msgid "Append messages to %s?"
 msgstr "附加信件到 %s ?"
 
-#: lib-ui/curs_main.c:832
+#: lib-ui/curs_main.c:788
 msgid "Argument must be a message number."
 msgstr "需要一個信件編號的參數。"
 
-#: nntp.c:1901
+#: nntp.c:1903
 #, c-format
 msgid "Article %d not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:763
+#: lib-ui/curs_main.c:719
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: lib-ui/curs_main.c:733
+#: lib-ui/curs_main.c:689
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: send.c:1461
+#: send.c:1455
 #, fuzzy
 msgid "Article not posted."
 msgstr "附件已被儲存。"
 
-#: send.c:1746
+#: send.c:1740
 msgid "Article posted."
 msgstr ""
 
-#: compose.c:95 compose.c:107 compose.c:675
+#: compose.c:608
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: compose.c:691
+#: compose.c:624
 msgid "Attaching selected files..."
 msgstr "正在附加選取了的檔案…"
 
-#: recvattach.c:509
+#: recvattach.c:500
 msgid "Attachment filtered."
 msgstr "附件被過濾掉。"
 
-#: recvattach.c:406 recvattach.c:483
+#: recvattach.c:397 recvattach.c:474
 msgid "Attachment saved."
 msgstr "附件已被儲存。"
 
-#: recvattach.c:868
+#: recvattach.c:858
 msgid "Attachments"
 msgstr "附件"
 
@@ -568,12 +560,12 @@ msgstr ""
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: sendlib.c:2035
+#: sendlib.c:2028
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: compose.c:646 send.c:1518
+#: compose.c:579 send.c:1512
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -588,7 +580,7 @@ msgstr ""
 msgid "Bad mailbox name"
 msgstr "製作信箱："
 
-#: pager.c:1706 pager.c:1733 pager.c:1763 pager.c:1994
+#: pager.c:1631 pager.c:1658 pager.c:1688 pager.c:1919
 msgid "Bottom of message is shown."
 msgstr "現正顯示最下面的信件。"
 
@@ -610,7 +602,7 @@ msgstr "把郵件直接傳送至 %s"
 msgid "Bounce tagged messages to: "
 msgstr "無法傳送已標記的郵件至："
 
-#: main.c:208
+#: main.c:206
 msgid "Built-In Defaults:"
 msgstr ""
 
@@ -627,16 +619,16 @@ msgstr ""
 msgid "Can't append to folder: %s"
 msgstr "無法把資料加到檔案夾：%s"
 
-#: browser.c:692
+#: browser.c:671
 msgid "Can't attach a directory!"
 msgstr "無法附帶目錄！"
 
-#: main.c:498
+#: main.c:474
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "無法建立 %s: %s."
 
-#: compose.c:1075
+#: compose.c:1005
 #, c-format
 msgid "Can't create file %s"
 msgstr "無法建立檔案 %s"
@@ -649,10 +641,10 @@ msgstr "無法建立過濾"
 msgid "Can't create filter process"
 msgstr "無法啟動過濾程序"
 
-#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1440
-#: crypt.cpkg:1480 crypt.cpkg:1496 crypt.cpkg:1530 crypt.cpkg:1547
-#: crypt.cpkg:2875 crypt.cpkg:3674 lib-mx/mbox.c:485 lib-mx/mbox.c:502
-#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1008
+#: crypt.cpkg:372 crypt.cpkg:480 crypt.cpkg:491 crypt.cpkg:1439
+#: crypt.cpkg:1479 crypt.cpkg:1495 crypt.cpkg:1529 crypt.cpkg:1546
+#: crypt.cpkg:2874 crypt.cpkg:3660 lib-mx/mbox.c:485 lib-mx/mbox.c:502
+#: lib-mx/mbox.c:512 lib-mx/mbox.c:528 send.c:1005
 msgid "Can't create temporary file"
 msgstr "無法建立暫存檔"
 
@@ -664,16 +656,16 @@ msgstr "未能把所有已標簽的附件解碼。要用 MIME 包封其它的嗎
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "未能把所有已標簽的附件解碼。要用 MIME 轉寄其它的嗎？"
 
-#: recvattach.c:856
+#: recvattach.c:846
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "找不到已標記的訊息"
 
-#: recvattach.c:977
+#: recvattach.c:965
 msgid "Can't delete attachment from POP server."
 msgstr "無法從 POP 伺服器刪除附件。"
 
-#: recvattach.c:985
+#: recvattach.c:973
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "無法從 POP 伺服器刪除附件。"
@@ -691,10 +683,6 @@ msgstr ""
 msgid "Can't find any tagged messages."
 msgstr "找不到已標記的訊息"
 
-#: remailer.c:462
-msgid "Can't get mixmaster's type2.list!"
-msgstr "拿不到 mixmaster 的 type2.list！"
-
 #: attach.c:87 attach.c:205 attach.c:413 attach.c:843
 msgid "Can't match nametemplate, continue?"
 msgstr "無法配合二個同樣名稱，繼續？"
@@ -709,27 +697,27 @@ msgstr "無法開啟信件檔案：%s"
 msgid "Can't open trash folder"
 msgstr "無法把資料加到檔案夾：%s"
 
-#: nntp.c:1965 nntp.c:1995
+#: nntp.c:1967 nntp.c:1997
 #, fuzzy, c-format
 msgid "Can't post article. Connection to %s lost."
 msgstr "到 %s 的連線中斷了"
 
-#: nntp.c:1952
+#: nntp.c:1954
 #, fuzzy
 msgid "Can't post article. No connection to news server."
 msgstr "正在關閉與 POP 伺服器的連線…"
 
-#: nntp.c:1959
+#: nntp.c:1961
 #, c-format
 msgid "Can't post article. Unable to open %s"
 msgstr ""
 
-#: nntp.c:1970 nntp.c:2000
+#: nntp.c:1972 nntp.c:2002
 #, fuzzy, c-format
 msgid "Can't post article: %s"
 msgstr "無法讀取：%s"
 
-#: nntp.c:640
+#: nntp.c:642
 #, fuzzy, c-format
 msgid "Can't rename %s to %s"
 msgstr "無法建立 %s: %s."
@@ -743,7 +731,7 @@ msgstr "無法將信件存到信箱。"
 msgid "Can't save message to newsserver."
 msgstr "無法編輯 POP 伺服器上的信件。"
 
-#: compose.c:1019 editmsg.c:97 sendlib.c:743
+#: compose.c:949 editmsg.c:97 sendlib.c:743
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "無法讀取：%s"
@@ -752,11 +740,11 @@ msgstr "無法讀取：%s"
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: browser.c:1296
+#: browser.c:1267
 msgid "Can't view a directory"
 msgstr "無法顯示目錄"
 
-#: nntp.c:632
+#: nntp.c:634
 #, fuzzy, c-format
 msgid "Can't write %s"
 msgstr "無法建立 %s."
@@ -781,42 +769,38 @@ msgstr "無法建立顯示過濾器"
 msgid "Cannot create filter"
 msgstr "無法建立過濾器"
 
-#: lib-ui/curs_main.c:222
+#: lib-ui/curs_main.c:221
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "無法寫入到一個唯讀的信箱！"
 
-#: browser.c:47 lib-ui/curs_main.c:373
-msgid "Catchup"
-msgstr ""
-
 #: lib-sys/mutt_signal.c:27
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "捕抓到 %s… 正在離開。\n"
 
-#: lib-sys/mutt_ssl.cpkg:539
+#: lib-sys/mutt_ssl.cpkg:537
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "伺服器的驗証還未有效"
 
-#: lib-sys/mutt_ssl.cpkg:833
+#: lib-sys/mutt_ssl.cpkg:824
 msgid "Certificate saved"
 msgstr "驗証已儲存"
 
-#: lib-sys/mutt_ssl.cpkg:531
+#: lib-sys/mutt_ssl.cpkg:529
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: lib-ui/curs_main.c:229
+#: lib-ui/curs_main.c:228
 msgid "Changes to folder will be written on folder exit."
 msgstr "在離開之後將會把改變寫入資料夾。"
 
-#: lib-ui/curs_main.c:233
+#: lib-ui/curs_main.c:232
 msgid "Changes to folder will not be written."
 msgstr "將不會把改變寫入資料夾。"
 
-#: keymap.c:872
+#: lib-ui/curs_lib.c:321
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -826,28 +810,20 @@ msgstr ""
 msgid "Character set changed to %s; %s."
 msgstr "字符集已換為 %s; %s。"
 
-#: browser.c:35
-msgid "Chdir"
-msgstr "改變目錄"
-
-#: browser.c:1090
+#: browser.c:1061
 msgid "Chdir to: "
 msgstr "改變目錄到："
 
-#: lib-ui/curs_main.c:796
+#: lib-ui/curs_main.c:752
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "看看有沒有新信件…"
 
-#: crypt.cpkg:3099
-msgid "Check key  "
-msgstr "檢查鑰匙   "
-
-#: nntp.c:2184 pop.c:1104 pop.c:1250
+#: nntp.c:2165 pop.c:1104 pop.c:1250
 msgid "Checking for new messages..."
 msgstr "看看有沒有新信件…"
 
-#: nntp.c:2196
+#: nntp.c:2177
 #, fuzzy
 msgid "Checking for new newsgroups..."
 msgstr "看看有沒有新信件…"
@@ -856,7 +832,7 @@ msgstr "看看有沒有新信件…"
 msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: compose.c:138
+#: compose.c:110
 msgid "Clear"
 msgstr "清除"
 
@@ -864,7 +840,7 @@ msgstr "清除"
 msgid "Clear flag"
 msgstr "清除旗標"
 
-#: imap/imap.c:151 nntp.c:2018
+#: imap/imap.c:151 nntp.c:2020
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "正在關閉與 %s 的連線…"
@@ -873,7 +849,7 @@ msgstr "正在關閉與 %s 的連線…"
 msgid "Closing connection to POP server..."
 msgstr "正在關閉與 POP 伺服器的連線…"
 
-#: crypt.cpkg:2878
+#: crypt.cpkg:2877
 #, fuzzy
 msgid "Collecting data..."
 msgstr "正連接到 %s…"
@@ -892,7 +868,7 @@ msgstr "伺服器不支援 UIDL 指令。"
 msgid "Committing changes..."
 msgstr "正在寫入更改的資料…"
 
-#: main.c:171
+#: main.c:169
 #, fuzzy
 msgid "Compile Options:"
 msgstr ""
@@ -913,12 +889,12 @@ msgstr "拷貝到 %s…"
 msgid "Compressing %s..."
 msgstr "拷貝到 %s…"
 
-#: nntp.c:1112
+#: nntp.c:1114
 #, c-format
 msgid "Connected to %s. Posting NOT ok."
 msgstr ""
 
-#: nntp.c:1110
+#: nntp.c:1112
 #, fuzzy, c-format
 msgid "Connected to %s. Posting ok."
 msgstr "正連接到 %s…"
@@ -947,7 +923,7 @@ msgstr "連線中斷。再與 POP 伺服器連線嗎？"
 msgid "Connection to %s closed"
 msgstr "到 %s 的連線中斷了"
 
-#: nntp.c:1221
+#: nntp.c:1223
 #, fuzzy, c-format
 msgid "Connection to %s lost. Reconnect?"
 msgstr "到 %s 的連線中斷了"
@@ -957,7 +933,7 @@ msgstr "到 %s 的連線中斷了"
 msgid "Content-Type changed to %s."
 msgstr "Content-Type 被改為 %s。"
 
-#: compose.c:1058
+#: compose.c:988
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type 的格式是 base/sub"
 
@@ -1010,9 +986,9 @@ msgstr "無法連線到 %s (%s)。"
 msgid "Could not copy message"
 msgstr "無法複制信件"
 
-#: crypt.cpkg:3908 crypt.cpkg:3995 imap/message.c:84 pattern.c:146 pop.c:844
+#: crypt.cpkg:3894 crypt.cpkg:3981 imap/message.c:84 pattern.c:146 pop.c:844
 #: pop.c:1400 recvcmd.c:446 recvcmd.c:608 recvcmd.c:855 sendlib.c:922
-#: sendlib.c:987 sendlib.c:2084
+#: sendlib.c:987 sendlib.c:2077
 #, fuzzy
 msgid "Could not create temporary file"
 msgstr "無法建立暫存檔！"
@@ -1030,7 +1006,7 @@ msgstr "找不到排序的功能！[請回報這個問題]"
 msgid "Could not find the host \"%s\""
 msgstr "找不到主機 \"%s\""
 
-#: send.c:812
+#: send.c:810
 msgid "Could not include all requested messages!"
 msgstr "無法包含所有要求的信件！"
 
@@ -1047,7 +1023,7 @@ msgstr "無法開啟 %s"
 msgid "Could not reopen mailbox!"
 msgstr "無法重開信箱！"
 
-#: send.c:1738
+#: send.c:1732
 msgid "Could not send the message."
 msgstr "無法寄出信件。"
 
@@ -1061,7 +1037,7 @@ msgstr "無法鎖住 %s。\n"
 msgid "Create %s?"
 msgstr "建立 %s？"
 
-#: browser.c:1000
+#: browser.c:971
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
 
@@ -1094,26 +1070,17 @@ msgstr "%s%s 到信箱"
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: postpone.c:506
+#: postpone.c:471
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "拿取信件中…"
 
-#: postpone.c:517
+#: postpone.c:482
 #, fuzzy
 msgid "Decryption failed."
 msgstr "登入失敗。"
 
-#: alias.cpkg:149 lib-ui/curs_main.c:355 lib-ui/curs_main.c:368 pager.c:1309
-#: pager.c:1319 postpone.c:32
-msgid "Del"
-msgstr "刪除"
-
-#: remailer.c:433
-msgid "Delete"
-msgstr "刪除"
-
-#: browser.c:1041
+#: browser.c:1012
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援刪除功能"
 
@@ -1121,25 +1088,21 @@ msgstr "只有 IMAP 郵箱才支援刪除功能"
 msgid "Delete messages from server?"
 msgstr "刪除伺服器上的信件嗎？"
 
-#: lib-ui/curs_main.c:880
+#: lib-ui/curs_main.c:836
 msgid "Delete messages matching: "
 msgstr "刪除符合這樣式的信件："
 
-#: lib-ui/curs_main.c:877 lib-ui/curs_main.c:1872 lib-ui/curs_main.c:1912
-#: pager.c:2054 pager.c:2073
+#: lib-ui/curs_main.c:833 lib-ui/curs_main.c:1820 lib-ui/curs_main.c:1860
+#: pager.c:1979 pager.c:1998
 #, fuzzy
 msgid "Deletion"
 msgstr "刪除"
 
-#: recvattach.c:993
+#: recvattach.c:981
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "未支援刪除 PGP 信件所附帶的附件。"
 
-#: compose.c:96 compose.c:108
-msgid "Descrip"
-msgstr "敘述"
-
 #: lib-lua/madmutt.cpkg:106
 #, c-format
 msgid "Directory %s is unsafe, do you want to use it ?"
@@ -1150,21 +1113,21 @@ msgstr ""
 msgid "Directory %s not exist. Create it?"
 msgstr "%s 不存在。製造嗎？"
 
-#: browser.c:679
+#: browser.c:658
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "目錄 [%s], 檔案遮罩: %s"
 
-#: help.c:238
+#: help.c:205
 msgid "ERROR: please report this bug"
 msgstr "錯誤：請回報這個問題"
 
-#: send.c:1387
+#: send.c:1381
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "準備轉寄信件…"
 
-#: lib-ui/curs_main.c:1963
+#: lib-ui/curs_main.c:1911
 msgid "Editing"
 msgstr ""
 
@@ -1173,11 +1136,11 @@ msgstr ""
 msgid "Empty expression"
 msgstr "表達式有錯誤"
 
-#: compose.c:134
+#: compose.c:106
 msgid "Encrypt"
 msgstr "加密"
 
-#: compose.c:163
+#: compose.c:135
 #, fuzzy
 msgid "Encrypt with: "
 msgstr "加密"
@@ -1187,17 +1150,17 @@ msgstr "加密"
 msgid "Encrypted connection unavailable"
 msgstr "加密的鑰匙"
 
-#: lib-ui/curs_main.c:725
+#: lib-ui/curs_main.c:681
 #, fuzzy
 msgid "Enter Message-ID: "
 msgstr "請輸入 %s 的鑰匙 ID："
 
-#: crypt.cpkg:3475
+#: crypt.cpkg:3461
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "請輸入 %s 的鑰匙 ID："
 
-#: keymap.c:868
+#: lib-ui/curs_lib.c:317
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "請輸入 %s 的鑰匙 ID："
@@ -1227,7 +1190,7 @@ msgstr "連線到 %s 時失敗"
 msgid "Error executing: %s : unable to open the mailbox!\n"
 msgstr ""
 
-#: crypt.cpkg:2901
+#: crypt.cpkg:2900
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "連線到 %s 時失敗"
@@ -1236,12 +1199,12 @@ msgstr "連線到 %s 時失敗"
 msgid "Error getting key information: "
 msgstr ""
 
-#: init.c:1248
+#: init.c:1245
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s 發生錯誤，行號 %d：%s"
 
-#: init.c:1676
+#: init.c:1673
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "指令行有錯：%s\n"
@@ -1251,12 +1214,12 @@ msgstr "指令行有錯：%s\n"
 msgid "Error in expression: %s"
 msgstr "表達式有錯誤：%s"
 
-#: lib-sys/mutt_ssl.cpkg:545
+#: lib-sys/mutt_ssl.cpkg:543
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "無法初始化終端機。"
 
-#: main.c:235
+#: main.c:223
 msgid "Error initializing terminal."
 msgstr "無法初始化終端機。"
 
@@ -1268,39 +1231,30 @@ msgstr "開啟信箱時發生錯誤"
 msgid "Error parsing address!"
 msgstr "無法分析位址！"
 
-#: lib-sys/mutt_ssl.cpkg:559
+#: lib-sys/mutt_ssl.cpkg:557
 msgid "Error processing certificate data"
 msgstr ""
 
-#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:147
+#: attach.c:106 attach.c:223 lib-ui/curs_lib.c:110
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "執行 \"%s\" 時發生錯誤！"
 
-#: browser.c:1113 browser.c:1177
+#: browser.c:1084 browser.c:1148
 msgid "Error scanning directory."
 msgstr "無法掃描目錄。"
 
-#: sendlib.c:1889
+#: sendlib.c:1882
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "寄送訊息出現錯誤，子程序已結束 %d (%s)。"
 
-#: remailer.c:703
-#, c-format
-msgid "Error sending message, child exited %d.\n"
-msgstr "寄送訊息時出現錯誤，子程序結束 %d。\n"
-
-#: remailer.c:706
-msgid "Error sending message."
-msgstr "寄信途中發生錯誤。"
-
 #: lib-sys/mutt_socket.c:286 lib-sys/mutt_socket.c:299
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "連線到 %s (%s) 時失敗"
 
-#: browser.c:1313
+#: browser.c:1284
 msgid "Error trying to view file"
 msgstr "無法試著顯示檔案"
 
@@ -1313,25 +1267,20 @@ msgstr "寫入信箱時發生錯誤！"
 msgid "Error. Preserving temporary file: %s"
 msgstr "發生錯誤，保留暫存檔：%s"
 
-#: remailer.c:544
-#, c-format
-msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "錯誤：%s 不能用作鏈結的最後一個郵件轉接器"
-
-#: alias.cpkg:356 send.c:232
+#: alias.cpkg:347 send.c:230
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: crypt.cpkg:2909
+#: crypt.cpkg:2908
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt.cpkg:1844
+#: crypt.cpkg:1843
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt.cpkg:1801
+#: crypt.cpkg:1800
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
@@ -1348,7 +1297,7 @@ msgstr "錯誤：multipart/signed 沒有通訊協定。"
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: crypt.cpkg:1225
+#: crypt.cpkg:1224
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "指令行有錯：%s\n"
@@ -1362,21 +1311,12 @@ msgstr "正在取回信件標頭… [%d/%d]"
 msgid "Executing command on matching messages..."
 msgstr "正在對符合的郵件執行命令…"
 
-#: alias.cpkg:148 browser.c:34 browser.c:43 lib-ui/query.c:35 pager.c:1302
-#: postpone.c:31 recvattach.c:31
-msgid "Exit"
-msgstr "離開"
-
-#: crypt.cpkg:3094 lib-sys/mutt_ssl.cpkg:792
-msgid "Exit  "
-msgstr "離開  "
-
-#: lib-ui/curs_main.c:1296
+#: lib-ui/curs_main.c:1244
 #, fuzzy
 msgid "Exit Madmutt without saving?"
 msgstr "不儲存便離開 Mutt 嗎？"
 
-#: lib-ui/curs_lib.c:233
+#: lib-ui/curs_lib.c:196
 #, fuzzy
 msgid "Exit Madmutt?"
 msgstr "離開 Mutt？"
@@ -1410,17 +1350,17 @@ msgstr "嚴重錯誤！無法重新開啟信箱！"
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "嚴重錯誤。信件數量不協調！"
 
-#: nntp.c:2286
+#: nntp.c:2267
 #, fuzzy, c-format
 msgid "Fetching %s from server..."
 msgstr "正在刪除伺服器上的信件…"
 
-#: nntp.c:1633
+#: nntp.c:1635
 #, fuzzy
 msgid "Fetching headers from cache..."
 msgstr "拿取信件中…"
 
-#: nntp.c:1644
+#: nntp.c:1646
 #, fuzzy
 msgid "Fetching list of articles..."
 msgstr "正在拿取信件…"
@@ -1429,7 +1369,7 @@ msgstr "正在拿取信件…"
 msgid "Fetching list of messages..."
 msgstr "正在拿取信件…"
 
-#: nntp.c:1632
+#: nntp.c:1634
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "正在取回信件標頭… [%d/%d]"
@@ -1439,11 +1379,11 @@ msgstr "正在取回信件標頭… [%d/%d]"
 msgid "Fetching message headers... [%d/%d]"
 msgstr "正在取回信件標頭… [%d/%d]"
 
-#: imap/message.c:371 imap/message.c:418 nntp.c:1894 pop.c:1395
+#: imap/message.c:371 imap/message.c:418 nntp.c:1896 pop.c:1395
 msgid "Fetching message..."
 msgstr "拿取信件中…"
 
-#: browser.c:1136
+#: browser.c:1107
 msgid "File Mask: "
 msgstr "檔案遮罩："
 
@@ -1464,39 +1404,34 @@ msgstr "檔案是一個目錄, 儲存在它下面 ?"
 msgid "File under directory: "
 msgstr "在目錄底下的檔案："
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Filter through: "
 msgstr "經過過濾："
 
-#: crypt.cpkg:991 crypt.cpkg:2734
+#: crypt.cpkg:991 crypt.cpkg:2733
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "指模：%s"
 
-#: lib-ui/curs_main.c:1364
+#: lib-ui/curs_main.c:1312
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "儲存信件以便稍後寄出"
 
-#: lib-ui/curs_main.c:1600 pager.c:2185
+#: lib-ui/curs_main.c:1548 pager.c:2110
 msgid "Flagging"
 msgstr ""
 
-#: send.c:572
+#: send.c:570
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "以後的回覆都寄至 %s%s?"
 
-#: lib-ui/curs_main.c:372 pager.c:1318
-#, fuzzy
-msgid "Followup"
-msgstr "以後的回覆都寄至 %s%s?"
-
 #: recvcmd.c:602
 msgid "Forward MIME encapsulated?"
 msgstr "用 MIME 的方式來轉寄？"
 
-#: send.c:828
+#: send.c:826
 msgid "Forward as attachment?"
 msgstr "利用附件形式來轉寄？"
 
@@ -1504,7 +1439,7 @@ msgstr "利用附件形式來轉寄？"
 msgid "Forward as attachments?"
 msgstr "利用附件形式來轉寄？"
 
-#: lib-ui/curs_main.c:42 pager.c:65 recvattach.c:888
+#: lib-ui/curs_main.c:41 pager.c:65 recvattach.c:876
 msgid "Function not permitted in attach-message mode."
 msgstr "功能在 attach-message 模式下不被支援。"
 
@@ -1520,28 +1455,17 @@ msgstr "拿取 namespace 中…"
 msgid "Good signature from: "
 msgstr ""
 
-#: lib-ui/curs_main.c:360
-msgid "Group"
-msgstr "群組"
-
 #: imap/imap.c:1201
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: alias.cpkg:152 browser.c:37 browser.c:49 compose.c:97 compose.c:109
-#: crypt.cpkg:3102 lib-sys/mutt_ssl.cpkg:794 lib-ui/curs_main.c:361
-#: lib-ui/curs_main.c:374 lib-ui/query.c:40 pager.c:1413 postpone.c:34
-#: recvattach.c:35
-msgid "Help"
-msgstr "求助"
-
-#: help.c:300
+#: help.c:267
 #, c-format
 msgid "Help for %s"
 msgstr "%s 的求助"
 
-#: pager.c:1925
+#: pager.c:1850
 msgid "Help is currently being shown."
 msgstr "現正顯示說明文件。"
 
@@ -1549,39 +1473,39 @@ msgstr "現正顯示說明文件。"
 msgid "I don't know how to print that!"
 msgstr "我不知道要如何列印它！"
 
-#: recvattach.c:600
+#: recvattach.c:591
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "我不知道要怎麼列印 %s 附件!"
 
-#: crypt.cpkg:3180
+#: crypt.cpkg:3166
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt.cpkg:3163
+#: crypt.cpkg:3149
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
 msgstr "這個 ID 已過期/停用/取消。"
 
-#: crypt.cpkg:3183
+#: crypt.cpkg:3169
 #, fuzzy
 msgid "ID is not valid."
 msgstr "這個 ID 不可接受。"
 
-#: crypt.cpkg:3186
+#: crypt.cpkg:3172
 #, fuzzy
 msgid "ID is only marginally valid."
 msgstr "此 ID 只是勉強可接受。"
 
-#: send.c:307
+#: send.c:305
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: postpone.c:395 postpone.c:414 postpone.c:449
+#: postpone.c:360 postpone.c:379 postpone.c:414
 msgid "Illegal PGP header"
 msgstr "不合規定的 PGP 標頭"
 
-#: postpone.c:434
+#: postpone.c:399
 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "不合規定的 PGP 標頭"
@@ -1591,39 +1515,35 @@ msgstr "不合規定的 PGP 標頭"
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "在 \"%2$s\" 的第 %3$d 行發現類別 %1$s 為錯誤的格式紀錄"
 
-#: send.c:801
+#: send.c:799
 msgid "Include message in reply?"
 msgstr "回信時是否要包含原本的信件內容？"
 
-#: send.c:805
+#: send.c:803
 msgid "Including quoted message..."
 msgstr "正引入引言部分…"
 
-#: remailer.c:432
-msgid "Insert"
-msgstr "加入"
-
 #: pattern.c:331
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "無效的日子：%s"
 
-#: init.c:939
+#: init.c:936
 #, c-format
 msgid ""
 "Invalid default setting for $%s found: \"%s\".\n"
 "Please report this error: \"%s\"\n"
 msgstr ""
 
-#: compose.c:947
+#: compose.c:880
 msgid "Invalid encoding."
 msgstr "無效的編碼。"
 
-#: lib-ui/menu.c:344
+#: lib-ui/menu.c:298
 msgid "Invalid index number."
 msgstr "無效的索引編號。"
 
-#: lib-ui/curs_main.c:863
+#: lib-ui/curs_main.c:819
 msgid "Invalid message number."
 msgstr "無效的信件編號。"
 
@@ -1637,11 +1557,11 @@ msgstr "無效的月份：%s"
 msgid "Invalid relative date: %s"
 msgstr "無效的相對日期：%s"
 
-#: crypt.cpkg:3704
+#: crypt.cpkg:3690
 msgid "Invoking PGP..."
 msgstr "啟動 PGP…"
 
-#: crypt.cpkg:3707
+#: crypt.cpkg:3693
 #, fuzzy
 msgid "Invoking S/MIME..."
 msgstr "啟動 PGP…"
@@ -1651,76 +1571,72 @@ msgstr "啟動 PGP…"
 msgid "Invoking autoview command: %s"
 msgstr "執行自動顯示指令：%s"
 
-#: crypt.cpkg:2767
+#: crypt.cpkg:2766
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
-#: lib-ui/curs_main.c:827
+#: lib-ui/curs_main.c:783
 msgid "Jump to message: "
 msgstr "跳到信件："
 
-#: lib-ui/menu.c:337
+#: lib-ui/menu.c:291
 msgid "Jump to: "
 msgstr "跳到："
 
-#: lib-ui/menu.c:870
+#: lib-ui/menu.c:820
 msgid "Jumping is not implemented for dialogs."
 msgstr "對話模式中不支援跳躍功能。"
 
-#: crypt.cpkg:2919
+#: crypt.cpkg:2918
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "鑰匙 ID：0x%s"
 
-#: crypt.cpkg:2713 crypt.cpkg:2836
+#: crypt.cpkg:2712 crypt.cpkg:2835
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt.cpkg:2715 crypt.cpkg:2838
+#: crypt.cpkg:2714 crypt.cpkg:2837
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: keymap.c:602 keymap.c:610
+#: keymap.c:596 keymap.c:604
 msgid "Key is not bound."
 msgstr "這個鍵還未被定義功能。"
 
-#: keymap.c:615
+#: keymap.c:609
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "這個鍵還未被定義功能。 按 '%s' 以取得說明。"
 
-#: nntp.c:1714
+#: nntp.c:1716
 #, c-format
 msgid "LISTGROUP command failed: %s"
 msgstr ""
 
-#: lib-ui/curs_main.c:936
+#: lib-ui/curs_main.c:892
 msgid "Limit to messages matching: "
 msgstr "限制只符合這樣式的信件："
 
-#: lib-ui/curs_main.c:906
+#: lib-ui/curs_main.c:862
 #, c-format
 msgid "Limit: %s"
 msgstr "限制: %s"
 
-#: browser.c:44
-msgid "List"
-msgstr ""
-
-#: nntp.c:2216 nntp.c:2249
+#: nntp.c:2197 nntp.c:2230
 #, fuzzy
 msgid "Loading descriptions..."
 msgstr "登入中…"
 
-#: nntp.c:320
+#: nntp.c:324
 #, c-format
 msgid "Loading list from cache... %d"
 msgstr ""
 
-#: nntp.c:2238
+#: nntp.c:2219
 #, c-format
 msgid "Loading list of all newsgroups on server %s..."
 msgstr ""
@@ -1730,15 +1646,15 @@ msgstr ""
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "鎖進數量超過限額，將 %s 的鎖移除？"
 
-#: nntp.c:1058
+#: nntp.c:1060
 msgid "Logging in..."
 msgstr "登入中…"
 
-#: nntp.c:1076 nntp.c:1146
+#: nntp.c:1078 nntp.c:1148
 msgid "Login failed."
 msgstr "登入失敗。"
 
-#: crypt.cpkg:3249 crypt.cpkg:3343
+#: crypt.cpkg:3235 crypt.cpkg:3329
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "正找尋匹配 \"%s\" 的鑰匙…"
@@ -1748,7 +1664,7 @@ msgstr "正找尋匹配 \"%s\" 的鑰匙…"
 msgid "Looking up %s..."
 msgstr "正在尋找 %s…"
 
-#: lib-sys/mutt_ssl.cpkg:749
+#: lib-sys/mutt_ssl.cpkg:747
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "指模：%s"
@@ -1757,23 +1673,19 @@ msgstr "指模：%s"
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME 形式未被定義. 無法顯示附件內容。"
 
-#: keymap.c:407
+#: keymap.c:406
 msgid "Macro loop detected."
 msgstr "檢測到巨集中有迴圈。"
 
-#: main.c:216
+#: main.c:213
 msgid "MadMutt is based on Madmutt wich was based on Mutt before\n"
 msgstr ""
 
-#: lib-ui/curs_main.c:358 lib-ui/query.c:36
-msgid "Mail"
-msgstr "信件"
-
-#: send.c:1465 send.c:1563
+#: send.c:1459 send.c:1557
 msgid "Mail not sent."
 msgstr "信件沒有寄出。"
 
-#: send.c:1747 send.c:1749
+#: send.c:1741 send.c:1743
 msgid "Mail sent."
 msgstr "信件已經寄出。"
 
@@ -1790,11 +1702,11 @@ msgstr "郵箱已經關掉"
 msgid "Mailbox created."
 msgstr "已完成製造郵箱。"
 
-#: browser.c:1061
+#: browser.c:1032
 msgid "Mailbox deleted."
 msgstr "郵箱已刪除。"
 
-#: main.c:683
+#: main.c:659
 msgid "Mailbox is empty."
 msgstr "信箱內空無一物。"
 
@@ -1803,7 +1715,7 @@ msgstr "信箱內空無一物。"
 msgid "Mailbox is marked unwritable. %s"
 msgstr "信箱被標記成為無法寫入的. %s"
 
-#: lib-mx/mx.c:920 lib-ui/curs_main.c:40 pager.c:58 recvattach.c:881
+#: lib-mx/mx.c:920 lib-ui/curs_main.c:39 pager.c:58 recvattach.c:869
 msgid "Mailbox is read-only."
 msgstr "信箱是唯讀的。"
 
@@ -1815,7 +1727,7 @@ msgstr "信箱沒有變動。"
 msgid "Mailbox must have a name."
 msgstr "信箱一定要有名字。"
 
-#: browser.c:1068
+#: browser.c:1039
 msgid "Mailbox not deleted."
 msgstr "郵箱未被刪除。"
 
@@ -1828,15 +1740,15 @@ msgstr "已完成製造郵箱。"
 msgid "Mailbox was corrupted!"
 msgstr "信箱已損壞!"
 
-#: lib-ui/curs_main.c:479
+#: lib-ui/curs_main.c:445
 msgid "Mailbox was externally modified."
 msgstr "信箱已被其他途徑更改過。"
 
-#: lib-ui/curs_main.c:469
+#: lib-ui/curs_main.c:435
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "信箱已被其他途徑改變過。旗標可能有錯誤。"
 
-#: browser.c:671
+#: browser.c:650
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "信箱 [%d]"
@@ -1851,11 +1763,7 @@ msgstr "編輯 Mailcap 項目時需要 %%s"
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap 編輯項目需要 %%s"
 
-#: lib-ui/query.c:38
-msgid "Make Alias"
-msgstr "製作別名"
-
-#: nntp.c:2090
+#: nntp.c:2071
 msgid "Mark all articles read?"
 msgstr ""
 
@@ -1864,19 +1772,15 @@ msgstr ""
 msgid "Marking %d messages deleted..."
 msgstr "標簽了的 %d 封信件刪去了…"
 
-#: lib-ui/curs_main.c:2058
+#: lib-ui/curs_main.c:2006
 msgid "Marking as read"
 msgstr ""
 
-#: browser.c:36 browser.c:48
-msgid "Mask"
-msgstr "遮罩"
-
 #: commands.c:234 recvcmd.c:196
 msgid "Message bounced."
 msgstr "郵件已被傳送。"
 
-#: send.c:505
+#: send.c:503
 msgid "Message came from a mailing list. List-reply to mailing list?"
 msgstr ""
 
@@ -1897,12 +1801,12 @@ msgstr "郵件已被傳送。"
 msgid "Message not modified!"
 msgstr "沒有改動信件！"
 
-#: lib-ui/curs_main.c:753
+#: lib-ui/curs_main.c:709
 #, fuzzy
 msgid "Message not visible in limited view."
 msgstr "在限制閱覽模式下無法顯示主信件。"
 
-#: send.c:1495
+#: send.c:1489
 msgid "Message postponed."
 msgstr "信件被延遲寄出。"
 
@@ -1910,7 +1814,7 @@ msgstr "信件被延遲寄出。"
 msgid "Message printed"
 msgstr "信件已印出"
 
-#: compose.c:1208
+#: compose.c:1138
 msgid "Message written."
 msgstr "信件已寫入。"
 
@@ -1931,19 +1835,10 @@ msgstr "郵件已傳送。"
 msgid "Messages printed"
 msgstr "信件已印出"
 
-#: lib-ui/color.c:474
+#: lib-ui/color.c:422
 msgid "Missing arguments."
 msgstr "缺少參數。"
 
-#: remailer.c:572
-#, c-format
-msgid "Mixmaster chains are limited to %d elements."
-msgstr "Mixmaster 鏈結最多為 %d 個元件"
-
-#: remailer.c:649
-msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster 不接受 Cc 和 Bcc 的標頭。"
-
 #: lib-mx/mx.c:672
 #, c-format
 msgid "Move read messages to %s?"
@@ -1954,19 +1849,15 @@ msgstr "搬移已讀取的信件到 %s？"
 msgid "Moving read messages to %s..."
 msgstr "正在搬移已經讀取的信件到 %s …"
 
-#: crypt.cpkg:2666
+#: crypt.cpkg:2665
 msgid "Name ......: "
 msgstr ""
 
-#: lib-ui/query.c:37
-msgid "New Query"
-msgstr "新的查詢"
-
-#: browser.c:1269
+#: browser.c:1240
 msgid "New file name: "
 msgstr "新檔名："
 
-#: compose.c:1046
+#: compose.c:976
 msgid "New file: "
 msgstr "建立新檔："
 
@@ -1975,41 +1866,33 @@ msgstr "建立新檔："
 msgid "New mail in "
 msgstr "在 %s 有新信件。"
 
-#: lib-ui/curs_main.c:473
+#: lib-ui/curs_main.c:439
 msgid "New mail in this mailbox."
 msgstr "這個信箱中有新信件。"
 
-#: nntp.c:1817
+#: nntp.c:1819
 #, c-format
 msgid "Newsgroup %s not found on server %s"
 msgstr ""
 
-#: browser.c:665
+#: browser.c:644
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: pager.c:1311 pager.c:1320
-msgid "Next"
-msgstr "下一個"
-
-#: pager.c:1304
-msgid "NextPg"
-msgstr "下一頁"
-
-#: lib-ui/curs_main.c:776
+#: lib-ui/curs_main.c:732
 msgid "No Message-ID. Unable to perform operation"
 msgstr ""
 
-#: lib-ui/curs_main.c:1361
+#: lib-ui/curs_main.c:1309
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: send.c:1559
+#: send.c:1553
 msgid "No attachments made but indicator found in text. Abort sending."
 msgstr ""
 
-#: send.c:1556
+#: send.c:1550
 msgid "No attachments made but indicator found in text. Cancel sending?"
 msgstr ""
 
@@ -2021,30 +1904,30 @@ msgstr "沒有認證方式"
 msgid "No boundary parameter found! [report this error]"
 msgstr "沒有發現分界變數！[回報錯誤]"
 
-#: lib-ui/menu.c:348 lib-ui/menu.c:369 lib-ui/menu.c:427 lib-ui/menu.c:462
-#: lib-ui/menu.c:476 lib-ui/menu.c:485 lib-ui/menu.c:494 lib-ui/menu.c:504
-#: lib-ui/menu.c:516 lib-ui/menu.c:528 lib-ui/menu.c:905
+#: lib-ui/menu.c:302 lib-ui/menu.c:323 lib-ui/menu.c:381 lib-ui/menu.c:416
+#: lib-ui/menu.c:430 lib-ui/menu.c:439 lib-ui/menu.c:448 lib-ui/menu.c:458
+#: lib-ui/menu.c:470 lib-ui/menu.c:482 lib-ui/menu.c:855
 msgid "No entries."
 msgstr "沒有資料。"
 
-#: browser.c:826 browser.c:1184 browser.c:1281
+#: browser.c:797 browser.c:1155 browser.c:1252
 msgid "No files match the file mask"
 msgstr "沒有檔案與檔案遮罩相符"
 
-#: main.c:648
+#: main.c:624
 msgid "No incoming mailboxes defined."
 msgstr "沒有定義任何的收信郵箱"
 
-#: lib-ui/curs_main.c:900
+#: lib-ui/curs_main.c:856
 msgid "No limit pattern is in effect."
 msgstr "沒有限制樣式是有效的。"
 
-#: imap/command.c:141 lib-ui/curs_main.c:38 lib-ui/curs_main.c:593
-#: lib-ui/curs_main.c:621
+#: imap/command.c:141 lib-ui/curs_main.c:37 lib-ui/curs_main.c:549
+#: lib-ui/curs_main.c:577
 msgid "No mailbox is open."
 msgstr "沒有已開啟信箱。"
 
-#: main.c:630
+#: main.c:606
 msgid "No mailbox with new mail."
 msgstr "沒有信箱有新信件。"
 
@@ -2058,7 +1941,7 @@ msgstr "沒有 %s 的 mailcap 組成登錄，正在建立空的檔案。"
 msgid "No mailcap edit entry for %s"
 msgstr "沒有 %s 的 mailcap 編輯登錄"
 
-#: recvcmd.c:753 send.c:774
+#: recvcmd.c:753 send.c:772
 msgid "No mailing lists found!"
 msgstr "沒有找到郵寄論壇！"
 
@@ -2066,7 +1949,7 @@ msgstr "沒有找到郵寄論壇！"
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "沒有發現配合 mailcap 的登錄。將以文字檔方式瀏覽。"
 
-#: compose.c:781
+#: compose.c:714
 msgid "No messages in that folder."
 msgstr "檔案夾中沒有信件。"
 
@@ -2074,15 +1957,15 @@ msgstr "檔案夾中沒有信件。"
 msgid "No messages matched criteria."
 msgstr "沒有郵件符合要求。"
 
-#: pager.c:1955
+#: pager.c:1880
 msgid "No more quoted text."
 msgstr "不能有再多的引言。"
 
-#: lib-ui/curs_main.c:1704
+#: lib-ui/curs_main.c:1652
 msgid "No more threads."
 msgstr "沒有更多的序列"
 
-#: pager.c:1972
+#: pager.c:1897
 msgid "No more unquoted text after quoted text."
 msgstr "在引言後有過多的非引言文字。"
 
@@ -2090,72 +1973,62 @@ msgstr "在引言後有過多的非引言文字。"
 msgid "No new mail in POP mailbox."
 msgstr "POP 信箱中沒有新的信件"
 
-#: lib-ui/curs_main.c:1582
+#: lib-ui/curs_main.c:1530
 msgid "No new messages"
 msgstr "沒有新信件"
 
-#: send.c:1544
+#: send.c:1538
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "沒有指定標題。"
 
-#: browser.c:1396
+#: browser.c:1367
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "沒有檔案與檔案遮罩相符"
 
-#: nntp.c:357
+#: nntp.c:360
 #, fuzzy
 msgid "No newsserver defined!"
 msgstr "沒有被定義的 POP 使用者名稱。"
 
-#: lib-ui/sidebar.c:423
-#, fuzzy
-msgid "No next mailboxes with new mail."
-msgstr "沒有信箱有新信件。"
-
-#: postpone.c:228 postpone.c:237
+#: postpone.c:215 postpone.c:224
 msgid "No postponed messages."
 msgstr "沒有被延遲寄出的信件。"
 
-#: lib-ui/sidebar.c:440
-#, fuzzy
-msgid "No previous mailbox with new mail."
-msgstr "沒有信箱有新信件。"
-
 #: commands.c:378
 msgid "No printing command has been defined."
 msgstr "沒有定義列印指令。"
 
-#: send.c:1506
+#: send.c:1500
 msgid "No recipients are specified!"
 msgstr "沒有指定接受者！"
 
-#: main.c:539
+#: main.c:515
 msgid "No recipients specified.\n"
 msgstr "沒有指定接受者。\n"
 
-#: send.c:1511
+#: send.c:1505
 msgid "No recipients were specified."
 msgstr "沒有指定接受者。"
 
-#: lib-ui/menu.c:615 pattern.c:1263
+#: lib-ui/menu.c:569 pattern.c:1263
 msgid "No search pattern."
 msgstr "沒有搜尋格式。"
 
-#: send.c:1532 send.c:1538
+#: send.c:1526 send.c:1532
 msgid "No subject specified."
 msgstr "沒有指定標題。"
 
-#: send.c:1529
+#: send.c:1523
 msgid "No subject, abort sending?"
 msgstr "沒有信件標題，要中斷寄信的工作?"
 
-#: send.c:316
+#: send.c:314
 msgid "No subject, abort?"
 msgstr "沒有標題，要不要中斷？"
 
-#: send.c:318
+#: send.c:316
 msgid "No subject, aborting."
 msgstr "沒有標題，正在中斷中。"
 
@@ -2164,101 +2037,97 @@ msgstr "沒有標題，正在中斷中。"
 msgid "No such folder"
 msgstr "%s：沒有這種顏色"
 
-#: lib-ui/menu.c:760
+#: lib-ui/menu.c:714
 msgid "No tagged entries."
 msgstr "沒有已標記的記錄。"
 
-#: send.c:743
+#: send.c:741
 msgid "No tagged messages are visible!"
 msgstr "沒有被標記了的信件在顯示！"
 
-#: lib-ui/curs_main.c:599
+#: lib-ui/curs_main.c:555
 msgid "No tagged messages."
 msgstr "沒有標記了的信件。"
 
-#: lib-ui/curs_main.c:1378
+#: lib-ui/curs_main.c:1326
 msgid "No thread linked"
 msgstr ""
 
-#: lib-ui/curs_main.c:1402 lib-ui/curs_main.c:1443
+#: lib-ui/curs_main.c:1350 lib-ui/curs_main.c:1391
 msgid "No undeleted messages."
 msgstr "沒有要反刪除的信件。"
 
-#: lib-ui/curs_main.c:1583
+#: lib-ui/curs_main.c:1531
 msgid "No unread messages"
 msgstr "沒有尚未讀取的信件"
 
-#: lib-ui/curs_main.c:43
+#: lib-ui/curs_main.c:42
 msgid "No visible messages."
 msgstr "沒有要被顯示的信件。"
 
-#: init.c:1020 init.c:1076 pager.c:51
+#: init.c:1017 init.c:1073 pager.c:51
 #, c-format
 msgid "Not available in this menu."
 msgstr "在這個菜單中沒有這個功能。"
 
-#: lib-ui/menu.c:645 pager.c:1787 pager.c:1801 pager.c:1901 pattern.c:1329
+#: lib-ui/menu.c:599 pager.c:1712 pager.c:1726 pager.c:1826 pattern.c:1329
 msgid "Not found."
 msgstr "沒有找到。"
 
-#: lib-ui/curs_main.c:634 lib-ui/menu.c:773
+#: lib-ui/curs_main.c:590 lib-ui/menu.c:727
 #, fuzzy
 msgid "Nothing to do."
 msgstr "正連接到 %s…"
 
-#: remailer.c:435
-msgid "OK"
-msgstr "OK"
-
-#: recvattach.c:1008 recvattach.c:1021
+#: recvattach.c:996 recvattach.c:1009
 msgid "Only deletion of multipart attachments is supported."
 msgstr "只支援刪除多重附件"
 
-#: lib-ui/curs_main.c:1148
+#: lib-ui/curs_main.c:1104
 msgid "Open mailbox"
 msgstr "開啟信箱"
 
-#: lib-ui/curs_main.c:1146
+#: lib-ui/curs_main.c:1102
 msgid "Open mailbox in read-only mode"
 msgstr "用唯讀模式開啟信箱"
 
-#: compose.c:726
+#: compose.c:659
 msgid "Open mailbox to attach message from"
 msgstr "開啟信箱並從它選擇附加的信件"
 
-#: lib-ui/curs_main.c:1160
+#: lib-ui/curs_main.c:1116
 msgid "Open newsgroup"
 msgstr ""
 
-#: lib-ui/curs_main.c:1158
+#: lib-ui/curs_main.c:1114
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "用唯讀模式開啟信箱"
 
-#: compose.c:734
+#: compose.c:667
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "開啟信箱並從它選擇附加的信件"
 
-#: sendlib.c:1895
+#: sendlib.c:1888
 msgid "Output of the delivery process"
 msgstr "Delivery process 的輸出"
 
-#: crypt.cpkg:3543
+#: crypt.cpkg:3529
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
-#: compose.c:1228
+#: compose.c:1158
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.cpkg:3116
+#: crypt.cpkg:3102
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 
-#: crypt.cpkg:3118
+#: crypt.cpkg:3104
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
@@ -2275,11 +2144,11 @@ msgstr "PGP 簽名驗證成功。"
 msgid "POP host is not defined."
 msgstr "POP 主機沒有被定義。"
 
-#: thread.c:987
+#: thread.c:983
 msgid "Parent message is not available."
 msgstr "主信件不存在。"
 
-#: thread.c:980
+#: thread.c:976
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
 msgstr "在限制閱覽模式下無法顯示主信件。"
@@ -2289,40 +2158,27 @@ msgstr "在限制閱覽模式下無法顯示主信件。"
 msgid "Password for %s@%s: "
 msgstr "%s@%s 的密碼："
 
-#: alias.cpkg:369
+#: alias.cpkg:360
 msgid "Personal name: "
 msgstr "個人姓名："
 
-#: recvattach.c:33
-msgid "Pipe"
-msgstr "管線"
-
 #: commands.c:364
 msgid "Pipe to command: "
 msgstr "用管道輸出至命令："
 
-#: recvattach.c:568
+#: recvattach.c:559
 msgid "Pipe to: "
 msgstr "導引至："
 
-#: remailer.c:671
-msgid ""
-"Please set the hostname variable to a proper value when using mixmaster!"
-msgstr "使用 mixmaster 時請先設定好 hostname 變數！"
-
-#: lib-ui/curs_main.c:371 pager.c:1317
-msgid "Post"
-msgstr ""
-
-#: lib-ui/curs_main.c:2120 pager.c:2227 pager.c:2241 pager.c:2269
+#: lib-ui/curs_main.c:2068 pager.c:2152 pager.c:2166 pager.c:2194
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
-#: compose.c:1154
+#: compose.c:1084
 msgid "Postpone this message?"
 msgstr "延遲寄出這封信件？"
 
-#: postpone.c:150
+#: postpone.c:139
 msgid "Postponed Messages"
 msgstr "信件已經被延遲寄出"
 
@@ -2330,23 +2186,15 @@ msgstr "信件已經被延遲寄出"
 msgid "Preconnect command failed."
 msgstr "預先連接指令失敗。"
 
-#: send.c:831
+#: send.c:829
 msgid "Preparing forwarded message..."
 msgstr "準備轉寄信件…"
 
-#: lib-ui/curs_lib.c:369
+#: lib-ui/curs_lib.c:347
 msgid "Press any key to continue..."
 msgstr "按下任何鍵繼續…"
 
-#: pager.c:1303
-msgid "PrevPg"
-msgstr "上一頁"
-
-#: recvattach.c:34
-msgid "Print"
-msgstr "顯示"
-
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print attachment?"
 msgstr "是否要列印附件?"
 
@@ -2354,7 +2202,7 @@ msgstr "是否要列印附件?"
 msgid "Print message?"
 msgstr "列印信件？"
 
-#: recvattach.c:664
+#: recvattach.c:655
 msgid "Print tagged attachment(s)?"
 msgstr "是否要列印標記起來的附件?"
 
@@ -2372,34 +2220,30 @@ msgstr "清除 %d 封已經被刪除的信件？"
 msgid "Purge %d deleted messages?"
 msgstr "清除 %d 封已被刪除的信件？"
 
-#: lib-ui/query.c:256
+#: lib-ui/query.c:244
 #, c-format
 msgid "Query"
 msgstr "查詢"
 
-#: lib-ui/query.c:275 lib-ui/query.c:297
+#: lib-ui/query.c:261 lib-ui/query.c:283
 #, c-format
 msgid "Query '%s'"
 msgstr "查詢 '%s'"
 
-#: lib-ui/query.c:204 lib-ui/query.c:230
+#: lib-ui/query.c:193 lib-ui/query.c:219
 msgid "Query command not defined."
 msgstr "查詢指令尚未定義。"
 
-#: lib-ui/query.c:269 lib-ui/query.c:290
+#: lib-ui/query.c:255 lib-ui/query.c:276
 msgid "Query: "
 msgstr "查詢："
 
-#: lib-ui/curs_main.c:354 lib-ui/curs_main.c:367
-msgid "Quit"
-msgstr "離開"
-
-#: lib-ui/curs_main.c:968
+#: lib-ui/curs_main.c:924
 #, fuzzy
 msgid "Quit Madmutt?"
 msgstr "離開 Mutt？"
 
-#: nntp.c:2083
+#: nntp.c:2064
 #, fuzzy
 msgid "Quitting newsgroup..."
 msgstr "拿取 namespace 中…"
@@ -2424,16 +2268,16 @@ msgstr "讀取 %s 中… %d (%d%%)"
 msgid "Reading new messages (%d bytes)..."
 msgstr "讀取新信件中 (%d 個位元組)…"
 
-#: browser.c:1048
+#: browser.c:1019
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "真的要刪除 \"%s\" 郵箱？"
 
-#: send.c:1110
+#: send.c:1104
 msgid "Recall postponed message?"
 msgstr "要叫出被延遲的信件?"
 
-#: compose.c:870
+#: compose.c:803
 msgid "Recoding only affects text attachments."
 msgstr "只重新編碼受影響的文字附件"
 
@@ -2442,7 +2286,7 @@ msgstr "只重新編碼受影響的文字附件"
 msgid "Rename failed: %s"
 msgstr "登入失敗： %s"
 
-#: browser.c:1020
+#: browser.c:991
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
@@ -2452,7 +2296,7 @@ msgstr "只有 IMAP 郵箱才支援製造功能"
 msgid "Rename mailbox %s to: "
 msgstr "製作信箱："
 
-#: compose.c:1016
+#: compose.c:946
 msgid "Rename to: "
 msgstr "更改名稱為："
 
@@ -2460,15 +2304,11 @@ msgstr "更改名稱為："
 msgid "Reopening mailbox..."
 msgstr "重新開啟信箱中…"
 
-#: lib-ui/curs_main.c:359 pager.c:1310
-msgid "Reply"
-msgstr "回覆"
-
-#: lib-ui/curs_main.c:2114 pager.c:2264 recvattach.c:1091
+#: lib-ui/curs_main.c:2062 pager.c:2189 recvattach.c:1079
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: send.c:542
+#: send.c:540
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "要回覆給 %s%s?"
@@ -2482,24 +2322,24 @@ msgstr ""
 "反方向 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排 8)大小 9)分"
 "數:"
 
-#: lib-ui/menu.c:607 pattern.c:1232
+#: lib-ui/menu.c:561 pattern.c:1232
 msgid "Reverse search for: "
 msgstr "返向搜尋："
 
-#: pager.c:1814
+#: pager.c:1739
 msgid "Reverse search: "
 msgstr "反向搜尋："
 
-#: browser.c:1202
+#: browser.c:1173
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "反向排序 (1)日期, (2)字元, (3)大小 或 (4)不排序 ? "
 
-#: crypt.cpkg:3541
+#: crypt.cpkg:3527
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
-#: compose.c:1214
+#: compose.c:1144
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
@@ -2507,7 +2347,7 @@ msgstr ""
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: crypt.cpkg:3120
+#: crypt.cpkg:3106
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
@@ -2530,7 +2370,7 @@ msgstr "PGP 簽名驗證成功。"
 msgid "SASL authentication failed."
 msgstr "SASL 驗證失敗。"
 
-#: lib-sys/mutt_ssl.cpkg:745
+#: lib-sys/mutt_ssl.cpkg:743
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "指模：%s"
@@ -2540,20 +2380,16 @@ msgstr "指模：%s"
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "利用 %s (%s) 來進行 SSL"
 
-#: lib-ui/curs_main.c:357 lib-ui/curs_main.c:370 recvattach.c:32
-msgid "Save"
-msgstr "儲存"
-
-#: compose.c:968
+#: compose.c:898
 msgid "Save a copy of this message?"
 msgstr "儲存這封信件的拷貝嗎？"
 
-#: recvattach.c:356
+#: recvattach.c:347
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: alias.cpkg:386 recvattach.c:370 recvattach.c:397 recvattach.c:409
-#: recvattach.c:434
+#: alias.cpkg:377 recvattach.c:361 recvattach.c:388 recvattach.c:400
+#: recvattach.c:425
 msgid "Save to file: "
 msgstr "存到檔案："
 
@@ -2567,15 +2403,11 @@ msgstr "%s%s 到信箱"
 msgid "Saving message status flags... [%d/%d]"
 msgstr "正在儲存信件狀態旗標… [%d/%d]"
 
-#: recvattach.c:401
+#: recvattach.c:392
 msgid "Saving..."
 msgstr "儲存中…"
 
-#: lib-ui/query.c:39
-msgid "Search"
-msgstr "搜尋"
-
-#: lib-ui/menu.c:606 pattern.c:1231
+#: lib-ui/menu.c:560 pattern.c:1231
 msgid "Search for: "
 msgstr "搜尋："
 
@@ -2591,62 +2423,46 @@ msgstr "已搜尋至開頭，並沒有發現任何符合"
 msgid "Search interrupted."
 msgstr "搜尋已被中斷。"
 
-#: lib-ui/menu.c:865
+#: lib-ui/menu.c:815
 msgid "Search is not implemented for this menu."
 msgstr "這個選單中沒有搜尋功能。"
 
-#: lib-ui/curs_main.c:1537 pattern.c:1295
+#: lib-ui/curs_main.c:1485 pattern.c:1295
 msgid "Search wrapped to bottom."
 msgstr "搜尋至結尾。"
 
-#: lib-ui/curs_main.c:1529 pattern.c:1284
+#: lib-ui/curs_main.c:1477 pattern.c:1284
 msgid "Search wrapped to top."
 msgstr "搜尋至開頭。"
 
-#: pager.c:1815
+#: pager.c:1740
 msgid "Search: "
 msgstr "搜尋："
 
-#: alias.cpkg:151
-msgid "Select"
-msgstr "選擇"
-
-#: crypt.cpkg:3096
-msgid "Select  "
-msgstr "選擇    "
-
-#: remailer.c:488
-msgid "Select a remailer chain."
-msgstr "選擇一個郵件轉接器的鏈結"
-
-#: imap/imap.c:520 nntp.c:1799
+#: imap/imap.c:520 nntp.c:1801
 #, c-format
 msgid "Selecting %s..."
 msgstr "正在選擇 %s …"
 
-#: compose.c:90 compose.c:103
-msgid "Send"
-msgstr "寄出"
-
-#: send.c:1744
+#: send.c:1738
 msgid "Sending in background."
 msgstr "正在背景作業中傳送。"
 
-#: send.c:1617
+#: send.c:1611
 msgid "Sending message..."
 msgstr "正在寄出信件…"
 
-#: crypt.cpkg:2761
+#: crypt.cpkg:2760
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: nntp.c:2337
+#: nntp.c:2318
 #, c-format
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: nntp.c:1089 pop.c:744 pop.c:1344
+#: nntp.c:1091 pop.c:744 pop.c:1344
 msgid "Server closed connection!"
 msgstr "與伺服器的聯結中斷了!"
 
@@ -2658,15 +2474,15 @@ msgstr "設定旗標"
 msgid "Shell command: "
 msgstr "Shell 指令："
 
-#: compose.c:136
+#: compose.c:108
 msgid "Sign"
 msgstr "簽名"
 
-#: crypt.cpkg:3558
+#: crypt.cpkg:3544
 msgid "Sign as: "
 msgstr "簽名的身份是："
 
-#: compose.c:132
+#: compose.c:104
 msgid "Sign, Encrypt"
 msgstr "簽名，加密"
 
@@ -2679,7 +2495,7 @@ msgstr ""
 "排序 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排序 8)大小 9)分"
 "數:"
 
-#: browser.c:1205
+#: browser.c:1176
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "依照 (1)日期 (2)字元 (3)大小 來排序，或(4)不排序 ? "
 
@@ -2687,26 +2503,22 @@ msgstr "依照 (1)日期 (2)字元 (3)大小 來排序，或(4)不排序 ? "
 msgid "Sorting mailbox..."
 msgstr "信箱排序中…"
 
-#: crypt.cpkg:2783
+#: crypt.cpkg:2782
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "鑰匙 ID：0x%s"
 
-#: browser.c:45
-msgid "Subscribe"
-msgstr ""
-
-#: browser.c:1377
+#: browser.c:1348
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:676
+#: browser.c:655
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "已訂閱 [%s], 檔案遮罩: %s"
 
-#: browser.c:663
+#: browser.c:642
 msgid "Subscribed newsgroups"
 msgstr ""
 
@@ -2715,24 +2527,24 @@ msgstr ""
 msgid "Subscribing to %s..."
 msgstr "訂閱 %s…"
 
-#: lib-sys/mutt_ssl.cpkg:778
+#: lib-sys/mutt_ssl.cpkg:776
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "SSL 驗証測試"
 
-#: lib-ui/curs_main.c:1044
+#: lib-ui/curs_main.c:1000
 msgid "Tag messages matching: "
 msgstr "標記信件的條件："
 
-#: compose.c:792
+#: compose.c:725
 msgid "Tag the messages you want to attach!"
 msgstr "請標記您要附加的信件！"
 
-#: lib-ui/menu.c:908
+#: lib-ui/menu.c:858
 msgid "Tagging is not supported."
 msgstr "不支援標記功能。"
 
-#: lib-ui/curs_main.c:860
+#: lib-ui/curs_main.c:816
 msgid "That message is not visible."
 msgstr "這封信件無法顯示。"
 
@@ -2741,11 +2553,11 @@ msgstr "這封信件無法顯示。"
 msgid "The CRL is not available\n"
 msgstr "沒有 SSL 功能"
 
-#: compose.c:877
+#: compose.c:810
 msgid "The current attachment will be converted."
 msgstr "這個附件會被轉換。"
 
-#: compose.c:875
+#: compose.c:808
 msgid "The current attachment won't be converted."
 msgstr "這個附件不會被轉換。"
 
@@ -2753,19 +2565,15 @@ msgstr "這個附件不會被轉換。"
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "信件的索引不正確。請再重新開啟信箱。"
 
-#: remailer.c:593
-msgid "The remailer chain is already empty."
-msgstr "郵件轉接器的鏈結已沒有東西了。"
-
-#: compose.c:41
+#: compose.c:40
 msgid "There are no attachments."
 msgstr "沒有附件。"
 
-#: lib-ui/curs_main.c:39 lib-ui/curs_main.c:2108
+#: lib-ui/curs_main.c:38 lib-ui/curs_main.c:2056
 msgid "There are no messages."
 msgstr "沒有信件。"
 
-#: recvattach.c:918
+#: recvattach.c:906
 msgid "There are no subparts to show!"
 msgstr "沒有部件！"
 
@@ -2773,38 +2581,38 @@ msgstr "沒有部件！"
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "這個 IMAP 伺服器已過時，Mutt 無法使用它。"
 
-#: lib-sys/mutt_ssl.cpkg:643
+#: lib-sys/mutt_ssl.cpkg:641
 msgid "This certificate belongs to:"
 msgstr "這個驗証屬於："
 
-#: lib-sys/mutt_ssl.cpkg:733
+#: lib-sys/mutt_ssl.cpkg:731
 #, c-format
 msgid "This certificate is valid"
 msgstr "這個驗証有效"
 
-#: lib-sys/mutt_ssl.cpkg:688
+#: lib-sys/mutt_ssl.cpkg:686
 msgid "This certificate was issued by:"
 msgstr "這個驗証的派發者："
 
-#: crypt.cpkg:3150
+#: crypt.cpkg:3136
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "這個鑰匙不能使用：過期/停用/已取消。"
 
-#: lib-ui/curs_main.c:1340
+#: lib-ui/curs_main.c:1288
 msgid "Thread broken"
 msgstr ""
 
-#: lib-ui/curs_main.c:1778
+#: lib-ui/curs_main.c:1726
 msgid "Thread contains unread messages."
 msgstr "序列中有尚未讀取的信件。"
 
-#: flags.c:285 lib-ui/curs_main.c:1328 lib-ui/curs_main.c:1358
-#: lib-ui/curs_main.c:1762 lib-ui/curs_main.c:1792 thread.c:923 thread.c:970
-#: thread.c:1025
+#: flags.c:285 lib-ui/curs_main.c:1276 lib-ui/curs_main.c:1306
+#: lib-ui/curs_main.c:1710 lib-ui/curs_main.c:1740 thread.c:919 thread.c:966
+#: thread.c:1021
 msgid "Threading is not enabled."
 msgstr "序列功能尚未啟動。"
 
-#: lib-ui/curs_main.c:1375
+#: lib-ui/curs_main.c:1323
 msgid "Threads linked"
 msgstr ""
 
@@ -2816,23 +2624,27 @@ msgstr "嘗試 fcntl 的鎖定時超過時間!"
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "嘗試 flock 時超過時間！"
 
-#: lib-ui/curs_main.c:957
+#: lib-ui/curs_main.c:913
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: lib-ui/curs_main.c:1633 pager.c:2393
+#: keymap_defs.h:11
+msgid "Toggle display of subparts"
+msgstr ""
+
+#: lib-ui/curs_main.c:1581 pager.c:2318
 msgid "Toggling"
 msgstr ""
 
-#: pager.c:1720 pager.c:1740 pager.c:1747 pager.c:1754
+#: pager.c:1645 pager.c:1665 pager.c:1672 pager.c:1679
 msgid "Top of message is shown."
 msgstr "現正顯示最上面的信件。"
 
-#: crypt.cpkg:3886
+#: crypt.cpkg:3872
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.cpkg:3897
+#: crypt.cpkg:3883
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
@@ -2851,12 +2663,12 @@ msgstr ""
 msgid "USER authentication failed."
 msgstr "SASL 驗證失敗。"
 
-#: compose.c:703
+#: compose.c:636
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "無法附加 %s！"
 
-#: compose.c:820
+#: compose.c:753
 msgid "Unable to attach!"
 msgstr "無法附加！"
 
@@ -2864,7 +2676,7 @@ msgstr "無法附加！"
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "無法取回使用這個 IMAP 伺服器版本的郵件的標頭。"
 
-#: lib-sys/mutt_ssl.cpkg:525 lib-sys/mutt_ssl.cpkg:552
+#: lib-sys/mutt_ssl.cpkg:523 lib-sys/mutt_ssl.cpkg:550
 msgid "Unable to get certificate from peer"
 msgstr "無法從對方拿取驗証"
 
@@ -2872,7 +2684,7 @@ msgstr "無法從對方拿取驗証"
 msgid "Unable to leave messages on server."
 msgstr "無法把信件留在伺服器上。"
 
-#: nntp.c:554
+#: nntp.c:556
 #, fuzzy, c-format
 msgid "Unable to lock %s"
 msgstr "無法附加 %s！"
@@ -2882,12 +2694,12 @@ msgstr "無法附加 %s！"
 msgid "Unable to lock mailbox!"
 msgstr "無法鎖住信箱！"
 
-#: nntp.c:549
+#: nntp.c:551
 #, fuzzy, c-format
 msgid "Unable to open %s for reading"
 msgstr "無法開啟暫存檔！"
 
-#: nntp.c:567
+#: nntp.c:569
 #, fuzzy, c-format
 msgid "Unable to open %s for writing"
 msgstr "無法開啟暫存檔！"
@@ -2896,31 +2708,22 @@ msgstr "無法開啟暫存檔！"
 msgid "Unable to open temporary file!"
 msgstr "無法開啟暫存檔！"
 
-#: alias.cpkg:150 lib-ui/curs_main.c:356 lib-ui/curs_main.c:369 postpone.c:33
-msgid "Undel"
-msgstr "反刪除"
-
-#: lib-ui/curs_main.c:1056
+#: lib-ui/curs_main.c:1012
 msgid "Undelete messages matching: "
 msgstr "反刪除信件的條件："
 
-#: lib-ui/curs_main.c:1054 lib-ui/curs_main.c:2183 lib-ui/curs_main.c:2210
-#: pager.c:2412 pager.c:2428
+#: lib-ui/curs_main.c:1010 lib-ui/curs_main.c:2131 lib-ui/curs_main.c:2158
+#: pager.c:2337 pager.c:2353
 #, fuzzy
 msgid "Undeletion"
 msgstr "反刪除"
 
-#: compose.c:1064
+#: compose.c:994
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "不明的 Content-Type %s"
 
-#: browser.c:46
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "取消訂閱 %s…"
-
-#: browser.c:1379
+#: browser.c:1350
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "取消訂閱 %s…"
@@ -2930,7 +2733,7 @@ msgstr "取消訂閱 %s…"
 msgid "Unsubscribing to %s..."
 msgstr "取消訂閱 %s…"
 
-#: lib-ui/curs_main.c:1065
+#: lib-ui/curs_main.c:1021
 msgid "Untag messages matching: "
 msgstr "反標記信件的條件："
 
@@ -2943,7 +2746,7 @@ msgstr "正在上傳信件…"
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "請使用 'toggle-write' 來重新啟動寫入功能!"
 
-#: crypt.cpkg:3446
+#: crypt.cpkg:3432
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
@@ -2953,20 +2756,16 @@ msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 msgid "Username at %s: "
 msgstr "用戶名在 %s："
 
-#: crypt.cpkg:2688 crypt.cpkg:2811
+#: crypt.cpkg:2687 crypt.cpkg:2810
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "無效的月份：%s"
 
-#: crypt.cpkg:2700 crypt.cpkg:2823
+#: crypt.cpkg:2699 crypt.cpkg:2822
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "無效的月份：%s"
 
-#: lib-ui/sidebar.c:339
-msgid "Value for sidebar_delim is too long. Disabling sidebar."
-msgstr ""
-
 #: commands.c:89
 msgid "Verify PGP signature?"
 msgstr "檢查 PGP 簽名?"
@@ -2975,11 +2774,7 @@ msgstr "檢查 PGP 簽名?"
 msgid "Verifying message indexes..."
 msgstr "正在檢查信件的指引 …"
 
-#: pager.c:1308
-msgid "View Attachm."
-msgstr "顯示附件。"
-
-#: recvattach.c:495
+#: recvattach.c:486
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "警告! 您正在覆蓋 %s, 是否要繼續?"
@@ -2990,26 +2785,26 @@ msgid ""
 "above\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:765
+#: lib-sys/mutt_ssl.cpkg:763
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "伺服器的驗証已過期"
 
-#: lib-sys/mutt_ssl.cpkg:760
+#: lib-sys/mutt_ssl.cpkg:758
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 
-#: lib-sys/mutt_ssl.cpkg:755
+#: lib-sys/mutt_ssl.cpkg:753
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 
-#: lib-sys/mutt_ssl.cpkg:770
+#: lib-sys/mutt_ssl.cpkg:768
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:775
+#: lib-sys/mutt_ssl.cpkg:773
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "伺服器的驗証還未有效"
@@ -3034,11 +2829,11 @@ msgstr "正在等待 fcntl 的鎖定… %d"
 msgid "Waiting for flock attempt... %d"
 msgstr "正在等待 flock 執行成功… %d"
 
-#: lib-ui/query.c:85
+#: lib-ui/query.c:74
 msgid "Waiting for response..."
 msgstr "等待回應中…"
 
-#: compose.c:291
+#: compose.c:233
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
@@ -3048,12 +2843,12 @@ msgstr ""
 msgid "Warning: At least one certification key has expired\n"
 msgstr "伺服器的驗証已過期"
 
-#: init.c:773
+#: init.c:770
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:829
+#: lib-sys/mutt_ssl.cpkg:820
 msgid "Warning: Couldn't save certificate"
 msgstr "警告：未能儲存驗証"
 
@@ -3073,17 +2868,17 @@ msgstr ""
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: init.c:1851
+#: init.c:1848
 #, c-format
 msgid "Warning: synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: init.c:1843
+#: init.c:1840
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: compose.c:1083
+#: compose.c:1013
 msgid "What we have here is a failure to make an attachment"
 msgstr "我們無法加上附件"
 
@@ -3096,7 +2891,7 @@ msgstr "寫入失敗！已把部分的信箱儲存至 %s"
 msgid "Write fault!"
 msgstr "寫入失敗！"
 
-#: compose.c:1197
+#: compose.c:1127
 msgid "Write message to mailbox"
 msgstr "將信件寫入到信箱"
 
@@ -3105,7 +2900,7 @@ msgstr "將信件寫入到信箱"
 msgid "Writing %s..."
 msgstr "寫入 %s 中…"
 
-#: compose.c:1199
+#: compose.c:1129
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "寫入信件到 %s …"
@@ -3115,74 +2910,56 @@ msgstr "寫入信件到 %s …"
 msgid "Writing messages... %d (%d%%)"
 msgstr "寫入信件中… %d (%d%%)"
 
-#: nntp.c:1703
+#: nntp.c:1705
 #, fuzzy, c-format
 msgid "XOVER command failed: %s"
 msgstr "指令行有錯：%s\n"
 
-#: alias.cpkg:326
+#: alias.cpkg:317
 msgid "You already have an alias defined with that name!"
 msgstr "您已經為這個名字定義了別名啦！"
 
-#: remailer.c:603
-msgid "You already have the first chain element selected."
-msgstr "你已經選擇了鏈結的第一個元件。"
-
-#: remailer.c:613
-msgid "You already have the last chain element selected."
-msgstr "你已經選擇了鏈結的最後一個元件。"
-
-#: lib-ui/menu.c:548
+#: lib-ui/menu.c:502
 msgid "You are on the first entry."
 msgstr "您現在在第一項。"
 
-#: lib-ui/sidebar.c:432 lib-ui/sidebar.c:449
-#, fuzzy
-msgid "You are on the first mailbox."
-msgstr "您現在在第一頁。"
-
-#: lib-ui/curs_main.c:1436 lib-ui/curs_main.c:1459
+#: lib-ui/curs_main.c:1384 lib-ui/curs_main.c:1407
 msgid "You are on the first message."
 msgstr "您已經在第一封信了。"
 
-#: lib-ui/menu.c:420
+#: lib-ui/menu.c:374
 msgid "You are on the first page."
 msgstr "您現在在第一頁。"
 
-#: lib-ui/curs_main.c:1707
+#: lib-ui/curs_main.c:1655
 msgid "You are on the first thread."
 msgstr "您已經在第一個序列上。"
 
-#: lib-ui/menu.c:538
+#: lib-ui/menu.c:492
 msgid "You are on the last entry."
 msgstr "您現在在最後一項。"
 
-#: lib-ui/sidebar.c:415 lib-ui/sidebar.c:458
-#, fuzzy
-msgid "You are on the last mailbox."
-msgstr "您現在在最後一頁。"
-
-#: lib-ui/curs_main.c:1395 lib-ui/curs_main.c:1418
+#: lib-ui/curs_main.c:1343 lib-ui/curs_main.c:1366
 msgid "You are on the last message."
 msgstr "您已經在最後一封信了。"
 
-#: lib-ui/menu.c:421
+#: lib-ui/menu.c:375
 msgid "You are on the last page."
 msgstr "您現在在最後一頁。"
 
-#: lib-ui/menu.c:366
+#: lib-ui/menu.c:320
 msgid "You cannot scroll down farther."
 msgstr "您無法再向下捲動了。"
 
-#: lib-ui/menu.c:383
+#: lib-ui/menu.c:337
 msgid "You cannot scroll up farther."
 msgstr "您無法再向上捲動了。"
 
-#: alias.cpkg:680
+#: alias.cpkg:670
 msgid "You have no aliases!"
 msgstr "您沒有別名資料！"
 
-#: compose.c:313
+#: compose.c:255
 msgid "You may not delete the only attachment."
 msgstr "您不可以刪除唯一的附件。"
 
@@ -3190,7 +2967,7 @@ msgstr "您不可以刪除唯一的附件。"
 msgid "You may only bounce message/rfc822 parts."
 msgstr "您只能直接傳送 message/rfc822 的部分。"
 
-#: alias.cpkg:377
+#: alias.cpkg:368
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] 接受?"
@@ -3215,7 +2992,7 @@ msgstr "[-- 自動顯示 %s 的 stderr 內容 --]\n"
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- 使用 %s 自動顯示 --]\n"
 
-#: crypt.cpkg:1862
+#: crypt.cpkg:1861
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -3223,11 +3000,11 @@ msgstr ""
 "[-- PGP 信件開始 --]\n"
 "\n"
 
-#: crypt.cpkg:1864
+#: crypt.cpkg:1863
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共鑰匙區段開始 --]\n"
 
-#: crypt.cpkg:1866
+#: crypt.cpkg:1865
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -3235,7 +3012,7 @@ msgstr ""
 "[-- PGP 簽名的信件開始 --]\n"
 "\n"
 
-#: crypt.cpkg:1217 crypt.cpkg:1385 crypt.cpkg:1824
+#: crypt.cpkg:1217 crypt.cpkg:1384 crypt.cpkg:1823
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -3244,53 +3021,53 @@ msgstr ""
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- 不能執行 %s 。 --]\n"
 
-#: crypt.cpkg:1889
+#: crypt.cpkg:1888
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP 信件結束 --]\n"
 
-#: crypt.cpkg:1891
+#: crypt.cpkg:1890
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共鑰匙區段結束 --]\n"
 
-#: crypt.cpkg:1893
+#: crypt.cpkg:1892
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP 簽名的信件結束 --]\n"
 
-#: crypt.cpkg:1981
+#: crypt.cpkg:1980
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
-#: crypt.cpkg:1980
+#: crypt.cpkg:1979
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
-#: crypt.cpkg:2045
+#: crypt.cpkg:2044
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
-#: crypt.cpkg:2044
+#: crypt.cpkg:2043
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 
-#: crypt.cpkg:1281 crypt.cpkg:1396 crypt.cpkg:1837
+#: crypt.cpkg:1280 crypt.cpkg:1395 crypt.cpkg:1836
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -3303,7 +3080,7 @@ msgstr ""
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- 錯誤： 無法顯示 Multipart/Alternative！ --]\n"
 
-#: crypt.cpkg:3981
+#: crypt.cpkg:3967
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -3311,7 +3088,7 @@ msgstr ""
 "[-- 錯誤：不一致的 multipart/signed 結構！ --]\n"
 "\n"
 
-#: crypt.cpkg:3971
+#: crypt.cpkg:3957
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -3320,11 +3097,11 @@ msgstr ""
 "[-- 錯誤：不明的 multipart/signed 協定 %s！ --]\n"
 "\n"
 
-#: crypt.cpkg:1945 crypt.cpkg:2005
+#: crypt.cpkg:1944 crypt.cpkg:2004
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- 錯誤：無法建立暫存檔！ --]\n"
 
-#: crypt.cpkg:1911
+#: crypt.cpkg:1910
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -3332,14 +3109,14 @@ msgstr ""
 "[-- 錯誤：找不到 PGP 信件的開頭！ --]\n"
 "\n"
 
-#: crypt.cpkg:1355
+#: crypt.cpkg:1354
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- 錯誤：突發的檔尾！ --]\n"
 
-#: crypt.cpkg:1934
+#: crypt.cpkg:1933
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -3352,7 +3129,7 @@ msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- 錯誤：message/external-body 沒有存取類型 (access-type) 的參數 --]\n"
 
-#: crypt.cpkg:1958
+#: crypt.cpkg:1957
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -3360,7 +3137,7 @@ msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
-#: crypt.cpkg:1957
+#: crypt.cpkg:1956
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
@@ -3369,7 +3146,7 @@ msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
-#: crypt.cpkg:2017
+#: crypt.cpkg:2016
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
@@ -3378,7 +3155,7 @@ msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
-#: crypt.cpkg:2016
+#: crypt.cpkg:2015
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
@@ -3387,7 +3164,7 @@ msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 
-#: crypt.cpkg:4028
+#: crypt.cpkg:4014
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -3411,7 +3188,7 @@ msgstr "[-- 這個 %s/%s 附件 "
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- 種類：%s%s，編碼：%s，大小：%s --]\n"
 
-#: crypt.cpkg:4032
+#: crypt.cpkg:4018
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -3419,7 +3196,7 @@ msgstr ""
 "[-- 警告：找不到任何的簽名。 --]\n"
 "\n"
 
-#: crypt.cpkg:4018
+#: crypt.cpkg:4004
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -3455,33 +3232,33 @@ msgstr "[-- 名稱：%s --]\n"
 msgid "[-- on %s --]\n"
 msgstr "[-- 在 %s --]\n"
 
-#: crypt.cpkg:2594
+#: crypt.cpkg:2593
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt.cpkg:2589
+#: crypt.cpkg:2588
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2587
+#: crypt.cpkg:2586
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt.cpkg:2798
+#: crypt.cpkg:2797
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt.cpkg:2794
+#: crypt.cpkg:2793
 #, fuzzy
 msgid "[Expired]"
 msgstr "離開  "
 
-#: crypt.cpkg:2669 crypt.cpkg:2790
+#: crypt.cpkg:2668 crypt.cpkg:2789
 #, fuzzy
 msgid "[Invalid]"
 msgstr "無效的月份：%s"
 
-#: crypt.cpkg:2786
+#: crypt.cpkg:2785
 msgid "[Revoked]"
 msgstr ""
 
@@ -3494,16 +3271,43 @@ msgstr "【無效的日期】"
 msgid "[unable to calculate]"
 msgstr "【無法計算】"
 
-#: init.c:743
+#: init.c:740
 msgid "alias: no address"
 msgstr "別名：沒有電子郵件位址"
 
-#: init.c:654
+#: keymap_defs.h:164
+msgid "append new query results to current results"
+msgstr ""
+
+#: keymap_defs.h:184
+#, fuzzy
+msgid "apply next function ONLY to tagged messages"
+msgstr "找不到已標記的訊息"
+
+#: keymap_defs.h:183
+#, fuzzy
+msgid "apply next function to tagged messages"
+msgstr "找不到已標記的訊息"
+
+#: keymap_defs.h:24
+#, fuzzy
+msgid "attach a file(s) to this message"
+msgstr "儲存這封信件的拷貝嗎？"
+
+#: keymap_defs.h:25
+msgid "attach message(s) to this message"
+msgstr ""
+
+#: keymap_defs.h:26
+msgid "attach newsmessage(s) to this message"
+msgstr ""
+
+#: init.c:651
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "編輯附件的說明"
 
-#: init.c:617
+#: init.c:614
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "編輯附件的說明"
@@ -3512,22 +3316,90 @@ msgstr "編輯附件的說明"
 msgid "bad formatted command string"
 msgstr ""
 
-#: keymap.c:744
+#: keymap.c:736
 msgid "bind: too many arguments"
 msgstr "bind：太多引數"
 
-#: crypt.cpkg:2727 crypt.cpkg:2850
+#: keymap_defs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_defs.h:88
+msgid "capitalize the word"
+msgstr ""
+
+#: crypt.cpkg:2726 crypt.cpkg:2849
 msgid "certification"
 msgstr ""
 
-#: lib-ui/color.c:508 lib-ui/color.c:518
+#: keymap_defs.h:22
+#, fuzzy
+msgid "change directories"
+msgstr "無法掃描目錄。"
+
+#: keymap_defs.h:215
+msgid "check for classic pgp"
+msgstr ""
+
+#: keymap_defs.h:23
+#, fuzzy
+msgid "check mailboxes for new mail"
+msgstr "沒有信箱有新信件。"
+
+#: keymap_defs.h:119
+msgid "clear a status flag from a message"
+msgstr ""
+
+#: keymap_defs.h:167
+msgid "clear and redraw the screen"
+msgstr ""
+
+#: keymap_defs.h:203
+msgid "collapse/uncollapse all threads"
+msgstr ""
+
+#: keymap_defs.h:202
+msgid "collapse/uncollapse current thread"
+msgstr ""
+
+#: lib-ui/color.c:456 lib-ui/color.c:466
 msgid "color: too few arguments"
 msgstr "色彩：太少引數"
 
+#: keymap_defs.h:75
+msgid "complete address with query"
+msgstr ""
+
+#: keymap_defs.h:74
+msgid "complete filename or alias"
+msgstr ""
+
+#: keymap_defs.h:113
+#, fuzzy
+msgid "compose a new mail message"
+msgstr "沒有新信件"
+
+#: keymap_defs.h:45
+msgid "compose new attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:89
+msgid "convert the word to lower case"
+msgstr ""
+
+#: keymap_defs.h:90
+msgid "convert the word to upper case"
+msgstr ""
+
 #: commands.c:788
 msgid "converting"
 msgstr "轉換中"
 
+#: keymap_defs.h:54
+#, fuzzy
+msgid "copy a message to a file/mailbox"
+msgstr "將信件寫入到信箱"
+
 #: editmsg.c:59
 #, c-format
 msgid "could not create temporary folder: %s"
@@ -3543,19 +3415,100 @@ msgstr "無法寫入暫存檔：%s"
 msgid "could not write temporary mail folder: %s"
 msgstr "無法寫入暫存檔：%s"
 
-#: browser.c:1206
+#: keymap_defs.h:42
+msgid "create a new mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:55
+msgid "create an alias from a message sender"
+msgstr ""
+
+#: keymap_defs.h:73
+#, fuzzy
+msgid "cycle among incoming mailboxes"
+msgstr "沒有定義任何的收信郵箱"
+
+#: browser.c:1177
 msgid "dazn"
 msgstr "1234"
 
-#: lib-ui/color.c:620
+#: lib-ui/color.c:567
 msgid "default colors not supported"
 msgstr "不支援預設的色彩"
 
+#: keymap_defs.h:84
+msgid "delete all chars on the line"
+msgstr ""
+
+#: keymap_defs.h:63
+#, fuzzy
+msgid "delete all messages in subthread"
+msgstr "刪除伺服器上的信件嗎？"
+
+#: keymap_defs.h:64
+#, fuzzy
+msgid "delete all messages in thread"
+msgstr "反刪除信件的條件："
+
+#: keymap_defs.h:82
+msgid "delete chars from cursor to end of line"
+msgstr ""
+
+#: keymap_defs.h:83
+msgid "delete chars from the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:120
+#, fuzzy
+msgid "delete messages matching a pattern"
+msgstr "反刪除信件的條件："
+
+#: keymap_defs.h:69
+msgid "delete the char in front of the cursor"
+msgstr ""
+
+#: keymap_defs.h:76
+msgid "delete the char under the cursor"
+msgstr ""
+
+#: keymap_defs.h:61
+msgid "delete the current entry"
+msgstr ""
+
+#: keymap_defs.h:62
+msgid "delete the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:85
+msgid "delete the word in front of the cursor"
+msgstr ""
+
 #: commands.c:407
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "123456789"
 
+#: keymap_defs.h:67
+#, fuzzy
+msgid "display a message"
+msgstr "準備轉寄信件…"
+
+#: keymap_defs.h:65
+msgid "display full address of sender"
+msgstr ""
+
+#: keymap_defs.h:66
+msgid "display message and toggle header weeding"
+msgstr ""
+
+#: keymap_defs.h:16
+msgid "display the currently selected file's name"
+msgstr ""
+
+#: keymap_defs.h:200
+msgid "display the keycode for a key press"
+msgstr ""
+
 #: lib-mx/compress.c:422
 #, c-format
 msgid "echo Compressed-appending to %s..."
@@ -3571,21 +3524,108 @@ msgstr "拷貝到 %s…"
 msgid "echo Decompressing %s..."
 msgstr "正在選擇 %s …"
 
+#: keymap_defs.h:43
+#, fuzzy
+msgid "edit attachment content type"
+msgstr "這個附件不會被轉換。"
+
+#: keymap_defs.h:29
+#, fuzzy
+msgid "edit attachment description"
+msgstr "編輯附件的說明"
+
+#: keymap_defs.h:30
+msgid "edit attachment transfer-encoding"
+msgstr ""
+
+#: keymap_defs.h:36
+msgid "edit attachment using mailcap entry"
+msgstr ""
+
+#: keymap_defs.h:27
+msgid "edit the BCC list"
+msgstr ""
+
+#: keymap_defs.h:28
+msgid "edit the CC list"
+msgstr ""
+
+#: keymap_defs.h:39
+msgid "edit the Followup-To field"
+msgstr ""
+
+#: keymap_defs.h:38
+msgid "edit the Reply-To field"
+msgstr ""
+
+#: keymap_defs.h:41
+msgid "edit the TO list"
+msgstr ""
+
+#: keymap_defs.h:32
+msgid "edit the file to be attached"
+msgstr ""
+
+#: keymap_defs.h:33
+msgid "edit the from field"
+msgstr ""
+
+#: keymap_defs.h:35
+#, fuzzy
+msgid "edit the message"
+msgstr "無法寫信件"
+
+#: keymap_defs.h:34
+#, fuzzy
+msgid "edit the message with headers"
+msgstr "正在取回信件標頭… [%d/%d]"
+
+#: keymap_defs.h:37
+msgid "edit the newsgroups list"
+msgstr ""
+
+#: keymap_defs.h:68
+#, fuzzy
+msgid "edit the raw message"
+msgstr "準備轉寄信件…"
+
+#: keymap_defs.h:40
+#, fuzzy
+msgid "edit the subject of this message"
+msgstr "儲存這封信件的拷貝嗎？"
+
 #: pattern.c:777
 msgid "empty pattern"
 msgstr "空的格式"
 
-#: crypt.cpkg:2719 crypt.cpkg:2842
+#: crypt.cpkg:2718 crypt.cpkg:2841
 #, fuzzy
 msgid "encryption"
 msgstr "加密"
 
+#: keymap_defs.h:8
+msgid "end of conditional execution (noop)"
+msgstr ""
+
+#: keymap_defs.h:92
+msgid "enter a file mask"
+msgstr ""
+
+#: keymap_defs.h:31
+#, fuzzy
+msgid "enter a file to save a copy of this message in"
+msgstr "儲存這封信件的拷貝嗎？"
+
+#: keymap_defs.h:91
+msgid "enter a muttrc command"
+msgstr ""
+
 #: crypt.cpkg:570
 #, fuzzy, c-format
 msgid "error adding recipient `%.*s': %s\n"
 msgstr "在樣式上有錯誤：%s"
 
-#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3650
+#: crypt.cpkg:409 crypt.cpkg:425 crypt.cpkg:1209 crypt.cpkg:3636
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
@@ -3615,7 +3655,7 @@ msgstr "在樣式上有錯誤：%s"
 msgid "error getting secret key `%s': %s\n"
 msgstr "在樣式上有錯誤：%s"
 
-#: crypt.cpkg:3657
+#: crypt.cpkg:3643
 #, fuzzy, c-format
 msgid "error importing gpg data: %s\n"
 msgstr "在樣式上有錯誤：%s"
@@ -3654,32 +3694,88 @@ msgstr "在樣式上有錯誤：%s"
 msgid "error: unknown op %d (report this error)."
 msgstr "錯誤：不明的 op %d (請回報這個錯誤)。"
 
-#: crypt.cpkg:3544
+#: crypt.cpkg:3530
 #, fuzzy
 msgid "esabmc"
 msgstr "1234i5"
 
-#: crypt.cpkg:3542
+#: crypt.cpkg:3528
 #, fuzzy
 msgid "esabpc"
 msgstr "1234i5"
 
-#: keymap.c:829
+#: keymap.c:821
 msgid "exec: no arguments"
 msgstr "exec：沒有引數"
 
-#: lib-sys/mutt_ssl.cpkg:220
-#, c-format
-msgid "gnutls_certificate_allocate_credentials: %s"
+#: keymap_defs.h:112
+msgid "execute a macro"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:116
-#, c-format
-msgid "gnutls_global_init: %s"
+#: keymap_defs.h:93
+msgid "exit this menu"
 msgstr ""
 
-#: lib-sys/mutt_ssl.cpkg:290
-#, c-format
+#: keymap_defs.h:219
+msgid "extract supported public keys"
+msgstr ""
+
+#: keymap_defs.h:94
+msgid "filter attachment through a shell command"
+msgstr ""
+
+#: keymap_defs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "以後的回覆都寄至 %s%s?"
+
+#: keymap_defs.h:122
+msgid "force retrieval of mail from IMAP server"
+msgstr ""
+
+#: keymap_defs.h:9
+msgid "force viewing of attachment using mailcap"
+msgstr ""
+
+#: keymap_defs.h:99
+#, fuzzy
+msgid "forward a message with comments"
+msgstr "利用附件形式來轉寄？"
+
+#: keymap_defs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_defs.h:44
+msgid "get a temporary copy of an attachment"
+msgstr ""
+
+#: keymap_defs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "看看有沒有新信件…"
+
+#: keymap_defs.h:102
+msgid "get message with Message-Id"
+msgstr ""
+
+#: keymap_defs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "您已經在第一封信了。"
+
+#: lib-sys/mutt_ssl.cpkg:220
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:116
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: lib-sys/mutt_ssl.cpkg:290
+#, c-format
 msgid "gnutls_handshake: %s"
 msgstr ""
 
@@ -3688,12 +3784,32 @@ msgstr ""
 msgid "gnutls_handshake: %s(%s)"
 msgstr ""
 
-#: crypt.cpkg:2983 crypt.cpkg:3019
+#: keymap_defs.h:206
+#, fuzzy
+msgid "go down to next mailbox"
+msgstr "您現在在最後一頁。"
+
+#: keymap_defs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "沒有信箱有新信件。"
+
+#: keymap_defs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "開啟信箱時發生錯誤"
+
+#: keymap_defs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "沒有信箱有新信件。"
+
+#: crypt.cpkg:2982 crypt.cpkg:3018
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt.cpkg:2956 crypt.cpkg:2992
+#: crypt.cpkg:2955 crypt.cpkg:2991
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
@@ -3706,23 +3822,117 @@ msgstr "已經被刪除了 --]\n"
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: init.c:823
+#: init.c:820
 msgid "invalid header field"
 msgstr "無效的標頭欄位"
 
-#: crypt.cpkg:3122
+#: keymap_defs.h:178
+msgid "invoke a command in a subshell"
+msgstr ""
+
+#: keymap_defs.h:108
+#, fuzzy
+msgid "jump to an index number"
+msgstr "無效的索引編號。"
+
+#: keymap_defs.h:134
+#, fuzzy
+msgid "jump to parent message in thread"
+msgstr "跳到信件："
+
+#: keymap_defs.h:136
+msgid "jump to previous subthread"
+msgstr ""
+
+#: keymap_defs.h:135
+msgid "jump to previous thread"
+msgstr ""
+
+#: keymap_defs.h:72
+msgid "jump to the beginning of the line"
+msgstr ""
+
+#: keymap_defs.h:152
+msgid "jump to the bottom of the message"
+msgstr ""
+
+#: keymap_defs.h:77
+msgid "jump to the end of the line"
+msgstr ""
+
+#: keymap_defs.h:128
+#, fuzzy
+msgid "jump to the next new message"
+msgstr "跳到信件："
+
+#: keymap_defs.h:129
+#, fuzzy
+msgid "jump to the next new or unread message"
+msgstr "序列中有尚未讀取的信件。"
+
+#: keymap_defs.h:130
+msgid "jump to the next subthread"
+msgstr ""
+
+#: keymap_defs.h:131
+#, fuzzy
+msgid "jump to the next thread"
+msgstr "您已經在第一個序列上。"
+
+#: keymap_defs.h:133
+#, fuzzy
+msgid "jump to the next unread message"
+msgstr "沒有尚未讀取的信件"
+
+#: keymap_defs.h:138
+msgid "jump to the previous new message"
+msgstr ""
+
+#: keymap_defs.h:139
+msgid "jump to the previous new or unread message"
+msgstr ""
+
+#: keymap_defs.h:140
+#, fuzzy
+msgid "jump to the previous unread message"
+msgstr "沒有尚未讀取的信件"
+
+#: keymap_defs.h:155
+#, fuzzy
+msgid "jump to the top of the message"
+msgstr "儲存這封信件的拷貝嗎？"
+
+#: crypt.cpkg:3108
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 
-#: keymap.c:789
+#: keymap_defs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "無法傳送已標記的郵件至："
+
+#: keymap_defs.h:20
+#, fuzzy
+msgid "list mailboxes with new mail"
+msgstr "沒有信箱有新信件。"
+
+#: keymap_defs.h:111
+msgid "load active file from NNTP server"
+msgstr ""
+
+#: keymap.c:781
 msgid "macro: empty key sequence"
 msgstr "macro：空的鍵值序列"
 
-#: keymap.c:797
+#: keymap.c:789
 msgid "macro: too many arguments"
 msgstr "macro：引數太多"
 
+#: keymap_defs.h:212
+msgid "mail a PGP public key"
+msgstr ""
+
 #: lib-mime/rfc1524.c:382
 #, c-format
 msgid "mailcap entry for type %s not found"
@@ -3732,6 +3942,38 @@ msgstr "沒有發現類型 %s 的 mailcap 紀錄"
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
+#: keymap_defs.h:59
+msgid "make decoded (text/plain) copy"
+msgstr ""
+
+#: keymap_defs.h:60
+msgid "make decoded copy (text/plain) and delete"
+msgstr ""
+
+#: keymap_defs.h:218
+msgid "make decrypted copy"
+msgstr ""
+
+#: keymap_defs.h:217
+msgid "make decrypted copy and delete"
+msgstr ""
+
+#: keymap_defs.h:21
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_defs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_defs.h:142
+msgid "mark the current subthread as read"
+msgstr ""
+
+#: keymap_defs.h:141
+msgid "mark the current thread as read"
+msgstr ""
+
 #: lib-mx/mx.c:584
 #, fuzzy
 msgid "message(s) not deleted"
@@ -3747,20 +3989,111 @@ msgstr "不對稱的括弧：%s"
 msgid "missing parameter"
 msgstr "錯失參數"
 
-#: lib-ui/color.c:541
+#: lib-ui/color.c:489
 msgid "mono: too few arguments"
 msgstr "單色：太少引數"
 
+#: keymap_defs.h:56
+msgid "move entry to bottom of screen"
+msgstr ""
+
+#: keymap_defs.h:57
+msgid "move entry to middle of screen"
+msgstr ""
+
+#: keymap_defs.h:58
+msgid "move entry to top of screen"
+msgstr ""
+
+#: keymap_defs.h:70
+msgid "move the cursor one character to the left"
+msgstr ""
+
+#: keymap_defs.h:78
+msgid "move the cursor one character to the right"
+msgstr ""
+
+#: keymap_defs.h:71
+msgid "move the cursor to the beginning of the word"
+msgstr ""
+
+#: keymap_defs.h:79
+msgid "move the cursor to the end of the word"
+msgstr ""
+
+#: keymap_defs.h:12
+msgid "move to the bottom of the page"
+msgstr ""
+
+#: keymap_defs.h:95
+#, fuzzy
+msgid "move to the first entry"
+msgstr "您現在在第一項。"
+
+#: keymap_defs.h:124
+#, fuzzy
+msgid "move to the first message"
+msgstr "您已經在第一封信了。"
+
+#: keymap_defs.h:109
+#, fuzzy
+msgid "move to the last entry"
+msgstr "您現在在最後一項。"
+
+#: keymap_defs.h:125
+#, fuzzy
+msgid "move to the last message"
+msgstr "您已經在最後一封信了。"
+
+#: keymap_defs.h:148
+msgid "move to the middle of the page"
+msgstr ""
+
+#: keymap_defs.h:149
+#, fuzzy
+msgid "move to the next entry"
+msgstr "您現在在最後一項。"
+
+#: keymap_defs.h:151
+#, fuzzy
+msgid "move to the next page"
+msgstr "您現在在最後一頁。"
+
+#: keymap_defs.h:132
+#, fuzzy
+msgid "move to the next undeleted message"
+msgstr "沒有要反刪除的信件。"
+
+#: keymap_defs.h:158
+#, fuzzy
+msgid "move to the previous entry"
+msgstr "您現在在第一項。"
+
+#: keymap_defs.h:160
+#, fuzzy
+msgid "move to the previous page"
+msgstr "您現在在第一頁。"
+
+#: keymap_defs.h:137
+#, fuzzy
+msgid "move to the previous undeleted message"
+msgstr "沒有要反刪除的信件。"
+
+#: keymap_defs.h:191
+#, fuzzy
+msgid "move to the top of the page"
+msgstr "您現在在第一頁。"
+
 #: lib-mime/rfc822parse.c:517
 msgid "multipart message has no boundary parameter!"
 msgstr "多部份郵件沒有分隔的參數!"
 
 # Don't translate this!!
-#: lib-ui/curs_lib.c:156
+#: lib-ui/curs_lib.c:119
 msgid "no"
 msgstr ""
 
-#: lib-ui/status.c:86
+#: lib-ui/status.c:85
 #, fuzzy
 msgid "no mailbox"
 msgstr "（沒有信箱）"
@@ -3769,54 +4102,307 @@ msgstr "（沒有信箱）"
 msgid "not converting"
 msgstr "沒有轉換"
 
-#: keymap.c:668
+#: keymap.c:662
 msgid "null key sequence"
 msgstr "空的鍵值序列"
 
+#: keymap_defs.h:7
+msgid "null operation"
+msgstr ""
+
 #: muttlib.c:260
 msgid "oac"
 msgstr "123"
 
-#: init.c:1065
+#: keymap_defs.h:115
+msgid "open a different folder"
+msgstr ""
+
+#: keymap_defs.h:116
+#, fuzzy
+msgid "open a different folder in read only mode"
+msgstr "用唯讀模式開啟信箱"
+
+#: keymap_defs.h:117
+msgid "open a different newsgroup"
+msgstr ""
+
+#: keymap_defs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "用唯讀模式開啟信箱"
+
+#: keymap_defs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "重新開啟信箱中…"
+
+#: keymap_defs.h:156
+msgid "pipe message/attachment to a shell command"
+msgstr ""
+
+#: keymap_defs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "把郵件直接傳送至 %s"
+
+#: init.c:1062
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "重新設置後字首仍不合規定"
 
-#: keymap.c:626
+#: keymap_defs.h:161
+#, fuzzy
+msgid "print the current entry"
+msgstr "您現在在第一項。"
+
+#: keymap.c:620
 msgid "push: too many arguments"
 msgstr "push：太多引數"
 
-#: lib-sys/mutt_ssl.cpkg:788
+#: keymap_defs.h:163
+msgid "query external program for addresses"
+msgstr ""
+
+#: keymap_defs.h:86
+msgid "quote the next typed key"
+msgstr ""
+
+#: keymap_defs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_defs.h:166
+#, fuzzy
+msgid "recall a postponed message"
+msgstr "要叫出被延遲的信件?"
+
+#: keymap_defs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "序列中有尚未讀取的信件。"
+
+#: keymap_defs.h:13
+#, fuzzy
+msgid "remail a message to another user"
+msgstr "無法編輯 POP 伺服器上的信件。"
+
+#: keymap_defs.h:169
+msgid "rename the current mailbox (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:48
+#, fuzzy
+msgid "rename/move an attached file"
+msgstr "%s：無法附帶檔案"
+
+#: keymap_defs.h:170
+#, fuzzy
+msgid "reply to a message"
+msgstr "跳到信件："
+
+#: keymap_defs.h:104
+msgid "reply to all recipients"
+msgstr ""
+
+#: keymap_defs.h:110
+msgid "reply to specified mailing list"
+msgstr ""
+
+#: keymap_defs.h:123
+#, fuzzy
+msgid "retrieve mail from POP server"
+msgstr "刪除伺服器上的信件嗎？"
+
+#: lib-sys/mutt_ssl.cpkg:786
 msgid "ro"
 msgstr "12"
 
-#: lib-sys/mutt_ssl.cpkg:784
+#: lib-sys/mutt_ssl.cpkg:782
 msgid "roa"
 msgstr "123"
 
-#: crypt.cpkg:2723 crypt.cpkg:2846
+#: keymap_defs.h:144
+#, fuzzy
+msgid "save changes to mailbox"
+msgstr "%s%s 到信箱"
+
+#: keymap_defs.h:165
+#, fuzzy
+msgid "save changes to mailbox and quit"
+msgstr "%s%s 到信箱"
+
+#: keymap_defs.h:172
+msgid "save message/attachment to a file"
+msgstr ""
+
+#: keymap_defs.h:47
+#, fuzzy
+msgid "save this message to send later"
+msgstr "無法編輯 POP 伺服器上的信件。"
+
+#: keymap_defs.h:105
+msgid "scroll down 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:150
+msgid "scroll down one line"
+msgstr ""
+
+#: keymap_defs.h:80
+msgid "scroll down through the history list"
+msgstr ""
+
+#: keymap_defs.h:205
+msgid "scroll the mailbox pane down 1 page"
+msgstr ""
+
+#: keymap_defs.h:204
+msgid "scroll the mailbox pane up 1 page"
+msgstr ""
+
+#: keymap_defs.h:106
+msgid "scroll up 1/2 page"
+msgstr ""
+
+#: keymap_defs.h:159
+msgid "scroll up one line"
+msgstr ""
+
+#: keymap_defs.h:81
+msgid "scroll up through the history list"
+msgstr ""
+
+#: keymap_defs.h:174
+msgid "search backwards for a regular expression"
+msgstr ""
+
+#: keymap_defs.h:173
+#, fuzzy
+msgid "search for a regular expression"
+msgstr "表達式有錯誤"
+
+#: keymap_defs.h:175
+#, fuzzy
+msgid "search for next match"
+msgstr "搜尋："
+
+#: keymap_defs.h:176
+msgid "search for next match in opposite direction"
+msgstr ""
+
+#: keymap_defs.h:14
+msgid "select a new file in this directory"
+msgstr ""
+
+#: keymap_defs.h:100
+msgid "select the current entry"
+msgstr ""
+
+#: keymap_defs.h:49
+#, fuzzy
+msgid "send the message"
+msgstr "無法寄出信件。"
+
+#: keymap_defs.h:143
+msgid "set a status flag on a message"
+msgstr ""
+
+#: keymap_defs.h:199
+#, fuzzy
+msgid "show MIME attachments"
+msgstr "利用附件形式來轉寄？"
+
+#: keymap_defs.h:211
+msgid "show PGP options"
+msgstr ""
+
+#: keymap_defs.h:216
+msgid "show S/MIME options"
+msgstr ""
+
+#: keymap_defs.h:201
+msgid "show currently active limit pattern"
+msgstr ""
+
+#: keymap_defs.h:126
+#, fuzzy
+msgid "show only messages matching a pattern"
+msgstr "限制只符合這樣式的信件："
+
+#: keymap_defs.h:197
+msgid "show the Mutt version number and date"
+msgstr ""
+
+#: crypt.cpkg:2722 crypt.cpkg:2845
 msgid "signing"
 msgstr ""
 
-#: init.c:1289
+#: keymap_defs.h:154
+#, fuzzy
+msgid "skip beyond quoted text"
+msgstr "不能有再多的引言。"
+
+#: keymap_defs.h:179
+#, fuzzy
+msgid "sort messages"
+msgstr "列印信件？"
+
+#: keymap_defs.h:180
+#, fuzzy
+msgid "sort messages in reverse order"
+msgstr "檔案夾中沒有信件。"
+
+#: init.c:1286
 #, c-format
 msgid "source: error at %s"
 msgstr "source：錯誤發生在 %s"
 
-#: init.c:1270
+#: init.c:1267
 #, c-format
 msgid "source: errors in %s"
 msgstr "source：錯誤發生在 %s"
 
-#: init.c:1271
+#: init.c:1268
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: 因 %s 發生太多錯誤，因此閱讀終止。"
 
+#: keymap_defs.h:17
+msgid "subscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "沒有檔案與檔案遮罩相符"
+
 #: lib-mx/mbox.c:443
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "同步：信箱已被修改，但沒有被修改過的信件！（請回報這個錯誤）"
 
+#: keymap_defs.h:145
+#, fuzzy
+msgid "tag messages matching a pattern"
+msgstr "反標記信件的條件："
+
+#: keymap_defs.h:182
+msgid "tag the current entry"
+msgstr ""
+
+#: keymap_defs.h:185
+msgid "tag the current subthread"
+msgstr ""
+
+#: keymap_defs.h:186
+#, fuzzy
+msgid "tag the current thread"
+msgstr "您已經在第一個序列上。"
+
+#: keymap_defs.h:107
+msgid "this screen"
+msgstr ""
+
 #: lib-sys/mutt_ssl.cpkg:151
 #, c-format
 msgid "tls_socket_read (%s)"
@@ -3827,23 +4413,94 @@ msgstr ""
 msgid "tls_socket_write (%s)"
 msgstr ""
 
-#: hook.c:61 hook.c:70 keymap.c:674 lib-ui/color.c:597
+#: keymap_defs.h:96
+msgid "toggle a message's 'important' flag"
+msgstr ""
+
+#: keymap_defs.h:187
+msgid "toggle a message's 'new' flag"
+msgstr ""
+
+#: keymap_defs.h:153
+#, fuzzy
+msgid "toggle display of quoted text"
+msgstr "不能有再多的引言。"
+
+#: keymap_defs.h:50
+msgid "toggle disposition between inline/attachment"
+msgstr ""
+
+#: keymap_defs.h:46
+#, fuzzy
+msgid "toggle recoding of this attachment"
+msgstr "只重新編碼受影響的文字附件"
+
+#: keymap_defs.h:177
+#, fuzzy
+msgid "toggle search pattern coloring"
+msgstr "沒有搜尋格式。"
+
+#: keymap_defs.h:19
+msgid "toggle view all/subscribed mailboxes (IMAP only)"
+msgstr ""
+
+#: keymap_defs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "沒有尚未讀取的信件"
+
+#: keymap_defs.h:189
+msgid "toggle whether the mailbox will be rewritten"
+msgstr ""
+
+#: keymap_defs.h:190
+msgid "toggle whether to browse mailboxes or all files"
+msgstr ""
+
+#: keymap_defs.h:51
+msgid "toggle whether to delete file after sending it"
+msgstr ""
+
+#: hook.c:61 hook.c:70 keymap.c:668 lib-ui/color.c:545
 msgid "too few arguments"
 msgstr "太少參數"
 
-#: hook.c:75 lib-ui/color.c:605
+#: hook.c:75 lib-ui/color.c:553
 msgid "too many arguments"
 msgstr "太多參數"
 
-#: init.c:690
+#: keymap_defs.h:87
+msgid "transpose character under cursor with previous"
+msgstr ""
+
+#: init.c:687
 msgid "unattachments: invalid disposition"
 msgstr ""
 
-#: init.c:667
+#: init.c:664
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "編輯附件的說明"
 
+#: keymap_defs.h:195
+#, fuzzy
+msgid "undelete all messages in subthread"
+msgstr "反刪除信件的條件："
+
+#: keymap_defs.h:194
+#, fuzzy
+msgid "undelete all messages in thread"
+msgstr "反刪除信件的條件："
+
+#: keymap_defs.h:146
+#, fuzzy
+msgid "undelete messages matching a pattern"
+msgstr "反刪除信件的條件："
+
+#: keymap_defs.h:193
+msgid "undelete the current entry"
+msgstr ""
+
 #: hook.c:218
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
@@ -3859,10 +4516,28 @@ msgstr "unhook: 在 hook 裡面不能做 unhook *"
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook：不明的 hook type %s"
 
-#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:349
+#: lib-sys/mutt_socket.c:375 lib-ui/curs_lib.c:306
 msgid "unknown error"
 msgstr "不明的錯誤"
 
+#: keymap_defs.h:196
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr ""
+
+#: keymap_defs.h:18
+msgid "unsubscribe to current (IMAP/NNTP only)"
+msgstr ""
+
+#: keymap_defs.h:147
+#, fuzzy
+msgid "untag messages matching a pattern"
+msgstr "反標記信件的條件："
+
+#: keymap_defs.h:52
+#, fuzzy
+msgid "update an attachment's encoding info"
+msgstr "編輯附件的說明"
+
 #: main.c:82
 msgid ""
 "usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
@@ -3874,13 +4549,44 @@ msgid ""
 "       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t"
 msgstr ""
 
-#: init.c:1070
+#: keymap_defs.h:171
+msgid "use the current message as a template for a new one"
+msgstr ""
+
+#: init.c:1067
 #, c-format
 msgid "value is illegal with reset"
 msgstr "重新設置後值仍不合規定"
 
+#: keymap_defs.h:213
+msgid "verify a PGP public key"
+msgstr ""
+
+#: keymap_defs.h:10
+#, fuzzy
+msgid "view attachment as text"
+msgstr "附件已被儲存。"
+
+#: keymap_defs.h:198
+msgid "view attachment using mailcap entry if necessary"
+msgstr ""
+
+#: keymap_defs.h:15
+#, fuzzy
+msgid "view file"
+msgstr "建立新檔："
+
+#: keymap_defs.h:214
+msgid "view the key's user id"
+msgstr ""
+
+#: keymap_defs.h:53
+#, fuzzy
+msgid "write the message to a folder"
+msgstr "將信件寫入到信箱"
+
 # Don't translate this!!
-#: lib-ui/curs_lib.c:155
+#: lib-ui/curs_lib.c:118
 msgid "yes"
 msgstr ""
 
@@ -3888,3 +4594,6 @@ msgstr ""
 msgid "yna"
 msgstr ""
 
+#: keymap_defs.h:168
+msgid "{internal}"
+msgstr ""